diff --git a/.htaccess.sample b/.htaccess.sample
index 546f18e6f36..b8821af2226 100644
--- a/.htaccess.sample
+++ b/.htaccess.sample
@@ -31,8 +31,7 @@
 ############################################
 ## adjust memory limit
 
-#    php_value memory_limit 64M
-    php_value memory_limit 128M
+    php_value memory_limit 512M
     php_value max_execution_time 18000
 
 ############################################
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 6f87f6b1875..7025e19610d 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,3 +1,12 @@
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+] NOTE: Current Release Notes are maintained at:                                 [
+]                                                                                [
+] http://www.magentocommerce.com/knowledge-base/entry/ce-18-later-release-notes  [
+]                                                                                [
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 ==== 1.7.0.2 ====
 
 === Fixes ===
diff --git a/app/Mage.php b/app/Mage.php
index bc7a6cb07a1..3849c1fb1d8 100644
--- a/app/Mage.php
+++ b/app/Mage.php
@@ -168,9 +168,9 @@ public static function getVersionInfo()
     {
         return array(
             'major'     => '1',
-            'minor'     => '7',
+            'minor'     => '8',
             'revision'  => '0',
-            'patch'     => '2',
+            'patch'     => '0',
             'stability' => '',
             'number'    => '',
         );
@@ -695,7 +695,7 @@ public static function run($code = '', $type = 'store', $options = array())
             }
             try {
                 self::dispatchEvent('mage_run_exception', array('exception' => $e));
-                if (!headers_sent()) {
+                if (!headers_sent() && self::isInstalled()) {
                     header('Location:' . self::getUrl('install'));
                 } else {
                     self::printException($e);
diff --git a/app/code/community/Cm/RedisSession/Model/Session.php b/app/code/community/Cm/RedisSession/Model/Session.php
new file mode 100644
index 00000000000..58ceac73aca
--- /dev/null
+++ b/app/code/community/Cm/RedisSession/Model/Session.php
@@ -0,0 +1,731 @@
+<?php
+/**
+ * Redis session handler with optimistic locking.
+ *
+ * Features:
+ *  - Falls back to mysql handler if it can't connect to redis. Mysql handler falls back to file handler.
+ *  - When a session's data exceeds the compression threshold the session data will be compressed.
+ *  - Compression libraries supported are 'gzip', 'lzf' and 'snappy'. Lzf and Snappy are much faster than gzip.
+ *  - Compression can be enabled, disabled, or reconfigured on the fly with no loss of session data.
+ *  - Expiration is handled by Redis. No garbage collection needed.
+ *  - Logs when sessions are not written due to not having or losing their lock.
+ *  - Limits the number of concurrent lock requests before a 503 error is returned.
+ *
+ * Locking Algorithm Properties:
+ *  - Only one process may get a write lock on a session.
+ *  - A process may lose it's lock if another process breaks it, in which case the session will not be written.
+ *  - The lock may be broken after BREAK_AFTER seconds and the process that gets the lock is indeterminate.
+ *  - Only MAX_CONCURRENCY processes may be waiting for a lock for the same session or else a 503 error is returned.
+ *  - Detects crashed processes to prevent session deadlocks (Linux only).
+ *  - Detects inactive waiting processes to prevent false-positives in concurrency throttling.
+ *
+ */
+class Cm_RedisSession_Model_Session extends Mage_Core_Model_Mysql4_Session
+{
+    const BREAK_MODULO       = 5;        /* The lock will only be broken one of of this many tries to prevent multiple processes breaking the same lock */
+    const FAIL_AFTER         = 15;       /* Try to break lock for at most this many seconds */
+    const DETECT_ZOMBIES     = 10;       /* Try to detect zombies every this many seconds */
+    const MAX_LIFETIME       = 2592000;  /* Redis backend limit */
+    const SESSION_PREFIX     = 'sess_';
+    const LOG_FILE           = 'redis_session.log';
+
+    /* Bots get shorter session lifetimes */
+    const BOT_REGEX          = '/^alexa|^blitz\.io|bot|^browsermob|crawl|^curl|^facebookexternalhit|feed|google web preview|^ia_archiver|^java|jakarta|^load impact|^magespeedtest|monitor|nagios|^pinterest|postrank|slurp|spider|uptime|yandex/i';
+
+    const XML_PATH_HOST            = 'global/redis_session/host';
+    const XML_PATH_PORT            = 'global/redis_session/port';
+    const XML_PATH_PASS            = 'global/redis_session/password';
+    const XML_PATH_TIMEOUT         = 'global/redis_session/timeout';
+    const XML_PATH_PERSISTENT      = 'global/redis_session/persistent';
+    const XML_PATH_DB              = 'global/redis_session/db';
+    const XML_PATH_COMPRESSION_THRESHOLD = 'global/redis_session/compression_threshold';
+    const XML_PATH_COMPRESSION_LIB = 'global/redis_session/compression_lib';
+    const XML_PATH_LOG_LEVEL       = 'global/redis_session/log_level';
+    const XML_PATH_MAX_CONCURRENCY = 'global/redis_session/max_concurrency';
+    const XML_PATH_BREAK_AFTER     = 'global/redis_session/break_after_%s';
+    const XML_PATH_BOT_LIFETIME    = 'global/redis_session/bot_lifetime';
+
+    const DEFAULT_TIMEOUT               = 2.5;
+    const DEFAULT_COMPRESSION_THRESHOLD = 2048;
+    const DEFAULT_COMPRESSION_LIB       = 'gzip';
+    const DEFAULT_LOG_LEVEL             = 1;
+    const DEFAULT_MAX_CONCURRENCY       = 6;        /* The maximum number of concurrent lock waiters per session */
+    const DEFAULT_BREAK_AFTER           = 30;       /* Try to break the lock after this many seconds */
+    const DEFAULT_BOT_LIFETIME          = 7200;     /* The session lifetime for bots - shorter to prevent bots from wasting backend storage */
+
+    /** @var bool */
+    protected $_useRedis;
+
+    /** @var Credis_Client */
+    protected $_redis;
+
+    /** @var int */
+    protected $_dbNum;
+
+    protected $_compressionThreshold;
+    protected $_compressionLib;
+    protected $_logLevel;
+    protected $_maxConcurrency;
+    protected $_breakAfter;
+    protected $_botLifetime;
+    protected $_isBot = FALSE;
+    protected $_hasLock;
+    protected $_sessionWritten; // avoid infinite loops
+    protected $_timeStart; // re-usable for timing instrumentation
+
+    static public $failedLockAttempts = 0; // for debug or informational purposes
+
+    public function __construct()
+    {
+        $this->_timeStart = microtime(true);
+        $host = (string)   (Mage::getConfig()->getNode(self::XML_PATH_HOST) ?: '127.0.0.1');
+        $port = (int)      (Mage::getConfig()->getNode(self::XML_PATH_PORT) ?: '6379');
+        $pass = (string)   (Mage::getConfig()->getNode(self::XML_PATH_PASS) ?: '');
+        $timeout = (float) (Mage::getConfig()->getNode(self::XML_PATH_TIMEOUT) ?: self::DEFAULT_TIMEOUT);
+        $persistent = (string) (Mage::getConfig()->getNode(self::XML_PATH_PERSISTENT) ?: '');
+        $this->_dbNum = (int) (Mage::getConfig()->getNode(self::XML_PATH_DB) ?: 0);
+        $this->_compressionThreshold = (int) (Mage::getConfig()->getNode(self::XML_PATH_COMPRESSION_THRESHOLD) ?: self::DEFAULT_COMPRESSION_THRESHOLD);
+        $this->_compressionLib = (string) (Mage::getConfig()->getNode(self::XML_PATH_COMPRESSION_LIB) ?: self::DEFAULT_COMPRESSION_LIB);
+        $this->_logLevel = (int) (Mage::getConfig()->getNode(self::XML_PATH_LOG_LEVEL) ?: self::DEFAULT_LOG_LEVEL);
+        $this->_maxConcurrency = (int) (Mage::getConfig()->getNode(self::XML_PATH_MAX_CONCURRENCY) ?: self::DEFAULT_MAX_CONCURRENCY);
+        $this->_breakAfter = (int) (Mage::getConfig()->getNode(sprintf(self::XML_PATH_BREAK_AFTER, session_name())) ?: self::DEFAULT_BREAK_AFTER);
+        $this->_botLifetime = (int) (Mage::getConfig()->getNode(self::XML_PATH_BOT_LIFETIME) ?: self::DEFAULT_BOT_LIFETIME);
+        if ($this->_botLifetime) {
+            $userAgent = empty($_SERVER['HTTP_USER_AGENT']) ? FALSE : $_SERVER['HTTP_USER_AGENT'];
+            $this->_isBot = ! $userAgent || preg_match(self::BOT_REGEX, $userAgent);
+        }
+        $this->_redis = new Credis_Client($host, $port, $timeout, $persistent);
+        if (!empty($pass)) {
+            $this->_redis->auth($pass) or Zend_Cache::throwException('Unable to authenticate with the redis server.');
+        }
+        $this->_redis->setCloseOnDestruct(FALSE);  // Destructor order cannot be predicted
+        $this->_useRedis = TRUE;
+        if ($this->_logLevel >= 7) {
+            Mage::log(
+                sprintf(
+                    "%s: %s initialized for connection to %s:%s after %.5f seconds",
+                    $this->_getPid(),
+                    get_class($this),
+                    $host,
+                    $port,
+                    (microtime(true) - $this->_timeStart)
+                ),
+                Zend_Log::DEBUG, self::LOG_FILE
+            );
+            if ($this->_isBot) {
+                Mage::log(
+                    sprintf(
+                        "%s: Bot detected for user agent: %s",
+                        $this->_getPid(),
+                        $userAgent
+                    ),
+                    Zend_Log::DEBUG, self::LOG_FILE
+                );
+            }
+        }
+    }
+
+    /**
+     * Check DB connection
+     *
+     * @return bool
+     */
+    public function hasConnection()
+    {
+        if( ! $this->_useRedis) return parent::hasConnection();
+
+        try {
+            $this->_redis->connect();
+            if ($this->_logLevel >= 7) {
+                Mage::log(
+                    sprintf("%s: Connected to Redis",
+                        $this->_getPid()
+                    ),
+                    Zend_Log::DEBUG, self::LOG_FILE
+                );
+                // reset timer
+                $this->_timeStart = microtime(true);
+            }
+            return TRUE;
+        }
+        catch (Exception $e) {
+            Mage::logException($e);
+            $this->_redis = NULL;
+            if ($this->_logLevel >= 0) {
+                Mage::log(
+                    sprintf(
+                        "%s: Unable to connect to Redis; falling back to MySQL handler",
+                        $this->_getPid()
+                    ),
+                    Zend_Log::EMERG, self::LOG_FILE
+                );
+            }
+
+            // Fall-back to MySQL handler. If this fails, the file handler will be used.
+            $this->_useRedis = FALSE;
+            parent::__construct();
+            return parent::hasConnection();
+        }
+    }
+
+    /**
+     * Fetch session data
+     *
+     * @param string $sessionId
+     * @return string
+     */
+    public function read($sessionId)
+    {
+        if ( ! $this->_useRedis) return parent::read($sessionId);
+
+        // Get lock on session. Increment the "lock" field and if the new value is 1, we have the lock.
+        // If the new value is a multiple of BREAK_MODULO then we are breaking the lock.
+        $sessionId = self::SESSION_PREFIX.$sessionId;
+        $tries = $waiting = $lock = 0;
+        $detectZombies = FALSE;
+        if ($this->_logLevel >= 7) {
+            Mage::log(
+                sprintf(
+                    "%s: Attempting read lock on ID %s",
+                    $this->_getPid(),
+                    $sessionId
+                ),
+                Zend_Log::DEBUG, self::LOG_FILE
+            );
+            // reset timer
+            $this->_timeStart = microtime(true);
+        }
+        if($this->_dbNum) $this->_redis->select($this->_dbNum);
+        while(1)
+        {
+            // Increment lock value for this session and retrieve the new value
+            $oldLock = $lock;
+            $lock = $this->_redis->hIncrBy($sessionId, 'lock', 1);
+
+            // If we got the lock, update with our pid and reset lock and expiration
+            if ($lock == 1 || ($tries >= $this->_breakAfter && $lock % self::BREAK_MODULO == 0)) {
+                $setData = array(
+                    'pid' => $this->_getPid(),
+                    'lock' => 1,
+                );
+
+                // Save request data in session so if a lock is broken we can know which page it was for debugging
+                if ($this->_logLevel >= 6)
+                {
+                    $additionalDetails = sprintf(
+                        "(%s attempts)",
+                        $tries
+                    );
+                    if ($this->_logLevel >= 7)
+                    {
+                        $additionalDetails = sprintf(
+                            "after %.5f seconds ",
+                            (microtime(true) - $this->_timeStart),
+                            $tries
+                        ) . $additionalDetails;
+                    }
+                    if (empty($_SERVER['REQUEST_METHOD'])) {
+                        $setData['req'] = $_SERVER['SCRIPT_NAME'];
+                    } else {
+                        $setData['req'] = "{$_SERVER['REQUEST_METHOD']} {$_SERVER['SERVER_NAME']}{$_SERVER['REQUEST_URI']}";
+                    }
+                    if ($lock != 1) {
+                        Mage::log(
+                            sprintf("%s: Successfully broke lock for ID %s %s. Lock: %s, BREAK_MODULO: %s\nLast request of broken lock: %s",
+                                    $this->_getPid(),
+                                    $sessionId,
+                                    $additionalDetails,
+                                    $lock,
+                                    self::BREAK_MODULO,
+                                    $this->_redis->hGet($sessionId, 'req')
+                            ),
+                            Zend_Log::INFO, self::LOG_FILE
+                        );
+                    }
+                }
+                $this->_redis->pipeline()
+                    ->hMSet($sessionId, $setData)
+                    ->expire($sessionId, min($this->getLifeTime(), self::MAX_LIFETIME))
+                    ->exec();
+                $this->_hasLock = TRUE;
+                break;
+            }
+
+            // Otherwise, add to "wait" counter and continue
+            else if ( ! $waiting) {
+                $i = 0;
+                do {
+                    $waiting = $this->_redis->hIncrBy($sessionId, 'wait', 1);
+                    if ($this->_logLevel >= 7) {
+                        Mage::log(
+                            sprintf(
+                                "%s: Waiting for lock on ID %s (%s tries, %s waiting, %.5f seconds elapsed)",
+                                $this->_getPid(),
+                                $sessionId,
+                                $tries,
+                                $waiting,
+                                (microtime(true) - $this->_timeStart)
+                            ),
+                            Zend_Log::DEBUG, self::LOG_FILE
+                        );
+                    }
+                } while (++$i < $this->_maxConcurrency && $waiting < 1);
+            }
+
+            // Handle overloaded sessions
+            else {
+                // Detect broken sessions (e.g. caused by fatal errors)
+                if ($detectZombies) {
+                    $detectZombies = FALSE;
+                    if ( $lock > $oldLock                 // lock shouldn't be less than old lock (another process broke the lock)
+                      && $lock + 1 < $oldLock + $waiting // lock should be old+waiting, otherwise there must be a dead process
+                    ) {
+                        // Reset session to fresh state
+                        if ($this->_logLevel >= 6)
+                        {
+                            Mage::log(
+                                sprintf("%s: Detected zombie waiter after %.5f seconds for ID %s (%s waiting)\n  %s (%s - %s)",
+                                    $this->_getPid(),
+                                    (microtime(true) - $this->_timeStart),
+                                    $sessionId, $waiting,
+                                    Mage::app()->getRequest()->getRequestUri(), Mage::app()->getRequest()->getClientIp(), Mage::app()->getRequest()->getHeader('User-Agent')
+                                ),
+                                Zend_Log::INFO, self::LOG_FILE
+                            );
+                        }
+                        $waiting = $this->_redis->hIncrBy($sessionId, 'wait', -1);
+                        continue;
+                    }
+                }
+
+                // Limit concurrent lock waiters to prevent server resource hogging
+                if ($waiting >= $this->_maxConcurrency) {
+                    // Overloaded sessions get 503 errors
+                    $this->_redis->hIncrBy($sessionId, 'wait', -1);
+                    $this->_sessionWritten = TRUE; // Prevent session from getting written
+                    $writes = $this->_redis->hGet($sessionId, 'writes');
+                    if ($this->_logLevel >= 4)
+                    {
+                        Mage::log(
+                            sprintf("%s: Session concurrency exceeded for ID %s; displaying HTTP 503 (%s waiting, %s total requests)\n  %s (%s - %s)",
+                                $this->_getPid(),
+                                $sessionId, $waiting, $writes,
+                                Mage::app()->getRequest()->getRequestUri(), Mage::app()->getRequest()->getClientIp(), Mage::app()->getRequest()->getHeader('User-Agent')
+                            ),
+                            Zend_Log::WARN, self::LOG_FILE
+                        );
+                    }
+                    require_once(Mage::getBaseDir() . DS . 'errors' . DS . '503.php');
+                    exit;
+                }
+            }
+
+            $tries++;
+
+            // Detect dead waiters
+            if ($tries == 1 /* TODO - $tries % 10 == 0 ? */) {
+                $detectZombies = TRUE;
+                // TODO: allow configuration of sleep period?
+                usleep(1500000); // 1.5 seconds
+            }
+            // Detect dead processes every 10 seconds
+            if ($tries % self::DETECT_ZOMBIES == 0) {
+                if ($this->_logLevel >= 7) {
+                    Mage::log(
+                        sprintf(
+                            "%s: Checking for zombies after %.5f seconds of waiting...",
+                            $this->_getPid(),
+                            (microtime(true) - $this->_timeStart)
+                        ),
+                        Zend_Log::DEBUG, self::LOG_FILE
+                    );
+                }
+                $pid = $this->_redis->hGet($sessionId, 'pid');
+                if ($pid && ! $this->_pidExists($pid)) {
+                    // Allow a live process to get the lock
+                    $this->_redis->hSet($sessionId, 'lock', 0);
+                    if ($this->_logLevel >= 6)
+                    {
+                        Mage::log(
+                            sprintf("%s: Detected zombie process (%s) for %s (%s waiting)\n  %s (%s - %s)",
+                                $this->_getPid(),
+                                $pid, $sessionId, $waiting,
+                                Mage::app()->getRequest()->getRequestUri(),
+                                Mage::app()->getRequest()->getClientIp(),
+                                Mage::app()->getRequest()->getHeader('User-Agent')
+                            ),
+                            Zend_Log::INFO, self::LOG_FILE
+                        );
+                    }
+                    continue;
+                }
+            }
+            // Timeout
+            if ($tries >= $this->_breakAfter+self::FAIL_AFTER) {
+                $this->_hasLock = FALSE;
+                if ($this->_logLevel >= 5) {
+                    $additionalDetails = sprintf(
+                        "(%s attempts)",
+                        $tries
+                    );
+                    if ($this->_logLevel >= 7)
+                    {
+                        $additionalDetails = sprintf(
+                            "after %.5f seconds ",
+                            (microtime(true) - $this->_timeStart),
+                            $tries
+                        ) . $additionalDetails;
+                    }
+                    Mage::log(
+                        sprintf(
+                            "%s: Giving up on read lock for ID %s %s",
+                            $this->_getPid(),
+                            $sessionId,
+                            $additionalDetails
+                        ),
+                        Zend_Log::NOTICE, self::LOG_FILE
+                    );
+                }
+                break;
+            }
+            else {
+                // TODO: configurable wait period?
+                sleep(1);
+            }
+        }
+        self::$failedLockAttempts = $tries;
+
+        // This process is no longer waiting for a lock
+        if ($tries > 0) {
+            $this->_redis->hIncrBy($sessionId, 'wait', -1);
+        }
+
+        // Session can be read even if it was not locked by this pid!
+        $sessionData = $this->_redis->hGet($sessionId, 'data');
+        if ($this->_logLevel >= 7) {
+            Mage::log(
+                sprintf(
+                    "%s: Data read for ID %s after %.5f seconds",
+                    $this->_getPid(),
+                    $sessionId,
+                    (microtime(true) - $this->_timeStart)
+                ),
+                Zend_Log::DEBUG, self::LOG_FILE
+            );
+        }
+        return $sessionData ? $this->_decodeData($sessionData) : '';
+    }
+
+    /**
+     * Update session
+     *
+     * @param string $sessionId
+     * @param string $sessionData
+     * @return boolean
+     */
+    public function write($sessionId, $sessionData)
+    {
+        if ( ! $this->_useRedis) return parent::write($sessionId, $sessionData);
+        if ($this->_sessionWritten) {
+            if ($this->_logLevel >= 7) {
+                Mage::log(
+                    sprintf(
+                        "%s: Repeated session write detected; skipping for ID %s",
+                        $this->_getPid(),
+                        $sessionId
+                    ),
+                    Zend_Log::DEBUG, self::LOG_FILE
+                );
+            }
+            return TRUE;
+        }
+        $this->_sessionWritten = TRUE;
+        if ($this->_logLevel >= 7) {
+            Mage::log(
+                sprintf(
+                    "%s: Attempting write to ID %s",
+                    $this->_getPid(),
+                    $sessionId
+                ),
+                Zend_Log::DEBUG, self::LOG_FILE
+            );
+            // reset timer
+            $this->_timeStart = microtime(true);
+        }
+
+        // Do not overwrite the session if it is locked by another pid
+        try {
+            if($this->_dbNum) $this->_redis->select($this->_dbNum);  // Prevent conflicts with other connections?
+            $pid = $this->_redis->hGet('sess_'.$sessionId, 'pid'); // PHP Fatal errors cause self::SESSION_PREFIX to not work..
+            if ( ! $pid || $pid == $this->_getPid()) {
+                if ($this->_logLevel >= 7) {
+                    Mage::log(
+                        sprintf(
+                            "%s: Write lock obtained on ID %s",
+                            $this->_getPid(),
+                            $sessionId
+                        ),
+                        Zend_Log::DEBUG, self::LOG_FILE
+                    );
+                }
+                $this->_writeRawSession($sessionId, $sessionData, $this->getLifeTime());
+                if ($this->_logLevel >= 7) {
+                    Mage::log(
+                        sprintf(
+                            "%s: Data written to ID %s after %.5f seconds",
+                            $this->_getPid(),
+                            $sessionId,
+                            (microtime(true) - $this->_timeStart)
+                        ),
+                        Zend_Log::DEBUG, self::LOG_FILE
+                    );
+                }
+            }
+            else {
+                if ($this->_logLevel >= 4) {
+                    if ($this->_hasLock) {
+                        Mage::log(
+                            sprintf("%s: Unable to write session after %.5f seconds, another process took the lock for ID %s",
+                                $this->_getPid(),
+                                (microtime(true) - $this->_timeStart),
+                                $sessionId
+                            ),
+                            Zend_Log::WARN,
+                            self::LOG_FILE
+                        );
+                    } else {
+                        Mage::log(
+                            sprintf("%s: Unable to write session after %.5f seconds, unable to acquire lock on ID %s", 
+                                $this->_getPid(),
+                                (microtime(true) - $this->_timeStart),
+                                $sessionId
+                            ),
+                            Zend_Log::WARN,
+                            self::LOG_FILE
+                        );
+                    }
+                }
+            }
+        }
+        catch(Exception $e) {
+            if (class_exists('Mage', false)) {
+                Mage::logException($e);
+            } else {
+                error_log("$e");
+            }
+            return FALSE;
+        }
+        return TRUE;
+    }
+
+    /**
+     * Destroy session
+     *
+     * @param string $sessionId
+     * @return boolean
+     */
+    public function destroy($sessionId)
+    {
+        if ( ! $this->_useRedis) return parent::destroy($sessionId);
+
+        if ($this->_logLevel >= 7) {
+            Mage::log(
+                sprintf(
+                    "%s: Destroying ID %s",
+                    $this->_getPid(),
+                    $sessionId
+                ),
+                Zend_Log::DEBUG, self::LOG_FILE
+            );
+        }
+        $this->_redis->pipeline();
+        if($this->_dbNum) $this->_redis->select($this->_dbNum);
+        $this->_redis->del(self::SESSION_PREFIX.$sessionId);
+        $this->_redis->exec();
+        return TRUE;
+    }
+
+    /**
+     * Overridden to prevent calling getLifeTime at shutdown
+     *
+     * @return bool
+     */
+    public function close()
+    {
+        if ( ! $this->_useRedis) return parent::close();
+        if ($this->_logLevel >= 7) {
+            Mage::log(
+                sprintf(
+                    "%s: Closing connection",
+                    $this->_getPid()
+                ),
+                Zend_Log::DEBUG, self::LOG_FILE
+            );
+        }
+        if ($this->_redis) $this->_redis->close();
+        return TRUE;
+    }
+
+    /**
+     * Garbage collection
+     *
+     * @param int $maxLifeTime ignored
+     * @return boolean
+     */
+    public function gc($maxLifeTime)
+    {
+        if ( ! $this->_useRedis) return parent::gc($maxLifeTime);
+        return TRUE;
+    }
+
+    /**
+     * @return int|mixed
+     */
+    public function getLifeTime()
+    {
+        if ($this->_isBot) {
+            return min(parent::getLifeTime(), $this->_botLifetime);
+        }
+        return parent::getLifeTime();
+    }
+
+    /**
+     * Public for testing purposes only.
+     *
+     * @param string $data
+     * @return string
+     */
+    public function _encodeData($data)
+    {
+        $originalDataSize = strlen($data);
+        if ($this->_compressionThreshold > 0 && $this->_compressionLib != 'none' && $originalDataSize >= $this->_compressionThreshold) {
+            if ($this->_logLevel >= 7) {
+                Mage::log(
+                    sprintf(
+                        "%s: Compressing %s bytes with %s",
+                        $this->_getPid(),
+                        $originalDataSize,
+                        $this->_compressionLib
+                    ),
+                    Zend_Log::DEBUG, self::LOG_FILE
+                );
+                // reset timer
+                $this->_timeStart = microtime(true);
+            }
+            switch($this->_compressionLib) {
+                case 'snappy': $data = snappy_compress($data); break;
+                case 'lzf':    $data = lzf_compress($data); break;
+                case 'gzip':   $data = gzcompress($data, 1); break;
+            }
+            if($data) {
+                $data = ':'.substr($this->_compressionLib,0,2).':'.$data;
+                if ($this->_logLevel >= 7) {
+                    Mage::log(
+                        sprintf(
+                            "%s: Data compressed by %.1f percent in %.5f seconds",
+                            $this->_getPid(),
+                            ($originalDataSize == 0 ? 0 : (100 - (strlen($data) / $originalDataSize * 100))),
+                            (microtime(true) - $this->_timeStart)
+                        ),
+                        Zend_Log::DEBUG, self::LOG_FILE
+                    );
+                }
+            } else if ($this->_logLevel >= 4) {
+                Mage::log(
+                    sprintf("%s: Could not compress session data using %s",
+                        $this->_getPid(),
+                        $this->_compressionLib
+                    ),
+                    Zend_Log::WARN,
+                    self::LOG_FILE
+                );
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * Public for testing purposes only.
+     *
+     * @param string $data
+     * @return string
+     */
+    public function _decodeData($data)
+    {
+        switch (substr($data,0,4)) {
+            // asking the data which library it uses allows for transparent changes of libraries
+            case ':sn:': return snappy_uncompress(substr($data,4));
+            case ':lz:': return lzf_decompress(substr($data,4));
+            case ':gz:': return gzuncompress(substr($data,4));
+        }
+        return $data;
+    }
+
+    /**
+     * Public for testing/import purposes only.
+     *
+     * @param $id
+     * @param $data
+     * @param $lifetime
+     * @throws Exception
+     */
+    public function _writeRawSession($id, $data, $lifetime)
+    {
+        if ( ! $this->_useRedis) {
+            throw new Exception('Not connected to redis!');
+        }
+
+        $sessionId = 'sess_' . $id;
+        $this->_redis->pipeline()
+            ->select($this->_dbNum)
+            ->hMSet($sessionId, array(
+                'data' => $this->_encodeData($data),
+                'lock' => 0, // 0 so that next lock attempt will get 1
+            ))
+            ->hIncrBy($sessionId, 'writes', 1) // For informational purposes only
+            ->expire($sessionId, min($lifetime, 2592000))
+            ->exec();
+    }
+
+    /**
+     * @param string $id
+     * @return array
+     * @throws Exception
+     */
+    public function _inspectSession($id)
+    {
+        if ( ! $this->_useRedis) {
+            throw new Exception('Not connected to redis!');
+        }
+
+        $sessionId = 'sess_' . $id;
+        $this->_redis->select($this->_dbNum);
+        $data = $this->_redis->hGetAll($sessionId);
+        if ($data && isset($data['data'])) {
+            $data['data'] = $this->_decodeData($data['data']);
+        }
+        return $data;
+    }
+
+    /**
+     * @return string
+     */
+    public function _getPid()
+    {
+        return gethostname().'|'.getmypid();
+    }
+
+    /**
+     * @param $pid
+     * @return bool
+     */
+    public function _pidExists($pid)
+    {
+        list($host,$pid) = explode('|', $pid);
+        if (PHP_OS != 'Linux' || $host != gethostname()) {
+            return TRUE;
+        }
+        return @file_exists('/proc/'.$pid);
+    }
+
+}
diff --git a/app/code/community/Cm/RedisSession/etc/config.xml b/app/code/community/Cm/RedisSession/etc/config.xml
new file mode 100644
index 00000000000..8c3058ed98e
--- /dev/null
+++ b/app/code/community/Cm/RedisSession/etc/config.xml
@@ -0,0 +1,16 @@
+<config>
+    <modules>
+        <Cm_RedisSession>
+            <version>0.2</version>
+        </Cm_RedisSession>
+    </modules>
+    <global>
+        <models>
+            <core_mysql4>
+                <rewrite>
+                    <session>Cm_RedisSession_Model_Session</session>
+                </rewrite>
+            </core_mysql4>
+        </models>
+    </global>
+</config>
diff --git a/app/code/core/Mage/Admin/Model/Resource/User.php b/app/code/core/Mage/Admin/Model/Resource/User.php
index 70b5f37eae8..ef497870c7a 100755
--- a/app/code/core/Mage/Admin/Model/Resource/User.php
+++ b/app/code/core/Mage/Admin/Model/Resource/User.php
@@ -24,7 +24,6 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-
 /**
  * ACL user resource
  *
@@ -151,7 +150,7 @@ public function hasAssigned2Role($user)
      */
     private function _encryptPassword($pwStr)
     {
-        return Mage::helper('core')->getHash($pwStr, 2);
+        return Mage::helper('core')->getHash($pwStr, Mage_Admin_Model_User::HASH_SALT_LENGTH);
     }
 
     /**
@@ -219,7 +218,7 @@ public function delete(Mage_Core_Model_Abstract $user)
         } catch (Mage_Core_Exception $e) {
             throw $e;
             return false;
-        } catch (Exception $e){
+        } catch (Exception $e) {
             $adapter->rollBack();
             return false;
         }
@@ -238,7 +237,7 @@ public function _saveRelations(Mage_Core_Model_Abstract $user)
     {
         $rolesIds = $user->getRoleIds();
 
-        if( !is_array($rolesIds) || count($rolesIds) == 0 ) {
+        if (!is_array($rolesIds) || count($rolesIds) == 0) {
             return $user;
         }
 
@@ -275,7 +274,7 @@ public function _saveRelations(Mage_Core_Model_Abstract $user)
             $adapter->commit();
         } catch (Mage_Core_Exception $e) {
             throw $e;
-        } catch (Exception $e){
+        } catch (Exception $e) {
             $adapter->rollBack();
             throw $e;
         }
@@ -331,7 +330,7 @@ public function add(Mage_Core_Model_Abstract $user)
 
         $aRoles = $this->hasAssigned2Role($user);
         if ( sizeof($aRoles) > 0 ) {
-            foreach($aRoles as $idx => $data){
+            foreach ($aRoles as $idx => $data) {
                 $conditions = array(
                     'role_id = ?' => $data['role_id'],
                 );
diff --git a/app/code/core/Mage/Admin/Model/User.php b/app/code/core/Mage/Admin/Model/User.php
index 34d8b355c34..c7a0e6cad30 100644
--- a/app/code/core/Mage/Admin/Model/User.php
+++ b/app/code/core/Mage/Admin/Model/User.php
@@ -60,18 +60,24 @@
  */
 class Mage_Admin_Model_User extends Mage_Core_Model_Abstract
 {
-    /**
+    /**#@+
      * Configuration paths for email templates and identities
      */
     const XML_PATH_FORGOT_EMAIL_TEMPLATE    = 'admin/emails/forgot_email_template';
     const XML_PATH_FORGOT_EMAIL_IDENTITY    = 'admin/emails/forgot_email_identity';
     const XML_PATH_STARTUP_PAGE             = 'admin/startup/page';
+    /**#@-*/
 
     /**
      * Minimum length of admin password
      */
     const MIN_PASSWORD_LENGTH = 7;
 
+    /**
+     * Length of salt
+     */
+    const HASH_SALT_LENGTH = 32;
+
     /**
      * Model event prefix
      *
@@ -116,11 +122,11 @@ protected function _beforeSave()
             'extra'     => serialize($this->getExtra())
         );
 
-        if($this->getId() > 0) {
+        if ($this->getId() > 0) {
             $data['user_id'] = $this->getId();
         }
 
-        if( $this->getUsername() ) {
+        if ($this->getUsername()) {
             $data['username'] = $this->getUsername();
         }
 
@@ -422,7 +428,18 @@ public function hasAssigned2Role($user)
      */
     protected function _getEncodedPassword($password)
     {
-        return Mage::helper('core')->getHash($password, 2);
+        return $this->_getHelper('core')->getHash($password, self::HASH_SALT_LENGTH);
+    }
+
+    /**
+     * Returns helper instance
+     *
+     * @param string $helperName
+     * @return Mage_Core_Helper_Abstract
+     */
+    protected function _getHelper($helperName)
+    {
+        return Mage::helper($helperName);
     }
 
     /**
@@ -596,5 +613,4 @@ public function isResetPasswordLinkTokenExpired()
 
         return false;
     }
-
 }
diff --git a/app/code/core/Mage/Admin/etc/config.xml b/app/code/core/Mage/Admin/etc/config.xml
index db1f823acfe..b420845cc36 100644
--- a/app/code/core/Mage/Admin/etc/config.xml
+++ b/app/code/core/Mage/Admin/etc/config.xml
@@ -28,7 +28,7 @@
 <config>
     <modules>
         <Mage_Admin>
-            <version>1.6.1.0</version>
+            <version>1.6.1.1</version>
         </Mage_Admin>
     </modules>
     <global>
diff --git a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.0-1.6.1.1.php b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.0-1.6.1.1.php
new file mode 100644
index 00000000000..2e1061ab0c5
--- /dev/null
+++ b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.0-1.6.1.1.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Admin
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/** @var $installer Mage_Core_Model_Resource_Setup */
+$installer = $this;
+$installer->startSetup();
+
+//Increase password field length
+$installer->getConnection()->changeColumn($installer->getTable('admin/user'), 'password', 'password', array(
+    'type'      => Varien_Db_Ddl_Table::TYPE_TEXT,
+    'length'    => 100,
+    'comment'   => 'User Password'
+));
+
+$installer->endSetup();
diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php
index 65a41b8da33..21c2a7db6be 100644
--- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php
@@ -48,7 +48,7 @@ public function __construct()
     public function getHeaderText()
     {
         if (Mage::registry('api_user')->getId()) {
-            return Mage::helper('adminhtml')->__("Edit User '%s'", $this->htmlEscape(Mage::registry('api_user')->getUsername()));
+            return Mage::helper('adminhtml')->__("Edit User '%s'", $this->escapeHtml(Mage::registry('api_user')->getUsername()));
         }
         else {
             return Mage::helper('adminhtml')->__('New User');
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php
index edd6c9057b3..0db2e8028dd 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php
@@ -58,7 +58,7 @@ public function setCategoryIds($ids)
     protected function _getNodeJson($node, $level = 1)
     {
         $item = array();
-        $item['text']= $this->htmlEscape($node->getName());
+        $item['text']= $this->escapeHtml($node->getName());
 
         if ($this->_withProductCount) {
              $item['text'].= ' ('.$node->getProductCount().')';
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php
index b6e82375ee9..9c4c2bdfa5f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php
@@ -34,6 +34,18 @@
  */
 class Mage_Adminhtml_Block_Catalog_Category_Helper_Pricestep extends Varien_Data_Form_Element_Text
 {
+    /**
+     * Returns js code that is used instead of default toggle code for "Use default config" checkbox
+     *
+     * @return string
+     */
+    public function getToggleCode()
+    {
+        $htmlId = 'use_config_' . $this->getHtmlId();
+        return "toggleValueElements(this, this.parentNode.parentNode);"
+            . "if (!this.checked) toggleValueElements($('$htmlId'), $('$htmlId').parentNode);";
+    }
+
     /**
      * Retrieve Element HTML fragment
      *
@@ -41,26 +53,30 @@ class Mage_Adminhtml_Block_Catalog_Category_Helper_Pricestep extends Varien_Data
      */
     public function getElementHtml()
     {
+        $elementDisabled = $this->getDisabled() == 'disabled';
         $disabled = false;
-        if (!$this->getValue()) {
+
+        if (!$this->getValue() || $elementDisabled) {
             $this->setData('disabled', 'disabled');
             $disabled = true;
         }
+
         parent::addClass('validate-number validate-number-range number-range-0.01-1000000000');
         $html = parent::getElementHtml();
         $htmlId = 'use_config_' . $this->getHtmlId();
         $html .= '<br/><input id="'.$htmlId.'" name="use_config[]" value="' . $this->getId() . '"';
         $html .= ($disabled ? ' checked="checked"' : '');
-        if ($this->getReadonly()) {
+
+        if ($this->getReadonly() || $elementDisabled) {
             $html .= ' disabled="disabled"';
         }
+
         $html .= ' onclick="toggleValueElements(this, this.parentNode);" class="checkbox" type="checkbox" />';
 
-        $html .= ' <label for="'.$htmlId.'" class="normal">'
-            . Mage::helper('adminhtml')->__('Use Config Settings').'</label>';
-        $html .= '<script type="text/javascript">'
-            . 'toggleValueElements($(\''.$htmlId.'\'), $(\''.$htmlId.'\').parentNode);'
-            . '</script>';
+        $html .= ' <label for="' . $htmlId . '" class="normal">'
+            . Mage::helper('adminhtml')->__('Use Config Settings') .'</label>';
+        $html .= '<script type="text/javascript">' . 'toggleValueElements($(\'' . $htmlId . '\'), $(\'' . $htmlId
+            . '\').parentNode);' . '</script>';
 
         return $html;
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php
index f53d44f9497..6a36d88b146 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php
@@ -35,32 +35,47 @@
 class Mage_Adminhtml_Block_Catalog_Category_Helper_Sortby_Available
     extends Varien_Data_Form_Element_Multiselect
 {
-/**
+    /**
+     * Returns js code that is used instead of default toggle code for "Use default config" checkbox
+     *
+     * @return string
+     */
+    public function getToggleCode()
+    {
+        $htmlId = 'use_config_' . $this->getHtmlId();
+        return "toggleValueElements(this, this.parentNode.parentNode);"
+            . "if (!this.checked) toggleValueElements($('$htmlId'), $('$htmlId').parentNode);";
+    }
+
+    /**
      * Retrieve Element HTML fragment
      *
      * @return string
      */
     public function getElementHtml()
     {
+        $elementDisabled = $this->getDisabled() == 'disabled';
         $disabled = false;
-        if (!$this->getValue()) {
+
+        if (!$this->getValue() || $elementDisabled) {
             $this->setData('disabled', 'disabled');
             $disabled = true;
         }
+
         $html = parent::getElementHtml();
         $htmlId = 'use_config_' . $this->getHtmlId();
-        $html .= '<input id="'.$htmlId.'" name="use_config[]" value="' . $this->getId() . '"';
+        $html .= '<input id="' . $htmlId . '" name="use_config[]" value="' . $this->getId() . '"';
         $html .= ($disabled ? ' checked="checked"' : '');
 
-        if ($this->getReadonly()) {
+        if ($this->getReadonly() || $elementDisabled) {
             $html .= ' disabled="disabled"';
         }
 
         $html .= ' onclick="toggleValueElements(this, this.parentNode);" class="checkbox" type="checkbox" />';
-
-        $html .= ' <label for="'.$htmlId.'" class="normal">'
-            . Mage::helper('adminhtml')->__('Use All Available Attributes').'</label>';
-        $html .= '<script type="text/javascript">toggleValueElements($(\''.$htmlId.'\'), $(\''.$htmlId.'\').parentNode);</script>';
+        $html .= ' <label for="' . $htmlId . '" class="normal">'
+            . Mage::helper('adminhtml')->__('Use All Available Attributes') . '</label>';
+        $html .= '<script type="text/javascript">toggleValueElements($(\'' . $htmlId . '\'), $(\'' . $htmlId
+            .'\').parentNode);</script>';
 
         return $html;
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php
index 5d7df5d8e70..879895e589e 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php
@@ -35,6 +35,18 @@
 class Mage_Adminhtml_Block_Catalog_Category_Helper_Sortby_Default
     extends Varien_Data_Form_Element_Select
 {
+    /**
+     * Returns js code that is used instead of default toggle code for "Use default config" checkbox
+     *
+     * @return string
+     */
+    public function getToggleCode()
+    {
+        $htmlId = 'use_config_' . $this->getHtmlId();
+        return "toggleValueElements(this, this.parentNode.parentNode);"
+            . "if (!this.checked) toggleValueElements($('$htmlId'), $('$htmlId').parentNode);";
+    }
+
     /**
      * Retrieve Element HTML fragment
      *
@@ -42,25 +54,28 @@ class Mage_Adminhtml_Block_Catalog_Category_Helper_Sortby_Default
      */
     public function getElementHtml()
     {
+        $elementDisabled = $this->getDisabled() == 'disabled';
         $disabled = false;
-        if (!$this->getValue()) {
+
+        if (!$this->getValue() || $elementDisabled) {
             $this->setData('disabled', 'disabled');
             $disabled = true;
         }
+
         $html = parent::getElementHtml();
         $htmlId = 'use_config_' . $this->getHtmlId();
-        $html .= '<input id="'.$htmlId.'" name="use_config[]" value="' . $this->getId() . '"';
+        $html .= '<input id="' . $htmlId . '" name="use_config[]" value="' . $this->getId() . '"';
         $html .= ($disabled ? ' checked="checked"' : '');
-        if ($this->getReadonly()) {
+
+        if ($this->getReadonly() || $elementDisabled) {
             $html .= ' disabled="disabled"';
         }
-        $html .= ' onclick="toggleValueElements(this, this.parentNode);" class="checkbox" type="checkbox" />';
 
-
-
-        $html .= ' <label for="'.$htmlId.'" class="normal">'
-            . Mage::helper('adminhtml')->__('Use Config Settings').'</label>';
-        $html .= '<script type="text/javascript">toggleValueElements($(\''.$htmlId.'\'), $(\''.$htmlId.'\').parentNode);</script>';
+        $html .= ' onclick="toggleValueElements(this, this.parentNode);" class="checkbox" type="checkbox" />';
+        $html .= ' <label for="' . $htmlId . '" class="normal">'
+            . Mage::helper('adminhtml')->__('Use Config Settings') . '</label>';
+        $html .= '<script type="text/javascript">toggleValueElements($(\'' . $htmlId . '\'), $(\'' . $htmlId
+            . '\').parentNode);</script>';
 
         return $html;
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php
index 8369c8c542a..930184f6f2b 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php
@@ -111,16 +111,15 @@ protected function _prepareForm() {
         }
 
         $this->_setFieldset($attributes, $fieldset);
-
         foreach ($attributes as $attribute) {
+            $rootId = Mage_Catalog_Model_Category::TREE_ROOT_ID;
             /* @var $attribute Mage_Eav_Model_Entity_Attribute */
             if ($attribute->getAttributeCode() == 'url_key') {
-                if ($this->getCategory()->getLevel() == 1) {
+                if (
+                    (!$this->getCategory()->getId() && $this->getRequest()->getParam('parent', $rootId) == $rootId)
+                    || ($this->getCategory()->getParentId() == $rootId)
+                ) {
                     $fieldset->removeField('url_key');
-                    $fieldset->addField('url_key', 'hidden', array(
-                        'name'  => 'url_key',
-                        'value' => $this->getCategory()->getUrlKey()
-                    ));
                 } else {
                     $form->getElement('url_key')->setRenderer(
                         $this->getLayout()->createBlock('adminhtml/catalog_form_renderer_attribute_urlkey')
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php
index 9e4603ef7eb..d968131f29d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php
@@ -123,7 +123,7 @@ protected function _getParentCategoryOptions($node=null, &$options=array())
         if ($node) {
             $options[] = array(
                'value' => $node->getPathId(),
-               'label' => str_repeat('&nbsp;', max(0, 3*($node->getLevel()))) . $this->htmlEscape($node->getName()),
+               'label' => str_repeat('&nbsp;', max(0, 3*($node->getLevel()))) . $this->escapeHtml($node->getName()),
             );
 
             foreach ($node->getChildren() as $child) {
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php
index 9f3f99bfc8e..4f2b9ac36b6 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php
@@ -151,7 +151,10 @@ public function getNodesUrl()
 
     public function getSwitchTreeUrl()
     {
-        return $this->getUrl("*/catalog_category/tree", array('_current'=>true, 'store'=>null, '_query'=>false, 'id'=>null, 'parent'=>null));
+        return $this->getUrl(
+            "*/catalog_category/tree",
+            array('_current'=>true, 'store'=>null, '_query'=>false, 'id'=>null, 'parent'=>null)
+        );
     }
 
     public function getIsWasExpanded()
@@ -202,7 +205,9 @@ public function getBreadcrumbsJavascript($path, $javascriptVarName)
         return
             '<script type="text/javascript">'
             . $javascriptVarName . ' = ' . Mage::helper('core')->jsonEncode($categories) . ';'
-            . ($this->canAddSubCategory() ? '$("add_subcategory_button").show();' : '$("add_subcategory_button").hide();')
+            . ($this->canAddSubCategory()
+                ? '$("add_subcategory_button").show();'
+                : '$("add_subcategory_button").hide();')
             . '</script>';
     }
 
@@ -223,7 +228,9 @@ protected function _getNodeJson($node, $level = 0)
         $item = array();
         $item['text'] = $this->buildNodeName($node);
 
-        //$rootForStores = Mage::getModel('core/store')->getCollection()->loadByCategoryIds(array($node->getEntityId()));
+        /* $rootForStores = Mage::getModel('core/store')
+            ->getCollection()
+            ->loadByCategoryIds(array($node->getEntityId())); */
         $rootForStores = in_array($node->getEntityId(), $this->getRootIds());
 
         $item['id']  = $node->getId();
@@ -267,7 +274,7 @@ protected function _getNodeJson($node, $level = 0)
      */
     public function buildNodeName($node)
     {
-        $result = $this->htmlEscape($node->getName());
+        $result = $this->escapeHtml($node->getName());
         if ($this->_withProductCount) {
              $result .= ' (' . $node->getProductCount() . ')';
         }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php
index bd7bf964747..4ed5bf81c07 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php
@@ -140,7 +140,20 @@ public function getScopeLabel()
         if (!$attribute || Mage::app()->isSingleStoreMode() || $attribute->getFrontendInput()=='gallery') {
             return $html;
         }
-        if ($attribute->isScopeGlobal()) {
+
+        /*
+         * Check if the current attribute is a 'price' attribute. If yes, check
+         * the config setting 'Catalog Price Scope' and modify the scope label.
+         */
+        $isGlobalPriceScope = false;
+        if ($attribute->getFrontendInput() == 'price') {
+            $priceScope = Mage::getStoreConfig('catalog/price/scope');
+            if ($priceScope == 0) {
+                $isGlobalPriceScope = true;
+            }
+        }
+
+        if ($attribute->isScopeGlobal() || $isGlobalPriceScope) {
             $html .= Mage::helper('adminhtml')->__('[GLOBAL]');
         } elseif ($attribute->isScopeWebsite()) {
             $html .= Mage::helper('adminhtml')->__('[WEBSITE]');
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php
index 4933a4f3e8e..e47e4a09ae7 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php
@@ -48,7 +48,7 @@ public function getAfterElementHtml()
                     'label'   => Mage::helper('catalog')->__('WYSIWYG Editor'),
                     'type'    => 'button',
                     'disabled' => $disabled,
-                    'class' => ($disabled) ? 'disabled btn-wysiwyg' : 'btn-wysiwyg',
+                    'class' => 'btn-wysiwyg',
                     'onclick' => 'catalogWysiwygEditor.open(\''.Mage::helper('adminhtml')->getUrl('*/*/wysiwyg').'\', \''.$this->getHtmlId().'\')'
                 ))->toHtml();
         }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php
index 118ea38cda2..1d8b581325a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php
@@ -82,7 +82,7 @@ public function getHeaderText()
             if (is_array($frontendLabel)) {
                 $frontendLabel = $frontendLabel[0];
             }
-            return Mage::helper('catalog')->__('Edit Product Attribute "%s"', $this->htmlEscape($frontendLabel));
+            return Mage::helper('catalog')->__('Edit Product Attribute "%s"', $this->escapeHtml($frontendLabel));
         }
         else {
             return Mage::helper('catalog')->__('New Product Attribute');
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php
index b33511dff9e..17ea98f1d72 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php
@@ -57,7 +57,8 @@ protected function _prepareLayout()
                 $this->getLayout()->createBlock('adminhtml/widget_button')
                     ->setData(array(
                         'label'     => Mage::helper('catalog')->__('Back'),
-                        'onclick'   => 'setLocation(\''.$this->getUrl('*/*/', array('store'=>$this->getRequest()->getParam('store', 0))).'\')',
+                        'onclick'   => 'setLocation(\''
+                            . $this->getUrl('*/*/', array('store'=>$this->getRequest()->getParam('store', 0))).'\')',
                         'class' => 'back'
                     ))
             );
@@ -107,7 +108,8 @@ protected function _prepareLayout()
                 $this->getLayout()->createBlock('adminhtml/widget_button')
                         ->setData(array(
                             'label'     => Mage::helper('catalog')->__('Delete'),
-                            'onclick'   => 'confirmSetLocation(\''.Mage::helper('catalog')->__('Are you sure?').'\', \''.$this->getDeleteUrl().'\')',
+                            'onclick'   => 'confirmSetLocation(\''
+                                . Mage::helper('catalog')->__('Are you sure?').'\', \''.$this->getDeleteUrl().'\')',
                             'class'  => 'delete'
                         ))
                 );
@@ -211,7 +213,7 @@ public function getHeader()
     {
         $header = '';
         if ($this->getProduct()->getId()) {
-            $header = $this->htmlEscape($this->getProduct()->getName());
+            $header = $this->escapeHtml($this->getProduct()->getName());
         }
         else {
             $header = Mage::helper('catalog')->__('New Product');
@@ -235,7 +237,10 @@ public function getAttributeSetName()
     public function getIsConfigured()
     {
         if ($this->getProduct()->isConfigurable()
-            && !($superAttributes = $this->getProduct()->getTypeInstance(true)->getUsedProductAttributeIds($this->getProduct()))) {
+            && !($superAttributes = $this->getProduct()
+                ->getTypeInstance(true)
+                ->getUsedProductAttributeIds($this->getProduct()))
+        ) {
             $superAttributes = false;
         }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php
index 13e35d0afbd..ff1bfe17761 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php
@@ -232,7 +232,7 @@ public function getOptionValues()
                 $value['id'] = $option->getOptionId();
                 $value['item_count'] = $this->getItemCount();
                 $value['option_id'] = $option->getOptionId();
-                $value['title'] = $this->htmlEscape($option->getTitle());
+                $value['title'] = $this->escapeHtml($option->getTitle());
                 $value['type'] = $option->getType();
                 $value['is_require'] = $option->getIsRequire();
                 $value['sort_order'] = $option->getSortOrder();
@@ -256,11 +256,11 @@ public function getOptionValues()
                             'item_count' => max($itemCount, $_value->getOptionTypeId()),
                             'option_id' => $_value->getOptionId(),
                             'option_type_id' => $_value->getOptionTypeId(),
-                            'title' => $this->htmlEscape($_value->getTitle()),
+                            'title' => $this->escapeHtml($_value->getTitle()),
                             'price' => ($showPrice)
                                 ? $this->getPriceValue($_value->getPrice(), $_value->getPriceType()) : '',
                             'price_type' => ($showPrice) ? $_value->getPriceType() : 0,
-                            'sku' => $this->htmlEscape($_value->getSku()),
+                            'sku' => $this->escapeHtml($_value->getSku()),
                             'sort_order' => $_value->getSortOrder(),
                         );
 
@@ -284,7 +284,7 @@ public function getOptionValues()
                     $value['price'] = ($showPrice)
                         ? $this->getPriceValue($option->getPrice(), $option->getPriceType()) : '';
                     $value['price_type'] = $option->getPriceType();
-                    $value['sku'] = $this->htmlEscape($option->getSku());
+                    $value['sku'] = $this->escapeHtml($option->getSku());
                     $value['max_characters'] = $option->getMaxCharacters();
                     $value['file_extension'] = $option->getFileExtension();
                     $value['image_size_x'] = $option->getImageSizeX();
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php
index fb3ba2da77c..58563c6c0b9 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php
@@ -33,7 +33,16 @@
  */
 class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Grid extends Mage_Adminhtml_Block_Widget_Grid
 {
+    /**
+     * Config attribute codes
+     *
+     * @var null|array
+     */
+    protected $_configAttributeCodes = null;
 
+    /**
+     * Constructor
+     */
     public function __construct()
     {
         parent::__construct();
@@ -41,7 +50,7 @@ public function __construct()
         $this->setId('super_product_links');
 
         if ($this->_getProduct()->getId()) {
-            $this->setDefaultFilter(array('in_products'=>1));
+            $this->setDefaultFilter(array('in_products' => 1));
         }
     }
 
@@ -309,4 +318,87 @@ public function getGridUrl()
         return $this->getUrl('*/*/superConfig', array('_current'=>true));
     }
 
+    /**
+     * Retrieving configurable attributes
+     *
+     * @return array
+     */
+    protected function _getConfigAttributeCodes()
+    {
+        if (is_null($this->_configAttributeCodes)) {
+            $product = $this->_getProduct();
+            $attributes = $product->getTypeInstance(true)->getConfigurableAttributes($product);
+            $attributeCodes = array();
+            foreach ($attributes as $attribute) {
+                $productAttribute = $attribute->getProductAttribute();
+                $attributeCodes[] = $productAttribute->getAttributeCode();
+            }
+            $this->_configAttributeCodes = $attributeCodes;
+        }
+        return $this->_configAttributeCodes;
+    }
+
+    /**
+     * Retrieve item row configurable attribute data
+     *
+     * @param Varien_Object $item
+     * @return array
+     */
+    protected function _retrieveRowData(Varien_Object $item)
+    {
+        $attributeValues = array();
+        foreach ($this->_getConfigAttributeCodes() as $attributeCode) {
+            $data = $item->getData($attributeCode);
+            if ($data) {
+                $attributeValues[$attributeCode] = $data;
+            }
+        }
+        return $attributeValues;
+    }
+
+    /**
+     * Checking the data contains the same value of data after collection
+     *
+     * @return Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Grid
+     */
+    protected function _afterLoadCollection()
+    {
+        parent::_afterLoadCollection();
+
+        $attributeCodes = $this->_getConfigAttributeCodes();
+        if (!$attributeCodes) {
+            return $this;
+        }
+
+        $disableMultiSelect = false;
+        $ids = array();
+        foreach ($this->_collection as $item) {
+            $ids[] = $item->getId();
+            $needleAttributeValues = $this->_retrieveRowData($item);
+            foreach($this->_collection as $item2) {
+                // Skip the data if already checked
+                if (in_array($item2->getId(), $ids)) {
+                   continue;
+                }
+                $attributeValues = $this->_retrieveRowData($item2);
+                $disableMultiSelect = ($needleAttributeValues == $attributeValues);
+                if ($disableMultiSelect) {
+                   break;
+                }
+            }
+            if ($disableMultiSelect) {
+                break;
+            }
+        }
+
+        // Disable multiselect column
+        if ($disableMultiSelect) {
+            $selectAll = $this->getColumn('in_products');
+            if ($selectAll) {
+                $selectAll->setDisabled(true);
+            }
+        }
+
+        return $this;
+    }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php
index a7e0e4beb5b..b887c3d89fd 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php
@@ -49,7 +49,7 @@ public function __construct()
     public function getHeaderText()
     {
         if (Mage::registry('current_catalog_search')->getId()) {
-            return Mage::helper('catalog')->__("Edit Search '%s'", $this->htmlEscape(Mage::registry('current_catalog_search')->getQueryText()));
+            return Mage::helper('catalog')->__("Edit Search '%s'", $this->escapeHtml(Mage::registry('current_catalog_search')->getQueryText()));
         }
         else {
             return Mage::helper('catalog')->__('New Search');
diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php
index cd7e9ee2047..512f4125f5f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php
@@ -73,7 +73,7 @@ function saveAndContinueEdit(){
     public function getHeaderText()
     {
         if (Mage::registry('cms_block')->getId()) {
-            return Mage::helper('cms')->__("Edit Block '%s'", $this->htmlEscape(Mage::registry('cms_block')->getTitle()));
+            return Mage::helper('cms')->__("Edit Block '%s'", $this->escapeHtml(Mage::registry('cms_block')->getTitle()));
         }
         else {
             return Mage::helper('cms')->__('New Block');
diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php
index 921977fdb1d..4467dbb0558 100644
--- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php
@@ -71,7 +71,7 @@ public function __construct()
     public function getHeaderText()
     {
         if (Mage::registry('cms_page')->getId()) {
-            return Mage::helper('cms')->__("Edit Page '%s'", $this->htmlEscape(Mage::registry('cms_page')->getTitle()));
+            return Mage::helper('cms')->__("Edit Page '%s'", $this->escapeHtml(Mage::registry('cms_page')->getTitle()));
         }
         else {
             return Mage::helper('cms')->__('New Page');
diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php
index 36ac00a8908..88d61170661 100644
--- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php
+++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php
@@ -89,7 +89,8 @@ protected function _prepareForm()
             'label'     => Mage::helper('cms')->__('Custom Design From'),
             'image'     => $this->getSkinUrl('images/grid-cal.gif'),
             'format'    => $dateFormatIso,
-            'disabled'  => $isElementDisabled
+            'disabled'  => $isElementDisabled,
+            'class'     => 'validate-date validate-date-range date-range-custom_theme-from'
         ));
 
         $designFieldset->addField('custom_theme_to', 'date', array(
@@ -97,7 +98,8 @@ protected function _prepareForm()
             'label'     => Mage::helper('cms')->__('Custom Design To'),
             'image'     => $this->getSkinUrl('images/grid-cal.gif'),
             'format'    => $dateFormatIso,
-            'disabled'  => $isElementDisabled
+            'disabled'  => $isElementDisabled,
+            'class'     => 'validate-date validate-date-range date-range-custom_theme-to'
         ));
 
         $designFieldset->addField('custom_theme', 'select', array(
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php
index e32b93c7efd..5ab14bddb08 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php
@@ -75,7 +75,7 @@ public function getCustomerId()
     public function getHeaderText()
     {
         if (Mage::registry('current_customer')->getId()) {
-            return $this->htmlEscape(Mage::registry('current_customer')->getName());
+            return $this->escapeHtml(Mage::registry('current_customer')->getName());
         }
         else {
             return Mage::helper('customer')->__('New Customer');
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php
index 974199fb175..78eeb8d2575 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php
@@ -29,28 +29,40 @@
  *
  * @category   Mage
  * @package    Mage_Adminhtml
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @author     Magento Core Team <core@magentocommerce.com>
  */
-class Mage_Adminhtml_Block_Customer_Edit_Renderer_Newpass extends Mage_Adminhtml_Block_Abstract implements Varien_Data_Form_Element_Renderer_Interface
+class Mage_Adminhtml_Block_Customer_Edit_Renderer_Newpass
+    extends Mage_Adminhtml_Block_Abstract
+    implements Varien_Data_Form_Element_Renderer_Interface
 {
-
+    /**
+     * Render block
+     *
+     * @param Varien_Data_Form_Element_Abstract $element
+     * @return string
+     */
     public function render(Varien_Data_Form_Element_Abstract $element)
     {
-        $html = '<tr>';
-        $html.= '<td class="label">'.$element->getLabelHtml().'</td>';
-        $html.= '<td class="value">'.$element->getElementHtml().'</td>';
-        $html.= '</tr>'."\n";
-        $html.= '<tr>';
-        $html.= '<td class="label"><label>&nbsp;</label></td>';
-        $html.= '<td class="value">'.Mage::helper('customer')->__('or').'</td>';
-        $html.= '</tr>'."\n";
-        $html.= '<tr>';
-        $html.= '<td class="label"><label>&nbsp;</label></td>';
-        $html.= '<td class="value"><input type="checkbox" id="account-send-pass" name="'.$element->getName().'" value="auto" onclick="setElementDisable(\''.$element->getHtmlId().'\', this.checked)"/>&nbsp;';
-        $html.= '<label for="account-send-pass">'.Mage::helper('customer')->__('Send auto-generated password').'</label></td>';
-        $html.= '</tr>'."\n";
+        $html  = '<tr>';
+        $html .= '<td class="label">' . $element->getLabelHtml() . '</td>';
+        $html .= '<td class="value">' . $element->getElementHtml() . '</td>';
+        $html .= '</tr>' . "\n";
+        $html .= '<tr>';
+        $html .= '<td class="label"><label>&nbsp;</label></td>';
+        $html .= '<td class="value">' . Mage::helper('customer')->__('or') . '</td>';
+        $html .= '</tr>' . "\n";
+        $html .= '<tr>';
+        $html .= '<td class="label"><label>&nbsp;</label></td>';
+        $html .= '<td class="value"><input type="checkbox" id="account-send-pass" name="'
+            . $element->getName()
+            . '" value="auto" onclick="setElementDisable(\''
+            . $element->getHtmlId()
+            . '\', this.checked)"/>&nbsp;';
+        $html .= '<label for="account-send-pass">'
+            . Mage::helper('customer')->__('Send Auto-Generated Password')
+            . '</label></td>';
+        $html .= '</tr>'."\n";
 
         return $html;
     }
-
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php
index 5f455f3da57..32701c34017 100755
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php
@@ -33,6 +33,23 @@ class Mage_Adminhtml_Block_Customer_Edit_Renderer_Region
     extends Mage_Adminhtml_Block_Abstract
     implements Varien_Data_Form_Element_Renderer_Interface
 {
+    /**
+     * Factory instance
+     *
+     * @var Mage_Core_Model_Abstract
+     */
+    protected $_factory;
+
+    /**
+     * Constructor for Mage_Adminhtml_Block_Customer_Edit_Renderer_Region class
+     *
+     * @param array $args
+     */
+    public function __construct(array $args = array())
+    {
+        $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('core/factory');
+    }
+
     /**
      * Output the region element and javasctipt that makes it dependent from country element
      *
@@ -41,14 +58,15 @@ class Mage_Adminhtml_Block_Customer_Edit_Renderer_Region
      */
     public function render(Varien_Data_Form_Element_Abstract $element)
     {
-        if ($country = $element->getForm()->getElement('country_id')) {
+        $country = $element->getForm()->getElement('country_id');
+        if (!is_null($country)) {
             $countryId = $country->getValue();
-        }
-        else {
+        } else {
             return $element->getDefaultHtml();
         }
 
         $regionId = $element->getForm()->getElement('region_id')->getValue();
+        $quoteStoreId = $element->getEntityAttribute()->getStoreId();
 
         $html = '<tr>';
         $element->setClass('input-text');
@@ -60,13 +78,13 @@ public function render(Varien_Data_Form_Element_Abstract $element)
         $selectId = $element->getHtmlId() . '_id';
         $html .= '<select id="' . $selectId . '" name="' . $selectName
             . '" class="select required-entry" style="display:none">';
-        $html .= '<option value="">' . Mage::helper('customer')->__('Please select') . '</option>';
+        $html .= '<option value="">' . $this->_factory->getHelper('customer')->__('Please select') . '</option>';
         $html .= '</select>';
 
         $html .= '<script type="text/javascript">' . "\n";
         $html .= '$("' . $selectId . '").setAttribute("defaultValue", "' . $regionId.'");' . "\n";
-        $html .= 'new regionUpdater("' . $country->getHtmlId() . '", "' . $element->getHtmlId()
-            . '", "' . $selectId . '", ' . $this->helper('directory')->getRegionJson() . ');' . "\n";
+        $html .= 'new regionUpdater("' . $country->getHtmlId() . '", "' . $element->getHtmlId() . '", "' .
+            $selectId . '", ' . $this->helper('directory')->getRegionJsonByStore($quoteStoreId).');' . "\n";
         $html .= '</script>' . "\n";
 
         $html .= '</td></tr>' . "\n";
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php
index be8efc5396c..f46247868f3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php
@@ -78,7 +78,7 @@ public function getCustomerLog()
      */
     public function getCreateDate()
     {
-        return Mage::helper('core')->formatDate($this->getCustomer()->getCreatedAtTimestamp(),
+        return $this->_getCoreHelper()->formatDate($this->getCustomer()->getCreatedAt(),
             Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true);
     }
 
@@ -211,4 +211,13 @@ public function isHidden()
         return true;
     }
 
+    /**
+     * Return instance of core helper
+     *
+     * @return Mage_Core_Helper_Data
+     */
+    protected function _getCoreHelper()
+    {
+        return Mage::helper('core');
+    }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php
index 8b9746fb9d9..a2638c125f8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php
@@ -29,11 +29,10 @@
  *
  * @category   Mage
  * @package    Mage_Adminhtml
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Mage_Adminhtml_Block_Customer_Edit_Tab_View_Cart extends Mage_Adminhtml_Block_Widget_Grid
 {
-
     public function __construct()
     {
         parent::__construct();
@@ -47,6 +46,7 @@ public function __construct()
 
     protected function _prepareCollection()
     {
+        /** @var $quote Mage_Sales_Model_Quote */
         $quote = Mage::getModel('sales/quote');
         // set website to quote, if any
         if ($this->getWebsiteId()) {
@@ -54,12 +54,7 @@ protected function _prepareCollection()
         }
         $quote->loadByCustomer(Mage::registry('current_customer'));
 
-        if ($quote) {
-            $collection = $quote->getItemsCollection(false);
-        }
-        else {
-            $collection = new Varien_Data_Collection();
-        }
+        $collection = $quote ? $quote->getItemsCollection(false) : new Varien_Data_Collection();
 
         $collection->addFieldToFilter('parent_item_id', array('null' => true));
         $this->setCollection($collection);
@@ -69,55 +64,56 @@ protected function _prepareCollection()
 
     protected function _prepareColumns()
     {
+        $currencyCode = (string)Mage::getStoreConfig(Mage_Directory_Model_Currency::XML_PATH_CURRENCY_BASE);
         $this->addColumn('product_id', array(
             'header' => Mage::helper('customer')->__('Product ID'),
             'index' => 'product_id',
-            'width' => '100px',
-        ));
-
-        $this->addColumn('name', array(
+            'width' => '100px'
+        ))->addColumn('name', array(
             'header' => Mage::helper('customer')->__('Product Name'),
-            'index' => 'name',
-        ));
-
-        $this->addColumn('sku', array(
+            'index' => 'name'
+        ))->addColumn('sku', array(
             'header' => Mage::helper('customer')->__('SKU'),
             'index' => 'sku',
-            'width' => '100px',
-        ));
-
-        $this->addColumn('qty', array(
+            'width' => '100px'
+        ))->addColumn('qty', array(
             'header' => Mage::helper('customer')->__('Qty'),
             'index' => 'qty',
             'type'  => 'number',
-            'width' => '60px',
-        ));
-
-        $this->addColumn('price', array(
+            'width' => '60px'
+        ))->addColumn('price', array(
             'header' => Mage::helper('customer')->__('Price'),
             'index' => 'price',
             'type'  => 'currency',
-            'currency_code' => (string) Mage::getStoreConfig(Mage_Directory_Model_Currency::XML_PATH_CURRENCY_BASE),
-        ));
-
-        $this->addColumn('total', array(
+            'currency_code' => $currencyCode
+        ))->addColumn('total', array(
             'header' => Mage::helper('customer')->__('Total'),
             'index' => 'row_total',
             'type'  => 'currency',
-            'currency_code' => (string) Mage::getStoreConfig(Mage_Directory_Model_Currency::XML_PATH_CURRENCY_BASE),
+            'currency_code' => $currencyCode
         ));
 
         return parent::_prepareColumns();
     }
 
+    /**
+     * Retrieve row url
+     *
+     * @param Mage_Sales_Model_Quote_Item $row
+     * @return string
+     */
     public function getRowUrl($row)
     {
         return $this->getUrl('*/catalog_product/edit', array('id' => $row->getProductId()));
     }
 
+    /**
+     * Check weather header should be shown
+     *
+     * @return bool
+     */
     public function getHeadersVisibility()
     {
         return ($this->getCollection()->getSize() > 0);
     }
-
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php
index 2abf9a8bf84..06218662a1e 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php
@@ -71,7 +71,7 @@ protected function _prepareColumns()
         ));
 
         $this->addColumn('created_at', array(
-            'header'    => Mage::helper('customer')->__('Purchased At'),
+            'header'    => Mage::helper('customer')->__('Purchased On'),
             'index'     => 'created_at',
             'type'      => 'datetime',
         ));
@@ -87,7 +87,7 @@ protected function _prepareColumns()
         ));
 
         $this->addColumn('grand_total', array(
-            'header'    => Mage::helper('customer')->__('Grand Total'),
+            'header'    => Mage::helper('customer')->__('Order Total'),
             'index'     => 'grand_total',
             'type'      => 'currency',
             'currency'  => 'order_currency_code',
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php
index 7c6e9c2087f..d2d22b56ca1 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php
@@ -86,7 +86,9 @@ protected function _getCustomer()
      */
     protected function _createCollection()
     {
-        return Mage::getModel('wishlist/item')->getCollection();
+        return Mage::getModel('wishlist/item')->getCollection()
+            ->setWebsiteId($this->_getCustomer()->getWebsiteId())
+            ->setCustomerGroupId($this->_getCustomer()->getGroupId());
     }
 
     /**
@@ -113,13 +115,13 @@ protected function _prepareCollection()
     protected function _prepareColumns()
     {
         $this->addColumn('product_name', array(
-            'header'    => Mage::helper('catalog')->__('Product name'),
+            'header'    => Mage::helper('catalog')->__('Product Name'),
             'index'     => 'product_name',
             'renderer'  => 'adminhtml/customer_edit_tab_view_grid_renderer_item'
         ));
 
         $this->addColumn('description', array(
-            'header'    => Mage::helper('wishlist')->__('User description'),
+            'header'    => Mage::helper('wishlist')->__('User Description'),
             'index'     => 'description',
             'renderer'  => 'adminhtml/customer_edit_tab_wishlist_grid_renderer_description'
         ));
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php
index a6dba63d579..e3ce6001f9f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php
@@ -52,7 +52,7 @@ public function __construct()
     public function getHeaderText()
     {
         if(!is_null(Mage::registry('current_group')->getId())) {
-            return Mage::helper('customer')->__('Edit Customer Group "%s"', $this->htmlEscape(Mage::registry('current_group')->getCustomerGroupCode()));
+            return Mage::helper('customer')->__('Edit Customer Group "%s"', $this->escapeHtml(Mage::registry('current_group')->getCustomerGroupCode()));
         } else {
             return Mage::helper('customer')->__('New Customer Group');
         }
diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php
index 45f269e080e..2fe5d5e81be 100644
--- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php
+++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php
@@ -31,16 +31,18 @@
  * @category   Mage
  * @package    Mage_Adminhtml
  */
-class Mage_Adminhtml_Block_Dashboard_Searches_Renderer_Searchquery extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
+class Mage_Adminhtml_Block_Dashboard_Searches_Renderer_Searchquery
+    extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
 {
     public function render(Varien_Object $row)
     {
         $value = $row->getData($this->getColumn()->getIndex());
         if (Mage::helper('core/string')->strlen($value) > 30) {
-            $value = '<span title="'. $this->htmlEscape($value) .'">' . $this->htmlEscape(Mage::helper('core/string')->truncate($value, 30)) . '</span>';
+            $value = '<span title="'. $this->escapeHtml($value) .'">'
+                . $this->escapeHtml(Mage::helper('core/string')->truncate($value, 30)) . '</span>';
         }
         else {
-            $value = $this->htmlEscape($value);
+            $value = $this->escapeHtml($value);
         }
         return $value;
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php
index 5634f0a4485..812906f52eb 100644
--- a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php
+++ b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php
@@ -141,7 +141,7 @@ protected function _buildMenuArray(Varien_Simplexml_Element $parent=null, $path=
             }
 
             $aclResource = 'admin/' . ($child->resource ? (string)$child->resource : $path . $childName);
-            if (!$this->_checkAcl($aclResource)) {
+            if (!$this->_checkAcl($aclResource) || !$this->_isEnabledModuleOutput($child)) {
                 continue;
             }
 
@@ -307,4 +307,21 @@ public function getMenuLevel($menu, $level = 0)
 
         return $html;
     }
+
+    /**
+     * Check is module output enabled
+     *
+     * @param Varien_Simplexml_Element $child
+     * @return bool
+     */
+    protected function _isEnabledModuleOutput(Varien_Simplexml_Element $child)
+    {
+        $helperName      = 'adminhtml';
+        $childAttributes = $child->attributes();
+        if (isset($childAttributes['module'])) {
+            $helperName  = (string)$childAttributes['module'];
+        }
+
+        return Mage::helper($helperName)->isModuleOutputEnabled();
+    }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php
index 364074f7ab7..657dc1359d7 100644
--- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php
@@ -48,7 +48,7 @@ public function __construct()
     public function getHeaderText()
     {
         if (Mage::registry('permissions_user')->getId()) {
-            return Mage::helper('adminhtml')->__("Edit User '%s'", $this->htmlEscape(Mage::registry('permissions_user')->getUsername()));
+            return Mage::helper('adminhtml')->__("Edit User '%s'", $this->escapeHtml(Mage::registry('permissions_user')->getUsername()));
         }
         else {
             return Mage::helper('adminhtml')->__('New User');
diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php
index 88ef63e3539..9ea48be11da 100644
--- a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php
@@ -55,7 +55,7 @@ public function __construct()
 
     public function getHeaderText()
     {
-        return Mage::helper('poll')->__("Edit Answer '%s'", $this->htmlEscape(Mage::registry('answer_data')->getAnswerTitle()));
+        return Mage::helper('poll')->__("Edit Answer '%s'", $this->escapeHtml(Mage::registry('answer_data')->getAnswerTitle()));
     }
 
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php
index fc8ccf5df67..ef2b62d3b81 100644
--- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php
@@ -50,7 +50,7 @@ public function __construct()
     public function getHeaderText()
     {
         if( Mage::registry('poll_data') && Mage::registry('poll_data')->getId() ) {
-            return Mage::helper('poll')->__("Edit Poll '%s'", $this->htmlEscape(Mage::registry('poll_data')->getPollTitle()));
+            return Mage::helper('poll')->__("Edit Poll '%s'", $this->escapeHtml(Mage::registry('poll_data')->getPollTitle()));
         } else {
             return Mage::helper('poll')->__('New Poll');
         }
diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php
index 9d7d6d0188b..b281bf28be4 100644
--- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php
@@ -57,7 +57,7 @@ public function __construct()
     public function getHeaderText()
     {
         if( Mage::registry('rating_data') && Mage::registry('rating_data')->getId() ) {
-            return Mage::helper('rating')->__("Edit Rating", $this->htmlEscape(Mage::registry('rating_data')->getRatingCode()));
+            return Mage::helper('rating')->__("Edit Rating", $this->escapeHtml(Mage::registry('rating_data')->getRatingCode()));
         } else {
             return Mage::helper('rating')->__('New Rating');
         }
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php
index a6263a8b827..e32b1ab55be 100644
--- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php
@@ -47,7 +47,6 @@ protected function _prepareCollection()
             ->joinAttribute('original_name', 'catalog_product/name', 'entity_id')
             ->addCustomerFilter($this->getRequest()->getParam('id'))
             ->addStatusFilter(Mage_Tag_Model_Tag::STATUS_APPROVED)
-            ->setDescOrder('DESC')
             ->addStoresVisibility()
             ->setActiveFilter()
             ->addGroupByTag()
@@ -62,28 +61,25 @@ protected function _prepareColumns()
     {
         $this->addColumn('name', array(
             'header'    =>Mage::helper('reports')->__('Product Name'),
-            'sortable'  => false,
             'index'     =>'original_name'
         ));
 
         $this->addColumn('tag_name', array(
             'header'    =>Mage::helper('reports')->__('Tag Name'),
-            'sortable'  => false,
             'index'     =>'tag_name'
         ));
 
         if (!Mage::app()->isSingleStoreMode()) {
             $this->addColumn('visible', array(
                 'header'    => Mage::helper('reports')->__('Visible In'),
-                'sortable'  => false,
                 'index'     => 'stores',
                 'type'      => 'store',
+                'sortable'  => false,
                 'store_view'=> true
             ));
 
             $this->addColumn('added_in', array(
                 'header'    =>Mage::helper('reports')->__('Submitted In'),
-                'sortable'  => false,
                 'index'     =>'store_id',
                 'type'      =>'store',
                 'store_view'=>true
@@ -92,7 +88,6 @@ protected function _prepareColumns()
 
         $this->addColumn('created_at', array(
             'header'    =>Mage::helper('reports')->__('Submitted On'),
-            'sortable'  => false,
             'width'     => '140px',
             'type'      => 'datetime',
             'index'     => 'created_at'
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php
index 93cf141ea96..ed61eb710fb 100644
--- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php
@@ -50,9 +50,8 @@ protected function _prepareCollection()
         /* @var $collection Mage_Reports_Model_Resource_Tag_Customer_Collection */
         $collection = Mage::getResourceModel('reports/tag_customer_collection');
         $collection->addStatusFilter(Mage::getModel('tag/tag')->getApprovedStatus())
-                ->addTagFilter($this->getRequest()->getParam('id'))
-                ->addDescOrder()
-                ->addProductName();
+            ->addTagFilter($this->getRequest()->getParam('id'))
+            ->addProductToSelect();
 
         $this->setCollection($collection);
 
@@ -69,27 +68,23 @@ protected function _prepareColumns()
 
         $this->addColumn('firstname', array(
             'header'    =>Mage::helper('reports')->__('First Name'),
-            'sortable'  => false,
             'index'     =>'firstname'
         ));
 
         $this->addColumn('lastname', array(
             'header'    =>Mage::helper('reports')->__('Last Name'),
-            'sortable'  => false,
             'index'     =>'lastname'
         ));
 
         $this->addColumn('product', array(
             'header'    =>Mage::helper('reports')->__('Product Name'),
-            'sortable'  => false,
-            'index'     =>'product'
+            'index'     =>'product_name'
         ));
 
         if (!Mage::app()->isSingleStoreMode()) {
             $this->addColumn('added_in', array(
                 'header'    => Mage::helper('reports')->__('Submitted In'),
-                'sortable'  => false,
-                'index'     => 'store_id',
+                'index'     => 'added_in',
                 'type'      => 'store',
                 'store_view'=> true
             ));
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php
index 7cda22744b1..edbdcdb8966 100644
--- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php
@@ -65,7 +65,6 @@ protected function _prepareColumns()
     {
         $this->addColumn('name', array(
             'header'    =>Mage::helper('reports')->__('Tag Name'),
-            'sortable'  =>false,
             'index'     =>'name'
         ));
 
@@ -73,7 +72,6 @@ protected function _prepareColumns()
             'header'    =>Mage::helper('reports')->__('Popularity'),
             'width'     =>'50px',
             'align'     =>'right',
-            'sortable'  =>false,
             'index'     =>'popularity'
         ));
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php
index 46a4dc9eae0..6f8a6f543b7 100644
--- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php
@@ -75,7 +75,7 @@ protected function _prepareColumns()
             $this->addColumn('visible', array(
                 'header'    => Mage::helper('reports')->__('Visible In'),
                 'sortable'  => false,
-                'index'     =>  'stores',
+                'index'     => 'stores',
                 'type'      => 'store',
                 'store_view'=> true
             ));
diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php b/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php
index 45ed9edf955..4fefdbe9db6 100644
--- a/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php
@@ -36,11 +36,6 @@ class Mage_Adminhtml_Block_Review_Add_Form extends Mage_Adminhtml_Block_Widget_F
 {
     protected function _prepareForm()
     {
-        $statuses = Mage::getModel('review/review')
-            ->getStatusCollection()
-            ->load()
-            ->toOptionArray();
-
         $form = new Varien_Data_Form();
 
         $fieldset = $form->addFieldset('add_review_form', array('legend' => Mage::helper('review')->__('Review Details')));
@@ -61,7 +56,7 @@ protected function _prepareForm()
             'label'     => Mage::helper('review')->__('Status'),
             'required'  => true,
             'name'      => 'status_id',
-            'values'    => $statuses,
+            'values'    => Mage::helper('review')->getReviewStatusesOptionArray(),
         ));
 
         /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Edit.php b/app/code/core/Mage/Adminhtml/Block/Review/Edit.php
index 1078043ffb2..1dcfdaddfd8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Review/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Review/Edit.php
@@ -46,19 +46,47 @@ public function __construct()
         $this->_updateButton('delete', 'label', Mage::helper('review')->__('Delete Review'));
 
         if( $this->getRequest()->getParam('productId', false) ) {
-            $this->_updateButton('back', 'onclick', 'setLocation(\'' . $this->getUrl('*/catalog_product/edit', array('id' => $this->getRequest()->getParam('productId', false))) .'\')' );
+            $this->_updateButton(
+                'back',
+                'onclick',
+                'setLocation(\''
+                    . $this->getUrl(
+                        '*/catalog_product/edit',
+                        array('id' => $this->getRequest()->getParam('productId', false))
+                    )
+                    .'\')'
+            );
         }
 
         if( $this->getRequest()->getParam('customerId', false) ) {
-            $this->_updateButton('back', 'onclick', 'setLocation(\'' . $this->getUrl('*/customer/edit', array('id' => $this->getRequest()->getParam('customerId', false))) .'\')' );
+            $this->_updateButton(
+                'back',
+                'onclick',
+                'setLocation(\''
+                    . $this->getUrl(
+                        '*/customer/edit',
+                        array('id' => $this->getRequest()->getParam('customerId', false))
+                    )
+                    .'\')'
+            );
         }
 
         if( $this->getRequest()->getParam('ret', false) == 'pending' ) {
             $this->_updateButton('back', 'onclick', 'setLocation(\'' . $this->getUrl('*/*/pending') .'\')' );
-            $this->_updateButton('delete', 'onclick', 'deleteConfirm(\'' . Mage::helper('review')->__('Are you sure you want to do this?') . '\', \'' . $this->getUrl('*/*/delete', array(
-                $this->_objectId => $this->getRequest()->getParam($this->_objectId),
-                'ret'           => 'pending',
-            )) .'\')' );
+            $this->_updateButton(
+                'delete',
+                'onclick',
+                'deleteConfirm('
+                    . '\'' . Mage::helper('review')->__('Are you sure you want to do this?').'\' '
+                    . '\'' . $this->getUrl(
+                        '*/*/delete',
+                        array(
+                            $this->_objectId => $this->getRequest()->getParam($this->_objectId),
+                            'ret'           => 'pending',
+                        )
+                    ) . '\''
+                    . ')'
+            );
             Mage::register('ret', 'pending');
         }
 
@@ -71,9 +99,20 @@ public function __construct()
         $this->_formInitScripts[] = '
             var review = {
                 updateRating: function() {
-                        elements = [$("select_stores"), $("rating_detail").getElementsBySelector("input[type=\'radio\']")].flatten();
+                        elements = [
+                            $("select_stores"),
+                            $("rating_detail").getElementsBySelector("input[type=\'radio\']")
+                        ].flatten();
                         $(\'save_button\').disabled = true;
-                        new Ajax.Updater("rating_detail", "'.$this->getUrl('*/*/ratingItems', array('_current'=>true)).'", {parameters:Form.serializeElements(elements), evalScripts:true, onComplete:function(){ $(\'save_button\').disabled = false; } });
+                        new Ajax.Updater(
+                            "rating_detail",
+                            "' . $this->getUrl('*/*/ratingItems', array('_current'=>true)).'",
+                            {
+                                parameters:Form.serializeElements(elements),
+                                evalScripts:true,
+                                onComplete:function(){ $(\'save_button\').disabled = false; }
+                            }
+                        );
                     }
            }
            Event.observe(window, \'load\', function(){
@@ -85,7 +124,7 @@ public function __construct()
     public function getHeaderText()
     {
         if( Mage::registry('review_data') && Mage::registry('review_data')->getId() ) {
-            return Mage::helper('review')->__("Edit Review '%s'", $this->htmlEscape(Mage::registry('review_data')->getTitle()));
+            return Mage::helper('review')->__("Edit Review '%s'", $this->escapeHtml(Mage::registry('review_data')->getTitle()));
         } else {
             return Mage::helper('review')->__('New Review');
         }
diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php
index d9efa34bde5..05270cc5805 100644
--- a/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php
@@ -39,10 +39,6 @@ protected function _prepareForm()
         $review = Mage::registry('review_data');
         $product = Mage::getModel('catalog/product')->load($review->getEntityPkValue());
         $customer = Mage::getModel('customer/customer')->load($review->getCustomerId());
-        $statuses = Mage::getModel('review/review')
-            ->getStatusCollection()
-            ->load()
-            ->toOptionArray();
 
         $form = new Varien_Data_Form(array(
             'id'        => 'edit_form',
@@ -89,7 +85,7 @@ protected function _prepareForm()
             'label'     => Mage::helper('review')->__('Status'),
             'required'  => true,
             'name'      => 'status_id',
-            'values'    => Mage::helper('review')->translateArray($statuses),
+            'values'    => Mage::helper('review')->getReviewStatusesOptionArray(),
         ));
 
         /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid.php
index 811811080f8..d70e6d720a7 100644
--- a/app/code/core/Mage/Adminhtml/Block/Review/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Review/Grid.php
@@ -76,18 +76,6 @@ protected function _prepareCollection()
 
     protected function _prepareColumns()
     {
-        $statuses = Mage::getModel('review/review')
-            ->getStatusCollection()
-            ->load()
-            ->toOptionArray();
-
-        $tmpArr = array();
-        foreach( $statuses as $key => $status ) {
-            $tmpArr[$status['value']] = $status['label'];
-        }
-
-        $statuses = $tmpArr;
-
         $this->addColumn('review_id', array(
             'header'        => Mage::helper('review')->__('ID'),
             'align'         => 'right',
@@ -110,7 +98,7 @@ protected function _prepareColumns()
                 'header'        => Mage::helper('review')->__('Status'),
                 'align'         => 'left',
                 'type'          => 'options',
-                'options'       => $statuses,
+                'options'       => Mage::helper('review')->getReviewStatuses(),
                 'width'         => '100px',
                 'filter_index'  => 'rt.status_id',
                 'index'         => 'status_id',
@@ -232,10 +220,7 @@ protected function _prepareMassaction()
             'confirm' => Mage::helper('review')->__('Are you sure?')
         ));
 
-        $statuses = Mage::getModel('review/review')
-            ->getStatusCollection()
-            ->load()
-            ->toOptionArray();
+        $statuses = Mage::helper('review')->getReviewStatusesOptionArray();
         array_unshift($statuses, array('label'=>'', 'value'=>''));
         $this->getMassactionBlock()->addItem('update_status', array(
             'label'         => Mage::helper('review')->__('Update Status'),
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php
index f2986db4598..e8bc3faac1a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php
@@ -36,14 +36,12 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Billing_Method_Form extends Mage_P
     /**
      * Check payment method model
      *
+     * @param Mage_Payment_Model_Method_Abstract|null $method
      * @return bool
      */
     protected function _canUseMethod($method)
     {
-        if (!$method->canUseInternal()) {
-            return false;
-        }
-        return parent::_canUseMethod($method);
+        return $method && $method->canUseInternal() && parent::_canUseMethod($method);
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php
index c570d12ee5b..7ca846e5bd0 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php
@@ -45,7 +45,7 @@ public function getHeaderText()
 
     public function getCommentNote()
     {
-        return $this->htmlEscape($this->getQuote()->getCustomerNote());
+        return $this->escapeHtml($this->getQuote()->getCustomerNote());
     }
 
     public function getNoteNotify()
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php
index b00f89d4a77..d0e820b2f80 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php
@@ -216,6 +216,6 @@ public function getAddressId()
      */
     public function getAddressAsString($address)
     {
-        return $this->htmlEscape($address->format('oneline'));
+        return $this->escapeHtml($address->format('oneline'));
     }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php
index ff2cbf72c0f..f36c028c6ae 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php
@@ -55,7 +55,7 @@ protected function _toHtml()
         else {
             $out.= Mage::helper('sales')->__('Create New Order');
         }
-        $out = $this->htmlEscape($out);
+        $out = $this->escapeHtml($out);
         $out = '<h3 class="icon-head head-sales-order">' . $out . '</h3>';
         return $out;
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php
index 73ac1e1a8a7..891ad449551 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php
@@ -29,7 +29,7 @@
  *
  * @category   Mage
  * @package    Mage_Adminhtml
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Mage_Adminhtml_Block_Sales_Order_Create_Items_Grid extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract
 {
@@ -40,12 +40,20 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Items_Grid extends Mage_Adminhtml_
      */
     protected $_moveToCustomerStorage = true;
 
+    /**
+     * Class constructor
+     */
     public function __construct()
     {
         parent::__construct();
         $this->setId('sales_order_create_search_grid');
     }
 
+    /**
+     * Returns the items
+     *
+     * @return array
+     */
     public function getItems()
     {
         $items = $this->getParentBlock()->getItems();
@@ -72,41 +80,69 @@ public function getItems()
         return $items;
     }
 
+    /**
+     * Returns the session
+     *
+     * @return Mage_Persistent_Helper_Session
+     */
     public function getSession()
     {
         return $this->getParentBlock()->getSession();
     }
 
+    /**
+     * Returns the item's calculation price
+     *
+     * @param Mage_Sales_Model_Quote_Item $item
+     * @return float
+     */
     public function getItemEditablePrice($item)
     {
-        return $item->getCalculationPrice()*1;
+        return $item->getCalculationPrice() * 1;
     }
 
+    /**
+     * Returns the item's original editable price
+     *
+     * @param Mage_Sales_Model_Quote_Item $item
+     * @return float
+     */
     public function getOriginalEditablePrice($item)
     {
         if ($item->hasOriginalCustomPrice()) {
-            $result = $item->getOriginalCustomPrice()*1;
+            $result = $item->getOriginalCustomPrice() * 1;
         } elseif ($item->hasCustomPrice()) {
-            $result = $item->getCustomPrice()*1;
+            $result = $item->getCustomPrice() * 1;
         } else {
             if (Mage::helper('tax')->priceIncludesTax($this->getStore())) {
-                $result = $item->getPriceInclTax()*1;
+                $result = $item->getPriceInclTax() * 1;
             } else {
-                $result = $item->getOriginalPrice()*1;
+                $result = $item->getOriginalPrice() * 1;
             }
         }
         return $result;
     }
 
+    /**
+     * Returns the item's original price
+     *
+     * @param Mage_Sales_Model_Quote_Item $item
+     * @return double
+     */
     public function getItemOrigPrice($item)
     {
-//        return $this->convertPrice($item->getProduct()->getPrice());
         return $this->convertPrice($item->getPrice());
     }
 
-    public function isGiftMessagesAvailable($item=null)
+    /**
+     * Returns whether the item's gift message is available
+     *
+     * @param null|Mage_Sales_Model_Quote_Item $item
+     * @return bool
+     */
+    public function isGiftMessagesAvailable($item = null)
     {
-        if(is_null($item)) {
+        if (is_null($item)) {
             return $this->helper('giftmessage/message')->getIsMessagesAvailable(
                 'items', $this->getQuote(), $this->getStore()
             );
@@ -117,6 +153,12 @@ public function isGiftMessagesAvailable($item=null)
         );
     }
 
+    /**
+     * Returns whether the item is allowed for the gift message
+     *
+     * @param Mage_Sales_Model_Quote_Item $item
+     * @return bool
+     */
     public function isAllowedForGiftMessage($item)
     {
         return Mage::getSingleton('adminhtml/giftmessage_save')->getIsAllowedQuoteItem($item);
@@ -134,6 +176,11 @@ public function displayTotalsIncludeTax()
         return $res;
     }
 
+    /**
+     * Returns the subtotal
+     *
+     * @return float
+     */
     public function getSubtotal()
     {
         $address = $this->getQuoteAddress();
@@ -148,23 +195,51 @@ public function getSubtotal()
         return false;
     }
 
+    /**
+     * Returns the subtotal with any discount removed
+     *
+     * @return float
+     */
     public function getSubtotalWithDiscount()
     {
         $address = $this->getQuoteAddress();
         if ($this->displayTotalsIncludeTax()) {
-            return $address->getSubtotal()+$address->getTaxAmount()+$this->getDiscountAmount();
+            if ($this->getIsPriceInclTax()) {
+                return $address->getSubtotalInclTax() + $this->getDiscountAmount();
+            } else {
+                return $address->getSubtotal() + $address->getTaxAmount() + $this->getDiscountAmount();
+            }
         } else {
-            return $address->getSubtotal()+$this->getDiscountAmount();
+            if ($this->getIsPriceInclTax()) {
+                return $address->getSubtotalInclTax() - $address->getTaxAmount() + $this->getDiscountAmount();
+            } else {
+                return $address->getSubtotal() + $this->getDiscountAmount();
+            }
         }
     }
 
+    /**
+     * Return whether the catalog prices include tax
+     *
+     * @return bool
+     */
+    public function getIsPriceInclTax()
+    {
+        return Mage::getSingleton('tax/config')->priceIncludesTax($this->getStore());
+    }
+
+    /**
+     * Returns the discount amount
+     *
+     * @return float
+     */
     public function getDiscountAmount()
     {
         return $this->getQuote()->getShippingAddress()->getDiscountAmount();
     }
 
     /**
-     * Retrive quote address
+     * Retrieve quote address
      *
      * @return Mage_Sales_Model_Quote_Address
      */
@@ -200,13 +275,19 @@ public function canApplyCustomPrice($item)
         return !$item->isChildrenCalculated();
     }
 
+    /**
+     * Returns the string that contains the 'quantity' title
+     *
+     * @param Mage_Sales_Model_Quote_Item $item
+     * @return string
+     */
     public function getQtyTitle($item)
     {
         $prices = $item->getProduct()->getTierPrice();
         if ($prices) {
             $info = array();
             foreach ($prices as $data) {
-                $qty    = $data['price_qty']*1;
+                $qty    = $data['price_qty'] * 1;
                 $price  = $this->convertPrice($data['price']);
                 $info[] = $this->helper('sales')->__('Buy %s for price %s', $qty, $price);
             }
@@ -217,13 +298,19 @@ public function getQtyTitle($item)
         }
     }
 
+    /**
+     * Returns the HTML string for the tiered pricing
+     *
+     * @param Mage_Sales_Model_Quote_Item $item
+     * @return string
+     */
     public function getTierHtml($item)
     {
         $html = '';
         $prices = $item->getProduct()->getTierPrice();
         if ($prices) {
             foreach ($prices as $data) {
-                $qty    = $data['price_qty']*1;
+                $qty    = $data['price_qty'] * 1;
                 $price  = $this->convertPrice($data['price']);
                 $info[] = $this->helper('sales')->__('%s for %s', $qty, $price);
             }
@@ -242,9 +329,11 @@ public function getCustomOptions(Mage_Sales_Model_Quote_Item $item)
     {
         $optionStr = '';
         $this->_moveToCustomerStorage = true;
-        if ($optionIds = $item->getOptionByCode('option_ids')) {
+        $optionIds = $item->getOptionByCode('option_ids');
+        if ($optionIds) {
             foreach (explode(',', $optionIds->getValue()) as $optionId) {
-                if ($option = $item->getProduct()->getOptionById($optionId)) {
+                $option = $item->getProduct()->getOptionById($optionId);
+                if ($option) {
                     $optionValue = $item->getOptionByCode('option_' . $option->getId())->getValue();
 
                     $optionStr .= $option->getTitle() . ':';
@@ -272,6 +361,12 @@ public function getMoveToCustomerStorage()
         return $this->_moveToCustomerStorage;
     }
 
+    /**
+     * Returns the item's subtotal that includes tax
+     *
+     * @param Mage_Sales_Model_Quote_Item $item
+     * @return string
+     */
     public function displaySubtotalInclTax($item)
     {
         if ($item->getTaxBeforeDiscount()) {
@@ -282,21 +377,38 @@ public function displaySubtotalInclTax($item)
         return $this->formatPrice($item->getRowTotal() + $tax);
     }
 
+    /**
+     * Returns the item's original price that includes tax
+     *
+     * @param Mage_Sales_Model_Quote_Item $item
+     * @return double
+     */
     public function displayOriginalPriceInclTax($item)
     {
         $tax = 0;
         if ($item->getTaxPercent()) {
             $tax = $item->getPrice() * ($item->getTaxPercent() / 100);
         }
-        return $this->convertPrice($item->getPrice()+($tax/$item->getQty()));
+        return $this->convertPrice($item->getPrice() + ($tax / $item->getQty()));
     }
 
+    /**
+     * Returns the item's row total with any discount and also with any tax
+     *
+     * @param Mage_Sales_Model_Quote_Item $item
+     * @return string
+     */
     public function displayRowTotalWithDiscountInclTax($item)
     {
         $tax = ($item->getTaxAmount() ? $item->getTaxAmount() : 0);
         return $this->formatPrice($item->getRowTotal()-$item->getDiscountAmount()+$tax);
     }
 
+    /**
+     * Returns the text for the custom price (whether it includes or excludes tax)
+     *
+     * @return string
+     */
     public function getInclExclTaxMessage()
     {
         if (Mage::helper('tax')->priceIncludesTax($this->getStore())) {
@@ -306,6 +418,11 @@ public function getInclExclTaxMessage()
         }
     }
 
+    /**
+     * Returns the store
+     *
+     * @return Mage_Core_Model_Store
+     */
     public function getStore()
     {
         return $this->getQuote()->getStore();
@@ -314,7 +431,7 @@ public function getStore()
     /**
      * Return html button which calls configure window
      *
-     * @param  $item
+     * @param  Mage_Sales_Model_Quote_Item $item
      * @return string
      */
     public function getConfigureButtonHtml($item)
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php
index 3a209c65cc1..2419af171cd 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php
@@ -45,19 +45,22 @@ public function getFullTaxInfo()
 
         $taxClassAmount = array();
         if ($source instanceof Mage_Sales_Model_Order) {
-            $taxClassAmount = Mage::helper('tax')->getCalculatedTaxes($source);
-            if (empty($taxClassAmount)) {
-                $rates = Mage::getModel('sales/order_tax')->getCollection()->loadByOrder($source)->toArray();
-                $taxClassAmount =  Mage::getSingleton('tax/calculation')->reproduceProcess($rates['items']);
-            } else {
-                $shippingTax    = Mage::helper('tax')->getShippingTax($source);
-                $taxClassAmount = array_merge($shippingTax, $taxClassAmount);
-            }
+            $taxClassAmount = $this->_getTaxHelper()->getCalculatedTaxes($source);
         }
 
         return $taxClassAmount;
     }
 
+    /**
+     * Return Mage_Tax_Helper_Data instance
+     *
+     * @return Mage_Tax_Helper_Data
+     */
+    protected function _getTaxHelper()
+    {
+        return Mage::helper('tax');
+    }
+
     /**
      * Display tax amount
      *
diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php
index 2032329fc09..a45abe9a066 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php
@@ -42,7 +42,9 @@ class Mage_Adminhtml_Block_Sitemap_Grid_Renderer_Link extends Mage_Adminhtml_Blo
     public function render(Varien_Object $row)
     {
         $fileName = preg_replace('/^\//', '', $row->getSitemapPath() . $row->getSitemapFilename());
-        $url = $this->htmlEscape(Mage::app()->getStore($row->getStoreId())->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB) . $fileName);
+        $url = $this->escapeHtml(
+            Mage::app()->getStore($row->getStoreId())->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB) . $fileName
+        );
 
         if (file_exists(BP . DS . $fileName)) {
             return sprintf('<a href="%1$s">%1$s</a>', $url);
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php
index c8aef7ef26f..8c359bbd1dd 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php
@@ -118,9 +118,11 @@ public function render(Varien_Data_Form_Element_Abstract $element)
 
             // default value
             $html.= '<td class="use-default">';
-            //$html.= '<input id="'.$id.'_inherit" name="'.$namePrefix.'[inherit]" type="checkbox" value="1" class="input-checkbox config-inherit" '.$inherit.' onclick="$(\''.$id.'\').disabled = this.checked">';
-            $html.= '<input id="'.$id.'_inherit" name="'.$namePrefix.'[inherit]" type="checkbox" value="1" class="checkbox config-inherit" '.$inherit.' onclick="toggleValueElements(this, Element.previous(this.parentNode))" /> ';
-            $html.= '<label for="'.$id.'_inherit" class="inherit" title="'.htmlspecialchars($defText).'">'.$checkboxLabel.'</label>';
+            $html.= '<input id="' . $id . '_inherit" name="'
+                . $namePrefix . '[inherit]" type="checkbox" value="1" class="checkbox config-inherit" '
+                . $inherit . ' onclick="toggleValueElements(this, Element.previous(this.parentNode))" /> ';
+            $html.= '<label for="' . $id . '_inherit" class="inherit" title="'
+                . htmlspecialchars($defText) . '">' . $checkboxLabel . '</label>';
             $html.= '</td>';
         }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php
index f3cfb39dda5..b42e3da2fc5 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php
@@ -31,7 +31,8 @@
  * @package    Mage_Adminhtml
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-abstract class Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract extends Mage_Adminhtml_Block_System_Config_Form_Field
+abstract class Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract
+    extends Mage_Adminhtml_Block_System_Config_Form_Field
 {
     /**
      * Grid columns
@@ -145,7 +146,7 @@ public function getArrayRows()
         if ($element->getValue() && is_array($element->getValue())) {
             foreach ($element->getValue() as $rowId => $row) {
                 foreach ($row as $key => $value) {
-                    $row[$key] = $this->htmlEscape($value);
+                    $row[$key] = $this->escapeHtml($value);
                 }
                 $row['_id'] = $rowId;
                 $result[$rowId] = new Varien_Object($row);
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php
index c0e26de63b1..02b7ee2c49e 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php
@@ -32,12 +32,13 @@
  * @package    Mage_Adminhtml
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_Adminhtml_Block_System_Config_Form_Field_Select_Flatcatalog extends Mage_Adminhtml_Block_System_Config_Form_Field
+class Mage_Adminhtml_Block_System_Config_Form_Field_Select_Flatcatalog
+    extends Mage_Adminhtml_Block_System_Config_Form_Field
 {
     protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
     {
-        if (!Mage::helper('catalog/category_flat')->isRebuilt()) {
-            $element->setDisabled('disabled')
+        if (!Mage::helper('catalog/category_flat')->isBuilt()) {
+            $element->setDisabled(true)
                 ->setValue(0);
         }
         return parent::_getElementHtml($element);
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php
index 447ba3036d5..9f7d89728ba 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php
@@ -58,7 +58,7 @@ public function getProfileId()
     public function getHeaderText()
     {
         if (Mage::registry('current_convert_profile')->getId()) {
-            return $this->htmlEscape(Mage::registry('current_convert_profile')->getName());
+            return $this->escapeHtml(Mage::registry('current_convert_profile')->getName());
         }
         else {
             return Mage::helper('adminhtml')->__('New Profile');
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php
index a74bd200980..86a3837001a 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php
@@ -84,7 +84,7 @@ public function getValue($key, $default='', $defaultNew = null)
         }
 
         $value = $this->getData($key);
-        return $this->htmlEscape(strlen($value) > 0 ? $value : $default);
+        return $this->escapeHtml(strlen($value) > 0 ? $value : $default);
     }
 
     public function getSelected($key, $value)
@@ -226,7 +226,9 @@ public function getStoreCollection()
     public function getShortDateFormat()
     {
         if (!$this->_shortDateFormat) {
-            $this->_shortDateFormat = Mage::app()->getLocale()->getDateStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
+            $this->_shortDateFormat = Mage::app()->getLocale()->getDateStrFormat(
+                Mage_Core_Model_Locale::FORMAT_TYPE_SHORT
+            );
         }
         return $this->_shortDateFormat;
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php
index fc12b550dd8..8370b7706f2 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php
@@ -58,7 +58,7 @@ public function getProfileId()
     public function getHeaderText()
     {
         if (Mage::registry('current_convert_profile')->getId()) {
-            return $this->htmlEscape(Mage::registry('current_convert_profile')->getName());
+            return $this->escapeHtml(Mage::registry('current_convert_profile')->getName());
         }
         else {
             return Mage::helper('adminhtml')->__('New Profile');
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php
index 75c9743648b..476404b3499 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php
@@ -67,8 +67,7 @@ public function __construct()
      */
     public function getHeaderText()
     {
-        return Mage::helper('adminhtml')->__("Delete %s '%s'", $this->getStoreTypeTitle(),
-            $this->htmlEscape($this->getChild('form')->getDataObject()->getName()));
+        return Mage::helper('adminhtml')->__("Delete %s '%s'", $this->getStoreTypeTitle(), $this->escapeHtml($this->getChild('form')->getDataObject()->getName()));
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php
index f82065597d3..65263806362 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php
@@ -98,7 +98,7 @@ public function getFormHtml()
     public function getHeaderText()
     {
         if ($this->getVariable()->getId()) {
-            return Mage::helper('adminhtml')->__('Custom Variable "%s"', $this->htmlEscape($this->getVariable()->getName()));
+            return Mage::helper('adminhtml')->__('Custom Variable "%s"', $this->escapeHtml($this->getVariable()->getName()));
         }
         else {
             return Mage::helper('adminhtml')->__('New Custom Variable');
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php b/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php
index d57254688d6..cc9bf392692 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php
@@ -62,7 +62,7 @@ public function __construct()
         $tagInfo = Mage::getModel('tag/tag')
             ->load(Mage::registry('tagId'));
 
-        $this->_headerText = Mage::helper('tag')->__("Customers Tagged '%s'", $this->htmlEscape($tagInfo->getName()));
+        $this->_headerText = Mage::helper('tag')->__("Customers Tagged '%s'", $this->escapeHtml($tagInfo->getName()));
     }
 
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php
index 24526307e23..2dfbc968f08 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php
@@ -80,7 +80,7 @@ protected function _prepareLayout()
     public function getHeaderText()
     {
         if (Mage::registry('current_tag')->getId()) {
-            return Mage::helper('tag')->__("Edit Tag '%s'", $this->htmlEscape(Mage::registry('current_tag')->getName()));
+            return Mage::helper('tag')->__("Edit Tag '%s'", $this->escapeHtml(Mage::registry('current_tag')->getName()));
         }
         return Mage::helper('tag')->__('New Tag');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Product.php b/app/code/core/Mage/Adminhtml/Block/Tag/Product.php
index 31d27bb64ea..3908aceea26 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Product.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Product.php
@@ -60,7 +60,7 @@ public function __construct()
         $tagInfo = Mage::getModel('tag/tag')
             ->load(Mage::registry('tagId'));
 
-        $this->_headerText = Mage::helper('tag')->__("Products Tagged with '%s'", $this->htmlEscape($tagInfo->getName()));
+        $this->_headerText = Mage::helper('tag')->__("Products Tagged with '%s'", $this->escapeHtml($tagInfo->getName()));
     }
 
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php
index f3d12669f05..2ab0be30bf6 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php
@@ -90,7 +90,7 @@ public function getFormHtml()
     public function getHeaderText()
     {
         if (Mage::registry('tag_tag')->getId()) {
-            return Mage::helper('tag')->__("Edit Tag '%s'", $this->htmlEscape(Mage::registry('tag_tag')->getName()));
+            return Mage::helper('tag')->__("Edit Tag '%s'", $this->escapeHtml(Mage::registry('tag_tag')->getName()));
         }
         else {
             return Mage::helper('tag')->__('New Tag');
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php
index 4555c276bfb..7005237a942 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php
@@ -48,7 +48,7 @@ public function __construct()
     public function getHeaderText()
     {
         if (Mage::registry('tax_class')->getId()) {
-            return Mage::helper('tax')->__("Edit Class '%s'", $this->htmlEscape(Mage::registry('tax_class')->getClassName()));
+            return Mage::helper('tax')->__("Edit Class '%s'", $this->escapeHtml(Mage::registry('tax_class')->getClassName()));
         }
         else {
             return Mage::helper('tax')->__('New Class');
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php
index ba8b3c20d6d..7d622a111af 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php
@@ -29,14 +29,12 @@
  *
  * @category   Mage
  * @package    Mage_Adminhtml
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @author     Magento Core Team <core@magentocommerce.com>
  */
-
 class Mage_Adminhtml_Block_Tax_Rule_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
 {
     /**
      * Init class
-     *
      */
     public function __construct()
     {
@@ -73,9 +71,12 @@ protected function _prepareForm()
             ->setClassTypeFilter(Mage_Tax_Model_Class::TAX_CLASS_TYPE_CUSTOMER)
             ->toOptionArray();
 
+        /**
+         * Get rates array without memory leak
+         */
         $rates = Mage::getModel('tax/calculation_rate')
             ->getCollection()
-            ->toOptionArray();
+            ->getOptionRates();
 
         $fieldset->addField('code', 'text',
             array(
@@ -128,6 +129,15 @@ protected function _prepareForm()
                 'note'      => Mage::helper('tax')->__('Tax rates at the same priority are added, others are compounded.'),
             )
         );
+
+        $fieldset->addField('calculate_subtotal', 'checkbox',
+            array(
+                'name'      => 'calculate_subtotal',
+                'label'     => Mage::helper('tax')->__('Calculate off subtotal only'),
+                'onclick'   => 'this.value = this.checked ? 1 : 0;',
+                'checked'   => $model->getCalculateSubtotal()
+            )
+        );
         $fieldset->addField('position', 'text',
             array(
                 'name'      => 'position',
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php
index b33b4e888ca..61fec8d3798 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php
@@ -25,7 +25,9 @@
  */
 class Mage_Adminhtml_Block_Tax_Rule_Grid extends Mage_Adminhtml_Block_Widget_Grid
 {
-
+    /**
+     * Set default value
+     */
     public function __construct()
     {
         parent::__construct();
@@ -35,6 +37,11 @@ public function __construct()
         $this->setSaveParametersInSession(true);
     }
 
+    /**
+     * Prepare grid collection
+     *
+     * @return Mage_Adminhtml_Block_Tax_Rule_Grid
+     */
     protected function _prepareCollection()
     {
         $collection = Mage::getModel('tax/calculation_rule')
@@ -50,6 +57,12 @@ protected function _prepareCollection()
         return $this;
     }
 
+    /**
+     * Add filter
+     *
+     * @param Mage_Adminhtml_Block_Widget_Grid_Column $column
+     * @return Mage_Adminhtml_Block_Widget_Grid
+     */
     protected function _addColumnFilterToCollection($column)
     {
         if ($this->getCollection()) {
@@ -71,11 +84,16 @@ protected function _addColumnFilterToCollection($column)
         return parent::_addColumnFilterToCollection($column);
     }
 
+    /**
+     * Prepare grid columns
+     *
+     * @return Mage_Adminhtml_Block_Widget_Grid
+     */
     protected function _prepareColumns()
     {
         $this->addColumn('code',
             array(
-                'header'=>Mage::helper('tax')->__('Name'),
+                'header' => Mage::helper('tax')->__('Name'),
                 'align' =>'left',
                 'index' => 'code',
                 'filter_index' => 'code',
@@ -84,27 +102,29 @@ protected function _prepareColumns()
 
         $this->addColumn('customer_tax_classes',
             array(
-                'header'=>Mage::helper('tax')->__('Customer Tax Class'),
+                'header' => Mage::helper('tax')->__('Customer Tax Class'),
                 'sortable'  => false,
                 'align' =>'left',
                 'index' => 'customer_tax_classes',
                 'filter_index' => 'ctc.customer_tax_class_id',
                 'type'    => 'options',
                 'show_missing_option_values' => true,
-                'options' => Mage::getModel('tax/class')->getCollection()->setClassTypeFilter(Mage_Tax_Model_Class::TAX_CLASS_TYPE_CUSTOMER)->toOptionHash(),
+                'options' => Mage::getModel('tax/class')->getCollection()
+                    ->setClassTypeFilter(Mage_Tax_Model_Class::TAX_CLASS_TYPE_CUSTOMER)->toOptionHash(),
             )
         );
 
         $this->addColumn('product_tax_classes',
             array(
-                'header'=>Mage::helper('tax')->__('Product Tax Class'),
+                'header' => Mage::helper('tax')->__('Product Tax Class'),
                 'sortable'  => false,
                 'align' =>'left',
                 'index' => 'product_tax_classes',
                 'filter_index' => 'ptc.product_tax_class_id',
                 'type'    => 'options',
                 'show_missing_option_values' => true,
-                'options' => Mage::getModel('tax/class')->getCollection()->setClassTypeFilter(Mage_Tax_Model_Class::TAX_CLASS_TYPE_PRODUCT)->toOptionHash(),
+                'options' => Mage::getModel('tax/class')->getCollection()
+                    ->setClassTypeFilter(Mage_Tax_Model_Class::TAX_CLASS_TYPE_PRODUCT)->toOptionHash(),
             )
         );
 
@@ -123,15 +143,23 @@ protected function _prepareColumns()
 
         $this->addColumn('priority',
             array(
-                'header'=>Mage::helper('tax')->__('Priority'),
+                'header' => Mage::helper('tax')->__('Priority'),
                 'width' => '50px',
                 'index' => 'priority'
             )
         );
 
+        $this->addColumn('calculate_subtotal',
+            array(
+                'header' => Mage::helper('tax')->__('Subtotal only'),
+                'width' => '50px',
+                'index' => 'calculate_subtotal'
+            )
+        );
+
         $this->addColumn('position',
             array(
-                'header'=>Mage::helper('tax')->__('Sort Order'),
+                'header' => Mage::helper('tax')->__('Sort Order'),
                 'width' => '50px',
                 'index' => 'position'
             )
@@ -142,6 +170,12 @@ protected function _prepareColumns()
         return parent::_prepareColumns();
     }
 
+    /**
+     * Return url
+     *
+     * @param Mage_Core_Model_Abstract $row
+     * @return string
+     */
     public function getRowUrl($row)
     {
         return $this->getUrl('*/*/edit', array('rule' => $row->getId()));
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php
index 545566c608d..faac783c5f9 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php
@@ -42,7 +42,7 @@ protected function _toHtml()
     {
         if ($this->getItem()) {
             return '<p>' . $this->getLabel() . ' <a href="' . $this->getItemUrl() . '">'
-                . $this->htmlEscape($this->getItem()->getName()) . '</a></p>';
+                . $this->escapeHtml($this->getItem()->getName()) . '</a></p>';
         }
     }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
index c5c38be9b0c..cea67d2193e 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
@@ -496,7 +496,7 @@ protected function _setCollectionOrder($column)
     /**
      * Prepare grid collection object
      *
-     * @return this
+     * @return Mage_Adminhtml_Block_Widget_Grid
      */
     protected function _prepareCollection()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php
index a25feddcd84..7f87c5178c5 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php
@@ -32,7 +32,8 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  * @todo        date format
  */
-class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Date extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Abstract
+class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Date
+    extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Abstract
 {
     protected $_locale;
 
@@ -48,17 +49,24 @@ public function getHtml()
     {
         $htmlId = $this->_getHtmlId() . microtime(true);
         $format = $this->getLocale()->getDateStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
-        $html = '<div class="range"><div class="range-line date">
-            <span class="label">' . Mage::helper('adminhtml')->__('From').':</span>
-            <input type="text" name="'.$this->_getHtmlName().'[from]" id="'.$htmlId.'_from" value="'.$this->getEscapedValue('from').'" class="input-text no-changes"/>
-            <img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle" id="'.$htmlId.'_from_trig" title="'.$this->htmlEscape(Mage::helper('adminhtml')->__('Date selector')).'"/>
-            </div>';
-        $html.= '<div class="range-line date">
-            <span class="label">' . Mage::helper('adminhtml')->__('To').' :</span>
-            <input type="text" name="'.$this->_getHtmlName().'[to]" id="'.$htmlId.'_to" value="'.$this->getEscapedValue('to').'" class="input-text no-changes"/>
-            <img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle" id="'.$htmlId.'_to_trig" title="'.$this->htmlEscape(Mage::helper('adminhtml')->__('Date selector')).'"/>
-            </div></div>';
-        $html.= '<input type="hidden" name="'.$this->_getHtmlName().'[locale]" value="'.$this->getLocale()->getLocaleCode().'"/>';
+        $html = '<div class="range"><div class="range-line date">'
+            . '<span class="label">' . Mage::helper('adminhtml')->__('From').':</span>'
+            . '<input type="text" name="'.$this->_getHtmlName().'[from]" id="'.$htmlId.'_from"'
+                . ' value="'.$this->getEscapedValue('from').'" class="input-text no-changes"/>'
+            . '<img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle"'
+                . ' id="'.$htmlId.'_from_trig"'
+                . ' title="' . $this->escapeHtml(Mage::helper('adminhtml')->__('Date selector')) . '"/>'
+            . '</div>';
+        $html.= '<div class="range-line date">'
+            . '<span class="label">' . Mage::helper('adminhtml')->__('To').' :</span>'
+            . '<input type="text" name="'.$this->_getHtmlName().'[to]" id="'.$htmlId.'_to"'
+                . ' value="'.$this->getEscapedValue('to').'" class="input-text no-changes"/>'
+            . '<img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle"'
+                . ' id="'.$htmlId.'_to_trig"'
+                . ' title="'.$this->escapeHtml(Mage::helper('adminhtml')->__('Date selector')).'"/>'
+            . '</div></div>';
+        $html.= '<input type="hidden" name="'.$this->_getHtmlName().'[locale]"'
+            . 'value="'.$this->getLocale()->getLocaleCode().'"/>';
         $html.= '<script type="text/javascript">
             Calendar.setup({
                 inputField : "'.$htmlId.'_from",
@@ -91,7 +99,8 @@ function showCalendar(event){
 
                         $(item).setStyle({
                             "zIndex" : index + 1,
-                            "left" : offset[0] + scrollOffset[0] - dimensionsCalendar.width + dimensionsButton.width + "px",
+                            "left" : offset[0] + scrollOffset[0] - dimensionsCalendar.width
+                                + dimensionsButton.width + "px",
                             "top" : offset[1] + scrollOffset[1] + dimensionsButton.height + "px"
                         });
                     };
@@ -177,7 +186,9 @@ protected function _convertDate($date, $locale)
             $dateObj = $this->getLocale()->date(null, null, $locale, false);
 
             //set default timezone for store (admin)
-            $dateObj->setTimezone(Mage::app()->getStore()->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_TIMEZONE));
+            $dateObj->setTimezone(
+                Mage::app()->getStore()->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_TIMEZONE)
+            );
 
             //set begining of day
             $dateObj->setHour(00);
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php
index 89f4eab90a6..33c7e96f720 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php
@@ -32,7 +32,8 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  * @todo        date format
  */
-class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Datetime extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Date
+class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Datetime
+    extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Date
 {
     //full day is 86400, we need 23 hours:59 minutes:59 seconds = 86399
     const END_OF_DAY_IN_SECONDS = 86399;
@@ -76,7 +77,9 @@ protected function _convertDate($date, $locale)
                 $dateObj = $this->getLocale()->date(null, null, $locale, false);
 
                 //set default timezone for store (admin)
-                $dateObj->setTimezone(Mage::app()->getStore()->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_TIMEZONE));
+                $dateObj->setTimezone(
+                    Mage::app()->getStore()->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_TIMEZONE)
+                );
 
                 //set date with applying timezone of store
                 $dateObj->set(
@@ -112,17 +115,24 @@ public function getHtml()
             $format .= ' ' . $this->getLocale()->getTimeStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
         }
 
-        $html = '<div class="range"><div class="range-line date">
-            <span class="label">' . Mage::helper('adminhtml')->__('From').':</span>
-            <input type="text" name="'.$this->_getHtmlName().'[from]" id="'.$htmlId.'_from" value="'.$this->getEscapedValue('from').'" class="input-text no-changes"/>
-            <img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle" id="'.$htmlId.'_from_trig" title="'.$this->htmlEscape(Mage::helper('adminhtml')->__('Date selector')).'"/>
-            </div>';
-        $html.= '<div class="range-line date">
-            <span class="label">' . Mage::helper('adminhtml')->__('To').' :</span>
-            <input type="text" name="'.$this->_getHtmlName().'[to]" id="'.$htmlId.'_to" value="'.$this->getEscapedValue('to').'" class="input-text no-changes"/>
-            <img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle" id="'.$htmlId.'_to_trig" title="'.$this->htmlEscape(Mage::helper('adminhtml')->__('Date selector')).'"/>
-            </div></div>';
-        $html.= '<input type="hidden" name="'.$this->_getHtmlName().'[locale]" value="'.$this->getLocale()->getLocaleCode().'"/>';
+        $html = '<div class="range"><div class="range-line date">'
+            . '<span class="label">' . Mage::helper('adminhtml')->__('From').':</span>'
+            . '<input type="text" name="'.$this->_getHtmlName().'[from]" id="'.$htmlId.'_from"'
+                . ' value="'.$this->getEscapedValue('from').'" class="input-text no-changes"/>'
+            . '<img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle"'
+                . ' id="'.$htmlId.'_from_trig"'
+                . ' title="'.$this->escapeHtml(Mage::helper('adminhtml')->__('Date selector')).'"/>'
+            . '</div>';
+        $html.= '<div class="range-line date">'
+            . '<span class="label">' . Mage::helper('adminhtml')->__('To').' :</span>'
+            . '<input type="text" name="'.$this->_getHtmlName().'[to]" id="'.$htmlId.'_to"'
+                . ' value="'.$this->getEscapedValue('to').'" class="input-text no-changes"/>'
+            . '<img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle"'
+                . ' id="'.$htmlId.'_to_trig"'
+                . ' title="'.$this->escapeHtml(Mage::helper('adminhtml')->__('Date selector')).'"/>'
+            . '</div></div>';
+        $html.= '<input type="hidden" name="'.$this->_getHtmlName().'[locale]"'
+            . ' value="'.$this->getLocale()->getLocaleCode().'"/>';
         $html.= '<script type="text/javascript">
             Calendar.setup({
                 inputField : "'.$htmlId.'_from",
@@ -155,7 +165,9 @@ public function getEscapedValue($index=null)
         if ($this->getColumn()->getFilterTime()) {
             $value = $this->getValue($index);
             if ($value instanceof Zend_Date) {
-                return $value->toString($this->getLocale()->getDateTimeFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT));
+                return $value->toString(
+                    $this->getLocale()->getDateTimeFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT)
+                );
             }
             return $value;
         }
diff --git a/app/code/core/Mage/Adminhtml/Helper/Data.php b/app/code/core/Mage/Adminhtml/Helper/Data.php
index 31744a3994d..87dd2239d4e 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Data.php
+++ b/app/code/core/Mage/Adminhtml/Helper/Data.php
@@ -120,6 +120,6 @@ public function prepareFilterString($filterString)
      */
     public function decodeFilter(&$value)
     {
-        $value = rawurldecode($value);
+        $value = trim(rawurldecode($value));
     }
 }
diff --git a/app/code/core/Mage/Adminhtml/Model/Config/Data.php b/app/code/core/Mage/Adminhtml/Model/Config/Data.php
index 749ee5292d6..573edda6703 100644
--- a/app/code/core/Mage/Adminhtml/Model/Config/Data.php
+++ b/app/code/core/Mage/Adminhtml/Model/Config/Data.php
@@ -132,7 +132,7 @@ public function save()
                 /**
                  * Get field backend model
                  */
-                $backendClass = $fieldConfig->backend_model;
+                $backendClass = (isset($fieldConfig->backend_model))? $fieldConfig->backend_model : false;
                 if (!$backendClass) {
                     $backendClass = 'core/config_data';
                 }
@@ -335,7 +335,7 @@ public function getConfigDataValue($path, &$inherit = null, $configData = null)
         if (is_null($configData)) {
             $configData = $this->_configData;
         }
-        if (isset($configData[$path])) {
+        if (array_key_exists($path, $configData)) {
             $data = $configData[$path];
             $inherit = false;
         } else {
diff --git a/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php b/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php
index 7f20e0013ee..c814462950c 100644
--- a/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php
+++ b/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php
@@ -92,7 +92,9 @@ public function render(Varien_Data_Form_Element_Abstract $element)
                  . $element->serialize($htmlAttributes) .'>' . "\n";
             foreach ($regionCollection as $region) {
                 $selected = ($regionId==$region['value']) ? ' selected="selected"' : '';
-                $html.= '<option value="'.(int)$region['value'].'"'.$selected.'>'.$region['label'].'</option>';
+                $html.= '<option value="' . (int)$region['value'] . '"' . $selected . '>'
+                    . Mage::helper('adminhtml')->escapeHtml(Mage::helper('directory')->__($region['label']))
+                    . '</option>';
             }
             $html.= '</select>' . "\n";
 
@@ -109,7 +111,8 @@ public function render(Varien_Data_Form_Element_Abstract $element)
             $element->setRequired(false);
             $html.= '<td class="value">';
             $html .= '<input id="' . $regionHtmlId . '" name="' . $regionHtmlName
-                 . '" value="' . $element->getEscapedValue() . '" ' . $element->serialize($htmlAttributes) . "/>" . "\n";
+                . '" value="' . $element->getEscapedValue() . '" '
+                . $element->serialize($htmlAttributes) . "/>" . "\n";
             $html .= '<input type="hidden" name="' . $regionIdHtmlName . '" id="' . $regionIdHtmlId . '" value=""/>';
             $html .= '</td>'."\n";
         }
diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order.php
index 77230a55a8d..0e22e502833 100644
--- a/app/code/core/Mage/Adminhtml/Model/Sales/Order.php
+++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order.php
@@ -71,8 +71,8 @@ public function checkRelation(Mage_Sales_Model_Order $order)
         foreach ($order->getAllItems() as $item) {
             if (!$productCollection->getItemById($item->getProductId())) {
                 $this->_getSession()->addError(
-                   Mage::helper('adminhtml')->__('The item %s (SKU %s) does not exist in the catalog anymore.', $item->getName(), $item->getSku()
-                ));
+                   Mage::helper('adminhtml')->__('The item %s (SKU %s) does not exist in the catalog anymore.', $item->getName(), $item->getSku())
+                );
                 $hasBadItems = true;
             }
         }
diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
index 48ef1463ea8..b615e9e2019 100644
--- a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
+++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
@@ -309,6 +309,13 @@ public function initFromOrder(Mage_Sales_Model_Order $order)
             }
         }
 
+        $shippingAddress = $order->getShippingAddress();
+        if ($shippingAddress) {
+            $addressDiff = array_diff_assoc($shippingAddress->getData(), $order->getBillingAddress()->getData());
+            unset($addressDiff['address_type'], $addressDiff['entity_id']);
+            $shippingAddress->setSameAsBilling(empty($addressDiff));
+        }
+
         $this->_initBillingAddressFromOrder($order);
         $this->_initShippingAddressFromOrder($order);
 
@@ -384,12 +391,15 @@ protected function _initBillingAddressFromOrder(Mage_Sales_Model_Order $order)
 
     protected function _initShippingAddressFromOrder(Mage_Sales_Model_Order $order)
     {
-        $this->getQuote()->getShippingAddress()->setCustomerAddressId('');
+        $orderShippingAddress = $order->getShippingAddress();
+        $quoteShippingAddress = $this->getQuote()->getShippingAddress()
+            ->setCustomerAddressId('')
+            ->setSameAsBilling($orderShippingAddress && $orderShippingAddress->getSameAsBilling());
         Mage::helper('core')->copyFieldset(
             'sales_copy_order_shipping_address',
             'to_order',
-            $order->getShippingAddress(),
-            $this->getQuote()->getShippingAddress()
+            $orderShippingAddress,
+            $quoteShippingAddress
         );
     }
 
@@ -622,7 +632,7 @@ public function moveQuoteItem($item, $moveTo, $qty)
                     break;
             }
             if ($removeItem) {
-                $this->getQuote()->removeItem($item->getId());
+                $this->getQuote()->deleteItem($item);
             }
             $this->setRecollect(true);
         }
@@ -855,8 +865,9 @@ public function updateQuoteItems($data)
                             $item->getProduct()->setIsSuperMode(true);
                             $item->getProduct()->unsSkipCheckRequiredOption();
                             $item->checkData();
-                        } else {
-                            $this->moveQuoteItem($item->getId(), $info['action'], $itemQty);
+                        }
+                        if (!empty($info['action'])) {
+                            $this->moveQuoteItem($item, $info['action'], $itemQty);
                         }
                     }
                 }
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php
index 5b8e8b432c3..0a6646675c5 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php
@@ -30,16 +30,25 @@
  *
  * @category   Mage
  * @package    Mage_Adminhtml
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Mage_Adminhtml_Model_System_Config_Backend_Email_Sender extends Mage_Core_Model_Config_Data
 {
+    /**
+     * Check sender name validity
+     *
+     * @return Mage_Adminhtml_Model_System_Config_Backend_Email_Sender
+     */
     protected function _beforeSave()
     {
         $value = $this->getValue();
         if (!preg_match("/^[\S ]+$/", $value)) {
             Mage::throwException(Mage::helper('adminhtml')->__('Invalid sender name "%s". Please use only visible characters and spaces.', $value));
         }
+
+        if (strlen($value) > 255) {
+            Mage::throwException(Mage::helper('adminhtml')->__('Maximum sender name length is 255. Please correct your settings.'));
+        }
         return $this;
     }
 }
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdaycodes.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdaycodes.php
new file mode 100644
index 00000000000..2b9c4183103
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdaycodes.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Adminhtml
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Locale weekdays source
+ *
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes
+{
+    public function toOptionArray()
+    {
+        return Mage::app()->getLocale()->getOptionWeekdays(true, true);
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php
index 901c36b25e1..8ed84ed5925 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php
@@ -284,6 +284,15 @@ public function saveAction()
                 $category->setPath($parentCategory->getPath());
             }
 
+            /**
+             * Check "Use Default Value" checkboxes values
+             */
+            if ($useDefaults = $this->getRequest()->getPost('use_default')) {
+                foreach ($useDefaults as $attributeCode) {
+                    $category->setData($attributeCode, false);
+                }
+            }
+
             /**
              * Process "Use Config Settings" checkboxes
              */
@@ -335,15 +344,6 @@ public function saveAction()
                     }
                 }
 
-                /**
-                 * Check "Use Default Value" checkboxes values
-                 */
-                if ($useDefaults = $this->getRequest()->getPost('use_default')) {
-                    foreach ($useDefaults as $attributeCode) {
-                        $category->setData($attributeCode, false);
-                    }
-                }
-
                 /**
                  * Unset $_POST['use_config'] before save
                  */
@@ -383,7 +383,7 @@ public function moveAction()
          * Category id after which we have put our category
          */
         $prevNodeId     = $this->getRequest()->getPost('aid', false);
-
+        $category->setData('save_rewrites_history', Mage::helper('catalog')->shouldSaveUrlRewritesHistory());
         try {
             $category->move($parentNodeId, $prevNodeId);
             $this->getResponse()->setBody("SUCCESS");
@@ -392,7 +392,7 @@ public function moveAction()
             $this->getResponse()->setBody($e->getMessage());
         }
         catch (Exception $e){
-            $this->getResponse()->setBody(Mage::helper('catalog')->__('Category move error'.$e));
+            $this->getResponse()->setBody(Mage::helper('catalog')->__('Category move error %s', $e));
             Mage::logException($e);
         }
 
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php
index d1217a7a2f0..4007994553c 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php
@@ -166,9 +166,10 @@ public function saveAction()
                     'products' => $productIds
                 ));
 
-                $this->_getSession()->addNotice(
-                    $this->__('Please refresh "Catalog URL Rewrites" and "Product Attributes" in System -> <a href="%s">Index Management</a>', $this->getUrl('adminhtml/process/list'))
-                );
+                $notice = Mage::getConfig()->getNode('adminhtml/messages/website_chnaged_indexers/label');
+                if ($notice) {
+                    $this->_getSession()->addNotice($this->__((string)$notice, $this->getUrl('adminhtml/process/list')));
+                }
             }
 
             $this->_getSession()->addSuccess(
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
index 5c3fb57ed96..6b218f202d9 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
@@ -510,8 +510,17 @@ public function validateAction()
                 }
             }
             $productData = $this->_filterDates($productData, $dateFields);
-
             $product->addData($productData);
+
+            /* set restrictions for date ranges */
+            $resource = $product->getResource();
+            $resource->getAttribute('special_from_date')
+                ->setMaxValue($product->getSpecialToDate());
+            $resource->getAttribute('news_from_date')
+                ->setMaxValue($product->getNewsToDate());
+            $resource->getAttribute('custom_design_from')
+                ->setMaxValue($product->getCustomDesignTo());
+
             $product->validate();
             /**
              * @todo implement full validation process with errors returning which are ignoring now
@@ -668,8 +677,13 @@ protected function _initProductSave()
      * Filter product stock data
      *
      * @param array $stockData
+     * @return null
      */
-    protected function _filterStockData(&$stockData) {
+    protected function _filterStockData(&$stockData)
+    {
+        if (is_null($stockData)) {
+            return;
+        }
         if (!isset($stockData['use_config_manage_stock'])) {
             $stockData['use_config_manage_stock'] = 0;
         }
@@ -727,8 +741,6 @@ public function saveAction()
                     }
                 }
 
-                Mage::getModel('catalogrule/rule')->applyAllRulesToProduct($productId);
-
                 $this->_getSession()->addSuccess($this->__('The product has been saved.'));
             } catch (Mage_Core_Exception $e) {
                 $this->_getSession()->addError($e->getMessage())
diff --git a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
index 8aa4a632060..7bd4a868094 100644
--- a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
@@ -290,7 +290,9 @@ public function saveAction()
                 }
             }
 
-            if (Mage::getSingleton('admin/session')->isAllowed('customer/newsletter')) {
+            if (Mage::getSingleton('admin/session')->isAllowed('customer/newsletter')
+                && !$customer->getConfirmation()
+            ) {
                 $customer->setIsSubscribed(isset($data['subscription']));
             }
 
@@ -511,10 +513,10 @@ public function cartAction()
     public function viewCartAction()
     {
         $this->_initCustomer();
-        $layout = $this->loadLayout()
+        $this->loadLayout()
             ->getLayout()
             ->getBlock('admin.customer.view.cart')
-            ->setWebsiteId();
+            ->setWebsiteId($this->getRequest()->getParam('website_id'));
         $this->renderLayout();
     }
 
diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php
index f5346f5ba39..d74d7f7d911 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php
@@ -303,6 +303,7 @@ public function applyRulesAction()
             $this->_getSession()->addError($errorMessage . ' ' . $e->getMessage());
         } catch (Exception $e) {
             $this->_getSession()->addError($errorMessage);
+            Mage::logException($e);
         }
         $this->_redirect('*/*');
     }
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php
index 376afd7bf17..d8900051c58 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php
@@ -242,9 +242,6 @@ protected function _processActionData($action = null)
             $this->_getOrderCreateModel()->moveQuoteItem($moveItemId, $moveTo);
         }
 
-        /*if ($paymentData = $this->getRequest()->getPost('payment')) {
-            $this->_getOrderCreateModel()->setPaymentData($paymentData);
-        }*/
         if ($paymentData = $this->getRequest()->getPost('payment')) {
             $this->_getOrderCreateModel()->getQuote()->getPayment()->addData($paymentData);
         }
@@ -342,7 +339,6 @@ public function indexAction()
 
     public function reorderAction()
     {
-//        $this->_initSession();
         $this->_getSession()->clear();
         $orderId = $this->getRequest()->getParam('order_id');
         $order = Mage::getModel('sales/order')->load($orderId);
@@ -481,7 +477,13 @@ public function saveAction()
     {
         try {
             $this->_processActionData('save');
-            if ($paymentData = $this->getRequest()->getPost('payment')) {
+            $paymentData = $this->getRequest()->getPost('payment');
+            if ($paymentData) {
+                $paymentData['checks'] = Mage_Payment_Model_Method_Abstract::CHECK_USE_INTERNAL
+                    | Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_COUNTRY
+                    | Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_CURRENCY
+                    | Mage_Payment_Model_Method_Abstract::CHECK_ORDER_TOTAL_MIN_MAX
+                    | Mage_Payment_Model_Method_Abstract::CHECK_ZERO_TOTAL;
                 $this->_getOrderCreateModel()->setPaymentData($paymentData);
                 $this->_getOrderCreateModel()->getQuote()->getPayment()->addData($paymentData);
             }
@@ -493,7 +495,11 @@ public function saveAction()
 
             $this->_getSession()->clear();
             Mage::getSingleton('adminhtml/session')->addSuccess($this->__('The order has been created.'));
-            $this->_redirect('*/sales_order/view', array('order_id' => $order->getId()));
+            if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/view')) {
+                $this->_redirect('*/sales_order/view', array('order_id' => $order->getId()));
+            } else {
+                $this->_redirect('*/sales_order/index');
+            }
         } catch (Mage_Payment_Model_Info_Exception $e) {
             $this->_getOrderCreateModel()->saveQuote();
             $message = $e->getMessage();
@@ -524,6 +530,7 @@ protected function _isAllowed()
         $action = strtolower($this->getRequest()->getActionName());
         switch ($action) {
             case 'index':
+            case 'save':
                 $aclResource = 'sales/order/actions/create';
                 break;
             case 'reorder':
@@ -532,9 +539,6 @@ protected function _isAllowed()
             case 'cancel':
                 $aclResource = 'sales/order/actions/cancel';
                 break;
-            case 'save':
-                $aclResource = 'sales/order/actions/edit';
-                break;
             default:
                 $aclResource = 'sales/order/actions';
                 break;
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php
index c6188db0dfd..16921ee017f 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php
@@ -671,14 +671,15 @@ public function massPrintShippingLabelAction()
             $outputPdf = $this->_combineLabelsPdf($labelsContent);
             $this->_prepareDownloadResponse('ShippingLabels.pdf', $outputPdf->render(), 'application/pdf');
             return;
-        } else {
-            $createdFromPartErrorMsg = $createdFromOrders ? 'orders' : 'shipments';
-            $this->_getSession()
-                ->addError(Mage::helper('sales')->__('There are no shipping labels related to selected %s.', $createdFromPartErrorMsg));
         }
+
         if ($createdFromOrders) {
+            $this->_getSession()
+                ->addError(Mage::helper('sales')->__('There are no shipping labels related to selected orders.'));
             $this->_redirect('*/sales_order/index');
         } else {
+            $this->_getSession()
+                ->addError(Mage::helper('sales')->__('There are no shipping labels related to selected shipments.'));
             $this->_redirect('*/sales_order_shipment/index');
         }
     }
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php
index 3a59b81a2a0..f3d17f4b354 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php
@@ -383,17 +383,18 @@ public function massHoldAction()
     {
         $orderIds = $this->getRequest()->getPost('order_ids', array());
         $countHoldOrder = 0;
-        $countNonHoldOrder = 0;
+
         foreach ($orderIds as $orderId) {
             $order = Mage::getModel('sales/order')->load($orderId);
             if ($order->canHold()) {
                 $order->hold()
                     ->save();
                 $countHoldOrder++;
-            } else {
-                $countNonHoldOrder++;
             }
         }
+
+        $countNonHoldOrder = count($orderIds) - $countHoldOrder;
+
         if ($countNonHoldOrder) {
             if ($countHoldOrder) {
                 $this->_getSession()->addError($this->__('%s order(s) were not put on hold.', $countNonHoldOrder));
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php b/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php
index 1310399fc49..06f7b422980 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php
@@ -33,6 +33,9 @@
  */
 class Mage_Adminhtml_System_Email_TemplateController extends Mage_Adminhtml_Controller_Action
 {
+    /**
+     * Index action
+     */
     public function indexAction()
     {
         $this->_title($this->__('System'))->_title($this->__('Transactional Emails'));
@@ -44,21 +47,27 @@ public function indexAction()
 
         $this->loadLayout();
         $this->_setActiveMenu('system/email_template');
-        $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Transactional Emails'), Mage::helper('adminhtml')->__('Transactional Emails'));
+        $this->_addBreadcrumb(
+            Mage::helper('adminhtml')->__('Transactional Emails'),
+            Mage::helper('adminhtml')->__('Transactional Emails')
+        );
 
         $this->_addContent($this->getLayout()->createBlock('adminhtml/system_email_template', 'template'));
         $this->renderLayout();
     }
 
+    /**
+     * Grid action
+     */
     public function gridAction()
     {
-        $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/system_email_template_grid')->toHtml());
+        $this->getResponse()->setBody(
+            $this->getLayout()->createBlock('adminhtml/system_email_template_grid')->toHtml()
+        );
     }
 
-
     /**
      * New transactional email action
-     *
      */
     public function newAction()
     {
@@ -66,29 +75,43 @@ public function newAction()
     }
 
     /**
-     * Edit transactioanl email action
-     *
+     * Edit transactional email action
      */
     public function editAction()
     {
         $this->loadLayout();
         $template = $this->_initTemplate('id');
         $this->_setActiveMenu('system/email_template');
-        $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Transactional Emails'), Mage::helper('adminhtml')->__('Transactional Emails'), $this->getUrl('*/*'));
+        $this->_addBreadcrumb(
+            Mage::helper('adminhtml')->__('Transactional Emails'),
+            Mage::helper('adminhtml')->__('Transactional Emails'),
+            $this->getUrl('*/*')
+        );
 
         if ($this->getRequest()->getParam('id')) {
-            $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Edit Template'), Mage::helper('adminhtml')->__('Edit System Template'));
+            $this->_addBreadcrumb(
+                Mage::helper('adminhtml')->__('Edit Template'),
+                Mage::helper('adminhtml')->__('Edit System Template')
+            );
         } else {
-            $this->_addBreadcrumb(Mage::helper('adminhtml')->__('New Template'), Mage::helper('adminhtml')->__('New System Template'));
+            $this->_addBreadcrumb(
+                Mage::helper('adminhtml')->__('New Template'),
+                Mage::helper('adminhtml')->__('New System Template')
+            );
         }
 
         $this->_title($template->getId() ? $template->getTemplateCode() : $this->__('New Template'));
-
-        $this->_addContent($this->getLayout()->createBlock('adminhtml/system_email_template_edit', 'template_edit')
-                                                            ->setEditMode((bool)$this->getRequest()->getParam('id')));
+        $this->_addContent(
+            $this->getLayout()->createBlock('adminhtml/system_email_template_edit', 'template_edit')->setEditMode(
+                (bool)$this->getRequest()->getParam('id')
+            )
+        );
         $this->renderLayout();
     }
 
+    /**
+     * Save action
+     */
     public function saveAction()
     {
         $request = $this->getRequest();
@@ -96,7 +119,9 @@ public function saveAction()
 
         $template = $this->_initTemplate('id');
         if (!$template->getId() && $id) {
-            Mage::getSingleton('adminhtml/session')->addError(Mage::helper('adminhtml')->__('This Email template no longer exists.'));
+            Mage::getSingleton('adminhtml/session')->addError(
+                Mage::helper('adminhtml')->__('This Email template no longer exists.')
+            );
             $this->_redirect('*/*/');
             return;
         }
@@ -104,10 +129,6 @@ public function saveAction()
         try {
             $template->setTemplateSubject($request->getParam('template_subject'))
                 ->setTemplateCode($request->getParam('template_code'))
-/*
-                ->setTemplateSenderEmail($request->getParam('sender_email'))
-                ->setTemplateSenderName($request->getParam('sender_name'))
-*/
                 ->setTemplateText($request->getParam('template_text'))
                 ->setTemplateStyles($request->getParam('template_styles'))
                 ->setModifiedAt(Mage::getSingleton('core/date')->gmtDate())
@@ -115,38 +136,44 @@ public function saveAction()
                 ->setOrigTemplateVariables($request->getParam('orig_template_variables'));
 
             if (!$template->getId()) {
-                //$type = constant(Mage::getConfig()->getModelClassName('core/email_template') . "::TYPE_HTML");
+                $template->setAddedAt(Mage::getSingleton('core/date')->gmtDate());
                 $template->setTemplateType(Mage_Core_Model_Email_Template::TYPE_HTML);
             }
 
-            if($request->getParam('_change_type_flag')) {
-                //$type = constant(Mage::getConfig()->getModelClassName('core/email_template') . "::TYPE_TEXT");
+            if ($request->getParam('_change_type_flag')) {
                 $template->setTemplateType(Mage_Core_Model_Email_Template::TYPE_TEXT);
                 $template->setTemplateStyles('');
             }
 
             $template->save();
             Mage::getSingleton('adminhtml/session')->setFormData(false);
-            Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('adminhtml')->__('The email template has been saved.'));
+            Mage::getSingleton('adminhtml/session')->addSuccess(
+                Mage::helper('adminhtml')->__('The email template has been saved.')
+            );
             $this->_redirect('*/*');
         }
         catch (Exception $e) {
-            Mage::getSingleton('adminhtml/session')->setData('email_template_form_data', $this->getRequest()->getParams());
+            Mage::getSingleton('adminhtml/session')->setData(
+                'email_template_form_data',
+                $this->getRequest()->getParams()
+            );
             Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
             $this->_forward('new');
         }
-
     }
 
-    public function deleteAction() {
-
+    /**
+     * Delete action
+     */
+    public function deleteAction()
+    {
         $template = $this->_initTemplate('id');
-        if($template->getId()) {
+        if ($template->getId()) {
             try {
                 $template->delete();
-                 // display success message
-                Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('adminhtml')->__('The email template has been deleted.'));
-                // go to grid
+                Mage::getSingleton('adminhtml/session')->addSuccess(
+                    Mage::helper('adminhtml')->__('The email template has been deleted.')
+                );
                 $this->_redirect('*/*/');
                 return;
             }
@@ -154,21 +181,23 @@ public function deleteAction() {
                 $this->_getSession()->addError($e->getMessage());
             }
             catch (Exception $e) {
-                $this->_getSession()->addError(Mage::helper('adminhtml')->__('An error occurred while deleting email template data. Please review log and try again.'));
+                $this->_getSession()->addError(
+                    Mage::helper('adminhtml')->__('An error occurred while deleting email template data. Please review log and try again.')
+                );
                 Mage::logException($e);
-                // save data in session
-                Mage::getSingleton('adminhtml/session')->setFormData($data);
-                // redirect to edit form
-                $this->_redirect('*/*/edit', array('id' => $id));
+                $this->_redirect('*/*/edit', array('id' => $template));
                 return;
             }
         }
-        // display error message
-        Mage::getSingleton('adminhtml/session')->addError(Mage::helper('adminhtml')->__('Unable to find a Email Template to delete.'));
-        // go to grid
+        Mage::getSingleton('adminhtml/session')->addError(
+            Mage::helper('adminhtml')->__('Unable to find a Email Template to delete.')
+        );
         $this->_redirect('*/*/');
     }
 
+    /**
+     * Preview action
+     */
     public function previewAction()
     {
         $this->loadLayout('systemPreview');
@@ -177,7 +206,6 @@ public function previewAction()
 
     /**
      * Set template data to retrieve it in template info form
-     *
      */
     public function defaultTemplateAction()
     {
@@ -198,7 +226,7 @@ public function defaultTemplateAction()
      * Load email template from request
      *
      * @param string $idFieldName
-     * @return Mage_Adminhtml_Model_Email_Template $model
+     * @return Mage_Adminhtml_Model_Email_Template
      */
     protected function _initTemplate($idFieldName = 'template_id')
     {
@@ -218,6 +246,11 @@ protected function _initTemplate($idFieldName = 'template_id')
         return $model;
     }
 
+    /**
+     * Check permissions
+     *
+     * @return bool
+     */
     protected function _isAllowed()
     {
         return Mage::getSingleton('admin/session')->isAllowed('system/email_template');
diff --git a/app/code/core/Mage/Adminhtml/controllers/TagController.php b/app/code/core/Mage/Adminhtml/controllers/TagController.php
index 1241a969738..a92365ce11d 100644
--- a/app/code/core/Mage/Adminhtml/controllers/TagController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/TagController.php
@@ -172,8 +172,7 @@ public function saveAction()
                 $productIds = Mage::helper('adminhtml/js')->decodeGridSerializedInput(
                     $postData['tag_assigned_products']
                 );
-                $tagRelationModel = Mage::getModel('tag/tag_relation');
-                $tagRelationModel->addRelations($model, $productIds);
+                $model->setData('tag_assigned_products', $productIds);
             }
 
             try {
diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
index 074f57092b2..68c040db378 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
@@ -61,8 +61,7 @@ public function indexAction()
      */
     public function addAction()
     {
-        $rateModel = Mage::getSingleton('tax/calculation_rate')
-            ->load(null);
+        $rateModel = Mage::getSingleton('tax/calculation_rate')->load(null);
 
         $this->_title($this->__('Sales'))
              ->_title($this->__('Tax'))
@@ -70,9 +69,12 @@ public function addAction()
 
         $this->_title($this->__('New Rate'));
 
-        //This line substitutes in the form the previously entered by the user values, if any of them were wrong.
         $rateModel->setData(Mage::getSingleton('adminhtml/session')->getFormData(true));
 
+        if ($rateModel->getZipIsRange() && !$rateModel->hasTaxPostcode()) {
+            $rateModel->setTaxPostcode($rateModel->getZipFrom() . '-' . $rateModel->getZipTo());
+        }
+
         $this->_initAction()
             ->_addBreadcrumb(Mage::helper('tax')->__('Manage Tax Rates'), Mage::helper('tax')->__('Manage Tax Rates'), $this->getUrl('*/tax_rate'))
             ->_addBreadcrumb(Mage::helper('tax')->__('New Tax Rate'), Mage::helper('tax')->__('New Tax Rate'))
@@ -133,10 +135,19 @@ public function editAction()
              ->_title($this->__('Manage Tax Zones and Rates'));
 
         $rateId = (int)$this->getRequest()->getParam('rate');
-        $rateModel = Mage::getSingleton('tax/calculation_rate')->load($rateId);
+        $rateModel = Mage::getSingleton('tax/calculation_rate')->load(null);
+        $rateModel->setData(Mage::getSingleton('adminhtml/session')->getFormData(true));
+        if ($rateModel->getId() != $rateId) {
+            $rateModel->load($rateId);
+        }
+
         if (!$rateModel->getId()) {
             $this->getResponse()->setRedirect($this->getUrl("*/*/"));
-            return ;
+            return;
+        }
+
+        if ($rateModel->getZipIsRange() && !$rateModel->hasTaxPostcode()) {
+            $rateModel->setTaxPostcode($rateModel->getZipFrom() . '-' . $rateModel->getZipTo());
         }
 
         $this->_title(sprintf("%s", $rateModel->getCode()));
diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php
index 2a3c7e3bc78..62b2af573ae 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php
@@ -33,6 +33,11 @@
  */
 class Mage_Adminhtml_Tax_RuleController extends Mage_Adminhtml_Controller_Action
 {
+    /**
+     * Index action
+     *
+     * @return Mage_Adminhtml_Tax_RuleController
+     */
     public function indexAction()
     {
         $this->_title($this->__('Sales'))
@@ -45,11 +50,17 @@ public function indexAction()
         return $this;
     }
 
+    /**
+     * Redirect to edit action
+     */
     public function newAction()
     {
         $this->_forward('edit');
     }
 
+    /**
+     * Edit action
+     */
     public function editAction()
     {
         $this->_title($this->__('Sales'))
@@ -62,7 +73,8 @@ public function editAction()
             $ruleModel->load($taxRuleId);
             if (!$ruleModel->getId()) {
                 Mage::getSingleton('adminhtml/session')->unsRuleData();
-                Mage::getSingleton('adminhtml/session')->addError(Mage::helper('tax')->__('This rule no longer exists.'));
+                Mage::getSingleton('adminhtml/session')
+                    ->addError(Mage::helper('tax')->__('This rule no longer exists.'));
                 $this->_redirect('*/*/');
                 return;
             }
@@ -78,45 +90,57 @@ public function editAction()
         Mage::register('tax_rule', $ruleModel);
 
         $this->_initAction()
-            ->_addBreadcrumb($taxRuleId ? Mage::helper('tax')->__('Edit Rule') :  Mage::helper('tax')->__('New Rule'), $taxRuleId ?  Mage::helper('tax')->__('Edit Rule') :  Mage::helper('tax')->__('New Rule'))
-            ->_addContent($this->getLayout()->createBlock('adminhtml/tax_rule_edit')->setData('action', $this->getUrl('*/tax_rule/save')))
+            ->_addBreadcrumb(
+                $taxRuleId ? Mage::helper('tax')->__('Edit Rule') :  Mage::helper('tax')->__('New Rule'),
+                $taxRuleId ?  Mage::helper('tax')->__('Edit Rule') :  Mage::helper('tax')->__('New Rule'))
+            ->_addContent($this->getLayout()->createBlock('adminhtml/tax_rule_edit')
+                ->setData('action', $this->getUrl('*/tax_rule/save')))
             ->renderLayout();
     }
 
+    /**
+     * Save action
+     *
+     * @return Mage_Core_Controller_Response_Http|Mage_Core_Controller_Varien_Action
+     */
     public function saveAction()
     {
-        if ($postData = $this->getRequest()->getPost()) {
-
-            $ruleModel = Mage::getSingleton('tax/calculation_rule');
-            $ruleModel->setData($postData);
+        $postData = $this->getRequest()->getPost();
+        if (!$postData) {
+            return $this->getResponse()->setRedirect($this->getUrl('*/tax_rule'));
+        }
 
-            try {
-                $ruleModel->save();
+        $ruleModel = $this->_getSingletonModel('tax/calculation_rule');
+        $ruleModel->setData($postData);
+        $ruleModel->setCalculateSubtotal($this->getRequest()->getParam('calculate_subtotal', 0));
 
-                Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('tax')->__('The tax rule has been saved.'));
+        try {
+            $ruleModel->save();
 
-                if ($this->getRequest()->getParam('back')) {
-                    $this->_redirect('*/*/edit', array('rule' => $ruleModel->getId()));
-                    return;
-                }
+            $this->_getSingletonModel('adminhtml/session')
+                ->addSuccess($this->_getHelperModel('tax')->__('The tax rule has been saved.'));
 
-                $this->_redirect('*/*/');
-                return;
-            }
-            catch (Mage_Core_Exception $e) {
-                Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
-            }
-            catch (Exception $e) {
-                Mage::getSingleton('adminhtml/session')->addError(Mage::helper('tax')->__('An error occurred while saving this tax rule.'));
+            if ($this->getRequest()->getParam('back')) {
+                return $this->_redirect('*/*/edit', array('rule' => $ruleModel->getId()));
             }
 
-            Mage::getSingleton('adminhtml/session')->setRuleData($postData);
-            $this->_redirectReferer();
-            return;
+            return $this->_redirect('*/*/');
         }
-        $this->getResponse()->setRedirect($this->getUrl('*/tax_rule'));
+        catch (Mage_Core_Exception $e) {
+            $this->_getSingletonModel('adminhtml/session')->addError($e->getMessage());
+        }
+        catch (Exception $e) {
+            $this->_getSingletonModel('adminhtml/session')
+                ->addError($this->_getHelperModel('tax')->__('An error occurred while saving this tax rule.'));
+        }
+
+        $this->_getSingletonModel('adminhtml/session')->setRuleData($postData);
+        $this->_redirectReferer();
     }
 
+    /**
+     * Delete action
+     */
     public function deleteAction()
     {
         $ruleId = (int)$this->getRequest()->getParam('rule');
@@ -131,7 +155,8 @@ public function deleteAction()
         try {
             $ruleModel->delete();
 
-            Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('tax')->__('The tax rule has been deleted.'));
+            Mage::getSingleton('adminhtml/session')
+                ->addSuccess(Mage::helper('tax')->__('The tax rule has been deleted.'));
             $this->_redirect('*/*/');
 
             return;
@@ -140,7 +165,8 @@ public function deleteAction()
             Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
         }
         catch (Exception $e) {
-            Mage::getSingleton('adminhtml/session')->addError(Mage::helper('tax')->__('An error occurred while deleting this tax rule.'));
+            Mage::getSingleton('adminhtml/session')
+                ->addError(Mage::helper('tax')->__('An error occurred while deleting this tax rule.'));
         }
 
         $this->_redirectReferer();
@@ -161,8 +187,36 @@ protected function _initAction()
         return $this;
     }
 
+    /**
+     * Check if sales rules is allowed
+     *
+     * @return bool
+     */
     protected function _isAllowed()
     {
         return Mage::getSingleton('admin/session')->isAllowed('sales/tax/rules');
     }
+
+    /**
+     * Return model instance
+     *
+     * @param string $className
+     * @param array $arguments
+     * @return Mage_Core_Model_Abstract
+     */
+    protected function _getSingletonModel($className, $arguments = array())
+    {
+        return Mage::getSingleton($className, $arguments);
+    }
+
+    /**
+     * Return helper instance
+     *
+     * @param string $className
+     * @return Mage_Core_Model_Abstract
+     */
+    protected function _getHelperModel($className)
+    {
+        return Mage::helper($className);
+    }
 }
diff --git a/app/code/core/Mage/Adminhtml/controllers/TaxController.php b/app/code/core/Mage/Adminhtml/controllers/TaxController.php
new file mode 100644
index 00000000000..0bf3efbf8b7
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/controllers/TaxController.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Adminhtml
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Product tax admin controller
+ *
+ * @category   Mage
+ * @package    Mage_Adminhtml
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Adminhtml_TaxController extends Mage_Adminhtml_Controller_Action
+{
+    /**
+     * Set tax ignore notification flag and redirect back
+     */
+    public function ignoreTaxNotificationAction()
+    {
+        $section = $this->getRequest()->getParam('section');
+        if ($section) {
+            try {
+                $path = 'tax/ignore_notification/' . $section;
+                Mage::getModel('core/config')->saveConfig($path, 1);
+                Mage::getConfig()->reinit();
+            } catch (Exception $e) {
+                Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
+            }
+        }
+        $this->_redirectReferer();
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php b/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php
index 7e711d38c1f..5bb269a6f16 100644
--- a/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php
@@ -43,7 +43,7 @@ protected function _initRegistry()
         $this->_title($this->__('Rewrite Rules'));
 
         // initialize urlrewrite, product and category models
-        Mage::register('current_urlrewrite', Mage::getModel('core/url_rewrite')
+        Mage::register('current_urlrewrite', Mage::getSingleton('core/factory')->getUrlRewriteInstance()
             ->load($this->getRequest()->getParam('id', 0))
         );
         $productId  = $this->getRequest()->getParam('product', 0);
diff --git a/app/code/core/Mage/Adminhtml/etc/config.xml b/app/code/core/Mage/Adminhtml/etc/config.xml
index 8b8af78a8ae..7c8ec8ef795 100644
--- a/app/code/core/Mage/Adminhtml/etc/config.xml
+++ b/app/code/core/Mage/Adminhtml/etc/config.xml
@@ -171,6 +171,11 @@
                 </create>
             </order>
         </sales>
+        <messages>
+            <website_chnaged_indexers translate="label" module="catalog">
+                <label><![CDATA[Please refresh "Catalog URL Rewrites" and "Product Attributes" in System -&gt; <a href="%s">Index Management</a>]]></label>
+            </website_chnaged_indexers>
+        </messages>
     </adminhtml>
     <default>
         <system>
diff --git a/app/code/core/Mage/Api/Helper/Data.php b/app/code/core/Mage/Api/Helper/Data.php
index 3d634865f99..b5e00282a0d 100644
--- a/app/code/core/Mage/Api/Helper/Data.php
+++ b/app/code/core/Mage/Api/Helper/Data.php
@@ -54,7 +54,7 @@ public function isComplianceWSI()
     }
 
     /**
-     * Go thru a WSI args array and turns it to correct state.
+     * Go through a WSI args array and turns it to correct state.
      *
      * @param Object $obj - Link to Object
      * @return Object
@@ -65,7 +65,7 @@ public function wsiArrayUnpacker(&$obj)
 
             $modifiedKeys = $this->clearWsiFootprints($obj);
 
-            foreach ($obj as $key => $value) {
+            foreach ($obj as $value) {
                 if (is_object($value)) {
                     $this->wsiArrayUnpacker($value);
                 }
@@ -79,13 +79,15 @@ public function wsiArrayUnpacker(&$obj)
             }
 
             foreach ($modifiedKeys as $arrKey) {
-                $this->associativeArrayUnpack($obj->$arrKey);
+                if ($arrKey !== 'complex_filter') {
+                    $this->associativeArrayUnpack($obj->$arrKey);
+                }
             }
         }
     }
 
     /**
-     * Go thru an object parameters and unpak associative object to array.
+     * Go through an object parameters and unpack associative object to array.
      *
      * @param Object $obj - Link to Object
      * @return Object
@@ -103,7 +105,7 @@ public function v2AssociativeArrayUnpacker(&$obj)
         } elseif (is_array($obj)) {
             $arr = array();
             $needReplacement = true;
-            foreach ($obj as $key => &$value) {
+            foreach ($obj as &$value) {
                 $isAssoc = $this->v2AssociativeArrayUnpacker($value);
                 if ($isAssoc) {
                     foreach ($value as $aKey => $aVal) {
@@ -127,7 +129,7 @@ public function v2AssociativeArrayUnpacker(&$obj)
     }
 
     /**
-     * Go thru mixed and turns it to a correct look.
+     * Go through mixed and turns it to a correct look.
      *
      * @param Mixed $mixed A link to variable that may contain associative array.
      */
@@ -197,7 +199,6 @@ public function wsiArrayPacker($mixed)
         if (is_array($mixed)) {
             $arrKeys = array_keys($mixed);
             $isDigit = false;
-            $isString = false;
             foreach ($arrKeys as $key) {
                 if (is_int($key)) {
                     $isDigit = true;
@@ -205,9 +206,9 @@ public function wsiArrayPacker($mixed)
                 }
             }
             if ($isDigit) {
-                $mixed = $this->packArrayToObjec($mixed);
+                $mixed = $this->packArrayToObject($mixed);
             } else {
-                $mixed = (object) $mixed;
+                $mixed = (object)$mixed;
             }
         }
         if (is_object($mixed) && isset($mixed->complexObjectArray)) {
@@ -224,7 +225,7 @@ public function wsiArrayPacker($mixed)
      * @param Array $arr - Link to Object
      * @return Object
      */
-    public function packArrayToObjec(Array $arr)
+    public function packArrayToObject(Array $arr)
     {
         $obj = new stdClass();
         $obj->complexObjectArray = $arr;
@@ -275,30 +276,9 @@ public function parseFilters($filters, $fieldsMap = null)
             }
             // parse complex filter
             if (isset($filters->complex_filter) && is_array($filters->complex_filter)) {
-                if ($this->isComplianceWSI()) {
-                    // WS-I compliance mode
-                    foreach ($filters->complex_filter as $fieldName => $condition) {
-                        if (is_object($condition) && isset($condition->key) && isset($condition->value)) {
-                            $conditionName = $condition->key;
-                            $conditionValue = $condition->value;
-                            $this->formatFilterConditionValue($conditionName, $conditionValue);
-                            $parsedFilters[$fieldName] = array($conditionName => $conditionValue);
-                        }
-                    }
-                } else {
-                    // non WS-I compliance mode
-                    foreach ($filters->complex_filter as $value) {
-                        if (is_object($value) && isset($value->key) && isset($value->value)) {
-                            $fieldName = $value->key;
-                            $condition = $value->value;
-                            if (is_object($condition) && isset($condition->key) && isset($condition->value)) {
-                                $this->formatFilterConditionValue($condition->key, $condition->value);
-                                $parsedFilters[$fieldName] = array($condition->key => $condition->value);
-                            }
-                        }
-                    }
-                }
+                $parsedFilters += $this->_parseComplexFilter($filters->complex_filter);
             }
+
             $filters = $parsedFilters;
         }
         // make sure that method result is always array
@@ -318,6 +298,37 @@ public function parseFilters($filters, $fieldsMap = null)
         return $filters;
     }
 
+    /**
+     * Parses complex filter, which may contain several nodes, e.g. when user want to fetch orders which were updated
+     * between two dates.
+     *
+     * @param array $complexFilter
+     * @return array
+     */
+    protected function _parseComplexFilter($complexFilter)
+    {
+        $parsedFilters = array();
+
+        foreach ($complexFilter as $filter) {
+            if (!isset($filter->key) || !isset($filter->value)) {
+                continue;
+            }
+
+            list($fieldName, $condition) = array($filter->key, $filter->value);
+            $conditionName = $condition->key;
+            $conditionValue = $condition->value;
+            $this->formatFilterConditionValue($conditionName, $conditionValue);
+
+            if (array_key_exists($fieldName, $parsedFilters)) {
+                $parsedFilters[$fieldName] += array($conditionName => $conditionValue);
+            } else {
+                $parsedFilters[$fieldName] = array($conditionName => $conditionValue);
+            }
+        }
+
+        return $parsedFilters;
+    }
+
     /**
      * Convert condition value from the string into the array
      * for the condition operators that require value to be an array.
diff --git a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php
index 2661d131fb4..9a788949487 100644
--- a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php
+++ b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php
@@ -287,7 +287,7 @@ public function call($sessionId, $apiPath, $args = array())
                 throw new Mage_Api_Exception('resource_path_not_callable');
             }
 
-            if (is_callable(array(&$model, $method))) {
+            if (method_exists($model, $method)) {
                 if (isset($methodInfo->arguments) && ((string)$methodInfo->arguments) == 'array') {
                     return $model->$method((is_array($args) ? $args : array($args)));
                 } elseif (!is_array($args)) {
@@ -400,7 +400,7 @@ public function multiCall($sessionId, array $calls = array(), $options = array()
                     throw new Mage_Api_Exception('resource_path_not_callable');
                 }
 
-                if (is_callable(array(&$model, $method))) {
+                if (method_exists($model, $method)) {
                     if (isset($methodInfo->arguments) && ((string)$methodInfo->arguments) == 'array') {
                         $result[] = $model->$method((is_array($args) ? $args : array($args)));
                     } elseif (!is_array($args)) {
diff --git a/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php
index b14c14db5fe..908c66e1667 100644
--- a/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php
+++ b/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php
@@ -61,16 +61,20 @@ public function run()
             try {
                 $this->_instantiateServer();
 
+                $content = str_replace(
+                    '><',
+                    ">\n<",
+                    preg_replace(
+                        '/<\?xml version="([^\"]+)"([^\>]+)>/i',
+                        '<?xml version="$1" encoding="' . $apiConfigCharset . '"?>',
+                        $this->_soap->handle()
+                    )
+                );
                 $this->getController()->getResponse()
                     ->clearHeaders()
-                    ->setHeader('Content-Type','text/xml; charset='.$apiConfigCharset)
-                    ->setBody(
-                            preg_replace(
-                                '/<\?xml version="([^\"]+)"([^\>]+)>/i',
-                                '<?xml version="$1" encoding="'.$apiConfigCharset.'"?>',
-                                $this->_soap->handle()
-                            )
-                    );
+                    ->setHeader('Content-Type', 'text/xml; charset=' . $apiConfigCharset)
+                    ->setHeader('Content-Length', strlen($content), true)
+                    ->setBody($content);
             } catch( Zend_Soap_Server_Exception $e ) {
                 $this->fault( $e->getCode(), $e->getMessage() );
             } catch( Exception $e ) {
diff --git a/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php
index 327c4ad3150..09877f51cfb 100644
--- a/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php
+++ b/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php
@@ -73,28 +73,33 @@ public function run()
             try {
                 $this->_instantiateServer();
 
-                $this->getController()->getResponse()
-                    ->clearHeaders()
-                    ->setHeader('Content-Type','text/xml; charset='.$apiConfigCharset)
-                    ->setBody(
+                $content = str_replace(
+                    '><',
+                    ">\n<",
+                    str_replace(
+                        '<soap:operation soapAction=""></soap:operation>',
+                        "<soap:operation soapAction=\"\" />\n",
                         str_replace(
-                            '<soap:operation soapAction=""></soap:operation>',
-                            "<soap:operation soapAction=\"\" />\n",
-                            str_replace(
-                                '<soap:body use="literal"></soap:body>',
-                                "<soap:body use=\"literal\" />\n",
-                                preg_replace(
-                                    '/<\?xml version="([^\"]+)"([^\>]+)>/i',
-                                    '<?xml version="$1" encoding="'.$apiConfigCharset.'"?>',
-                                    $this->_soap->handle()
-                                )
+                            '<soap:body use="literal"></soap:body>',
+                            "<soap:body use=\"literal\" />\n",
+                            preg_replace(
+                                '/<\?xml version="([^\"]+)"([^\>]+)>/i',
+                                '<?xml version="$1" encoding="' . $apiConfigCharset . '"?>',
+                                $this->_soap->handle()
                             )
                         )
-                    );
-            } catch( Zend_Soap_Server_Exception $e ) {
-                $this->fault( $e->getCode(), $e->getMessage() );
-            } catch( Exception $e ) {
-                $this->fault( $e->getCode(), $e->getMessage() );
+                    )
+                );
+
+                $this->getController()->getResponse()
+                    ->clearHeaders()
+                    ->setHeader('Content-Type', 'text/xml; charset=' . $apiConfigCharset)
+                    ->setHeader('Content-Length', strlen($content), true)
+                    ->setBody($content);
+            } catch (Zend_Soap_Server_Exception $e) {
+                $this->fault($e->getCode(), $e->getMessage());
+            } catch (Exception $e) {
+                $this->fault($e->getCode(), $e->getMessage());
             }
         }
 
diff --git a/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php b/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php
index b1b6711b943..9127d6afb49 100644
--- a/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php
+++ b/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php
@@ -176,4 +176,16 @@ public function prepareArgs($params, $args) {
         return $callArgs;
     }
 
+    /**
+     * End web service session
+     *
+     * @param object $request
+     * @return stdClass
+     */
+    public function endSession($request)
+    {
+        $stdObject = new stdClass();
+        $stdObject->result = parent::endSession($request->sessionId);
+        return $stdObject;
+    }
 }
diff --git a/app/code/core/Mage/Api/Model/User.php b/app/code/core/Mage/Api/Model/User.php
index acd296e40ff..a27e3ccfa6c 100644
--- a/app/code/core/Mage/Api/Model/User.php
+++ b/app/code/core/Mage/Api/Model/User.php
@@ -25,7 +25,7 @@
  */
 
 /**
- * Enter description here ...
+ * Api model
  *
  * @method Mage_Api_Model_Resource_User _getResource()
  * @method Mage_Api_Model_Resource_User getResource()
@@ -63,11 +63,19 @@ class Mage_Api_Model_User extends Mage_Core_Model_Abstract
      */
     protected $_eventPrefix = 'api_user';
 
+    /**
+     * Constructor
+     */
     protected function _construct()
     {
         $this->_init('api/user');
     }
 
+    /**
+     * Save user
+     *
+     * @return Mage_Api_Model_User|Mage_Core_Model_Abstract
+     */
     public function save()
     {
         $this->_beforeSave();
@@ -78,11 +86,11 @@ public function save()
                 'modified'  => Mage::getSingleton('core/date')->gmtDate()
             );
 
-        if($this->getId() > 0) {
+        if ($this->getId() > 0) {
             $data['user_id']   = $this->getId();
         }
 
-        if( $this->getUsername() ) {
+        if ( $this->getUsername() ) {
             $data['username']   = $this->getUsername();
         }
 
@@ -104,6 +112,11 @@ public function save()
         return $this;
     }
 
+    /**
+     * Delete user
+     *
+     * @return Mage_Api_Model_User|Mage_Core_Model_Abstract
+     */
     public function delete()
     {
         $this->_beforeDelete();
@@ -112,50 +125,96 @@ public function delete()
         return $this;
     }
 
+    /**
+     * Save relations for users
+     *
+     * @return Mage_Api_Model_User
+     */
     public function saveRelations()
     {
         $this->_getResource()->_saveRelations($this);
         return $this;
     }
 
+    /**
+     * Get user roles
+     *
+     * @return array
+     */
     public function getRoles()
     {
         return $this->_getResource()->_getRoles($this);
     }
 
+    /**
+     * Delete user from role
+     *
+     * @return Mage_Api_Model_User
+     */
     public function deleteFromRole()
     {
         $this->_getResource()->deleteFromRole($this);
         return $this;
     }
 
+    /**
+     * Check is user role exists
+     *
+     * @return bool
+     */
     public function roleUserExists()
     {
         $result = $this->_getResource()->roleUserExists($this);
         return ( is_array($result) && count($result) > 0 ) ? true : false;
     }
 
+    /**
+     * Add user
+     *
+     * @return Mage_Api_Model_User
+     */
     public function add()
     {
         $this->_getResource()->add($this);
         return $this;
     }
 
+    /**
+     * Check if user exists
+     *
+     * @return bool
+     */
     public function userExists()
     {
         $result = $this->_getResource()->userExists($this);
         return ( is_array($result) && count($result) > 0 ) ? true : false;
     }
 
+    /**
+     * Get collection of users
+     *
+     * @return Object|Mage_Api_Model_Resource_User_Collection
+     */
     public function getCollection() {
         return Mage::getResourceModel('api/user_collection');
     }
 
-    public function getName($separator=' ')
+    /**
+     * Get user's name
+     *
+     * @param string $separator
+     * @return string
+     */
+    public function getName($separator = ' ')
     {
         return $this->getFirstname().$separator.$this->getLastname();
     }
 
+    /**
+     * Get user's id
+     *
+     * @return string
+     */
     public function getId()
     {
         return $this->getUserId();
@@ -196,7 +255,7 @@ public function authenticate($username, $apiKey)
     /**
      * Login user
      *
-     * @param   string $login
+     * @param   string $username
      * @param   string $apiKey
      * @return  Mage_Api_Model_User
      */
@@ -217,38 +276,83 @@ public function login($username, $apiKey)
         return $this;
     }
 
+    /**
+     * Reload user
+     *
+     * @return Mage_Api_Model_User
+     */
     public function reload()
     {
         $this->load($this->getId());
         return $this;
     }
 
+    /**
+     * Load user by username
+     *
+     * @param string $username
+     * @return Mage_Api_Model_User
+     */
     public function loadByUsername($username)
     {
         $this->setData($this->getResource()->loadByUsername($username));
         return $this;
     }
 
+    /**
+     * Load user by session id
+     *
+     * @param string $sessId
+     * @return Mage_Api_Model_User
+     */
     public function loadBySessId ($sessId)
     {
         $this->setData($this->getResource()->loadBySessId($sessId));
         return $this;
     }
 
+    /**
+     * Logout user by session id
+     *
+     * @param string $sessid
+     * @return Mage_Api_Model_User
+     */
     public function logoutBySessId($sessid)
     {
         $this->getResource()->clearBySessId($sessid);
         return $this;
     }
 
+    /**
+     * Check if user is assigned to role
+     *
+     * @param int|Mage_Core_Model_Abstract $user
+     * @return array|null
+     */
     public function hasAssigned2Role($user)
     {
         return $this->getResource()->hasAssigned2Role($user);
     }
 
+    /**
+     * Retrieve encoded api key
+     *
+     * @param string $apiKey
+     * @return string
+     */
     protected function _getEncodedApiKey($apiKey)
     {
-        return Mage::helper('core')->getHash($apiKey, 2);
+        return $this->_getHelper('core')->getHash($apiKey, Mage_Admin_Model_User::HASH_SALT_LENGTH);
     }
 
+    /**
+     * Get helper instance
+     *
+     * @param string $helperName
+     * @return Mage_Core_Helper_Abstract
+     */
+    protected function _getHelper($helperName)
+    {
+        return Mage::helper($helperName);
+    }
 }
diff --git a/app/code/core/Mage/Api/etc/config.xml b/app/code/core/Mage/Api/etc/config.xml
index eceac462b9e..2fa86f31a3f 100644
--- a/app/code/core/Mage/Api/etc/config.xml
+++ b/app/code/core/Mage/Api/etc/config.xml
@@ -28,7 +28,7 @@
 <config>
     <modules>
         <Mage_Api>
-            <version>1.6.0.0</version>
+            <version>1.6.0.1</version>
         </Mage_Api>
     </modules>
     <global>
diff --git a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php
new file mode 100644
index 00000000000..b9b77a1a636
--- /dev/null
+++ b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Api
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/* @var $this Mage_Core_Model_Resource_Setup */
+$this->startSetup();
+
+$this->getConnection()->changeColumn(
+    $this->getTable('api/user'),
+    'api_key',
+    'api_key',
+    array(
+        'type' => Varien_Db_Ddl_Table::TYPE_TEXT,
+        'length' => 100,
+        'comment' => 'Api key'
+    )
+);
+
+$this->endSetup();
diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php
index 2c587c06b3a..323aacf6cf5 100644
--- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php
+++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php
@@ -60,10 +60,7 @@ protected function _prepareForm()
             /** @var $helper Mage_Core_Helper_Data */
             $helper = Mage::helper('core');
 
-            $data['note'] = Mage::helper('api2')->__(
-                '%s role is protected.',
-                $helper->escapeHtml($this->getRole()->getRoleName())
-            );
+            $data['note'] = Mage::helper('api2')->__('%s role is protected.', $helper->escapeHtml($this->getRole()->getRoleName()));
             $data['readonly'] = 'readonly';
         }
         $fieldset->addField('role_name', 'text', $data);
diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Role.php b/app/code/core/Mage/Api2/Model/Acl/Global/Role.php
index 512361c93a3..6b75cc634a0 100644
--- a/app/code/core/Mage/Api2/Model/Acl/Global/Role.php
+++ b/app/code/core/Mage/Api2/Model/Acl/Global/Role.php
@@ -96,8 +96,7 @@ protected function _beforeSave()
             $helper = Mage::helper('core');
 
             Mage::throwException(
-                Mage::helper('api2')->__('%s role is a special one and can\'t be changed.',
-                    $helper->escapeHtml($this->getRoleName()))
+                Mage::helper('api2')->__('%s role is a special one and can\'t be changed.', $helper->escapeHtml($this->getRoleName()))
             );
         }
 
@@ -117,8 +116,7 @@ protected function _beforeDelete()
             $helper = Mage::helper('core');
 
             Mage::throwException(
-                Mage::helper('api2')->__('%s role is a special one and can\'t be deleted.',
-                    $helper->escapeHtml($this->getRoleName()))
+                Mage::helper('api2')->__('%s role is a special one and can\'t be deleted.', $helper->escapeHtml($this->getRoleName()))
             );
         }
 
diff --git a/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php b/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php
index 36d0c8ff9a5..18cfd21a4d7 100644
--- a/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php
+++ b/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php
@@ -222,11 +222,10 @@ public function getErrors()
     {
         // business asked to avoid additional validation message, so we filter it here
         $errors        = array();
-        $helper        = Mage::helper('eav');
         $requiredAttrs = array();
-        $isRequiredRE  = '/^' . str_replace('%s', '(.+)', preg_quote($helper->__('"%s" is a required value.'))). '$/';
+        $isRequiredRE  = '/^' . str_replace('%s', '(.+)', preg_quote(Mage::helper('eav')->__('"%s" is a required value.'))) . '$/';
         $greaterThanRE = '/^' . str_replace(
-            '%s', '(.+)', preg_quote($helper->__('"%s" length must be equal or greater than %s characters.'))
+            '%s', '(.+)', preg_quote(Mage::helper('eav')->__('"%s" length must be equal or greater than %s characters.'))
         ) . '$/';
 
         // find all required attributes labels
diff --git a/app/code/core/Mage/Authorizenet/Helper/Data.php b/app/code/core/Mage/Authorizenet/Helper/Data.php
index 2786189a44d..263373dda76 100755
--- a/app/code/core/Mage/Authorizenet/Helper/Data.php
+++ b/app/code/core/Mage/Authorizenet/Helper/Data.php
@@ -126,7 +126,8 @@ public function getRedirectIframeUrl($params)
      */
     public function getPlaceOrderFrontUrl()
     {
-        return $this->_getUrl('authorizenet/directpost_payment/place');
+        $params = array(Mage_Core_Model_Url::FORM_KEY => Mage::getSingleton('core/session')->getFormKey());
+        return $this->_getUrl('authorizenet/directpost_payment/place', $params);
     }
 
     /**
diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost.php b/app/code/core/Mage/Authorizenet/Model/Directpost.php
index c6346365ae0..5d432ee4b10 100644
--- a/app/code/core/Mage/Authorizenet/Model/Directpost.php
+++ b/app/code/core/Mage/Authorizenet/Model/Directpost.php
@@ -426,6 +426,13 @@ public function process(array $responseData)
         if ($orderIncrementId) {
             /* @var $order Mage_Sales_Model_Order */
             $order = Mage::getModel('sales/order')->loadByIncrementId($orderIncrementId);
+            //check payment method
+            $payment = $order->getPayment();
+            if (!$payment || $payment->getMethod() != $this->getCode()) {
+                Mage::throwException(
+                    Mage::helper('authorizenet')->__('Payment error. Order was not found.')
+                );
+            }
             if ($order->getId() &&  $order->getState() == Mage_Sales_Model_Order::STATE_PENDING_PAYMENT) {
                 //operate with order
                 $this->_authOrder($order);
@@ -536,12 +543,8 @@ protected function _authOrder(Mage_Sales_Model_Order $order)
 
         $payment->addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_AUTH);
 
-        // Set transaction apporval message
-        $message = Mage::helper('authorizenet')->__(
-            'Amount of %s approved by payment gateway. Transaction ID: "%s".',
-            $order->getBaseCurrency()->formatTxt($payment->getBaseAmountAuthorized()),
-            $response->getXTransId()
-        );
+        // Set transaction approval message
+        $message = Mage::helper('authorizenet')->__('Amount of %s approved by payment gateway. Transaction ID: "%s".', $order->getBaseCurrency()->formatTxt($payment->getBaseAmountAuthorized()), $response->getXTransId());
 
         $orderState = Mage_Sales_Model_Order::STATE_PROCESSING;
         $orderStatus = $this->getConfigData('order_status');
diff --git a/app/code/core/Mage/Backup/Helper/Data.php b/app/code/core/Mage/Backup/Helper/Data.php
index 41c96cae533..e9ed65630e5 100644
--- a/app/code/core/Mage/Backup/Helper/Data.php
+++ b/app/code/core/Mage/Backup/Helper/Data.php
@@ -62,10 +62,10 @@ class Mage_Backup_Helper_Data extends Mage_Core_Helper_Abstract
     public function getBackupTypes()
     {
         return array(
-            self::TYPE_DB => self::__('Database'),
-            self::TYPE_MEDIA => self::__('Database and Media'),
-            self::TYPE_SYSTEM_SNAPSHOT => self::__('System'),
-            self::TYPE_SNAPSHOT_WITHOUT_MEDIA => self::__('System (excluding Media)')
+            self::TYPE_DB                     => $this->__('Database'),
+            self::TYPE_MEDIA                  => $this->__('Database and Media'),
+            self::TYPE_SYSTEM_SNAPSHOT        => $this->__('System'),
+            self::TYPE_SNAPSHOT_WITHOUT_MEDIA => $this->__('System (excluding Media)')
         );
     }
 
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
index 6444592ccae..176a23dec14 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
@@ -77,7 +77,9 @@ public function isShipmentSeparately($item = null)
             }
             if ($parentItem = $item->getParentItem()) {
                 if ($options = $parentItem->getProductOptions()) {
-                    if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) {
+                    if (isset($options['shipment_type'])
+                        && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY
+                    ) {
                         return true;
                     } else {
                         return false;
@@ -85,7 +87,9 @@ public function isShipmentSeparately($item = null)
                 }
             } else {
                 if ($options = $item->getProductOptions()) {
-                    if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) {
+                    if (isset($options['shipment_type'])
+                        && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY
+                    ) {
                         return false;
                     } else {
                         return true;
@@ -95,7 +99,9 @@ public function isShipmentSeparately($item = null)
         }
 
         if ($options = $this->getOrderItem()->getProductOptions()) {
-            if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) {
+            if (isset($options['shipment_type'])
+                && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY
+            ) {
                 return true;
             }
         }
@@ -110,7 +116,9 @@ public function isChildCalculated($item = null)
             }
             if ($parentItem = $item->getParentItem()) {
                 if ($options = $parentItem->getProductOptions()) {
-                    if (isset($options['product_calculations']) && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) {
+                    if (isset($options['product_calculations'])
+                        && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD
+                    ) {
                         return true;
                     } else {
                         return false;
@@ -118,7 +126,9 @@ public function isChildCalculated($item = null)
                 }
             } else {
                 if ($options = $item->getProductOptions()) {
-                    if (isset($options['product_calculations']) && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) {
+                    if (isset($options['product_calculations'])
+                        && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD
+                    ) {
                         return false;
                     } else {
                         return true;
@@ -129,7 +139,8 @@ public function isChildCalculated($item = null)
 
         if ($options = $this->getOrderItem()->getProductOptions()) {
             if (isset($options['product_calculations'])
-                && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) {
+                && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD
+            ) {
                 return true;
             }
         }
@@ -177,7 +188,7 @@ public function getOrderItem()
 
     public function getValueHtml($item)
     {
-        $result = $this->htmlEscape($item->getName());
+        $result = $this->escapeHtml($item->getName());
         if (!$this->isShipmentSeparately($item)) {
             if ($attributes = $this->getSelectionAttributes($item)) {
                 $result =  sprintf('%d', $attributes['qty']) . ' x ' . $result;
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php
index d4c842c05e6..23ee15dfc2c 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php
@@ -32,14 +32,17 @@
  * @package     Mage_Bundle
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_Bundle_Block_Adminhtml_Sales_Order_View_Items_Renderer extends Mage_Adminhtml_Block_Sales_Order_View_Items_Renderer_Default
+class Mage_Bundle_Block_Adminhtml_Sales_Order_View_Items_Renderer
+    extends Mage_Adminhtml_Block_Sales_Order_View_Items_Renderer_Default
 {
     public function isShipmentSeparately($item = null)
     {
         if ($item) {
             if ($parentItem = $item->getParentItem()) {
                 if ($options = $parentItem->getProductOptions()) {
-                    if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) {
+                    if (isset($options['shipment_type'])
+                        && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY
+                    ) {
                         return true;
                     } else {
                         return false;
@@ -47,7 +50,9 @@ public function isShipmentSeparately($item = null)
                 }
             } else {
                 if ($options = $item->getProductOptions()) {
-                    if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) {
+                    if (isset($options['shipment_type'])
+                        && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY
+                    ) {
                         return false;
                     } else {
                         return true;
@@ -57,7 +62,9 @@ public function isShipmentSeparately($item = null)
         }
 
         if ($options = $this->getOrderItem()->getProductOptions()) {
-            if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) {
+            if (isset($options['shipment_type'])
+                && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY
+            ) {
                 return true;
             }
         }
@@ -69,7 +76,9 @@ public function isChildCalculated($item = null)
         if ($item) {
             if ($parentItem = $item->getParentItem()) {
                 if ($options = $parentItem->getProductOptions()) {
-                    if (isset($options['product_calculations']) && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) {
+                    if (isset($options['product_calculations'])
+                        && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD
+                    ) {
                         return true;
                     } else {
                         return false;
@@ -77,7 +86,9 @@ public function isChildCalculated($item = null)
                 }
             } else {
                 if ($options = $item->getProductOptions()) {
-                    if (isset($options['product_calculations']) && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) {
+                    if (isset($options['product_calculations'])
+                        && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD
+                    ) {
                         return false;
                     } else {
                         return true;
@@ -88,7 +99,8 @@ public function isChildCalculated($item = null)
 
         if ($options = $this->getItem()->getProductOptions()) {
             if (isset($options['product_calculations'])
-                && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) {
+                && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD
+            ) {
                 return true;
             }
         }
@@ -126,7 +138,7 @@ public function getOrderOptions()
 
     public function getValueHtml($item)
     {
-        $result = $this->htmlEscape($item->getName());
+        $result = $this->escapeHtml($item->getName());
         if (!$this->isShipmentSeparately($item)) {
             if ($attributes = $this->getSelectionAttributes($item)) {
                 $result =  sprintf('%d', $attributes['qty']) . ' x ' . $result;
diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php
index 0cc7241fb6c..9a77c14dad6 100644
--- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php
+++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php
@@ -37,24 +37,36 @@ class Mage_Bundle_Block_Catalog_Product_View extends Mage_Catalog_Block_Product_
     /**
      * Get tier prices (formatted)
      *
-     * @param Mage_Catalog_Model_Product $product
+     * @param Mage_Catalog_Model_Product|null $product
      * @return array
      */
     public function getTierPrices($product = null)
     {
-        if (is_null($product)) {
+        if ($product === null) {
             $product = $this->getProduct();
         }
-        $prices  = $product->getFormatedTierPrice();
 
         $res = array();
+
+        $prices = $product->getFormatedTierPrice();
         if (is_array($prices)) {
+            $store = Mage::app()->getStore();
+            $helper = Mage::helper('tax');
+            $specialPrice = $product->getSpecialPrice();
+            $defaultDiscount = max($product->getGroupPrice(), $specialPrice ? 100 - $specialPrice : 0);
             foreach ($prices as $price) {
-                $price['price_qty'] = $price['price_qty']*1;
-                $price['savePercent'] = ceil(100 - $price['price']);
-                $price['formated_price'] = Mage::app()->getStore()->formatPrice(Mage::app()->getStore()->convertPrice(Mage::helper('tax')->getPrice($product, $price['website_price'])));
-                $price['formated_price_incl_tax'] = Mage::app()->getStore()->formatPrice(Mage::app()->getStore()->convertPrice(Mage::helper('tax')->getPrice($product, $price['website_price'], true)));
-                $res[] = $price;
+                if ($defaultDiscount < $price['price']) {
+                    $price['price_qty'] += 0;
+                    $price['savePercent'] = ceil(100 - $price['price']);
+
+                    $priceExclTax = $helper->getPrice($product, $price['website_price']);
+                    $price['formated_price'] = $store->formatPrice($store->convertPrice($priceExclTax));
+
+                    $priceInclTax = $helper->getPrice($product, $price['website_price'], true);
+                    $price['formated_price_incl_tax'] = $store->formatPrice($store->convertPrice($priceInclTax));
+
+                    $res[] = $price;
+                }
             }
         }
 
diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php
index 2ded2182c55..ac2f85473aa 100644
--- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php
+++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php
@@ -97,6 +97,7 @@ public function getJsonConfig()
             $defaultValues       = array();
         }
 
+        $position = 0;
         foreach ($optionsArray as $_option) {
             /* @var $_option Mage_Bundle_Model_Option */
             if (!$_option->getSelections()) {
@@ -107,11 +108,13 @@ public function getJsonConfig()
             $option = array (
                 'selections' => array(),
                 'title'      => $_option->getTitle(),
-                'isMulti'    => in_array($_option->getType(), array('multi', 'checkbox'))
+                'isMulti'    => in_array($_option->getType(), array('multi', 'checkbox')),
+                'position'   => $position++
             );
 
             $selectionCount = count($_option->getSelections());
-
+            /** @var $taxHelper Mage_Tax_Helper_Data */
+            $taxHelper = Mage::helper('tax');
             foreach ($_option->getSelections() as $_selection) {
                 /* @var $_selection Mage_Catalog_Model_Product */
                 $selectionId = $_selection->getSelectionId();
@@ -120,6 +123,8 @@ public function getJsonConfig()
                 $tierPrices = $_selection->getTierPrice();
                 foreach ($tierPrices as &$tierPriceInfo) {
                     $tierPriceInfo['price'] = $coreHelper->currency($tierPriceInfo['price'], false, false);
+                    $tierPriceInfo['priceInclTax'] = $taxHelper->getPrice($_selection, $tierPriceInfo['price'], true);
+                    $tierPriceInfo['priceExclTax'] = $taxHelper->getPrice($_selection, $tierPriceInfo['price']);
                 }
                 unset($tierPriceInfo); // break the reference with the last element
 
@@ -152,7 +157,8 @@ public function getJsonConfig()
                     'name'             => $_selection->getName(),
                     'plusDisposition'  => 0,
                     'minusDisposition' => 0,
-                    'canApplyMAP'      => $canApplyMAP
+                    'canApplyMAP'      => $canApplyMAP,
+                    'tierPriceHtml'    => $this->getTierPriceHtml($_selection),
                 );
 
                 $responseObject = new Varien_Object();
diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
index 602810a7cd6..2b1ecb68b26 100644
--- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
+++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -218,6 +218,11 @@ public function getSelectionPrice($_selection)
     public function getSelectionTitlePrice($_selection, $includeContainer = true)
     {
         $price = $this->getProduct()->getPriceModel()->getSelectionPreFinalPrice($this->getProduct(), $_selection, 1);
+        $tierPrice = $_selection->getTierPrice();
+        if (!empty($tierPrice)) {
+            $qty = $_selection->getSelectionQty();
+            $price = $qty * (float) $_selection->getPriceModel()->getTierPrice($qty, $_selection);
+        }
         $this->setFormatProduct($_selection);
         $priceTitle = $this->escapeHtml($_selection->getName());
         $priceTitle .= ' &nbsp; ' . ($includeContainer ? '<span class="price-notice">' : '')
diff --git a/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php b/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php
index a2d6f5b1a29..2848e0d882f 100644
--- a/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php
+++ b/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php
@@ -54,7 +54,9 @@ protected function _getBundleOptions($useCache = true)
      */
     protected function _getSelectionFinalPrice($selectionProduct)
     {
-        return Mage::helper('bundle/catalog_product_configuration')->getSelectionFinalPrice($this->getItem(), $selectionProduct);
+        $helper = Mage::helper('bundle/catalog_product_configuration');
+        $result = $helper->getSelectionFinalPrice($this->getItem(), $selectionProduct);
+        return $result;
     }
 
     /**
@@ -80,23 +82,22 @@ public function getOptionList()
     }
 
     /**
-     * Return cart backorder messages
+     * Return cart item error messages
      *
      * @return array
      */
     public function getMessages()
     {
-        $messages = $this->getData('messages');
-        if (is_null($messages)) {
-            $messages = array();
-        }
-        $options = $this->getItem()->getQtyOptions();
+        $messages = array();
+        $quoteItem = $this->getItem();
 
-        foreach ($options as $option) {
-            if ($option->getMessage()) {
+        // Add basic messages occuring during this page load
+        $baseMessages = $quoteItem->getMessage(false);
+        if ($baseMessages) {
+            foreach ($baseMessages as $message) {
                 $messages[] = array(
-                    'text' => $option->getMessage(),
-                    'type' => ($this->getItem()->getHasError()) ? 'error' : 'notice'
+                    'text' => $message,
+                    'type' => $quoteItem->getHasError() ? 'error' : 'notice'
                 );
             }
         }
diff --git a/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php
index 22260a7195d..449af991fad 100644
--- a/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php
+++ b/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php
@@ -41,7 +41,9 @@ public function isShipmentSeparately($item = null)
             }
             if ($parentItem = $item->getParentItem()) {
                 if ($options = $parentItem->getProductOptions()) {
-                    if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) {
+                    if (isset($options['shipment_type'])
+                        && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY
+                    ) {
                         return true;
                     } else {
                         return false;
@@ -49,7 +51,9 @@ public function isShipmentSeparately($item = null)
                 }
             } else {
                 if ($options = $item->getProductOptions()) {
-                    if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) {
+                    if (isset($options['shipment_type'])
+                        && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY
+                    ) {
                         return false;
                     } else {
                         return true;
@@ -59,7 +63,9 @@ public function isShipmentSeparately($item = null)
         }
 
         if ($options = $this->getOrderItem()->getProductOptions()) {
-            if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) {
+            if (isset($options['shipment_type'])
+                && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY
+            ) {
                 return true;
             }
         }
@@ -74,7 +80,9 @@ public function isChildCalculated($item = null)
             }
             if ($parentItem = $item->getParentItem()) {
                 if ($options = $parentItem->getProductOptions()) {
-                    if (isset($options['product_calculations']) && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) {
+                    if (isset($options['product_calculations'])
+                        && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD
+                    ) {
                         return true;
                     } else {
                         return false;
@@ -82,7 +90,9 @@ public function isChildCalculated($item = null)
                 }
             } else {
                 if ($options = $item->getProductOptions()) {
-                    if (isset($options['product_calculations']) && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) {
+                    if (isset($options['product_calculations'])
+                        && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD
+                    ) {
                         return false;
                     } else {
                         return true;
@@ -93,7 +103,8 @@ public function isChildCalculated($item = null)
 
         if ($options = $this->getOrderItem()->getProductOptions()) {
             if (isset($options['product_calculations'])
-                && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) {
+                && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD
+            ) {
                 return true;
             }
         }
@@ -116,10 +127,10 @@ public function getValueHtml($item)
     {
         if ($attributes = $this->getSelectionAttributes($item)) {
             return sprintf('%d', $attributes['qty']) . ' x ' .
-                $this->htmlEscape($item->getName()) .
+                $this->escapeHtml($item->getName()) .
                 " " . $this->getOrder()->formatPrice($attributes['price']);
         } else {
-            return $this->htmlEscape($item->getName());
+            return $this->escapeHtml($item->getName());
         }
     }
 
diff --git a/app/code/core/Mage/Bundle/Helper/Catalog/Product/Configuration.php b/app/code/core/Mage/Bundle/Helper/Catalog/Product/Configuration.php
index 96223a960f9..b996c6e4a60 100644
--- a/app/code/core/Mage/Bundle/Helper/Catalog/Product/Configuration.php
+++ b/app/code/core/Mage/Bundle/Helper/Catalog/Product/Configuration.php
@@ -39,6 +39,7 @@ class Mage_Bundle_Helper_Catalog_Product_Configuration extends Mage_Core_Helper_
      *
      * @param Mage_Catalog_Model_Product $product
      * @param int $selectionId
+     *
      * @return decimal
      */
     public function getSelectionQty($product, $selectionId)
@@ -55,6 +56,7 @@ public function getSelectionQty($product, $selectionId)
      *
      * @param Mage_Catalog_Model_Product_Configuration_Item_Interface $item
      * @param Mage_Catalog_Model_Product $selectionProduct
+     *
      * @return decimal
      */
     public function getSelectionFinalPrice(Mage_Catalog_Model_Product_Configuration_Item_Interface $item,
@@ -101,33 +103,37 @@ public function getBundleOptions(Mage_Catalog_Model_Product_Configuration_Item_I
             // get and add bundle selections collection
             $selectionsQuoteItemOption = $item->getOptionByCode('bundle_selection_ids');
 
-            $selectionsCollection = $typeInstance->getSelectionsByIds(
-                unserialize($selectionsQuoteItemOption->getValue()),
-                $product
-            );
+            $bundleSelectionIds = unserialize($selectionsQuoteItemOption->getValue());
+
+            if (!empty($bundleSelectionIds)) {
+                $selectionsCollection = $typeInstance->getSelectionsByIds(
+                    unserialize($selectionsQuoteItemOption->getValue()),
+                    $product
+                );
 
-            $bundleOptions = $optionsCollection->appendSelections($selectionsCollection, true);
-            foreach ($bundleOptions as $bundleOption) {
-                if ($bundleOption->getSelections()) {
-                    $option = array(
-                        'label' => $bundleOption->getTitle(),
-                        'value' => array()
-                    );
+                $bundleOptions = $optionsCollection->appendSelections($selectionsCollection, true);
+                foreach ($bundleOptions as $bundleOption) {
+                    if ($bundleOption->getSelections()) {
+                        $option = array(
+                            'label' => $bundleOption->getTitle(),
+                            'value' => array()
+                        );
 
-                    $bundleSelections = $bundleOption->getSelections();
+                        $bundleSelections = $bundleOption->getSelections();
 
-                    foreach ($bundleSelections as $bundleSelection) {
-                        $qty = $this->getSelectionQty($product, $bundleSelection->getSelectionId()) * 1;
-                        if ($qty) {
-                            $option['value'][] = $qty . ' x ' . $this->escapeHtml($bundleSelection->getName())
-                                . ' ' . Mage::helper('core')->currency(
-                                    $this->getSelectionFinalPrice($item, $bundleSelection)
-                                );
+                        foreach ($bundleSelections as $bundleSelection) {
+                            $qty = $this->getSelectionQty($product, $bundleSelection->getSelectionId()) * 1;
+                            if ($qty) {
+                                $option['value'][] = $qty . ' x ' . $this->escapeHtml($bundleSelection->getName())
+                                    . ' ' . Mage::helper('core')->currency(
+                                        $this->getSelectionFinalPrice($item, $bundleSelection)
+                                    );
+                            }
                         }
-                    }
 
-                    if ($option['value']) {
-                        $options[] = $option;
+                        if ($option['value']) {
+                            $options[] = $option;
+                        }
                     }
                 }
             }
diff --git a/app/code/core/Mage/Bundle/Model/Product/Price.php b/app/code/core/Mage/Bundle/Model/Product/Price.php
index 1c63b5111b2..b64b1730478 100644
--- a/app/code/core/Mage/Bundle/Model/Product/Price.php
+++ b/app/code/core/Mage/Bundle/Model/Product/Price.php
@@ -33,7 +33,14 @@
  */
 class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Price
 {
+    /**
+     * Fixed price type
+     */
     const PRICE_TYPE_FIXED      = 1;
+
+    /**
+     * Dynamic price type
+     */
     const PRICE_TYPE_DYNAMIC    = 0;
 
     /**
@@ -183,137 +190,159 @@ public function getPricesDependingOnTax($product, $which = null, $includeTax = n
      */
     public function getTotalPrices($product, $which = null, $includeTax = null, $takeTierPrice = true)
     {
-        // check calculated price index
-        if ($product->getData('min_price') && $product->getData('max_price')) {
-            $minimalPrice = Mage::helper('tax')->getPrice($product, $product->getData('min_price'), $includeTax);
-            $maximalPrice = Mage::helper('tax')->getPrice($product, $product->getData('max_price'), $includeTax);
-            $this->_isPricesCalculatedByIndex = true;
+        $isPriceFixedType = ($product->getPriceType() == self::PRICE_TYPE_FIXED);
+        $this->_isPricesCalculatedByIndex = ($product->getData('min_price') && $product->getData('max_price'));
+        $taxHelper = $this->_getHelperData('tax');
+
+        if ($this->_isPricesCalculatedByIndex && !$includeTax) {
+            $minimalPrice = $taxHelper->getPrice($product, $product->getData('min_price'), $includeTax);
+            $maximalPrice = $taxHelper->getPrice($product, $product->getData('max_price'), $includeTax);
         } else {
             /**
              * Check if product price is fixed
              */
             $finalPrice = $product->getFinalPrice();
-            if ($product->getPriceType() == self::PRICE_TYPE_FIXED) {
-                $minimalPrice = $maximalPrice = Mage::helper('tax')->getPrice($product, $finalPrice, $includeTax);
+            if ($isPriceFixedType) {
+                $minimalPrice = $maximalPrice = $taxHelper->getPrice($product, $finalPrice, $includeTax);
             } else { // PRICE_TYPE_DYNAMIC
                 $minimalPrice = $maximalPrice = 0;
             }
 
-            $options = $this->getOptions($product);
-            $minPriceFounded = false;
-
-            if ($options) {
-                foreach ($options as $option) {
-                    /* @var $option Mage_Bundle_Model_Option */
-                    $selections = $option->getSelections();
-                    if ($selections) {
-                        $selectionMinimalPrices = array();
-                        $selectionMaximalPrices = array();
-
-                        foreach ($option->getSelections() as $selection) {
-                            /* @var $selection Mage_Bundle_Model_Selection */
-                            if (!$selection->isSalable()) {
-                                /**
-                                 * @todo CatalogInventory Show out of stock Products
-                                 */
-                                continue;
-                            }
-
-                            $qty = $selection->getSelectionQty();
-
-                            $item = $product->getPriceType() == self::PRICE_TYPE_FIXED ? $product : $selection;
-
-                            $selectionMinimalPrices[] = Mage::helper('tax')->getPrice(
-                                $item,
-                                $this->getSelectionFinalTotalPrice($product, $selection, 1, $qty, true, $takeTierPrice),
-                                $includeTax
-                            );
-                            $selectionMaximalPrices[] = Mage::helper('tax')->getPrice(
-                                $item,
-                                $this->getSelectionFinalTotalPrice($product, $selection, 1, null, true, $takeTierPrice),
-                                $includeTax
-                            );
-                        }
-
-                        if (count($selectionMinimalPrices)) {
-                            $selMinPrice = min($selectionMinimalPrices);
-                            if ($option->getRequired()) {
-                                $minimalPrice += $selMinPrice;
-                                $minPriceFounded = true;
-                            } elseif (true !== $minPriceFounded) {
-                                $selMinPrice += $minimalPrice;
-                                $minPriceFounded = (false === $minPriceFounded)
-                                    ? $selMinPrice
-                                    : min($minPriceFounded, $selMinPrice);
-                            }
-
-                            if ($option->isMultiSelection()) {
-                                $maximalPrice += array_sum($selectionMaximalPrices);
-                            } else {
-                                $maximalPrice += max($selectionMaximalPrices);
-                            }
-                        }
-                    }
-                }
-            }
-            // condition is TRUE when all product options are NOT required
-            if (!is_bool($minPriceFounded)) {
-                $minimalPrice = $minPriceFounded;
-            }
+            $minimalPrice += $this->_getMinimalBundleOptionsPrice($product, $includeTax, $takeTierPrice);
+            $maximalPrice += $this->_getMaximalBundleOptionsPrice($product, $includeTax, $takeTierPrice);
 
             $customOptions = $product->getOptions();
-            if ($product->getPriceType() == self::PRICE_TYPE_FIXED && $customOptions) {
+            if ($isPriceFixedType && $customOptions) {
                 foreach ($customOptions as $customOption) {
                     /* @var $customOption Mage_Catalog_Model_Product_Option */
-                    $values = $customOption->getValues();
-                    if ($values) {
-                        $prices = array();
-                        foreach ($values as $value) {
-                            /* @var $value Mage_Catalog_Model_Product_Option_Value */
-                            $valuePrice = $value->getPrice(true);
-
-                            $prices[] = $valuePrice;
-                        }
-                        if (count($prices)) {
-                            if ($customOption->getIsRequire()) {
-                                $minimalPrice += Mage::helper('tax')->getPrice($product, min($prices), $includeTax);
-                            }
-
-                            $multiTypes = array(
-                                //Mage_Catalog_Model_Product_Option::OPTION_TYPE_DROP_DOWN,
-                                Mage_Catalog_Model_Product_Option::OPTION_TYPE_CHECKBOX,
-                                Mage_Catalog_Model_Product_Option::OPTION_TYPE_MULTIPLE
-                            );
-
-                            if (in_array($customOption->getType(), $multiTypes)) {
-                                $maximalValue = array_sum($prices);
-                            } else {
-                                $maximalValue = max($prices);
-                            }
-                            $maximalPrice += Mage::helper('tax')->getPrice($product, $maximalValue, $includeTax);
-                        }
-                    } else {
-                        $valuePrice = $customOption->getPrice(true);
-
-                        if ($customOption->getIsRequire()) {
-                            $minimalPrice += Mage::helper('tax')->getPrice($product, $valuePrice, $includeTax);
-                        }
-                        $maximalPrice += Mage::helper('tax')->getPrice($product, $valuePrice, $includeTax);
-                    }
+                    $minimalPrice += $taxHelper->getPrice(
+                        $product,
+                        $this->_getMinimalCustomOptionPrice($customOption),
+                        $includeTax);
+                    $maximalPrice += $taxHelper->getPrice(
+                        $product,
+                        $this->_getMaximalCustomOptionPrice($customOption),
+                        $includeTax);
                 }
             }
-            $this->_isPricesCalculatedByIndex = false;
         }
 
-        if ($which == 'max') {
+        if ('max' == $which) {
             return $maximalPrice;
-        } elseif ($which == 'min') {
+        } elseif ('min' == $which) {
             return $minimalPrice;
         }
 
         return array($minimalPrice, $maximalPrice);
     }
 
+    /**
+     * Get minimal possible price for bundle option
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @param bool|null $includeTax
+     * @param bool $takeTierPrice
+     * @return int|mixed
+     */
+    protected function _getMinimalBundleOptionsPrice($product, $includeTax, $takeTierPrice)
+    {
+        $options = $this->getOptions($product);
+        $minimalPrice = 0;
+        $hasRequiredOptions = $this->_hasRequiredOptions($product);
+        $selectionMinimalPrices = array();
+
+        if (!$options) {
+            return $minimalPrice;
+        }
+
+        foreach ($options as $option) {
+            /* @var $option Mage_Bundle_Model_Option */
+           $selectionPrices = $this->_getSelectionPrices($product, $option, $takeTierPrice, $includeTax);
+
+            if (count($selectionPrices)) {
+                $selectionMinPrice = min($selectionPrices);
+                if ($option->getRequired()) {
+                    $minimalPrice += $selectionMinPrice;
+                } elseif (!$hasRequiredOptions) {
+                    $selectionMinimalPrices[] = $selectionMinPrice;
+                }
+            }
+        }
+        // condition is TRUE when all product options are NOT required
+        if (!$hasRequiredOptions) {
+            $minimalPrice = min($selectionMinimalPrices);
+        }
+        return $minimalPrice;
+    }
+
+    /**
+     * Get maximal possible price for bundle option
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @param bool|null $includeTax
+     * @param bool $takeTierPrice
+     * @return float
+     */
+    protected function _getMaximalBundleOptionsPrice($product, $includeTax, $takeTierPrice)
+    {
+        $maximalPrice = 0;
+        $options = $this->getOptions($product);
+
+        if (!$options) {
+            return $maximalPrice;
+        }
+
+        foreach ($options as $option) {
+            $selectionPrices = $this->_getSelectionPrices($product, $option, $takeTierPrice, $includeTax);
+            if (count($selectionPrices)) {
+                $maximalPrice += ($option->isMultiSelection())
+                    ? array_sum($selectionPrices)
+                    : max($selectionPrices);
+            }
+        }
+        return $maximalPrice;
+    }
+
+    /**
+     * Get all prices for bundle option selection
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @param Mage_Bundle_Model_Option $option
+     * @param bool $takeTierPrice
+     * @param bool|null $includeTax
+     * @return array
+     */
+    protected function _getSelectionPrices($product, $option, $takeTierPrice, $includeTax)
+    {
+        $selectionPrices = array();
+        $taxHelper = $this->_getHelperData('tax');
+        $isPriceFixedType = ($product->getPriceType() == self::PRICE_TYPE_FIXED);
+
+        $selections = $option->getSelections();
+        if (!$selections) {
+            return $selectionPrices;
+        }
+
+        foreach ($selections as $selection) {
+            /* @var $selection Mage_Bundle_Model_Selection */
+            if (!$selection->isSalable()) {
+                /**
+                 * @todo CatalogInventory Show out of stock Products
+                 */
+                continue;
+            }
+
+            $item = $isPriceFixedType ? $product : $selection;
+
+            $selectionPrices[] = $taxHelper->getPrice(
+                $item,
+                $this->getSelectionFinalTotalPrice($product, $selection, 1, null, true, $takeTierPrice),
+                $includeTax
+            );
+        }
+        return $selectionPrices;
+    }
+
     /**
      * Calculate Minimal price of bundle (counting all required options)
      *
@@ -445,15 +474,17 @@ public function getSelectionFinalTotalPrice($bundleProduct, $selectionProduct, $
             }
         }
 
-        if ($multiplyQty) {
-            $price *= $selectionQty;
-        }
-
-        return min($price,
+        $price = min($price,
             $this->_applyGroupPrice($bundleProduct, $price),
             $this->_applyTierPrice($bundleProduct, $bundleQty, $price),
             $this->_applySpecialPrice($bundleProduct, $price)
         );
+
+        if ($multiplyQty) {
+            $price *= $selectionQty;
+        }
+
+        return $price;
     }
 
     /**
@@ -543,13 +574,14 @@ protected function _applyTierPrice($product, $qty, $finalPrice)
      * @param   Mage_Catalog_Model_Product $product
      * @return  decimal
      */
-    public function getTierPrice($qty=null, $product)
+    public function getTierPrice($qty = null, $product)
     {
         $allGroups = Mage_Customer_Model_Group::CUST_GROUP_ALL;
         $prices = $product->getData('tier_price');
 
         if (is_null($prices)) {
-            if ($attribute = $product->getResource()->getAttribute('tier_price')) {
+            $attribute = $product->getResource()->getAttribute('tier_price');
+            if ($attribute) {
                 $attribute->getBackend()->afterLoad($product);
                 $prices = $product->getData('tier_price');
             }
@@ -574,7 +606,7 @@ public function getTierPrice($qty=null, $product)
             $prevGroup = $allGroups;
 
             foreach ($prices as $price) {
-                if ($price['cust_group']!=$custGroup && $price['cust_group']!=$allGroups) {
+                if ($price['cust_group'] != $custGroup && $price['cust_group'] != $allGroups) {
                     // tier not for current customer group nor is for all groups
                     continue;
                 }
@@ -738,7 +770,8 @@ public static function calculatePrice($basePrice, $specialPrice, $specialPriceFr
             ->addValuesToResult();
 
         foreach ($customOptions as $customOption) {
-            if ($values = $customOption->getValues()) {
+            $values = $customOption->getValues();
+            if ($values) {
                 $prices = array();
                 foreach ($values as $value) {
                     $prices[] = $value->getPrice();
@@ -797,4 +830,81 @@ public function isGroupPriceFixed()
     {
         return false;
     }
+
+    /**
+     * Get data helper
+     *
+     * @param string $name
+     * @return Mage_Core_Helper_Abstract
+     */
+    protected function _getHelperData($name)
+    {
+        return Mage::helper($name);
+    }
+
+    /**
+     * Check if product has required options
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @return bool
+     */
+    protected function _hasRequiredOptions($product)
+    {
+        $options = $this->getOptions($product);
+        if ($options) {
+            foreach ($options as $option) {
+                if ($option->getRequired()) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Get minimum possible price of custom options
+     *
+     * @param Mage_Catalog_Model_Product_Option $option
+     * @return float
+     */
+    protected function _getMinimalCustomOptionPrice($option)
+    {
+        $prices = $this->_getCustomOptionValuesPrices($option);
+        $minimalOptionPrice = ($prices) ? min($prices) : (float)$option->getPrice(true);
+        $minimalPrice = ($option->getIsRequire()) ? $minimalOptionPrice : 0;
+        return $minimalPrice;
+    }
+
+    /**
+     * Get maximum possible price of custom options
+     *
+     * @param Mage_Catalog_Model_Product_Option $option
+     * @return float
+     */
+    protected function _getMaximalCustomOptionPrice($option)
+    {
+        $prices = $this->_getCustomOptionValuesPrices($option);
+        $maximalOptionPrice = ($option->isMultipleType()) ? array_sum($prices) : max($prices);
+        $maximalPrice = ($prices) ? $maximalOptionPrice : (float)($option->getPrice(true));
+        return $maximalPrice;
+    }
+
+    /**
+     * Get all custom option values prices
+     *
+     * @param Mage_Catalog_Model_Product_Option $option
+     * @return array
+     */
+    protected function _getCustomOptionValuesPrices($option)
+    {
+        $values = $option->getValues();
+        $prices = array();
+        if ($values) {
+            foreach ($values as $value) {
+                /* @var $value Mage_Catalog_Model_Product_Option_Value */
+                $prices[] = $value->getPrice(true);
+            }
+        }
+        return $prices;
+    }
 }
diff --git a/app/code/core/Mage/Bundle/Model/Product/Type.php b/app/code/core/Mage/Bundle/Model/Product/Type.php
index 2f718961d99..270d90b877f 100644
--- a/app/code/core/Mage/Bundle/Model/Product/Type.php
+++ b/app/code/core/Mage/Bundle/Model/Product/Type.php
@@ -648,13 +648,7 @@ protected function _prepareProduct(Varien_Object $buyRequest, $product, $process
 
                 $product->addCustomOption('selection_qty_' . $selection->getSelectionId(), $qty, $selection);
                 $selection->addCustomOption('selection_id', $selection->getSelectionId());
-
-                $beforeQty = 0;
-                $customOption = $product->getCustomOption('product_qty_' . $selection->getId());
-                if ($customOption) {
-                    $beforeQty = (float)$customOption->getValue();
-                }
-                $product->addCustomOption('product_qty_' . $selection->getId(), $qty + $beforeQty, $selection);
+                $product->addCustomOption('product_qty_' . $selection->getId(), $qty, $selection);
 
                 /*
                  * Create extra attributes that will be converted to product options in order item
@@ -733,6 +727,7 @@ public function getSelectionsByIds($selectionIds, $product = null)
             $usedSelections = Mage::getResourceModel('bundle/selection_collection')
                 ->addAttributeToSelect('*')
                 ->setFlag('require_stock_items', true)
+                ->setFlag('product_children', true)
                 ->addStoreFilter($this->getStoreFilter($product))
                 ->setStoreId($storeId)
                 ->setPositionOrder()
diff --git a/app/code/core/Mage/Bundle/Model/Resource/Indexer/Price.php b/app/code/core/Mage/Bundle/Model/Resource/Indexer/Price.php
index 201daa57bb7..3038d28ae52 100755
--- a/app/code/core/Mage/Bundle/Model/Resource/Indexer/Price.php
+++ b/app/code/core/Mage/Bundle/Model/Resource/Indexer/Price.php
@@ -242,17 +242,17 @@ protected function _prepareBundlePriceByType($priceType, $entityIds = null)
         if ($priceType == Mage_Bundle_Model_Product_Price::PRICE_TYPE_FIXED) {
             $finalPrice = $write->getCheckSql(
                 $specialExpr . ' > 0',
-                'ROUND(' . $price . ' * (' . $specialExpr . '  / 100), 4)',
+                'ROUND(' . $price . ' * (' . $specialExpr . '  / 100), 2)',
                 $price
             );
             $tierPrice = $write->getCheckSql(
                 $tierExpr . ' IS NOT NULL',
-                'ROUND(' . $price . ' - ' . '(' . $price . ' * (' . $tierExpr . ' / 100)), 4)',
+                'ROUND(' . $price . ' - ' . '(' . $price . ' * (' . $tierExpr . ' / 100)), 2)',
                 'NULL'
             );
             $groupPrice = $write->getCheckSql(
                 $groupPriceExpr . ' > 0',
-                'ROUND(' . $price . ' - ' . '(' . $price . ' * (' . $groupPriceExpr . ' / 100)), 4)',
+                'ROUND(' . $price . ' - ' . '(' . $price . ' * (' . $groupPriceExpr . ' / 100)), 2)',
                 'NULL'
             );
             $finalPrice = $write->getCheckSql(
@@ -417,10 +417,10 @@ protected function _calculateBundleSelectionPrice($priceType)
             $priceExpr = new Zend_Db_Expr(
                 $write->getCheckSql(
                     $selectionPriceType . ' = 1',
-                    'ROUND(i.price * (' . $selectionPriceValue . ' / 100),4)',
+                    'ROUND(i.price * (' . $selectionPriceValue . ' / 100),2)',
                     $write->getCheckSql(
                         'i.special_price > 0 AND i.special_price < 100',
-                        'ROUND(' . $selectionPriceValue . ' * (i.special_price / 100),4)',
+                        'ROUND(' . $selectionPriceValue . ' * (i.special_price / 100),2)',
                         $selectionPriceValue
                     )
                 ) . '* bs.selection_qty'
@@ -430,11 +430,11 @@ protected function _calculateBundleSelectionPrice($priceType)
                 'i.base_tier IS NOT NULL',
                 $write->getCheckSql(
                     $selectionPriceType .' = 1',
-                    'ROUND(i.base_tier - (i.base_tier * (' . $selectionPriceValue . ' / 100)),4)',
+                    'ROUND(i.base_tier - (i.base_tier * (' . $selectionPriceValue . ' / 100)),2)',
                     $write->getCheckSql(
                         'i.tier_percent > 0',
                         'ROUND(' . $selectionPriceValue
-                        . ' - (' . $selectionPriceValue . ' * (i.tier_percent / 100)),4)',
+                        . ' - (' . $selectionPriceValue . ' * (i.tier_percent / 100)),2)',
                         $selectionPriceValue
                     )
                 ) . ' * bs.selection_qty',
@@ -449,7 +449,7 @@ protected function _calculateBundleSelectionPrice($priceType)
                     $write->getCheckSql(
                         'i.group_price_percent > 0',
                         'ROUND(' . $selectionPriceValue
-                        . ' - (' . $selectionPriceValue . ' * (i.group_price_percent / 100)),4)',
+                        . ' - (' . $selectionPriceValue . ' * (i.group_price_percent / 100)),2)',
                         $selectionPriceValue
                     )
                 ) . ' * bs.selection_qty',
@@ -462,24 +462,24 @@ protected function _calculateBundleSelectionPrice($priceType)
             $priceExpr = new Zend_Db_Expr(
                 $write->getCheckSql(
                     'i.special_price > 0 AND i.special_price < 100',
-                    'ROUND(idx.min_price * (i.special_price / 100), 4)',
+                    'ROUND(idx.min_price * (i.special_price / 100), 2)',
                     'idx.min_price'
                 ) . ' * bs.selection_qty'
             );
             $tierExpr = $write->getCheckSql(
                 'i.base_tier IS NOT NULL',
-                'ROUND(idx.min_price * (i.base_tier / 100), 4)* bs.selection_qty',
+                'ROUND(idx.min_price * (i.base_tier / 100), 2)* bs.selection_qty',
                 'NULL'
             );
             $groupExpr = $write->getCheckSql(
                 'i.base_group_price IS NOT NULL',
-                'ROUND(idx.min_price * (i.base_group_price / 100), 4)* bs.selection_qty',
+                'ROUND(idx.min_price * (i.base_group_price / 100), 2)* bs.selection_qty',
                 'NULL'
             );
             $groupPriceExpr = new Zend_Db_Expr(
                 $write->getCheckSql(
                     'i.base_group_price IS NOT NULL AND i.base_group_price > 0 AND i.base_group_price < 100',
-                    'ROUND(idx.min_price - idx.min_price * (i.base_group_price / 100), 4)',
+                    'ROUND(idx.min_price - idx.min_price * (i.base_group_price / 100), 2)',
                     'idx.min_price'
                 ) . ' * bs.selection_qty'
             );
diff --git a/app/code/core/Mage/Captcha/Model/Observer.php b/app/code/core/Mage/Captcha/Model/Observer.php
index af5c45b33ec..b1f08550486 100755
--- a/app/code/core/Mage/Captcha/Model/Observer.php
+++ b/app/code/core/Mage/Captcha/Model/Observer.php
@@ -162,7 +162,7 @@ public function checkUserLoginBackend($observer)
     {
         $formId = 'backend_login';
         $captchaModel = Mage::helper('captcha')->getCaptcha($formId);
-        $loginParams = Mage::app()->getRequest()->getPost('login');
+        $loginParams = Mage::app()->getRequest()->getPost('login', array());
         $login = array_key_exists('username', $loginParams) ? $loginParams['username'] : null;
         if ($captchaModel->isRequired($login)) {
             if (!$captchaModel->isCorrect($this->_getCaptchaString(Mage::app()->getRequest(), $formId))) {
diff --git a/app/code/core/Mage/Captcha/Model/Zend.php b/app/code/core/Mage/Captcha/Model/Zend.php
index be7d4ee64b2..0b6e8e55f92 100755
--- a/app/code/core/Mage/Captcha/Model/Zend.php
+++ b/app/code/core/Mage/Captcha/Model/Zend.php
@@ -108,7 +108,6 @@ public function getBlockName()
         return 'captcha/captcha_zend';
     }
 
-
     /**
      * Whether captcha is required to be inserted to this form
      *
@@ -405,6 +404,11 @@ protected function _getWordLen()
      */
     protected function _isShowAlways()
     {
+        // setting the allowed attempts to 0 is like setting mode to always
+        if ($this->_getAllowedAttemptsForSameLogin() == 0 || $this->_getAllowedAttemptsFromSameIp() == 0) {
+            return true;
+        }
+
         if ((string)$this->_getHelper()->getConfigNode('mode') == Mage_Captcha_Helper_Data::MODE_ALWAYS) {
             return true;
         }
diff --git a/app/code/core/Mage/Catalog/Block/Category/View.php b/app/code/core/Mage/Catalog/Block/Category/View.php
index d1f54b3e5eb..7e750d345c0 100644
--- a/app/code/core/Mage/Catalog/Block/Category/View.php
+++ b/app/code/core/Mage/Catalog/Block/Category/View.php
@@ -77,7 +77,12 @@ public function IsTopCategory()
 
     public function getRssLink()
     {
-        return Mage::getUrl('rss/catalog/category',array('cid' => $this->getCurrentCategory()->getId(), 'store_id' => Mage::app()->getStore()->getId()));
+        return Mage::getUrl('rss/catalog/category',
+            array(
+                'cid' => $this->getCurrentCategory()->getId(),
+                'store_id' => Mage::app()->getStore()->getId()
+            )
+        );
     }
 
     public function getProductListHtml()
@@ -148,4 +153,14 @@ public function isContentMode()
         }
         return $res;
     }
+
+    /**
+     * Retrieve block cache tags based on category
+     *
+     * @return array
+     */
+    public function getCacheTags()
+    {
+        return array_merge(parent::getCacheTags(), $this->getCurrentCategory()->getCacheIdTags());
+    }
 }
diff --git a/app/code/core/Mage/Catalog/Block/Navigation.php b/app/code/core/Mage/Catalog/Block/Navigation.php
index 3ce6c721985..104412014a7 100644
--- a/app/code/core/Mage/Catalog/Block/Navigation.php
+++ b/app/code/core/Mage/Catalog/Block/Navigation.php
@@ -34,7 +34,12 @@
  */
 class Mage_Catalog_Block_Navigation extends Mage_Core_Block_Template
 {
-    protected $_categoryInstance = null;
+    /**
+     * Category instance
+     *
+     * @var Mage_Catalog_Model_Category
+     */
+    protected $_categoryInstance;
 
     /**
      * Current category key
@@ -50,11 +55,22 @@ class Mage_Catalog_Block_Navigation extends Mage_Core_Block_Template
      */
     protected $_itemLevelPositions = array();
 
+    /**
+     * Current child categories collection
+     *
+     * @var Mage_Catalog_Model_Resource_Category_Collection
+     */
+    protected $_currentChildCategories;
+
+    /**
+     * Set cache data
+     */
     protected function _construct()
     {
-        $this->addData(array(
-            'cache_lifetime'    => false,
-            'cache_tags'        => array(Mage_Catalog_Model_Category::CACHE_TAG, Mage_Core_Model_Store_Group::CACHE_TAG),
+        $this->addData(array('cache_lifetime' => false));
+        $this->addCacheTag(array(
+            Mage_Catalog_Model_Category::CACHE_TAG,
+            Mage_Core_Model_Store_Group::CACHE_TAG
         ));
     }
 
@@ -107,7 +123,7 @@ public function getCurrenCategoryKey()
     }
 
     /**
-     * Get catagories of current store
+     * Get categories of current store
      *
      * @return Varien_Data_Tree_Node_Collection
      */
@@ -120,34 +136,38 @@ public function getStoreCategories()
     /**
      * Retrieve child categories of current category
      *
-     * @return Varien_Data_Tree_Node_Collection
+     * @return Mage_Catalog_Model_Resource_Category_Collection
      */
     public function getCurrentChildCategories()
     {
-        $layer = Mage::getSingleton('catalog/layer');
-        $category   = $layer->getCurrentCategory();
-        /* @var $category Mage_Catalog_Model_Category */
-        $categories = $category->getChildrenCategories();
-        $productCollection = Mage::getResourceModel('catalog/product_collection');
-        $layer->prepareProductCollection($productCollection);
-        $productCollection->addCountToCategories($categories);
-        return $categories;
+        if (null === $this->_currentChildCategories) {
+            $layer = Mage::getSingleton('catalog/layer');
+            $category = $layer->getCurrentCategory();
+            $this->_currentChildCategories = $category->getChildrenCategories();
+            $productCollection = Mage::getResourceModel('catalog/product_collection');
+            $layer->prepareProductCollection($productCollection);
+            $productCollection->addCountToCategories($this->_currentChildCategories);
+        }
+        return $this->_currentChildCategories;
     }
 
     /**
-     * Checkin activity of category
+     * Check whether specified category is active
      *
-     * @param   Varien_Object $category
-     * @return  bool
+     * @param Varien_Object $category
+     * @return bool
      */
     public function isCategoryActive($category)
     {
-        if ($this->getCurrentCategory()) {
-            return in_array($category->getId(), $this->getCurrentCategory()->getPathIds());
-        }
-        return false;
+        return $this->getCurrentCategory()
+            ? in_array($category->getId(), $this->getCurrentCategory()->getPathIds()) : false;
     }
 
+    /**
+     * Retrieve category instance
+     *
+     * @return Mage_Catalog_Model_Category
+     */
     protected function _getCategoryInstance()
     {
         if (is_null($this->_categoryInstance)) {
@@ -224,7 +244,9 @@ protected function _renderCategoryMenuItemHtml($category, $level = 0, $isLast =
         $html = array();
 
         // get all children
-        if (Mage::helper('catalog/category_flat')->isEnabled()) {
+        // If Flat Data enabled then use it but only on frontend
+        $flatHelper = Mage::helper('catalog/category_flat');
+        if ($flatHelper->isAvailable() && $flatHelper->isBuilt(true) && !Mage::app()->getStore()->isAdmin()) {
             $children = (array)$category->getChildrenNodes();
             $childrenCount = count($children);
         } else {
@@ -373,33 +395,33 @@ public function drawOpenCategoryItem($category) {
             return $html;
         }
 
-        $html.= '<li';
+        $html .= '<li';
 
         if ($this->isCategoryActive($category)) {
-            $html.= ' class="active"';
+            $html .= ' class="active"';
         }
 
-        $html.= '>'."\n";
-        $html.= '<a href="'.$this->getCategoryUrl($category).'"><span>'.$this->htmlEscape($category->getName()).'</span></a>'."\n";
+        $html .= '>' . "\n";
+        $html .= '<a href="'.$this->getCategoryUrl($category).'">'
+            . '<span>' . $this->escapeHtml($category->getName()) . '</span></a>' . "\n";
 
-        if (in_array($category->getId(), $this->getCurrentCategoryPath())){
+        if (in_array($category->getId(), $this->getCurrentCategoryPath())) {
             $children = $category->getChildren();
             $hasChildren = $children && $children->count();
 
             if ($hasChildren) {
                 $htmlChildren = '';
                 foreach ($children as $child) {
-                    $htmlChildren.= $this->drawOpenCategoryItem($child);
+                    $htmlChildren .= $this->drawOpenCategoryItem($child);
                 }
 
                 if (!empty($htmlChildren)) {
-                    $html.= '<ul>'."\n"
-                            .$htmlChildren
-                            .'</ul>';
+                    $html .= '<ul>' . "\n" . $htmlChildren . '</ul>';
                 }
             }
         }
-        $html.= '</li>'."\n";
+        $html .= '</li>'."\n";
+
         return $html;
     }
 
@@ -444,5 +466,4 @@ public function renderCategoriesMenuHtml($level = 0, $outermostItemClass = '', $
 
         return $html;
     }
-
 }
diff --git a/app/code/core/Mage/Catalog/Block/Product/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/Abstract.php
index a4728a51bda..eca05591e33 100644
--- a/app/code/core/Mage/Catalog/Block/Product/Abstract.php
+++ b/app/code/core/Mage/Catalog/Block/Product/Abstract.php
@@ -34,6 +34,11 @@
  */
 abstract class Mage_Catalog_Block_Product_Abstract extends Mage_Core_Block_Template
 {
+    /**
+     * Price block array
+     *
+     * @var array
+     */
     protected $_priceBlock = array();
 
     /**
@@ -43,10 +48,25 @@ abstract class Mage_Catalog_Block_Product_Abstract extends Mage_Core_Block_Templ
      */
     protected $_block = 'catalog/product_price';
 
+    /**
+     * Price template
+     *
+     * @var string
+     */
     protected $_priceBlockDefaultTemplate = 'catalog/product/price.phtml';
 
+    /**
+     * Tier price template
+     *
+     * @var string
+     */
     protected $_tierPriceDefaultTemplate  = 'catalog/product/view/tierprices.phtml';
 
+    /**
+     * Price types
+     *
+     * @var array
+     */
     protected $_priceBlockTypes = array();
 
     /**
@@ -56,6 +76,11 @@ abstract class Mage_Catalog_Block_Product_Abstract extends Mage_Core_Block_Templ
      */
     protected $_useLinkForAsLowAs = true;
 
+    /**
+     * Review block instance
+     *
+     * @var null|Mage_Review_Block_Helper
+     */
     protected $_reviewsHelperBlock;
 
     /**
@@ -89,18 +114,33 @@ abstract class Mage_Catalog_Block_Product_Abstract extends Mage_Core_Block_Templ
      */
     public function getAddToCartUrl($product, $additional = array())
     {
-        if ($product->getTypeInstance(true)->hasRequiredOptions($product)) {
-            if (!isset($additional['_escape'])) {
-                $additional['_escape'] = true;
-            }
-            if (!isset($additional['_query'])) {
-                $additional['_query'] = array();
-            }
-            $additional['_query']['options'] = 'cart';
-
-            return $this->getProductUrl($product, $additional);
+        if (!$product->getTypeInstance(true)->hasRequiredOptions($product)) {
+            return $this->helper('checkout/cart')->getAddUrl($product, $additional);
+        }
+        $additional = array_merge(
+            $additional,
+            array(Mage_Core_Model_Url::FORM_KEY => $this->_getSingletonModel('core/session')->getFormKey())
+        );
+        if (!isset($additional['_escape'])) {
+            $additional['_escape'] = true;
+        }
+        if (!isset($additional['_query'])) {
+            $additional['_query'] = array();
         }
-        return $this->helper('checkout/cart')->getAddUrl($product, $additional);
+        $additional['_query']['options'] = 'cart';
+        return $this->getProductUrl($product, $additional);
+    }
+
+    /**
+     * Return model instance
+     *
+     * @param string $className
+     * @param array $arguments
+     * @return Mage_Core_Model_Abstract
+     */
+    protected function _getSingletonModel($className, $arguments = array())
+    {
+        return Mage::getSingleton($className, $arguments);
     }
 
     /**
@@ -126,7 +166,7 @@ public function getSubmitUrl($product, $additional = array())
     }
 
     /**
-     * Enter description here...
+     * Return link to Add to Wishlist
      *
      * @param Mage_Catalog_Model_Product $product
      * @return string
@@ -147,14 +187,28 @@ public function getAddToCompareUrl($product)
         return $this->helper('catalog/product_compare')->getAddUrl($product);
     }
 
+    /**
+     * Gets minimal sales quantity
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @return int|null
+     */
     public function getMinimalQty($product)
     {
-        if ($stockItem = $product->getStockItem()) {
-            return ($stockItem->getMinSaleQty() && $stockItem->getMinSaleQty() > 0 ? $stockItem->getMinSaleQty() * 1 : null);
+        $stockItem = $product->getStockItem();
+        if ($stockItem) {
+            return ($stockItem->getMinSaleQty()
+                && $stockItem->getMinSaleQty() > 0 ? $stockItem->getMinSaleQty() * 1 : null);
         }
         return null;
     }
 
+    /**
+     * Return price block
+     *
+     * @param string $productTypeId
+     * @return mixed
+     */
     protected function _getPriceBlock($productTypeId)
     {
         if (!isset($this->_priceBlock[$productTypeId])) {
@@ -169,6 +223,12 @@ protected function _getPriceBlock($productTypeId)
         return $this->_priceBlock[$productTypeId];
     }
 
+    /**
+     * Return Block template
+     *
+     * @param string $productTypeId
+     * @return string
+     */
     protected function _getPriceBlockTemplate($productTypeId)
     {
         if (isset($this->_priceBlockTypes[$productTypeId])) {
@@ -304,6 +364,11 @@ public function getProduct()
         return $this->getData('product');
     }
 
+    /**
+     * Return tier price template
+     *
+     * @return mixed|string
+     */
     public function getTierPriceTemplate()
     {
         if (!$this->hasData('tier_price_template')) {
@@ -419,13 +484,13 @@ protected function _addProductAttributesAndPrices(Mage_Catalog_Model_Resource_Pr
      *
      * @return string
      */
-    public function getImageLabel($product=null, $mediaAttributeCode='image')
+    public function getImageLabel($product = null, $mediaAttributeCode = 'image')
     {
         if (is_null($product)) {
             $product = $this->getProduct();
         }
 
-        $label = $product->getData($mediaAttributeCode.'_label');
+        $label = $product->getData($mediaAttributeCode . '_label');
         if (empty($label)) {
             $label = $product->getName();
         }
@@ -448,7 +513,6 @@ public function getProductUrl($product, $additional = array())
             }
             return $product->getUrlModel()->getUrl($product, $additional);
         }
-
         return '#';
     }
 
@@ -457,18 +521,13 @@ public function getProductUrl($product, $additional = array())
      *
      * @param Mage_Catalog_Model_Product $product
      * @return bool
+     *
      */
     public function hasProductUrl($product)
     {
         if ($product->getVisibleInSiteVisibilities()) {
             return true;
         }
-        if ($product->hasUrlDataObject()) {
-            if (in_array($product->hasUrlDataObject()->getVisibility(), $product->getVisibleInSiteVisibilities())) {
-                return true;
-            }
-        }
-
         return false;
     }
 
@@ -558,6 +617,18 @@ public function getCanShowProductPrice($product)
         return $product->getCanShowPrice() !== false;
     }
 
+    /**
+     * Get if it is necessary to show product stock status
+     *
+     * @return bool
+     */
+    public function displayProductStockStatus()
+    {
+        $statusInfo = new Varien_Object(array('display_status' => true));
+        Mage::dispatchEvent('catalog_block_product_status_display', array('status' => $statusInfo));
+        return (boolean)$statusInfo->getDisplayStatus();
+    }
+
     /**
      * If exists price template block, retrieve price blocks from it
      *
diff --git a/app/code/core/Mage/Catalog/Block/Product/Compare/List.php b/app/code/core/Mage/Catalog/Block/Product/Compare/List.php
index 24fa4a1ebf7..bc0f5ac1bfe 100644
--- a/app/code/core/Mage/Catalog/Block/Product/Compare/List.php
+++ b/app/code/core/Mage/Catalog/Block/Product/Compare/List.php
@@ -62,6 +62,13 @@ class Mage_Catalog_Block_Product_Compare_List extends Mage_Catalog_Block_Product
      */
     protected $_customerId = null;
 
+    /**
+     * Default MAP renderer type
+     *
+     * @var string
+     */
+    protected $_mapRenderer = 'msrp_noform';
+
     /**
      * Retrieve url for adding product to wishlist with params
      *
diff --git a/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php b/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php
index 640d98cf092..f3df1a710cf 100644
--- a/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php
+++ b/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php
@@ -104,4 +104,21 @@ public function getCompareUrl()
     {
         return $this->_getHelper()->getListUrl();
     }
+
+    /**
+     * Retrieve block cache tags
+     *
+     * @return array
+     */
+    public function getCacheTags()
+    {
+        $compareItem = Mage::getModel('catalog/product_compare_item');
+        foreach ($this->getItems() as $product) {
+            $this->addModelTags($product);
+            $this->addModelTags(
+                $compareItem->setId($product->getCatalogCompareItemId())
+            );
+        }
+        return parent::getCacheTags();
+    }
 }
diff --git a/app/code/core/Mage/Catalog/Block/Product/List.php b/app/code/core/Mage/Catalog/Block/Product/List.php
index f5c2833332e..4ef69d716ac 100644
--- a/app/code/core/Mage/Catalog/Block/Product/List.php
+++ b/app/code/core/Mage/Catalog/Block/Product/List.php
@@ -81,6 +81,7 @@ protected function _getProductCollection()
                 if ($category->getId()) {
                     $origCategory = $layer->getCurrentCategory();
                     $layer->setCurrentCategory($category);
+                    $this->addModelTags($category);
                 }
             }
             $this->_productCollection = $layer->getProductCollection();
@@ -254,4 +255,17 @@ public function prepareSortableFieldsByCategory($category) {
 
         return $this;
     }
+
+    /**
+     * Retrieve block cache tags based on product collection
+     *
+     * @return array
+     */
+    public function getCacheTags()
+    {
+        return array_merge(
+            parent::getCacheTags(),
+            $this->getItemsTags($this->_getProductCollection())
+        );
+    }
 }
diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Related.php b/app/code/core/Mage/Catalog/Block/Product/List/Related.php
index 2732aefb2a7..abf1c8563ad 100644
--- a/app/code/core/Mage/Catalog/Block/Product/List/Related.php
+++ b/app/code/core/Mage/Catalog/Block/Product/List/Related.php
@@ -82,4 +82,14 @@ public function getItems()
     {
         return $this->_itemCollection;
     }
+
+    /**
+     * Get tags array for saving cache
+     *
+     * @return array
+     */
+    public function getCacheTags()
+    {
+        return array_merge(parent::getCacheTags(), $this->getItemsTags($this->getItems()));
+    }
 }
diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php
index fbc294a8689..5e315d29bb2 100644
--- a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php
+++ b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php
@@ -102,7 +102,7 @@ public function getItemCollection()
 
     public function getItems()
     {
-        if (is_null($this->_items)) {
+        if (is_null($this->_items) && $this->getItemCollection()) {
             $this->_items = $this->getItemCollection()->getItems();
         }
         return $this->_items;
@@ -167,4 +167,14 @@ public function getItemLimit($type = '')
             return 0;
         }
     }
+
+    /**
+     * Get tags array for saving cache
+     *
+     * @return array
+     */
+    public function getCacheTags()
+    {
+        return array_merge(parent::getCacheTags(), $this->getItemsTags($this->getItems()));
+    }
 }
diff --git a/app/code/core/Mage/Catalog/Block/Product/New.php b/app/code/core/Mage/Catalog/Block/Product/New.php
index 3125809f649..8af3122fdb6 100644
--- a/app/code/core/Mage/Catalog/Block/Product/New.php
+++ b/app/code/core/Mage/Catalog/Block/Product/New.php
@@ -29,13 +29,21 @@
  *
  * @category   Mage
  * @package    Mage_Catalog
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Mage_Catalog_Block_Product_New extends Mage_Catalog_Block_Product_Abstract
 {
-    protected $_productsCount = null;
+    /**
+     * Default value for products count that will be shown
+     */
+    const DEFAULT_PRODUCTS_COUNT = 10;
 
-    const DEFAULT_PRODUCTS_COUNT = 5;
+    /**
+     * Products count
+     *
+     * @var null
+     */
+    protected $_productsCount;
 
     /**
      * Initialize block's cache
@@ -50,10 +58,8 @@ protected function _construct()
             ->addColumnCountLayoutDepend('two_columns_right', 4)
             ->addColumnCountLayoutDepend('three_columns', 3);
 
-        $this->addData(array(
-            'cache_lifetime'    => 86400,
-            'cache_tags'        => array(Mage_Catalog_Model_Product::CACHE_TAG),
-        ));
+        $this->addData(array('cache_lifetime' => 86400));
+        $this->addCacheTag(Mage_Catalog_Model_Product::CACHE_TAG);
     }
 
     /**
@@ -75,11 +81,11 @@ public function getCacheKeyInfo()
     }
 
     /**
-     * Prepare collection with new products and applied page limits.
+     * Prepare and return product collection
      *
-     * return Mage_Catalog_Block_Product_New
+     * @return Mage_Catalog_Model_Resource_Product_Collection|Object|Varien_Data_Collection
      */
-    protected function _beforeToHtml()
+    protected function _getProductCollection()
     {
         $todayStartOfDayDate  = Mage::app()->getLocale()->date()
             ->setTime('00:00:00')
@@ -89,6 +95,7 @@ protected function _beforeToHtml()
             ->setTime('23:59:59')
             ->toString(Varien_Date::DATETIME_INTERNAL_FORMAT);
 
+        /** @var $collection Mage_Catalog_Model_Resource_Product_Collection */
         $collection = Mage::getResourceModel('catalog/product_collection');
         $collection->setVisibility(Mage::getSingleton('catalog/product_visibility')->getVisibleInCatalogIds());
 
@@ -114,8 +121,17 @@ protected function _beforeToHtml()
             ->setCurPage(1)
         ;
 
-        $this->setProductCollection($collection);
+        return $collection;
+    }
 
+    /**
+     * Prepare collection with new products
+     *
+     * @return Mage_Core_Block_Abstract
+     */
+    protected function _beforeToHtml()
+    {
+        $this->setProductCollection($this->_getProductCollection());
         return parent::_beforeToHtml();
     }
 
diff --git a/app/code/core/Mage/Catalog/Block/Product/Price.php b/app/code/core/Mage/Catalog/Block/Product/Price.php
index 0149979ea44..bd10b87703e 100644
--- a/app/code/core/Mage/Catalog/Block/Product/Price.php
+++ b/app/code/core/Mage/Catalog/Block/Product/Price.php
@@ -31,7 +31,7 @@
  * @category   Mage
  * @package    Mage_Catalog
  */
-class Mage_Catalog_Block_Product_Price extends Mage_Core_Block_Template
+class Mage_Catalog_Block_Product_Price extends Mage_Catalog_Block_Product_Abstract
 {
     protected $_priceDisplayType = null;
     protected $_idSuffix = '';
@@ -165,4 +165,27 @@ public function getRealPriceJs($product)
         $html = $this->hasRealPriceHtml() ? $this->getRealPriceHtml() : $product->getRealPriceHtml();
         return Mage::helper('core')->jsonEncode($html);
     }
+
+    /**
+     * Retrieve block cache tags
+     *
+     * @return array
+     */
+    public function getCacheTags()
+    {
+        return array_merge(parent::getCacheTags(), $this->getProduct()->getCacheIdTags());
+    }
+
+    /**
+     * Retrieve attribute instance by name, id or config node
+     *
+     * If attribute is not found false is returned
+     *
+     * @param string|integer|Mage_Core_Model_Config_Element $attribute
+     * @return Mage_Eav_Model_Entity_Attribute_Abstract || false
+     */
+    public function getProductAttribute($attribute)
+    {
+        return $this->getProduct()->getResource()->getAttribute($attribute);
+    }
 }
diff --git a/app/code/core/Mage/Catalog/Block/Product/View.php b/app/code/core/Mage/Catalog/Block/Product/View.php
index f641f24ec25..7f988a4df41 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View.php
@@ -61,7 +61,7 @@ protected function _prepareLayout()
             $currentCategory = Mage::registry('current_category');
             if ($keyword) {
                 $headBlock->setKeywords($keyword);
-            } elseif($currentCategory) {
+            } elseif ($currentCategory) {
                 $headBlock->setKeywords($product->getName());
             }
             $description = $product->getMetaDescription();
@@ -71,7 +71,7 @@ protected function _prepareLayout()
                 $headBlock->setDescription(Mage::helper('core/string')->substr($product->getDescription(), 0, 255));
             }
             if ($this->helper('catalog/product')->canUseCanonicalTag()) {
-                $params = array('_ignore_category'=>true);
+                $params = array('_ignore_category' => true);
                 $headBlock->addLinkRel('canonical', $product->getUrlModel()->getUrl($product, $params));
             }
         }
@@ -117,7 +117,7 @@ public function getAddToCartUrl($product, $additional = array())
             return $this->getCustomAddToCartUrl();
         }
 
-        if ($this->getRequest()->getParam('wishlist_next')){
+        if ($this->getRequest()->getParam('wishlist_next')) {
             $additional['wishlist_next'] = 1;
         }
 
@@ -191,9 +191,9 @@ public function getJsonConfig()
         );
 
         $responseObject = new Varien_Object();
-        Mage::dispatchEvent('catalog_product_view_config', array('response_object'=>$responseObject));
+        Mage::dispatchEvent('catalog_product_view_config', array('response_object' => $responseObject));
         if (is_array($responseObject->getAdditionalOptions())) {
-            foreach ($responseObject->getAdditionalOptions() as $option=>$value) {
+            foreach ($responseObject->getAdditionalOptions() as $option => $value) {
                 $config[$option] = $value;
             }
         }
@@ -259,4 +259,14 @@ public function getProductDefaultQty($product = null)
 
         return $qty;
     }
+
+    /**
+     * Retrieve block cache tags
+     *
+     * @return array
+     */
+    public function getCacheTags()
+    {
+        return array_merge(parent::getCacheTags(), $this->getProduct()->getCacheIdTags());
+    }
 }
diff --git a/app/code/core/Mage/Catalog/Block/Product/Widget/Html/Pager.php b/app/code/core/Mage/Catalog/Block/Product/Widget/Html/Pager.php
new file mode 100644
index 00000000000..40debf1a651
--- /dev/null
+++ b/app/code/core/Mage/Catalog/Block/Product/Widget/Html/Pager.php
@@ -0,0 +1,299 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Catalog
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * New products widget pager block
+ *
+ * @category   Mage
+ * @package    Mage_Catalog
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Catalog_Block_Product_Widget_Html_Pager extends Mage_Page_Block_Html_Pager
+{
+    /**
+     * Collection size
+     *
+     * Size of collection which may has a manual limitation
+     *
+     * @var int
+     */
+    protected $_collectionSize;
+
+    /**
+     * Current page
+     *
+     * @var int
+     */
+    protected $_currentPage;
+
+    /**
+     * Last page
+     *
+     * @var int
+     */
+    protected $_lastPage;
+
+    /**
+     * Return collection size
+     *
+     * It may be limited by manual
+     *
+     * @return int
+     */
+    public function getCollectionSize()
+    {
+        if (null === $this->_collectionSize) {
+            $this->_collectionSize = $this->getCollection()->getSize();
+            if ($this->getTotalLimit() && $this->_collectionSize > $this->getTotalLimit()) {
+                $this->_collectionSize = $this->getTotalLimit();
+            }
+        }
+        return $this->_collectionSize;
+    }
+
+    /**
+     * Return number of current page
+     *
+     * If current page is grate then total count of page current page will be equals total count of page
+     *
+     * @return int
+     */
+    public function getCurrentPage()
+    {
+        if (null === $this->_currentPage) {
+            $page = abs((int)$this->getRequest()->getParam($this->getPageVarName()));
+            if ($page > $this->getLastPageNum()) {
+                $this->_currentPage = $this->getLastPageNum();
+            } elseif ($page > 0) {
+                $this->_currentPage = $page;
+            } else {
+                $this->_currentPage = 1;
+            }
+        }
+        return $this->_currentPage;
+    }
+
+    /**
+     * Return items count per page
+     *
+     * @return int
+     */
+    public function getLimit()
+    {
+        if ($this->_limit > 0) {
+            return $this->_limit;
+        }
+        $limit  = $this->getRequest()->getParam($this->getLimitVarName());
+        $limits = $this->getAvailableLimit();
+        if ($limit && isset($limits[$limit])) {
+            return $limit;
+        }
+        $limits = array_keys($limits);
+        return current($limits);
+    }
+
+    /**
+     * Connect collection to paging
+     *
+     * @param   Mage_Core_Model_Resource_Db_Collection_Abstract $collection
+     * @return  Mage_Catalog_Block_Product_Widget_Html_Pager
+     */
+    public function setCollection($collection)
+    {
+        $this->_collection = $collection;
+        $this->_collection->setPageSize(null)->setCurPage(null);
+
+        $collectionOffset = $this->getFirstNum() - 1;
+        $collectionLimit  = $collectionOffset + $this->getLimit() > $this->getTotalNum()
+            ? $this->getTotalNum() - $collectionOffset
+            : $this->getLimit();
+
+        $this->_collection->getSelect()->limit($collectionLimit, $collectionOffset);
+        $this->_setFrameInitialized(false);
+        return $this;
+    }
+
+    /**
+     * Return position number in collection for first item on current page
+     *
+     * @return int
+     */
+    public function getFirstNum()
+    {
+        return $this->getLimit() * ($this->getCurrentPage() - 1) + 1;
+    }
+
+    /**
+     * Return position number in collection for last item on current page
+     *
+     * @return int
+     */
+    public function getLastNum()
+    {
+        $collection = $this->getCollection();
+        return $this->getLimit() * ($this->getCurrentPage() - 1) + $collection->count();
+    }
+
+    /**
+     * Return total number of collection
+     *
+     * It may be limited by manual
+     *
+     * @return int
+     */
+    public function getTotalNum()
+    {
+        return $this->getCollectionSize();
+    }
+
+    /**
+     * Return number of last page
+     *
+     * @return bool
+     */
+    public function getLastPageNum()
+    {
+        if (null === $this->_lastPage) {
+            $this->_lastPage = ceil($this->getCollectionSize() / $this->getLimit());
+            if ($this->_lastPage <= 0) {
+                $this->_lastPage = 1;
+            }
+        }
+        return $this->_lastPage;
+    }
+
+    /**
+     * Checks if current page is the first page
+     *
+     * @return bool
+     */
+    public function isFirstPage()
+    {
+        return $this->getCurrentPage() == 1;
+    }
+
+    /**
+     * Checks if current page is the last page
+     *
+     * @return bool
+     */
+    public function isLastPage()
+    {
+        return $this->getCurrentPage() >= $this->getLastPageNum();
+    }
+
+    /**
+     * Return array of pages
+     *
+     * @return array
+     */
+    public function getPages()
+    {
+        $pages = array();
+        if ($this->getLastPageNum() <= $this->_displayPages) {
+            $pages = range(1, $this->getLastPageNum());
+        } else {
+            $half = ceil($this->_displayPages / 2);
+            if ($this->getCurrentPage() >= $half && $this->getCurrentPage() <= $this->getLastPageNum() - $half) {
+                $start  = ($this->getCurrentPage() - $half) + 1;
+                $finish = ($start + $this->_displayPages) - 1;
+            } elseif ($this->getCurrentPage() < $half) {
+                $start  = 1;
+                $finish = $this->_displayPages;
+            } elseif ($this->getCurrentPage() > ($this->getLastPageNum() - $half)) {
+                $finish = $this->getLastPageNum();
+                $start  = $finish - $this->_displayPages + 1;
+            }
+            $pages = range($start, $finish);
+        }
+        return $pages;
+    }
+
+    /**
+     * Retrieve url for previous page
+     *
+     * @return string
+     */
+    public function getPreviousPageUrl()
+    {
+        return $this->getPageUrl($this->getCurrentPage() - 1);
+    }
+
+    /**
+     * Retrieve url for next page
+     *
+     * @return string
+     */
+    public function getNextPageUrl()
+    {
+        return $this->getPageUrl($this->getCurrentPage() + 1);
+    }
+
+    /**
+     * Retrieve url for last page
+     *
+     * @return string
+     */
+    public function getLastPageUrl()
+    {
+        return $this->getPageUrl($this->getLastPageNum());
+    }
+
+    /**
+     * Initialize frame data, such as frame start, frame start etc.
+     *
+     * @return Mage_Catalog_Block_Product_Widget_Html_Pager
+     */
+    protected function _initFrame()
+    {
+        if (!$this->isFrameInitialized()) {
+            $start = 0;
+            $end   = 0;
+
+            if ($this->getLastPageNum() <= $this->getFrameLength()) {
+                $start = 1;
+                $end = $this->getLastPageNum();
+            } else {
+                $half = ceil($this->getFrameLength() / 2);
+                if ($this->getCurrentPage() >= $half && $this->getCurrentPage() <= $this->getLastPageNum() - $half) {
+                    $start  = ($this->getCurrentPage() - $half) + 1;
+                    $end = ($start + $this->getFrameLength()) - 1;
+                } elseif ($this->getCurrentPage() < $half) {
+                    $start  = 1;
+                    $end = $this->getFrameLength();
+                } elseif ($this->getCurrentPage() > ($this->getLastPageNum() - $half)) {
+                    $end = $this->getLastPageNum();
+                    $start  = $end - $this->getFrameLength() + 1;
+                }
+            }
+            $this->_frameStart = $start;
+            $this->_frameEnd = $end;
+            $this->_setFrameInitialized(true);
+        }
+
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/Widget/New.php b/app/code/core/Mage/Catalog/Block/Product/Widget/New.php
index c277e030497..625d09f0b51 100644
--- a/app/code/core/Mage/Catalog/Block/Product/Widget/New.php
+++ b/app/code/core/Mage/Catalog/Block/Product/Widget/New.php
@@ -29,25 +29,115 @@
  *
  * @category   Mage
  * @package    Mage_Catalog
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @author     Magento Core Team <core@magentocommerce.com>
  */
-class Mage_Catalog_Block_Product_Widget_New
-    extends Mage_Catalog_Block_Product_New
+class Mage_Catalog_Block_Product_Widget_New extends Mage_Catalog_Block_Product_New
     implements Mage_Widget_Block_Interface
 {
     /**
-     * Internal contructor
+     * Display products type
+     */
+    const DISPLAY_TYPE_ALL_PRODUCTS         = 'all_products';
+    const DISPLAY_TYPE_NEW_PRODUCTS         = 'new_products';
+
+    /**
+     * Default value whether show pager or not
+     */
+    const DEFAULT_SHOW_PAGER                = false;
+
+    /**
+     * Default value for products per page
+     */
+    const DEFAULT_PRODUCTS_PER_PAGE         = 5;
+
+    /**
+     * Name of request parameter for page number value
+     */
+    const PAGE_VAR_NAME                     = 'np';
+
+    /**
+     * Instance of pager block
      *
+     * @var Mage_Catalog_Block_Product_Widget_Html_Pager
+     */
+    protected $_pager;
+
+    /**
+     * Initialize block's cache and template settings
      */
     protected function _construct()
     {
         parent::_construct();
-
         $this->addPriceBlockType('bundle', 'bundle/catalog_product_price', 'bundle/catalog/product/price.phtml');
     }
 
     /**
-     * Retrieve how much products should be displayed.
+     * Product collection initialize process
+     *
+     * @return Mage_Catalog_Model_Resource_Product_Collection|Object|Varien_Data_Collection
+     */
+    protected function _getProductCollection()
+    {
+        switch ($this->getDisplayType()) {
+            case self::DISPLAY_TYPE_NEW_PRODUCTS:
+                $collection = parent::_getProductCollection();
+                break;
+            default:
+                $collection = $this->_getRecentlyAddedProductsCollection();
+                break;
+        }
+        return $collection;
+    }
+
+    /**
+     * Prepare collection for recent product list
+     *
+     * @return Mage_Catalog_Model_Resource_Product_Collection|Object|Varien_Data_Collection
+     */
+    protected function _getRecentlyAddedProductsCollection()
+    {
+        /** @var $collection Mage_Catalog_Model_Resource_Product_Collection */
+        $collection = Mage::getResourceModel('catalog/product_collection');
+        $collection->setVisibility(Mage::getSingleton('catalog/product_visibility')->getVisibleInCatalogIds());
+
+        $collection = $this->_addProductAttributesAndPrices($collection)
+            ->addStoreFilter()
+            ->addAttributeToSort('created_at', 'desc')
+            ->setPageSize($this->getProductsCount())
+            ->setCurPage(1)
+        ;
+        return $collection;
+    }
+
+    /**
+     * Get key pieces for caching block content
+     *
+     * @return array
+     */
+    public function getCacheKeyInfo()
+    {
+        return array_merge(parent::getCacheKeyInfo(), array(
+            $this->getDisplayType(),
+            $this->getProductsPerPage(),
+            intval($this->getRequest()->getParam(self::PAGE_VAR_NAME))
+        ));
+    }
+
+    /**
+     * Retrieve display type for products
+     *
+     * @return string
+     */
+    public function getDisplayType()
+    {
+        if (!$this->hasData('display_type')) {
+            $this->setData('display_type', self::DISPLAY_TYPE_ALL_PRODUCTS);
+        }
+        return $this->getData('display_type');
+    }
+
+    /**
+     * Retrieve how much products should be displayed
      *
      * @return int
      */
@@ -56,6 +146,59 @@ public function getProductsCount()
         if (!$this->hasData('products_count')) {
             return parent::getProductsCount();
         }
-        return $this->_getData('products_count');
+        return $this->getData('products_count');
+    }
+
+    /**
+     * Retrieve how much products should be displayed
+     *
+     * @return int
+     */
+    public function getProductsPerPage()
+    {
+        if (!$this->hasData('products_per_page')) {
+            $this->setData('products_per_page', self::DEFAULT_PRODUCTS_PER_PAGE);
+        }
+        return $this->getData('products_per_page');
+    }
+
+    /**
+     * Return flag whether pager need to be shown or not
+     *
+     * @return bool
+     */
+    public function showPager()
+    {
+        if (!$this->hasData('show_pager')) {
+            $this->setData('show_pager', self::DEFAULT_SHOW_PAGER);
+        }
+        return (bool)$this->getData('show_pager');
+    }
+
+    /**
+     * Render pagination HTML
+     *
+     * @return string
+     */
+    public function getPagerHtml()
+    {
+        if ($this->showPager()) {
+            if (!$this->_pager) {
+                $this->_pager = $this->getLayout()
+                    ->createBlock('catalog/product_widget_html_pager', 'widget.new.product.list.pager');
+
+                $this->_pager->setUseContainer(true)
+                    ->setShowAmounts(true)
+                    ->setShowPerPage(false)
+                    ->setPageVarName(self::PAGE_VAR_NAME)
+                    ->setLimit($this->getProductsPerPage())
+                    ->setTotalLimit($this->getProductsCount())
+                    ->setCollection($this->getProductCollection());
+            }
+            if ($this->_pager instanceof Mage_Core_Block_Abstract) {
+                return $this->_pager->toHtml();
+            }
+        }
+        return '';
     }
 }
diff --git a/app/code/core/Mage/Catalog/Helper/Category/Flat.php b/app/code/core/Mage/Catalog/Helper/Category/Flat.php
index aaba1d7ed6e..b37ffb992db 100644
--- a/app/code/core/Mage/Catalog/Helper/Category/Flat.php
+++ b/app/code/core/Mage/Catalog/Helper/Category/Flat.php
@@ -31,44 +31,64 @@
  * @package    Mage_Catalog
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-class Mage_Catalog_Helper_Category_Flat extends Mage_Core_Helper_Abstract
+class Mage_Catalog_Helper_Category_Flat extends Mage_Catalog_Helper_Flat_Abstract
 {
+    /**
+     * Catalog Category Flat Is Enabled Config
+     */
     const XML_PATH_IS_ENABLED_FLAT_CATALOG_CATEGORY = 'catalog/frontend/flat_catalog_category';
 
     /**
-     * Return true if flat catalog is enabled, rebuileded and is not Admin
+     * Catalog Flat Category index process code
+     */
+    const CATALOG_CATEGORY_FLAT_PROCESS_CODE = 'catalog_category_flat';
+
+    /**
+     * Catalog Category Flat index process code
+     *
+     * @var string
+     */
+    protected $_indexerCode = self::CATALOG_CATEGORY_FLAT_PROCESS_CODE;
+
+    /**
+     * Store catalog Category Flat index process instance
+     *
+     * @var Mage_Index_Model_Process|null
+     */
+    protected $_process = null;
+
+    /**
+     * Check if Catalog Category Flat Data is enabled
      *
-     * @param boolean $skipAdmin
-     * @return boolean
+     * @param bool $skipAdminCheck this parameter is deprecated and no longer in use
+     *
+     * @return bool
      */
     public function isEnabled($skipAdminCheck = false)
     {
-        $flatFlag = Mage::getStoreConfigFlag(self::XML_PATH_IS_ENABLED_FLAT_CATALOG_CATEGORY);
-        $isFront = !Mage::app()->getStore()->isAdmin();
-        if ($skipAdminCheck === true) {
-            $isFront = true;
-        }
-
-        return (boolean) $flatFlag && $isFront;
+        return Mage::getStoreConfigFlag(self::XML_PATH_IS_ENABLED_FLAT_CATALOG_CATEGORY);
     }
 
     /**
-     * Return true if catalog category flat data rebuilt
+     * Check if Catalog Category Flat Data has been initialized
      *
-     * @return boolean
+     * @param null|bool|int|Mage_Core_Model_Store $store Store(id) for which the value is checked
+     * @return bool
      */
-    public function isRebuilt()
+    public function isBuilt($store = null)
     {
-        return Mage::getResourceSingleton('catalog/category_flat')->isRebuilt();
+        return Mage::getResourceSingleton('catalog/category_flat')->isBuilt($store);
     }
 
     /**
-     * Back Flat compatibility: check is built and enabled flat
+     * Check if Catalog Category Flat Data has been initialized
+     *
+     * @deprecated after 1.7.0.0 use Mage_Catalog_Helper_Category_Flat::isBuilt() instead
      *
      * @return bool
      */
-    public function isBuilt()
+    public function isRebuilt()
     {
-        return $this->isEnabled(true);
+        return $this->isBuilt();
     }
 }
diff --git a/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite.php b/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite.php
new file mode 100644
index 00000000000..69174d6c061
--- /dev/null
+++ b/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Catalog
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Category url rewrite helper
+ *
+ * @category    Mage
+ * @package     Mage_Catalog
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Catalog_Helper_Category_Url_Rewrite
+    implements Mage_Catalog_Helper_Category_Url_Rewrite_Interface
+{
+    /**
+     * Adapter instance
+     *
+     * @var Varien_Db_Adapter_Interface
+     */
+    protected $_connection;
+
+    /**
+     * Resource instance
+     *
+     * @var Mage_Core_Model_Resource
+     */
+    protected $_resource;
+
+    /**
+     * Initialize resource and connection instances
+     *
+     * @param array $args
+     */
+    public function __construct(array $args = array())
+    {
+        $this->_resource = Mage::getSingleton('core/resource');
+        $this->_connection = !empty($args['connection']) ? $args['connection'] : $this->_resource
+            ->getConnection(Mage_Core_Model_Resource::DEFAULT_READ_RESOURCE);
+    }
+
+    /**
+     * Join url rewrite table to eav collection
+     *
+     * @param Mage_Eav_Model_Entity_Collection_Abstract $collection
+     * @param int $storeId
+     * @return Mage_Catalog_Helper_Category_Url_Rewrite
+     */
+    public function joinTableToEavCollection(Mage_Eav_Model_Entity_Collection_Abstract $collection, $storeId)
+    {
+        $collection->joinTable(
+            'core/url_rewrite',
+            'category_id=entity_id',
+            array('request_path'),
+            "{{table}}.is_system=1 AND " .
+                "{{table}}.store_id='{$storeId}' AND " .
+                "{{table}}.id_path LIKE 'category/%'",
+            'left'
+        );
+        return $this;
+    }
+
+    /**
+     * Join url rewrite table to collection
+     *
+     * @param Mage_Catalog_Model_Resource_Category_Flat_Collection $collection
+     * @param int $storeId
+     * @return Mage_Catalog_Helper_Category_Url_Rewrite|Mage_Catalog_Helper_Category_Url_Rewrite_Interface
+     */
+    public function joinTableToCollection(Mage_Catalog_Model_Resource_Category_Flat_Collection $collection, $storeId)
+    {
+        $collection->getSelect()->joinLeft(
+            array('url_rewrite' => $collection->getTable('core/url_rewrite')),
+            'url_rewrite.category_id = main_table.entity_id AND url_rewrite.is_system = 1 '.
+                ' AND ' . $collection->getConnection()->quoteInto('url_rewrite.store_id = ?', $storeId).
+                ' AND ' . $collection->getConnection()->quoteInto('url_rewrite.id_path LIKE ?', 'category/%'),
+            array('request_path')
+        );
+        return $this;
+    }
+
+    /**
+     * Join url rewrite to select
+     *
+     * @param Varien_Db_Select $select
+     * @param int $storeId
+     * @return Mage_Catalog_Helper_Category_Url_Rewrite
+     */
+    public function joinTableToSelect(Varien_Db_Select $select, $storeId)
+    {
+        $select->joinLeft(
+            array('url_rewrite' => $this->_resource->getTableName('core/url_rewrite')),
+            'url_rewrite.category_id=main_table.entity_id AND url_rewrite.is_system=1 AND ' .
+                $this->_connection->quoteInto('url_rewrite.store_id = ? AND ',
+                    (int)$storeId) .
+                $this->_connection->prepareSqlCondition('url_rewrite.id_path', array('like' => 'category/%')),
+            array('request_path' => 'url_rewrite.request_path'));
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite/Interface.php b/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite/Interface.php
new file mode 100644
index 00000000000..d9917619279
--- /dev/null
+++ b/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite/Interface.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Catalog
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+
+/**
+ * Category url rewrite interface
+ *
+ * @category    Mage
+ * @package     Mage_Catalog
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+interface Mage_Catalog_Helper_Category_Url_Rewrite_Interface
+{
+    /**
+     * Join url rewrite table to eav collection
+     *
+     * @param Mage_Eav_Model_Entity_Collection_Abstract $collection
+     * @param int $storeId
+     * @return Mage_Catalog_Helper_Category_Url_Rewrite
+     */
+    public function joinTableToEavCollection(Mage_Eav_Model_Entity_Collection_Abstract $collection, $storeId);
+
+    /**
+     * Join url rewrite table to flat collection
+     *
+     * @param Mage_Catalog_Model_Resource_Category_Flat_Collection $collection
+     * @param int $storeId
+     * @return Mage_Catalog_Helper_Category_Url_Rewrite_Interface
+     */
+    public function joinTableToCollection(Mage_Catalog_Model_Resource_Category_Flat_Collection $collection, $storeId);
+
+    /**
+     * Join url rewrite to select
+     *
+     * @param Varien_Db_Select $select
+     * @param int $storeId
+     * @return Mage_Catalog_Helper_Category_Url_Rewrite
+     */
+    public function joinTableToSelect(Varien_Db_Select $select, $storeId);
+}
diff --git a/app/code/core/Mage/Catalog/Helper/Flat/Abstract.php b/app/code/core/Mage/Catalog/Helper/Flat/Abstract.php
new file mode 100644
index 00000000000..0018e229601
--- /dev/null
+++ b/app/code/core/Mage/Catalog/Helper/Flat/Abstract.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Catalog
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Catalog flat abstract helper
+ *
+ * @category   Mage
+ * @package    Mage_Catalog
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+abstract class Mage_Catalog_Helper_Flat_Abstract extends Mage_Core_Helper_Abstract
+{
+    /**
+     * Catalog Flat index process code
+     *
+     * @var null|string
+     */
+    protected $_indexerCode = null;
+
+    /**
+     * Store catalog Flat index process instance
+     *
+     * @var Mage_Index_Model_Process|null
+     */
+    protected $_process = null;
+
+    /**
+     * Check if Catalog Flat Data has been initialized
+     *
+     * @param null|bool|int|Mage_Core_Model_Store $store Store(id) for which the value is checked
+     * @return bool
+     */
+    abstract public function isBuilt($store = null);
+
+    /**
+     * Check if Catalog Category Flat Data is enabled
+     *
+     * @param mixed $deprecatedParam this parameter is deprecated and no longer in use
+     *
+     * @return bool
+     */
+    abstract public function isEnabled($deprecatedParam = false);
+
+    /**
+     * Check if Catalog Category Flat Data is available
+     * without lock check
+     *
+     * @return bool
+     */
+    public function isAccessible()
+    {
+        return $this->isEnabled() && $this->getProcess()->getStatus() != Mage_Index_Model_Process::STATUS_RUNNING;
+    }
+
+    /**
+     * Check if Catalog Category Flat Data is available for use
+     *
+     * @return bool
+     */
+    public function isAvailable()
+    {
+        return $this->isAccessible() && !$this->getProcess()->isLocked();
+    }
+
+    /**
+     * Retrieve Catalog Flat index process
+     *
+     * @return Mage_Index_Model_Process
+     */
+    public function getProcess()
+    {
+        if (is_null($this->_process)) {
+            $this->_process = Mage::getModel('index/process')
+                ->load($this->_indexerCode, 'indexer_code');
+        }
+        return $this->_process;
+    }
+}
diff --git a/app/code/core/Mage/Catalog/Helper/Product/Compare.php b/app/code/core/Mage/Catalog/Helper/Product/Compare.php
index d38d2ba6948..70696174f83 100644
--- a/app/code/core/Mage/Catalog/Helper/Product/Compare.php
+++ b/app/code/core/Mage/Catalog/Helper/Product/Compare.php
@@ -79,17 +79,17 @@ protected function _getSession()
      */
     public function getListUrl()
     {
-         $itemIds = array();
-         foreach ($this->getItemCollection() as $item) {
-             $itemIds[] = $item->getId();
-         }
+        $itemIds = array();
+        foreach ($this->getItemCollection() as $item) {
+            $itemIds[] = $item->getId();
+        }
 
          $params = array(
-            'items'=>implode(',', $itemIds),
+            'items' => implode(',', $itemIds),
             Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED => $this->getEncodedUrl()
-         );
+        );
 
-         return $this->_getUrl('catalog/product_compare', $params);
+        return $this->_getUrl('catalog/product_compare', $params);
     }
 
     /**
@@ -128,7 +128,8 @@ public function getAddToWishlistUrl($product)
         $beforeCompareUrl = Mage::getSingleton('catalog/session')->getBeforeCompareUrl();
 
         $params = array(
-            'product'=>$product->getId(),
+            'product' => $product->getId(),
+            Mage_Core_Model_Url::FORM_KEY => $this->_getSingletonModel('core/session')->getFormKey(),
             Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED => $this->getEncodedUrl($beforeCompareUrl)
         );
 
@@ -143,10 +144,11 @@ public function getAddToWishlistUrl($product)
      */
     public function getAddToCartUrl($product)
     {
-        $beforeCompareUrl = Mage::getSingleton('catalog/session')->getBeforeCompareUrl();
+        $beforeCompareUrl = $this->_getSingletonModel('catalog/session')->getBeforeCompareUrl();
         $params = array(
-            'product'=>$product->getId(),
-            Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED => $this->getEncodedUrl($beforeCompareUrl)
+            'product' => $product->getId(),
+            Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED => $this->getEncodedUrl($beforeCompareUrl),
+            Mage_Core_Model_Url::FORM_KEY => $this->_getSingletonModel('core/session')->getFormKey()
         );
 
         return $this->_getUrl('checkout/cart/add', $params);
@@ -161,7 +163,7 @@ public function getAddToCartUrl($product)
     public function getRemoveUrl($item)
     {
         $params = array(
-            'product'=>$item->getId(),
+            'product' => $item->getId(),
             Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED => $this->getEncodedUrl()
         );
         return $this->_getUrl('catalog/product_compare/remove', $params);
diff --git a/app/code/core/Mage/Catalog/Helper/Product/Flat.php b/app/code/core/Mage/Catalog/Helper/Product/Flat.php
index 4eacef653f7..a3764472d03 100644
--- a/app/code/core/Mage/Catalog/Helper/Product/Flat.php
+++ b/app/code/core/Mage/Catalog/Helper/Product/Flat.php
@@ -24,7 +24,6 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-
 /**
  * Catalog Product Flat Helper
  *
@@ -32,33 +31,48 @@
  * @package    Mage_Catalog
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-class Mage_Catalog_Helper_Product_Flat extends Mage_Core_Helper_Abstract
+class Mage_Catalog_Helper_Product_Flat extends Mage_Catalog_Helper_Flat_Abstract
 {
+    /**
+     * Catalog Product Flat Config
+     */
     const XML_PATH_USE_PRODUCT_FLAT          = 'catalog/frontend/flat_catalog_product';
     const XML_NODE_ADD_FILTERABLE_ATTRIBUTES = 'global/catalog/product/flat/add_filterable_attributes';
     const XML_NODE_ADD_CHILD_DATA            = 'global/catalog/product/flat/add_child_data';
 
+    /**
+     * Path for flat flag model
+     */
+    const XML_PATH_FLAT_FLAG                 = 'global/catalog/product/flat/flag/model';
+
     /**
      * Catalog Flat Product index process code
-     * 
-     * @var string
      */
     const CATALOG_FLAT_PROCESS_CODE = 'catalog_product_flat';
-    
+
+    /**
+     * Catalog Product Flat index process code
+     *
+     * @var string
+     */
+    protected $_indexerCode = self::CATALOG_FLAT_PROCESS_CODE;
+
     /**
-     * Catalog Product Flat index process
-     * 
-     * @var Mage_Index_Model_Process
+     * Catalog Product Flat index process instance
+     *
+     * @var Mage_Index_Model_Process|null
      */
-    protected $_process;
+    protected $_process = null;
 
     /**
-     * Catalog Product Flat status by store
-     * 
+     * Store flags which defines if Catalog Product Flat functionality is enabled
+     *
+     * @deprecated after 1.7.0.0
+     *
      * @var array
      */
-    protected $_isEnabled = array();    
-    
+    protected $_isEnabled = array();
+
     /**
      * Catalog Product Flat Flag object
      *
@@ -74,43 +88,52 @@ class Mage_Catalog_Helper_Product_Flat extends Mage_Core_Helper_Abstract
     public function getFlag()
     {
         if (is_null($this->_flagObject)) {
-            $this->_flagObject = Mage::getSingleton('catalog/product_flat_flag')
+            $className = (string)Mage::getConfig()->getNode(self::XML_PATH_FLAT_FLAG);
+            $this->_flagObject = Mage::getSingleton($className)
                 ->loadSelf();
         }
         return $this->_flagObject;
     }
 
     /**
-     * Check is builded Catalog Product Flat Data
+     * Check Catalog Product Flat functionality is enabled
+     *
+     * @param int|string|null|Mage_Core_Model_Store $store this parameter is deprecated and no longer in use
      *
      * @return bool
      */
-    public function isBuilt()
+    public function isEnabled($store = null)
     {
-        return $this->getFlag()->getIsBuilt();
+        return Mage::getStoreConfigFlag(self::XML_PATH_USE_PRODUCT_FLAT);
     }
 
     /**
-     * Check is enable catalog product for store
+     * Check if Catalog Product Flat Data has been initialized
      *
-     * @param mixed $store
+     * @param null|bool|int|Mage_Core_Model_Store $store Store(id) for which the value is checked
      * @return bool
      */
-    public function isEnabled($store = null)
+    public function isBuilt($store = null)
     {
-        $store = Mage::app()->getStore($store);
-        if ($store->isAdmin()) {
-            return false;
+        if ($store !== null) {
+            return $this->getFlag()->isStoreBuilt(Mage::app()->getStore($store)->getId());
         }
-        
-        if (!isset($this->_isEnabled[$store->getId()])) {
-            if (Mage::getStoreConfigFlag(self::XML_PATH_USE_PRODUCT_FLAT, $store)) {
-                $this->_isEnabled[$store->getId()] = $this->getProcess()->getStatus() == Mage_Index_Model_Process::STATUS_PENDING;
-            } else {
-                $this->_isEnabled[$store->getId()] = false;
-            }
+        return $this->getFlag()->getIsBuilt();
+    }
+
+    /**
+     * Check if Catalog Product Flat Data has been initialized for all stores
+     *
+     * @return bool
+     */
+    public function isBuiltAllStores()
+    {
+        $isBuildAll = true;
+        foreach(Mage::app()->getStores(false) as $store) {
+            /** @var $store Mage_Core_Model_Store */
+            $isBuildAll = $isBuildAll && $this->isBuilt($store->getId());
         }
-        return $this->_isEnabled[$store->getId()];        
+        return $isBuildAll;
     }
 
     /**
@@ -132,18 +155,4 @@ public function isAddChildData()
     {
         return intval(Mage::getConfig()->getNode(self::XML_NODE_ADD_CHILD_DATA));
     }
-
-    /**
-     * Retrive Catalog Product Flat index process
-     * 
-     * @return Mage_Index_Model_Process
-     */
-    public function getProcess()
-    {
-        if (is_null($this->_process)) {
-            $this->_process = Mage::getModel('index/process')
-                ->load(self::CATALOG_FLAT_PROCESS_CODE, 'indexer_code');
-        }
-        return $this->_process;
-    }
 }
diff --git a/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite.php b/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite.php
new file mode 100644
index 00000000000..189e20ec17e
--- /dev/null
+++ b/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Catalog
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Product url rewrite helper
+ *
+ * @category    Mage
+ * @package     Mage_Catalog
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Catalog_Helper_Product_Url_Rewrite
+    implements Mage_Catalog_Helper_Product_Url_Rewrite_Interface
+{
+    /**
+     * Adapter instance
+     *
+     * @var Varien_Db_Adapter_Interface
+     */
+    protected $_connection;
+
+    /**
+     * Resource instance
+     *
+     * @var Mage_Core_Model_Resource
+     */
+    protected $_resource;
+
+    /**
+     * Initialize resource and connection instances
+     *
+     * @param array $args
+     */
+    public function __construct(array $args = array())
+    {
+        $this->_resource = Mage::getSingleton('core/resource');
+        $this->_connection = !empty($args['connection']) ? $args['connection'] : $this->_resource
+            ->getConnection(Mage_Core_Model_Resource::DEFAULT_READ_RESOURCE);
+    }
+
+    /**
+     * Prepare and return select
+     *
+     * @param array $productIds
+     * @param int $categoryId
+     * @param int $storeId
+     * @return Varien_Db_Select
+     */
+    public function getTableSelect(array $productIds, $categoryId, $storeId)
+    {
+        $select = $this->_connection->select()
+            ->from($this->_resource->getTableName('core/url_rewrite'), array('product_id', 'request_path'))
+            ->where('store_id = ?', (int)$storeId)
+            ->where('is_system = ?', 1)
+            ->where('category_id = ? OR category_id IS NULL', (int)$categoryId)
+            ->where('product_id IN(?)', $productIds)
+            ->order('category_id ' . Varien_Data_Collection::SORT_ORDER_DESC);
+        return $select;
+    }
+
+    /**
+     * Prepare url rewrite left join statement for given select instance and store_id parameter.
+     *
+     * @param Varien_Db_Select $select
+     * @param int $storeId
+     * @return Mage_Catalog_Helper_Product_Url_Rewrite_Interface
+     */
+    public function joinTableToSelect(Varien_Db_Select $select, $storeId)
+    {
+        $select->joinLeft(
+            array('url_rewrite' => $this->_resource->getTableName('core/url_rewrite')),
+            'url_rewrite.product_id = main_table.entity_id AND url_rewrite.is_system = 1 AND ' .
+                $this->_connection->quoteInto('url_rewrite.category_id IS NULL AND url_rewrite.store_id = ? AND ',
+                    (int)$storeId) .
+                $this->_connection->prepareSqlCondition('url_rewrite.id_path', array('like' => 'product/%')),
+            array('request_path' => 'url_rewrite.request_path'));
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite/Interface.php b/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite/Interface.php
new file mode 100644
index 00000000000..5fc169fdf6c
--- /dev/null
+++ b/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite/Interface.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Catalog
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+
+/**
+ * Product url rewrite interface
+ *
+ * @category    Mage
+ * @package     Mage_Catalog
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+interface Mage_Catalog_Helper_Product_Url_Rewrite_Interface
+{
+    /**
+     * Prepare and return select
+     *
+     * @param array $productIds
+     * @param int $categoryId
+     * @param int $storeId
+     * @return Varien_Db_Select
+     */
+    public function getTableSelect(array $productIds, $categoryId, $storeId);
+
+    /**
+     * Prepare url rewrite left join statement for given select instance and store_id parameter.
+     *
+     * @param Varien_Db_Select $select
+     * @param int $storeId
+     * @return Mage_Catalog_Helper_Product_Url_Rewrite_Interface
+     */
+    public function joinTableToSelect(Varien_Db_Select $select, $storeId);
+}
diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php
index 59d3cae02c7..8f035cba448 100644
--- a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php
+++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php
@@ -73,7 +73,7 @@ protected function _retrieveCollection()
             ->addPriceData($this->_getCustomerGroupId(), $store->getWebsiteId())
             ->addAttributeToSelect(array_diff($availableAttributes, $entityOnlyAttributes))
             ->addAttributeToFilter('visibility', array(
-            'neq' => Mage_Catalog_Model_Product_Visibility::VISIBILITY_NOT_VISIBLE))
+                'neq' => Mage_Catalog_Model_Product_Visibility::VISIBILITY_NOT_VISIBLE))
             ->addAttributeToFilter('status', array('eq' => Mage_Catalog_Model_Product_Status::STATUS_ENABLED));
         $this->_applyCategoryFilter($collection);
         $this->_applyCollectionModifiers($collection);
@@ -125,7 +125,7 @@ protected function _prepareProductForResponse(Mage_Catalog_Model_Product $produc
         $productData['final_price_without_tax'] = $this->_applyTaxToPrice($finalPrice, false);
 
         $productData['is_saleable'] = $product->getIsSalable();
-        $productData['image_url'] = (string)Mage::helper('catalog/image')->init($product, 'image');
+        $productData['image_url'] = (string) Mage::helper('catalog/image')->init($product, 'image');
 
         if ($this->getActionType() == self::ACTION_TYPE_ENTITY) {
             // define URLs
@@ -255,9 +255,8 @@ protected function _getCategoryById($categoryId)
      * @see Mage_Tax_Helper_Data::getPrice()
      */
     protected function _getPrice($price, $includingTax = null, $shippingAddress = null,
-                                 $billingAddress = null, $ctc = null, $priceIncludesTax = null
-    )
-    {
+        $billingAddress = null, $ctc = null, $priceIncludesTax = null
+    ) {
         $product = $this->_getProduct();
         $store = $this->_getStore();
 
diff --git a/app/code/core/Mage/Catalog/Model/Attribute/Backend/Urlkey/Abstract.php b/app/code/core/Mage/Catalog/Model/Attribute/Backend/Urlkey/Abstract.php
new file mode 100644
index 00000000000..10a594c25c5
--- /dev/null
+++ b/app/code/core/Mage/Catalog/Model/Attribute/Backend/Urlkey/Abstract.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Catalog
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Product url key attribute backend
+ *
+ * @category   Mage
+ * @package    Mage_Catalog
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+abstract class Mage_Catalog_Model_Attribute_Backend_Urlkey_Abstract
+    extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract
+{
+    /**
+     * Format url key attribute before save, also use product name as url key if it empty
+     *
+     * @param Varien_Object $object
+     * @return Mage_Catalog_Model_Category_Attribute_Backend_Urlkey
+     */
+    public function beforeSave($object)
+    {
+        $attributeName = $this->getAttribute()->getName();
+
+        $urlKey = $object->getData($attributeName);
+        if ($urlKey === false) {
+            return $this;
+        }
+        if ($urlKey=='') {
+            $urlKey = $object->getName();
+        }
+
+        $object->setData($attributeName, $object->formatUrlKey($urlKey));
+
+        return $this;
+    }
+
+    /**
+     * Executes after url attribute save.
+     *
+     * @param Varien_Object $object
+     *
+     * @return Mage_Catalog_Model_Category_Attribute_Backend_Urlkey
+     */
+    public function afterSave($object)
+    {
+        /**
+         * This logic moved to Mage_Catalog_Model_Indexer_Url
+         */
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/Catalog/Model/Category.php b/app/code/core/Mage/Catalog/Model/Category.php
index 835eca27e5a..4795b155f0f 100644
--- a/app/code/core/Mage/Catalog/Model/Category.php
+++ b/app/code/core/Mage/Catalog/Model/Category.php
@@ -110,13 +110,25 @@ class Mage_Catalog_Model_Category extends Mage_Catalog_Model_Abstract
      */
     protected $_treeModel = null;
 
+    /**
+     * Category Url instance
+     *
+     * @var Mage_Catalog_Model_Category_Url
+     */
+    protected $_urlModel;
+
     /**
      * Initialize resource mode
      *
+     * @return void
      */
     protected function _construct()
     {
-        if (Mage::helper('catalog/category_flat')->isEnabled()) {
+        // If Flat Data enabled then use it but only on frontend
+        $flatHelper = Mage::helper('catalog/category_flat');
+        if ($flatHelper->isAvailable() && !Mage::app()->getStore()->isAdmin() && $flatHelper->isBuilt(true)
+            && !$this->getDisableFlat()
+        ) {
             $this->_init('catalog/category_flat');
             $this->_useFlatResource = true;
         } else {
@@ -145,7 +157,7 @@ public function getUrlInstance()
     public function getUrlRewrite()
     {
         if (!self::$_urlRewrite) {
-            self::$_urlRewrite = Mage::getModel('core/url_rewrite');
+            self::$_urlRewrite = Mage::getSingleton('core/factory')->getUrlRewriteInstance();
         }
         return self::$_urlRewrite;
     }
@@ -418,37 +430,20 @@ public function setStoreId($storeId)
      */
     public function getUrl()
     {
-        $url = $this->_getData('url');
-        if (is_null($url)) {
-            Varien_Profiler::start('REWRITE: '.__METHOD__);
-
-            if ($this->hasData('request_path') && $this->getRequestPath() != '') {
-                $this->setData('url', $this->getUrlInstance()->getDirectUrl($this->getRequestPath()));
-                Varien_Profiler::stop('REWRITE: '.__METHOD__);
-                return $this->getData('url');
-            }
-
-            Varien_Profiler::stop('REWRITE: '.__METHOD__);
-
-            $rewrite = $this->getUrlRewrite();
-            if ($this->getStoreId()) {
-                $rewrite->setStoreId($this->getStoreId());
-            }
-            $idPath = 'category/' . $this->getId();
-            $rewrite->loadByIdPath($idPath);
-
-            if ($rewrite->getId()) {
-                $this->setData('url', $this->getUrlInstance()->getDirectUrl($rewrite->getRequestPath()));
-                Varien_Profiler::stop('REWRITE: '.__METHOD__);
-                return $this->getData('url');
-            }
-
-            Varien_Profiler::stop('REWRITE: '.__METHOD__);
+        return $this->getUrlModel()->getCategoryUrl($this);
+    }
 
-            $this->setData('url', $this->getCategoryIdUrl());
-            return $this->getData('url');
+    /**
+     * Get product url model
+     *
+     * @return Mage_Catalog_Model_Category_Url
+     */
+    public function getUrlModel()
+    {
+        if ($this->_urlModel === null) {
+            $this->_urlModel = Mage::getSingleton('catalog/factory')->getCategoryUrlInstance();
         }
-        return $url;
+        return $this->_urlModel;
     }
 
     /**
@@ -476,7 +471,7 @@ public function getCategoryIdUrl()
      */
     public function formatUrlKey($str)
     {
-        $str = Mage::helper('core')->removeAccents($str);
+        $str = Mage::helper('catalog/product_url')->format($str);
         $urlKey = preg_replace('#[^0-9a-z]+#i', '-', $str);
         $urlKey = strtolower($urlKey);
         $urlKey = trim($urlKey, '-');
@@ -733,6 +728,9 @@ public function hasChildren()
      */
     public function getRequestPath()
     {
+        if (!$this->_getData('request_path')) {
+            $this->getUrl();
+        }
         return $this->_getData('request_path');
     }
 
@@ -841,6 +839,16 @@ public function getChildrenCategories()
         return $this->getResource()->getChildrenCategories($this);
     }
 
+    /**
+     * Return children categories of current category
+     *
+     * @return array
+     */
+    public function getChildrenCategoriesWithInactive()
+    {
+        return $this->getResource()->getChildrenCategoriesWithInactive($this);
+    }
+
     /**
      * Return parent category of current category with own custom design settings
      *
diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php
index cf118acface..2b2e42a2b7b 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php
@@ -44,13 +44,14 @@ class Mage_Catalog_Model_Category_Attribute_Backend_Sortby
     public function validate($object)
     {
         $attributeCode = $this->getAttribute()->getName();
-        $postDataConfig = ($object->getData('use_post_data_config'))? $object->getData('use_post_data_config') : array();
-        
-        $isUseConfig = false;
+        $postDataConfig = $object->getData('use_post_data_config');
         if ($postDataConfig) {
             $isUseConfig = in_array($attributeCode, $postDataConfig);
+        } else {
+            $isUseConfig = false;
+            $postDataConfig = array();
         }
-        
+
         if ($this->getAttribute()->getIsRequired()) {
             $attributeValue = $object->getData($attributeCode);
             if ($this->getAttribute()->isValueEmpty($attributeValue)) {
@@ -69,7 +70,7 @@ public function validate($object)
                 Mage::throwException(Mage::helper('eav')->__('The value of attribute "%s" must be unique.', $label));
             }
         }
-        
+
         if ($attributeCode == 'default_sort_by') {
             if ($available = $object->getData('available_sort_by')) {
                 if (!is_array($available)) {
@@ -78,16 +79,16 @@ public function validate($object)
                 $data = (!in_array('default_sort_by', $postDataConfig))? $object->getData($attributeCode):
                        Mage::getStoreConfig("catalog/frontend/default_sort_by");
                 if (!in_array($data, $available)) {
-                    Mage::throwException(Mage::helper('eav')->__('Default Product Listing Sort by not exists on Available Product Listing Sort By'));
+                    Mage::throwException(Mage::helper('eav')->__('Default Product Listing Sort by does not exist in Available Product Listing Sort By.'));
                 }
             } else {
                 if (!in_array('available_sort_by', $postDataConfig)) {
-                    Mage::throwException(Mage::helper('eav')->__('Default Product Listing Sort by not exists on Available Product Listing Sort By'));
+                    Mage::throwException(Mage::helper('eav')->__('Default Product Listing Sort by does not exist in Available Product Listing Sort By.'));
                 }
             }
         }
 
-        return true;        
+        return true;
     }
 
     /**
diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php
index 501115fe43c..22ca55ee80d 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php
@@ -30,50 +30,9 @@
  *
  * @category   Mage
  * @package    Mage_Catalog
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @author     Magento Core Team <core@magentocommerce.com>
  */
-class Mage_Catalog_Model_Category_Attribute_Backend_Urlkey extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract
+class Mage_Catalog_Model_Category_Attribute_Backend_Urlkey extends Mage_Catalog_Model_Attribute_Backend_Urlkey_Abstract
 {
 
-    /**
-     * Enter description here...
-     *
-     * @param Varien_Object $object
-     * @return Mage_Catalog_Model_Category_Attribute_Backend_Urlkey
-     */
-    public function beforeSave($object)
-    {
-        $attributeName = $this->getAttribute()->getName();
-
-        $urlKey = $object->getData($attributeName);
-        if ($urlKey === false) {
-            return $this;
-        }
-        if ($urlKey=='') {
-            $urlKey = $object->getName();
-        }
-
-        $object->setData($attributeName, $object->formatUrlKey($urlKey));
-
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param Varien_Object $object
-     */
-    public function afterSave($object)
-    {
-        /* @var $object Mage_Catalog_Model_Category */
-        /**
-         * Logic moved to Mage_Catalog_Molde_Indexer_Url
-         */
-        /*if (!$object->getInitialSetupFlag() && $object->getLevel() > 1) {
-            if ($object->dataHasChangedFor('url_key') || $object->getIsChangedProductList()) {
-                Mage::getSingleton('catalog/url')->refreshCategoryRewrite($object->getId());
-            }
-        }*/
-    }
-
 }
diff --git a/app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php b/app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php
index f13b469028f..71e3c72bafb 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php
@@ -57,6 +57,18 @@ class Mage_Catalog_Model_Category_Indexer_Flat extends Mage_Index_Model_Indexer_
         ),
     );
 
+    /**
+     * Whether the indexer should be displayed on process/list page
+     *
+     * @return bool
+     */
+    public function isVisible()
+    {
+        /** @var $categoryFlatHelper Mage_Catalog_Helper_Category_Flat */
+        $categoryFlatHelper = Mage::helper('catalog/category_flat');
+        return $categoryFlatHelper->isEnabled() || !$categoryFlatHelper->isBuilt();
+    }
+
     /**
      * Retrieve Indexer name
      *
@@ -97,7 +109,9 @@ protected function _getIndexer()
      */
     public function matchEvent(Mage_Index_Model_Event $event)
     {
-        if (!Mage::helper('catalog/category_flat')->isEnabled(true)) {
+        /** @var $categoryFlatHelper Mage_Catalog_Helper_Category_Flat */
+        $categoryFlatHelper = Mage::helper('catalog/category_flat');
+        if (!$categoryFlatHelper->isAccessible() || !$categoryFlatHelper->isBuilt()) {
             return false;
         }
 
@@ -213,7 +227,7 @@ protected function _registerCoreStoreEvent(Mage_Index_Model_Event $event)
         return $this;
     }
 
-/**
+    /**
      * Process event
      *
      * @param Mage_Index_Model_Event $event
diff --git a/app/code/core/Mage/Catalog/Model/Category/Url.php b/app/code/core/Mage/Catalog/Model/Category/Url.php
new file mode 100644
index 00000000000..cf0b2d09e63
--- /dev/null
+++ b/app/code/core/Mage/Catalog/Model/Category/Url.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Catalog
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Catalog category url
+ *
+ * @category   Mage
+ * @package    Mage_Catalog
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Catalog_Model_Category_Url
+{
+    /**
+     * Url instance
+     *
+     * @var Mage_Core_Model_Url
+     */
+    protected $_url;
+
+    /**
+     * Factory instance
+     *
+     * @var Mage_Catalog_Model_Factory
+     */
+    protected $_factory;
+
+    /**
+     * Url rewrite instance
+     *
+     * @var Mage_Core_Model_Url_Rewrite
+     */
+    protected $_urlRewrite;
+
+    /**
+     * Initialize Url model
+     *
+     * @param array $args
+     */
+    public function __construct(array $args = array())
+    {
+        $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('catalog/factory');
+    }
+
+    /**
+     * Retrieve Url for specified category
+     *
+     * @param Mage_Catalog_Model_Category $category
+     * @return string
+     */
+    public function getCategoryUrl(Mage_Catalog_Model_Category $category)
+    {
+        $url = $category->getData('url');
+        if (null !== $url) {
+            return $url;
+        }
+
+        Varien_Profiler::start('REWRITE: '.__METHOD__);
+
+        if ($category->hasData('request_path') && $category->getData('request_path') != '') {
+            $category->setData('url', $this->_getDirectUrl($category));
+            Varien_Profiler::stop('REWRITE: '.__METHOD__);
+            return $category->getData('url');
+        }
+
+        $requestPath = $this->_getRequestPath($category);
+        if ($requestPath) {
+            $category->setRequestPath($requestPath);
+            $category->setData('url', $this->_getDirectUrl($category));
+            Varien_Profiler::stop('REWRITE: '.__METHOD__);
+            return $category->getData('url');
+        }
+
+        Varien_Profiler::stop('REWRITE: '.__METHOD__);
+
+        $category->setData('url', $category->getCategoryIdUrl());
+        return $category->getData('url');
+    }
+
+    /**
+     * Returns category URL by which it can be accessed
+     * @param Mage_Catalog_Model_Category $category
+     * @return string
+     */
+    protected function _getDirectUrl(Mage_Catalog_Model_Category $category)
+    {
+        return $this->getUrlInstance()->getDirectUrl($category->getRequestPath());
+    }
+
+    /**
+     * Retrieve request path
+     *
+     * @param Mage_Catalog_Model_Category $category
+     * @return bool|string
+     */
+    protected function _getRequestPath(Mage_Catalog_Model_Category $category)
+    {
+        $rewrite = $this->getUrlRewrite();
+        $storeId = $category->getStoreId();
+        if ($storeId) {
+            $rewrite->setStoreId($storeId);
+        }
+        $idPath = 'category/' . $category->getId();
+        $rewrite->loadByIdPath($idPath);
+        if ($rewrite->getId()) {
+            return $rewrite->getRequestPath();
+        }
+        return false;
+    }
+
+    /**
+     * Retrieve Url instance
+     *
+     * @return Mage_Core_Model_Url
+     */
+    public function getUrlInstance()
+    {
+        if (null === $this->_url) {
+            $this->_url = $this->_factory->getModel('core/url');
+        }
+        return $this->_url;
+    }
+
+    /**
+     * Retrieve Url rewrite instance
+     *
+     * @return Mage_Core_Model_Url_Rewrite
+     */
+    public function getUrlRewrite()
+    {
+        if (null === $this->_urlRewrite) {
+            $this->_urlRewrite = $this->_factory->getUrlRewriteInstance();
+        }
+        return $this->_urlRewrite;
+    }
+}
diff --git a/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php
index 2a9987e560e..ad08fe8ac82 100644
--- a/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php
+++ b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php
@@ -482,7 +482,7 @@ public function save()
 
         $stockItems = Mage::registry('current_imported_inventory');
         if ($collections) foreach ($collections as $storeId=>$collection) {
-            $this->addException(Mage::helper('catalog')->__('Records for "'.$stores[$storeId].'" store found.'));
+            $this->addException(Mage::helper('catalog')->__('Records for "%s" store found.', $stores[$storeId]));
 
             if (!$collection instanceof Mage_Catalog_Model_Entity_Product_Collection) {
                 $this->addException(
diff --git a/app/code/core/Mage/Catalog/Model/Design.php b/app/code/core/Mage/Catalog/Model/Design.php
index 00a2b561982..fbb112ee186 100644
--- a/app/code/core/Mage/Catalog/Model/Design.php
+++ b/app/code/core/Mage/Catalog/Model/Design.php
@@ -61,7 +61,8 @@ public function applyDesign($object, $calledFrom = 0)
             return $this;
         }
 
-        if (Mage::helper('catalog/category_flat')->isEnabled()) {
+        // If Flat Data enabled then use it but only on frontend
+        if (Mage::helper('catalog/category_flat')->isAvailable() && !Mage::app()->getStore()->isAdmin()) {
             $this->_applyDesign($object, $calledFrom);
         } else {
             $this->_inheritDesign($object, $calledFrom);
diff --git a/app/code/core/Mage/Catalog/Model/Factory.php b/app/code/core/Mage/Catalog/Model/Factory.php
new file mode 100644
index 00000000000..d931b2e6f6a
--- /dev/null
+++ b/app/code/core/Mage/Catalog/Model/Factory.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Catalog
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+
+/**
+ * Catalog factory
+ *
+ * @category    Mage
+ * @package     Mage_Catalog
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Catalog_Model_Factory extends Mage_Core_Model_Factory
+{
+    /**
+     * Xml path to the category url rewrite helper class alias
+     */
+    const XML_PATH_CATEGORY_URL_REWRITE_HELPER_CLASS = 'global/catalog/category/url_rewrite/helper';
+
+    /**
+     * Xml path to the product url rewrite helper class alias
+     */
+    const XML_PATH_PRODUCT_URL_REWRITE_HELPER_CLASS = 'global/catalog/product/url_rewrite/helper';
+
+    /**
+     * Path to product_url model alias
+     */
+    const XML_PATH_PRODUCT_URL_MODEL = 'global/catalog/product/url/model';
+
+    /**
+     * Path to category_url model alias
+     */
+    const XML_PATH_CATEGORY_URL_MODEL = 'global/catalog/category/url/model';
+
+    /**
+     * Returns category url rewrite helper instance
+     *
+     * @return Mage_Catalog_Helper_Category_Url_Rewrite_Interface
+     */
+    public function getCategoryUrlRewriteHelper()
+    {
+        return $this->getHelper(
+            (string)$this->_config->getNode(self::XML_PATH_CATEGORY_URL_REWRITE_HELPER_CLASS)
+        );
+    }
+
+    /**
+     * Returns product url rewrite helper instance
+     *
+     * @return Mage_Catalog_Helper_Product_Url_Rewrite_Interface
+     */
+    public function getProductUrlRewriteHelper()
+    {
+        return $this->getHelper(
+            (string)$this->_config->getNode(self::XML_PATH_PRODUCT_URL_REWRITE_HELPER_CLASS)
+        );
+    }
+
+    /**
+     * Retrieve product_url instance
+     *
+     * @return Mage_Catalog_Model_Product_Url
+     */
+    public function getProductUrlInstance()
+    {
+        return $this->getModel(
+            (string)$this->_config->getNode(self::XML_PATH_PRODUCT_URL_MODEL)
+        );
+    }
+
+    /**
+     * Retrieve category_url instance
+     *
+     * @return Mage_Catalog_Model_Category_Url
+     */
+    public function getCategoryUrlInstance()
+    {
+        return $this->getModel(
+            (string)$this->_config->getNode(self::XML_PATH_CATEGORY_URL_MODEL)
+        );
+    }
+}
diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php
index f7391fb59a2..34306f85791 100644
--- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php
+++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php
@@ -169,7 +169,7 @@ protected function _getItemsData()
             foreach ($categories as $category) {
                 if ($category->getIsActive() && $category->getProductCount()) {
                     $data[] = array(
-                        'label' => Mage::helper('core')->htmlEscape($category->getName()),
+                        'label' => Mage::helper('core')->escapeHtml($category->getName()),
                         'value' => $category->getId(),
                         'count' => $category->getProductCount(),
                     );
diff --git a/app/code/core/Mage/Catalog/Model/Observer.php b/app/code/core/Mage/Catalog/Model/Observer.php
index 6b6452bfb0b..8ee8ded5f32 100644
--- a/app/code/core/Mage/Catalog/Model/Observer.php
+++ b/app/code/core/Mage/Catalog/Model/Observer.php
@@ -42,24 +42,13 @@ class Mage_Catalog_Model_Observer
      */
     public function storeEdit(Varien_Event_Observer $observer)
     {
+        /** @var $store Mage_Core_Model_Store */
         $store = $observer->getEvent()->getStore();
-        /* @var $store Mage_Core_Model_Store */
         if ($store->dataHasChangedFor('group_id')) {
             Mage::app()->reinitStores();
-            /**
-             * @see Mage_Catalog_Model_Indexer_Url
-             */
-            //Mage::getModel('catalog/url')->refreshRewrites($store->getId());
-
-            /**
-             * @see Mage_Catalog_Model_Category_Indexer_Product
-             */
-            /*Mage::getResourceModel('catalog/category')->refreshProductIndex(
-                array(),
-                array(),
-                array($store->getId())
-            );*/
-            if (Mage::helper('catalog/category_flat')->isEnabled(true)) {
+            /** @var $categoryFlatHelper Mage_Catalog_Helper_Category_Flat */
+            $categoryFlatHelper = Mage::helper('catalog/category_flat');
+            if ($categoryFlatHelper->isAvailable() && $categoryFlatHelper->isBuilt()) {
                 Mage::getResourceModel('catalog/category_flat')->synchronize(null, array($store->getId()));
             }
             Mage::getResourceSingleton('catalog/product')->refreshEnabledIndex($store);
@@ -75,26 +64,14 @@ public function storeEdit(Varien_Event_Observer $observer)
      */
     public function storeAdd(Varien_Event_Observer $observer)
     {
-        $store = $observer->getEvent()->getStore();
         /* @var $store Mage_Core_Model_Store */
+        $store = $observer->getEvent()->getStore();
         Mage::app()->reinitStores();
         Mage::getConfig()->reinit();
-
-        /**
-         * @see Mage_Catalog_Model_Indexer_Url
-         */
-        //Mage::getModel('catalog/url')->refreshRewrites($store->getId());
-        /**
-         * @see Mage_Catalog_Model_Category_Indexer_Product
-         */
-        /*Mage::getResourceSingleton('catalog/category')->refreshProductIndex(
-            array(),
-            array(),
-            array($store->getId())
-        );*/
-        if (Mage::helper('catalog/category_flat')->isEnabled(true)) {
-            Mage::getResourceModel('catalog/category_flat')
-                ->synchronize(null, array($store->getId()));
+        /** @var $categoryFlatHelper Mage_Catalog_Helper_Category_Flat */
+        $categoryFlatHelper = Mage::helper('catalog/category_flat');
+        if ($categoryFlatHelper->isAvailable() && $categoryFlatHelper->isBuilt()) {
+            Mage::getResourceModel('catalog/category_flat')->synchronize(null, array($store->getId()));
         }
         Mage::getResourceModel('catalog/product')->refreshEnabledIndex($store);
         return $this;
@@ -108,26 +85,15 @@ public function storeAdd(Varien_Event_Observer $observer)
      */
     public function storeGroupSave(Varien_Event_Observer $observer)
     {
-        $group = $observer->getEvent()->getGroup();
         /* @var $group Mage_Core_Model_Store_Group */
+        $group = $observer->getEvent()->getGroup();
         if ($group->dataHasChangedFor('root_category_id') || $group->dataHasChangedFor('website_id')) {
             Mage::app()->reinitStores();
             foreach ($group->getStores() as $store) {
-                /**
-                 * @see Mage_Catalog_Model_Indexer_Url
-                 */
-                //Mage::getModel('catalog/url')->refreshRewrites($store->getId());
-                /**
-                 * @see Mage_Catalog_Model_Category_Indexer_Product
-                 */
-                /*Mage::getResourceSingleton('catalog/category')->refreshProductIndex(
-                    array(),
-                    array(),
-                    array($store->getId())
-                );*/
-                if (Mage::helper('catalog/category_flat')->isEnabled(true)) {
-                    Mage::getResourceModel('catalog/category_flat')
-                        ->synchronize(null, array($store->getId()));
+                /** @var $categoryFlatHelper Mage_Catalog_Helper_Category_Flat */
+                $categoryFlatHelper = Mage::helper('catalog/category_flat');
+                if ($categoryFlatHelper->isAvailable() && $categoryFlatHelper->isBuilt()) {
+                    Mage::getResourceModel('catalog/category_flat')->synchronize(null, array($store->getId()));
                 }
             }
         }
@@ -142,7 +108,9 @@ public function storeGroupSave(Varien_Event_Observer $observer)
      */
     public function storeDelete(Varien_Event_Observer $observer)
     {
-        if (Mage::helper('catalog/category_flat')->isEnabled(true)) {
+        /** @var $categoryFlatHelper Mage_Catalog_Helper_Category_Flat */
+        $categoryFlatHelper = Mage::helper('catalog/category_flat');
+        if ($categoryFlatHelper->isAvailable() && $categoryFlatHelper->isBuilt()) {
             $store = $observer->getEvent()->getStore();
             Mage::getResourceModel('catalog/category_flat')->deleteStores($store->getId());
         }
@@ -160,21 +128,10 @@ public function categoryMove(Varien_Event_Observer $observer)
         $categoryId = $observer->getEvent()->getCategoryId();
         $prevParentId = $observer->getEvent()->getPrevParentId();
         $parentId = $observer->getEvent()->getParentId();
-        /**
-         * @see Mage_Catalog_Model_Indexer_Url
-         */
-        //Mage::getModel('catalog/url')->refreshCategoryRewrite($categoryId);
-        /**
-         * @see Mage_Catalog_Model_Category_Indexer_Product
-         */
-        /*Mage::getResourceSingleton('catalog/category')->refreshProductIndex(array(
-            $categoryId, $prevParentId, $parentId
-        ));*/
-        //Mage::getModel('catalog/category')->load($prevParentId)->save();
-        //Mage::getModel('catalog/category')->load($parentId)->save();
-        if (Mage::helper('catalog/category_flat')->isEnabled(true)) {
-            Mage::getResourceModel('catalog/category_flat')
-                ->move($categoryId, $prevParentId, $parentId);
+        /** @var $categoryFlatHelper Mage_Catalog_Helper_Category_Flat */
+        $categoryFlatHelper = Mage::helper('catalog/category_flat');
+        if ($categoryFlatHelper->isAvailable() && $categoryFlatHelper->isBuilt()) {
+            Mage::getResourceModel('catalog/category_flat')->move($categoryId, $prevParentId, $parentId);
         }
         return $this;
     }
@@ -212,7 +169,9 @@ public function catalogProductCompareClean(Varien_Event_Observer $observer)
      */
     public function categorySaveAfter(Varien_Event_Observer $observer)
     {
-        if (Mage::helper('catalog/category_flat')->isEnabled(true)) {
+        /** @var $categoryFlatHelper Mage_Catalog_Helper_Category_Flat */
+        $categoryFlatHelper = Mage::helper('catalog/category_flat');
+        if ($categoryFlatHelper->isAvailable() && $categoryFlatHelper->isBuilt()) {
             $category = $observer->getEvent()->getCategory();
             Mage::getResourceModel('catalog/category_flat')->synchronize($category);
         }
@@ -252,7 +211,11 @@ public function reindexProductPrices(Mage_Cron_Model_Schedule $schedule)
      */
     public function addCatalogToTopmenuItems(Varien_Event_Observer $observer)
     {
-        $this->_addCategoriesToMenu(Mage::helper('catalog/category')->getStoreCategories(), $observer->getMenu());
+        $block = $observer->getEvent()->getBlock();
+        $block->addCacheTag(Mage_Catalog_Model_Category::CACHE_TAG);
+        $this->_addCategoriesToMenu(
+            Mage::helper('catalog/category')->getStoreCategories(), $observer->getMenu(), $block, true
+        );
     }
 
     /**
@@ -260,9 +223,12 @@ public function addCatalogToTopmenuItems(Varien_Event_Observer $observer)
      *
      * @param Varien_Data_Tree_Node_Collection|array $categories
      * @param Varien_Data_Tree_Node $parentCategoryNode
+     * @param Mage_Page_Block_Html_Topmenu $menuBlock
+     * @param bool $addTags
      */
-    protected function _addCategoriesToMenu($categories, $parentCategoryNode)
+    protected function _addCategoriesToMenu($categories, $parentCategoryNode, $menuBlock, $addTags = false)
     {
+        $categoryModel = Mage::getModel('catalog/category');
         foreach ($categories as $category) {
             if (!$category->getIsActive()) {
                 continue;
@@ -270,6 +236,11 @@ protected function _addCategoriesToMenu($categories, $parentCategoryNode)
 
             $nodeId = 'category-node-' . $category->getId();
 
+            $categoryModel->setId($category->getId());
+            if ($addTags) {
+                $menuBlock->addModelTags($categoryModel);
+            }
+
             $tree = $parentCategoryNode->getTree();
             $categoryData = array(
                 'name' => $category->getName(),
@@ -280,13 +251,14 @@ protected function _addCategoriesToMenu($categories, $parentCategoryNode)
             $categoryNode = new Varien_Data_Tree_Node($categoryData, 'id', $tree, $parentCategoryNode);
             $parentCategoryNode->addChild($categoryNode);
 
-            if (Mage::helper('catalog/category_flat')->isEnabled()) {
+            $flatHelper = Mage::helper('catalog/category_flat');
+            if ($flatHelper->isEnabled() && $flatHelper->isBuilt(true)) {
                 $subcategories = (array)$category->getChildrenNodes();
             } else {
                 $subcategories = $category->getChildren();
             }
 
-            $this->_addCategoriesToMenu($subcategories, $categoryNode);
+            $this->_addCategoriesToMenu($subcategories, $categoryNode, $menuBlock, $addTags);
         }
     }
 
@@ -311,4 +283,26 @@ protected function _isActiveMenuCategory($category)
         $categoryPathIds = explode(',', $currentCategory->getPathInStore());
         return in_array($category->getId(), $categoryPathIds);
     }
+
+    /**
+     * Checks whether attribute_code by current module is reserved
+     *
+     * @param Varien_Event_Observer $observer
+     * @throws Mage_Core_Exception
+     */
+    public function checkReservedAttributeCodes(Varien_Event_Observer $observer)
+    {
+        /** @var $attribute Mage_Catalog_Model_Entity_Attribute */
+        $attribute = $observer->getEvent()->getAttribute();
+        if (!is_object($attribute)) {
+            return;
+        }
+        /** @var $product Mage_Catalog_Model_Product */
+        $product = Mage::getModel('catalog/product');
+        if ($product->isReservedAttribute($attribute)) {
+            throw new Mage_Core_Exception(
+                Mage::helper('catalog')->__('The attribute code \'%s\' is reserved by system. Please try another attribute code', $attribute->getAttributeCode())
+            );
+        }
+    }
 }
diff --git a/app/code/core/Mage/Catalog/Model/Product.php b/app/code/core/Mage/Catalog/Model/Product.php
index 2b6cecb7e69..be8b1b52a6e 100644
--- a/app/code/core/Mage/Catalog/Model/Product.php
+++ b/app/code/core/Mage/Catalog/Model/Product.php
@@ -28,10 +28,11 @@
  * Catalog product model
  *
  * @method Mage_Catalog_Model_Resource_Product getResource()
- * @method Mage_Catalog_Model_Resource_Product _getResource()
+ * @method Mage_Catalog_Model_Product setHasError(bool $value)
+ * @method null|bool getHasError()
  *
- * @category   Mage
- * @package    Mage_Catalog
+ * @category    Mage
+ * @package     Mage_Catalog
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Mage_Catalog_Model_Product extends Mage_Catalog_Model_Abstract
@@ -165,7 +166,7 @@ public function getResourceCollection()
     public function getUrlModel()
     {
         if ($this->_urlModel === null) {
-            $this->_urlModel = Mage::getSingleton('catalog/product_url');
+            $this->_urlModel = Mage::getSingleton('catalog/factory')->getProductUrlInstance();
         }
         return $this->_urlModel;
     }
@@ -1325,7 +1326,7 @@ public function isAvailable()
     public function getIsSalable()
     {
         $productType = $this->getTypeInstance(true);
-        if (is_callable(array($productType, 'getIsSalable'))) {
+        if (method_exists($productType, 'getIsSalable')) {
             return $productType->getIsSalable($this);
         }
         if ($this->hasData('is_salable')) {
@@ -1534,6 +1535,9 @@ public function delete()
      */
     public function getRequestPath()
     {
+        if (!$this->_getData('request_path')) {
+            $this->getProductUrl();
+        }
         return $this->_getData('request_path');
     }
 
@@ -1914,7 +1918,7 @@ public function isProductsHasSku(array $productIds)
         $products = $this->_getResource()->getProductsSku($productIds);
         if (count($products)) {
             foreach ($products as $product) {
-                if (empty($product['sku'])) {
+                if (!strlen($product['sku'])) {
                     return false;
                 }
             }
diff --git a/app/code/core/Mage/Catalog/Model/Product/Api.php b/app/code/core/Mage/Catalog/Model/Product/Api.php
index 178ab9bbbf7..a7d2373ffb3 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Api.php
@@ -123,13 +123,18 @@ public function items($filters = null, $store = null)
      *
      * @param int|string $productId
      * @param string|int $store
-     * @param array $attributes
+     * @param array      $attributes
+     * @param string     $identifierType
      * @return array
      */
     public function info($productId, $store = null, $attributes = null, $identifierType = null)
     {
-        $product = $this->_getProduct($productId, $store, $identifierType);
+        // make sku flag case-insensitive
+        if (!empty($identifierType)) {
+            $identifierType = strtolower($identifierType);
+        }
 
+        $product = $this->_getProduct($productId, $store, $identifierType);
 
         $result = array( // Basic product data
             'product_id' => $product->getId(),
@@ -352,7 +357,15 @@ public function setSpecialPrice($productId, $specialPrice = null, $fromDate = nu
      */
     public function getSpecialPrice($productId, $store = null)
     {
-        return $this->info($productId, $store, array('special_price', 'special_from_date', 'special_to_date'));
+        $product = $this->_getProduct($productId, $store);
+
+        $result = array(
+            'special_price'     => $product->getSpecialPrice(),
+            'special_from_date' => $product->getSpecialFromDate(),
+            'special_to_date'   => $product->getSpecialToDate()
+        );
+
+        return $result;
     }
 
     /**
diff --git a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php
index 6fa37d4b1ca..76cfc309935 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php
@@ -38,11 +38,17 @@ class Mage_Catalog_Model_Product_Api_V2 extends Mage_Catalog_Model_Product_Api
      *
      * @param int|string $productId
      * @param string|int $store
-     * @param stdClass $attributes
+     * @param stdClass   $attributes
+     * @param string     $identifierType
      * @return array
      */
     public function info($productId, $store = null, $attributes = null, $identifierType = null)
     {
+        // make sku flag case-insensitive
+        if (!empty($identifierType)) {
+            $identifierType = strtolower($identifierType);
+        }
+
         $product = $this->_getProduct($productId, $store, $identifierType);
 
         $result = array( // Basic product data
@@ -193,6 +199,41 @@ public function update($productId, $productData, $store = null, $identifierType
         return true;
     }
 
+    /**
+     * Update multiple products information at once
+     *
+     * @param array      $productIds
+     * @param array      $productData
+     * @param string|int $store
+     * @param string     $identifierType
+     * @return boolean
+     */
+    public function multiUpdate($productIds, $productData, $store = null, $identifierType = null)
+    {
+        if (count($productIds) != count($productData)) {
+            $this->_fault('multi_update_not_match');
+        }
+
+        $productData = (array)$productData;
+        $failMessages = array();
+
+        foreach ($productIds as $index => $productId) {
+            try {
+                $this->update($productId, $productData[$index], $store, $identifierType);
+            } catch (Mage_Api_Exception $e) {
+                $failMessages[] = sprintf("Product ID %d:\n %s", $productId, $e->getMessage());
+            }
+        }
+
+        if (empty($failMessages)) {
+            return true;
+        } else {
+            $this->_fault('partially_updated', implode("\n", $failMessages));
+        }
+
+        return false;
+    }
+
     /**
      *  Set additional data before product saved
      *
@@ -276,7 +317,7 @@ protected function _prepareDataForSave ($product, $productData)
     }
 
     /**
-     * Update product special price
+     * Update product special priceim
      *
      * @param int|string $productId
      * @param float $specialPrice
@@ -296,24 +337,4 @@ public function setSpecialPrice($productId, $specialPrice = null, $fromDate = nu
         $obj->special_to_date = $toDate;
         return $this->update($productId, $obj, $store, $identifierType);
     }
-
-    /**
-     * Retrieve product special price
-     *
-     * @param int|string $productId
-     * @param string|int $store
-     * @return array
-     */
-    public function getSpecialPrice($productId, $store = null)
-    {
-        return $this->info($productId, $store, array(
-            'attributes' => array(
-                'special_price',
-                'special_from_date',
-                'special_to_date'
-                )
-            )
-        );
-    }
-
 }
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php
index 9e37188ba00..9c4b3b6f120 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php
@@ -150,7 +150,7 @@ public function create($data)
         /** @var $helper Mage_Catalog_Helper_Product */
         $helper = Mage::helper('catalog/product');
 
-        if (empty($data['attribute_code']) || !is_array($data['frontend_label'])) {
+        if (empty($data['attribute_code']) || (isset($data['frontend_label']) && !is_array($data['frontend_label']))) {
             $this->_fault('invalid_parameters');
         }
 
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
index 77d98ab571b..3ec690bb68f 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
@@ -138,8 +138,12 @@ public function beforeSave($object)
                 if (!isset($image['value_id'])) {
                     continue;
                 }
-                $duplicate[$image['value_id']] = $this->_copyImage($image['file']);
-                $newImages[$image['file']] = $duplicate[$image['value_id']];
+                $newFile = $this->_copyImage($image['file']);
+                $newImages[$image['file']] = array(
+                    'new_file' => $newFile,
+                    'label' => $image['label']
+                );
+                $duplicate[$image['value_id']] = $newFile;
             }
 
             $value['duplicate'] = $duplicate;
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php
index a3634a2ee98..ee245d0779b 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php
@@ -35,21 +35,74 @@
 
 class Mage_Catalog_Model_Product_Attribute_Backend_Startdate extends Mage_Eav_Model_Entity_Attribute_Backend_Datetime
 {
-    public function beforeSave($object)
+   /**
+    * Get attribute value for save.
+    *
+    * @param Varien_Object $object
+    * @return string|bool
+    */
+    protected function _getValueForSave($object)
     {
         $attributeName  = $this->getAttribute()->getName();
         $startDate      = $object->getData($attributeName);
         if ($startDate === false) {
-            return $this;
+            return false;
         }
         if ($startDate == '' && $object->getSpecialPrice()) {
             $startDate = Mage::app()->getLocale()->date();
         }
 
-        $object->setData($attributeName, $startDate);
+        return $startDate;
+    }
+
+   /**
+    * Before save hook.
+    * Prepare attribute value for save
+    *
+    * @param Varien_Object $object
+    * @return Mage_Catalog_Model_Product_Attribute_Backend_Startdate
+    */
+    public function beforeSave($object)
+    {
+        $startDate = $this->_getValueForSave($object);
+        if ($startDate === false) {
+            return $this;
+        }
 
+        $object->setData($this->getAttribute()->getName(), $startDate);
         parent::beforeSave($object);
         return $this;
     }
 
+   /**
+    * Product from date attribute validate function.
+    * In case invalid data throws exception.
+    *
+    * @param Varien_Object $object
+    * @throws Mage_Eav_Model_Entity_Attribute_Exception
+    * @return bool
+    */
+    public function validate($object)
+    {
+        $attr      = $this->getAttribute();
+        $maxDate   = $attr->getMaxValue();
+        $startDate = $this->_getValueForSave($object);
+        if ($startDate === false) {
+            return true;
+        }
+
+        if ($maxDate) {
+            $date     = Mage::getModel('core/date');
+            $value    = $date->timestamp($startDate);
+            $maxValue = $date->timestamp($maxDate);
+
+            if ($value > $maxValue) {
+                $message = Mage::helper('catalog')->__('The From Date value should be less than or equal to the To Date value.');
+                $eavExc  = new Mage_Eav_Model_Entity_Attribute_Exception($message);
+                $eavExc->setAttributeCode($attr->getName());
+                throw $eavExc;
+            }
+        }
+        return true;
+    }
 }
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php
index 06f58026313..a25ad0b8a10 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php
@@ -29,38 +29,9 @@
  *
  * @category   Mage
  * @package    Mage_Catalog
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @author     Magento Core Team <core@magentocommerce.com>
  */
-
-class Mage_Catalog_Model_Product_Attribute_Backend_Urlkey extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract
+class Mage_Catalog_Model_Product_Attribute_Backend_Urlkey extends Mage_Catalog_Model_Attribute_Backend_Urlkey_Abstract
 {
-    public function beforeSave($object)
-    {
-        $attributeName = $this->getAttribute()->getName();
-
-        $urlKey = $object->getData($attributeName);
-        if ($urlKey === false) {
-            return $this;
-        }
-        if ($urlKey == '') {
-            $urlKey = $object->getName();
-        }
-
-        $object->setData($attributeName, $object->formatUrlKey($urlKey));
-
-        return $this;
-    }
 
-    public function afterSave($object)
-    {
-        /* @var $object Mage_Catalog_Model_Product */
-        /**
-         * Logic moved to Mage_Catalog_Model_Indexer_Url
-         */
-        /*if (!$object->getExcludeUrlRewrite() &&
-            ($object->dataHasChangedFor('url_key') || $object->getIsChangedCategories() || $object->getIsChangedWebsites())) {
-            Mage::getSingleton('catalog/url')->refreshProductRewrite($object->getId());
-        }*/
-        return $this;
-    }
 }
diff --git a/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php b/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php
index e0a75647f7e..9a1ab4c5287 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php
@@ -43,6 +43,12 @@
  */
 class Mage_Catalog_Model_Product_Compare_Item extends Mage_Core_Model_Abstract
 {
+    /**
+     * Model cache tag
+     *
+     * @var string
+     */
+    protected $_cacheTag = 'catalog_compare_item';
 
     /**
      * Prefix of model events names
diff --git a/app/code/core/Mage/Catalog/Model/Product/Condition.php b/app/code/core/Mage/Catalog/Model/Product/Condition.php
index 463d4b0a33a..c09e48c8f0a 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Condition.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Condition.php
@@ -24,7 +24,14 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class Mage_Catalog_Model_Product_Condition extends Varien_Object implements Mage_Catalog_Model_Product_Condition_Interface
+/**
+ * Class Mage_Catalog_Model_Product_Condition
+ *
+ * @method Mage_Catalog_Model_Product_Condition setTable(string $tableName)
+ * @method Mage_Catalog_Model_Product_Condition setPkFieldName(string $fieldName)
+ */
+class Mage_Catalog_Model_Product_Condition extends Varien_Object
+    implements Mage_Catalog_Model_Product_Condition_Interface
 {
     public function applyToCollection($collection)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php b/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php
index d12d4a45fab..955144dd400 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php
@@ -46,7 +46,8 @@ class Mage_Catalog_Model_Product_Flat_Flag extends Mage_Core_Model_Flag
      *
      * @return array
      */
-    public function getFlagData() {
+    public function getFlagData()
+    {
         $flagData = parent::getFlagData();
         if (!is_array($flagData)) {
             $flagData = array();
@@ -56,11 +57,45 @@ public function getFlagData() {
     }
 
     /**
-     * Retrieve Catalog Product Flat is built flag
+     * Returns true if store's flat index has been built.
      *
+     * @param int $storeId
      * @return bool
      */
-    public function getIsBuilt() {
+    public function isStoreBuilt($storeId)
+    {
+        $key = 'is_store_built_' . (int)$storeId;
+        $flagData = $this->getFlagData();
+        if (!isset($flagData[$key])) {
+            $flagData[$key] = false;
+            $this->setFlagData($flagData);
+        }
+        return (bool)$flagData[$key];
+    }
+
+    /**
+     * Defines whether flat index for specific store has been built.
+     *
+     * @param int  $storeId
+     * @param bool $built
+     * @return Mage_Catalog_Model_Product_Flat_Flag
+     */
+    public function setStoreBuilt($storeId, $built)
+    {
+        $key = 'is_store_built_' . (int)$storeId;
+        $flagData = $this->getFlagData();
+        $flagData[$key] = (bool)$built;
+        $this->setFlagData($flagData);
+        return $this;
+    }
+
+    /**
+     * Retrieve Catalog Product Flat Data is built flag
+     *
+     * @return bool
+     */
+    public function getIsBuilt()
+    {
         $flagData = $this->getFlagData();
         if (!isset($flagData['is_built'])) {
             $flagData['is_built'] = false;
@@ -70,15 +105,32 @@ public function getIsBuilt() {
     }
 
     /**
-     * Set Catalog Product Flat is built flag
+     * Set Catalog Product Flat Data is built flag
      *
      * @param bool $flag
+     *
      * @return Mage_Catalog_Model_Product_Flat_Flag
      */
-    public function setIsBuild($flag) {
+    public function setIsBuilt($flag)
+    {
         $flagData = $this->getFlagData();
         $flagData['is_built'] = (bool)$flag;
         $this->setFlagData($flagData);
         return $this;
     }
+
+    /**
+     * Set Catalog Product Flat Data is built flag
+     *
+     * @deprecated after 1.7.0.0 use Mage_Catalog_Model_Product_Flat_Flag::setIsBuilt() instead
+     *
+     * @param bool $flag
+     *
+     * @return Mage_Catalog_Model_Product_Flat_Flag
+     */
+    public function setIsBuild($flag)
+    {
+        $this->setIsBuilt($flag);
+        return $this;
+    }
 }
diff --git a/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php b/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php
index 3c3975c96ca..3da0f395961 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php
@@ -61,7 +61,7 @@ protected function _getIndexer() {
      */
     public function catalogEntityAttributeSaveAfter(Varien_Event_Observer $observer)
     {
-        if (!$this->_getHelper()->isBuilt()) {
+        if (!$this->_getHelper()->isAvailable() || !$this->_getHelper()->isBuilt()) {
             return $this;
         }
 
@@ -100,7 +100,7 @@ public function catalogEntityAttributeSaveAfter(Varien_Event_Observer $observer)
      */
     public function catalogProductStatusUpdate(Varien_Event_Observer $observer)
     {
-        if (!$this->_getHelper()->isBuilt()) {
+        if (!$this->_getHelper()->isAvailable() || !$this->_getHelper()->isBuilt()) {
             return $this;
         }
 
@@ -122,7 +122,7 @@ public function catalogProductStatusUpdate(Varien_Event_Observer $observer)
      */
     public function catalogProductWebsiteUpdate(Varien_Event_Observer $observer)
     {
-        if (!$this->_getHelper()->isBuilt()) {
+        if (!$this->_getHelper()->isAvailable() || !$this->_getHelper()->isBuilt()) {
             return $this;
         }
 
@@ -151,7 +151,7 @@ public function catalogProductWebsiteUpdate(Varien_Event_Observer $observer)
      * @return Mage_Catalog_Model_Product_Flat_Observer
      */
     public function catalogProductSaveAfter(Varien_Event_Observer $observer) {
-        if (!$this->_getHelper()->isBuilt()) {
+        if (!$this->_getHelper()->isAvailable() || !$this->_getHelper()->isBuilt()) {
             return $this;
         }
 
@@ -171,7 +171,7 @@ public function catalogProductSaveAfter(Varien_Event_Observer $observer) {
      */
     public function storeAdd(Varien_Event_Observer $observer)
     {
-        if (!$this->_getHelper()->isBuilt()) {
+        if (!$this->_getHelper()->isAvailable() || !$this->_getHelper()->isBuilt()) {
             return $this;
         }
 
@@ -190,7 +190,7 @@ public function storeAdd(Varien_Event_Observer $observer)
      */
     public function storeEdit(Varien_Event_Observer $observer)
     {
-        if (!$this->_getHelper()->isBuilt()) {
+        if (!$this->_getHelper()->isAvailable() || !$this->_getHelper()->isBuilt()) {
             return $this;
         }
 
@@ -211,7 +211,7 @@ public function storeEdit(Varien_Event_Observer $observer)
      */
     public function storeDelete(Varien_Event_Observer $observer)
     {
-        if (!$this->_getHelper()->isBuilt()) {
+        if (!$this->_getHelper()->isAvailable() || !$this->_getHelper()->isBuilt()) {
             return $this;
         }
 
@@ -231,7 +231,7 @@ public function storeDelete(Varien_Event_Observer $observer)
      */
     public function storeGroupSave(Varien_Event_Observer $observer)
     {
-        if (!$this->_getHelper()->isBuilt()) {
+        if (!$this->_getHelper()->isAvailable() || !$this->_getHelper()->isBuilt()) {
             return $this;
         }
 
@@ -256,7 +256,7 @@ public function storeGroupSave(Varien_Event_Observer $observer)
      */
     public function catalogProductImportAfter(Varien_Event_Observer $observer)
     {
-        if (!$this->_getHelper()->isBuilt()) {
+        if (!$this->_getHelper()->isAvailable() || !$this->_getHelper()->isBuilt()) {
             return $this;
         }
 
@@ -273,7 +273,7 @@ public function catalogProductImportAfter(Varien_Event_Observer $observer)
      */
     public function customerGroupSaveAfter(Varien_Event_Observer $observer)
     {
-        if (!$this->_getHelper()->isBuilt()) {
+        if (!$this->_getHelper()->isAvailable() || !$this->_getHelper()->isBuilt()) {
             return $this;
         }
 
diff --git a/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php b/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php
index 31b8da1a4ef..af6cfdd8e06 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php
@@ -59,6 +59,18 @@ class Mage_Catalog_Model_Product_Indexer_Flat extends Mage_Index_Model_Indexer_A
         ),
     );
 
+    /**
+     * Whether the indexer should be displayed on process/list page
+     *
+     * @return bool
+     */
+    public function isVisible()
+    {
+        /** @var $productFlatHelper Mage_Catalog_Helper_Product_Flat */
+        $productFlatHelper = Mage::helper('catalog/product_flat');
+        return $productFlatHelper->isEnabled() || !$productFlatHelper->isBuilt();
+    }
+
     /**
      * Retrieve Indexer name
      *
@@ -99,7 +111,9 @@ protected function _getIndexer()
      */
     public function matchEvent(Mage_Index_Model_Event $event)
     {
-        if (!Mage::helper('catalog/product_flat')->isBuilt()) {
+        /** @var $productFlatHelper Mage_Catalog_Helper_Product_Flat */
+        $productFlatHelper = Mage::helper('catalog/product_flat');
+        if (!$productFlatHelper->isEnabled() || !$productFlatHelper->isBuilt()) {
             return false;
         }
 
@@ -112,7 +126,7 @@ public function matchEvent(Mage_Index_Model_Event $event)
         if ($entity == Mage_Catalog_Model_Resource_Eav_Attribute::ENTITY) {
             /* @var $attribute Mage_Catalog_Model_Resource_Eav_Attribute */
             $attribute      = $event->getDataObject();
-            $addFilterable  = Mage::helper('catalog/product_flat')->isAddFilterableAttributes();
+            $addFilterable  = $productFlatHelper->isAddFilterableAttributes();
 
             $enableBefore   = $attribute && (($attribute->getOrigData('backend_type') == 'static')
                 || ($addFilterable && $attribute->getOrigData('is_filterable') > 0)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option.php b/app/code/core/Mage/Catalog/Model/Product/Option.php
index 842f76d6a1b..85bb4f5e94a 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option.php
@@ -54,30 +54,107 @@
  */
 class Mage_Catalog_Model_Product_Option extends Mage_Core_Model_Abstract
 {
+    /**
+     * Option group text
+     */
     const OPTION_GROUP_TEXT   = 'text';
+
+    /**
+     * Option group file
+     */
     const OPTION_GROUP_FILE   = 'file';
+
+    /**
+     * Option group select
+     */
     const OPTION_GROUP_SELECT = 'select';
+
+    /**
+     * Option group date
+     */
     const OPTION_GROUP_DATE   = 'date';
 
+    /**
+     * Option type field
+     */
     const OPTION_TYPE_FIELD     = 'field';
+
+    /**
+     * Option type area
+     */
     const OPTION_TYPE_AREA      = 'area';
+
+    /**
+     * Option group file
+     */
     const OPTION_TYPE_FILE      = 'file';
+
+    /**
+     * Option type drop down
+     */
     const OPTION_TYPE_DROP_DOWN = 'drop_down';
+
+    /**
+     * Option type radio
+     */
     const OPTION_TYPE_RADIO     = 'radio';
+
+    /**
+     * Option type checkbox
+     */
     const OPTION_TYPE_CHECKBOX  = 'checkbox';
+
+    /**
+     * Option type multiple
+     */
     const OPTION_TYPE_MULTIPLE  = 'multiple';
+
+    /**
+     * Option type date
+     */
     const OPTION_TYPE_DATE      = 'date';
+
+    /**
+     * Option type date/time
+     */
     const OPTION_TYPE_DATE_TIME = 'date_time';
+
+    /**
+     * Option type time
+     */
     const OPTION_TYPE_TIME      = 'time';
 
+    /**
+     * Product instance
+     *
+     * @var Mage_Catalog_Model_Product
+     */
     protected $_product;
 
+    /**
+     * Options
+     *
+     * @var array
+     */
     protected $_options = array();
 
+    /**
+     * Value instance
+     *
+     * @var Mage_Catalog_Model_Product_Option_Value
+     */
     protected $_valueInstance;
 
+    /**
+     * Values
+     *
+     * @var array
+     */
     protected $_values = array();
 
+    /**
+     * Constructor
+     */
     protected function _construct()
     {
         $this->_init('catalog/product_option');
@@ -110,6 +187,11 @@ public function getValueById($valueId)
         return null;
     }
 
+    /**
+     * Get values
+     *
+     * @return array
+     */
     public function getValues()
     {
         return $this->_values;
@@ -306,6 +388,11 @@ public function saveOptions()
         return $this;
     }
 
+    /**
+     * After save
+     *
+     * @return Mage_Core_Model_Abstract
+     */
     protected function _afterSave()
     {
         $this->getValueInstance()->unsetValues();
@@ -330,11 +417,11 @@ protected function _afterSave()
      * @param bool $flag
      * @return decimal
      */
-    public function getPrice($flag=false)
+    public function getPrice($flag = false)
     {
         if ($flag && $this->getPriceType() == 'percent') {
             $basePrice = $this->getProduct()->getFinalPrice();
-            $price = $basePrice*($this->_getData('price')/100);
+            $price = $basePrice * ($this->_getData('price')/100);
             return $price;
         }
         return $this->_getData('price');
@@ -425,7 +512,8 @@ public function prepareOptionForDuplicate()
         $this->setProductId(null);
         $this->setOptionId(null);
         $newOption = $this->__toArray();
-        if ($_values = $this->getValues()) {
+        $_values = $this->getValues();
+        if ($_values) {
             $newValuesArray = array();
             foreach ($_values as $_value) {
                 $newValuesArray[] = $_value->prepareValueForDuplicate();
@@ -488,4 +576,19 @@ protected function _clearReferences()
         }
         return $this;
     }
+
+    /**
+     * Check whether custom option could have multiple values
+     *
+     * @return bool
+     */
+    public function isMultipleType()
+    {
+        switch ($this->getType()) {
+            case self::OPTION_TYPE_MULTIPLE:
+            case self::OPTION_TYPE_CHECKBOX:
+                return true;
+        }
+        return false;
+    }
 }
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Api.php b/app/code/core/Mage/Catalog/Model/Product/Option/Api.php
index 11a781301b8..0026a4dfe36 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Api.php
@@ -154,20 +154,24 @@ protected function _saveProductCustomOption($product, $data)
                 $data[$key] = Mage::helper('catalog')->stripTags($value);
             }
         }
-        // setProductOptions expects data to be an array of options arrays
-        $data = array($data);
-        if (!$product->getOptionsReadonly()) {
-            $product->setProductOptions($data);
-        }
-        $product->setCanSaveCustomOptions(!$product->getOptionsReadonly());
+
         try {
-            // an empty request can be set as event parameter
-            // because it is not used for options changing in observers
-            Mage::dispatchEvent(
-                'catalog_product_prepare_save',
-                array('product' => $product, 'request' => new Mage_Core_Controller_Request_Http())
-            );
-            $product->save();
+            if (!$product->getOptionsReadonly()) {
+                $product
+                    ->getOptionInstance()
+                    ->setOptions(array($data));
+
+                $product->setHasOptions(true);
+
+                // an empty request can be set as event parameter
+                // because it is not used for options changing in observers
+                Mage::dispatchEvent(
+                    'catalog_product_prepare_save',
+                    array('product' => $product, 'request' => new Mage_Core_Controller_Request_Http())
+                );
+
+                $product->save();
+            }
         } catch (Exception $e) {
             $this->_fault('save_option_error', $e->getMessage());
         }
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php
index 5e9bdea59bb..9f85aac2f30 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php
@@ -523,7 +523,7 @@ protected function _getOptionHtml($optionValue)
 
             return sprintf('<a href="%s" target="_blank">%s</a> %s',
                 $this->_getOptionDownloadUrl($urlRoute, $urlParams),
-                Mage::helper('core')->htmlEscape($title),
+                Mage::helper('core')->escapeHtml($title),
                 $sizes
             );
         } catch (Exception $e) {
@@ -570,7 +570,7 @@ public function getEditableOptionValue($optionValue)
         try {
             $value = unserialize($optionValue);
             return sprintf('%s [%d]',
-                Mage::helper('core')->htmlEscape($value['title']),
+                Mage::helper('core')->escapeHtml($value['title']),
                 $this->getConfigurationItemOption()->getId()
             );
 
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php
index 927293c20a2..f9fcf3003d8 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php
@@ -86,7 +86,7 @@ public function prepareForCart()
     public function getFormattedOptionValue($optionValue)
     {
         if ($this->_formattedOptionValue === null) {
-            $this->_formattedOptionValue = Mage::helper('core')->htmlEscape(
+            $this->_formattedOptionValue = Mage::helper('core')->escapeHtml(
                 $this->getEditableOptionValue($optionValue)
             );
         }
@@ -105,13 +105,13 @@ public function getPrintableOptionValue($optionValue)
     }
 
     /**
-     * Return wrong product configuration message
+     * Return currently unavailable product configuration message
      *
      * @return string
      */
     protected function _getWrongConfigurationMessage()
     {
-        return Mage::helper('catalog')->__('Some of the products below do not have all the required options. Please edit them and configure all the required options.');
+        return Mage::helper('catalog')->__('Some of the selected item options are not currently available.');
     }
 
     /**
@@ -205,6 +205,7 @@ public function prepareOptionValueForRequest($optionValue)
      * Return Price for selected option
      *
      * @param string $optionValue Prepared for cart option value
+     * @param float $basePrice
      * @return float
      */
     public function getOptionPrice($optionValue, $basePrice)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php
index ab048547a2e..34fe9beb8fb 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php
@@ -86,6 +86,6 @@ public function prepareForCart()
      */
     public function getFormattedOptionValue($value)
     {
-        return Mage::helper('core')->htmlEscape($value);
+        return Mage::helper('core')->escapeHtml($value);
     }
 }
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Value.php b/app/code/core/Mage/Catalog/Model/Product/Option/Value.php
index b78e8c5503e..7b1f6fa0594 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Value.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Value.php
@@ -142,7 +142,7 @@ public function saveValues()
      *  return converted percent to price
      *
      * @param bool $flag
-     * @return decimal
+     * @return float|int
      */
     public function getPrice($flag=false)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php
index 329edc44ccf..d51a74f2a07 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php
@@ -885,12 +885,7 @@ public function prepareQuoteItemQty($qty, $product = null)
      */
     public function assignProductToOption($optionProduct, $option, $product = null)
     {
-        if ($optionProduct) {
-            $option->setProduct($optionProduct);
-        } else {
-            $option->setProduct($this->getProduct($product));
-        }
-
+        $option->setProduct($optionProduct ? $optionProduct : $this->getProduct($product));
         return $this;
     }
 
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php
index 7d3d659cbaa..0012e392d60 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php
@@ -654,7 +654,7 @@ protected function _prepareProduct(Varien_Object $buyRequest, $product, $process
      * Check if product can be bought
      *
      * @param  Mage_Catalog_Model_Product $product
-     * @return Mage_Catalog_Model_Product_Type_Abstract
+     * @return Mage_Catalog_Model_Product_Type_Configurable
      * @throws Mage_Core_Exception
      */
     public function checkProductBuyState($product = null)
@@ -778,20 +778,18 @@ public function getWeight($product = null)
      * Implementation of product specify logic of which product needs to be assigned to option.
      * For example if product which was added to option already removed from catalog.
      *
-     * @param  Mage_Catalog_Model_Product $optionProduct
+     * @param  Mage_Catalog_Model_Product|null $optionProduct
      * @param  Mage_Sales_Model_Quote_Item_Option $option
-     * @param  Mage_Catalog_Model_Product $product
-     * @return Mage_Catalog_Model_Product_Type_Abstract
+     * @param  Mage_Catalog_Model_Product|null $product
+     * @return Mage_Catalog_Model_Product_Type_Configurable
      */
     public function assignProductToOption($optionProduct, $option, $product = null)
     {
         if ($optionProduct) {
             $option->setProduct($optionProduct);
         } else {
-            $option->getItem()->setHasError('error');
-            $option->getItem()->addMessage(Mage::helper('catalog')->__('Selected configuration is not available.', $this->getProduct($product)->getName()));
+            $option->getItem()->setHasConfigurationUnavailableError(true);
         }
-
         return $this;
     }
 
diff --git a/app/code/core/Mage/Catalog/Model/Product/Url.php b/app/code/core/Mage/Catalog/Model/Product/Url.php
index 627dca1dab8..25b425c445f 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Url.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Url.php
@@ -37,18 +37,41 @@ class Mage_Catalog_Model_Product_Url extends Varien_Object
     const CACHE_TAG = 'url_rewrite';
 
     /**
-     * Static URL instance
+     * URL instance
      *
      * @var Mage_Core_Model_Url
      */
-    protected static $_url;
+    protected  $_url;
 
     /**
-     * Static URL Rewrite Instance
+     * URL Rewrite Instance
      *
      * @var Mage_Core_Model_Url_Rewrite
      */
-    protected static $_urlRewrite;
+    protected $_urlRewrite;
+
+    /**
+     * Factory instance
+     *
+     * @var Mage_Catalog_Model_Factory
+     */
+    protected $_factory;
+
+    /**
+     * @var Mage_Core_Model_Store
+     */
+    protected $_store;
+
+    /**
+     * Initialize Url model
+     *
+     * @param array $args
+     */
+    public function __construct(array $args = array())
+    {
+        $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('catalog/factory');
+        $this->_store = !empty($args['store']) ? $args['store'] : Mage::app()->getStore();
+    }
 
     /**
      * Retrieve URL Instance
@@ -57,10 +80,10 @@ class Mage_Catalog_Model_Product_Url extends Varien_Object
      */
     public function getUrlInstance()
     {
-        if (!self::$_url) {
-            self::$_url = Mage::getModel('core/url');
+        if (null === $this->_url) {
+            $this->_url = Mage::getModel('core/url');
         }
-        return self::$_url;
+        return $this->_url;
     }
 
     /**
@@ -70,10 +93,10 @@ public function getUrlInstance()
      */
     public function getUrlRewrite()
     {
-        if (!self::$_urlRewrite) {
-            self::$_urlRewrite = Mage::getModel('core/url_rewrite');
+        if (null === $this->_urlRewrite) {
+            $this->_urlRewrite = $this->_factory->getUrlRewriteInstance();
         }
-        return self::$_urlRewrite;
+        return $this->_urlRewrite;
     }
 
     /**
@@ -171,65 +194,110 @@ public function getUrlPath($product, $category=null)
      */
     public function getUrl(Mage_Catalog_Model_Product $product, $params = array())
     {
-        $routePath      = '';
-        $routeParams    = $params;
+        $url = $product->getData('url');
+        if (!empty($url)) {
+            return $url;
+        }
 
-        $storeId    = $product->getStoreId();
-        if (isset($params['_ignore_category'])) {
-            unset($params['_ignore_category']);
-            $categoryId = null;
-        } else {
-            $categoryId = $product->getCategoryId() && !$product->getDoNotUseCategoryId()
-                ? $product->getCategoryId() : null;
+        $requestPath = $product->getData('request_path');
+        if (empty($requestPath)) {
+            $requestPath = $this->_getRequestPath($product, $this->_getCategoryIdForUrl($product, $params));
+            $product->setRequestPath($requestPath);
         }
 
-        if ($product->hasUrlDataObject()) {
-            $requestPath = $product->getUrlDataObject()->getUrlRewrite();
-            $routeParams['_store'] = $product->getUrlDataObject()->getStoreId();
+        if (isset($params['_store'])) {
+            $storeId = $this->_getStoreId($params['_store']);
         } else {
-            $requestPath = $product->getRequestPath();
-            if (empty($requestPath) && $requestPath !== false) {
-                $idPath = sprintf('product/%d', $product->getEntityId());
-                if ($categoryId) {
-                    $idPath = sprintf('%s/%d', $idPath, $categoryId);
-                }
-                $rewrite = $this->getUrlRewrite();
-                $rewrite->setStoreId($storeId)
-                    ->loadByIdPath($idPath);
-                if ($rewrite->getId()) {
-                    $requestPath = $rewrite->getRequestPath();
-                    $product->setRequestPath($requestPath);
-                } else {
-                    $product->setRequestPath(false);
-                }
-            }
+            $storeId = $product->getStoreId();
         }
 
-        if (isset($routeParams['_store'])) {
-            $storeId = Mage::app()->getStore($routeParams['_store'])->getId();
+        if ($storeId != $this->_getStoreId()) {
+            $params['_store_to_url'] = true;
         }
 
-        if ($storeId != Mage::app()->getStore()->getId()) {
-            $routeParams['_store_to_url'] = true;
+        // reset cached URL instance GET query params
+        if (!isset($params['_query'])) {
+            $params['_query'] = array();
         }
 
-        if (!empty($requestPath)) {
-            $routeParams['_direct'] = $requestPath;
+        $this->getUrlInstance()->setStore($storeId);
+        $productUrl = $this->_getProductUrl($product, $requestPath, $params);
+        $product->setData('url', $productUrl);
+        return $product->getData('url');
+    }
+
+    /**
+     * Returns checked store_id value
+     *
+     * @param int|null $id
+     * @return int
+     */
+    protected function _getStoreId($id = null)
+    {
+        return Mage::app()->getStore($id)->getId();
+    }
+
+    /**
+     * Check product category
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @param array $params
+     *
+     * @return int|null
+     */
+    protected function _getCategoryIdForUrl($product, $params)
+    {
+        if (isset($params['_ignore_category'])) {
+            return null;
         } else {
-            $routePath = 'catalog/product/view';
-            $routeParams['id']  = $product->getId();
-            $routeParams['s']   = $product->getUrlKey();
-            if ($categoryId) {
-                $routeParams['category'] = $categoryId;
-            }
+            return $product->getCategoryId() && !$product->getDoNotUseCategoryId()
+                ? $product->getCategoryId() : null;
         }
+    }
 
-        // reset cached URL instance GET query params
-        if (!isset($routeParams['_query'])) {
-            $routeParams['_query'] = array();
+    /**
+     * Retrieve product URL based on requestPath param
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @param string $requestPath
+     * @param array $routeParams
+     *
+     * @return string
+     */
+    protected function _getProductUrl($product, $requestPath, $routeParams)
+    {
+        if (!empty($requestPath)) {
+            return $this->getUrlInstance()->getDirectUrl($requestPath, $routeParams);
+        }
+        $routeParams['id'] = $product->getId();
+        $routeParams['s'] = $product->getUrlKey();
+        $categoryId = $this->_getCategoryIdForUrl($product, $routeParams);
+        if ($categoryId) {
+            $routeParams['category'] = $categoryId;
+        }
+        return $this->getUrlInstance()->getUrl('catalog/product/view', $routeParams);
+    }
+
+    /**
+     * Retrieve request path
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @param int $categoryId
+     * @return bool|string
+     */
+    protected function _getRequestPath($product, $categoryId)
+    {
+        $idPath = sprintf('product/%d', $product->getEntityId());
+        if ($categoryId) {
+            $idPath = sprintf('%s/%d', $idPath, $categoryId);
+        }
+        $rewrite = $this->getUrlRewrite();
+        $rewrite->setStoreId($product->getStoreId())
+            ->loadByIdPath($idPath);
+        if ($rewrite->getId()) {
+            return $rewrite->getRequestPath();
         }
 
-        return $this->getUrlInstance()->setStore($storeId)
-            ->getUrl($routePath, $routeParams);
+        return false;
     }
 }
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category.php b/app/code/core/Mage/Catalog/Model/Resource/Category.php
index 23ffc38e8bb..a196832913d 100755
--- a/app/code/core/Mage/Catalog/Model/Resource/Category.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Category.php
@@ -619,37 +619,84 @@ public function getParentDesignCategory($category)
             ->addAttributeToSelect('custom_layout_update')
             ->addAttributeToSelect('custom_apply_to_products')
             ->addFieldToFilter('entity_id', array('in' => $pathIds))
-            ->addFieldToFilter('custom_use_parent_settings', 0)
+            ->addAttributeToFilter('custom_use_parent_settings', array(array('eq' => 0), array('null' => 0)), 'left')
             ->addFieldToFilter('level', array('neq' => 0))
             ->setOrder('level', 'DESC')
             ->load();
         return $collection->getFirstItem();
     }
 
-
     /**
-     * Return child categories
+     * Prepare base collection setup for get categories list
      *
      * @param Mage_Catalog_Model_Category $category
      * @return Mage_Catalog_Model_Resource_Category_Collection
      */
-    public function getChildrenCategories($category)
+    protected function _getChildrenCategoriesBase($category)
     {
         $collection = $category->getCollection();
-        /* @var $collection Mage_Catalog_Model_Resource_Category_Collection */
         $collection->addAttributeToSelect('url_key')
             ->addAttributeToSelect('name')
             ->addAttributeToSelect('all_children')
             ->addAttributeToSelect('is_anchor')
-            ->addAttributeToFilter('is_active', 1)
-            ->addIdFilter($category->getChildren())
             ->setOrder('position', Varien_Db_Select::SQL_ASC)
-            ->joinUrlRewrite()
+            ->joinUrlRewrite();
+
+        return $collection;
+    }
+
+
+    /**
+     * Return child categories
+     *
+     * @param Mage_Catalog_Model_Category $category
+     * @return Mage_Catalog_Model_Resource_Category_Collection
+     */
+    public function getChildrenCategories($category)
+    {
+        $collection = $this->_getChildrenCategoriesBase($category);
+        $collection->addAttributeToFilter('is_active', 1)
+            ->addIdFilter($category->getChildren())
             ->load();
 
         return $collection;
     }
 
+
+    /**
+     * Return children categories lists with inactive
+     *
+     * @param Mage_Catalog_Model_Category $category
+     * @return Mage_Catalog_Model_Resource_Category_Collection
+     */
+    public function getChildrenCategoriesWithInactive($category)
+    {
+        $collection = $this->_getChildrenCategoriesBase($category);
+        $collection->addFieldToFilter('parent_id', $category->getId());
+
+        return $collection;
+    }
+
+    /**
+     * Returns select for category's children.
+     *
+     * @param $category
+     * @param bool $recursive
+     * @return Varien_Db_Select
+     */
+    protected function _getChildrenIdSelect($category, $recursive = true)
+    {
+        $adapter = $this->_getReadAdapter();
+        $select = $adapter->select()
+            ->from(array('m' => $this->getEntityTable()), 'entity_id')
+            ->where($adapter->quoteIdentifier('path') . ' LIKE ?', $category->getPath() . '/%');
+
+        if (!$recursive) {
+            $select->where($adapter->quoteIdentifier('level') . ' <= ?', $category->getLevel() + 1);
+        }
+        return $select;
+    }
+
     /**
      * Return children ids of category
      *
@@ -667,10 +714,9 @@ public function getChildren($category, $recursive = true)
             'attribute_id' => $attributeId,
             'store_id'     => $category->getStoreId(),
             'scope'        => 1,
-            'c_path'       => $category->getPath() . '/%'
         );
-        $select = $this->_getReadAdapter()->select()
-            ->from(array('m' => $this->getEntityTable()), 'entity_id')
+        $select = $this->_getChildrenIdSelect($category, $recursive);
+        $select
             ->joinLeft(
                 array('d' => $backendTable),
                 'd.attribute_id = :attribute_id AND d.store_id = 0 AND d.entity_id = m.entity_id',
@@ -681,16 +727,24 @@ public function getChildren($category, $recursive = true)
                 'c.attribute_id = :attribute_id AND c.store_id = :store_id AND c.entity_id = m.entity_id',
                 array()
             )
-            ->where($checkSql . ' = :scope')
-            ->where($adapter->quoteIdentifier('path') . ' LIKE :c_path');
-        if (!$recursive) {
-            $select->where($adapter->quoteIdentifier('level') . ' <= :c_level');
-            $bind['c_level'] = $category->getLevel() + 1;
-        }
+            ->where($checkSql . ' = :scope');
 
         return $adapter->fetchCol($select, $bind);
     }
 
+    /**
+     * Return IDs of category's children along with inactive categories.
+     *
+     * @param $category
+     * @param bool $recursive
+     * @return array
+     */
+    public function getChildrenIds($category, $recursive = true)
+    {
+        $select = $this->_getChildrenIdSelect($category, $recursive);
+        return $this->_getReadAdapter()->fetchCol($select);
+    }
+
     /**
      * Return all children ids of category (with category id)
      *
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php
index c04ea837690..76ed5f0ab99 100755
--- a/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php
@@ -76,6 +76,32 @@ class Mage_Catalog_Model_Resource_Category_Collection extends Mage_Catalog_Model
      */
     protected $_loadWithProductCount     = false;
 
+    /**
+     * Catalog factory instance
+     *
+     * @var Mage_Catalog_Model_Factory
+     */
+    protected $_factory;
+
+    /**
+     * Disable flat flag
+     *
+     * @var bool
+     */
+    protected $_disableFlat = false;
+
+    /**
+     * Initialize factory
+     *
+     * @param Mage_Core_Model_Resource_Abstract $resource
+     * @param array $args
+     */
+    public function __construct($resource = null, array $args = array())
+    {
+        parent::__construct($resource);
+        $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('catalog/factory');
+    }
+
     /**
      * Init collection and determine table names
      *
@@ -320,20 +346,22 @@ public function addPathFilter($regexp)
      */
     public function joinUrlRewrite()
     {
-        $storeId = Mage::app()->getStore()->getId();
-        $this->joinTable(
-            'core/url_rewrite',
-            'category_id=entity_id',
-            array('request_path'),
-            "{{table}}.is_system=1"
-                . " AND {{table}}.product_id IS NULL"
-                . " AND {{table}}.store_id='{$storeId}'"
-                . " AND id_path LIKE 'category/%'",
-            'left'
-        );
+        $this->_factory->getCategoryUrlRewriteHelper()
+            ->joinTableToEavCollection($this, $this->_getCurrentStoreId());
+
         return $this;
     }
 
+    /**
+     * Retrieves store_id from current store
+     *
+     * @return int
+     */
+    protected function _getCurrentStoreId()
+    {
+        return (int)Mage::app()->getStore()->getId();
+    }
+
     /**
      * Add active category filter
      *
@@ -426,4 +454,36 @@ public function addOrderField($field)
         $this->setOrder($field, self::SORT_ORDER_ASC);
         return $this;
     }
+
+    /**
+     * Set disable flat flag
+     *
+     * @param bool $flag
+     * @return Mage_Catalog_Model_Resource_Category_Collection
+     */
+    public function setDisableFlat($flag)
+    {
+        $this->_disableFlat = (bool) $flag;
+        return $this;
+    }
+
+    /**
+     * Retrieve disable flat flag value
+     *
+     * @return bool
+     */
+    public function getDisableFlat()
+    {
+        return $this->_disableFlat;
+    }
+
+    /**
+     * Retrieve collection empty item
+     *
+     * @return Mage_Catalog_Model_Category
+     */
+    public function getNewEmptyItem()
+    {
+        return new $this->_itemObjectClass(array('disable_flat' => $this->getDisableFlat()));
+    }
 }
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php
index 8a806ca98f5..0f92645040c 100755
--- a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php
@@ -34,6 +34,11 @@
  */
 class Mage_Catalog_Model_Resource_Category_Flat extends Mage_Index_Model_Resource_Abstract
 {
+    /**
+     * Amount of categories to be processed in batch
+     */
+    const CATEGORY_BATCH = 500;
+
     /**
      * Store id
      *
@@ -84,9 +89,18 @@ class Mage_Catalog_Model_Resource_Category_Flat extends Mage_Index_Model_Resourc
     protected $_inactiveCategoryIds      = null;
 
     /**
-     * Is rebuild
+     * Store flag which defines if Catalog Category Flat Data has been initialized
      *
-     * @var boolean
+     * @var array
+     */
+    protected $_isBuilt                  = array();
+
+    /**
+     * Store flag which defines if Catalog Category Flat Data has been initialized
+     *
+     * @deprecated after 1.7.0.0 use $this->_isBuilt instead
+     *
+     * @var bool|null
      */
     protected $_isRebuilt                = null;
 
@@ -104,6 +118,24 @@ class Mage_Catalog_Model_Resource_Category_Flat extends Mage_Index_Model_Resourc
      */
     protected $_allowTableChanges        = true;
 
+    /**
+     * Factory instance
+     *
+     * @var Mage_Catalog_Model_Factory
+     */
+    protected $_factory;
+
+    /**
+     * Initialize factory instance
+     *
+     * @param array $args
+     */
+    public function __construct(array $args = array())
+    {
+        $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('catalog/factory');
+        parent::__construct();
+    }
+
     /**
      * Resource initializations
      *
@@ -182,7 +214,7 @@ public function getUseStoreTables()
     /**
      * Add inactive categories ids
      *
-     * @param unknown_type $ids
+     * @param array $ids
      * @return Mage_Catalog_Model_Resource_Category_Flat
      */
     public function addInactiveCategoryIds($ids)
@@ -226,9 +258,10 @@ public function getInactiveCategoryIds()
      * @param Mage_Catalog_Model_Category|int $parentNode
      * @param integer $recursionLevel
      * @param integer $storeId
+     * @param bool $onlyActive
      * @return Mage_Catalog_Model_Resource_Category_Flat
      */
-    protected function _loadNodes($parentNode = null, $recursionLevel = 0, $storeId = 0)
+    protected function _loadNodes($parentNode = null, $recursionLevel = 0, $storeId = 0, $onlyActive = true)
     {
         $_conn = $this->_getReadAdapter();
         $startLevel = 1;
@@ -255,18 +288,18 @@ protected function _loadNodes($parentNode = null, $recursionLevel = 0, $storeId
                     new Zend_Db_Expr('main_table.' . $_conn->quoteIdentifier('path')),
                     'is_active',
                     'is_anchor'))
-            ->joinLeft(
-                array('url_rewrite'=>$this->getTable('core/url_rewrite')),
-                'url_rewrite.category_id=main_table.entity_id AND url_rewrite.is_system=1 AND ' .
-                $_conn->quoteInto(
-                'url_rewrite.product_id IS NULL AND url_rewrite.store_id=? AND ',
-                $storeId) .
-                $_conn->prepareSqlCondition('url_rewrite.id_path', array('like' => 'category/%')),
-                array('request_path' => 'url_rewrite.request_path'))
-            ->where('main_table.is_active = ?', '1')
+
             ->where('main_table.include_in_menu = ?', '1')
             ->order('main_table.position');
 
+        if ($onlyActive) {
+            $select->where('main_table.is_active = ?', '1');
+        }
+
+        /** @var $urlRewrite Mage_Catalog_Helper_Category_Url_Rewrite_Interface */
+        $urlRewrite = $this->_factory->getCategoryUrlRewriteHelper();
+        $urlRewrite->joinTableToSelect($select, $storeId);
+
         if ($parentPath) {
             $select->where($_conn->quoteInto("main_table.path like ?", "$parentPath/%"));
         }
@@ -427,35 +460,36 @@ public function getNodeById($nodeId, $nodes = null)
     }
 
     /**
-     * Check if category flat data is rebuilt
+     * Check if Catalog Category Flat Data has been initialized
      *
+     * @param bool|int|\Mage_Core_Model_Store|null $storeView Store(id) for which the value is checked
      * @return bool
      */
-    public function isRebuilt()
+    public function isBuilt($storeView = null)
     {
-        if ($this->_isRebuilt === null) {
-            $defaultStoreView = Mage::app()->getDefaultStoreView();
-            if ($defaultStoreView === null) {
-                $defaultStoreId = Mage_Core_Model_App::ADMIN_STORE_ID;
-            } else {
-                $defaultStoreId = $defaultStoreView->getId();
-            }
+        $storeView = is_null($storeView) ? Mage::app()->getDefaultStoreView() : Mage::app()->getStore($storeView);
+        if ($storeView === null) {
+            $storeId = Mage_Core_Model_App::ADMIN_STORE_ID;
+        } else {
+            $storeId = $storeView->getId();
+        }
+        if (!isset($this->_isBuilt[$storeId])) {
             $select = $this->_getReadAdapter()->select()
-                ->from($this->getMainStoreTable($defaultStoreId), 'entity_id')
+                ->from($this->getMainStoreTable($storeId), 'entity_id')
                 ->limit(1);
             try {
-                $this->_isRebuilt = (bool) $this->_getReadAdapter()->fetchOne($select);
+                $this->_isBuilt[$storeId] = (bool)$this->_getReadAdapter()->fetchOne($select);
             } catch (Exception $e) {
-                $this->_isRebuilt = false;
+                $this->_isBuilt[$storeId] = false;
             }
         }
-        return $this->_isRebuilt;
+        return $this->_isBuilt[$storeId];
     }
 
     /**
      * Rebuild flat data from eav
      *
-     * @param unknown_type $stores
+     * @param array|null $stores
      * @return Mage_Catalog_Model_Resource_Category_Flat
      */
     public function rebuild($stores = null)
@@ -489,7 +523,7 @@ public function rebuild($stores = null)
                     $categoriesIds[$store->getRootCategoryId()][] = $category['entity_id'];
                 }
             }
-            $categoriesIdsChunks = array_chunk($categoriesIds[$store->getRootCategoryId()], 500);
+            $categoriesIdsChunks = array_chunk($categoriesIds[$store->getRootCategoryId()], self::CATEGORY_BATCH);
             foreach ($categoriesIdsChunks as $categoriesIdsChunk) {
                 $attributesData = $this->_getAttributeValues($categoriesIdsChunk, $store->getId());
                 $data = array();
@@ -807,10 +841,10 @@ protected function _getAttributeValues($entityIds, $store_id)
      *
      * @param string $type
      * @param array $entityIds
-     * @param integer $sid
+     * @param integer $storeId
      * @return array
      */
-    protected function _getAttributeTypeValues($type, $entityIds, $sid)
+    protected function _getAttributeTypeValues($type, $entityIds, $storeId)
     {
         $select = $this->_getWriteAdapter()->select()
             ->from(
@@ -819,14 +853,16 @@ protected function _getAttributeTypeValues($type, $entityIds, $sid)
             )
             ->joinLeft(
                 array('store' => $this->getTable(array('catalog/category', $type))),
-                'store.entity_id = def.entity_id AND store.attribute_id = def.attribute_id AND store.store_id = '.$sid,
-                array('value' => $this->_getWriteAdapter()->getCheckSql('store.value_id > 0',
+                'store.entity_id = def.entity_id AND store.attribute_id = def.attribute_id '
+                    . 'AND store.store_id = ' . $storeId,
+                array('value' => $this->_getWriteAdapter()->getCheckSql(
+                    'store.value_id > 0',
                     $this->_getWriteAdapter()->quoteIdentifier('store.value'),
-                    $this->_getWriteAdapter()->quoteIdentifier('def.value'))
-                )
+                    $this->_getWriteAdapter()->quoteIdentifier('def.value')
+                ))
             )
             ->where('def.entity_id IN (?)', $entityIds)
-            ->where('def.store_id = ?', Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID);
+            ->where('def.store_id IN (?)', array(Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID, $storeId));
         return $this->_getWriteAdapter()->fetchAll($select);
     }
 
@@ -1181,30 +1217,26 @@ public function getProductCount($category)
      * Return parent categories of category
      *
      * @param Mage_Catalog_Model_Category $category
-     * @param unknown_type $isActive
+     * @param bool $isActive
      * @return array
      */
     public function getParentCategories($category, $isActive = true)
     {
         $categories = array();
-        $read = $this->_getReadAdapter();
-        $select = $read->select()
+        $select = $this->_getReadAdapter()->select()
             ->from(
                 array('main_table' => $this->getMainStoreTable($category->getStoreId())),
                 array('main_table.entity_id', 'main_table.name')
             )
-            ->joinLeft(
-                array('url_rewrite'=>$this->getTable('core/url_rewrite')),
-                'url_rewrite.category_id=main_table.entity_id AND url_rewrite.is_system=1 AND '.
-                $read->quoteInto('url_rewrite.product_id IS NULL AND url_rewrite.store_id=? AND ',
-                $category->getStoreId() ).
-                $read->prepareSqlCondition('url_rewrite.id_path', array('like' => 'category/%')),
-                array('request_path' => 'url_rewrite.request_path'))
             ->where('main_table.entity_id IN (?)', array_reverse(explode(',', $category->getPathInStore())));
         if ($isActive) {
             $select->where('main_table.is_active = ?', '1');
         }
         $select->order('main_table.path ASC');
+
+        $urlRewrite = $this->_factory->getCategoryUrlRewriteHelper();
+        $urlRewrite->joinTableToSelect($select, $category->getStoreId());
+
         $result = $this->_getReadAdapter()->fetchAll($select);
         foreach ($result as $row) {
             $row['id'] = $row['entity_id'];
@@ -1246,6 +1278,17 @@ public function getChildrenCategories($category)
         return $categories;
     }
 
+    /**
+     * Return children categories of category with inactive
+     *
+     * @param Mage_Catalog_Model_Category $category
+     * @return array
+     */
+    public function getChildrenCategoriesWithInactive($category)
+    {
+        return $this->_loadNodes($category, 1, $category->getStoreId(), false);
+    }
+
     /**
      * Check is category in list of store categories
      *
@@ -1262,8 +1305,8 @@ public function isInRootCategoryList($category)
      * Return children ids of category
      *
      * @param Mage_Catalog_Model_Category $category
-     * @param unknown_type $recursive
-     * @param unknown_type $isActive
+     * @param bool $recursive
+     * @param bool $isActive
      * @return array
      */
     public function getChildren($category, $recursive = true, $isActive = true)
@@ -1424,6 +1467,7 @@ protected function _createTables()
     /**
      * Transactional rebuild flat data from eav
      *
+     * @throws Exception
      * @return Mage_Catalog_Model_Resource_Category_Flat
      */
     public function reindexAll()
@@ -1449,4 +1493,16 @@ public function reindexAll()
         }
         return $this;
     }
+
+    /**
+     * Check if Catalog Category Flat Data has been initialized
+     *
+     * @deprecated use Mage_Catalog_Model_Resource_Category_Flat::isBuilt() instead
+     *
+     * @return bool
+     */
+    public function isRebuilt()
+    {
+        return $this->isBuilt();
+    }
 }
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php
index e501d1cc1b9..a2632a5a380 100755
--- a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php
@@ -55,6 +55,25 @@ class Mage_Catalog_Model_Resource_Category_Flat_Collection extends Mage_Core_Mod
      */
     protected $_storeId        = null;
 
+    /**
+     * Catalog factory instance
+     *
+     * @var Mage_Catalog_Model_Factory
+     */
+    protected $_factory;
+
+    /**
+     * Initialize factory
+     *
+     * @param Mage_Core_Model_Resource_Abstract $resource
+     * @param array $args
+     */
+    public function __construct($resource = null, array $args = array())
+    {
+        parent::__construct($resource);
+        $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('catalog/factory');
+    }
+
     /**
      *  Collection initialization
      *
@@ -304,24 +323,29 @@ public function addAttributeToFilter($attribute, $condition = null)
     }
 
     /**
-     * Enter description here ...
+     * Join request_path column from url rewrite table
      *
      * @return Mage_Catalog_Model_Resource_Category_Flat_Collection
      */
     public function addUrlRewriteToResult()
     {
-        $storeId = Mage::app()->getStore()->getId();
-        $this->getSelect()->joinLeft(
-            array('url_rewrite' => $this->getTable('core/url_rewrite')),
-            'url_rewrite.category_id=main_table.entity_id AND url_rewrite.is_system=1 '.
-            'AND url_rewrite.product_id IS NULL'.
-            ' AND ' . $this->getConnection()->quoteInto('url_rewrite.store_id=?', $storeId).
-            ' AND ' . $this->getConnection()->quoteInto('url_rewrite.id_path LIKE ?','category/%'),
-            array('request_path')
-        );
+        /** @var $urlRewrite Mage_Catalog_Helper_Category_Url_Rewrite_Interface */
+        $urlRewrite = $this->_factory->getCategoryUrlRewriteHelper();
+        $urlRewrite->joinTableToCollection($this, $this->_getCurrentStoreId());
+
         return $this;
     }
 
+    /**
+     * Retrieves store_id from current store
+     *
+     * @return int
+     */
+    protected function _getCurrentStoreId()
+    {
+        return (int)Mage::app()->getStore()->getId();
+    }
+
     /**
      * Enter description here ...
      *
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php
index 544c5494f80..aee5f155008 100755
--- a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php
@@ -309,7 +309,9 @@ public function loadPrices($filter, $limit, $offset = null, $lowerPrice = null,
     {
         $select = $this->_getSelect($filter);
         $priceExpression = $this->_getPriceExpression($filter, $select);
-        $select->columns(array($this->_getFullPriceExpression($filter, $select)));
+        $select->columns(array(
+            'min_price_expr' => $this->_getFullPriceExpression($filter, $select)
+        ));
         if (!is_null($lowerPrice)) {
             $select->where("$priceExpression >= " . $this->_getComparingValue($lowerPrice, $filter));
         }
@@ -371,7 +373,9 @@ public function loadNextPrices($filter, $price, $rightIndex, $upperPrice = null)
         }
 
         $pricesSelect
-            ->columns(array($this->_getFullPriceExpression($filter, $pricesSelect)))
+            ->columns(array(
+                'min_price_expr' => $this->_getFullPriceExpression($filter, $pricesSelect)
+            ))
             ->where("$priceExpression >= " . $this->_getComparingValue($price, $filter));
         if (!is_null($upperPrice)) {
             $pricesSelect->where("$priceExpression < " . $this->_getComparingValue($upperPrice, $filter));
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.php
index c1e23216e3d..b66d247a468 100755
--- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.php
@@ -31,6 +31,7 @@
  * @category    Mage
  * @package     Mage_Catalog
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @deprecated since 1.7.0.2
  */
 class Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey
     extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php
index 29ac97dbc38..2ea263d2844 100755
--- a/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php
@@ -208,6 +208,25 @@ class Mage_Catalog_Model_Resource_Product_Collection extends Mage_Catalog_Model_
      */
     protected $_catalogPreparePriceSelect = null;
 
+    /**
+     * Catalog factory instance
+     *
+     * @var Mage_Catalog_Model_Factory
+     */
+    protected $_factory;
+
+    /**
+     * Initialize factory
+     *
+     * @param Mage_Core_Model_Resource_Abstract $resource
+     * @param array $args
+     */
+    public function __construct($resource = null, array $args = array())
+    {
+        parent::__construct($resource);
+        $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('catalog/factory');
+    }
+
     /**
      * Get cloned Select after dispatching 'catalog_prepare_price_select' event
      *
@@ -304,20 +323,22 @@ public function getFlatHelper()
 
     /**
      * Retrieve is flat enabled flag
-     * Return alvays false if magento run admin
+     * Return always false if magento run admin
      *
      * @return bool
      */
     public function isEnabledFlat()
     {
+        // Flat Data can be used only on frontend
         if (Mage::app()->getStore()->isAdmin()) {
             return false;
         }
-        if (!isset($this->_flatEnabled[$this->getStoreId()])) {
-            $this->_flatEnabled[$this->getStoreId()] = $this->getFlatHelper()
-                ->isEnabled($this->getStoreId());
+        $storeId = $this->getStoreId();
+        if (!isset($this->_flatEnabled[$storeId])) {
+            $flatHelper = $this->getFlatHelper();
+            $this->_flatEnabled[$storeId] = $flatHelper->isAvailable() && $flatHelper->isBuilt($storeId);
         }
-        return $this->_flatEnabled[$this->getStoreId()];
+        return $this->_flatEnabled[$storeId];
     }
 
     /**
@@ -520,8 +541,6 @@ protected function _afterLoad()
            $this->_addUrlRewrite($this->_urlRewriteCategory);
         }
 
-        $this->_prepareUrlDataObject();
-
         if (count($this) > 0) {
             Mage::dispatchEvent('catalog_product_collection_load_after', array('collection' => $this));
         }
@@ -539,6 +558,7 @@ protected function _afterLoad()
      * Prepare Url Data object
      *
      * @return Mage_Catalog_Model_Resource_Product_Collection
+     * @deprecated after 1.7.0.2
      */
     protected function _prepareUrlDataObject()
     {
@@ -653,7 +673,6 @@ public function addStoreFilter($store = null)
         $store = Mage::app()->getStore($store);
 
         if (!$store->isAdmin()) {
-            $this->setStoreId($store);
             $this->_productLimitationFilters['store_id'] = $store->getId();
             $this->_applyProductLimitations();
         }
@@ -905,9 +924,11 @@ protected function _prepareStatisticsData()
         $priceExpression = $this->getPriceExpression($select) . ' ' . $this->getAdditionalPriceExpression($select);
         $sqlEndPart = ') * ' . $this->getCurrencyRate() . ', 2)';
         $select = $this->_getSelectCountSql($select, false);
-        $select->columns('ROUND(MAX(' . $priceExpression . $sqlEndPart);
-        $select->columns('ROUND(MIN(' . $priceExpression . $sqlEndPart);
-        $select->columns($this->getConnection()->getStandardDeviationSql('ROUND((' . $priceExpression . $sqlEndPart));
+        $select->columns(array(
+            'max' => 'ROUND(MAX(' . $priceExpression . $sqlEndPart,
+            'min' => 'ROUND(MIN(' . $priceExpression . $sqlEndPart,
+            'std' => $this->getConnection()->getStandardDeviationSql('ROUND((' . $priceExpression . $sqlEndPart)
+        ));
         $select->where($this->getPriceExpression($select) . ' IS NOT NULL');
         $row = $this->getConnection()->fetchRow($select, $this->_bindParams, Zend_Db::FETCH_NUM);
         $this->_pricesCount = (int)$row[0];
@@ -1091,6 +1112,7 @@ public function getProductTypeIds()
     /**
      * Joins url rewrite rules to collection
      *
+     * @deprecated after 1.7.0.2. Method is not used anywhere in the code.
      * @return Mage_Catalog_Model_Resource_Product_Collection
      */
     public function joinUrlRewrite()
@@ -1110,7 +1132,7 @@ public function joinUrlRewrite()
      * Add URL rewrites data to product
      * If collection loadded - run processing else set flag
      *
-     * @param int $categoryId
+     * @param int|string $categoryId
      * @return Mage_Catalog_Model_Resource_Product_Collection
      */
     public function addUrlRewrite($categoryId = '')
@@ -1153,15 +1175,10 @@ protected function _addUrlRewrite()
                 return;
             }
 
-            $select = $this->getConnection()->select()
-                ->from($this->getTable('core/url_rewrite'), array('product_id', 'request_path'))
-                ->where('store_id = ?', Mage::app()->getStore()->getId())
-                ->where('is_system = ?', 1)
-                ->where('category_id = ? OR category_id IS NULL', $this->_urlRewriteCategory)
-                ->where('product_id IN(?)', $productIds)
-                ->order('category_id ' . self::SORT_ORDER_DESC); // more priority is data with category id
-            $urlRewrites = array();
+            $select = $this->_factory->getProductUrlRewriteHelper()
+                ->getTableSelect($productIds, $this->_urlRewriteCategory, Mage::app()->getStore()->getId());
 
+            $urlRewrites = array();
             foreach ($this->getConnection()->fetchAll($select) as $row) {
                 if (!isset($urlRewrites[$row['product_id']])) {
                     $urlRewrites[$row['product_id']] = $row['request_path'];
@@ -1179,6 +1196,9 @@ protected function _addUrlRewrite()
         }
 
         foreach($this->getItems() as $item) {
+            if (empty($this->_urlRewriteCategory)) {
+                $item->setDoNotUseCategoryId(true);
+            }
             if (isset($urlRewrites[$item->getEntityId()])) {
                 $item->setData('request_path', $urlRewrites[$item->getEntityId()]);
             } else {
@@ -1816,6 +1836,12 @@ public function applyFrontendPriceLimitations()
      */
     protected function _applyProductLimitations()
     {
+        Mage::dispatchEvent('catalog_product_collection_apply_limitations_before', array(
+            'collection'  => $this,
+            'category_id' => isset($this->_productLimitationFilters['category_id'])
+                ? $this->_productLimitationFilters['category_id']
+                : null,
+        ));
         $this->_prepareProductLimitationFilters();
         $this->_productLimitationJoinWebsite();
         $this->_productLimitationJoinPrice();
@@ -1833,8 +1859,11 @@ protected function _applyProductLimitations()
             $conditions[] = $this->getConnection()
                 ->quoteInto('cat_index.visibility IN(?)', $filters['visibility']);
         }
-        $conditions[] = $this->getConnection()
-            ->quoteInto('cat_index.category_id=?', $filters['category_id']);
+
+        if (!$this->getFlag('disable_root_category_filter')) {
+            $conditions[] = $this->getConnection()->quoteInto('cat_index.category_id = ?', $filters['category_id']);
+        }
+
         if (isset($filters['category_is_anchor'])) {
             $conditions[] = $this->getConnection()
                 ->quoteInto('cat_index.is_parent=?', $filters['category_is_anchor']);
@@ -1857,7 +1886,7 @@ protected function _applyProductLimitations()
         $this->_productLimitationJoinStore();
 
         Mage::dispatchEvent('catalog_product_collection_apply_limitations_after', array(
-            'collection'    => $this
+            'collection' => $this
         ));
 
         return $this;
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php
index 7fb6d62073c..d6405f9dea8 100755
--- a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php
@@ -41,6 +41,13 @@ class Mage_Catalog_Model_Resource_Product_Flat extends Mage_Core_Model_Resource_
      */
     protected $_storeId;
 
+    /**
+     * Store flag which defines if Catalog Product Flat Data has been initialized
+     *
+     * @var array
+     */
+    protected $_isBuilt                  = array();
+
     /**
      * Init connection and resource table
      *
@@ -217,4 +224,33 @@ public function getMainTable()
     {
         return $this->getFlatTableName($this->getStoreId());
     }
+
+    /**
+     * Check if Catalog Product Flat Data has been initialized
+     *
+     * @param bool|int|\Mage_Core_Model_Store|null $storeView Store(id) for which the value is checked
+     * @return bool
+     */
+    public function isBuilt($storeView = null)
+    {
+        if ($storeView === null) {
+            $storeId = Mage::app()->getDefaultStoreView()->getId();
+        } elseif (is_int($storeView)) {
+            $storeId = $storeView;
+        } else {
+            $storeId = Mage::app()->getStore($storeView)->getId();
+        }
+
+        if (!isset($this->_isBuilt[$storeId])) {
+            $select = $this->_getReadAdapter()->select()
+                ->from($this->getFlatTableName($storeId), 'entity_id')
+                ->limit(1);
+            try {
+                $this->_isBuilt[$storeId] = (bool)$this->_getReadAdapter()->fetchOne($select);
+            } catch (Exception $e) {
+                $this->_isBuilt[$storeId] = false;
+            }
+        }
+        return $this->_isBuilt[$storeId];
+    }
 }
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php
index 6d73df73179..e335fb490bc 100755
--- a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php
@@ -121,9 +121,6 @@ public function rebuild($store = null)
             foreach (Mage::app()->getStores() as $store) {
                 $this->rebuild($store->getId());
             }
-            $flag = $this->getFlatHelper()->getFlag();
-            $flag->setIsBuild(true)->save();
-
             return $this;
         }
 
@@ -137,6 +134,8 @@ public function rebuild($store = null)
         $this->updateRelationProducts($storeId);
         $this->cleanRelationProducts($storeId);
 
+        $flag = $this->getFlatHelper()->getFlag();
+        $flag->setIsBuilt(true)->setStoreBuilt($storeId, true)->save();
         return $this;
     }
 
@@ -1397,8 +1396,6 @@ public function reindexAll()
                 throw $e;
            }
         }
-        $flag = $this->getFlatHelper()->getFlag();
-        $flag->setIsBuild(true)->save();
 
         return $this;
     }
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Product/Collection.php
index 3ddc3928e08..329e6983876 100755
--- a/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Product/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Product/Collection.php
@@ -116,6 +116,7 @@ public function setProduct(Mage_Catalog_Model_Product $product)
         $this->_product = $product;
         if ($product && $product->getId()) {
             $this->_hasLinkFilter = true;
+            $this->setStore($product->getStore());
         }
         return $this;
     }
diff --git a/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Category/Flat.php b/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Category/Flat.php
index 5c593c6dd10..382087ebefd 100644
--- a/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Category/Flat.php
+++ b/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Category/Flat.php
@@ -37,7 +37,8 @@ class Mage_Catalog_Model_System_Config_Backend_Catalog_Category_Flat extends Mag
     protected function _afterSave()
     {
         if ($this->isValueChanged() && $this->getValue()) {
-            Mage::getSingleton('index/indexer')->getProcessByCode('catalog_category_flat')
+            Mage::getModel('index/indexer')
+                ->getProcessByCode(Mage_Catalog_Helper_Category_Flat::CATALOG_CATEGORY_FLAT_PROCESS_CODE)
                 ->changeStatus(Mage_Index_Model_Process::STATUS_REQUIRE_REINDEX);
         }
 
diff --git a/app/code/core/Mage/Catalog/controllers/CategoryController.php b/app/code/core/Mage/Catalog/controllers/CategoryController.php
index ca486e6ebfb..d18a3cfb650 100644
--- a/app/code/core/Mage/Catalog/controllers/CategoryController.php
+++ b/app/code/core/Mage/Catalog/controllers/CategoryController.php
@@ -55,6 +55,8 @@ protected function _initCatagory()
         }
         Mage::getSingleton('catalog/session')->setLastVisitedCategoryId($category->getId());
         Mage::register('current_category', $category);
+        Mage::register('current_entity_key', $category->getPath());
+
         try {
             Mage::dispatchEvent(
                 'catalog_controller_category_init_after',
diff --git a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.13-1.6.0.0.14.php b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.13-1.6.0.0.14.php
index ef7f466f271..e5436ca1de4 100644
--- a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.13-1.6.0.0.14.php
+++ b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.13-1.6.0.0.14.php
@@ -62,7 +62,7 @@
 }
 
 Mage::getModel('index/indexer')
-    ->getProcessByCode('catalog_category_flat')
+    ->getProcessByCode(Mage_Catalog_Helper_Category_Flat::CATALOG_CATEGORY_FLAT_PROCESS_CODE)
     ->changeStatus(Mage_Index_Model_Process::STATUS_REQUIRE_REINDEX);
 
 $installer->endSetup();
diff --git a/app/code/core/Mage/Catalog/etc/api.xml b/app/code/core/Mage/Catalog/etc/api.xml
index 320adbd2f06..da242db51af 100644
--- a/app/code/core/Mage/Catalog/etc/api.xml
+++ b/app/code/core/Mage/Catalog/etc/api.xml
@@ -163,6 +163,10 @@
                         <title>Update product</title>
                         <acl>catalog/product/update</acl>
                     </update>
+                    <multiUpdate translate="title" module="Mage_Catalog">
+                        <title>Multi update product</title>
+                        <acl>catalog/product/update</acl>
+                    </multiUpdate>
                     <delete translate="title" module="catalog">
                         <title>Delete product</title>
                         <acl>catalog/product/delete</acl>
@@ -209,6 +213,14 @@
                         <code>106</code>
                         <message>Product attribute set is not belong catalog product entity type</message>
                     </product_attribute_set_not_valid>
+                    <multi_update_not_match>
+                        <code>107</code>
+                        <message>Quantity of product IDs and product data should match. No changes made.</message>
+                    </multi_update_not_match>
+                    <partially_updated>
+                        <code>108</code>
+                        <message>There was an error during one or more products update. See error log for details.</message>
+                    </partially_updated>
                 </faults>
             </catalog_product>
             <catalog_product_attribute translate="title" module="catalog">
diff --git a/app/code/core/Mage/Catalog/etc/config.xml b/app/code/core/Mage/Catalog/etc/config.xml
index 9f490020474..4d7db607e19 100644
--- a/app/code/core/Mage/Catalog/etc/config.xml
+++ b/app/code/core/Mage/Catalog/etc/config.xml
@@ -28,7 +28,7 @@
 <config>
     <modules>
         <Mage_Catalog>
-            <version>1.6.0.0.14</version>
+            <version>1.6.0.0.18</version>
         </Mage_Catalog>
     </modules>
     <admin>
@@ -467,6 +467,14 @@
                     </catalog_add_topmenu_items>
                 </observers>
             </page_block_html_topmenu_gethtml_before>
+            <catalog_entity_attribute_save_before>
+                <observers>
+                    <catalog_check_reserved_attribute_codes>
+                        <class>catalog/observer</class>
+                        <method>checkReservedAttributeCodes</method>
+                    </catalog_check_reserved_attribute_codes>
+                </observers>
+            </catalog_entity_attribute_save_before>
         </events>
         <catalog>
             <product>
@@ -587,11 +595,28 @@
                     </attribute_nodes>
                     <add_filterable_attributes>0</add_filterable_attributes>
                     <add_child_data>0</add_child_data>
+                    <flag>
+                        <model>catalog/product_flat_flag</model>
+                    </flag>
                 </flat>
+                <url>
+                    <model>catalog/product_url</model>
+                </url>
+                <url_rewrite>
+                    <helper>catalog/product_url_rewrite</helper>
+                </url_rewrite>
             </product>
             <content>
                 <tempate_filter>catalog/template_filter</tempate_filter>
             </content>
+            <category>
+                <url>
+                    <model>catalog/category_url</model>
+                </url>
+                <url_rewrite>
+                    <helper>catalog/category_url_rewrite</helper>
+                </url_rewrite>
+            </category>
         </catalog>
         <eav_attributes>
             <catalog_product>
@@ -646,6 +671,14 @@
                     </catalog_wysiwyg>
                 </observers>
             </cms_wysiwyg_images_static_urls_allowed>
+            <admin_system_config_changed_section_catalog>
+                <observers>
+                    <mage_catalog>
+                        <class>core/observer</class>
+                        <method>cleanCacheByTags</method>
+                    </mage_catalog>
+                </observers>
+            </admin_system_config_changed_section_catalog>
         </events>
     </adminhtml>
     <frontend>
diff --git a/app/code/core/Mage/Catalog/etc/system.xml b/app/code/core/Mage/Catalog/etc/system.xml
index 40268ec48e1..7746d650085 100644
--- a/app/code/core/Mage/Catalog/etc/system.xml
+++ b/app/code/core/Mage/Catalog/etc/system.xml
@@ -116,8 +116,9 @@
                             <show_in_store>0</show_in_store>
                         </flat_catalog_category>
 
-                        <flat_catalog_product translate="label">
+                        <flat_catalog_product translate="label comment">
                             <label>Use Flat Catalog Product</label>
+                            <comment><![CDATA[Enable for reindexing a big number of SKUs]]>.</comment>
                             <frontend_type>select</frontend_type>
                             <frontend_model>adminhtml/system_config_form_field_select_flatproduct</frontend_model>
                             <backend_model>catalog/system_config_backend_catalog_product_flat</backend_model>
diff --git a/app/code/core/Mage/Catalog/etc/widget.xml b/app/code/core/Mage/Catalog/etc/widget.xml
index 302a77148ea..80b3d8ddb79 100644
--- a/app/code/core/Mage/Catalog/etc/widget.xml
+++ b/app/code/core/Mage/Catalog/etc/widget.xml
@@ -31,10 +31,42 @@
         <description>List of Products that are set as New</description>
         <is_email_compatible>1</is_email_compatible>
         <parameters>
-            <products_count translate="label">
+            <display_type translate="label description">
+                <required>1</required>
+                <visible>1</visible>
+                <label>Display Type</label>
+                <type>select</type>
+                <value>all_products</value>
+                <values>
+                    <default translate="label">
+                        <value>all_products</value>
+                        <label>All products</label>
+                    </default>
+                    <item translate="label">
+                        <value>new_products</value>
+                        <label>New products</label>
+                    </item>
+                </values>
+                <description>All products - recently added products, New products - products marked as new</description>
+            </display_type>
+            <show_pager translate="label">
+                <visible>1</visible>
+                <label>Display Page Control</label>
+                <type>select</type>
+                <source_model>adminhtml/system_config_source_yesno</source_model>
+            </show_pager>
+            <products_per_page translate="label">
                 <required>1</required>
                 <visible>1</visible>
                 <value>5</value>
+                <label>Number of Products per Page</label>
+                <type>text</type>
+                <depends><show_pager><value>1</value></show_pager></depends>
+            </products_per_page>
+            <products_count translate="label">
+                <required>1</required>
+                <visible>1</visible>
+                <value>10</value>
                 <label>Number of Products to Display</label>
                 <type>text</type>
             </products_count>
diff --git a/app/code/core/Mage/Catalog/etc/wsdl.xml b/app/code/core/Mage/Catalog/etc/wsdl.xml
index 1aba78ee875..627fe123a6c 100644
--- a/app/code/core/Mage/Catalog/etc/wsdl.xml
+++ b/app/code/core/Mage/Catalog/etc/wsdl.xml
@@ -107,6 +107,13 @@
                     <element name="additional_attributes" type="typens:catalogProductAdditionalAttributesEntity" minOccurs="0"/>
                 </all>
             </complexType>
+            <complexType name="catalogProductCreateEntityArray">
+                <complexContent>
+                    <restriction base="soapenc:Array">
+                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogProductCreateEntity[]"/>
+                    </restriction>
+                </complexContent>
+            </complexType>
             <complexType name="catalogProductAttributeSetEntity">
                 <all>
                     <element name="set_id" type="xsd:int" minOccurs="0"/>
@@ -604,6 +611,13 @@
                     <element name="sort_order" type="xsd:string" minOccurs="0" maxOccurs="1" />
                 </all>
             </complexType>
+            <complexType name="catalogProductSpecialPriceReturnEntity">
+                <all>
+                    <element name="special_price" type="xsd:string" minOccurs="1" maxOccurs="1" />
+                    <element name="special_from_date" type="xsd:string" minOccurs="1" maxOccurs="1" />
+                    <element name="special_to_date" type="xsd:string" minOccurs="1" maxOccurs="1" />
+                </all>
+            </complexType>
         </schema>
     </types>
     <message name="catalogProductCurrentStoreRequest">
@@ -623,10 +637,10 @@
     </message>
     <message name="catalogProductInfoRequest">
         <part name="sessionId" type="xsd:string"/>
-        <part name="product" type="xsd:string"/>
+        <part name="productId" type="xsd:string"/>
         <part name="storeView" type="xsd:string"/>
         <part name="attributes" type="typens:catalogProductRequestAttributes"/>
-        <part name="productIdentifierType" type="xsd:string"/>
+        <part name="identifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductInfoResponse">
         <part name="info" type="typens:catalogProductReturnEntity"/>
@@ -647,11 +661,21 @@
         <part name="product" type="xsd:string"/>
         <part name="productData" type="typens:catalogProductCreateEntity"/>
         <part name="storeView" type="xsd:string"/>
-        <part name="productIdentifierType" type="xsd:string"/>
+        <part name="identifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductUpdateResponse">
         <part name="result" type="xsd:boolean"/>
     </message>
+    <message name="catalogProductMultiUpdateRequest">
+        <part name="sessionId" type="xsd:string"/>
+        <part name="productIds" type="typens:ArrayOfString"/>
+        <part name="productData" type="typens:catalogProductCreateEntityArray"/>
+        <part name="store" type="xsd:string"/>
+        <part name="identifierType" type="xsd:string"/>
+    </message>
+    <message name="catalogProductMultiUpdateResponse">
+        <part name="result" type="xsd:boolean"/>
+    </message>
     <message name="catalogProductSetSpecialPriceRequest">
         <part name="sessionId" type="xsd:string"/>
         <part name="product" type="xsd:string"/>
@@ -659,7 +683,7 @@
         <part name="fromDate" type="xsd:string"/>
         <part name="toDate" type="xsd:string"/>
         <part name="storeView" type="xsd:string"/>
-        <part name="productIdentifierType" type="xsd:string"/>
+        <part name="identifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductSetSpecialPriceResponse">
         <part name="result" type="xsd:int"/>
@@ -668,15 +692,15 @@
         <part name="sessionId" type="xsd:string"/>
         <part name="product" type="xsd:string"/>
         <part name="storeView" type="xsd:string"/>
-        <part name="productIdentifierType" type="xsd:string"/>
+        <part name="identifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductGetSpecialPriceResponse">
-        <part name="result" type="typens:catalogProductReturnEntity"/>
+        <part name="result" type="typens:catalogProductSpecialPriceReturnEntity"/>
     </message>
     <message name="catalogProductDeleteRequest">
         <part name="sessionId" type="xsd:string"/>
         <part name="product" type="xsd:string"/>
-        <part name="productIdentifierType" type="xsd:string"/>
+        <part name="identifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductDeleteResponse">
         <part name="result" type="xsd:int"/>
@@ -807,7 +831,7 @@
         <part name="data" type="typens:catalogProductAttributeEntityToUpdate"/>
     </message>
     <message name="catalogProductAttributeUpdateResponse">
-        <part name="result" type="xsd:boolean" />
+        <part name="result" type="xsd:boolean"/>
     </message>
     <message name="catalogProductAttributeAddOptionRequest">
         <part name="sessionId" type="xsd:string"/>
@@ -834,7 +858,7 @@
     <message name="catalogProductAttributeTierPriceInfoRequest">
         <part name="sessionId" type="xsd:string"/>
         <part name="product" type="xsd:string"/>
-        <part name="productIdentifierType" type="xsd:string"/>
+        <part name="identifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductAttributeTierPriceInfoResponse">
         <part name="result" type="typens:catalogProductTierPriceEntityArray"/>
@@ -843,7 +867,7 @@
         <part name="sessionId" type="xsd:string"/>
         <part name="product" type="xsd:string"/>
         <part name="tier_price" type="typens:catalogProductTierPriceEntityArray"/>
-        <part name="productIdentifierType" type="xsd:string"/>
+        <part name="identifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductAttributeTierPriceUpdateResponse">
         <part name="result" type="xsd:int"/>
@@ -859,7 +883,7 @@
         <part name="sessionId" type="xsd:string"/>
         <part name="product" type="xsd:string"/>
         <part name="storeView" type="xsd:string"/>
-        <part name="productIdentifierType" type="xsd:string"/>
+        <part name="identifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductAttributeMediaListResponse">
         <part name="result" type="typens:catalogProductImageEntityArray"/>
@@ -869,7 +893,7 @@
         <part name="product" type="xsd:string"/>
         <part name="file" type="xsd:string"/>
         <part name="storeView" type="xsd:string"/>
-        <part name="productIdentifierType" type="xsd:string"/>
+        <part name="identifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductAttributeMediaInfoResponse">
         <part name="result" type="typens:catalogProductImageEntity"/>
@@ -886,7 +910,7 @@
         <part name="product" type="xsd:string"/>
         <part name="data" type="typens:catalogProductAttributeMediaCreateEntity"/>
         <part name="storeView" type="xsd:string"/>
-        <part name="productIdentifierType" type="xsd:string"/>
+        <part name="identifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductAttributeMediaCreateResponse">
         <part name="result" type="xsd:string"/>
@@ -897,7 +921,7 @@
         <part name="file" type="xsd:string"/>
         <part name="data" type="typens:catalogProductAttributeMediaCreateEntity"/>
         <part name="storeView" type="xsd:string"/>
-        <part name="productIdentifierType" type="xsd:string"/>
+        <part name="identifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductAttributeMediaUpdateResponse">
         <part name="result" type="xsd:boolean"/>
@@ -906,7 +930,7 @@
         <part name="sessionId" type="xsd:string"/>
         <part name="product" type="xsd:string"/>
         <part name="file" type="xsd:string"/>
-        <part name="productIdentifierType" type="xsd:string"/>
+        <part name="identifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductAttributeMediaRemoveResponse">
         <part name="result" type="xsd:boolean"/>
@@ -915,7 +939,7 @@
         <part name="sessionId" type="xsd:string"/>
         <part name="type" type="xsd:string"/>
         <part name="product" type="xsd:string"/>
-        <part name="productIdentifierType" type="xsd:string"/>
+        <part name="identifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductLinkListResponse">
         <part name="result" type="typens:catalogProductLinkEntityArray"/>
@@ -926,7 +950,7 @@
         <part name="product" type="xsd:string"/>
         <part name="linkedProduct" type="xsd:string"/>
         <part name="data" type="typens:catalogProductLinkEntity"/>
-        <part name="productIdentifierType" type="xsd:string"/>
+        <part name="identifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductLinkAssignResponse">
         <part name="result" type="xsd:boolean"/>
@@ -937,7 +961,7 @@
         <part name="product" type="xsd:string"/>
         <part name="linkedProduct" type="xsd:string"/>
         <part name="data" type="typens:catalogProductLinkEntity"/>
-        <part name="productIdentifierType" type="xsd:string"/>
+        <part name="identifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductLinkUpdateResponse">
         <part name="result" type="xsd:boolean"/>
@@ -947,7 +971,7 @@
         <part name="type" type="xsd:string"/>
         <part name="product" type="xsd:string"/>
         <part name="linkedProduct" type="xsd:string"/>
-        <part name="productIdentifierType" type="xsd:string"/>
+        <part name="identifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductLinkRemoveResponse">
         <part name="result" type="xsd:boolean"/>
@@ -1132,7 +1156,7 @@
         <part name="categoryId" type="xsd:int"/>
         <part name="product" type="xsd:string"/>
         <part name="position" type="xsd:string"/>
-        <part name="productIdentifierType" type="xsd:string"/>
+        <part name="identifierType" type="xsd:string"/>
     </message>
     <message name="catalogCategoryAssignProductResponse">
         <part name="result" type="xsd:boolean"/>
@@ -1142,7 +1166,7 @@
         <part name="categoryId" type="xsd:int"/>
         <part name="product" type="xsd:string"/>
         <part name="position" type="xsd:string"/>
-        <part name="productIdentifierType" type="xsd:string"/>
+        <part name="identifierType" type="xsd:string"/>
     </message>
     <message name="catalogCategoryUpdateProductResponse">
         <part name="result" type="xsd:boolean"/>
@@ -1151,7 +1175,7 @@
         <part name="sessionId" type="xsd:string"/>
         <part name="categoryId" type="xsd:int"/>
         <part name="product" type="xsd:string"/>
-        <part name="productIdentifierType" type="xsd:string"/>
+        <part name="identifierType" type="xsd:string"/>
     </message>
     <message name="catalogCategoryRemoveProductResponse">
         <part name="result" type="xsd:boolean"/>
@@ -1278,6 +1302,11 @@
             <input message="typens:catalogProductUpdateRequest"/>
             <output message="typens:catalogProductUpdateResponse"/>
         </operation>
+        <operation name="catalogProductMultiUpdate">
+            <documentation>Product multi update</documentation>
+            <input message="typens:catalogProductMultiUpdateRequest"/>
+            <output message="typens:catalogProductMultiUpdateResponse"/>
+        </operation>
         <operation name="catalogProductSetSpecialPrice">
             <documentation>Update product special price</documentation>
             <input message="typens:catalogProductSetSpecialPriceRequest"/>
@@ -1724,6 +1753,17 @@
                            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
+        <operation name="catalogProductMultiUpdate">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
+            <input>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+            </input>
+            <output>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+            </output>
+        </operation>
         <operation name="catalogProductSetSpecialPrice">
             <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
diff --git a/app/code/core/Mage/Catalog/etc/wsi.xml b/app/code/core/Mage/Catalog/etc/wsi.xml
index d3918cf476b..fd4fca2cc88 100644
--- a/app/code/core/Mage/Catalog/etc/wsi.xml
+++ b/app/code/core/Mage/Catalog/etc/wsi.xml
@@ -99,6 +99,11 @@
                     <xsd:element name="additional_attributes" type="typens:associativeArray" minOccurs="0" />
                 </xsd:sequence>
             </xsd:complexType>
+            <xsd:complexType name="catalogProductCreateEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:catalogProductCreateEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
             <xsd:complexType name="catalogProductAttributeSetEntity">
                 <xsd:sequence>
                     <xsd:element name="set_id" type="xsd:int" minOccurs="0" />
@@ -498,6 +503,71 @@
                     <xsd:element name="sort_order" type="xsd:string" minOccurs="0" maxOccurs="1" />
                 </xsd:sequence>
             </xsd:complexType>
+            <xsd:complexType name="catalogProductAttributeOptionLabelEntity">
+                <xsd:sequence>
+                    <xsd:element minOccurs="1" maxOccurs="1" name="store_id" type="typens:ArrayOfString" />
+                    <xsd:element minOccurs="1" maxOccurs="1" name="value" type="xsd:string" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductAttributeOptionLabelArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="1" maxOccurs="unbounded" name="complexObjectArray" type="typens:catalogProductAttributeOptionLabelEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductAttributeOptionEntityToAdd">
+                <xsd:sequence>
+                    <xsd:element minOccurs="1" maxOccurs="1" name="label" type="typens:catalogProductAttributeOptionLabelArray" />
+                    <xsd:element minOccurs="1" maxOccurs="1" name="order" type="xsd:int" />
+                    <xsd:element minOccurs="1" maxOccurs="1" name="is_default" type="xsd:int" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductAttributeEntity">
+                <xsd:sequence>
+                    <xsd:element minOccurs="1" maxOccurs="1" name="attribute_id" type="xsd:string" />
+                    <xsd:element minOccurs="1" maxOccurs="1" name="attribute_code" type="xsd:string" />
+                    <xsd:element minOccurs="1" maxOccurs="1" name="frontend_input" type="xsd:string" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="scope" type="xsd:string" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="default_value" type="xsd:string" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="is_unique" type="xsd:int" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="is_required" type="xsd:int" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="apply_to" type="typens:ArrayOfString" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="is_configurable" type="xsd:int" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="is_searchable" type="xsd:int" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="is_visible_in_advanced_search" type="xsd:int" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="is_comparable" type="xsd:int" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="is_used_for_promo_rules" type="xsd:int" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="is_visible_on_front" type="xsd:int" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="used_in_product_listing" type="xsd:int" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="additional_fields" type="typens:associativeArray" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="options" type="typens:catalogAttributeOptionEntityArray" />
+                    <xsd:element minOccurs="1" maxOccurs="1" name="frontend_label" type="typens:catalogProductAttributeFrontendLabelArray" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductAttributeEntityToUpdate">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="1" name="scope" type="xsd:string" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="default_value" type="xsd:string" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="is_unique" type="xsd:int" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="is_required" type="xsd:int" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="apply_to" type="typens:ArrayOfString" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="is_configurable" type="xsd:int" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="is_searchable" type="xsd:int" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="is_visible_in_advanced_search" type="xsd:int" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="is_comparable" type="xsd:int" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="is_used_for_promo_rules" type="xsd:int" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="is_visible_on_front" type="xsd:int" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="used_in_product_listing" type="xsd:int" />
+                    <xsd:element minOccurs="0" maxOccurs="1" name="additional_fields" type="typens:associativeArray" />
+                    <xsd:element minOccurs="1" maxOccurs="1" name="frontend_label" type="typens:catalogProductAttributeFrontendLabelArray" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductSpecialPriceReturnEntity">
+                <xsd:sequence>
+                    <xsd:element minOccurs="1" maxOccurs="1" name="special_price" type="xsd:string" />
+                    <xsd:element minOccurs="1" maxOccurs="1" name="special_from_date" type="xsd:string" />
+                    <xsd:element minOccurs="1" maxOccurs="1" name="special_to_date" type="xsd:string" />
+                </xsd:sequence>
+            </xsd:complexType>
             <xsd:element name="catalogProductCurrentStoreRequestParam">
                 <xsd:complexType>
                     <xsd:sequence>
@@ -584,6 +654,24 @@
                     </xsd:sequence>
                 </xsd:complexType>
             </xsd:element>
+            <xsd:element name="catalogProductMultiUpdateRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productIds" type="typens:ArrayOfString" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productData" type="typens:catalogProductCreateEntityArray" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="identifierType" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductMultiUpdateResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
             <xsd:element name="catalogProductSetSpecialPriceRequestParam">
                 <xsd:complexType>
                     <xsd:sequence>
@@ -615,7 +703,7 @@
             <xsd:element name="catalogProductGetSpecialPriceResponseParam">
                 <xsd:complexType>
                     <xsd:sequence>
-                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogProductReturnEntity" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogProductSpecialPriceReturnEntity" />
                     </xsd:sequence>
                 </xsd:complexType>
             </xsd:element>
@@ -921,6 +1009,22 @@
                     </xsd:sequence>
                 </xsd:complexType>
             </xsd:element>
+            <xsd:element name="catalogProductAttributeAddOptionRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="attribute" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="data" type="typens:catalogProductAttributeOptionEntityToAdd" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeAddOptionResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
             <xsd:element name="catalogProductAttributeSetAttributeRemoveRequestParam">
                 <xsd:complexType>
                     <xsd:sequence>
@@ -1512,6 +1616,52 @@
                     </xsd:sequence>
                 </xsd:complexType>
             </xsd:element>
+            <xsd:element name="catalogProductAttributeRemoveRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="attribute" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeRemoveResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeInfoRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="attribute" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeInfoResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogProductAttributeEntity" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeUpdateRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="attribute" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="data" type="typens:catalogProductAttributeEntityToUpdate" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeUpdateResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
         </xsd:schema>
     </wsdl:types>
     <wsdl:message name="catalogProductCurrentStoreRequest">
@@ -1544,6 +1694,12 @@
     <wsdl:message name="catalogProductUpdateResponse">
         <wsdl:part name="parameters" element="typens:catalogProductUpdateResponseParam" />
     </wsdl:message>
+    <wsdl:message name="catalogProductMultiUpdateRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductMultiUpdateRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductMultiUpdateResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductMultiUpdateResponseParam" />
+    </wsdl:message>
     <wsdl:message name="catalogProductSetSpecialPriceRequest">
         <wsdl:part name="parameters" element="typens:catalogProductSetSpecialPriceRequestParam" />
     </wsdl:message>
@@ -1670,6 +1826,12 @@
     <wsdl:message name="catalogProductAttributeSetAttributeAddResponse">
         <wsdl:part name="parameters" element="typens:catalogProductAttributeSetAttributeAddResponseParam" />
     </wsdl:message>
+    <wsdl:message name="catalogProductAttributeAddOptionRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeAddOptionRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeAddOptionResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeAddOptionResponseParam" />
+    </wsdl:message>
     <wsdl:message name="catalogProductAttributeSetAttributeRemoveRequest">
         <wsdl:part name="parameters" element="typens:catalogProductAttributeSetAttributeRemoveRequestParam" />
     </wsdl:message>
@@ -1886,6 +2048,24 @@
     <wsdl:message name="catalogProductAttributeCreateResponse">
         <wsdl:part name="parameters" element="typens:catalogProductAttributeCreateResponseParam" />
     </wsdl:message>
+    <wsdl:message name="catalogProductAttributeRemoveRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeRemoveRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeRemoveResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeRemoveResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeInfoRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeInfoRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeInfoResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeInfoResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeUpdateRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeUpdateRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeUpdateResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeUpdateResponseParam" />
+    </wsdl:message>
     <wsdl:portType name="{{var wsdl.handler}}PortType">
         <wsdl:operation name="catalogCategoryCurrentStore">
             <wsdl:documentation>Set_Get current store view</wsdl:documentation>
@@ -1987,6 +2167,11 @@
             <wsdl:input message="typens:catalogProductUpdateRequest" />
             <wsdl:output message="typens:catalogProductUpdateResponse" />
         </wsdl:operation>
+        <wsdl:operation name="catalogProductMultiUpdate">
+            <wsdl:documentation>Product multi update</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductMultiUpdateRequest" />
+            <wsdl:output message="typens:catalogProductMultiUpdateResponse" />
+        </wsdl:operation>
         <wsdl:operation name="catalogProductSetSpecialPrice">
             <wsdl:documentation>Update product special price</wsdl:documentation>
             <wsdl:input message="typens:catalogProductSetSpecialPriceRequest" />
@@ -2092,6 +2277,11 @@
             <wsdl:input message="typens:catalogProductAttributeSetAttributeAddRequest" />
             <wsdl:output message="typens:catalogProductAttributeSetAttributeAddResponse" />
         </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeAddOption">
+            <wsdl:documentation>Add option to attribute</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductAttributeAddOptionRequest" />
+            <wsdl:output message="typens:catalogProductAttributeAddOptionResponse" />
+        </wsdl:operation>
         <wsdl:operation name="catalogProductAttributeSetAttributeRemove">
             <wsdl:documentation>Remove attribute from attribute set</wsdl:documentation>
             <wsdl:input message="typens:catalogProductAttributeSetAttributeRemoveRequest" />
@@ -2197,11 +2387,21 @@
             <wsdl:input message="typens:catalogProductAttributeCreateRequest" />
             <wsdl:output message="typens:catalogProductAttributeCreateResponse" />
         </wsdl:operation>
-        <wsdl:operation name="catalogProductAttributeRemove">
+        <wsdl:operation name="catalogProductAttributeUpdate">
+            <wsdl:documentation>Update attribute</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductAttributeUpdateRequest" />
+            <wsdl:output message="typens:catalogProductAttributeUpdateResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeRemove" >
             <wsdl:documentation>Delete attribute</wsdl:documentation>
             <wsdl:input message="typens:catalogProductAttributeRemoveRequest" />
             <wsdl:output message="typens:catalogProductAttributeRemoveResponse" />
         </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeInfo">
+            <wsdl:documentation>Get full information about attribute with list of options</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductAttributeInfoRequest"/>
+            <wsdl:output message="typens:catalogProductAttributeInfoResponse"/>
+        </wsdl:operation>
     </wsdl:portType>
     <wsdl:binding name="{{var wsdl.handler}}Binding" type="typens:{{var wsdl.handler}}PortType">
         <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
@@ -2358,6 +2558,15 @@
                 <soap:body use="literal" />
             </wsdl:output>
         </wsdl:operation>
+        <wsdl:operation name="catalogProductMultiUpdate">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
         <wsdl:operation name="catalogProductSetSpecialPrice">
             <soap:operation soapAction="" />
             <wsdl:input>
@@ -2556,6 +2765,15 @@
                 <soap:body use="literal" />
             </wsdl:output>
         </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeAddOption">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
         <wsdl:operation name="catalogProductAttributeSetGroupAdd">
             <soap:operation soapAction="" />
             <wsdl:input>
@@ -2763,6 +2981,33 @@
                 <soap:body use="literal" />
             </wsdl:output>
         </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeRemove">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeInfo">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeUpdate">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
     </wsdl:binding>
     <wsdl:service name="{{var wsdl.name}}Service">
         <wsdl:port name="{{var wsdl.handler}}Port" binding="typens:{{var wsdl.handler}}Binding">
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.65-0.7.66.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.65-0.7.66.php
index b007ad0bc23..cc956620ef9 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.65-0.7.66.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.65-0.7.66.php
@@ -30,7 +30,7 @@
 
 Mage::getModel('catalog/product_flat_flag')
     ->loadSelf()
-    ->setIsBuild(false)
+    ->setIsBuilt(false)
     ->save();
 
 $installer->startSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.14-1.6.0.0.15.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.14-1.6.0.0.15.php
new file mode 100644
index 00000000000..df803196433
--- /dev/null
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.14-1.6.0.0.15.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Catalog
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+$installer = $this;
+/** @var $installer Mage_Catalog_Model_Resource_Setup */
+
+foreach (array('news_from_date', 'custom_design_from') as $attributeCode) {
+    $installer->updateAttribute(
+        Mage_Catalog_Model_Product::ENTITY,
+        $attributeCode,
+        'backend_model',
+        'catalog/product_attribute_backend_startdate'
+    );
+}
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.15-1.6.0.0.18.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.15-1.6.0.0.18.php
new file mode 100644
index 00000000000..83abe945482
--- /dev/null
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.15-1.6.0.0.18.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Catalog
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Dummy script for maintainig data and schema version integrity
+ */
diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Indexer.php
index f50bad07679..5d3ffbe5541 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Indexer.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Indexer.php
@@ -186,7 +186,9 @@ protected function _getWebsites()
      */
     public function cleanup($product)
     {
-        $this->_getResource()->clear(true, true, true, true, true, $product, ($product->getNeedStoreForReindex() === true ? $this->_getStores() : null));
+        $store = $product->getNeedStoreForReindex() === true ? $this->_getStores() : null;
+        $this->_getResource()->clear(true, true, true, true, true, $product, $store);
+
         return $this;
     }
 
@@ -342,7 +344,9 @@ public function plainReindex($products = null, $attributes = null, $stores = nul
             /**
              * Catalog Product Flat price update
              */
-            if (Mage::helper('catalog/product_flat')->isBuilt()) {
+            /** @var $productFlatHelper Mage_Catalog_Helper_Product_Flat */
+            $productFlatHelper = Mage::helper('catalog/product_flat');
+            if ($productFlatHelper->isAvailable() && $productFlatHelper->isBuilt()) {
                 foreach ($stores as $store) {
                     $this->updateCatalogProductFlat($store, $products);
                 }
@@ -376,7 +380,9 @@ protected function _afterPlainReindex($store, $products = null)
         /**
          * Catalog Product Flat price update
          */
-        if (Mage::helper('catalog/product_flat')->isBuilt()) {
+        /** @var $productFlatHelper Mage_Catalog_Helper_Product_Flat */
+        $productFlatHelper = Mage::helper('catalog/product_flat');
+        if ($productFlatHelper->isAvailable() && $productFlatHelper->isBuilt()) {
             if ($store instanceof Mage_Core_Model_Website) {
                 foreach ($store->getStores() as $storeObject) {
                     $this->_afterPlainReindex($storeObject->getId(), $products);
@@ -642,21 +648,25 @@ public function buildEntityPriceFilter($attributes, $values, &$filteredAttribute
 
                                 if (isset($values[$code]['from']) && isset($values[$code]['to'])) {
                                     if (isset($values[$code]['currency'])) {
-                                        $rateConversion = $this->_getBaseToSpecifiedCurrencyRate($values[$code]['currency']);
+                                        $rateConversion = $this->_getBaseToSpecifiedCurrencyRate(
+                                            $values[$code]['currency']
+                                        );
                                     } else {
                                         $rateConversion = $this->_getBaseToSpecifiedCurrencyRate($currentStoreCurrency);
                                     }
 
-                                    if (strlen($values[$code]['from'])>0) {
+                                    if (strlen($values[$code]['from']) > 0) {
                                         $filter[$code]->where(
-                                            "($table.min_price".implode('', $additionalCalculations[$code]).")*{$rateConversion} >= ?",
+                                            "($table.min_price"
+                                            . implode('', $additionalCalculations[$code]).")*{$rateConversion} >= ?",
                                             $values[$code]['from']
                                         );
                                     }
 
-                                    if (strlen($values[$code]['to'])>0) {
+                                    if (strlen($values[$code]['to']) > 0) {
                                         $filter[$code]->where(
-                                            "($table.min_price".implode('', $additionalCalculations[$code]).")*{$rateConversion} <= ?",
+                                            "($table.min_price"
+                                            . implode('', $additionalCalculations[$code]).")*{$rateConversion} <= ?",
                                             $values[$code]['to']
                                         );
                                     }
@@ -720,7 +730,8 @@ public function buildEntityFilter($attributes, $values, &$filteredAttributes, $p
 
                                     if ($values[$code]['from']) {
                                         if (!is_numeric($values[$code]['from'])) {
-                                            $values[$code]['from'] = date("Y-m-d H:i:s", strtotime($values[$code]['from']));
+                                            $_date = date("Y-m-d H:i:s", strtotime($values[$code]['from']));
+                                            $values[$code]['from'] = $_date;
                                         }
 
                                         $filter[$code]->where("value >= ?", $values[$code]['from']);
diff --git a/app/code/core/Mage/CatalogInventory/Block/Qtyincrements.php b/app/code/core/Mage/CatalogInventory/Block/Qtyincrements.php
index 4fca1e8423b..cb86597bad0 100644
--- a/app/code/core/Mage/CatalogInventory/Block/Qtyincrements.php
+++ b/app/code/core/Mage/CatalogInventory/Block/Qtyincrements.php
@@ -76,4 +76,14 @@ public function getProductQtyIncrements()
         }
         return $this->_qtyIncrements;
     }
+
+    /**
+     * Retrieve block cache tags
+     *
+     * @return array
+     */
+    public function getCacheTags()
+    {
+        return array_merge(parent::getCacheTags(), $this->_getProduct()->getCacheIdTags());
+    }
 }
diff --git a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Default.php b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Default.php
index 693b75e9f02..88c5da569d9 100644
--- a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Default.php
+++ b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Default.php
@@ -46,4 +46,14 @@ protected function _toHtml()
         }
         return parent::_toHtml();
     }
+
+    /**
+     * Retrieve block cache tags
+     *
+     * @return array
+     */
+    public function getCacheTags()
+    {
+        return array_merge(parent::getCacheTags(), $this->_getProduct()->getCacheIdTags());
+    }
 }
diff --git a/app/code/core/Mage/CatalogInventory/Helper/Data.php b/app/code/core/Mage/CatalogInventory/Helper/Data.php
index 42fef0b323f..251fef3fa4b 100644
--- a/app/code/core/Mage/CatalogInventory/Helper/Data.php
+++ b/app/code/core/Mage/CatalogInventory/Helper/Data.php
@@ -31,6 +31,10 @@ class Mage_CatalogInventory_Helper_Data extends Mage_Core_Helper_Abstract
 {
     const XML_PATH_SHOW_OUT_OF_STOCK    = 'cataloginventory/options/show_out_of_stock';
     const XML_PATH_ITEM_AUTO_RETURN     = 'cataloginventory/item_options/auto_return';
+    /**
+     * Path to configuration option 'Display product stock status'
+     */
+    const XML_PATH_DISPLAY_PRODUCT_STOCK_STATUS = 'cataloginventory/options/display_product_stock_status';
 
     /**
      * Error codes, that Catalog Inventory module can set to quote or quote items
@@ -125,4 +129,15 @@ public function isAutoReturnEnabled()
     {
         return Mage::getStoreConfigFlag(self::XML_PATH_ITEM_AUTO_RETURN);
     }
+
+    /**
+     * Get 'Display product stock status' option value
+     * Shows if it is necessary to show product stock status ('in stock'/'out of stock')
+     *
+     * @return bool
+     */
+    public function isDisplayProductStockStatus()
+    {
+        return Mage::getStoreConfigFlag(self::XML_PATH_DISPLAY_PRODUCT_STOCK_STATUS);
+    }
 }
diff --git a/app/code/core/Mage/CatalogInventory/Model/Observer.php b/app/code/core/Mage/CatalogInventory/Model/Observer.php
index 4c819a3706a..eb901624297 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Observer.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Observer.php
@@ -308,6 +308,34 @@ public function checkQuoteItemQty($observer)
          */
         $qty = $quoteItem->getQty();
 
+        /**
+         * Check if product in stock. For composite products check base (parent) item stosk status
+         */
+        $stockItem = $quoteItem->getProduct()->getStockItem();
+        $parentStockItem = false;
+        if ($quoteItem->getParentItem()) {
+            $parentStockItem = $quoteItem->getParentItem()->getProduct()->getStockItem();
+        }
+        if ($stockItem) {
+            if (!$stockItem->getIsInStock() || ($parentStockItem && !$parentStockItem->getIsInStock())) {
+                $quoteItem->addErrorInfo(
+                    'cataloginventory',
+                    Mage_CatalogInventory_Helper_Data::ERROR_QTY,
+                    Mage::helper('cataloginventory')->__('This product is currently out of stock.')
+                );
+                $quoteItem->getQuote()->addErrorInfo(
+                    'stock',
+                    'cataloginventory',
+                    Mage_CatalogInventory_Helper_Data::ERROR_QTY,
+                    Mage::helper('cataloginventory')->__('Some of the products are currently out of stock.')
+                );
+                return $this;
+            } else {
+                // Delete error from item and its quote, if it was set due to item out of stock
+                $this->_removeErrorsFromQuoteAndItem($quoteItem, Mage_CatalogInventory_Helper_Data::ERROR_QTY);
+            }
+        }
+
         /**
          * Check item for options
          */
@@ -315,7 +343,6 @@ public function checkQuoteItemQty($observer)
             $qty = $quoteItem->getProduct()->getTypeInstance(true)->prepareQuoteItemQty($qty, $quoteItem->getProduct());
             $quoteItem->setData('qty', $qty);
 
-            $stockItem = $quoteItem->getProduct()->getStockItem();
             if ($stockItem) {
                 $result = $stockItem->checkQtyIncrements($qty);
                 if ($result->getHasError()) {
@@ -403,7 +430,7 @@ public function checkQuoteItemQty($observer)
                     $quoteItem->addErrorInfo(
                         'cataloginventory',
                         Mage_CatalogInventory_Helper_Data::ERROR_QTY,
-                        $result->getQuoteMessage()
+                        $result->getMessage()
                     );
 
                     $quoteItem->getQuote()->addErrorInfo(
@@ -420,7 +447,6 @@ public function checkQuoteItemQty($observer)
                 $stockItem->unsIsChildItem();
             }
         } else {
-            $stockItem = $quoteItem->getProduct()->getStockItem();
             /* @var $stockItem Mage_CatalogInventory_Model_Stock_Item */
             if (!$stockItem instanceof Mage_CatalogInventory_Model_Stock_Item) {
                 Mage::throwException(Mage::helper('cataloginventory')->__('The stock item for Product is not valid.'));
@@ -453,6 +479,7 @@ public function checkQuoteItemQty($observer)
             if (!is_null($productTypeCustomOption)) {
                 // Check if product related to current item is a part of grouped product
                 if ($productTypeCustomOption->getValue() == Mage_Catalog_Model_Product_Type_Grouped::TYPE_CODE) {
+                    $stockItem->setProductName($quoteItem->getProduct()->getName());
                     $stockItem->setIsChildItem(true);
                 }
             }
@@ -489,9 +516,6 @@ public function checkQuoteItemQty($observer)
             }
             if (!is_null($result->getMessage())) {
                 $quoteItem->setMessage($result->getMessage());
-                if ($quoteItem->getParentItem()) {
-                    $quoteItem->getParentItem()->setMessage($result->getMessage());
-                }
             }
 
             if (!is_null($result->getItemBackorders())) {
@@ -948,4 +972,17 @@ public function reindexProductsMassAction($observer)
             Mage_Catalog_Model_Product::ENTITY, Mage_Index_Model_Event::TYPE_MASS_ACTION
         );
     }
+
+    /**
+     * Detects whether product status should be shown
+     *
+     * @param Varien_Event_Observer $observer
+     * @return Mage_CatalogInventory_Model_Observer
+     */
+    public function displayProductStatusInfo($observer)
+    {
+        $info = $observer->getEvent()->getStatus();
+        $info->setDisplayStatus(Mage::helper('cataloginventory')->isDisplayProductStockStatus());
+        return $this;
+    }
 }
diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php
index e0a2c04f96f..34f38086c03 100755
--- a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php
@@ -211,13 +211,20 @@ public function setInStockFilterToCollection($collection)
     protected function _initConfig()
     {
         if (!$this->_isConfig) {
+            $configMap = array(
+                '_isConfigManageStock'  => Mage_CatalogInventory_Model_Stock_Item::XML_PATH_MANAGE_STOCK,
+                '_isConfigBackorders'   => Mage_CatalogInventory_Model_Stock_Item::XML_PATH_BACKORDERS,
+                '_configMinQty'         => Mage_CatalogInventory_Model_Stock_Item::XML_PATH_MIN_QTY,
+                '_configNotifyStockQty' => Mage_CatalogInventory_Model_Stock_Item::XML_PATH_NOTIFY_STOCK_QTY
+            );
+
+            foreach ($configMap as $field => $const) {
+                $this->$field = (int)Mage::getStoreConfig($const);
+            }
+
             $this->_isConfig = true;
-            $this->_isConfigManageStock  = (int)Mage::getStoreConfigFlag(Mage_CatalogInventory_Model_Stock_Item::XML_PATH_MANAGE_STOCK);
-            $this->_isConfigBackorders   = (int)Mage::getStoreConfig(Mage_CatalogInventory_Model_Stock_Item::XML_PATH_BACKORDERS);
-            $this->_configMinQty         = (int)Mage::getStoreConfig(Mage_CatalogInventory_Model_Stock_Item::XML_PATH_MIN_QTY);
-            $this->_configNotifyStockQty = (int)Mage::getStoreConfig(Mage_CatalogInventory_Model_Stock_Item::XML_PATH_NOTIFY_STOCK_QTY);
-            $this->_configTypeIds        = array_keys(Mage::helper('catalogInventory')->getIsQtyTypeIds(true));
-            $this->_stock                = Mage::getModel('cataloginventory/stock');
+            $this->_stock = Mage::getModel('cataloginventory/stock');
+            $this->_configTypeIds = array_keys(Mage::helper('catalogInventory')->getIsQtyTypeIds(true));
         }
     }
 
@@ -318,4 +325,50 @@ public function updateLowStockDate()
 
         $adapter->update($this->getTable('cataloginventory/stock_item'), $value, $where);
     }
+
+    /**
+     * Add low stock filter to product collection
+     *
+     * @param Mage_Catalog_Model_Resource_Product_Collection $collection
+     * @param array $fields
+     * @return Mage_CatalogInventory_Model_Resource_Stock
+     */
+    public function addLowStockFilter(Mage_Catalog_Model_Resource_Product_Collection $collection, $fields)
+    {
+        $this->_initConfig();
+        $adapter = $collection->getSelect()->getAdapter();
+        $qtyIf = $adapter->getCheckSql(
+            'invtr.use_config_notify_stock_qty',
+            $this->_configNotifyStockQty,
+            'invtr.notify_stock_qty'
+        );
+        $conditions = array(
+            array(
+                $adapter->prepareSqlCondition('invtr.use_config_manage_stock', 1),
+                $adapter->prepareSqlCondition($this->_isConfigManageStock, 1),
+                $adapter->prepareSqlCondition('invtr.qty', array('lt' => $qtyIf))
+            ),
+            array(
+                $adapter->prepareSqlCondition('invtr.use_config_manage_stock', 0),
+                $adapter->prepareSqlCondition('invtr.manage_stock', 1)
+            )
+        );
+
+        $where = array();
+        foreach ($conditions as $k => $part) {
+            $where[$k] = join(' ' . Zend_Db_Select::SQL_AND . ' ', $part);
+        }
+
+        $where = $adapter->prepareSqlCondition('invtr.low_stock_date', array('notnull' => true))
+            . ' ' . Zend_Db_Select::SQL_AND . ' (('
+            .  join(') ' . Zend_Db_Select::SQL_OR .' (', $where)
+            . '))';
+
+        $collection->joinTable(array('invtr' => 'cataloginventory/stock_item'),
+            'product_id = entity_id',
+            $fields,
+            $where
+        );
+        return $this;
+    }
 }
diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php
index 0b7d0174123..9fcffb0700d 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php
@@ -580,7 +580,7 @@ public function checkQuoteItemQty($qty, $summaryQty, $origQty = 0)
         if (!$this->getIsInStock()) {
             $result->setHasError(true)
                 ->setMessage(Mage::helper('cataloginventory')->__('This product is currently out of stock.'))
-                ->setQuoteMessage(Mage::helper('cataloginventory')->__('Some of the products are currently out of stock'))
+                ->setQuoteMessage(Mage::helper('cataloginventory')->__('Some of the products are currently out of stock.'))
                 ->setQuoteMessageIndex('stock');
             $result->setItemUseOldQty(true);
             return $result;
@@ -621,7 +621,7 @@ public function checkQuoteItemQty($qty, $summaryQty, $origQty = 0)
                             );
                         } else {
                             $result->setMessage(
-                               Mage::helper('cataloginventory')->__('"%s" is not available in the requested quantity. %s of the items will be backordered.', $this->getProductName(), ($backorderQty * 1))
+                                Mage::helper('cataloginventory')->__('"%s" is not available in the requested quantity. %s of the items will be backordered.', $this->getProductName(), ($backorderQty * 1))
                             );
                         }
                     } elseif (Mage::app()->getStore()->isAdmin()) {
diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php
index c92982ef453..80a54aefa6f 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php
@@ -27,19 +27,23 @@
 /**
  * Catalog inventory api V2
  *
- * @category   Mage
- * @package    Mage_CatalogInventory
  * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Mage_CatalogInventory_Model_Stock_Item_Api_V2 extends Mage_CatalogInventory_Model_Stock_Item_Api
 {
+    /**
+     * Update product stock data
+     *
+     * @param int   $productId
+     * @param array $data
+     * @return bool
+     */
     public function update($productId, $data)
     {
+        /** @var $product Mage_Catalog_Model_Product */
         $product = Mage::getModel('catalog/product');
-
-        if ($newId = $product->getIdBySku($productId)) {
-            $productId = $newId;
-        }
+        $idBySku = $product->getIdBySku($productId);
+        $productId = $idBySku ? $idBySku : $productId;
 
         $product->setStoreId($this->_getStoreId())
             ->load($productId);
@@ -48,40 +52,37 @@ public function update($productId, $data)
             $this->_fault('not_exists');
         }
 
-        if (!$stockData = $product->getStockData()) {
-            $stockData = array();
-        }
-
-        if (isset($data->qty)) {
-            $stockData['qty'] = $data->qty;
-        }
-
-        if (isset($data->is_in_stock)) {
-            $stockData['is_in_stock'] = $data->is_in_stock;
-        }
+        /** @var $stockItem Mage_CatalogInventory_Model_Stock_Item */
+        $stockItem = $product->getStockItem();
+        $stockData = array_replace($stockItem->getData(), (array)$data);
+        $stockItem->setData($stockData);
 
-        if (isset($data->manage_stock)) {
-            $stockData['manage_stock'] = $data->manage_stock;
-        }
-
-        if (isset($data->use_config_manage_stock)) {
-            $stockData['use_config_manage_stock'] = $data->use_config_manage_stock;
+        try {
+            $stockItem->save();
+        } catch (Mage_Core_Exception $e) {
+            $this->_fault('not_updated', $e->getMessage());
         }
 
-        if (isset($data->use_config_backorders)) {
-            $stockData['use_config_backorders'] = $data->use_config_backorders;
-        }
+        return true;
+    }
 
-        if (isset($data->backorders)) {
-            $stockData['backorders'] = $data->backorders;
+    /**
+     * Update stock data of multiple products at once
+     *
+     * @param array $productIds
+     * @param array $productData
+     * @return boolean
+     */
+    public function multiUpdate($productIds, $productData)
+    {
+        if (count($productIds) != count($productData)) {
+            $this->_fault('multi_update_not_match');
         }
 
-        $product->setStockData($stockData);
+        $productData = (array)$productData;
 
-        try {
-            $product->save();
-        } catch (Mage_Core_Exception $e) {
-            $this->_fault('not_updated', $e->getMessage());
+        foreach ($productIds as $index => $productId) {
+            $this->update($productId, $productData[$index]);
         }
 
         return true;
diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php
index 1fa4eccb2b0..ec9345fc040 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php
@@ -277,10 +277,12 @@ public function updateStatus($productId, $productType = null, $websiteId = null)
      * @param int $status
      * @param int $stockId
      * @param int $websiteId
+     *
      * @return Mage_CatalogInventory_Model_Stock_Status
      */
-    protected function _processChildren($productId, $productType, $qty = 0, $status = self::STATUS_IN_STOCK, $stockId = 1, $websiteId = null)
-    {
+    protected function _processChildren($productId, $productType, $qty = 0, $status = self::STATUS_IN_STOCK,
+        $stockId = 1, $websiteId = null
+    ) {
         if ($status == self::STATUS_OUT_OF_STOCK) {
             $this->saveProductStatus($productId, $status, $qty, $stockId, $websiteId);
             return $this;
diff --git a/app/code/core/Mage/CatalogInventory/etc/api.xml b/app/code/core/Mage/CatalogInventory/etc/api.xml
index aa8e9838b58..4260c5663fe 100644
--- a/app/code/core/Mage/CatalogInventory/etc/api.xml
+++ b/app/code/core/Mage/CatalogInventory/etc/api.xml
@@ -42,6 +42,10 @@
                         <title>Update product stock data</title>
                         <acl>cataloginventory/update</acl>
                     </update>
+                    <multiUpdate translate="title" module="cataloginventory">
+                        <title>Multi update product stock data</title>
+                        <acl>cataloginventory/update</acl>
+                    </multiUpdate>
                 </methods>
                 <faults module="cataloginventory">
                     <not_exists>
@@ -52,6 +56,10 @@
                         <code>102</code>
                         <message>Product inventory not updated. Details in error message.</message>
                     </not_updated>
+                    <multi_update_not_match>
+                        <code>103</code>
+                        <message>Quantity of product IDs and product data should match. Inventory was not updated.</message>
+                    </multi_update_not_match>
                 </faults>
             </cataloginventory_stock_item>
         </resources>
diff --git a/app/code/core/Mage/CatalogInventory/etc/config.xml b/app/code/core/Mage/CatalogInventory/etc/config.xml
index 1baf453778a..0f810d696c6 100644
--- a/app/code/core/Mage/CatalogInventory/etc/config.xml
+++ b/app/code/core/Mage/CatalogInventory/etc/config.xml
@@ -78,6 +78,14 @@
             </cataloginventory>
         </blocks>
         <events>
+            <catalog_block_product_status_display>
+                <observers>
+                    <inventory>
+                        <class>cataloginventory/observer</class>
+                        <method>displayProductStatusInfo</method>
+                    </inventory>
+                </observers>
+            </catalog_block_product_status_display>
             <catalog_product_load_after>
                 <observers>
                     <inventory>
@@ -305,6 +313,7 @@
                 <can_back_in_stock>1</can_back_in_stock>
                 <show_out_of_stock>0</show_out_of_stock>
                 <stock_threshold_qty>0</stock_threshold_qty>
+                <display_product_stock_status>1</display_product_stock_status>
             </options>
             <item_options>
                 <manage_stock>1</manage_stock>
diff --git a/app/code/core/Mage/CatalogInventory/etc/system.xml b/app/code/core/Mage/CatalogInventory/etc/system.xml
index e11a71bcf6c..ec2b68e4d21 100644
--- a/app/code/core/Mage/CatalogInventory/etc/system.xml
+++ b/app/code/core/Mage/CatalogInventory/etc/system.xml
@@ -62,8 +62,9 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                         </can_back_in_stock>
-                        <show_out_of_stock translate="label">
+                        <show_out_of_stock translate="label comment">
                             <label>Display Out of Stock Products</label>
+                            <comment>Products will still be shown by direct product URLs.</comment>
                             <frontend_type>select</frontend_type>
                             <source_model>adminhtml/system_config_source_yesno</source_model>
                             <sort_order>3</sort_order>
@@ -80,10 +81,19 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                        </stock_threshold_qty>
+                        <display_product_stock_status translate="label">
+                             <label>Display products availability in stock in the frontend</label>
+                             <frontend_type>select</frontend_type>
+                             <source_model>adminhtml/system_config_source_yesno</source_model>
+                             <sort_order>50</sort_order>
+                             <show_in_default>1</show_in_default>
+                             <show_in_website>1</show_in_website>
+                             <show_in_store>1</show_in_store>
+                         </display_product_stock_status>
                     </fields>
                 </options>
                 <item_options translate="label comment">
-                    <comment>&lt;strong&gt;Note&lt;/strong&gt; that these settings are applicable to cart line items, not the whole cart.</comment>
+                    <comment><![CDATA[<strong>Note</strong> that these settings are applicable to cart line items, not the whole cart.]]></comment>
                     <label>Product Stock Options</label>
                     <frontend_type>text</frontend_type>
                     <sort_order>10</sort_order>
diff --git a/app/code/core/Mage/CatalogInventory/etc/wsdl.xml b/app/code/core/Mage/CatalogInventory/etc/wsdl.xml
index 6291e9cc039..5947ef4a064 100644
--- a/app/code/core/Mage/CatalogInventory/etc/wsdl.xml
+++ b/app/code/core/Mage/CatalogInventory/etc/wsdl.xml
@@ -44,6 +44,13 @@
                     <element name="stock_data" type="typens:catalogInventoryStockItemUpdateEntity" minOccurs="0" />
                 </all>
             </complexType>
+            <complexType name="catalogInventoryStockItemUpdateEntityArray">
+                <complexContent>
+                    <restriction base="soapenc:Array">
+                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogInventoryStockItemUpdateEntity[]"/>
+                    </restriction>
+                </complexContent>
+            </complexType>
         </schema>
     </types>
     <message name="catalogInventoryStockItemListRequest">
@@ -61,6 +68,14 @@
     <message name="catalogInventoryStockItemUpdateResponse">
         <part name="result" type="xsd:int" />
     </message>
+    <message name="catalogInventoryStockItemMultiUpdateRequest">
+        <part name="sessionId" type="xsd:string"/>
+        <part name="productIds" type="typens:ArrayOfString"/>
+        <part name="productData" type="typens:catalogInventoryStockItemUpdateEntityArray"/>
+    </message>
+    <message name="catalogInventoryStockItemMultiUpdateResponse">
+        <part name="result" type="xsd:boolean"/>
+    </message>
     <portType name="{{var wsdl.handler}}PortType">
         <operation name="catalogInventoryStockItemList">
             <documentation>Retrieve stock data by product ids</documentation>
@@ -72,6 +87,11 @@
             <input message="typens:catalogInventoryStockItemUpdateRequest" />
             <output message="typens:catalogInventoryStockItemUpdateResponse" />
         </operation>
+        <operation name="catalogInventoryStockItemMultiUpdate">
+            <documentation>Multi stock item update</documentation>
+            <input message="typens:catalogInventoryStockItemMultiUpdateRequest"/>
+            <output message="typens:catalogInventoryStockItemMultiUpdateResponse"/>
+        </operation>
     </portType>
     <binding name="{{var wsdl.handler}}Binding" type="typens:{{var wsdl.handler}}PortType">
         <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
@@ -93,6 +113,17 @@
                 <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
             </output>
         </operation>
+        <operation name="catalogInventoryStockItemMultiUpdate">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
+            <input>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+            </input>
+            <output>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+            </output>
+        </operation>
     </binding>
     <service name="{{var wsdl.name}}Service">
         <port name="{{var wsdl.handler}}Port" binding="typens:{{var wsdl.handler}}Binding">
diff --git a/app/code/core/Mage/CatalogInventory/etc/wsi.xml b/app/code/core/Mage/CatalogInventory/etc/wsi.xml
index 6812d85cb05..b5622f58286 100644
--- a/app/code/core/Mage/CatalogInventory/etc/wsi.xml
+++ b/app/code/core/Mage/CatalogInventory/etc/wsi.xml
@@ -45,6 +45,11 @@
                     <xsd:element name="stock_data" type="typens:catalogInventoryStockItemUpdateEntity" minOccurs="0" />
                 </xsd:sequence>
             </xsd:complexType>
+            <xsd:complexType name="catalogInventoryStockItemUpdateEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:catalogInventoryStockItemUpdateEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
 
 
             <xsd:element name="catalogInventoryStockItemListRequestParam">
@@ -78,6 +83,22 @@
                     </xsd:sequence>
                 </xsd:complexType>
             </xsd:element>
+            <xsd:element name="catalogInventoryStockItemMultiUpdateRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productIds" type="typens:ArrayOfString" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productData" type="typens:catalogInventoryStockItemUpdateEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogInventoryStockItemMultiUpdateResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
         </xsd:schema>
     </wsdl:types>
     <wsdl:message name="catalogInventoryStockItemListRequest">
@@ -92,6 +113,12 @@
     <wsdl:message name="catalogInventoryStockItemUpdateResponse">
         <wsdl:part name="parameters" element="typens:catalogInventoryStockItemUpdateResponseParam" />
     </wsdl:message>
+    <wsdl:message name="catalogInventoryStockItemMultiUpdateRequest">
+        <wsdl:part name="parameters" element="typens:catalogInventoryStockItemMultiUpdateRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogInventoryStockItemMultiUpdateResponse">
+        <wsdl:part name="parameters" element="typens:catalogInventoryStockItemMultiUpdateResponseParam" />
+    </wsdl:message>
     <wsdl:portType name="{{var wsdl.handler}}PortType">
         <wsdl:operation name="catalogInventoryStockItemList">
             <wsdl:documentation>Retrieve stock data by product ids</wsdl:documentation>
@@ -103,6 +130,11 @@
             <wsdl:input message="typens:catalogInventoryStockItemUpdateRequest" />
             <wsdl:output message="typens:catalogInventoryStockItemUpdateResponse" />
         </wsdl:operation>
+        <wsdl:operation name="catalogInventoryStockItemMultiUpdate">
+            <wsdl:documentation>Multi update product stock data</wsdl:documentation>
+            <wsdl:input message="typens:catalogInventoryStockItemMultiUpdateRequest" />
+            <wsdl:output message="typens:catalogInventoryStockItemMultiUpdateResponse" />
+        </wsdl:operation>
     </wsdl:portType>
     <wsdl:binding name="{{var wsdl.handler}}Binding" type="typens:{{var wsdl.handler}}PortType">
         <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
@@ -124,6 +156,15 @@
                 <soap:body use="literal" />
             </wsdl:output>
         </wsdl:operation>
+        <wsdl:operation name="catalogInventoryStockItemMultiUpdate">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
     </wsdl:binding>
     <wsdl:service name="{{var wsdl.name}}Service">
         <wsdl:port name="{{var wsdl.handler}}Port" binding="typens:{{var wsdl.handler}}Binding">
diff --git a/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh.php b/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh.php
new file mode 100644
index 00000000000..d015f963d2c
--- /dev/null
+++ b/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh.php
@@ -0,0 +1,648 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_CatalogRule
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Catalog rule indexer
+ *
+ * @category    Mage
+ * @package     Mage_CatalogRule
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_CatalogRule_Model_Action_Index_Refresh
+{
+    /**
+     * Connection instance
+     *
+     * @var Varien_Db_Adapter_Interface
+     */
+    protected $_connection;
+
+    /**
+     * Core factory instance
+     *
+     * @var Mage_Core_Model_Factory
+     */
+    protected $_factory;
+
+    /**
+     * Resource instance
+     *
+     * @var Mage_Core_Model_Resource_Db_Abstract
+     */
+    protected $_resource;
+
+    /**
+     * Application instance
+     *
+     * @var Mage_Core_Model_App
+     */
+    protected $_app;
+
+    /**
+     * Constructor with parameters
+     * Array of arguments with keys
+     *  - 'connection' Varien_Db_Adapter_Interface
+     *  - 'factory' Mage_Core_Model_Factory
+     *  - 'resource' Mage_Core_Model_Resource_Db_Abstract
+     *  - 'app' Mage_Core_Model_App
+     *
+     * @param array $args
+     */
+    public function __construct(array $args)
+    {
+        $this->_setConnection($args['connection']);
+        $this->_setFactory($args['factory']);
+        $this->_setResource($args['resource']);
+        $this->_app = !empty($args['app']) ? $args['app'] : Mage::app();
+    }
+
+    /**
+     * Set connection
+     *
+     * @param Varien_Db_Adapter_Interface $connection
+     */
+    protected function _setConnection(Varien_Db_Adapter_Interface $connection)
+    {
+        $this->_connection = $connection;
+    }
+
+    /**
+     * Set factory
+     *
+     * @param Mage_Core_Model_Factory $factory
+     */
+    protected function _setFactory(Mage_Core_Model_Factory $factory)
+    {
+        $this->_factory = $factory;
+    }
+
+    /**
+     * Set resource
+     *
+     * @param Mage_Core_Model_Resource_Db_Abstract $resource
+     */
+    protected function _setResource(Mage_Core_Model_Resource_Db_Abstract $resource)
+    {
+        $this->_resource = $resource;
+    }
+
+    /**
+     * Run reindex
+     */
+    public function execute()
+    {
+        $this->_app->dispatchEvent('catalogrule_before_apply', array('resource' => $this->_resource));
+
+        /** @var $coreDate Mage_Core_Model_Date */
+        $coreDate  = $this->_factory->getModel('core/date');
+        $timestamp = $coreDate->gmtTimestamp('Today');
+
+        foreach ($this->_app->getWebsites(false) as $website) {
+            /** @var $website Mage_Core_Model_Website */
+            if ($website->getDefaultStore()) {
+                $this->_reindex($website, $timestamp);
+            }
+        }
+
+        $this->_prepareGroupWebsite($timestamp);
+        $this->_prepareAffectedProduct();
+    }
+
+    /**
+     * Return temporary table name
+     *
+     * @return string
+     */
+    protected function _getTemporaryTable()
+    {
+        return $this->_resource->getTable('catalogrule/rule_product_price_tmp');
+    }
+
+    /**
+     * Create temporary table
+     */
+    protected function _createTemporaryTable()
+    {
+        $this->_connection->dropTemporaryTable($this->_getTemporaryTable());
+        $table = $this->_connection->newTable($this->_getTemporaryTable())
+            ->addColumn(
+                'grouped_id',
+                Varien_Db_Ddl_Table::TYPE_VARCHAR,
+                80,
+                array(),
+                'Grouped ID'
+            )
+            ->addColumn(
+                'product_id',
+                Varien_Db_Ddl_Table::TYPE_INTEGER,
+                null,
+                array(
+                    'unsigned' => true
+                ),
+                'Product ID'
+            )
+            ->addColumn(
+                'customer_group_id',
+                Varien_Db_Ddl_Table::TYPE_SMALLINT,
+                5,
+                array(
+                    'unsigned' => true
+                ),
+                'Customer Group ID'
+            )
+            ->addColumn(
+                'from_date',
+                Varien_Db_Ddl_Table::TYPE_DATE,
+                null,
+                array(),
+                'From Date'
+            )
+            ->addColumn(
+                'to_date',
+                Varien_Db_Ddl_Table::TYPE_DATE,
+                null,
+                array(),
+                'To Date'
+            )
+            ->addColumn(
+                'action_amount',
+                Varien_Db_Ddl_Table::TYPE_DECIMAL,
+                '12,4',
+                array(),
+                'Action Amount'
+            )
+            ->addColumn(
+                'action_operator',
+                Varien_Db_Ddl_Table::TYPE_VARCHAR,
+                10,
+                array(),
+                'Action Operator'
+            )
+            ->addColumn(
+                'action_stop',
+                Varien_Db_Ddl_Table::TYPE_SMALLINT,
+                6,
+                array(),
+                'Action Stop'
+            )
+            ->addColumn(
+                'sort_order',
+                Varien_Db_Ddl_Table::TYPE_INTEGER,
+                10,
+                array(
+                    'unsigned' => true
+                ),
+                'Sort Order'
+            )
+            ->addColumn(
+                'price',
+                Varien_Db_Ddl_Table::TYPE_DECIMAL,
+                '12,4',
+                array(),
+                'Product Price'
+            )
+            ->addColumn(
+                'rule_product_id',
+                Varien_Db_Ddl_Table::TYPE_INTEGER,
+                null,
+                array(
+                    'unsigned' => true
+                ),
+                'Rule Product ID'
+            )
+            ->addColumn(
+                'from_time',
+                Varien_Db_Ddl_Table::TYPE_INTEGER,
+                null,
+                array(
+                    'unsigned' => true,
+                    'nullable' => true,
+                    'default'  => 0,
+                ),
+                'From Time'
+            )
+            ->addColumn(
+                'to_time',
+                Varien_Db_Ddl_Table::TYPE_INTEGER,
+                null,
+                array(
+                    'unsigned' => true,
+                    'nullable' => true,
+                    'default'  => 0,
+                ),
+                'To Time'
+            )
+            ->addIndex(
+                $this->_connection->getIndexName($this->_getTemporaryTable(), 'grouped_id'),
+                array('grouped_id')
+            )
+            ->setComment('CatalogRule Price Temporary Table');
+        $this->_connection->createTemporaryTable($table);
+    }
+
+    /**
+     * Prepare temporary data
+     *
+     * @param Mage_Core_Model_Website $website
+     * @return Varien_Db_Select
+     */
+    protected function _prepareTemporarySelect(Mage_Core_Model_Website $website)
+    {
+        /** @var $catalogFlatHelper Mage_Catalog_Helper_Product_Flat */
+        $catalogFlatHelper = $this->_factory->getHelper('catalog/product_flat');
+
+        /** @var $eavConfig Mage_Eav_Model_Config */
+        $eavConfig = $this->_factory->getSingleton('eav/config');
+        $priceAttribute = $eavConfig->getAttribute(Mage_Catalog_Model_Product::ENTITY, 'price');
+
+        $select = $this->_connection->select()
+            ->from(
+                array('rp' => $this->_resource->getTable('catalogrule/rule_product')),
+                array()
+            )
+            ->joinInner(
+                array('r' => $this->_resource->getTable('catalogrule/rule')),
+                'r.rule_id = rp.rule_id',
+                array()
+            )
+            ->where('rp.website_id = ?', $website->getId())
+            ->order(
+                array('rp.product_id', 'rp.customer_group_id', 'rp.sort_order', 'rp.rule_product_id')
+            )
+            ->joinLeft(
+                array(
+                    'pg' => $this->_resource->getTable('catalog/product_attribute_group_price')
+                ),
+                'pg.entity_id = rp.product_id AND pg.customer_group_id = rp.customer_group_id'
+                    . ' AND pg.website_id = rp.website_id',
+                array()
+            )
+            ->joinLeft(
+                array(
+                    'pgd' => $this->_resource->getTable('catalog/product_attribute_group_price')
+                ),
+                'pgd.entity_id = rp.product_id AND pgd.customer_group_id = rp.customer_group_id'
+                    . ' AND pgd.website_id = 0',
+                array()
+            );
+
+        $storeId = $website->getDefaultStore()->getId();
+
+        if ($catalogFlatHelper->isEnabled() && $storeId && $catalogFlatHelper->isBuilt($storeId)) {
+            $select->joinInner(
+                array('p' => $this->_resource->getTable('catalog/product_flat') . '_' . $storeId),
+                'p.entity_id = rp.product_id',
+                array()
+            );
+            $priceColumn = $this->_connection->getIfNullSql(
+                $this->_connection->getIfNullSql(
+                    'pg.value',
+                    'pgd.value'
+                ),
+                'p.price'
+            );
+        } else {
+            $select->joinInner(
+                    array(
+                        'pd' => $this->_resource->getTable(array('catalog/product', $priceAttribute->getBackendType()))
+                    ),
+                    'pd.entity_id = rp.product_id AND pd.store_id = 0 AND pd.attribute_id = '
+                        . $priceAttribute->getId(),
+                    array()
+                )
+                ->joinLeft(
+                    array(
+                        'p' => $this->_resource->getTable(array('catalog/product', $priceAttribute->getBackendType()))
+                    ),
+                    'p.entity_id = rp.product_id AND p.store_id = ' . $storeId
+                        . ' AND p.attribute_id = pd.attribute_id',
+                    array()
+                );
+            $priceColumn = $this->_connection->getIfNullSql(
+                $this->_connection->getIfNullSql(
+                    'pg.value',
+                    'pgd.value'
+                ),
+                $this->_connection->getIfNullSql(
+                    'p.value',
+                    'pd.value'
+                )
+            );
+        }
+
+        $select->columns(
+            array(
+                'grouped_id' => $this->_connection->getConcatSql(
+                    array('rp.product_id', 'rp.customer_group_id'),
+                    '-'
+                ),
+                'product_id'        => 'rp.product_id',
+                'customer_group_id' => 'rp.customer_group_id',
+                'from_date'         => 'r.from_date',
+                'to_date'           => 'r.to_date',
+                'action_amount'     => 'rp.action_amount',
+                'action_operator'   => 'rp.action_operator',
+                'action_stop'       => 'rp.action_stop',
+                'sort_order'        => 'rp.sort_order',
+                'price'             => $priceColumn,
+                'rule_product_id'   => 'rp.rule_product_id',
+                'from_time'         => 'rp.from_time',
+                'to_time'           => 'rp.to_time'
+            )
+        );
+
+        return $select;
+    }
+
+    /**
+     * Prepare price column
+     *
+     * @return Zend_Db_Expr
+     */
+    protected function _calculatePrice()
+    {
+        $toPercent = $this->_connection->quote('to_percent');
+        $byPercent = $this->_connection->quote('by_percent');
+        $toFixed   = $this->_connection->quote('to_fixed');
+        $byFixed   = $this->_connection->quote('by_fixed');
+        $nA        = $this->_connection->quote('N/A');
+
+        return $this->_connection->getCaseSql(
+            '',
+            array(
+                $this->_connection->getIfNullSql(
+                    new Zend_Db_Expr('@group_id'), $nA
+                ) . ' != cppt.grouped_id' =>
+                '@price := ' . $this->_connection->getCaseSql(
+                    $this->_connection->quoteIdentifier('cppt.action_operator'),
+                    array(
+                        $toPercent => new Zend_Db_Expr('cppt.price * cppt.action_amount/100'),
+                        $byPercent => new Zend_Db_Expr('cppt.price * (1 - cppt.action_amount/100)'),
+                        $toFixed   => $this->_connection->getCheckSql(
+                            new Zend_Db_Expr('cppt.action_amount < cppt.price'),
+                            new Zend_Db_Expr('cppt.action_amount'),
+                            new Zend_Db_Expr('cppt.price')
+                        ),
+                        $byFixed   => $this->_connection->getCheckSql(
+                            new Zend_Db_Expr('0 > cppt.price - cppt.action_amount'),
+                            new Zend_Db_Expr('0'),
+                            new Zend_Db_Expr('cppt.price - cppt.action_amount')
+                        ),
+                    )
+                ),
+                $this->_connection->getIfNullSql(
+                    new Zend_Db_Expr('@group_id'), $nA
+                ) . ' = cppt.grouped_id AND '
+                . $this->_connection->getIfNullSql(
+                    new Zend_Db_Expr('@action_stop'),
+                    new Zend_Db_Expr(0)
+                ) . ' = 0' => '@price := ' . $this->_connection->getCaseSql(
+                    $this->_connection->quoteIdentifier('cppt.action_operator'),
+                    array(
+                        $toPercent => new Zend_Db_Expr('@price * cppt.action_amount/100'),
+                        $byPercent => new Zend_Db_Expr('@price * (1 - cppt.action_amount/100)'),
+                        $toFixed   => $this->_connection->getCheckSql(
+                            new Zend_Db_Expr('cppt.action_amount < @price'),
+                            new Zend_Db_Expr('cppt.action_amount'),
+                            new Zend_Db_Expr('@price')
+                        ),
+                        $byFixed   => $this->_connection->getCheckSql(
+                            new Zend_Db_Expr('0 > @price - cppt.action_amount'),
+                            new Zend_Db_Expr('0'),
+                            new Zend_Db_Expr('@price - cppt.action_amount')
+                        ),
+                    )
+                )
+            ),
+            '@price := @price'
+        );
+    }
+
+    /**
+     * Prepare index select
+     *
+     * @param Mage_Core_Model_Website $website
+     * @param $time
+     * @return Varien_Db_Select
+     */
+    protected function _prepareIndexSelect(Mage_Core_Model_Website $website, $time)
+    {
+        $nA = $this->_connection->quote('N/A');
+        $this->_connection->query('SET @price := NULL');
+        $this->_connection->query('SET @group_id := NULL');
+        $this->_connection->query('SET @action_stop := NULL');
+
+        $indexSelect = $this->_connection->select()
+            ->from(array('cppt' => $this->_getTemporaryTable()), array())
+            ->order(array('cppt.grouped_id', 'cppt.sort_order', 'cppt.rule_product_id'))
+            ->columns(
+                array(
+                    'customer_group_id' => 'cppt.customer_group_id',
+                    'product_id'        => 'cppt.product_id',
+                    'rule_price'        => $this->_calculatePrice(),
+                    'latest_start_date' => 'cppt.from_date',
+                    'earliest_end_date' => 'cppt.to_date',
+                    new Zend_Db_Expr(
+                        $this->_connection->getCaseSql(
+                            '',
+                            array(
+                                $this->_connection->getIfNullSql(
+                                    new Zend_Db_Expr('@group_id'),
+                                    $nA
+                                ) . ' != cppt.grouped_id' => new Zend_Db_Expr('@action_stop := cppt.action_stop'),
+                                $this->_connection->getIfNullSql(
+                                    new Zend_Db_Expr('@group_id'),
+                                    $nA
+                                ) . ' = cppt.grouped_id' => '@action_stop := '
+                                    . $this->_connection->getIfNullSql(
+                                        new Zend_Db_Expr('@action_stop'),
+                                        new Zend_Db_Expr(0)
+                                    ) . ' + cppt.action_stop',
+                            )
+                        )
+                    ),
+                    new Zend_Db_Expr('@group_id := cppt.grouped_id'),
+                    'from_time'         => 'cppt.from_time',
+                    'to_time'           => 'cppt.to_time'
+                )
+            );
+
+        $select = $this->_connection->select()
+            ->from($indexSelect, array())
+            ->joinInner(
+                array(
+                    'dates' => $this->_connection->select()->union(
+                        array(
+                            new Zend_Db_Expr(
+                                'SELECT ' . $this->_connection->getDateAddSql(
+                                    $this->_connection->fromUnixtime($time),
+                                    -1,
+                                    Varien_Db_Adapter_Interface::INTERVAL_DAY
+                                ) . ' AS rule_date'
+                            ),
+                            new Zend_Db_Expr('SELECT ' . $this->_connection->fromUnixtime($time) . ' AS rule_date'),
+                            new Zend_Db_Expr(
+                                'SELECT ' . $this->_connection->getDateAddSql(
+                                    $this->_connection->fromUnixtime($time),
+                                    1,
+                                    Varien_Db_Adapter_Interface::INTERVAL_DAY
+                                ) . ' AS rule_date'
+                            ),
+                        )
+                    )
+                ),
+                '1=1',
+                array()
+            )
+            ->columns(
+                array(
+                    'rule_product_price_id' => new Zend_Db_Expr('NULL'),
+                    'rule_date'             => 'dates.rule_date',
+                    'customer_group_id'     => 'customer_group_id',
+                    'product_id'            => 'product_id',
+                    'rule_price'            => 'MIN(rule_price)',
+                    'website_id'            => new Zend_Db_Expr($website->getId()),
+                    'latest_start_date'     => 'latest_start_date',
+                    'earliest_end_date'     => 'earliest_end_date',
+                )
+            )
+            ->where(new Zend_Db_Expr($this->_connection->getUnixTimestamp('dates.rule_date') . " >= from_time"))
+            ->where(
+                $this->_connection->getCheckSql(
+                    new Zend_Db_Expr('to_time = 0'),
+                    new Zend_Db_Expr(1),
+                    new Zend_Db_Expr($this->_connection->getUnixTimestamp('dates.rule_date') . " <= to_time")
+                )
+            )
+            ->group(array('customer_group_id', 'product_id', 'dates.rule_date'));
+
+        return $select;
+    }
+
+    /**
+     * Remove old index data
+     *
+     * @param Mage_Core_Model_Website $website
+     */
+    protected function _removeOldIndexData(Mage_Core_Model_Website $website)
+    {
+        $this->_connection->delete(
+            $this->_resource->getTable('catalogrule/rule_product_price'),
+            array('website_id = ?' => $website->getId())
+        );
+    }
+
+    /**
+     * Fill Index Data
+     *
+     * @param Mage_Core_Model_Website $website
+     * @param int $time
+     */
+    protected function _fillIndexData(Mage_Core_Model_Website $website, $time)
+    {
+        $this->_connection->query(
+            $this->_connection->insertFromSelect(
+                $this->_prepareIndexSelect($website, $time),
+                $this->_resource->getTable('catalogrule/rule_product_price')
+            )
+        );
+    }
+
+    /**
+     * Reindex catalog prices by website for timestamp
+     *
+     * @param Mage_Core_Model_Website $website
+     * @param int $timestamp
+     */
+    protected function _reindex(Mage_Core_Model_Website $website, $timestamp)
+    {
+        $this->_createTemporaryTable();
+        $this->_connection->query(
+            $this->_connection->insertFromSelect(
+                $this->_prepareTemporarySelect($website),
+                $this->_getTemporaryTable()
+            )
+        );
+        $this->_removeOldIndexData($website);
+        $this->_fillIndexData($website, $timestamp);
+    }
+
+    /**
+     * Prepare data for group website relation
+     */
+    protected function _prepareGroupWebsite($timestamp)
+    {
+        $this->_connection->delete($this->_resource->getTable('catalogrule/rule_group_website'), array());
+        $select = $this->_connection->select()
+            ->distinct(true)
+            ->from(
+                $this->_resource->getTable('catalogrule/rule_product'),
+                array('rule_id', 'customer_group_id', 'website_id')
+            )
+            ->where(new Zend_Db_Expr("{$timestamp} >= from_time"))
+            ->where(
+                $this->_connection->getCheckSql(
+                    new Zend_Db_Expr('to_time = 0'),
+                    new Zend_Db_Expr(1),
+                    new Zend_Db_Expr("{$timestamp} <= to_time")
+                )
+            );
+        $query = $select->insertFromSelect($this->_resource->getTable('catalogrule/rule_group_website'));
+        $this->_connection->query($query);
+    }
+
+    /**
+     * Return data for affected product
+     *
+     * @return null
+     */
+    protected function _getProduct()
+    {
+        return null;
+    }
+
+    /**
+     * Prepare affected product
+     */
+    protected function _prepareAffectedProduct()
+    {
+        /** @var $modelCondition Mage_Catalog_Model_Product_Condition */
+        $modelCondition = $this->_factory->getModel('catalog/product_condition');
+
+        $productCondition = $modelCondition->setTable($this->_resource->getTable('catalogrule/affected_product'))
+            ->setPkFieldName('product_id');
+
+            $this->_app->dispatchEvent(
+                'catalogrule_after_apply',
+                array(
+                    'product' => $this->_getProduct(),
+                    'product_condition' => $productCondition
+                )
+            );
+
+        $this->_connection->delete($this->_resource->getTable('catalogrule/affected_product'));
+    }
+}
diff --git a/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php b/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php
new file mode 100644
index 00000000000..a5a4c38714c
--- /dev/null
+++ b/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_CatalogRule
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Catalog rule indexer for row
+ *
+ * @category    Mage
+ * @package     Mage_CatalogRule
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_CatalogRule_Model_Action_Index_Refresh_Row extends Mage_CatalogRule_Model_Action_Index_Refresh
+{
+    /**
+     * Product Id
+     *
+     * @var int
+     */
+    protected $_productId;
+
+    /**
+     * Constructor with parameters
+     * Array of arguments with keys
+     *  - 'connection' Varien_Db_Adapter_Interface
+     *  - 'factory' Mage_Core_Model_Factory
+     *  - 'resource' Mage_Core_Model_Resource_Db_Abstract
+     *  - 'app' Mage_Core_Model_App
+     *  - 'value' int|Mage_Catalog_Model_Product
+     *
+     * @param array $args
+     */
+    public function __construct(array $args)
+    {
+        parent::__construct($args);
+        $this->_productId = $args['value'] instanceof Mage_Catalog_Model_Product
+            ? $args['value']->getId()
+            : $args['value'];
+    }
+
+    /**
+     * Prepare temporary data
+     *
+     * @param Mage_Core_Model_Website $website
+     * @return Varien_Db_Select
+     */
+    protected function _prepareTemporarySelect(Mage_Core_Model_Website $website)
+    {
+        $select = parent::_prepareTemporarySelect($website);
+        return $select->where('rp.product_id IN (?)', $this->_productId);
+    }
+
+    /**
+     * Remove old index data
+     *
+     * @param Mage_Core_Model_Website $website
+     */
+    protected function _removeOldIndexData(Mage_Core_Model_Website $website)
+    {
+        $this->_connection->query(
+            $this->_connection->deleteFromSelect(
+                $this->_connection->select()
+                    ->from($this->_resource->getTable('catalogrule/rule_product_price'))
+                    ->where('product_id IN (?)', $this->_productId)
+                    ->where('website_id = ?', $website->getId()),
+                $this->_resource->getTable('catalogrule/rule_product_price')
+            )
+        );
+    }
+
+    /**
+     * Return data for affected product
+     *
+     * @return int
+     */
+    protected function _getProduct()
+    {
+        return $this->_productId;
+    }
+}
diff --git a/app/code/core/Mage/CatalogRule/Model/Observer.php b/app/code/core/Mage/CatalogRule/Model/Observer.php
index c0919e937e5..084f055a627 100644
--- a/app/code/core/Mage/CatalogRule/Model/Observer.php
+++ b/app/code/core/Mage/CatalogRule/Model/Observer.php
@@ -50,22 +50,14 @@ public function applyAllRulesOnProduct($observer)
             return;
         }
 
-        $productWebsiteIds = $product->getWebsiteIds();
-
-        $rules = Mage::getModel('catalogrule/rule')->getCollection()
-            ->addFieldToFilter('is_active', 1);
-
-        foreach ($rules as $rule) {
-            $websiteIds = array_intersect($productWebsiteIds, $rule->getWebsiteIds());
-            $rule->applyToProduct($product, $websiteIds);
-        }
+        Mage::getModel('catalogrule/rule')->applyAllRulesToProduct($product);
 
         return $this;
     }
 
     /**
      * Apply all price rules for current date.
-     * Handle cataolg_product_import_after event
+     * Handle catalog_product_import_after event
      *
      * @param   Varien_Event_Observer $observer
      *
@@ -73,8 +65,9 @@ public function applyAllRulesOnProduct($observer)
      */
     public function applyAllRules($observer)
     {
+        /** @var $resource Mage_CatalogRule_Model_Resource_Rule */
         $resource = Mage::getResourceSingleton('catalogrule/rule');
-        $resource->applyAllRulesForDateRange($resource->formatDate(mktime(0,0,0)));
+        $resource->applyAllRules();
         Mage::getModel('catalogrule/flag')->loadSelf()
             ->setState(0)
             ->save();
@@ -206,7 +199,9 @@ public function catalogProductTypeConfigurablePrice(Varien_Event_Observer $obser
      */
     public function dailyCatalogUpdate($observer)
     {
-        Mage::getResourceSingleton('catalogrule/rule')->applyAllRulesForDateRange();
+        /** @var $resource Mage_CatalogRule_Model_Resource_Rule */
+        $resource = Mage::getResourceSingleton('catalogrule/rule');
+        $resource->applyAllRules();
 
         return $this;
     }
@@ -399,4 +394,17 @@ public function createCatalogRulesRelations(Varien_Event_Observer $observer)
             Mage::getResourceSingleton('catalogrule/rule')->updateRuleProductData($rule);
         }
     }
+
+    /**
+     * Runs Catalog Product Price Reindex
+     *
+     * @param Varien_Event_Observer $observer
+     */
+    public function runCatalogProductPriceReindex(Varien_Event_Observer $observer)
+    {
+        $indexProcess = Mage::getSingleton('index/indexer')->getProcessByCode('catalog_product_price');
+        if ($indexProcess) {
+            $indexProcess->reindexAll();
+        }
+    }
 }
diff --git a/app/code/core/Mage/CatalogRule/Model/Resource/Rule.php b/app/code/core/Mage/CatalogRule/Model/Resource/Rule.php
index bcb88e8b7f8..ea5b27b3f71 100755
--- a/app/code/core/Mage/CatalogRule/Model/Resource/Rule.php
+++ b/app/code/core/Mage/CatalogRule/Model/Resource/Rule.php
@@ -39,6 +39,11 @@ class Mage_CatalogRule_Model_Resource_Rule extends Mage_Rule_Model_Resource_Abst
      */
     const SECONDS_IN_DAY = 86400;
 
+    /**
+     * Number of products in range for insert
+     */
+    const RANGE_PRODUCT_STEP = 1000000;
+
     /**
      * Store associated with rule entities information map
      *
@@ -57,6 +62,35 @@ class Mage_CatalogRule_Model_Resource_Rule extends Mage_Rule_Model_Resource_Abst
         )
     );
 
+    /**
+     * Factory instance
+     *
+     * @var Mage_Core_Model_Factory
+     */
+    protected $_factory;
+
+    /**
+     * App instance
+     *
+     * @var Mage_Core_Model_App
+     */
+    protected $_app;
+
+    /**
+     * Constructor with parameters
+     * Array of arguments with keys
+     *  - 'factory' Mage_Core_Model_Factory
+     *
+     * @param array $args
+     */
+    public function __construct(array $args = array())
+    {
+        $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('core/factory');
+        $this->_app     = !empty($args['app']) ? $args['app'] : Mage::app();
+
+        parent::__construct();
+    }
+
     /**
      * Initialize main table and table id field
      */
@@ -111,75 +145,159 @@ protected function _afterSave(Mage_Core_Model_Abstract $object)
     }
 
     /**
-     * Update products which are matched for rule
+     * Deletes records in catalogrule/product_data by rule ID and product IDs
      *
-     * @param Mage_CatalogRule_Model_Rule $rule
-     *
-     * @return Mage_CatalogRule_Model_Resource_Rule
+     * @param int $ruleId
+     * @param array $productIds
      */
-    public function updateRuleProductData(Mage_CatalogRule_Model_Rule $rule)
+    public function cleanProductData($ruleId, array $productIds = array())
     {
-        $ruleId = $rule->getId();
-        $write  = $this->_getWriteAdapter();
-        $write->beginTransaction();
-        if ($rule->getProductsFilter()) {
-            $write->delete(
-                $this->getTable('catalogrule/rule_product'),
-                array(
-                    'rule_id=?' => $ruleId,
-                    'product_id IN (?)' => $rule->getProductsFilter()
-                )
-            );
-        } else {
-            $write->delete($this->getTable('catalogrule/rule_product'), $write->quoteInto('rule_id=?', $ruleId));
-        }
+        /** @var $write Varien_Db_Adapter_Interface */
+        $write = $this->_getWriteAdapter();
 
-        if (!$rule->getIsActive()) {
-            $write->commit();
-            return $this;
-        }
+        $conditions = array('rule_id = ?' => $ruleId);
 
-        $websiteIds = $rule->getWebsiteIds();
-        if (!is_array($websiteIds)) {
-            $websiteIds = explode(',', $websiteIds);
+        if (count($productIds) > 0) {
+            $conditions['product_id IN (?)'] = $productIds;
         }
-        if (empty($websiteIds)) {
-            return $this;
+
+        $write->delete($this->getTable('catalogrule/rule_product'), $conditions);
+    }
+
+    /**
+     * Return whether the product fits the rule
+     *
+     * @param Mage_CatalogRule_Model_Rule $rule
+     * @param Varien_Object $product
+     * @param array $websiteIds
+     * @return bool
+     */
+    public function validateProduct(Mage_CatalogRule_Model_Rule $rule, Varien_Object $product, $websiteIds = array())
+    {
+        /** @var $helper Mage_Catalog_Helper_Product_Flat */
+        $helper = $this->_factory->getHelper('catalog/product_flat');
+        if ($helper->isEnabled() && $helper->isBuiltAllStores()) {
+            /** @var $store Mage_Core_Model_Store */
+            foreach ($this->_app->getStores(false) as $store) {
+                if (count($websiteIds) == 0 || in_array($store->getWebsiteId(), $websiteIds)) {
+                    /** @var $selectByStore Varien_Db_Select */
+                    $selectByStore = $rule->getProductFlatSelect($store->getId());
+                    $selectByStore->where('p.entity_id = ?', $product->getId());
+                    $selectByStore->limit(1);
+                    if ($this->_getReadAdapter()->fetchOne($selectByStore)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        } else {
+            return $rule->getConditions()->validate($product);
         }
+    }
 
-        Varien_Profiler::start('__MATCH_PRODUCTS__');
-        $productIds = $rule->getMatchingProductIds();
-        Varien_Profiler::stop('__MATCH_PRODUCTS__');
+    /**
+     * Inserts rule data into catalogrule/rule_product table
+     *
+     * @param Mage_CatalogRule_Model_Rule $rule
+     * @param array $websiteIds
+     * @param array $productIds
+     */
+    public function insertRuleData(Mage_CatalogRule_Model_Rule $rule, array $websiteIds, array $productIds = array())
+    {
+        /** @var $write Varien_Db_Adapter_Interface */
+        $write = $this->_getWriteAdapter();
 
         $customerGroupIds = $rule->getCustomerGroupIds();
-        $fromTime = strtotime($rule->getFromDate());
-        $toTime = strtotime($rule->getToDate());
+        $fromTime = (int) strtotime($rule->getFromDate());
+        $toTime = (int) strtotime($rule->getToDate());
         $toTime = $toTime ? ($toTime + self::SECONDS_IN_DAY - 1) : 0;
-        $sortOrder = (int)$rule->getSortOrder();
+        $sortOrder = (int) $rule->getSortOrder();
         $actionOperator = $rule->getSimpleAction();
-        $actionAmount = $rule->getDiscountAmount();
+        $actionAmount = (float) $rule->getDiscountAmount();
         $subActionOperator = $rule->getSubIsEnable() ? $rule->getSubSimpleAction() : '';
-        $subActionAmount = $rule->getSubDiscountAmount();
-        $actionStop = $rule->getStopRulesProcessing();
+        $subActionAmount = (float) $rule->getSubDiscountAmount();
+        $actionStop = (int) $rule->getStopRulesProcessing();
+        /** @var $helper Mage_Catalog_Helper_Product_Flat */
+        $helper = $this->_factory->getHelper('catalog/product_flat');
+
+        if ($helper->isEnabled() && $helper->isBuiltAllStores()) {
+            /** @var $store Mage_Core_Model_Store */
+            foreach ($this->_app->getStores(false) as $store) {
+                if (in_array($store->getWebsiteId(), $websiteIds)) {
+                    /** @var $selectByStore Varien_Db_Select */
+                    $selectByStore = $rule->getProductFlatSelect($store->getId())
+                        ->joinLeft(array('cg' => $this->getTable('customer/customer_group')),
+                            $write->quoteInto('cg.customer_group_id IN (?)', $customerGroupIds),
+                            array('cg.customer_group_id'))
+                        ->reset(Varien_Db_Select::COLUMNS)
+                        ->columns(array(
+                            new Zend_Db_Expr($store->getWebsiteId()),
+                            'cg.customer_group_id',
+                            'p.entity_id',
+                            new Zend_Db_Expr($rule->getId()),
+                            new Zend_Db_Expr($fromTime),
+                            new Zend_Db_Expr($toTime),
+                            new Zend_Db_Expr("'" . $actionOperator . "'"),
+                            new Zend_Db_Expr($actionAmount),
+                            new Zend_Db_Expr($actionStop),
+                            new Zend_Db_Expr($sortOrder),
+                            new Zend_Db_Expr("'" . $subActionOperator . "'"),
+                            new Zend_Db_Expr($subActionAmount),
+                        ));
+
+                    if (count($productIds) > 0) {
+                        $selectByStore->where('p.entity_id IN (?)', $productIds);
+                    }
 
-        $rows = array();
+                    $selects = $write->selectsByRange('entity_id', $selectByStore, self::RANGE_PRODUCT_STEP);
+                    foreach ($selects as $select) {
+                        $write->query(
+                            $write->insertFromSelect(
+                                $select, $this->getTable('catalogrule/rule_product'), array(
+                                    'website_id',
+                                    'customer_group_id',
+                                    'product_id',
+                                    'rule_id',
+                                    'from_time',
+                                    'to_time',
+                                    'action_operator',
+                                    'action_amount',
+                                    'action_stop',
+                                    'sort_order',
+                                    'sub_simple_action',
+                                    'sub_discount_amount',
+                                ), Varien_Db_Adapter_Interface::INSERT_IGNORE
+                            )
+                        );
+                    }
+                }
+            }
+        } else {
+            if (count($productIds) == 0) {
+                Varien_Profiler::start('__MATCH_PRODUCTS__');
+                $productIds = $rule->getMatchingProductIds();
+                Varien_Profiler::stop('__MATCH_PRODUCTS__');
+            }
 
-        try {
-            foreach ($productIds as $productId) {
+            $rows = array();
+            foreach ($productIds as $productId => $validationByWebsite) {
                 foreach ($websiteIds as $websiteId) {
                     foreach ($customerGroupIds as $customerGroupId) {
+                        if (empty($validationByWebsite[$websiteId])) {
+                            continue;
+                        }
                         $rows[] = array(
-                            'rule_id' => $ruleId,
-                            'from_time' => $fromTime,
-                            'to_time' => $toTime,
-                            'website_id' => $websiteId,
-                            'customer_group_id' => $customerGroupId,
-                            'product_id' => $productId,
-                            'action_operator' => $actionOperator,
-                            'action_amount' => $actionAmount,
-                            'action_stop' => $actionStop,
-                            'sort_order' => $sortOrder,
-                            'sub_simple_action' => $subActionOperator,
+                            'rule_id'             => $rule->getId(),
+                            'from_time'           => $fromTime,
+                            'to_time'             => $toTime,
+                            'website_id'          => $websiteId,
+                            'customer_group_id'   => $customerGroupId,
+                            'product_id'          => $productId,
+                            'action_operator'     => $actionOperator,
+                            'action_amount'       => $actionAmount,
+                            'action_stop'         => $actionStop,
+                            'sort_order'          => $sortOrder,
+                            'sub_simple_action'   => $subActionOperator,
                             'sub_discount_amount' => $subActionAmount,
                         );
 
@@ -190,17 +308,53 @@ public function updateRuleProductData(Mage_CatalogRule_Model_Rule $rule)
                     }
                 }
             }
+
             if (!empty($rows)) {
-               $write->insertMultiple($this->getTable('catalogrule/rule_product'), $rows);
+                $write->insertMultiple($this->getTable('catalogrule/rule_product'), $rows);
             }
+        }
+    }
+
+    /**
+     * Update products which are matched for rule
+     *
+     * @param Mage_CatalogRule_Model_Rule $rule
+     *
+     * @throws Exception
+     * @return Mage_CatalogRule_Model_Resource_Rule
+     */
+    public function updateRuleProductData(Mage_CatalogRule_Model_Rule $rule)
+    {
+        $ruleId = $rule->getId();
+        $write  = $this->_getWriteAdapter();
+        $write->beginTransaction();
+        if ($rule->getProductsFilter()) {
+            $this->cleanProductData($ruleId, $rule->getProductsFilter());
+        } else {
+            $this->cleanProductData($ruleId);
+        }
+
+        if (!$rule->getIsActive()) {
+            $write->commit();
+            return $this;
+        }
 
+        $websiteIds = $rule->getWebsiteIds();
+        if (!is_array($websiteIds)) {
+            $websiteIds = explode(',', $websiteIds);
+        }
+        if (empty($websiteIds)) {
+            return $this;
+        }
+
+        try {
+            $this->insertRuleData($rule, $websiteIds);
             $write->commit();
         } catch (Exception $e) {
             $write->rollback();
             throw $e;
         }
 
-
         return $this;
     }
 
@@ -376,6 +530,22 @@ protected function _getRuleProductsStmt($fromDate, $toDate, $productId = null, $
         return $read->query($select);
     }
 
+    /**
+     * Generate catalog price rules prices for specified date range
+     * If from date is not defined - will be used previous day by UTC
+     * If to date is not defined - will be used next day by UTC
+     *
+     * @param int|Mage_Catalog_Model_Product $product
+     *
+     * @throws Exception
+     * @return Mage_CatalogRule_Model_Resource_Rule
+     */
+    public function applyAllRules($product = null)
+    {
+        $this->_reindexCatalogRule($product);
+        return $this;
+    }
+
     /**
      * Generate catalog price rules prices for specified date range
      * If from date is not defined - will be used previous day by UTC
@@ -385,158 +555,41 @@ protected function _getRuleProductsStmt($fromDate, $toDate, $productId = null, $
      * @param int|string|null $toDate
      * @param int $productId
      *
+     * @deprecated after 1.7.0.2 use method applyAllRules
+     *
      * @return Mage_CatalogRule_Model_Resource_Rule
      */
     public function applyAllRulesForDateRange($fromDate = null, $toDate = null, $productId = null)
     {
-        $write = $this->_getWriteAdapter();
-        $write->beginTransaction();
-
-        Mage::dispatchEvent('catalogrule_before_apply', array('resource' => $this));
-
-        $clearOldData = false;
-        if ($fromDate === null) {
-            $fromDate = mktime(0,0,0,date('m'),date('d')-1);
-            /**
-             * If fromDate not specified we can delete all data oldest than 1 day
-             * We have run it for clear table in case when cron was not installed
-             * and old data exist in table
-             */
-            $clearOldData = true;
-        }
-        if (is_string($fromDate)) {
-            $fromDate = strtotime($fromDate);
-        }
-        if ($toDate === null) {
-            $toDate = mktime(0,0,0,date('m'),date('d')+1);
-        }
-        if (is_string($toDate)) {
-            $toDate = strtotime($toDate);
-        }
-
-        $product = null;
-        if ($productId instanceof Mage_Catalog_Model_Product) {
-            $product    = $productId;
-            $productId  = $productId->getId();
-        }
-
-        $this->removeCatalogPricesForDateRange($fromDate, $toDate, $productId);
-        if ($clearOldData) {
-            $this->deleteOldData($fromDate, $productId);
-        }
-
-        $dayPrices  = array();
-
-        try {
-            /**
-             * Update products rules prices per each website separately
-             * because of max join limit in mysql
-             */
-            foreach (Mage::app()->getWebsites(false) as $website) {
-                $productsStmt = $this->_getRuleProductsStmt(
-                   $fromDate,
-                   $toDate,
-                   $productId,
-                   $website->getId()
-                );
-
-                $dayPrices  = array();
-                $stopFlags  = array();
-                $prevKey    = null;
-
-                while ($ruleData = $productsStmt->fetch()) {
-                    $ruleProductId  = $ruleData['product_id'];
-                    $productKey     = $ruleProductId . '_'
-                       . $ruleData['website_id'] . '_'
-                       . $ruleData['customer_group_id'];
-
-                    if ($prevKey && ($prevKey != $productKey)) {
-                        $stopFlags = array();
-                    }
-
-                    /**
-                     * Build prices for each day
-                     */
-                    for ($time=$fromDate; $time<=$toDate; $time+=self::SECONDS_IN_DAY) {
-                        if (($ruleData['from_time']==0 || $time >= $ruleData['from_time'])
-                            && ($ruleData['to_time']==0 || $time <=$ruleData['to_time'])
-                        ) {
-                            $priceKey = $time . '_' . $productKey;
-
-                            if (isset($stopFlags[$priceKey])) {
-                                continue;
-                            }
-
-                            if (!isset($dayPrices[$priceKey])) {
-                                $dayPrices[$priceKey] = array(
-                                    'rule_date'         => $time,
-                                    'website_id'        => $ruleData['website_id'],
-                                    'customer_group_id' => $ruleData['customer_group_id'],
-                                    'product_id'        => $ruleProductId,
-                                    'rule_price'        => $this->_calcRuleProductPrice($ruleData),
-                                    'latest_start_date' => $ruleData['from_time'],
-                                    'earliest_end_date' => $ruleData['to_time'],
-                                );
-                            } else {
-                                $dayPrices[$priceKey]['rule_price'] = $this->_calcRuleProductPrice(
-                                    $ruleData,
-                                    $dayPrices[$priceKey]
-                                );
-                                $dayPrices[$priceKey]['latest_start_date'] = max(
-                                    $dayPrices[$priceKey]['latest_start_date'],
-                                    $ruleData['from_time']
-                                );
-                                $dayPrices[$priceKey]['earliest_end_date'] = min(
-                                    $dayPrices[$priceKey]['earliest_end_date'],
-                                    $ruleData['to_time']
-                                );
-                            }
-
-                            if ($ruleData['action_stop']) {
-                                $stopFlags[$priceKey] = true;
-                            }
-                        }
-                    }
-
-                    $prevKey = $productKey;
-                    if (count($dayPrices)>1000) {
-                        $this->_saveRuleProductPrices($dayPrices);
-                        $dayPrices = array();
-                    }
-                }
-                $this->_saveRuleProductPrices($dayPrices);
-            }
-            $this->_saveRuleProductPrices($dayPrices);
-
-            $write->delete($this->getTable('catalogrule/rule_group_website'), array());
-
-            $timestamp = Mage::getModel('core/date')->gmtTimestamp();
-
-            $select = $write->select()
-                ->distinct(true)
-                ->from(
-                    $this->getTable('catalogrule/rule_product'),
-                    array('rule_id', 'customer_group_id', 'website_id')
-                )->where("{$timestamp} >= from_time AND (({$timestamp} <= to_time AND to_time > 0) OR to_time = 0)");
-            $query = $select->insertFromSelect($this->getTable('catalogrule/rule_group_website'));
-            $write->query($query);
+        return $this->applyAllRules($productId);
+    }
 
-            $write->commit();
-        } catch (Exception $e) {
-            $write->rollback();
-            throw $e;
+    /**
+     * Run reindex
+     *
+     * @param int|Mage_Catalog_Model_Product $product
+     */
+    protected function _reindexCatalogRule($product = null)
+    {
+        $indexerCode = 'catalogrule/action_index_refresh';
+        $value = null;
+        if ($product) {
+            $value = $product instanceof Mage_Catalog_Model_Product ? $product->getId() : $product;
+            $indexerCode = 'catalogrule/action_index_refresh_row';
         }
 
-        $productCondition = Mage::getModel('catalog/product_condition')
-            ->setTable($this->getTable('catalogrule/affected_product'))
-            ->setPkFieldName('product_id');
-        Mage::dispatchEvent('catalogrule_after_apply', array(
-            'product' => $product,
-            'product_condition' => $productCondition
-        ));
-        $write->delete($this->getTable('catalogrule/affected_product'));
-
-        return $this;
+        /** @var $indexer Mage_CatalogRule_Model_Action_Index_Refresh */
+        $indexer = Mage::getModel(
+            $indexerCode,
+            array(
+                'connection' => $this->_getWriteAdapter(),
+                'factory'    => Mage::getModel('core/factory'),
+                'resource'   => $this,
+                'app'        => Mage::app(),
+                'value'      => $value
+            )
+        );
+        $indexer->execute();
     }
 
     /**
@@ -703,6 +756,7 @@ public function getRulesForProduct($date, $wId, $pId)
      * @param Mage_Catalog_Model_Product $product
      * @param array $websiteIds
      *
+     * @throws Exception
      * @return Mage_CatalogRule_Model_Resource_Rule
      */
     public function applyToProduct($rule, $product, $websiteIds)
@@ -717,66 +771,24 @@ public function applyToProduct($rule, $product, $websiteIds)
         $write = $this->_getWriteAdapter();
         $write->beginTransaction();
 
-        $write->delete($this->getTable('catalogrule/rule_product'), array(
-            $write->quoteInto('rule_id=?', $ruleId),
-            $write->quoteInto('product_id=?', $productId),
-        ));
+        $this->cleanProductData($ruleId, array($productId));
 
-        if (!$rule->getConditions()->validate($product)) {
+        if (!$this->validateProduct($rule, $product, $websiteIds)) {
             $write->delete($this->getTable('catalogrule/rule_product_price'), array(
-                $write->quoteInto('product_id=?', $productId),
+                $write->quoteInto('product_id = ?', $productId),
             ));
             $write->commit();
             return $this;
         }
 
-        $customerGroupIds = $rule->getCustomerGroupIds();
-        $fromTime = strtotime($rule->getFromDate());
-        $toTime = strtotime($rule->getToDate());
-        $toTime = $toTime ? $toTime + self::SECONDS_IN_DAY - 1 : 0;
-        $sortOrder = (int)$rule->getSortOrder();
-        $actionOperator = $rule->getSimpleAction();
-        $actionAmount = $rule->getDiscountAmount();
-        $actionStop = $rule->getStopRulesProcessing();
-        $subActionOperator = $rule->getSubIsEnable() ? $rule->getSubSimpleAction() : '';
-        $subActionAmount = $rule->getSubDiscountAmount();
-
-        $rows = array();
         try {
-            foreach ($websiteIds as $websiteId) {
-                foreach ($customerGroupIds as $customerGroupId) {
-                    $rows[] = array(
-                        'rule_id' => $ruleId,
-                        'from_time' => $fromTime,
-                        'to_time' => $toTime,
-                        'website_id' => $websiteId,
-                        'customer_group_id' => $customerGroupId,
-                        'product_id' => $productId,
-                        'action_operator' => $actionOperator,
-                        'action_amount' => $actionAmount,
-                        'action_stop' => $actionStop,
-                        'sort_order' => $sortOrder,
-                        'sub_simple_action' => $subActionOperator,
-                        'sub_discount_amount' => $subActionAmount,
-                    );
-
-                    if (count($rows) == 1000) {
-                        $write->insertMultiple($this->getTable('catalogrule/rule_product'), $rows);
-                        $rows = array();
-                    }
-                }
-            }
-
-            if (!empty($rows)) {
-                $write->insertMultiple($this->getTable('catalogrule/rule_product'), $rows);
-            }
+            $this->insertRuleData($rule, $websiteIds, array(
+                $productId => array_combine(array_values($websiteIds), array_values($websiteIds))));
         } catch (Exception $e) {
             $write->rollback();
             throw $e;
         }
 
-        $this->applyAllRulesForDateRange(null, null, $product);
-
         $write->commit();
 
         return $this;
diff --git a/app/code/core/Mage/CatalogRule/Model/Rule.php b/app/code/core/Mage/CatalogRule/Model/Rule.php
index 675eb0ed78e..80fafdbf905 100644
--- a/app/code/core/Mage/CatalogRule/Model/Rule.php
+++ b/app/code/core/Mage/CatalogRule/Model/Rule.php
@@ -111,6 +111,45 @@ class Mage_CatalogRule_Model_Rule extends Mage_Rule_Model_Abstract
      */
     protected static $_priceRulesData = array();
 
+    /**
+     * Factory instance
+     *
+     * @var Mage_Core_Model_Factory
+     */
+    protected $_factory = null;
+
+    /**
+     * Configuration object
+     *
+     * @var Mage_Core_Model_Config
+     */
+    protected $_config = null;
+
+    /**
+     * Configuration object
+     *
+     * @var Mage_Core_Model_App
+     */
+    protected $_app = null;
+
+    /**
+     * Constructor with parameters
+     * Array of arguments with keys
+     *  - 'factory' Mage_Core_Model_Factory
+     *  - 'config' Mage_Core_Model_Config
+     *  - 'app' Mage_Core_Model_App
+     *
+     * @param array $args
+     */
+    public function __construct(array $args = array())
+    {
+        $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('core/factory');
+        $this->_config  = !empty($args['config']) ? $args['config'] : Mage::getConfig();
+        $this->_app     = !empty($args['app']) ? $args['app'] : Mage::app();
+
+        parent::__construct();
+    }
+
     /**
      * Init resource model and id field
      */
@@ -223,9 +262,28 @@ public function callbackValidateProduct($args)
         $product = clone $args['product'];
         $product->setData($args['row']);
 
-        if ($this->getConditions()->validate($product)) {
-            $this->_productIds[] = $product->getId();
+        $results = array();
+        foreach ($this->_getWebsitesMap() as $websiteId => $defaultStoreId) {
+            $product->setStoreId($defaultStoreId);
+            $results[$websiteId] = (int)$this->getConditions()->validate($product);
+        }
+        $this->_productIds[$product->getId()] = $results;
+    }
+
+    /**
+     * Prepare website to default assigned store map
+     *
+     * @return array
+     */
+    protected function _getWebsitesMap()
+    {
+        $map = array();
+        foreach ($this->_app->getWebsites(true) as $website) {
+            if ($website->getDefaultStore()) {
+                $map[$website->getId()] = $website->getDefaultStore()->getId();
+            }
         }
+        return $map;
     }
 
     /**
@@ -239,12 +297,14 @@ public function callbackValidateProduct($args)
     public function applyToProduct($product, $websiteIds = null)
     {
         if (is_numeric($product)) {
-            $product = Mage::getModel('catalog/product')->load($product);
+            $product = $this->_factory->getModel('catalog/product')->load($product);
         }
         if (is_null($websiteIds)) {
             $websiteIds = $this->getWebsiteIds();
         }
         $this->getResource()->applyToProduct($this, $product, $websiteIds);
+        $this->getResource()->applyAllRules($product);
+        $this->_invalidateCache();
     }
 
     /**
@@ -255,7 +315,7 @@ public function applyToProduct($product, $websiteIds = null)
     public function applyAll()
     {
         $this->getResourceCollection()->walk(array($this->_getResource(), 'updateRuleProductData'));
-        $this->_getResource()->applyAllRulesForDateRange();
+        $this->_getResource()->applyAllRules();
         $this->_invalidateCache();
         $indexProcess = Mage::getSingleton('index/indexer')->getProcessByCode('catalog_product_price');
         if ($indexProcess) {
@@ -271,22 +331,31 @@ public function applyAll()
      */
     public function applyAllRulesToProduct($product)
     {
-        $this->_getResource()->applyAllRulesForDateRange(NULL, NULL, $product);
-        $this->_invalidateCache();
-
-        if ($product instanceof Mage_Catalog_Model_Product) {
-            $productId = $product->getId();
-        } else {
-            $productId = $product;
+        if (is_numeric($product)) {
+            /** @var $product Mage_Catalog_Model_Product */
+            $product = Mage::getModel('catalog/product')->load($product);
         }
 
-        if ($productId) {
-            Mage::getSingleton('index/indexer')->processEntityAction(
-                new Varien_Object(array('id' => $productId)),
-                Mage_Catalog_Model_Product::ENTITY,
-                Mage_Catalog_Model_Product_Indexer_Price::EVENT_TYPE_REINDEX_PRICE
-            );
+        $productWebsiteIds = $product->getWebsiteIds();
+
+        /** @var $rules Mage_CatalogRule_Model_Resource_Rule_Collection */
+        $rules = Mage::getModel('catalogrule/rule')->getCollection()
+            ->addFieldToFilter('is_active', 1);
+        foreach ($rules as $rule) {
+            $websiteIds = array_intersect($productWebsiteIds, $rule->getWebsiteIds());
+            $this->getResource()->applyToProduct($rule, $product, $websiteIds);
         }
+
+        $this->getResource()->applyAllRules($product);
+        $this->_invalidateCache();
+
+        Mage::getSingleton('index/indexer')->processEntityAction(
+            new Varien_Object(array('id' => $product->getId())),
+            Mage_Catalog_Model_Product::ENTITY,
+            Mage_Catalog_Model_Product_Indexer_Price::EVENT_TYPE_REINDEX_PRICE
+        );
+
+        return $this;
     }
 
     /**
@@ -375,17 +444,14 @@ public function getProductsFilter()
      */
     protected function _invalidateCache()
     {
-        $types = Mage::getConfig()->getNode(self::XML_NODE_RELATED_CACHE);
+        $types = $this->_config->getNode(self::XML_NODE_RELATED_CACHE);
         if ($types) {
             $types = $types->asArray();
-            Mage::app()->getCacheInstance()->invalidateType(array_keys($types));
+            $this->_app->getCacheInstance()->invalidateType(array_keys($types));
         }
         return $this;
     }
 
-
-
-
     /**
      * @deprecated after 1.11.2.0
      *
diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php
index e1f9bb2c80b..b05705fa37a 100644
--- a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php
+++ b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php
@@ -30,5 +30,107 @@
  */
 class Mage_CatalogRule_Model_Rule_Condition_Product extends Mage_Rule_Model_Condition_Product_Abstract
 {
+    /**
+     * Validate product attribute value for condition
+     *
+     * @param Varien_Object $object
+     * @return bool
+     */
+    public function validate(Varien_Object $object)
+    {
+        $attrCode = $this->getAttribute();
+        if ('category_ids' == $attrCode) {
+            return $this->validateAttribute($object->getAvailableInCategories());
+        }
+        if ('attribute_set_id' == $attrCode) {
+            return $this->validateAttribute($object->getData($attrCode));
+        }
 
+        $oldAttrValue = $object->hasData($attrCode) ? $object->getData($attrCode) : null;
+        $object->setData($attrCode, $this->_getAttributeValue($object));
+        $result = $this->_validateProduct($object);
+        $this->_restoreOldAttrValue($object, $oldAttrValue);
+
+        return (bool)$result;
+    }
+
+    /**
+     * Validate product
+     *
+     * @param Varien_Object $object
+     * @return bool
+     */
+    protected function _validateProduct($object)
+    {
+        return Mage_Rule_Model_Condition_Abstract::validate($object);
+    }
+
+    /**
+     * Restore old attribute value
+     *
+     * @param Varien_Object $object
+     * @param mixed $oldAttrValue
+     */
+    protected function _restoreOldAttrValue($object, $oldAttrValue)
+    {
+        $attrCode = $this->getAttribute();
+        if (is_null($oldAttrValue)) {
+            $object->unsetData($attrCode);
+        } else {
+            $object->setData($attrCode, $oldAttrValue);
+        }
+    }
+
+    /**
+     * Get attribute value
+     *
+     * @param Varien_Object $object
+     * @return mixed
+     */
+    protected function _getAttributeValue($object)
+    {
+        $storeId = $object->getStoreId();
+        $defaultStoreId = Mage_Core_Model_App::ADMIN_STORE_ID;
+        $productValues  = isset($this->_entityAttributeValues[$object->getId()])
+            ? $this->_entityAttributeValues[$object->getId()] : array();
+        $defaultValue = isset($productValues[$defaultStoreId]) ? $productValues[$defaultStoreId] : null;
+        $value = isset($productValues[$storeId]) ? $productValues[$storeId] : $defaultValue;
+
+        $value = $this->_prepareDatetimeValue($value, $object);
+        $value = $this->_prepareMultiselectValue($value, $object);
+
+        return $value;
+    }
+
+    /**
+     * Prepare datetime attribute value
+     *
+     * @param mixed $value
+     * @param Varien_Object $object
+     * @return mixed
+     */
+    protected function _prepareDatetimeValue($value, $object)
+    {
+        $attribute = $object->getResource()->getAttribute($this->getAttribute());
+        if ($attribute && $attribute->getBackendType() == 'datetime') {
+            $value = strtotime($value);
+        }
+        return $value;
+    }
+
+    /**
+     * Prepare multiselect attribute value
+     *
+     * @param mixed $value
+     * @param Varien_Object $object
+     * @return mixed
+     */
+    protected function _prepareMultiselectValue($value, $object)
+    {
+        $attribute = $object->getResource()->getAttribute($this->getAttribute());
+        if ($attribute && $attribute->getFrontendInput() == 'multiselect') {
+            $value = strlen($value) ? explode(',', $value) : array();
+        }
+        return $value;
+    }
 }
diff --git a/app/code/core/Mage/CatalogRule/etc/config.xml b/app/code/core/Mage/CatalogRule/etc/config.xml
index 9f2375d2e29..8cfd453bc50 100644
--- a/app/code/core/Mage/CatalogRule/etc/config.xml
+++ b/app/code/core/Mage/CatalogRule/etc/config.xml
@@ -52,6 +52,9 @@
                     <rule_product>
                         <table>catalogrule_product</table>
                     </rule_product>
+                    <rule_product_price_tmp>
+                        <table>catalogrule_product_price_tmp</table>
+                    </rule_product_price_tmp>
                     <rule_product_price>
                         <table>catalogrule_product_price</table>
                     </rule_product_price>
@@ -149,14 +152,14 @@
                     </catalogrule>
                 </observers>
             </catalog_product_get_final_price>
-            <catalog_product_save_after>
+            <catalog_product_save_commit_after>
                 <observers>
                     <catalogrule>
                         <class>catalogrule/observer</class>
                         <method>applyAllRulesOnProduct</method>
                     </catalogrule>
                 </observers>
-            </catalog_product_save_after>
+            </catalog_product_save_commit_after>
 
             <catalog_product_import_finish_before>
                 <observers>
diff --git a/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php
index 61858c08ccf..8150953900d 100644
--- a/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php
+++ b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php
@@ -62,7 +62,7 @@ public function getSearchableAttributes()
     /**
      * Retrieve attribute label
      *
-     * @param  $attribute
+     * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute
      * @return string
      */
     public function getAttributeLabel($attribute)
@@ -73,8 +73,8 @@ public function getAttributeLabel($attribute)
     /**
      * Retrieve attribute input validation class
      *
-     * @param   $attribute
-     * @return  string
+     * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute
+     * @return string
      */
     public function getAttributeValidationClass($attribute)
     {
@@ -84,18 +84,17 @@ public function getAttributeValidationClass($attribute)
     /**
      * Retrieve search string for given field from request
      *
-     * @param string $attribute
-     * @param string $part
+     * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute
+     * @param string|null $part
      * @return mixed|string
      */
-    public function getAttributeValue($attribute, $part=null)
+    public function getAttributeValue($attribute, $part = null)
     {
         $value = $this->getRequest()->getQuery($attribute->getAttributeCode());
         if ($part && $value) {
             if (isset($value[$part])) {
                 $value = $value[$part];
-            }
-            else {
+            } else {
                 $value = '';
             }
         }
@@ -145,7 +144,7 @@ public function getCurrencyCount()
     /**
      * Retrieve currency code for attribute
      *
-     * @param $attribute
+     * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute
      * @return string
      */
     public function getCurrency($attribute)
@@ -160,7 +159,7 @@ public function getCurrency($attribute)
     /**
      * Retrieve attribute input type
      *
-     * @param   $attribute
+     * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute
      * @return  string
      */
     public function getAttributeInputType($attribute)
@@ -193,7 +192,7 @@ public function getAttributeInputType($attribute)
     /**
      * Build attribute select element html string
      *
-     * @param $attribute
+     * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute
      * @return string
      */
     public function getAttributeSelectElement($attribute)
@@ -223,6 +222,12 @@ public function getAttributeSelectElement($attribute)
             ->getHtml();
     }
 
+    /**
+     * Retrieve yes/no element html for provided attribute
+     *
+     * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute
+     * @return string
+     */
     public function getAttributeYesNoElement($attribute)
     {
         $options = array(
@@ -273,7 +278,7 @@ public function getModel()
     }
 
     /**
-     * Retrieve search form action string
+     * Retrieve search form action url
      *
      * @return string
      */
@@ -285,7 +290,7 @@ public function getSearchPostUrl()
     /**
      * Build date element html string for attribute
      *
-     * @param $attribute
+     * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute
      * @param string $part
      * @return string
      */
diff --git a/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php b/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php
index 4e5c4ef0aff..d970c0a08b2 100644
--- a/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php
+++ b/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php
@@ -56,8 +56,8 @@ protected function _toHtml()
                 $item['row_class'] .= ' last';
             }
 
-            $html .=  '<li title="'.$this->htmlEscape($item['title']).'" class="'.$item['row_class'].'">'
-                . '<span class="amount">'.$item['num_of_results'].'</span>'.$this->htmlEscape($item['title']).'</li>';
+            $html .=  '<li title="'.$this->escapeHtml($item['title']).'" class="'.$item['row_class'].'">'
+                . '<span class="amount">'.$item['num_of_results'].'</span>'.$this->escapeHtml($item['title']).'</li>';
         }
 
         $html.= '</ul>';
diff --git a/app/code/core/Mage/CatalogSearch/Block/Layer.php b/app/code/core/Mage/CatalogSearch/Block/Layer.php
index f7a6d941f90..df0963bf837 100644
--- a/app/code/core/Mage/CatalogSearch/Block/Layer.php
+++ b/app/code/core/Mage/CatalogSearch/Block/Layer.php
@@ -86,7 +86,7 @@ public function canShowBlock()
             ->getConfig(Mage_CatalogSearch_Model_Layer::XML_PATH_DISPLAY_LAYER_COUNT);
 
         if (!$availableResCount
-            || ($availableResCount>=$this->getLayer()->getProductCollection()->getSize())) {
+            || ($availableResCount > $this->getLayer()->getProductCollection()->getSize())) {
             return parent::canShowBlock();
         }
         return false;
diff --git a/app/code/core/Mage/CatalogSearch/Model/Advanced.php b/app/code/core/Mage/CatalogSearch/Model/Advanced.php
index f27fa6246e2..86583655f71 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Advanced.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Advanced.php
@@ -62,9 +62,16 @@ class Mage_CatalogSearch_Model_Advanced extends Mage_Core_Model_Abstract
     /**
      * Current search engine
      *
-     * @var object | Mage_CatalogSearch_Model_Resource_Fulltext_Engine
+     * @var object|Mage_CatalogSearch_Model_Resource_Fulltext_Engine
      */
-    protected $_engine = null;
+    protected $_engine;
+
+    /**
+     * Found products collection
+     *
+     * @var Mage_CatalogSearch_Model_Resource_Advanced_Collection
+     */
+    protected $_productCollection;
 
     /**
      * Initialize resource model
diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php
index f200e922878..01aff9a4250 100755
--- a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php
@@ -685,7 +685,7 @@ protected function _getAttributeValue($attributeId, $value, $storeId)
             }
 
             $attribute->setStoreId($storeId);
-            $value = $attribute->getSource()->getOptionText($value);
+            $value = $attribute->getSource()->getIndexOptionText($value);
 
             if (is_array($value)) {
                 $value = implode($this->_separator, $value);
diff --git a/app/code/core/Mage/CatalogSearch/etc/config.xml b/app/code/core/Mage/CatalogSearch/etc/config.xml
index 16566c4f085..e9097525510 100644
--- a/app/code/core/Mage/CatalogSearch/etc/config.xml
+++ b/app/code/core/Mage/CatalogSearch/etc/config.xml
@@ -32,6 +32,9 @@
         </Mage_CatalogSearch>
     </modules>
     <global>
+        <catalogsearch_fulltext>
+            <model>catalogsearch/fulltext</model>
+        </catalogsearch_fulltext>
         <models>
             <catalogsearch>
                 <class>Mage_CatalogSearch_Model</class>
diff --git a/app/code/core/Mage/Checkout/Block/Cart.php b/app/code/core/Mage/Checkout/Block/Cart.php
index a774c6cb1ce..d4059847cdd 100644
--- a/app/code/core/Mage/Checkout/Block/Cart.php
+++ b/app/code/core/Mage/Checkout/Block/Cart.php
@@ -40,11 +40,12 @@ class Mage_Checkout_Block_Cart extends Mage_Checkout_Block_Cart_Abstract
     public function __construct()
     {
         parent::__construct();
-        $this->prepareItemUrls();
     }
 
     /**
-     * prepare cart items URLs
+     * Prepare cart items URLs
+     *
+     * @deprecated after 1.7.0.2
      */
     public function prepareItemUrls()
     {
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php
index 64b2c7e91f1..d19b70c1df8 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php
@@ -123,7 +123,6 @@ public function hasProductUrl()
         if ($this->_ignoreProductUrl) {
             return false;
         }
-
         if ($this->_productUrl || $this->getItem()->getRedirectUrl()) {
             return true;
         }
@@ -133,19 +132,9 @@ public function hasProductUrl()
         if ($option) {
             $product = $option->getProduct();
         }
-
         if ($product->isVisibleInSiteVisibility()) {
             return true;
         }
-        else {
-            if ($product->hasUrlDataObject()) {
-                $data = $product->getUrlDataObject();
-                if (in_array($data->getVisibility(), $product->getVisibleInSiteVisibilities())) {
-                    return true;
-                }
-            }
-        }
-
         return false;
     }
 
@@ -415,4 +404,44 @@ public function setIgnoreProductUrl($ignore = true)
         $this->_ignoreProductUrl = $ignore;
         return $this;
     }
+
+    /**
+     * Common code to be called by product renders of gift registry to create a block, which is be used to
+     * generate html for mrsp price
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @return Mage_Catalog_Block_Product_Price
+     */
+    protected function _preparePriceBlock($product)
+    {
+        return $this->getLayout()
+            ->createBlock('catalog/product_price')
+            ->setTemplate('catalog/product/price.phtml')
+            ->setIdSuffix($this->getIdSuffix())
+            ->setProduct($product);
+    }
+
+    /**
+     *  Common code to be called by product renders of gift registry to  generate final html block
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @return string
+     */
+    protected function _getPriceContent($product)
+    {
+        return $this->getLayout()->createBlock('catalog/product_price')
+            ->setTemplate('catalog/product/price_msrp.phtml')
+            ->setProduct($product)
+            ->toHtml();
+    }
+
+    /**
+     * Retrieve block cache tags
+     *
+     * @return array
+     */
+    public function getCacheTags()
+    {
+        return array_merge(parent::getCacheTags(), $this->getProduct()->getCacheIdTags());
+    }
 }
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php
index 609bffc8eb0..0524a268686 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php
@@ -112,4 +112,14 @@ public function getOptionList()
         $options = $helper->getConfigurableOptions($this->getItem());
         return $options;
     }
+
+    /**
+     * Retrieve block cache tags
+     *
+     * @return array
+     */
+    public function getCacheTags()
+    {
+        return array_merge(parent::getCacheTags(), $this->getConfigurableProduct()->getCacheIdTags());
+    }
 }
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php
index 7d9d7787e9c..2d526836581 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php
@@ -84,4 +84,14 @@ protected function _toHtml()
         $renderer->overrideProductThumbnail(null);
         return $rendererHtml;
     }
+
+    /**
+     * Retrieve block cache tags
+     *
+     * @return array
+     */
+    public function getCacheTags()
+    {
+        return array_merge(parent::getCacheTags(), $this->getGroupedProduct()->getCacheIdTags());
+    }
 }
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php b/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php
index b6d010f5d7f..adbba232ec9 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php
@@ -63,41 +63,18 @@ public function getItemCount()
     /**
      * Get array of last added items
      *
+     * @param null $count
      * @return array
      */
     public function getRecentItems($count = null)
     {
-        if ($count === null) {
-            $count = $this->getItemCount();
-        }
-
-        $items = array();
         if (!$this->getSummaryCount()) {
-            return $items;
+            return array();
         }
-
-        $i = 0;
-        $allItems = array_reverse($this->getItems());
-        foreach ($allItems as $item) {
-            /* @var $item Mage_Sales_Model_Quote_Item */
-            if (!$item->getProduct()->isVisibleInSiteVisibility()) {
-                $productId = $item->getProduct()->getId();
-                $products  = Mage::getResourceSingleton('catalog/url')
-                    ->getRewriteByProductStore(array($productId => $item->getStoreId()));
-                if (!isset($products[$productId])) {
-                    continue;
-                }
-                $urlDataObject = new Varien_Object($products[$productId]);
-                $item->getProduct()->setUrlDataObject($urlDataObject);
-            }
-
-            $items[] = $item;
-            if (++$i == $count) {
-                break;
-            }
+        if ($count === null) {
+            $count = $this->getItemCount();
         }
-
-        return $items;
+        return array_slice(array_reverse($this->getItems()), 0, $count);
     }
 
     /**
@@ -310,4 +287,26 @@ public function deserializeRenders($renders)
 
         return $this;
     }
+
+    /**
+     * Retrieve block cache tags
+     *
+     * @return array
+     */
+    public function getCacheTags()
+    {
+        $quoteTags = $this->getQuote()->getCacheIdTags();
+
+        $items = array();
+        /** @var $item Mage_Sales_Model_Quote_Item */
+        foreach ($this->getItems() as $item) {
+            $items[] = $item->getProduct();
+       }
+
+        return array_merge(
+            parent::getCacheTags(),
+            (!$quoteTags)? array() : $quoteTags,
+            $this->getItemsTags($items)
+        );
+    }
 }
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php b/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php
index b63ba0e8690..3ac26d3a890 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php
@@ -48,16 +48,14 @@ protected function _prepareLayout()
     }
 
     /**
-     * Check and prepare payment method model
+     * Check payment method model
      *
+     * @param Mage_Payment_Model_Method_Abstract|null $method
      * @return bool
      */
     protected function _canUseMethod($method)
     {
-        if (!$method->canUseForMultishipping()) {
-            return false;
-        }
-        return parent::_canUseMethod($method);
+        return $method && $method->canUseForMultishipping() && parent::_canUseMethod($method);
     }
 
     /**
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php b/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php
index 01ffc43a57a..3f227bfac8d 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php
@@ -88,7 +88,6 @@ public function getPayment()
             $this->setData('payment', $payment);
         }
         return $this->_getData('payment');
-        //return $this->getCheckout()->getQuote()->getPayment();
     }
 
     public function getShippingAddresses()
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php
index ff981bff280..8fc8f8c34fd 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php
@@ -40,16 +40,14 @@ public function getQuote()
     }
 
     /**
-     * Check and prepare payment method model
+     * Check payment method model
      *
+     * @param Mage_Payment_Model_Method_Abstract|null
      * @return bool
      */
     protected function _canUseMethod($method)
     {
-        if (!$method || !$method->canUseCheckout()) {
-            return false;
-        }
-        return parent::_canUseMethod($method);
+        return $method && $method->canUseCheckout() && parent::_canUseMethod($method);
     }
 
     /**
diff --git a/app/code/core/Mage/Checkout/Helper/Cart.php b/app/code/core/Mage/Checkout/Helper/Cart.php
index 33ba781875b..2dad79bc6df 100644
--- a/app/code/core/Mage/Checkout/Helper/Cart.php
+++ b/app/code/core/Mage/Checkout/Helper/Cart.php
@@ -31,7 +31,15 @@
  */
 class Mage_Checkout_Helper_Cart extends Mage_Core_Helper_Url
 {
-    const XML_PATH_REDIRECT_TO_CART         = 'checkout/cart/redirect_to_cart';
+    /**
+     * XML path for redirect to cart value
+     */
+    const XML_PATH_REDIRECT_TO_CART = 'checkout/cart/redirect_to_cart';
+
+    /**
+     * Maximal coupon code length according to database table definitions (longer codes are truncated)
+     */
+    const COUPON_CODE_MAX_LENGTH = 255;
 
     /**
      * Retrieve cart instance
@@ -46,17 +54,17 @@ public function getCart()
     /**
      * Retrieve url for add product to cart
      *
-     * @param   Mage_Catalog_Model_Product $product
-     * @return  string
+     * @param Mage_Catalog_Model_Product $product
+     * @param array $additional
+     * @return string
      */
     public function getAddUrl($product, $additional = array())
     {
-        $continueUrl    = Mage::helper('core')->urlEncode($this->getCurrentUrl());
-        $urlParamName   = Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED;
-
         $routeParams = array(
-            $urlParamName   => $continueUrl,
-            'product'       => $product->getEntityId()
+            Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED => $this->_getHelperInstance('core')
+                ->urlEncode($this->getCurrentUrl()),
+            'product' => $product->getEntityId(),
+            Mage_Core_Model_Url::FORM_KEY => $this->_getSingletonModel('core/session')->getFormKey()
         );
 
         if (!empty($additional)) {
@@ -76,6 +84,17 @@ public function getAddUrl($product, $additional = array())
         return $this->_getUrl('checkout/cart/add', $routeParams);
     }
 
+    /**
+     * Return helper instance
+     *
+     * @param  string $helperName
+     * @return Mage_Core_Helper_Abstract
+     */
+    protected function _getHelperInstance($helperName)
+    {
+        return Mage::helper($helperName);
+    }
+
     /**
      * Retrieve url for remove product from cart
      *
@@ -85,7 +104,7 @@ public function getAddUrl($product, $additional = array())
     public function getRemoveUrl($item)
     {
         $params = array(
-            'id'=>$item->getId(),
+            'id' => $item->getId(),
             Mage_Core_Controller_Front_Action::PARAM_NAME_BASE64_URL => $this->getCurrentBase64Url()
         );
         return $this->_getUrl('checkout/cart/delete', $params);
diff --git a/app/code/core/Mage/Checkout/Model/Cart.php b/app/code/core/Mage/Checkout/Model/Cart.php
index cc99a9a31db..b5073b44f37 100644
--- a/app/code/core/Mage/Checkout/Model/Cart.php
+++ b/app/code/core/Mage/Checkout/Model/Cart.php
@@ -140,21 +140,15 @@ public function setQuote(Mage_Sales_Model_Quote $quote)
      */
     public function init()
     {
-        $this->getQuote()->setCheckoutMethod('');
+        $quote = $this->getQuote()->setCheckoutMethod('');
 
-        /**
-         * If user try do checkout, reset shipping and payment data
-         */
         if ($this->getCheckoutSession()->getCheckoutState() !== Mage_Checkout_Model_Session::CHECKOUT_STATE_BEGIN) {
-            $this->getQuote()
-                ->removeAllAddresses()
-                ->removePayment();
+            $quote->removeAllAddresses()->removePayment();
             $this->getCheckoutSession()->resetCheckout();
         }
 
-        if (!$this->getQuote()->hasItems()) {
-            $this->getQuote()->getShippingAddress()
-                ->setCollectShippingRates(false)
+        if (!$quote->hasItems()) {
+            $quote->getShippingAddress()->setCollectShippingRates(false)
                 ->removeAllShippingRates();
         }
 
diff --git a/app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php
index 63d5f5765ef..04bcca611a3 100644
--- a/app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php
+++ b/app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php
@@ -51,7 +51,7 @@ protected function _preparePaymentData($data)
      */
     protected function _canUsePaymentMethod($method, $quote)
     {
-        if ( !($method->isGateway() || $method->canUseInternal()) ) {
+        if (!($method->isGateway() || $method->canUseInternal())) {
             return false;
         }
 
@@ -80,8 +80,8 @@ protected function _canUsePaymentMethod($method, $quote)
     protected function _getPaymentMethodAvailableCcTypes($method)
     {
         $ccTypes = Mage::getSingleton('payment/config')->getCcTypes();
-        $methodCcTypes = explode(',',$method->getConfigData('cctypes'));
-        foreach ($ccTypes as $code=>$title) {
+        $methodCcTypes = explode(',', $method->getConfigData('cctypes'));
+        foreach ($ccTypes as $code => $title) {
             if (!in_array($code, $methodCcTypes)) {
                 unset($ccTypes[$code]);
             }
@@ -94,11 +94,13 @@ protected function _getPaymentMethodAvailableCcTypes($method)
     }
 
     /**
-     * @param  $quoteId
-     * @param  $store
+     * Retrieve available payment methods for a quote
+     *
+     * @param int $quoteId
+     * @param int $store
      * @return array
      */
-    public function getPaymentMethodsList($quoteId, $store=null)
+    public function getPaymentMethodsList($quoteId, $store = null)
     {
         $quote = $this->_getQuote($quoteId, $store);
         $store = $quote->getStoreId();
@@ -107,18 +109,19 @@ public function getPaymentMethodsList($quoteId, $store=null)
 
         $methodsResult = array();
         $methods = Mage::helper('payment')->getStoreMethods($store, $quote);
-        foreach ($methods as $key=>$method) {
+
+        foreach ($methods as $method) {
             /** @var $method Mage_Payment_Model_Method_Abstract */
-            if ($this->_canUsePaymentMethod($method, $quote)
-                    && ($total != 0
-                        || $method->getCode() == 'free'
-                        || ($quote->hasRecurringItems() && $method->canManageRecurringProfiles()))) {
-                $methodsResult[] =
-                        array(
-                            "code" => $method->getCode(),
-                            "title" => $method->getTitle(),
-                            "ccTypes" => $this->_getPaymentMethodAvailableCcTypes($method)
-                        );
+            if ($this->_canUsePaymentMethod($method, $quote)) {
+                $isRecurring = $quote->hasRecurringItems() && $method->canManageRecurringProfiles();
+
+                if ($total != 0 || $method->getCode() == 'free' || $isRecurring) {
+                    $methodsResult[] = array(
+                        'code' => $method->getCode(),
+                        'title' => $method->getTitle(),
+                        'cc_types' => $this->_getPaymentMethodAvailableCcTypes($method),
+                    );
+                }
             }
         }
 
@@ -131,7 +134,7 @@ public function getPaymentMethodsList($quoteId, $store=null)
      * @param  $store
      * @return bool
      */
-    public function setPaymentMethod($quoteId, $paymentData, $store=null)
+    public function setPaymentMethod($quoteId, $paymentData, $store = null)
     {
         $quote = $this->_getQuote($quoteId, $store);
         $store = $quote->getStoreId();
@@ -144,16 +147,20 @@ public function setPaymentMethod($quoteId, $paymentData, $store=null)
 
         if ($quote->isVirtual()) {
             // check if billing address is set
-            if (is_null($quote->getBillingAddress()->getId()) ) {
+            if (is_null($quote->getBillingAddress()->getId())) {
                 $this->_fault('billing_address_is_not_set');
             }
-            $quote->getBillingAddress()->setPaymentMethod(isset($paymentData['method']) ? $paymentData['method'] : null);
+            $quote->getBillingAddress()->setPaymentMethod(
+                isset($paymentData['method']) ? $paymentData['method'] : null
+            );
         } else {
             // check if shipping address is set
-            if (is_null($quote->getShippingAddress()->getId()) ) {
+            if (is_null($quote->getShippingAddress()->getId())) {
                 $this->_fault('shipping_address_is_not_set');
             }
-            $quote->getShippingAddress()->setPaymentMethod(isset($paymentData['method']) ? $paymentData['method'] : null);
+            $quote->getShippingAddress()->setPaymentMethod(
+                isset($paymentData['method']) ? $paymentData['method'] : null
+            );
         }
 
         if (!$quote->isVirtual() && $quote->getShippingAddress()) {
@@ -162,13 +169,14 @@ public function setPaymentMethod($quoteId, $paymentData, $store=null)
 
         $total = $quote->getBaseSubtotal();
         $methods = Mage::helper('payment')->getStoreMethods($store, $quote);
-        foreach ($methods as $key=>$method) {
+        foreach ($methods as $method) {
             if ($method->getCode() == $paymentData['method']) {
                 /** @var $method Mage_Payment_Model_Method_Abstract */
                 if (!($this->_canUsePaymentMethod($method, $quote)
-                        && ($total != 0
-                            || $method->getCode() == 'free'
-                            || ($quote->hasRecurringItems() && $method->canManageRecurringProfiles())))) {
+                    && ($total != 0
+                        || $method->getCode() == 'free'
+                        || ($quote->hasRecurringItems() && $method->canManageRecurringProfiles())))
+                ) {
                     $this->_fault("method_not_allowed");
                 }
             }
@@ -180,8 +188,8 @@ public function setPaymentMethod($quoteId, $paymentData, $store=null)
 
 
             $quote->setTotalsCollectedFlag(false)
-                    ->collectTotals()
-                    ->save();
+                ->collectTotals()
+                ->save();
         } catch (Mage_Core_Exception $e) {
             $this->_fault('payment_method_is_not_set', $e->getMessage());
         }
diff --git a/app/code/core/Mage/Checkout/Model/Cart/Product/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Product/Api.php
index c45a8e5845c..4ebd31e24fc 100644
--- a/app/code/core/Mage/Checkout/Model/Cart/Product/Api.php
+++ b/app/code/core/Mage/Checkout/Model/Cart/Product/Api.php
@@ -295,8 +295,10 @@ public function moveToCustomerQuote($quoteId, $productsData, $store=null)
                 /** @var $quoteItem Mage_Sales_Model_Quote_Item */
                 $quoteItem = $this->_getQuoteItemByProduct($quote, $productByItem,
                     $this->_getProductRequest($productItem));
-                if($quoteItem->getId()){
-                    $customerQuote->addItem($quoteItem);
+                if($quoteItem && $quoteItem->getId()){
+                    $newQuoteItem = clone $quoteItem;
+                    $newQuoteItem->setId(null);
+                    $customerQuote->addItem($newQuoteItem);
                     $quote->removeItem($quoteItem->getId());
                     unset($productsData[$key]);
                 } else {
diff --git a/app/code/core/Mage/Checkout/Model/Session.php b/app/code/core/Mage/Checkout/Model/Session.php
index 5c17599c7fe..b7d0dc80eda 100644
--- a/app/code/core/Mage/Checkout/Model/Session.php
+++ b/app/code/core/Mage/Checkout/Model/Session.php
@@ -50,6 +50,13 @@ class Mage_Checkout_Model_Session extends Mage_Core_Model_Session_Abstract
      */
     protected $_loadInactive = false;
 
+    /**
+     * Loaded order instance
+     *
+     * @var Mage_Sales_Model_Order
+     */
+    protected $_order;
+
     /**
      * Class constructor. Initialize checkout session namespace
      */
@@ -391,4 +398,32 @@ public function replaceQuote($quote)
         $this->setQuoteId($quote->getId());
         return $this;
     }
+
+    /**
+     * Get order instance based on last order ID
+     *
+     * @return Mage_Sales_Model_Order
+     */
+    public function getLastRealOrder()
+    {
+        $orderId = $this->getLastRealOrderId();
+        if ($this->_order !== null && $orderId == $this->_order->getIncrementId()) {
+            return $this->_order;
+        }
+        $this->_order = $this->_getOrderModel();
+        if ($orderId) {
+            $this->_order->loadByIncrementId($orderId);
+        }
+        return $this->_order;
+    }
+
+    /**
+     * Get order model
+     *
+     * @return Mage_Sales_Model_Order
+     */
+    protected function _getOrderModel()
+    {
+        return Mage::getModel('sales/order');
+    }
 }
diff --git a/app/code/core/Mage/Checkout/Model/Type/Onepage.php b/app/code/core/Mage/Checkout/Model/Type/Onepage.php
index e16724a4825..fc8b3a539d2 100644
--- a/app/code/core/Mage/Checkout/Model/Type/Onepage.php
+++ b/app/code/core/Mage/Checkout/Model/Type/Onepage.php
@@ -278,6 +278,11 @@ public function saveBilling($data, $customerAddressId)
             $address->setSaveInAddressBook(empty($data['save_in_address_book']) ? 0 : 1);
         }
 
+        // set email for newly created user
+        if (!$address->getEmail() && $this->getQuote()->getCustomerEmail()) {
+            $address->setEmail($this->getQuote()->getCustomerEmail());
+        }
+
         // validate billing address
         if (($validateRes = $address->validate()) !== true) {
             return array('error' => 1, 'message' => $validateRes);
@@ -616,6 +621,12 @@ public function savePayment($data)
             $quote->getShippingAddress()->setCollectShippingRates(true);
         }
 
+        $data['checks'] = Mage_Payment_Model_Method_Abstract::CHECK_USE_CHECKOUT
+            | Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_COUNTRY
+            | Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_CURRENCY
+            | Mage_Payment_Model_Method_Abstract::CHECK_ORDER_TOTAL_MIN_MAX
+            | Mage_Payment_Model_Method_Abstract::CHECK_ZERO_TOTAL;
+
         $payment = $quote->getPayment();
         $payment->importData($data);
 
@@ -908,244 +919,4 @@ public function getLastOrderId()
         }
         return $orderId;
     }
-
-
-    /**
-     * Enter description here...
-     *
-     * @return array
-     */
-//    public function saveOrder1()
-//    {
-//        $this->validateOrder();
-//        $billing = $this->getQuote()->getBillingAddress();
-//        if (!$this->getQuote()->isVirtual()) {
-//            $shipping = $this->getQuote()->getShippingAddress();
-//        }
-//
-//        /*
-//         * Check if before this step checkout method was not defined use default values.
-//         * Related to issue with some browsers when checkout method was not saved during first step.
-//         */
-//        if (!$this->getQuote()->getCheckoutMethod()) {
-//            if (Mage::helper('checkout')->isAllowedGuestCheckout($this->getQuote(), $this->getQuote()->getStore())) {
-//                $this->getQuote()->setCheckoutMethod(Mage_Sales_Model_Quote::CHECKOUT_METHOD_GUEST);
-//            } else {
-//                $this->getQuote()->setCheckoutMethod(Mage_Sales_Model_Quote::CHECKOUT_METHOD_REGISTER);
-//            }
-//        }
-//
-//        switch ($this->getQuote()->getCheckoutMethod()) {
-//        case Mage_Sales_Model_Quote::CHECKOUT_METHOD_GUEST:
-//            if (!$this->getQuote()->isAllowedGuestCheckout()) {
-//                Mage::throwException(Mage::helper('checkout')->__('Sorry, guest checkout is not enabled. Please try again or contact the store owner.'));
-//            }
-//            $this->getQuote()->setCustomerId(null)
-//                ->setCustomerEmail($billing->getEmail())
-//                ->setCustomerIsGuest(true)
-//                ->setCustomerGroupId(Mage_Customer_Model_Group::NOT_LOGGED_IN_ID);
-//            break;
-//
-//        case Mage_Sales_Model_Quote::CHECKOUT_METHOD_REGISTER:
-//            $customer = Mage::getModel('customer/customer');
-//            /* @var $customer Mage_Customer_Model_Customer */
-//
-//            $customerBilling = $billing->exportCustomerAddress();
-//            $customer->addAddress($customerBilling);
-//
-//            if (!$this->getQuote()->isVirtual() && !$shipping->getSameAsBilling()) {
-//                $customerShipping = $shipping->exportCustomerAddress();
-//                $customer->addAddress($customerShipping);
-//            }
-//
-//            if ($this->getQuote()->getCustomerDob() && !$billing->getCustomerDob()) {
-//                $billing->setCustomerDob($this->getQuote()->getCustomerDob());
-//            }
-//
-//            if ($this->getQuote()->getCustomerTaxvat() && !$billing->getCustomerTaxvat()) {
-//                $billing->setCustomerTaxvat($this->getQuote()->getCustomerTaxvat());
-//            }
-//
-//            if ($this->getQuote()->getCustomerGender() && !$billing->getCustomerGender()) {
-//                $billing->setCustomerGender($this->getQuote()->getCustomerGender());
-//            }
-//
-//            Mage::helper('core')->copyFieldset('checkout_onepage_billing', 'to_customer', $billing, $customer);
-//
-//            $customer->setPassword($customer->decryptPassword($this->getQuote()->getPasswordHash()));
-//            $customer->setPasswordHash($customer->hashPassword($customer->getPassword()));
-//
-//            $this->getQuote()->setCustomer($customer);
-//            break;
-//
-//        default:
-//            $customer = Mage::getSingleton('customer/session')->getCustomer();
-//
-//            if (!$billing->getCustomerId() || $billing->getSaveInAddressBook()) {
-//                $customerBilling = $billing->exportCustomerAddress();
-//                $customer->addAddress($customerBilling);
-//            }
-//            if (!$this->getQuote()->isVirtual() &&
-//                ((!$shipping->getCustomerId() && !$shipping->getSameAsBilling()) ||
-//                (!$shipping->getSameAsBilling() && $shipping->getSaveInAddressBook()))) {
-//
-//                $customerShipping = $shipping->exportCustomerAddress();
-//                $customer->addAddress($customerShipping);
-//            }
-//            $customer->setSavedFromQuote(true);
-//            $customer->save();
-//
-//            $changed = false;
-//            if (isset($customerBilling) && !$customer->getDefaultBilling()) {
-//                $customer->setDefaultBilling($customerBilling->getId());
-//                $changed = true;
-//            }
-//            if (!$this->getQuote()->isVirtual() && isset($customerBilling) &&
-//                !$customer->getDefaultShipping() && $shipping->getSameAsBilling()) {
-//                $customer->setDefaultShipping($customerBilling->getId());
-//                $changed = true;
-//            }
-//            elseif (!$this->getQuote()->isVirtual() && isset($customerShipping) && !$customer->getDefaultShipping()){
-//                $customer->setDefaultShipping($customerShipping->getId());
-//                $changed = true;
-//            }
-//
-//            if ($changed) {
-//                $customer->save();
-//            }
-//        }
-//
-//        $this->getQuote()->reserveOrderId();
-//        $convertQuote = Mage::getModel('sales/convert_quote');
-//        /* @var $convertQuote Mage_Sales_Model_Convert_Quote */
-//        //$order = Mage::getModel('sales/order');
-//        if ($this->getQuote()->isVirtual()) {
-//            $order = $convertQuote->addressToOrder($billing);
-//        }
-//        else {
-//            $order = $convertQuote->addressToOrder($shipping);
-//        }
-//        /* @var $order Mage_Sales_Model_Order */
-//        $order->setBillingAddress($convertQuote->addressToOrderAddress($billing));
-//
-//        if (!$this->getQuote()->isVirtual()) {
-//            $order->setShippingAddress($convertQuote->addressToOrderAddress($shipping));
-//        }
-//
-//        $order->setPayment($convertQuote->paymentToOrderPayment($this->getQuote()->getPayment()));
-//
-//        foreach ($this->getQuote()->getAllItems() as $item) {
-//            $orderItem = $convertQuote->itemToOrderItem($item);
-//            if ($item->getParentItem()) {
-//                $orderItem->setParentItem($order->getItemByQuoteItemId($item->getParentItem()->getId()));
-//            }
-//            $order->addItem($orderItem);
-//        }
-//
-//        /**
-//         * We can use configuration data for declare new order status
-//         */
-//        Mage::dispatchEvent('checkout_type_onepage_save_order', array('order'=>$order, 'quote'=>$this->getQuote()));
-//        // check again, if customer exists
-//        if ($this->getQuote()->getCheckoutMethod() == Mage_Sales_Model_Quote::CHECKOUT_METHOD_REGISTER) {
-//            if ($this->_customerEmailExists($customer->getEmail(), Mage::app()->getWebsite()->getId())) {
-//                Mage::throwException($this->_customerEmailExistsMessage);
-//            }
-//        }
-//        $order->place();
-//
-//        if ($this->getQuote()->getCheckoutMethod()==Mage_Sales_Model_Quote::CHECKOUT_METHOD_REGISTER) {
-//            $customer->save();
-//            $customerBillingId = $customerBilling->getId();
-//            if (!$this->getQuote()->isVirtual()) {
-//                $customerShippingId = isset($customerShipping) ? $customerShipping->getId() : $customerBillingId;
-//                $customer->setDefaultShipping($customerShippingId);
-//            }
-//            $customer->setDefaultBilling($customerBillingId);
-//            $customer->save();
-//
-//            $this->getQuote()->setCustomerId($customer->getId());
-//
-//            $order->setCustomerId($customer->getId());
-//            Mage::helper('core')->copyFieldset('customer_account', 'to_order', $customer, $order);
-//
-//            $billing->setCustomerId($customer->getId())->setCustomerAddressId($customerBillingId);
-//            if (!$this->getQuote()->isVirtual()) {
-//                $shipping->setCustomerId($customer->getId())->setCustomerAddressId($customerShippingId);
-//            }
-//
-//            try {
-//                if ($customer->isConfirmationRequired()) {
-//                    $customer->sendNewAccountEmail('confirmation');
-//                }
-//                else {
-//                    $customer->sendNewAccountEmail();
-//                }
-//            } catch (Exception $e) {
-//                Mage::logException($e);
-//            }
-//        }
-//
-//        /**
-//         * a flag to set that there will be redirect to third party after confirmation
-//         * eg: paypal standard ipn
-//         */
-//        $redirectUrl = $this->getQuote()->getPayment()->getOrderPlaceRedirectUrl();
-//        if(!$redirectUrl){
-//            $order->setEmailSent(true);
-//        }
-//
-//        $order->save();
-//
-//        Mage::dispatchEvent('checkout_type_onepage_save_order_after',
-//            array('order'=>$order, 'quote'=>$this->getQuote()));
-//
-//        /**
-//         * need to have somelogic to set order as new status to make sure order is not finished yet
-//         * quote will be still active when we send the customer to paypal
-//         */
-//
-//        $orderId = $order->getIncrementId();
-//        $this->getCheckout()->setLastQuoteId($this->getQuote()->getId());
-//        $this->getCheckout()->setLastOrderId($order->getId());
-//        $this->getCheckout()->setLastRealOrderId($order->getIncrementId());
-//        $this->getCheckout()->setRedirectUrl($redirectUrl);
-//
-//        /**
-//         * we only want to send to customer about new order when there is no redirect to third party
-//         */
-//        if(!$redirectUrl){
-//            try {
-//                $order->sendNewOrderEmail();
-//            } catch (Exception $e) {
-//                Mage::logException($e);
-//            }
-//        }
-//
-//        if ($this->getQuote()->getCheckoutMethod(true)==Mage_Sales_Model_Quote::CHECKOUT_METHOD_REGISTER
-//            && !Mage::getSingleton('customer/session')->isLoggedIn()) {
-//            /**
-//             * we need to save quote here to have it saved with Customer Id.
-//             * so when loginById() executes checkout/session method loadCustomerQuote
-//             * it would not create new quotes and merge it with old one.
-//             */
-//            $this->getQuote()->save();
-//            if ($customer->isConfirmationRequired()) {
-//                Mage::getSingleton('checkout/session')->addSuccess(Mage::helper('customer')->__('Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href="%s">click here</a>.', Mage::helper('customer')->getEmailConfirmationUrl($customer->getEmail())));
-//            }
-//            else {
-//                Mage::getSingleton('customer/session')->loginById($customer->getId());
-//            }
-//        }
-//
-//        //Setting this one more time like control flag that we haves saved order
-//        //Must be checkout on success page to show it or not.
-//        $this->getCheckout()->setLastSuccessQuoteId($this->getQuote()->getId());
-//
-//        $this->getQuote()->setIsActive(false);
-//        $this->getQuote()->save();
-//
-//        return $this;
-//    }
-//
 }
diff --git a/app/code/core/Mage/Checkout/controllers/CartController.php b/app/code/core/Mage/Checkout/controllers/CartController.php
index 8745dd6f652..8c159ea2e29 100644
--- a/app/code/core/Mage/Checkout/controllers/CartController.php
+++ b/app/code/core/Mage/Checkout/controllers/CartController.php
@@ -70,6 +70,7 @@ protected function _getQuote()
      * Set back redirect url to response
      *
      * @return Mage_Checkout_CartController
+     * @throws Mage_Exception
      */
     protected function _goBack()
     {
@@ -166,9 +167,16 @@ public function indexAction()
 
     /**
      * Add product to shopping cart action
+     *
+     * @return Mage_Core_Controller_Varien_Action
+     * @throws Exception
      */
     public function addAction()
     {
+        if (!$this->_validateFormKey()) {
+            $this->_goBack();
+            return;
+        }
         $cart   = $this->_getCart();
         $params = $this->getRequest()->getParams();
         try {
@@ -207,7 +215,7 @@ public function addAction()
             );
 
             if (!$this->_getSession()->getNoCartRedirect(true)) {
-                if (!$cart->getQuote()->getHasError()){
+                if (!$cart->getQuote()->getHasError()) {
                     $message = $this->__('%s was added to your shopping cart.', Mage::helper('core')->escapeHtml($product->getName()));
                     $this->_getSession()->addSuccess($message);
                 }
@@ -236,34 +244,41 @@ public function addAction()
         }
     }
 
+    /**
+     * Add products in group to shopping cart action
+     */
     public function addgroupAction()
     {
         $orderItemIds = $this->getRequest()->getParam('order_items', array());
-        if (is_array($orderItemIds)) {
-            $itemsCollection = Mage::getModel('sales/order_item')
-                ->getCollection()
-                ->addIdFilter($orderItemIds)
-                ->load();
-            /* @var $itemsCollection Mage_Sales_Model_Mysql4_Order_Item_Collection */
-            $cart = $this->_getCart();
-            foreach ($itemsCollection as $item) {
-                try {
-                    $cart->addOrderItem($item, 1);
-                } catch (Mage_Core_Exception $e) {
-                    if ($this->_getSession()->getUseNotice(true)) {
-                        $this->_getSession()->addNotice($e->getMessage());
-                    } else {
-                        $this->_getSession()->addError($e->getMessage());
-                    }
-                } catch (Exception $e) {
-                    $this->_getSession()->addException($e, $this->__('Cannot add the item to shopping cart.'));
-                    Mage::logException($e);
-                    $this->_goBack();
+
+        if (!is_array($orderItemIds) || !$this->_validateFormKey()) {
+            $this->_goBack();
+            return;
+        }
+
+        $itemsCollection = Mage::getModel('sales/order_item')
+            ->getCollection()
+            ->addIdFilter($orderItemIds)
+            ->load();
+        /* @var $itemsCollection Mage_Sales_Model_Mysql4_Order_Item_Collection */
+        $cart = $this->_getCart();
+        foreach ($itemsCollection as $item) {
+            try {
+                $cart->addOrderItem($item, 1);
+            } catch (Mage_Core_Exception $e) {
+                if ($this->_getSession()->getUseNotice(true)) {
+                    $this->_getSession()->addNotice($e->getMessage());
+                } else {
+                    $this->_getSession()->addError($e->getMessage());
                 }
+            } catch (Exception $e) {
+                $this->_getSession()->addException($e, $this->__('Cannot add the item to shopping cart.'));
+                Mage::logException($e);
+                $this->_goBack();
             }
-            $cart->save();
-            $this->_getSession()->setCartWasUpdated(true);
         }
+        $cart->save();
+        $this->_getSession()->setCartWasUpdated(true);
         $this->_goBack();
     }
 
@@ -347,8 +362,8 @@ public function updateItemOptionsAction()
                 array('item' => $item, 'request' => $this->getRequest(), 'response' => $this->getResponse())
             );
             if (!$this->_getSession()->getNoCartRedirect(true)) {
-                if (!$cart->getQuote()->getHasError()){
-                    $message = $this->__('%s was updated in your shopping cart.', Mage::helper('core')->htmlEscape($item->getProduct()->getName()));
+                if (!$cart->getQuote()->getHasError()) {
+                    $message = $this->__('%s was updated in your shopping cart.', Mage::helper('core')->escapeHtml($item->getProduct()->getName()));
                     $this->_getSession()->addSuccess($message);
                 }
                 $this->_goBack();
@@ -487,6 +502,11 @@ public function estimatePostAction()
         $this->_goBack();
     }
 
+    /**
+     * Estimate update action
+     *
+     * @return null
+     */
     public function estimateUpdatePostAction()
     {
         $code = (string) $this->getRequest()->getParam('estimate_method');
@@ -521,20 +541,22 @@ public function couponPostAction()
         }
 
         try {
+            $codeLength = strlen($couponCode);
+            $isCodeLengthValid = $codeLength && $codeLength <= Mage_Checkout_Helper_Cart::COUPON_CODE_MAX_LENGTH;
+
             $this->_getQuote()->getShippingAddress()->setCollectShippingRates(true);
-            $this->_getQuote()->setCouponCode(strlen($couponCode) ? $couponCode : '')
+            $this->_getQuote()->setCouponCode($isCodeLengthValid ? $couponCode : '')
                 ->collectTotals()
                 ->save();
 
-            if (strlen($couponCode)) {
-                if ($couponCode == $this->_getQuote()->getCouponCode()) {
+            if ($codeLength) {
+                if ($isCodeLengthValid && $couponCode == $this->_getQuote()->getCouponCode()) {
                     $this->_getSession()->addSuccess(
-                        $this->__('Coupon code "%s" was applied.', Mage::helper('core')->htmlEscape($couponCode))
+                        $this->__('Coupon code "%s" was applied.', Mage::helper('core')->escapeHtml($couponCode))
                     );
-                }
-                else {
+                } else {
                     $this->_getSession()->addError(
-                        $this->__('Coupon code "%s" is not valid.', Mage::helper('core')->htmlEscape($couponCode))
+                        $this->__('Coupon code "%s" is not valid.', Mage::helper('core')->escapeHtml($couponCode))
                     );
                 }
             } else {
diff --git a/app/code/core/Mage/Checkout/controllers/MultishippingController.php b/app/code/core/Mage/Checkout/controllers/MultishippingController.php
index 71ee416bf84..5916134942b 100644
--- a/app/code/core/Mage/Checkout/controllers/MultishippingController.php
+++ b/app/code/core/Mage/Checkout/controllers/MultishippingController.php
@@ -388,26 +388,6 @@ public function billingAction()
         $this->renderLayout();
     }
 
-//    public function billingPostAction()
-//    {
-//        if(!$this->_validateBilling()) {
-//            return;
-//        }
-//
-//        $payment = $this->getRequest()->getPost('payment');
-//        try {
-//            $this->_getCheckout()->setPaymentMethod($payment);
-//            $this->_getState()->setActiveStep(
-//                Mage_Checkout_Model_Type_Multishipping_State::STEP_OVERVIEW
-//            );
-//            $this->_redirect('*/*/overview');
-//        }
-//        catch (Exception $e) {
-//            $this->_getCheckoutSession()->addError($e->getMessage());
-//            $this->_redirect('*/*/billing');
-//        }
-//    }
-
     /**
      * Validation of selecting of billing address
      *
@@ -445,7 +425,12 @@ public function overviewAction()
         $this->_getState()->setActiveStep(Mage_Checkout_Model_Type_Multishipping_State::STEP_OVERVIEW);
 
         try {
-            $payment = $this->getRequest()->getPost('payment');
+            $payment = $this->getRequest()->getPost('payment', array());
+            $payment['checks'] = Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_MULTISHIPPING
+                | Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_COUNTRY
+                | Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_CURRENCY
+                | Mage_Payment_Model_Method_Abstract::CHECK_ORDER_TOTAL_MIN_MAX
+                | Mage_Payment_Model_Method_Abstract::CHECK_ZERO_TOTAL;
             $this->_getCheckout()->setPaymentMethod($payment);
 
             $this->_getState()->setCompleteStep(
diff --git a/app/code/core/Mage/Checkout/controllers/OnepageController.php b/app/code/core/Mage/Checkout/controllers/OnepageController.php
index e90b59eee10..5fe661a6989 100644
--- a/app/code/core/Mage/Checkout/controllers/OnepageController.php
+++ b/app/code/core/Mage/Checkout/controllers/OnepageController.php
@@ -24,19 +24,34 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-
+/**
+ * Onepage controller for checkout
+ *
+ * @category    Mage
+ * @package     Mage_Checkout
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
 class Mage_Checkout_OnepageController extends Mage_Checkout_Controller_Action
 {
+    /**
+     * List of functions for section update
+     *
+     * @var array
+     */
     protected $_sectionUpdateFunctions = array(
         'payment-method'  => '_getPaymentMethodsHtml',
         'shipping-method' => '_getShippingMethodsHtml',
         'review'          => '_getReviewHtml',
     );
 
-    /** @var Mage_Sales_Model_Order */
+    /**
+     * @var Mage_Sales_Model_Order
+     */
     protected $_order;
 
     /**
+     * Predispatch: should set layout area
+     *
      * @return Mage_Checkout_OnepageController
      */
     public function preDispatch()
@@ -50,7 +65,7 @@ public function preDispatch()
             $checkoutSessionQuote->removeAllAddresses();
         }
 
-        if(!$this->_canShowForUnregisteredUsers()){
+        if (!$this->_canShowForUnregisteredUsers()) {
             $this->norouteAction();
             $this->setFlag('',self::FLAG_NO_DISPATCH,true);
             return;
@@ -59,6 +74,11 @@ public function preDispatch()
         return $this;
     }
 
+    /**
+     * Send Ajax redirect response
+     *
+     * @return Mage_Checkout_OnepageController
+     */
     protected function _ajaxRedirectResponse()
     {
         $this->getResponse()
@@ -77,17 +97,18 @@ protected function _expireAjax()
     {
         if (!$this->getOnepage()->getQuote()->hasItems()
             || $this->getOnepage()->getQuote()->getHasError()
-            || $this->getOnepage()->getQuote()->getIsMultiShipping()) {
+            || $this->getOnepage()->getQuote()->getIsMultiShipping()
+        ) {
             $this->_ajaxRedirectResponse();
             return true;
         }
         $action = $this->getRequest()->getActionName();
         if (Mage::getSingleton('checkout/session')->getCartWasUpdated(true)
-            && !in_array($action, array('index', 'progress'))) {
+            && !in_array($action, array('index', 'progress'))
+        ) {
             $this->_ajaxRedirectResponse();
             return true;
         }
-
         return false;
     }
 
@@ -123,6 +144,12 @@ protected function _getPaymentMethodsHtml()
         return $output;
     }
 
+    /**
+     * Return block content from the 'checkout_onepage_additional'
+     * This is the additional content for shipping method
+     *
+     * @return string
+     */
     protected function _getAdditionalHtml()
     {
         $layout = $this->getLayout();
@@ -180,7 +207,7 @@ public function indexAction()
             return;
         }
         Mage::getSingleton('checkout/session')->setCartWasUpdated(false);
-        Mage::getSingleton('customer/session')->setBeforeAuthUrl(Mage::getUrl('*/*/*', array('_secure'=>true)));
+        Mage::getSingleton('customer/session')->setBeforeAuthUrl(Mage::getUrl('*/*/*', array('_secure' => true)));
         $this->getOnepage()->initCheckout();
         $this->loadLayout();
         $this->_initLayoutMessages('customer/session');
@@ -189,17 +216,38 @@ public function indexAction()
     }
 
     /**
-     * Checkout status block
+     * Refreshes the previous step
+     * Loads the block corresponding to the current step and sets it
+     * in to the response body
+     *
+     * This function is called from the reloadProgessBlock
+     * function from the javascript
+     *
+     * @return string|null
      */
     public function progressAction()
     {
-        if ($this->_expireAjax()) {
-            return;
+        // previous step should never be null. We always start with billing and go forward
+        $prevStep = $this->getRequest()->getParam('prevStep', false);
+
+        if ($this->_expireAjax() || !$prevStep) {
+            return null;
         }
-        $this->loadLayout(false);
-        $this->renderLayout();
+
+        $layout = $this->getLayout();
+        $update = $layout->getUpdate();
+        /* Load the block belonging to the current step*/
+        $update->load('checkout_onepage_progress_' . $prevStep);
+        $layout->generateXml();
+        $layout->generateBlocks();
+        $output = $layout->getOutput();
+        $this->getResponse()->setBody($output);
+        return $output;
     }
 
+    /**
+     * Shipping method action
+     */
     public function shippingMethodAction()
     {
         if ($this->_expireAjax()) {
@@ -209,6 +257,9 @@ public function shippingMethodAction()
         $this->renderLayout();
     }
 
+    /**
+     * Review page action
+     */
     public function reviewAction()
     {
         if ($this->_expireAjax()) {
@@ -244,6 +295,9 @@ public function successAction()
         $this->renderLayout();
     }
 
+    /**
+     * Failure action
+     */
     public function failureAction()
     {
         $lastQuoteId = $this->getOnepage()->getCheckout()->getLastQuoteId();
@@ -259,6 +313,9 @@ public function failureAction()
     }
 
 
+    /**
+     * Get additional info action
+     */
     public function getAdditionalAction()
     {
         $this->getResponse()->setBody($this->_getAdditionalHtml());
@@ -301,7 +358,7 @@ public function saveMethodAction()
     }
 
     /**
-     * save checkout billing address
+     * Save checkout billing address
      */
     public function saveBillingAction()
     {
@@ -309,8 +366,6 @@ public function saveBillingAction()
             return;
         }
         if ($this->getRequest()->isPost()) {
-//            $postData = $this->getRequest()->getPost('billing', array());
-//            $data = $this->_filterPostData($postData);
             $data = $this->getRequest()->getPost('billing', array());
             $customerAddressId = $this->getRequest()->getPost('billing_address_id', false);
 
@@ -320,7 +375,6 @@ public function saveBillingAction()
             $result = $this->getOnepage()->saveBilling($data, $customerAddressId);
 
             if (!isset($result['error'])) {
-                /* check quote for virtual */
                 if ($this->getOnepage()->getQuote()->isVirtual()) {
                     $result['goto_section'] = 'payment';
                     $result['update_section'] = array(
@@ -380,13 +434,13 @@ public function saveShippingMethodAction()
         if ($this->getRequest()->isPost()) {
             $data = $this->getRequest()->getPost('shipping_method', '');
             $result = $this->getOnepage()->saveShippingMethod($data);
-            /*
-            $result will have erro data if shipping method is empty
-            */
-            if(!$result) {
-                Mage::dispatchEvent('checkout_controller_onepage_save_shipping_method',
-                        array('request'=>$this->getRequest(),
-                            'quote'=>$this->getOnepage()->getQuote()));
+            // $result will contain error data if shipping method is empty
+            if (!$result) {
+                Mage::dispatchEvent(
+                    'checkout_controller_onepage_save_shipping_method',
+                     array(
+                          'request' => $this->getRequest(),
+                          'quote'   => $this->getOnepage()->getQuote()));
                 $this->getOnepage()->getQuote()->collectTotals();
                 $this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
 
@@ -417,8 +471,6 @@ public function savePaymentAction()
                 return;
             }
 
-            // set payment to quote
-            $result = array();
             $data = $this->getRequest()->getPost('payment', array());
             $result = $this->getOnepage()->savePayment($data);
 
@@ -452,6 +504,7 @@ public function savePaymentAction()
     /**
      * Get Order by quoteId
      *
+     * @throws Mage_Payment_Model_Info_Exception
      * @return Mage_Sales_Model_Order
      */
     protected function _getOrder()
@@ -489,15 +542,22 @@ protected function _initInvoice()
      */
     public function saveOrderAction()
     {
+        if (!$this->_validateFormKey()) {
+            $this->_redirect('*/*');
+            return;
+        }
+
         if ($this->_expireAjax()) {
             return;
         }
 
         $result = array();
         try {
-            if ($requiredAgreements = Mage::helper('checkout')->getRequiredAgreementIds()) {
+            $requiredAgreements = Mage::helper('checkout')->getRequiredAgreementIds();
+            if ($requiredAgreements) {
                 $postedAgreements = array_keys($this->getRequest()->getPost('agreement', array()));
-                if ($diff = array_diff($requiredAgreements, $postedAgreements)) {
+                $diff = array_diff($requiredAgreements, $postedAgreements);
+                if ($diff) {
                     $result['success'] = false;
                     $result['error'] = true;
                     $result['error_messages'] = $this->__('Please agree to all the terms and conditions before placing the order.');
@@ -505,9 +565,17 @@ public function saveOrderAction()
                     return;
                 }
             }
-            if ($data = $this->getRequest()->getPost('payment', false)) {
+
+            $data = $this->getRequest()->getPost('payment', array());
+            if ($data) {
+                $data['checks'] = Mage_Payment_Model_Method_Abstract::CHECK_USE_CHECKOUT
+                    | Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_COUNTRY
+                    | Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_CURRENCY
+                    | Mage_Payment_Model_Method_Abstract::CHECK_ORDER_TOTAL_MIN_MAX
+                    | Mage_Payment_Model_Method_Abstract::CHECK_ZERO_TOTAL;
                 $this->getOnepage()->getQuote()->getPayment()->importData($data);
             }
+
             $this->getOnepage()->saveOrder();
 
             $redirectUrl = $this->getOnepage()->getCheckout()->getRedirectUrl();
@@ -515,7 +583,7 @@ public function saveOrderAction()
             $result['error']   = false;
         } catch (Mage_Payment_Model_Info_Exception $e) {
             $message = $e->getMessage();
-            if( !empty($message) ) {
+            if (!empty($message)) {
                 $result['error_messages'] = $message;
             }
             $result['goto_section'] = 'payment';
@@ -530,12 +598,13 @@ public function saveOrderAction()
             $result['error'] = true;
             $result['error_messages'] = $e->getMessage();
 
-            if ($gotoSection = $this->getOnepage()->getCheckout()->getGotoSection()) {
+            $gotoSection = $this->getOnepage()->getCheckout()->getGotoSection();
+            if ($gotoSection) {
                 $result['goto_section'] = $gotoSection;
                 $this->getOnepage()->getCheckout()->setGotoSection(null);
             }
-
-            if ($updateSection = $this->getOnepage()->getCheckout()->getUpdateSection()) {
+            $updateSection = $this->getOnepage()->getCheckout()->getUpdateSection();
+            if ($updateSection) {
                 if (isset($this->_sectionUpdateFunctions[$updateSection])) {
                     $updateSectionFunction = $this->_sectionUpdateFunctions[$updateSection];
                     $result['update_section'] = array(
diff --git a/app/code/core/Mage/Checkout/etc/wsdl.xml b/app/code/core/Mage/Checkout/etc/wsdl.xml
index 0491ffdfbb3..44c68694234 100644
--- a/app/code/core/Mage/Checkout/etc/wsdl.xml
+++ b/app/code/core/Mage/Checkout/etc/wsdl.xml
@@ -314,13 +314,20 @@
                     <element name="cc_exp_month" type="xsd:string" minOccurs="0"/>
                 </all>
             </complexType>
-            <complexType name="shoppingCartPaymentMethodResponseEntityArray">
+            <complexType name="shoppingCartPaymentMethodResponseEntity">
                 <all>
                     <element name="code" type="xsd:string"/>
                     <element name="title" type="xsd:string"/>
                     <element name="cc_types" type="typens:associativeArray"/>
                 </all>
             </complexType>
+            <complexType name="shoppingCartPaymentMethodResponseEntityArray">
+                <complexContent>
+                    <restriction base="soapenc:Array">
+                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:shoppingCartPaymentMethodResponseEntity[]"/>
+                    </restriction>
+                </complexContent>
+            </complexType>
         </schema>
     </types>
     <message name="shoppingCartCreateRequest">
@@ -454,7 +461,7 @@
     <message name="shoppingCartPaymentListRequest">
         <part name="sessionId" type="xsd:string"/>
         <part name="quoteId" type="xsd:int"/>
-        <part name="storeId" type="xsd:string"/>
+        <part name="store" type="xsd:string"/>
     </message>
     <message name="shoppingCartPaymentListResponse">
         <part name="result" type="typens:shoppingCartPaymentMethodResponseEntityArray"/>
diff --git a/app/code/core/Mage/Checkout/etc/wsi.xml b/app/code/core/Mage/Checkout/etc/wsi.xml
index 066af05eb2b..c1ed1325c54 100644
--- a/app/code/core/Mage/Checkout/etc/wsi.xml
+++ b/app/code/core/Mage/Checkout/etc/wsi.xml
@@ -300,15 +300,18 @@
                     <xsd:element name="cc_exp_month" type="xsd:string" minOccurs="0"/>
                 </xsd:sequence>
             </xsd:complexType>
-            <xsd:complexType name="shoppingCartPaymentMethodResponseEntityArray">
+            <xsd:complexType name="shoppingCartPaymentMethodResponseEntity">
                 <xsd:sequence>
                     <xsd:element name="code" type="xsd:string"/>
                     <xsd:element name="title" type="xsd:string"/>
                     <xsd:element name="cc_types" type="typens:associativeArray"/>
                 </xsd:sequence>
             </xsd:complexType>
-
-
+            <xsd:complexType name="shoppingCartPaymentMethodResponseEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:shoppingCartPaymentMethodResponseEntity"/>
+                </xsd:sequence>
+            </xsd:complexType>
             <xsd:element name="shoppingCartCreateRequestParam">
                 <xsd:complexType>
                     <xsd:sequence>
diff --git a/app/code/core/Mage/Cms/Block/Block.php b/app/code/core/Mage/Cms/Block/Block.php
index 41585621887..c0bb0c5f398 100644
--- a/app/code/core/Mage/Cms/Block/Block.php
+++ b/app/code/core/Mage/Cms/Block/Block.php
@@ -52,6 +52,7 @@ protected function _toHtml()
                 $helper = Mage::helper('cms');
                 $processor = $helper->getBlockTemplateProcessor();
                 $html = $processor->filter($block->getContent());
+                $this->addModelTags($block);
             }
         }
         return $html;
diff --git a/app/code/core/Mage/Cms/Block/Page.php b/app/code/core/Mage/Cms/Block/Page.php
index b1efe4df2cb..86662734841 100644
--- a/app/code/core/Mage/Cms/Block/Page.php
+++ b/app/code/core/Mage/Cms/Block/Page.php
@@ -49,6 +49,7 @@ public function getPage()
             } else {
                 $page = Mage::getSingleton('cms/page');
             }
+            $this->addModelTags($page);
             $this->setData('page', $page);
         }
         return $this->getData('page');
diff --git a/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php b/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php
index 84b154e40ac..23c74c0fb58 100644
--- a/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php
+++ b/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php
@@ -197,11 +197,11 @@ public function getImageHtmlDeclaration($filename, $renderAsTag = false)
     public function getCurrentPath()
     {
         if (!$this->_currentPath) {
-            $currentPath = $this->getStorageRoot();
-            $path = $this->_getRequest()->getParam($this->getTreeNodeName());
-            if ($path) {
-                $path = $this->convertIdToPath($path);
-                if (is_dir($path)) {
+            $currentPath = realpath($this->getStorageRoot());
+            $node = $this->_getRequest()->getParam($this->getTreeNodeName());
+            if ($node) {
+                $path = realpath($this->convertIdToPath($node));
+                if (is_dir($path) && false !== stripos($path, $currentPath)) {
                     $currentPath = $path;
                 }
             }
diff --git a/app/code/core/Mage/Cms/Model/Observer.php b/app/code/core/Mage/Cms/Model/Observer.php
index 4a8ed4c9811..61f8e80e565 100644
--- a/app/code/core/Mage/Cms/Model/Observer.php
+++ b/app/code/core/Mage/Cms/Model/Observer.php
@@ -73,5 +73,4 @@ public function noCookies(Varien_Event_Observer $observer)
         }
         return $this;
     }
-
 }
diff --git a/app/code/core/Mage/Contacts/etc/system.xml b/app/code/core/Mage/Contacts/etc/system.xml
index b74bccc5570..9c3f4154a1f 100644
--- a/app/code/core/Mage/Contacts/etc/system.xml
+++ b/app/code/core/Mage/Contacts/etc/system.xml
@@ -67,7 +67,7 @@
                         <recipient_email translate="label">
                             <label>Send Emails To</label>
                             <frontend_type>text</frontend_type>
-                            <validate>validate-email</validate>
+                            <validate>validate-email required-entry</validate>
                             <sort_order>10</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
diff --git a/app/code/core/Mage/Core/Block/Abstract.php b/app/code/core/Mage/Core/Block/Abstract.php
index dc92040a1d6..a92b794266b 100644
--- a/app/code/core/Mage/Core/Block/Abstract.php
+++ b/app/code/core/Mage/Core/Block/Abstract.php
@@ -24,7 +24,6 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-
 /**
  * Base Content Block class
  *
@@ -33,7 +32,7 @@
  *
  * @category   Mage
  * @package    Mage_Core
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @author     Magento Core Team <core@magentocommerce.com>
  */
 abstract class Mage_Core_Block_Abstract extends Varien_Object
 {
@@ -41,6 +40,12 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
      * Cache group Tag
      */
     const CACHE_GROUP = 'block_html';
+
+    /**
+     * Cache tags data key
+     */
+    const CACHE_TAGS_DATA_KEY = 'cache_tags';
+
     /**
      * Block name in layout
      *
@@ -163,6 +168,24 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
      */
     protected $_sortInstructions = array();
 
+    /**
+     * Factory instance
+     *
+     * @var Mage_Core_Model_Factory
+     */
+    protected $_factory;
+
+    /**
+     * Initialize factory instance
+     *
+     * @param array $args
+     */
+    public function __construct(array $args = array())
+    {
+        $this->_factory = !empty($args['core_factory']) ? $args['core_factory'] : Mage::getSingleton('core/factory');
+        parent::__construct($args);
+    }
+
     /**
      * Internal constructor, that is called from real constructor
      *
@@ -1138,6 +1161,19 @@ public function escapeUrl($data)
         return $this->helper('core')->escapeUrl($data);
     }
 
+    /**
+     * Escape quotes inside html attributes
+     * Use $addSlashes = false for escaping js that inside html attribute (onClick, onSubmit etc)
+     *
+     * @param  string $data
+     * @param  bool $addSlashes
+     * @return string
+     */
+    public function quoteEscape($data, $addSlashes = false)
+    {
+        return $this->helper('core')->quoteEscape($data, $addSlashes);
+    }
+
     /**
      * Escape quotes in java scripts
      *
@@ -1241,15 +1277,50 @@ public function getCacheKey()
      */
     public function getCacheTags()
     {
-        if (!$this->hasData('cache_tags')) {
-            $tags = array();
-        } else {
-            $tags = $this->getData('cache_tags');
+        $tagsCache = Mage::app()->loadCache($this->_getTagsCacheKey());
+        if ($tagsCache) {
+            $tags = json_decode($tagsCache);
         }
-        $tags[] = self::CACHE_GROUP;
-        return $tags;
+        if (!isset($tags) || !is_array($tags) || empty($tags)) {
+            $tags = !$this->hasData(self::CACHE_TAGS_DATA_KEY) ? array() : $this->getData(self::CACHE_TAGS_DATA_KEY);
+            if (!in_array(self::CACHE_GROUP, $tags)) {
+                $tags[] = self::CACHE_GROUP;
+            }
+        }
+        return array_unique($tags);
+    }
+
+    /**
+     * Add tag to block
+     *
+     * @param string|array $tag
+     * @return Mage_Core_Block_Abstract
+     */
+    public function addCacheTag($tag)
+    {
+        $tag = is_array($tag) ? $tag : array($tag);
+        $tags = !$this->hasData(self::CACHE_TAGS_DATA_KEY) ?
+            $tag : array_merge($this->getData(self::CACHE_TAGS_DATA_KEY), $tag);
+        $this->setData(self::CACHE_TAGS_DATA_KEY, $tags);
+        return $this;
+    }
+
+    /**
+     * Add tags from specified model to current block
+     *
+     * @param Mage_Core_Model_Abstract $model
+     * @return Mage_Core_Block_Abstract
+     */
+    public function addModelTags(Mage_Core_Model_Abstract $model)
+    {
+        $cacheTags = $model->getCacheIdTags();
+        if (false !== $cacheTags) {
+            $this->addCacheTag($cacheTags);
+        }
+        return $this;
     }
 
+
     /**
      * Get block cache life time
      *
@@ -1307,10 +1378,31 @@ protected function _saveCache($data)
             $data
         );
 
-        Mage::app()->saveCache($data, $cacheKey, $this->getCacheTags(), $this->getCacheLifetime());
+        $tags = $this->getCacheTags();
+
+        Mage::app()->saveCache($data, $cacheKey, $tags, $this->getCacheLifetime());
+        Mage::app()->saveCache(
+            json_encode($tags),
+            $this->_getTagsCacheKey($cacheKey),
+            $tags,
+            $this->getCacheLifetime()
+        );
         return $this;
     }
 
+    /**
+     * Get cache key for tags
+     *
+     * @param string $cacheKey
+     * @return string
+     */
+    protected function _getTagsCacheKey($cacheKey = null)
+    {
+        $cacheKey = !empty($cacheKey) ? $cacheKey : $this->getCacheKey();
+        $cacheKey = md5($cacheKey . '_tags');
+        return $cacheKey;
+    }
+
     /**
      * Get SID placeholder for cache
      *
@@ -1325,4 +1417,25 @@ protected function _getSidPlaceholder($cacheKey = null)
 
         return '<!--SID=' . $cacheKey . '-->';
     }
+
+    /**
+     * Collect and retrieve items tags.
+     * Item should implements Mage_Core_Model_Abstract::getCacheIdTags method
+     *
+     * @param array|Varien_Data_Collection $items
+     * @return array
+     */
+    public function getItemsTags($items)
+    {
+        $tags = array();
+        /** @var $item Mage_Core_Model_Abstract */
+        foreach($items as $item) {
+            $itemTags = $item->getCacheIdTags();
+            if (false === $itemTags) {
+                continue;
+            }
+            $tags = array_merge($tags, $itemTags);
+        }
+        return $tags;
+    }
 }
diff --git a/app/code/core/Mage/Core/Block/Html/Link.php b/app/code/core/Mage/Core/Block/Html/Link.php
index 5cac033c291..a6ee3549c20 100644
--- a/app/code/core/Mage/Core/Block/Html/Link.php
+++ b/app/code/core/Mage/Core/Block/Html/Link.php
@@ -64,7 +64,7 @@ public function getLinkAttributes()
         foreach ($allow as $attribute) {
             $value = $this->getDataUsingMethod($attribute);
             if (!is_null($value)) {
-                $attributes[$attribute] = $this->htmlEscape($value);
+                $attributes[$attribute] = $this->escapeHtml($value);
             }
         }
 
diff --git a/app/code/core/Mage/Core/Block/Messages.php b/app/code/core/Mage/Core/Block/Messages.php
index b3feda3d35c..0d8ab803c42 100644
--- a/app/code/core/Mage/Core/Block/Messages.php
+++ b/app/code/core/Mage/Core/Block/Messages.php
@@ -213,7 +213,7 @@ public function getHtml($type=null)
         $html = '<' . $this->_messagesFirstLevelTagName . ' id="admin_messages">';
         foreach ($this->getMessages($type) as $message) {
             $html.= '<' . $this->_messagesSecondLevelTagName . ' class="'.$message->getType().'-msg">'
-                . ($this->_escapeMessageFlag) ? $this->htmlEscape($message->getText()) : $message->getText()
+                . ($this->_escapeMessageFlag) ? $this->escapeHtml($message->getText()) : $message->getText()
                 . '</' . $this->_messagesSecondLevelTagName . '>';
         }
         $html .= '</' . $this->_messagesFirstLevelTagName . '>';
@@ -246,7 +246,7 @@ public function getGroupedHtml()
                 foreach ( $messages as $message ) {
                     $html.= '<' . $this->_messagesSecondLevelTagName . '>';
                     $html.= '<' . $this->_messagesContentWrapperTagName . '>';
-                    $html.= ($this->_escapeMessageFlag) ? $this->htmlEscape($message->getText()) : $message->getText();
+                    $html.= ($this->_escapeMessageFlag) ? $this->escapeHtml($message->getText()) : $message->getText();
                     $html.= '</' . $this->_messagesContentWrapperTagName . '>';
                     $html.= '</' . $this->_messagesSecondLevelTagName . '>';
                 }
diff --git a/app/code/core/Mage/Core/Controller/Varien/Action.php b/app/code/core/Mage/Core/Controller/Varien/Action.php
index 8f16e3c5e9a..ca289388586 100755
--- a/app/code/core/Mage/Core/Controller/Varien/Action.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Action.php
@@ -151,7 +151,7 @@ protected function _construct()
 
     public function hasAction($action)
     {
-        return is_callable(array($this, $this->getActionMethodName($action)));
+        return method_exists($this, $this->getActionMethodName($action));
     }
 
     /**
@@ -399,8 +399,7 @@ public function dispatch($action)
     {
         try {
             $actionMethodName = $this->getActionMethodName($action);
-
-            if (!is_callable(array($this, $actionMethodName))) {
+            if (!method_exists($this, $actionMethodName)) {
                 $actionMethodName = 'norouteAction';
             }
 
@@ -788,8 +787,6 @@ protected function _getRefererUrl()
             $refererUrl = Mage::helper('core')->urlDecode($url);
         }
 
-        $refererUrl = Mage::helper('core')->escapeUrl($refererUrl);
-
         if (!$this->_isUrlInternal($refererUrl)) {
             $refererUrl = Mage::app()->getStore()->getBaseUrl();
         }
diff --git a/app/code/core/Mage/Core/Controller/Varien/Front.php b/app/code/core/Mage/Core/Controller/Varien/Front.php
index 0bddf590e94..f0d7c47e146 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Front.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Front.php
@@ -161,19 +161,15 @@ public function dispatch()
         $this->_checkBaseUrl($request);
 
         $request->setPathInfo()->setDispatched(false);
-        if (!$request->isStraight()) {
-            Varien_Profiler::start('mage::dispatch::db_url_rewrite');
-            Mage::getModel('core/url_rewrite')->rewrite();
-            Varien_Profiler::stop('mage::dispatch::db_url_rewrite');
-        }
-        Varien_Profiler::start('mage::dispatch::config_url_rewrite');
-        $this->rewrite();
-        Varien_Profiler::stop('mage::dispatch::config_url_rewrite');
+
+        $this->_getRequestRewriteController()->rewrite();
+
         Varien_Profiler::start('mage::dispatch::routers_match');
         $i = 0;
-        while (!$request->isDispatched() && $i++<100) {
+        while (!$request->isDispatched() && $i++ < 100) {
             foreach ($this->_routers as $router) {
-                if ($router->match($this->getRequest())) {
+                /** @var $router Mage_Core_Controller_Varien_Router_Abstract */
+                if ($router->match($request)) {
                     break;
                 }
             }
@@ -191,6 +187,27 @@ public function dispatch()
         return $this;
     }
 
+    /**
+     * Returns request rewrite instance.
+     * Class name alias is declared in the configuration
+     *
+     * @return Mage_Core_Model_Url_Rewrite_Request
+     */
+    protected function _getRequestRewriteController()
+    {
+        $className = (string)Mage::getConfig()->getNode('global/request_rewrite/model');
+
+        return Mage::getSingleton('core/factory')->getModel($className, array(
+            'routers' => $this->getRouters(),
+        ));
+    }
+
+    /**
+     * Returns router instance by route name
+     *
+     * @param string $routeName
+     * @return Mage_Core_Controller_Varien_Router_Abstract
+     */
     public function getRouterByRoute($routeName)
     {
         // empty route supplied - return base url
@@ -237,6 +254,7 @@ public function getRouterByFrontName($frontName)
      * Apply configuration rewrites to current url
      *
      * @return Mage_Core_Controller_Varien_Front
+     * @deprecated since 1.7.0.2. Refactored and moved to Mage_Core_Controller_Request_Rewrite
      */
     public function rewrite()
     {
@@ -269,6 +287,7 @@ public function rewrite()
      *
      * @param   string $url
      * @return  string
+     * @deprecated since 1.7.0.2. Refactored and moved to Mage_Core_Controller_Request_Rewrite
      */
     protected function _processRewriteUrl($url)
     {
@@ -293,7 +312,7 @@ protected function _processRewriteUrl($url)
      */
     protected function _checkBaseUrl($request)
     {
-        if (!Mage::isInstalled() || $request->getPost()) {
+        if (!Mage::isInstalled() || $request->getPost() || strtolower($request->getMethod()) == 'post') {
             return;
         }
 
diff --git a/app/code/core/Mage/Core/Helper/Cookie.php b/app/code/core/Mage/Core/Helper/Cookie.php
index 17d5020a814..803cbffb0cb 100644
--- a/app/code/core/Mage/Core/Helper/Cookie.php
+++ b/app/code/core/Mage/Core/Helper/Cookie.php
@@ -48,6 +48,55 @@ class Mage_Core_Helper_Cookie extends Mage_Core_Helper_Abstract
      */
     const XML_PATH_COOKIE_RESTRICTION_LIFETIME = 'web/cookie/cookie_restriction_lifetime';
 
+    /**
+     * Store instance
+     *
+     * @var Mage_Core_Model_Store
+     */
+    protected $_currentStore;
+
+    /**
+     * Cookie instance
+     *
+     * @var Mage_Core_Model_Cookie
+     */
+    protected $_cookieModel;
+
+    /**
+     * Website instance
+     *
+     * @var Mage_Core_Model_Website
+     */
+    protected $_website;
+
+    /**
+     * Initializes store, cookie and website objects.
+     *
+     * @param array $data
+     * @throws InvalidArgumentException
+     */
+    public function __construct(array $data = array())
+    {
+        $this->_currentStore = isset($data['current_store']) ? $data['current_store'] : Mage::app()->getStore();
+
+        if (!$this->_currentStore instanceof Mage_Core_Model_Store) {
+            throw new InvalidArgumentException('Required store object is invalid');
+        }
+
+        $this->_cookieModel = isset($data['cookie_model'])
+            ? $data['cookie_model'] : Mage::getSingleton('core/cookie');
+
+        if (!$this->_cookieModel instanceof Mage_Core_Model_Cookie) {
+            throw new InvalidArgumentException('Required cookie object is invalid');
+        }
+
+        $this->_website = isset($data['website']) ? $data['website'] : Mage::app()->getWebsite();
+
+        if (!$this->_website instanceof Mage_Core_Model_Website) {
+            throw new InvalidArgumentException('Required website object is invalid');
+        }
+    }
+
     /**
      * Check if cookie restriction notice should be displayed
      *
@@ -56,20 +105,20 @@ class Mage_Core_Helper_Cookie extends Mage_Core_Helper_Abstract
     public function isUserNotAllowSaveCookie()
     {
         $acceptedSaveCookiesWebsites = $this->_getAcceptedSaveCookiesWebsites();
-        return Mage::getStoreConfig(self::XML_PATH_COOKIE_RESTRICTION) &&
-            empty($acceptedSaveCookiesWebsites[Mage::app()->getWebsite()->getId()]);
+        return $this->_currentStore->getConfig(self::XML_PATH_COOKIE_RESTRICTION) &&
+            empty($acceptedSaveCookiesWebsites[$this->_website->getId()]);
     }
 
     /**
-     * Return serialzed list of accepted save cookie website
+     * Return serialized list of accepted save cookie website
      *
      * @return string
      */
     public function getAcceptedSaveCookiesWebsiteIds()
     {
         $acceptedSaveCookiesWebsites = $this->_getAcceptedSaveCookiesWebsites();
-        $acceptedSaveCookiesWebsites[Mage::app()->getWebsite()->getId()] = 1;
-        return serialize($acceptedSaveCookiesWebsites);
+        $acceptedSaveCookiesWebsites[$this->_website->getId()] = 1;
+        return json_encode($acceptedSaveCookiesWebsites);
     }
 
     /**
@@ -79,8 +128,8 @@ public function getAcceptedSaveCookiesWebsiteIds()
      */
     protected function _getAcceptedSaveCookiesWebsites()
     {
-        $serializedList = Mage::getSingleton('core/cookie')->get(self::IS_USER_ALLOWED_SAVE_COOKIE);
-        $unSerializedList = unserialize($serializedList);
+        $serializedList = $this->_cookieModel->get(self::IS_USER_ALLOWED_SAVE_COOKIE);
+        $unSerializedList = json_decode($serializedList, true);
         return is_array($unSerializedList) ? $unSerializedList : array();
     }
 
@@ -91,6 +140,6 @@ protected function _getAcceptedSaveCookiesWebsites()
      */
     public function getCookieRestrictionLifetime()
     {
-        return (int)Mage::getStoreConfig(self::XML_PATH_COOKIE_RESTRICTION_LIFETIME);
+        return (int)$this->_currentStore->getConfig(self::XML_PATH_COOKIE_RESTRICTION_LIFETIME);
     }
 }
diff --git a/app/code/core/Mage/Core/Helper/Url.php b/app/code/core/Mage/Core/Helper/Url.php
index 2fd8608a134..0181a25d592 100644
--- a/app/code/core/Mage/Core/Helper/Url.php
+++ b/app/code/core/Mage/Core/Helper/Url.php
@@ -65,7 +65,13 @@ public function getCurrentBase64Url()
         return $this->urlEncode($this->getCurrentUrl());
     }
 
-    public function getEncodedUrl($url=null)
+    /**
+     * Return encoded url
+     *
+     * @param null|string $url
+     * @return string
+     */
+    public function getEncodedUrl($url = null)
     {
         if (!$url) {
             $url = $this->getCurrentUrl();
@@ -83,6 +89,12 @@ public function getHomeUrl()
         return Mage::getBaseUrl();
     }
 
+    /**
+     * Formatting string
+     *
+     * @param string $string
+     * @return string
+     */
     protected function _prepareString($string)
     {
         $string = preg_replace('#[^0-9a-z]+#i', '-', $string);
@@ -104,7 +116,7 @@ public function addRequestParam($url, $param)
         $startDelimiter = (false === strpos($url,'?'))? '?' : '&';
 
         $arrQueryParams = array();
-        foreach($param as $key=>$value) {
+        foreach ($param as $key => $value) {
             if (is_numeric($key) || is_object($value)) {
                 continue;
             }
@@ -128,6 +140,7 @@ public function addRequestParam($url, $param)
      *
      * @param string $url
      * @param string $paramKey
+     * @param boolean $caseSensitive
      * @return string
      */
     public function removeRequestParam($url, $paramKey, $caseSensitive = false)
@@ -143,4 +156,16 @@ public function removeRequestParam($url, $paramKey, $caseSensitive = false)
         }
         return $url;
     }
+
+    /**
+     * Return singleton model instance
+     *
+     * @param string $name
+     * @param array $arguments
+     * @return Mage_Core_Model_Abstract
+     */
+    protected function _getSingletonModel($name, $arguments = array())
+    {
+        return Mage::getSingleton($name, $arguments);
+    }
 }
diff --git a/app/code/core/Mage/Core/Helper/Url/Rewrite.php b/app/code/core/Mage/Core/Helper/Url/Rewrite.php
index 4974cca38b0..e70617bc2ff 100644
--- a/app/code/core/Mage/Core/Helper/Url/Rewrite.php
+++ b/app/code/core/Mage/Core/Helper/Url/Rewrite.php
@@ -33,26 +33,45 @@
  */
 class Mage_Core_Helper_Url_Rewrite extends Mage_Core_Helper_Abstract
 {
-    /**
+    /**#@+
      * Validation error constants
      */
     const VERR_MANYSLASHES = 1; // Too many slashes in a row of request path, e.g. '///foo//'
     const VERR_ANCHOR = 2;      // Anchor is not supported in request path, e.g. 'foo#bar'
+    /**#@-*/
+
+    /**
+     * Allowed request path length
+     */
+    const TARGET_PATH_ALLOWED_LENGTH = 255;
 
     /**
      * Core func to validate request path
      * If something is wrong with a path it throws localized error message and error code,
      * that can be checked to by wrapper func to alternate error message
      *
+     * @throws Mage_Core_Exception
+     * @param string $requestPath
      * @return bool
      */
     protected function _validateRequestPath($requestPath)
     {
+        if (strlen($requestPath) > self::TARGET_PATH_ALLOWED_LENGTH) {
+            throw new Mage_Core_Exception(
+                $this->__('Request path length exceeds allowed %s symbols.', self::TARGET_PATH_ALLOWED_LENGTH)
+            );
+        }
         if (strpos($requestPath, '//') !== false) {
-            throw new Exception($this->__('Two and more slashes together are not permitted in request path'), self::VERR_MANYSLASHES);
+            throw new Mage_Core_Exception(
+                $this->__('Two and more slashes together are not permitted in request path'),
+                self::VERR_MANYSLASHES
+            );
         }
         if (strpos($requestPath, '#') !== false) {
-            throw new Exception($this->__('Anchor symbol (#) is not supported in request path'), self::VERR_ANCHOR);
+            throw new Mage_Core_Exception(
+                $this->__('Anchor symbol (#) is not supported in request path'),
+                self::VERR_ANCHOR
+            );
         }
         return true;
     }
@@ -61,15 +80,12 @@ protected function _validateRequestPath($requestPath)
      * Validates request path
      * Either returns TRUE (success) or throws error (validation failed)
      *
+     * @param string $requestPath
      * @return bool
      */
     public function validateRequestPath($requestPath)
     {
-        try {
-            $this->_validateRequestPath($requestPath);
-        } catch (Exception $e) {
-            Mage::throwException($e->getMessage());
-        }
+        $this->_validateRequestPath($requestPath);
         return true;
     }
 
@@ -77,6 +93,8 @@ public function validateRequestPath($requestPath)
      * Validates suffix for url rewrites to inform user about errors in it
      * Either returns TRUE (success) or throws error (validation failed)
      *
+     * @throws Mage_Core_Exception|Exception
+     * @param string $suffix
      * @return bool
      */
     public function validateSuffix($suffix)
@@ -87,10 +105,11 @@ public function validateSuffix($suffix)
             // Make message saying about suffix, not request path
             switch ($e->getCode()) {
                 case self::VERR_MANYSLASHES:
-                    Mage::throwException($this->__('Two and more slashes together are not permitted in url rewrite suffix'));
+                    throw new Mage_Core_Exception($this->__('Two and more slashes together are not permitted in url rewrite suffix'));
                 case self::VERR_ANCHOR:
-                    Mage::throwException($this->__('Anchor symbol (#) is not supported in url rewrite suffix'));
+                    throw new Mage_Core_Exception($this->__('Anchor symbol (#) is not supported in url rewrite suffix'));
             }
+            throw $e;
         }
         return true;
     }
diff --git a/app/code/core/Mage/Core/Model/Abstract.php b/app/code/core/Mage/Core/Model/Abstract.php
index d38f7064382..4511af146c7 100644
--- a/app/code/core/Mage/Core/Model/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Abstract.php
@@ -422,7 +422,7 @@ public function getCacheTags()
     /**
      * Get cahce tags associated with object id
      *
-     * @return array
+     * @return array|bool
      */
     public function getCacheIdTags()
     {
diff --git a/app/code/core/Mage/Core/Model/App/Emulation.php b/app/code/core/Mage/Core/Model/App/Emulation.php
index ac1adda9104..b2399d308c8 100644
--- a/app/code/core/Mage/Core/Model/App/Emulation.php
+++ b/app/code/core/Mage/Core/Model/App/Emulation.php
@@ -34,29 +34,57 @@
 class Mage_Core_Model_App_Emulation extends Varien_Object
 {
     /**
-     * Start enviromment emulation of the specified store
+     * Factory instance
+     *
+     * @var Mage_Core_Model_Factory
+     */
+    protected $_factory;
+
+    /**
+     * Application instance
+     *
+     * @var Mage_Core_Model_App
+     */
+    protected $_app;
+
+    /**
+     * Constructor
+     *
+     * @param array $args
+     */
+    public function __construct(array $args = array())
+    {
+        $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('core/factory');
+        $this->_app = !empty($args['app']) ? $args['app'] : Mage::app();
+        unset($args['factory'], $args['app']);
+        parent::__construct($args);
+    }
+
+    /**
+     * Start environment emulation of the specified store
      *
      * Function returns information about initial store environment and emulates environment of another store
      *
      * @param integer $storeId
      * @param string $area
-     * @param boolean $emulateSroreInlineTranslation emulate inline translation of the specified store or just disable it
+     * @param boolean $emulateStoreInlineTranslation emulate inline translation of the specified store or just disable it
      *
      * @return Varien_Object information about environment of the initial store
      */
-    public function startEnvironmentEmulation($storeId, $area = Mage_Core_Model_App_Area::AREA_FRONTEND, $emulateSroreInlineTranslation = false)
+    public function startEnvironmentEmulation($storeId, $area = Mage_Core_Model_App_Area::AREA_FRONTEND,
+                                              $emulateStoreInlineTranslation = false)
     {
         if (is_null($area)) {
             $area = Mage_Core_Model_App_Area::AREA_FRONTEND;
         }
-        if ($emulateSroreInlineTranslation) {
+        if ($emulateStoreInlineTranslation) {
             $initialTranslateInline = $this->_emulateInlineTranslation($storeId, $area);
         } else {
             $initialTranslateInline = $this->_emulateInlineTranslation();
         }
         $initialDesign = $this->_emulateDesign($storeId, $area);
         // Current store needs to be changed right before locale change and after design change
-        Mage::app()->setCurrentStore($storeId);
+        $this->_app->setCurrentStore($storeId);
         $initialLocaleCode = $this->_emulateLocale($storeId, $area);
 
         $initialEnvironmentInfo = new Varien_Object();
@@ -82,7 +110,7 @@ public function stopEnvironmentEmulation(Varien_Object $initialEnvironmentInfo)
         $initialDesign = $initialEnvironmentInfo->getInitialDesign();
         $this->_restoreInitialDesign($initialDesign);
         // Current store needs to be changed right before locale change and after design change
-        Mage::app()->setCurrentStore($initialDesign['store']);
+        $this->_app->setCurrentStore($initialDesign['store']);
         $this->_restoreInitialLocale($initialEnvironmentInfo->getInitialLocaleCode(), $initialDesign['area']);
         return $this;
     }
@@ -125,7 +153,7 @@ protected function _emulateInlineTranslation($storeId = null, $area = Mage_Core_
     protected function _emulateDesign($storeId, $area = Mage_Core_Model_App_Area::AREA_FRONTEND)
     {
         $initialDesign = Mage::getDesign()->setAllGetOld(array(
-            'package' => Mage::getStoreConfig('design/package/name', $storeId),
+            'package' => $this->_getStoreConfig('design/package/name', $storeId),
             'store'   => $storeId,
             'area'    => $area
         ));
@@ -144,13 +172,27 @@ protected function _emulateDesign($storeId, $area = Mage_Core_Model_App_Area::AR
      */
     protected function _emulateLocale($storeId, $area = Mage_Core_Model_App_Area::AREA_FRONTEND)
     {
-        $initialLocaleCode = Mage::app()->getLocale()->getLocaleCode();
-        $newLocaleCode = Mage::getStoreConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_LOCALE, $storeId);
-        Mage::app()->getLocale()->setLocaleCode($newLocaleCode);
-        Mage::getSingleton('core/translate')->setLocale($newLocaleCode)->init($area, true);
+        $initialLocaleCode = $this->_app->getLocale()->getLocaleCode();
+        $newLocaleCode = $this->_getStoreConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_LOCALE, $storeId);
+        if ($initialLocaleCode != $newLocaleCode) {
+            $this->_app->getLocale()->setLocaleCode($newLocaleCode);
+            $this->_factory->getSingleton('core/translate')->setLocale($newLocaleCode)->init($area, true);
+        }
         return $initialLocaleCode;
     }
 
+    /**
+     * Retrieve config value for store by path
+     *
+     * @param string $path
+     * @param mixed $store
+     * @return mixed
+     */
+    protected function _getStoreConfig($path, $store = null)
+    {
+        return Mage::getStoreConfig($path, $store);
+    }
+
     /**
      * Restore initial inline translation state
      *
@@ -188,10 +230,14 @@ protected function _restoreInitialDesign(array $initialDesign)
      *
      * @return Mage_Core_Model_App_Emulation
      */
-    protected function _restoreInitialLocale($initialLocaleCode, $initialArea = Mage_Core_Model_App_Area::AREA_ADMINHTML)
+    protected function _restoreInitialLocale($initialLocaleCode,
+                                             $initialArea = Mage_Core_Model_App_Area::AREA_ADMINHTML)
     {
-        Mage::app()->getLocale()->setLocaleCode($initialLocaleCode);
-        Mage::getSingleton('core/translate')->setLocale($initialLocaleCode)->init($initialArea, true);
+        $currentLocaleCode = $this->_app->getLocale()->getLocaleCode();
+        if ($currentLocaleCode != $initialLocaleCode) {
+            $this->_app->getLocale()->setLocaleCode($initialLocaleCode);
+            $this->_factory->getSingleton('core/translate')->setLocale($initialLocaleCode)->init($initialArea, true);
+        }
         return $this;
     }
 }
diff --git a/app/code/core/Mage/Core/Model/Cache.php b/app/code/core/Mage/Core/Model/Cache.php
index acecd2cc581..5cd8200442c 100644
--- a/app/code/core/Mage/Core/Model/Cache.php
+++ b/app/code/core/Mage/Core/Model/Cache.php
@@ -26,17 +26,21 @@
 
 /**
  * System cache model
- * support id and tags preffix support,
+ * support id and tags prefix support,
  */
-
 class Mage_Core_Model_Cache
 {
+    /**
+     * Cache settings
+     */
     const DEFAULT_LIFETIME  = 7200;
     const OPTIONS_CACHE_ID  = 'core_cache_options';
     const INVALIDATED_TYPES = 'core_cache_invalidate';
     const XML_PATH_TYPES    = 'global/cache/types';
 
     /**
+     * Id prefix
+     *
      * @var string
      */
     protected $_idPrefix    = '';
@@ -44,9 +48,9 @@ class Mage_Core_Model_Cache
     /**
      * Cache frontend API
      *
-     * @var Zend_Cache_Core
+     * @var Varien_Cache_Core
      */
-    protected $_frontend    = null;
+    protected $_frontend;
 
     /**
      * Shared memory backend models list (required TwoLevels backend model)
@@ -59,14 +63,14 @@ class Mage_Core_Model_Cache
     );
 
     /**
-     * Fefault cache backend type
+     * Default cache backend type
      *
      * @var string
      */
     protected $_defaultBackend = 'File';
 
     /**
-     * Default iotions for default backend
+     * Default options for default backend
      *
      * @var array
      */
@@ -95,7 +99,15 @@ class Mage_Core_Model_Cache
      *
      * @var array
      */
-    protected $_allowedCacheOptions = null;
+    protected $_allowedCacheOptions;
+
+
+    /**
+     * DB connection
+     *
+     * @var string|null
+     */
+    protected $_dbConnection = 'core_write';
 
     /**
      * Class constructor. Initialize cache instance based on options
@@ -104,7 +116,8 @@ class Mage_Core_Model_Cache
      */
     public function __construct(array $options = array())
     {
-        $this->_defaultBackendOptions['cache_dir'] = Mage::getBaseDir('cache');
+        $this->_defaultBackendOptions['cache_dir'] = isset($options['cache_dir']) ? $options['cache_dir'] :
+            Mage::getBaseDir('cache');
         /**
          * Initialize id prefix
          */
@@ -128,7 +141,7 @@ public function __construct(array $options = array())
         }
 
         if (isset($options['disallow_save'])) {
-            $this->_disallowSave = $options['disallow_save'];
+            $this->_disallowSave = (bool)$options['disallow_save'];
         }
     }
 
@@ -189,9 +202,10 @@ protected function _getBackendOptions(array $cacheOptions)
                     $backendType = 'Varien_Cache_Backend_Eaccelerator';
                 }
                 break;
+            case 'varien_cache_backend_database':
             case 'database':
                 $backendType = 'Varien_Cache_Backend_Database';
-                $options = $this->getDbAdapterOptions();
+                $options = $this->getDbAdapterOptions($options);
                 break;
             default:
                 if ($type != $this->_defaultBackend) {
@@ -200,6 +214,9 @@ protected function _getBackendOptions(array $cacheOptions)
                             $implements = class_implements($type, true);
                             if (in_array('Zend_Cache_Backend_Interface', $implements)) {
                                 $backendType = $type;
+                                if (isset($options['enable_two_levels'])) {
+                                    $enable2levels = true;
+                                }
                             }
                         }
                     } catch (Exception $e) {
@@ -226,13 +243,18 @@ protected function _getBackendOptions(array $cacheOptions)
     /**
      * Get options for database backend type
      *
+     * @param array $options
      * @return array
      */
-    protected function getDbAdapterOptions()
+    protected function getDbAdapterOptions(array $options = array())
     {
+        if (isset($options['connection'])) {
+            $this->_dbConnection = $options['connection'];
+        }
+
         $options['adapter_callback'] = array($this, 'getDbAdapter');
-        $options['data_table']  = Mage::getSingleton('core/resource')->getTableName('core/cache');
-        $options['tags_table']  = Mage::getSingleton('core/resource')->getTableName('core/cache_tag');
+        $options['data_table'] = Mage::getSingleton('core/resource')->getTableName('core/cache');
+        $options['tags_table'] = Mage::getSingleton('core/resource')->getTableName('core/cache_tag');
         return $options;
     }
 
@@ -270,7 +292,7 @@ protected function _getTwoLevelsBackendOptions($fastOptions, $cacheOptions)
         }
         if ($options['slow_backend'] == 'database') {
             $options['slow_backend'] = 'Varien_Cache_Backend_Database';
-            $options['slow_backend_options'] = $this->getDbAdapterOptions();
+            $options['slow_backend_options'] = $this->getDbAdapterOptions($options['slow_backend_options']);
             if (isset($cacheOptions['slow_backend_store_data'])) {
                 $options['slow_backend_options']['store_data'] = (bool)$cacheOptions['slow_backend_store_data'];
             } else {
@@ -309,7 +331,7 @@ protected function _getFrontendOptions(array $cacheOptions)
     }
 
     /**
-     * Prepare unified valid identifier with preffix
+     * Prepare unified valid identifier with prefix
      *
      * @param   string $id
      * @return  string
@@ -339,7 +361,7 @@ protected function _tags($tags = array())
     /**
      * Get cache frontend API object
      *
-     * @return Zend_Cache_Core
+     * @return Varien_Cache_Core
      */
     public function getFrontend()
     {
@@ -354,7 +376,7 @@ public function getFrontend()
      */
     public function load($id)
     {
-        return $this->_frontend->load($this->_id($id));
+        return $this->getFrontend()->load($this->_id($id));
     }
 
     /**
@@ -366,18 +388,19 @@ public function load($id)
      * @param int $lifeTime
      * @return bool
      */
-    public function save($data, $id, $tags=array(), $lifeTime=null)
+    public function save($data, $id, $tags = array(), $lifeTime = null)
     {
+        if ($this->_disallowSave) {
+            return true;
+        }
+
         /**
          * Add global magento cache tag to all cached data exclude config cache
          */
         if (!in_array(Mage_Core_Model_Config::CACHE_TAG, $tags)) {
             $tags[] = Mage_Core_Model_App::CACHE_TAG;
         }
-        if ($this->_disallowSave) {
-            return true;
-        }
-        return $this->_frontend->save((string)$data, $this->_id($id), $this->_tags($tags), $lifeTime);
+        return $this->getFrontend()->save((string)$data, $this->_id($id), $this->_tags($tags), $lifeTime);
     }
 
     /**
@@ -388,7 +411,7 @@ public function save($data, $id, $tags=array(), $lifeTime=null)
      */
     public function remove($id)
     {
-        return $this->_frontend->remove($this->_id($id));
+        return $this->getFrontend()->remove($this->_id($id));
     }
 
     /**
@@ -404,10 +427,10 @@ public function clean($tags=array())
             if (!is_array($tags)) {
                 $tags = array($tags);
             }
-            $res = $this->_frontend->clean($mode, $this->_tags($tags));
+            $res = $this->getFrontend()->clean($mode, $this->_tags($tags));
         } else {
-            $res = $this->_frontend->clean($mode, array(Mage_Core_Model_App::CACHE_TAG));
-            $res = $res && $this->_frontend->clean($mode, array(Mage_Core_Model_Config::CACHE_TAG));
+            $res = $this->getFrontend()->clean($mode, array(Mage_Core_Model_App::CACHE_TAG));
+            $res = $res && $this->getFrontend()->clean($mode, array(Mage_Core_Model_Config::CACHE_TAG));
         }
         return $res;
     }
@@ -419,7 +442,7 @@ public function clean($tags=array())
      */
     public function flush()
     {
-        $res = $this->_frontend->clean();
+        $res = $this->getFrontend()->clean();
         return $res;
     }
 
@@ -430,7 +453,7 @@ public function flush()
      */
     public function getDbAdapter()
     {
-        return Mage::getSingleton('core/resource')->getConnection('core_write');
+        return Mage::getSingleton('core/resource')->getConnection($this->_dbConnection);
     }
 
     /**
@@ -481,7 +504,7 @@ protected function _initOptions()
     public function saveOptions($options)
     {
         $this->remove(self::OPTIONS_CACHE_ID);
-        $options = $this->_getResource()->saveAllOptions($options);
+        $this->_getResource()->saveAllOptions($options);
         return $this;
     }
 
@@ -499,17 +522,18 @@ public function canUse($typeCode)
 
         if (empty($typeCode)) {
             return $this->_allowedCacheOptions;
+        }
+
+        if (isset($this->_allowedCacheOptions[$typeCode])) {
+            return (bool)$this->_allowedCacheOptions[$typeCode];
         } else {
-            if (isset($this->_allowedCacheOptions[$typeCode])) {
-                return (bool)$this->_allowedCacheOptions[$typeCode];
-            } else {
-                return false;
-            }
+            return false;
         }
     }
 
     /**
      * Disable cache usage for specific data type
+     *
      * @param string $typeCode
      * @return Mage_Core_Model_Cache
      */
@@ -527,7 +551,7 @@ public function banUse($typeCode)
      */
     public function getTagsByType($type)
     {
-        $path = self::XML_PATH_TYPES.'/'.$type.'/tags';
+        $path = self::XML_PATH_TYPES . '/' . $type . '/tags';
         $tagsConfig = Mage::getConfig()->getNode($path);
         if ($tagsConfig) {
             $tags = (string) $tagsConfig;
@@ -676,7 +700,6 @@ public function processRequest()
      */
     protected function _getProcessor($processor)
     {
-        $processor = new $processor;
-        return $processor;
+        return new $processor;
     }
 }
diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php
index 45ac03c4ffb..b3885f05312 100644
--- a/app/code/core/Mage/Core/Model/Config.php
+++ b/app/code/core/Mage/Core/Model/Config.php
@@ -1236,7 +1236,7 @@ public function getGroupedClassName($groupType, $classId, $groupRootNode=null)
              * In MMDB release resource nodes <..._mysql4> were renamed to <..._resource>. So <deprecatedNode> is left
              * to keep name of previously used nodes, that still may be used by non-updated extensions.
              */
-            if ($config->deprecatedNode) {
+            if (isset($config->deprecatedNode)) {
                 $deprecatedNode = $config->deprecatedNode;
                 $configOld = $this->_xml->global->{$groupType.'s'}->$deprecatedNode;
                 if (isset($configOld->rewrite->$class)) {
diff --git a/app/code/core/Mage/Core/Model/Email/Template.php b/app/code/core/Mage/Core/Model/Email/Template.php
index 214a469ba09..4fd83131f95 100644
--- a/app/code/core/Mage/Core/Model/Email/Template.php
+++ b/app/code/core/Mage/Core/Model/Email/Template.php
@@ -489,7 +489,7 @@ public function sendTransactional($templateId, $sender, $email, $name, $vars=arr
         }
 
         if (!$this->getId()) {
-            throw Mage::exception('Mage_Core', Mage::helper('core')->__('Invalid transactional email code: ' . $templateId));
+            throw Mage::exception('Mage_Core', Mage::helper('core')->__('Invalid transactional email code: %s', $templateId));
         }
 
         if (!is_array($sender)) {
diff --git a/app/code/core/Mage/Core/Model/Email/Template/Filter.php b/app/code/core/Mage/Core/Model/Email/Template/Filter.php
index 7a71a12f9b4..10bf811c9f4 100644
--- a/app/code/core/Mage/Core/Model/Email/Template/Filter.php
+++ b/app/code/core/Mage/Core/Model/Email/Template/Filter.php
@@ -185,7 +185,7 @@ public function blockDirective($construction)
         if (isset($blockParameters['output'])) {
             $method = $blockParameters['output'];
         }
-        if (!isset($method) || !is_string($method) || !is_callable(array($block, $method))) {
+        if (!isset($method) || !is_string($method) || !method_exists($block, $method)) {
             $method = 'toHtml';
         }
         return $block->$method();
@@ -341,7 +341,7 @@ public function htmlescapeDirective($construction)
             $allowedTags = preg_split('/\s*\,\s*/', $params['allowed_tags'], 0, PREG_SPLIT_NO_EMPTY);
         }
 
-        return Mage::helper('core')->htmlEscape($params['var'], $allowedTags);
+        return Mage::helper('core')->escapeHtml($params['var'], $allowedTags);
     }
 
     /**
@@ -481,7 +481,9 @@ public function customvarDirective($construction)
             $variable = Mage::getModel('core/variable')
                 ->setStoreId($this->getStoreId())
                 ->loadByCode($params['code']);
-            $mode = $this->getPlainTemplateMode()?Mage_Core_Model_Variable::TYPE_TEXT:Mage_Core_Model_Variable::TYPE_HTML;
+            $mode = $this->getPlainTemplateMode()
+                ? Mage_Core_Model_Variable::TYPE_TEXT
+                : Mage_Core_Model_Variable::TYPE_HTML;
             if ($value = $variable->getValue($mode)) {
                 $customVarValue = $value;
             }
diff --git a/app/code/core/Mage/Core/Model/Factory.php b/app/code/core/Mage/Core/Model/Factory.php
new file mode 100644
index 00000000000..6eff2546920
--- /dev/null
+++ b/app/code/core/Mage/Core/Model/Factory.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Core
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Factory class
+ *
+ * @category    Mage
+ * @package     Mage_Core
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Core_Model_Factory
+{
+    /**
+     * Xml path to url rewrite model class alias
+     */
+    const XML_PATH_URL_REWRITE_MODEL = 'global/url_rewrite/model';
+
+    const XML_PATH_INDEX_INDEX_MODEL = 'global/index/index_model';
+
+    /**
+     * Config instance
+     *
+     * @var Mage_Core_Model_Config
+     */
+    protected $_config;
+
+    /**
+     * Initialize factory
+     *
+     * @param array $arguments
+     */
+    public function __construct(array $arguments = array())
+    {
+        $this->_config = !empty($arguments['config']) ? $arguments['config'] : Mage::getConfig();
+    }
+
+    /**
+     * Retrieve model object
+     *
+     * @param string $modelClass
+     * @param array|object $arguments
+     * @return bool|Mage_Core_Model_Abstract
+     */
+    public function getModel($modelClass = '', $arguments = array())
+    {
+        return Mage::getModel($modelClass, $arguments);
+    }
+
+    /**
+     * Retrieve model object singleton
+     *
+     * @param string $modelClass
+     * @param array $arguments
+     * @return Mage_Core_Model_Abstract
+     */
+    public function getSingleton($modelClass = '', array $arguments = array())
+    {
+        return Mage::getSingleton($modelClass, $arguments);
+    }
+
+    /**
+     * Retrieve object of resource model
+     *
+     * @param string $modelClass
+     * @param array $arguments
+     * @return Object
+     */
+    public function getResourceModel($modelClass, $arguments = array())
+    {
+        return Mage::getResourceModel($modelClass, $arguments);
+    }
+
+    /**
+     * Retrieve helper instance
+     *
+     * @param string $helperClass
+     * @return Mage_Core_Helper_Abstract
+     */
+    public function getHelper($helperClass)
+    {
+        return Mage::helper($helperClass);
+    }
+
+    /**
+     * Get config instance
+     *
+     * @return Mage_Core_Model_Config
+     */
+    public function getConfig()
+    {
+        return $this->_config;
+    }
+
+    /**
+     * Retrieve url_rewrite instance
+     *
+     * @return Mage_Core_Model_Url_Rewrite
+     */
+    public function getUrlRewriteInstance()
+    {
+        return $this->getModel($this->getUrlRewriteClassAlias());
+    }
+
+    /**
+     * Retrieve alias for url_rewrite model
+     *
+     * @return string
+     */
+    public function getUrlRewriteClassAlias()
+    {
+        return (string)$this->_config->getNode(self::XML_PATH_URL_REWRITE_MODEL);
+    }
+
+    /**
+     * @return string
+     */
+    public function getIndexClassAlias()
+    {
+        return (string)$this->_config->getNode(self::XML_PATH_INDEX_INDEX_MODEL);
+    }
+}
diff --git a/app/code/core/Mage/Core/Model/File/Storage/File.php b/app/code/core/Mage/Core/Model/File/Storage/File.php
index 5d63b384b3b..5d1da1f4306 100644
--- a/app/code/core/Mage/Core/Model/File/Storage/File.php
+++ b/app/code/core/Mage/Core/Model/File/Storage/File.php
@@ -253,7 +253,7 @@ public function saveDir($dir)
     public function saveFile($file, $overwrite = true)
     {
         if (isset($file['filename']) && !empty($file['filename'])
-            && isset($file['content']) && !empty($file['content'])
+            && isset($file['content'])
         ) {
             try {
                 $filename = (isset($file['directory']) && !empty($file['directory']))
diff --git a/app/code/core/Mage/Core/Model/Locale.php b/app/code/core/Mage/Core/Model/Locale.php
index a3cf908ac05..013ce7221b5 100644
--- a/app/code/core/Mage/Core/Model/Locale.php
+++ b/app/code/core/Mage/Core/Model/Locale.php
@@ -285,16 +285,20 @@ public function getOptionTimezones()
     /**
      * Retrieve days of week option list
      *
+     * @param bool $preserveCodes
+     * @param bool $ucFirstCode
+     *
      * @return array
      */
-    public function getOptionWeekdays()
+    public function getOptionWeekdays($preserveCodes = false, $ucFirstCode = false)
     {
         $options= array();
         $days = $this->getTranslationList('days');
-        foreach (array_values($days['format']['wide']) as $code => $name) {
+        $days = $preserveCodes ? $days['format']['wide']  : array_values($days['format']['wide']);
+        foreach ($days as $code => $name) {
             $options[] = array(
                'label' => $name,
-               'value' => $code,
+               'value' => $ucFirstCode ? ucfirst($code) : $code,
             );
         }
         return $options;
diff --git a/app/code/core/Mage/Core/Model/Logger.php b/app/code/core/Mage/Core/Model/Logger.php
new file mode 100644
index 00000000000..586343d349b
--- /dev/null
+++ b/app/code/core/Mage/Core/Model/Logger.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Core
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Logger model
+ *
+ * @author Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Core_Model_Logger
+{
+    /**
+     * Log wrapper
+     *
+     * @param string $message
+     * @param int $level
+     * @param string $file
+     * @param bool $forceLog
+     * @return void
+     */
+    public function log($message, $level = null, $file = '', $forceLog = false)
+    {
+        Mage::log($message, $level, $file, $forceLog);
+    }
+
+    /**
+     * Log exception wrapper
+     *
+     * @param Exception $e
+     * @return void
+     */
+    public function logException(Exception $e)
+    {
+        Mage::logException($e);
+    }
+}
diff --git a/app/code/core/Mage/Core/Model/Observer.php b/app/code/core/Mage/Core/Model/Observer.php
index 615e25d0d67..edf0f319b2b 100644
--- a/app/code/core/Mage/Core/Model/Observer.php
+++ b/app/code/core/Mage/Core/Model/Observer.php
@@ -105,4 +105,24 @@ public function cleanCache(Mage_Cron_Model_Schedule $schedule)
         Mage::app()->getCache()->clean(Zend_Cache::CLEANING_MODE_OLD);
         Mage::dispatchEvent('core_clean_cache');
     }
+
+
+    /**
+     * Cleans cache by tags
+     *
+     * @param Varien_Event_Observer $observer
+     * @return Mage_Core_Model_Observer
+     */
+    public function cleanCacheByTags(Varien_Event_Observer $observer)
+    {
+        /** @var $tags array */
+        $tags = $observer->getEvent()->getTags();
+        if (empty($tags)) {
+            Mage::app()->cleanCache();
+            return $this;
+        }
+
+        Mage::app()->cleanCache($tags);
+        return $this;
+    }
 }
diff --git a/app/code/core/Mage/Core/Model/Resource/File/Storage/File.php b/app/code/core/Mage/Core/Model/Resource/File/Storage/File.php
index fa4ab3a038f..05d618d2940 100644
--- a/app/code/core/Mage/Core/Model/Resource/File/Storage/File.php
+++ b/app/code/core/Mage/Core/Model/Resource/File/Storage/File.php
@@ -185,7 +185,7 @@ public function saveFile($filePath, $content, $overwrite = false)
             $ioFile->streamUnlock();
             $ioFile->streamClose();
 
-            if ($result) {
+            if ($result !== false) {
                 return true;
             }
 
diff --git a/app/code/core/Mage/Core/Model/Resource/Session.php b/app/code/core/Mage/Core/Model/Resource/Session.php
index 3fc4817ad8d..382c1ed999a 100644
--- a/app/code/core/Mage/Core/Model/Resource/Session.php
+++ b/app/code/core/Mage/Core/Model/Resource/Session.php
@@ -163,6 +163,15 @@ public function setSaveHandler()
         return $this;
     }
 
+    /**
+     * Adds session handler via static call
+     */
+    public static function setStaticSaveHandler()
+    {
+        $handler = new self;
+        $handler->setSaveHandler();
+    }
+
     /**
      * Open session
      *
diff --git a/app/code/core/Mage/Core/Model/Resource/Translate/String.php b/app/code/core/Mage/Core/Model/Resource/Translate/String.php
index c992c0e9314..09951b6ac5d 100644
--- a/app/code/core/Mage/Core/Model/Resource/Translate/String.php
+++ b/app/code/core/Mage/Core/Model/Resource/Translate/String.php
@@ -188,7 +188,7 @@ public function deleteTranslate($string, $locale = null, $storeId = null)
         if ($storeId === false) {
             $where['store_id > ?'] = Mage_Core_Model_App::ADMIN_STORE_ID;
         } elseif ($storeId !== null) {
-            $where['store_id > ?'] = $storeId;
+            $where['store_id = ?'] = $storeId;
         }
 
         $this->_getWriteAdapter()->delete($this->getMainTable(), $where);
@@ -223,11 +223,12 @@ public function saveTranslate($string, $translate, $locale = null, $storeId = nu
             ->where('store_id = :store_id')
             ->where('locale = :locale')
             ->where('string = :string')
-        ;
+            ->where('crc_string = :crc_string');
         $bind = array(
-            'store_id' => $storeId,
-            'locale'   => $locale,
-            'string'   => $string
+            'store_id'   => $storeId,
+            'locale'     => $locale,
+            'string'     => $string,
+            'crc_string' => crc32($string),
         );
 
         if ($row = $write->fetchRow($select, $bind)) {
@@ -242,10 +243,11 @@ public function saveTranslate($string, $translate, $locale = null, $storeId = nu
             }
         } else {
             $write->insert($table, array(
-                'store_id'  => $storeId,
-                'locale'    => $locale,
-                'string'    => $string,
-                'translate' => $translate,
+                'store_id'   => $storeId,
+                'locale'     => $locale,
+                'string'     => $string,
+                'translate'  => $translate,
+                'crc_string' => crc32($string),
             ));
         }
 
diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php b/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php
index 32e99cb1a07..33a06d7cd75 100644
--- a/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php
+++ b/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php
@@ -68,7 +68,7 @@ protected function _getDbAdapterInstance($configArr)
      */
     protected function _getDbAdapterClassName()
     {
-        return 'Varien_Db_Adapter_Pdo_Mysql';
+        return 'Magento_Db_Adapter_Pdo_Mysql';
     }
 
 }
diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php
index 74166ea9ff5..92c8c0440cf 100644
--- a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php
+++ b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php
@@ -41,35 +41,37 @@ class Mage_Core_Model_Session_Abstract_Varien extends Varien_Object
      */
     public function start($sessionName=null)
     {
-        if (isset($_SESSION)) {
+        if (isset($_SESSION) && !$this->getSkipEmptySessionCheck()) {
             return $this;
         }
 
-        switch($this->getSessionSaveMethod()) {
+        // getSessionSaveMethod has to return correct version of handler in any case
+        $moduleName = $this->getSessionSaveMethod();
+        switch ($moduleName) {
+            /**
+             * backward compatibility with db argument (option is @deprecated after 1.12.0.2)
+             */
             case 'db':
-                ini_set('session.save_handler', 'user');
+                $moduleName = 'user';
+                /* @var $sessionResource Mage_Core_Model_Resource_Session */
                 $sessionResource = Mage::getResourceSingleton('core/session');
-                /* @var $sessionResource Mage_Core_Model_Mysql4_Session */
                 $sessionResource->setSaveHandler();
                 break;
-            case 'memcache':
-                ini_set('session.save_handler', 'memcache');
-                session_save_path($this->getSessionSavePath());
-                break;
-            case 'memcached':
-                ini_set('session.save_handler', 'memcached');
-                session_save_path($this->getSessionSavePath());
-                break;
-            case 'eaccelerator':
-                ini_set('session.save_handler', 'eaccelerator');
+            case 'user':
+                // getSessionSavePath represents static function for custom session handler setup
+                call_user_func($this->getSessionSavePath());
                 break;
-            default:
-                session_module_name($this->getSessionSaveMethod());
-                if (is_writable($this->getSessionSavePath())) {
-                    session_save_path($this->getSessionSavePath());
+            case 'files':
+                //don't change path if it's not writable
+                if (!is_writable($this->getSessionSavePath())) {
+                    break;
                 }
+            default:
+                session_save_path($this->getSessionSavePath());
                 break;
         }
+        session_module_name($moduleName);
+
         $cookie = $this->getCookie();
         if (Mage::app()->getStore()->isAdmin()) {
             $sessionMaxLifetime = Mage_Core_Model_Resource_Session::SEESION_MAX_COOKIE_LIFETIME;
diff --git a/app/code/core/Mage/Core/Model/Source/Email/Variables.php b/app/code/core/Mage/Core/Model/Source/Email/Variables.php
index 31c8f359718..e2847cec723 100644
--- a/app/code/core/Mage/Core/Model/Source/Email/Variables.php
+++ b/app/code/core/Mage/Core/Model/Source/Email/Variables.php
@@ -115,7 +115,7 @@ public function toOptionArray($withGroup = false)
         foreach ($this->_configVariables as $variable) {
             $optionArray[] = array(
                 'value' => '{{config path="' . $variable['value'] . '"}}',
-                'label' => Mage::helper('core')->__('%s', $variable['label'])
+                'label' => $variable['label']
             );
         }
         if ($withGroup && $optionArray) {
diff --git a/app/code/core/Mage/Core/Model/Store.php b/app/code/core/Mage/Core/Model/Store.php
index 18163e8480c..dda235c9a76 100644
--- a/app/code/core/Mage/Core/Model/Store.php
+++ b/app/code/core/Mage/Core/Model/Store.php
@@ -581,15 +581,8 @@ public function getBaseUrl($type = self::URL_TYPE_LINK, $secure = null)
      */
     protected function _updatePathUseRewrites($url)
     {
-        if ($this->isAdmin()
-            || !$this->getConfig(self::XML_PATH_USE_REWRITES)
-            || !Mage::isInstalled()
-        ) {
-            if ($this->_isCustomEntryPoint()) {
-                $indexFileName = 'index.php';
-            } else {
-                $indexFileName = basename($_SERVER['SCRIPT_FILENAME']);
-            }
+        if ($this->isAdmin() || !$this->getConfig(self::XML_PATH_USE_REWRITES) || !Mage::isInstalled()) {
+            $indexFileName = $this->_isCustomEntryPoint() ? 'index.php' : basename($_SERVER['SCRIPT_FILENAME']);
             $url .= $indexFileName . '/';
         }
         return $url;
diff --git a/app/code/core/Mage/Core/Model/Store/Observer.php b/app/code/core/Mage/Core/Model/Store/Observer.php
new file mode 100644
index 00000000000..5acb93d3a98
--- /dev/null
+++ b/app/code/core/Mage/Core/Model/Store/Observer.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Core
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Store observer
+ *
+ * @category    Mage
+ * @package     Mage_Core
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Core_Model_Store_Observer
+{
+    /**
+     * Cleans cache by store tag
+     */
+    public function cleanCache()
+    {
+        Mage::app()->cleanCache(array(Mage_Core_Model_Store::CACHE_TAG));
+    }
+}
diff --git a/app/code/core/Mage/Core/Model/Translate.php b/app/code/core/Mage/Core/Model/Translate.php
index 2e7847297ba..fd4656eff49 100644
--- a/app/code/core/Mage/Core/Model/Translate.php
+++ b/app/code/core/Mage/Core/Model/Translate.php
@@ -41,6 +41,11 @@ class Mage_Core_Model_Translate
     const CONFIG_KEY_DESIGN_PACKAGE = 'package';
     const CONFIG_KEY_DESIGN_THEME   = 'theme';
 
+    /**
+     * Default translation string
+     */
+    const DEFAULT_STRING = 'Translate String';
+
     /**
      * Locale name
      *
diff --git a/app/code/core/Mage/Core/Model/Translate/Inline.php b/app/code/core/Mage/Core/Model/Translate/Inline.php
index c5ebb2e8bec..805098ed1e6 100644
--- a/app/code/core/Mage/Core/Model/Translate/Inline.php
+++ b/app/code/core/Mage/Core/Model/Translate/Inline.php
@@ -110,10 +110,7 @@ class Mage_Core_Model_Translate_Inline
         'blockquote'    => 'Long quotation',
         'q'             => 'Short quotation',
         'cite'          => 'Citation',
-        'dt'            => 'Item in a definition list',
-        'dd'            => 'Item description in a definition list.',
         'caption'       => 'Table caption',
-        'th'            => 'Header cell in a table',
         'abbr'          => 'Abbreviated phrase',
         'acronym'       => 'An acronym',
         'var'           => 'Variable part of a text',
@@ -127,10 +124,10 @@ class Mage_Core_Model_Translate_Inline
         'h4'            => 'Heading level 4',
         'h5'            => 'Heading level 5',
         'h6'            => 'Heading level 6',
-        'p'             => 'Paragraph',
-        'pre'           => 'Preformatted text',
         'center'        => 'Centered text',
         'select'        => 'List options',
+        'img'           => 'Image',
+        'input'         => 'Form element',
     );
 
     /**
@@ -158,8 +155,8 @@ public function isAllowed($store = null)
             $this->_isAllowed = $active && Mage::helper('core')->isDevAllowed($store);
         }
 
-        $translate = Mage::getSingleton('core/translate');
         /* @var $translate Mage_Core_Model_Translate */
+        $translate = Mage::getSingleton('core/translate');
 
         return $translate->getTranslateInline() && $this->_isAllowed;
     }
@@ -366,6 +363,7 @@ protected function _tagAttributes()
      * Prepare tags inline translates for the content
      *
      * @param string $content
+     * @return void
      */
     protected function _prepareTagAttributesForContent(&$content)
     {
@@ -377,12 +375,11 @@ protected function _prepareTagAttributesForContent(&$content)
 
         $tagMatch   = array();
         $nextTag    = 0;
-        $tagRegExp  = '#<([a-z]+)\s*?[^>]+?((' . $this->_tokenRegex . ')[^>]*?)+/?>#i';
+        $tagRegExp = '#<([a-z]+)\s*?[^>]+?((' . $this->_tokenRegex . ')[^>]*?)+\\\\?/?>#iS';
         while (preg_match($tagRegExp, $content, $tagMatch, PREG_OFFSET_CAPTURE, $nextTag)) {
-            $next       = 0;
             $tagHtml    = $tagMatch[0][0];
             $m          = array();
-            $attrRegExp = '#' . $this->_tokenRegex . '#';
+            $attrRegExp = '#' . $this->_tokenRegex . '#S';
             $trArr = $this->_getTranslateData($attrRegExp, $tagHtml, array($this, '_getAttributeLocation'));
             if ($trArr) {
                 $transRegExp = '# translate=' . $quoteHtml . '\[([^'.preg_quote($quoteHtml).']*)]' . $quoteHtml . '#i';
@@ -394,6 +391,7 @@ protected function _prepareTagAttributesForContent(&$content)
                     $trAttr  = ' translate=' . $quoteHtml
                         . htmlspecialchars('[' . join(',', $trArr) . ']') . $quoteHtml;
                 }
+                $tagHtml = substr_replace($tagHtml , $trAttr, strlen($tagMatch[1][0])+1, 1);
                 $content = substr_replace($content, $tagHtml, $tagMatch[0][1], strlen($tagMatch[0][0]));
             }
             $nextTag = $tagMatch[0][1] + strlen($tagHtml);
@@ -460,28 +458,26 @@ protected function _applySimpleTagsFormat($tagHtml, $tagName, $trArr)
     /**
      * Prepare simple tags
      *
-     * @param string $body
+     * @param string $content
      * @param array $tagsList
      * @param string|array $formatCallback
      * @param bool $isNeedTranslateAttributes
      */
-    protected function _translateTags(&$body, $tagsList, $formatCallback, $isNeedTranslateAttributes)
+    protected function _translateTags(&$content, $tagsList, $formatCallback, $isNeedTranslateAttributes)
     {
-        if ($this->getIsJson()) {
-            $quoteHtml   = '\"';
-        } else {
-            $quoteHtml   = '"';
-        }
-
         $nextTag = 0;
 
         $tags = implode('|', array_keys($tagsList));
-        $tagRegExp  = '#<(' . $tags . ')(\s*[^>]*>)#i';
-
+        $tagRegExp  = '#<(' . $tags . ')(/?>| \s*[^>]*+/?>)#iSU';
         $tagMatch = array();
-        while (preg_match($tagRegExp, $body, $tagMatch, PREG_OFFSET_CAPTURE, $nextTag)) {
+        while (preg_match($tagRegExp, $content, $tagMatch, PREG_OFFSET_CAPTURE, $nextTag)) {
             $tagName  = strtolower($tagMatch[1][0]);
-            $tagClosurePos = $this->findEndOfTag($body, $tagName, $tagMatch[0][1]);
+            if (substr($tagMatch[0][0], -2) == '/>') {
+                $tagClosurePos = $tagMatch[0][1] + strlen($tagMatch[0][0]);
+            } else {
+                $tagClosurePos = $this->findEndOfTag($content, $tagName, $tagMatch[0][1]);
+            }
+
             if ($tagClosurePos === false) {
                 $nextTag += strlen($tagMatch[0][0]);
                 continue;
@@ -491,23 +487,12 @@ protected function _translateTags(&$body, $tagsList, $formatCallback, $isNeedTra
 
             $tagStartLength = strlen($tagMatch[0][0]);
 
-            $tagHtml = $tagMatch[0][0] ;
-            $tagEnd = substr($body, $tagMatch[0][1] + $tagStartLength, $tagLength - $tagStartLength);
-
-            if ($isNeedTranslateAttributes
-                && preg_match_all('#' . $this->_tokenRegex . '#', $tagEnd, $m)
-                && count($m[0]) > $this->_maxTranslateBlocks
-            ) {
-                $this->_translateTags($tagEnd, $tagsList, $formatCallback, $isNeedTranslateAttributes);
-            }
-
-            if ($isNeedTranslateAttributes) {
-                $this->_prepareTagAttributesForContent($tagEnd);
-            }
-            $tagHtml .= $tagEnd;
+            $tagHtml = $tagMatch[0][0]
+                . substr($content, $tagMatch[0][1] + $tagStartLength, $tagLength - $tagStartLength);
+            $tagClosurePos = $tagMatch[0][1] + strlen($tagHtml);
 
             $trArr = $this->_getTranslateData(
-                '#' . $this->_tokenRegex . '#i',
+                '#' . $this->_tokenRegex . '#iS',
                 $tagHtml,
                 array($this, '_getTagLocation'),
                 array(
@@ -519,8 +504,8 @@ protected function _translateTags(&$body, $tagsList, $formatCallback, $isNeedTra
             if (!empty($trArr)) {
                 $trArr = array_unique($trArr);
                 $tagHtml = call_user_func(array($this, $formatCallback), $tagHtml, $tagName, $trArr);
-
-                $body = substr_replace($body, $tagHtml, $tagMatch[0][1], $tagLength);
+                $tagClosurePos = $tagMatch[0][1] + strlen($tagHtml);
+                $content = substr_replace($content, $tagHtml, $tagMatch[0][1], $tagLength);
             }
             $nextTag = $tagClosurePos;
         }
@@ -537,17 +522,18 @@ protected function _translateTags(&$body, $tagsList, $formatCallback, $isNeedTra
     private function findEndOfTag($body, $tagName, $from)
     {
         $openTag = '<' . $tagName;
-        $closeTag = '</' . $tagName;
-        $end = $from + strlen($openTag);
-        $length = $end - $from;
+        $closeTag =  ($this->getIsJson() ? '<\\/' : '</') . $tagName;
+        $tagLength = strlen($tagName);
+        $length = $tagLength + 1;
+        $end = $from + 1;
         while (substr_count($body, $openTag, $from, $length) != substr_count($body, $closeTag, $from, $length)) {
-            $end = strpos($body, $closeTag, $end + strlen($closeTag) - 1);
+            $end = strpos($body, $closeTag, $end + $tagLength + 1);
             if ($end === false) {
                 return false;
             }
-            $length = $end - $from  + strlen($closeTag);
+            $length = $end - $from  + $tagLength + 3;
         }
-        if (preg_match('#<\/' . $tagName .'\s*?>#i', $body, $tagMatch, null, $end)) {
+        if (preg_match('#<\\\\?\/' . $tagName .'\s*?>#i', $body, $tagMatch, null, $end)) {
             return $end + strlen($tagMatch[0]);
         } else {
             return false;
diff --git a/app/code/core/Mage/Core/Model/Url.php b/app/code/core/Mage/Core/Model/Url.php
index c87bf481a34..28086af00c4 100644
--- a/app/code/core/Mage/Core/Model/Url.php
+++ b/app/code/core/Mage/Core/Model/Url.php
@@ -89,13 +89,30 @@ class Mage_Core_Model_Url extends Varien_Object
     const DEFAULT_ACTION_NAME       = 'index';
 
     /**
-     * Configuration paths
+     * XML base url path unsecure
      */
     const XML_PATH_UNSECURE_URL     = 'web/unsecure/base_url';
+
+    /**
+     * XML base url path secure
+     */
     const XML_PATH_SECURE_URL       = 'web/secure/base_url';
+
+    /**
+     * XML path for using in adminhtml
+     */
     const XML_PATH_SECURE_IN_ADMIN  = 'default/web/secure/use_in_adminhtml';
+
+    /**
+     * XML path for using in frontend
+     */
     const XML_PATH_SECURE_IN_FRONT  = 'web/secure/use_in_frontend';
 
+    /**
+     * Param name for form key functionality
+     */
+    const FORM_KEY = 'form_key';
+
     /**
      * Configuration data cache
      *
@@ -483,7 +500,7 @@ public function getRoutePath($routeParams = array())
             }
             $routePath = $this->getActionPath();
             if ($this->getRouteParams()) {
-                foreach ($this->getRouteParams() as $key=>$value) {
+                foreach ($this->getRouteParams() as $key => $value) {
                     if (is_null($value) || false === $value || '' === $value || !is_scalar($value)) {
                         continue;
                     }
@@ -939,8 +956,8 @@ public function getFragment()
     /**
      * Build url by requested path and parameters
      *
-     * @param   string|null $routePath
-     * @param   array|null $routeParams
+     * @param string|null $routePath
+     * @param array|null $routeParams
      * @return  string
      */
     public function getUrl($routePath = null, $routeParams = null)
@@ -974,6 +991,7 @@ public function getUrl($routePath = null, $routeParams = null)
             $noSid = (bool)$routeParams['_nosid'];
             unset($routeParams['_nosid']);
         }
+
         $url = $this->getRouteUrl($routePath, $routeParams);
         /**
          * Apply query params, need call after getRouteUrl for rewrite _current values
@@ -1006,6 +1024,18 @@ public function getUrl($routePath = null, $routeParams = null)
         return $this->escape($url);
     }
 
+    /**
+     * Return singleton model instance
+     *
+     * @param string $name
+     * @param array $arguments
+     * @return Mage_Core_Model_Abstract
+     */
+    protected function _getSingletonModel($name, $arguments = array())
+    {
+        return Mage::getSingleton($name, $arguments);
+    }
+
     /**
      * Check and add session id to URL
      *
diff --git a/app/code/core/Mage/Core/Model/Url/Rewrite.php b/app/code/core/Mage/Core/Model/Url/Rewrite.php
index 4af6d5c5891..1d2abc539fe 100644
--- a/app/code/core/Mage/Core/Model/Url/Rewrite.php
+++ b/app/code/core/Mage/Core/Model/Url/Rewrite.php
@@ -52,7 +52,7 @@
  * @package     Mage_Core
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_Core_Model_Url_Rewrite extends Mage_Core_Model_Abstract
+class Mage_Core_Model_Url_Rewrite extends Mage_Core_Model_Abstract implements Mage_Core_Model_Url_Rewrite_Interface
 {
     const TYPE_CATEGORY = 1;
     const TYPE_PRODUCT  = 2;
@@ -191,6 +191,7 @@ public function removeTag($tags)
      * @param   Zend_Controller_Request_Http $request
      * @param   Zend_Controller_Response_Http $response
      * @return  Mage_Core_Model_Url
+     * @deprecated since 1.7.0.2. Refactored and moved to Mage_Core_Controller_Request_Rewrite
      */
     public function rewrite(Zend_Controller_Request_Http $request=null, Zend_Controller_Response_Http $response=null)
     {
@@ -294,6 +295,12 @@ public function rewrite(Zend_Controller_Request_Http $request=null, Zend_Control
         return true;
     }
 
+    /**
+     * Prepare and return QUERY_STRING
+     *
+     * @return bool|string
+     * @deprecated since 1.7.0.2. Refactored and moved to Mage_Core_Controller_Request_Rewrite
+     */
     protected function _getQueryString()
     {
         if (!empty($_SERVER['QUERY_STRING'])) {
@@ -326,6 +333,7 @@ public function getStoreId()
      *
      * @param string $url
      * @param bool $isPermanent
+     * @deprecated since 1.7.0.2. Refactored and moved to Mage_Core_Controller_Request_Rewrite
      */
     protected function _sendRedirectHeaders($url, $isPermanent = false)
     {
diff --git a/app/code/core/Mage/Core/Model/Url/Rewrite/Interface.php b/app/code/core/Mage/Core/Model/Url/Rewrite/Interface.php
new file mode 100644
index 00000000000..d3bdb510043
--- /dev/null
+++ b/app/code/core/Mage/Core/Model/Url/Rewrite/Interface.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Core
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Url rewrite interface
+ *
+ * @category Mage
+ * @package Mage_Core
+ * @author Magento Core Team <core@magentocommerce.com>
+ */
+interface Mage_Core_Model_Url_Rewrite_Interface
+{
+    /**
+     * Load rewrite information for request
+     *
+     * @param array|string $path
+     * @return Mage_Core_Model_Url_Rewrite_Interface
+     */
+    public function loadByRequestPath($path);
+}
diff --git a/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php b/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php
new file mode 100644
index 00000000000..759e0129b46
--- /dev/null
+++ b/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php
@@ -0,0 +1,392 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Core
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Url rewrite request model
+ *
+ * @category Mage
+ * @package Mage_Core
+ * @author Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Core_Model_Url_Rewrite_Request
+{
+    /**
+     * Instance of request
+     *
+     * @var Zend_Controller_Request_Http
+     */
+    protected $_request;
+
+    /**
+     * Instance of core config model
+     *
+     * @var Mage_Core_Model_Config
+     */
+    protected $_config;
+
+    /**
+     * Collection of front controller's routers
+     *
+     * @var array
+     */
+    protected $_routers = array();
+
+    /**
+     * Instance of url rewrite model
+     *
+     * @var Mage_Core_Model_Url_Rewrite
+     */
+    protected $_rewrite;
+
+    /**
+     * Application
+     *
+     * @var Mage_Core_Model_App
+     */
+    protected $_app;
+
+    /**
+     * Mage Factory model
+     *
+     * @var Mage_Core_Model_Factory
+     */
+    protected $_factory;
+
+    /**
+     * Constructor
+     * Arguments:
+     *   request  - Zend_Controller_Request_Http
+     *   config   - Mage_Core_Model_Config
+     *   factory  - Mage_Core_Model_Factory
+     *   routers  - array
+     *
+     * @param array $args
+     */
+    public function __construct(array $args)
+    {
+        $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getModel('core/factory');
+        $this->_app     = !empty($args['app']) ? $args['app'] : Mage::app();
+        $this->_config  = !empty($args['config']) ? $args['config'] : Mage::getConfig();
+        $this->_request = !empty($args['request'])
+            ? $args['request'] : Mage::app()->getFrontController()->getRequest();
+        $this->_rewrite = !empty($args['rewrite'])
+            ? $args['rewrite'] : $this->_factory->getModel('core/url_rewrite');
+
+        if (!empty($args['routers'])) {
+            $this->_routers = $args['routers'];
+        }
+    }
+
+    /**
+     * Implement logic of custom rewrites
+     *
+     * @return bool
+     */
+    public function rewrite()
+    {
+        if (!Mage::isInstalled()) {
+            return false;
+        }
+
+        if (!$this->_request->isStraight()) {
+            Varien_Profiler::start('mage::dispatch::db_url_rewrite');
+            $this->_rewriteDb();
+            Varien_Profiler::stop('mage::dispatch::db_url_rewrite');
+        }
+
+        Varien_Profiler::start('mage::dispatch::config_url_rewrite');
+        $this->_rewriteConfig();
+        Varien_Profiler::stop('mage::dispatch::config_url_rewrite');
+
+        return true;
+    }
+
+    /**
+     * Implement logic of custom rewrites
+     *
+     * @return bool
+     */
+    protected function _rewriteDb()
+    {
+        if (null === $this->_rewrite->getStoreId() || false === $this->_rewrite->getStoreId()) {
+            $this->_rewrite->setStoreId($this->_app->getStore()->getId());
+        }
+
+        $requestCases = $this->_getRequestCases();
+        $this->_rewrite->loadByRequestPath($requestCases);
+
+        $fromStore = $this->_request->getQuery('___from_store');
+        if (!$this->_rewrite->getId() && $fromStore) {
+            $stores = $this->_app->getStores();
+            if (!empty($stores[$fromStore])) {
+                /** @var $store Mage_Core_Model_Store */
+                $store = $stores[$fromStore];
+                $fromStoreId = $store->getId();
+            } else {
+                return false;
+            }
+
+            $this->_rewrite->setStoreId($fromStoreId)->loadByRequestPath($requestCases);
+            if (!$this->_rewrite->getId()) {
+                return false;
+            }
+
+            // Load rewrite by id_path
+            $currentStore = $this->_app->getStore();
+            $this->_rewrite->setStoreId($currentStore->getId())->loadByIdPath($this->_rewrite->getIdPath());
+
+            $this->_setStoreCodeCookie($currentStore->getCode());
+
+            $targetUrl = $this->_request->getBaseUrl() . '/' . $this->_rewrite->getRequestPath();
+            $this->_sendRedirectHeaders($targetUrl, true);
+        }
+
+        if (!$this->_rewrite->getId()) {
+            return false;
+        }
+
+        $this->_request->setAlias(Mage_Core_Model_Url_Rewrite::REWRITE_REQUEST_PATH_ALIAS,
+            $this->_rewrite->getRequestPath());
+        $this->_processRedirectOptions();
+
+        return true;
+    }
+
+    /**
+     * Set store code to a cookie
+     *
+     * @param string $storeCode
+     */
+    protected function _setStoreCodeCookie($storeCode)
+    {
+        $this->_app->getCookie()->set(Mage_Core_Model_Store::COOKIE_NAME, $storeCode, true);
+    }
+
+    /**
+     * Process redirect (R) and permanent redirect (RP)
+     *
+     * @return Mage_Core_Model_Url_Rewrite_Request
+     */
+    protected function _processRedirectOptions()
+    {
+        $isPermanentRedirectOption = $this->_rewrite->hasOption('RP');
+
+        $external = substr($this->_rewrite->getTargetPath(), 0, 6);
+        if ($external === 'http:/' || $external === 'https:') {
+            $destinationStoreCode = $this->_app->getStore($this->_rewrite->getStoreId())->getCode();
+            $this->_setStoreCodeCookie($destinationStoreCode);
+            $this->_sendRedirectHeaders($this->_rewrite->getTargetPath(), $isPermanentRedirectOption);
+        }
+
+        $targetUrl = $this->_request->getBaseUrl() . '/' . $this->_rewrite->getTargetPath();
+
+        $storeCode = $this->_app->getStore()->getCode();
+        if (Mage::getStoreConfig('web/url/use_store') && !empty($storeCode)) {
+            $targetUrl = $this->_request->getBaseUrl() . '/' . $storeCode . '/' . $this->_rewrite->getTargetPath();
+        }
+
+        if ($this->_rewrite->hasOption('R') || $isPermanentRedirectOption) {
+            $this->_sendRedirectHeaders($targetUrl, $isPermanentRedirectOption);
+        }
+
+        $queryString = $this->_getQueryString();
+        if ($queryString) {
+            $targetUrl .= '?' . $queryString;
+        }
+
+        $this->_request->setRequestUri($targetUrl);
+        $this->_request->setPathInfo($this->_rewrite->getTargetPath());
+
+        return $this;
+    }
+
+    /**
+     * Apply configuration rewrites to current url
+     *
+     * @return bool
+     */
+    protected function _rewriteConfig()
+    {
+        $config = $this->_config->getNode('global/rewrite');
+        if (!$config) {
+            return false;
+        }
+        foreach ($config->children() as $rewrite) {
+            $from = (string)$rewrite->from;
+            $to = (string)$rewrite->to;
+            if (empty($from) || empty($to)) {
+                continue;
+            }
+            $from = $this->_processRewriteUrl($from);
+            $to   = $this->_processRewriteUrl($to);
+
+            $pathInfo = preg_replace($from, $to, $this->_request->getPathInfo());
+            if (isset($rewrite->complete)) {
+                $this->_request->setPathInfo($pathInfo);
+            } else {
+                $this->_request->rewritePathInfo($pathInfo);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Prepare request cases.
+     *
+     * We have two cases of incoming paths - with and without slashes at the end ("/somepath/" and "/somepath").
+     * Each of them matches two url rewrite request paths
+     * - with and without slashes at the end ("/somepath/" and "/somepath").
+     * Choose any matched rewrite, but in priority order that depends on same presence of slash and query params.
+     *
+     * @return array
+     */
+    protected function _getRequestCases()
+    {
+        $pathInfo = $this->_request->getPathInfo();
+        $requestPath = trim($pathInfo, '/');
+        $origSlash = (substr($pathInfo, -1) == '/') ? '/' : '';
+        // If there were final slash - add nothing to less priority paths. And vice versa.
+        $altSlash = $origSlash ? '' : '/';
+
+        $requestCases = array();
+        // Query params in request, matching "path + query" has more priority
+        $queryString = $this->_getQueryString();
+        if ($queryString) {
+            $requestCases[] = $requestPath . $origSlash . '?' . $queryString;
+            $requestCases[] = $requestPath . $altSlash . '?' . $queryString;
+        }
+        $requestCases[] = $requestPath . $origSlash;
+        $requestCases[] = $requestPath . $altSlash;
+        return $requestCases;
+    }
+
+    /**
+     * Add location header and disable browser page caching
+     *
+     * @param string $url
+     * @param bool $isPermanent
+     */
+    protected function _sendRedirectHeaders($url, $isPermanent = false)
+    {
+        if ($isPermanent) {
+            header('HTTP/1.1 301 Moved Permanently');
+        }
+
+        header('Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0');
+        header('Pragma: no-cache');
+        header('Location: ' . $url);
+        exit;
+    }
+
+    /**
+     * Prepare and return QUERY_STRING
+     *
+     * @return bool|string
+     */
+    protected function _getQueryString()
+    {
+        if (!empty($_SERVER['QUERY_STRING'])) {
+            $queryParams = array();
+            parse_str($_SERVER['QUERY_STRING'], $queryParams);
+            $hasChanges = false;
+            foreach ($queryParams as $key => $value) {
+                if (substr($key, 0, 3) === '___') {
+                    unset($queryParams[$key]);
+                    $hasChanges = true;
+                }
+            }
+            if ($hasChanges) {
+                return http_build_query($queryParams);
+            } else {
+                return $_SERVER['QUERY_STRING'];
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Replace route name placeholders in url to front name
+     *
+     * @param string $url
+     * @return string
+     */
+    protected function _processRewriteUrl($url)
+    {
+        $startPos = strpos($url, '{');
+        if ($startPos !== false) {
+            $endPos = strpos($url, '}');
+            $routeName = substr($url, $startPos + 1, $endPos - $startPos - 1);
+            $router = $this->_getRouterByRoute($routeName);
+            if ($router) {
+                $frontName = $router->getFrontNameByRoute($routeName);
+                $url = str_replace('{' . $routeName . '}', $frontName, $url);
+            }
+        }
+        return $url;
+    }
+
+    /**
+     * Retrieve router by name
+     *
+     * @param string $name
+     * @return Mage_Core_Controller_Varien_Router_Abstract|bool
+     */
+    protected function _getRouter($name)
+    {
+        if (isset($this->_routers[$name])) {
+            return $this->_routers[$name];
+        }
+        return false;
+    }
+
+    /**
+     * Retrieve router by name
+     *
+     * @param string $routeName
+     * @return Mage_Core_Controller_Varien_Router_Abstract
+     */
+    protected function _getRouterByRoute($routeName)
+    {
+        // empty route supplied - return base url
+        if (empty($routeName)) {
+            $router = $this->_getRouter('standard');
+        } elseif ($this->_getRouter('admin')->getFrontNameByRoute($routeName)) {
+            // try standard router url assembly
+            $router = $this->_getRouter('admin');
+        } elseif ($this->_getRouter('standard')->getFrontNameByRoute($routeName)) {
+            // try standard router url assembly
+            $router = $this->_getRouter('standard');
+        } else {
+            // try custom router url assembly
+            $router = $this->_getRouter($routeName);
+            if (!$router) {
+                // get default router url
+                $router = $this->_getRouter('default');
+            }
+        }
+        return $router;
+    }
+}
diff --git a/app/code/core/Mage/Core/Model/Variable.php b/app/code/core/Mage/Core/Model/Variable.php
index 56f163a91d6..0d24f0f9e18 100644
--- a/app/code/core/Mage/Core/Model/Variable.php
+++ b/app/code/core/Mage/Core/Model/Variable.php
@@ -103,7 +103,7 @@ public function getValue($type = null)
             $value = $this->getData('plain_value');
             //escape html if type is html, but html value is not defined
             if ($type == self::TYPE_HTML) {
-                $value = nl2br(Mage::helper('core')->htmlEscape($value));
+                $value = nl2br(Mage::helper('core')->escapeHtml($value));
             }
             return $value;
         }
diff --git a/app/code/core/Mage/Core/etc/config.xml b/app/code/core/Mage/Core/etc/config.xml
index a36a57421d2..3fcb24c8c26 100644
--- a/app/code/core/Mage/Core/etc/config.xml
+++ b/app/code/core/Mage/Core/etc/config.xml
@@ -28,7 +28,7 @@
 <config>
     <modules>
         <Mage_Core>
-            <version>1.6.0.2</version>
+            <version>1.6.0.3</version>
         </Mage_Core>
     </modules>
     <global>
@@ -146,6 +146,12 @@
                 <writer_model>Zend_Log_Writer_Stream</writer_model>
             </core>
         </log>
+        <url_rewrite>
+            <model>core/url_rewrite</model>
+        </url_rewrite>
+        <request_rewrite>
+            <model>core/url_rewrite_request</model>
+        </request_rewrite>
     </global>
     <frontend>
         <routers>
@@ -209,6 +215,14 @@
                     </synchronize_notification>
                 </observers>
             </show_synchronize_message>
+            <clean_cache_by_tags>
+                <observers>
+                    <clean_cache_observer>
+                        <class>core/observer</class>
+                        <method>cleanCacheByTags</method>
+                    </clean_cache_observer>
+                </observers>
+            </clean_cache_by_tags>
         </events>
     </adminhtml>
     <install>
diff --git a/app/code/core/Mage/Core/etc/jstranslator.xml b/app/code/core/Mage/Core/etc/jstranslator.xml
index 4a552ea7df2..f042cd8e683 100644
--- a/app/code/core/Mage/Core/etc/jstranslator.xml
+++ b/app/code/core/Mage/Core/etc/jstranslator.xml
@@ -72,6 +72,9 @@
     <validate-date translate="message" module="core">
         <message>Please enter a valid date.</message>
     </validate-date>
+    <validate-date-range translate="message" module="core">
+        <message>The From Date value should be less than or equal to the To Date value.</message>
+    </validate-date-range>
     <validate-email translate="message" module="core">
         <message>Please enter a valid email address. For example johndoe@domain.com.</message>
     </validate-email>
diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml
index 37b31d4331d..d2bf9396518 100644
--- a/app/code/core/Mage/Core/etc/system.xml
+++ b/app/code/core/Mage/Core/etc/system.xml
@@ -1243,7 +1243,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
-                            <comment>&lt;strong style="color:red"&gt;Warning!&lt;/strong&gt; When using CDN, in some cases JavaScript may not run properly if CDN is not in your subdomain</comment>
+                            <comment><![CDATA[<strong style="color:red">Warning!</strong> When using CDN, in some cases JavaScript may not run properly if CDN is not in your subdomain]]></comment>
                         </base_js_url>
                     </fields>
                 </unsecure>
@@ -1301,7 +1301,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
-                            <comment>&lt;strong style="color:red"&gt;Warning!&lt;/strong&gt; When using CDN, in some cases JavaScript may not run properly if CDN is not in your subdomain</comment>
+                            <comment><![CDATA[<strong style="color:red">Warning!</strong> When using CDN, in some cases JavaScript may not run properly if CDN is not in your subdomain]]></comment>
                         </base_js_url>
                         <use_in_frontend translate="label">
                             <label>Use Secure URLs in Frontend</label>
diff --git a/app/code/core/Mage/Core/sql/core_setup/install-1.6.0.0.php b/app/code/core/Mage/Core/sql/core_setup/install-1.6.0.0.php
index e34461cb546..1ac53bc41dc 100644
--- a/app/code/core/Mage/Core/sql/core_setup/install-1.6.0.0.php
+++ b/app/code/core/Mage/Core/sql/core_setup/install-1.6.0.0.php
@@ -354,7 +354,7 @@
         ), 'Key Id of Translation')
     ->addColumn('string', Varien_Db_Ddl_Table::TYPE_TEXT, 255, array(
         'nullable'  => false,
-        'default'   => 'Translate String',
+        'default'   => Mage_Core_Model_Translate::DEFAULT_STRING,
         ), 'Translation String')
     ->addColumn('store_id', Varien_Db_Ddl_Table::TYPE_SMALLINT, null, array(
         'unsigned'  => true,
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-data-upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-data-upgrade-1.6.0.2-1.6.0.3.php
new file mode 100644
index 00000000000..e1692061a8a
--- /dev/null
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-data-upgrade-1.6.0.2-1.6.0.3.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Core
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/* @var $installer Mage_Core_Model_Resource_Setup */
+$installer = $this;
+$connection = $installer->getConnection();
+$connection->update($installer->getTable('core/translate'), array(
+    'crc_string' => new Zend_Db_Expr('CRC32(' . $connection->quoteIdentifier('string') . ')')
+));
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php
index 72dcfd19d45..8074e92b722 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php
@@ -726,7 +726,7 @@
                 'type'      => Varien_Db_Ddl_Table::TYPE_TEXT,
                 'length'    => 255,
                 'nullable'  => false,
-                'default'   => 'Translate String',
+                'default'   => Mage_Core_Model_Translate::DEFAULT_STRING,
                 'comment'   => 'Translation String'
             ),
             'store_id' => array(
diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.2-1.6.0.3.php
new file mode 100644
index 00000000000..bb0fb564312
--- /dev/null
+++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.2-1.6.0.3.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Core
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/* @var $installer Mage_Core_Model_Resource_Setup */
+$installer = $this;
+
+$installer->startSetup();
+$connection = $installer->getConnection();
+$table = $installer->getTable('core/translate');
+
+$connection->dropIndex($table, $installer->getIdxName(
+    'core/translate',
+    array('store_id', 'locale', 'string'),
+    Varien_Db_Adapter_Interface::INDEX_TYPE_UNIQUE
+));
+
+$connection->addColumn($table, 'crc_string', array(
+    'type'     => Varien_Db_Ddl_Table::TYPE_BIGINT,
+    'nullable' => false,
+    'default'  => crc32(Mage_Core_Model_Translate::DEFAULT_STRING),
+    'comment'  => 'Translation String CRC32 Hash',
+));
+
+$connection->addIndex($table, $installer->getIdxName(
+    'core/translate',
+    array('store_id', 'locale', 'crc_string', 'string'),
+    Varien_Db_Adapter_Interface::INDEX_TYPE_UNIQUE
+), array('store_id', 'locale', 'crc_string', 'string'), Varien_Db_Adapter_Interface::INDEX_TYPE_UNIQUE);
+
+$installer->endSetup();
diff --git a/app/code/core/Mage/Cron/Model/Observer.php b/app/code/core/Mage/Cron/Model/Observer.php
index 3057cb4377f..c09fe1c601e 100644
--- a/app/code/core/Mage/Cron/Model/Observer.php
+++ b/app/code/core/Mage/Cron/Model/Observer.php
@@ -49,7 +49,7 @@ class Mage_Cron_Model_Observer
 
     /**
      * Process cron queue
-     * Geterate tasks schedule
+     * Generate tasks schedule
      * Cleanup tasks schedule
      *
      * @param Varien_Event_Observer $observer
@@ -57,11 +57,10 @@ class Mage_Cron_Model_Observer
     public function dispatch($observer)
     {
         $schedules = $this->getPendingSchedules();
-        $scheduleLifetime = Mage::getStoreConfig(self::XML_PATH_SCHEDULE_LIFETIME) * 60;
-        $now = time();
         $jobsRoot = Mage::getConfig()->getNode('crontab/jobs');
         $defaultJobsRoot = Mage::getConfig()->getNode('default/crontab/jobs');
 
+        /** @var $schedule Mage_Cron_Model_Schedule */
         foreach ($schedules->getIterator() as $schedule) {
             $jobConfig = $jobsRoot->{$schedule->getJobCode()};
             if (!$jobConfig || !$jobConfig->run) {
@@ -70,63 +69,33 @@ public function dispatch($observer)
                     continue;
                 }
             }
+            $this->_processJob($schedule, $jobConfig);
+        }
 
-            $runConfig = $jobConfig->run;
-            $time = strtotime($schedule->getScheduledAt());
-            if ($time > $now) {
-                continue;
-            }
-            try {
-                $errorStatus = Mage_Cron_Model_Schedule::STATUS_ERROR;
-                $errorMessage = Mage::helper('cron')->__('Unknown error.');
-
-                if ($time < $now - $scheduleLifetime) {
-                    $errorStatus = Mage_Cron_Model_Schedule::STATUS_MISSED;
-                    Mage::throwException(Mage::helper('cron')->__('Too late for the schedule.'));
-                }
-
-                if ($runConfig->model) {
-                    if (!preg_match(self::REGEX_RUN_MODEL, (string)$runConfig->model, $run)) {
-                        Mage::throwException(Mage::helper('cron')->__('Invalid model/method definition, expecting "model/class::method".'));
-                    }
-                    if (!($model = Mage::getModel($run[1])) || !method_exists($model, $run[2])) {
-                        Mage::throwException(Mage::helper('cron')->__('Invalid callback: %s::%s does not exist', $run[1], $run[2]));
-                    }
-                    $callback = array($model, $run[2]);
-                    $arguments = array($schedule);
-                }
-                if (empty($callback)) {
-                    Mage::throwException(Mage::helper('cron')->__('No callbacks found'));
-                }
-
-                if (!$schedule->tryLockJob()) {
-                    // another cron started this job intermittently, so skip it
-                    continue;
-                }
-                /**
-                    though running status is set in tryLockJob we must set it here because the object
-                    was loaded with a pending status and will set it back to pending if we don't set it here
-                 */
-                $schedule
-                    ->setStatus(Mage_Cron_Model_Schedule::STATUS_RUNNING)
-                    ->setExecutedAt(strftime('%Y-%m-%d %H:%M:%S', time()))
-                    ->save();
-
-                call_user_func_array($callback, $arguments);
-
-                $schedule
-                    ->setStatus(Mage_Cron_Model_Schedule::STATUS_SUCCESS)
-                    ->setFinishedAt(strftime('%Y-%m-%d %H:%M:%S', time()));
+        $this->generate();
+        $this->cleanup();
+    }
 
-            } catch (Exception $e) {
-                $schedule->setStatus($errorStatus)
-                    ->setMessages($e->__toString());
+    /**
+     * Process cron queue for tasks marked as always
+     *
+     * @param Varien_Event_Observer $observer
+     */
+    public function dispatchAlways($observer)
+    {
+        $jobsRoot = Mage::getConfig()->getNode('crontab/jobs');
+        if ($jobsRoot instanceof Varien_Simplexml_Element) {
+            foreach ($jobsRoot->children() as $jobCode => $jobConfig) {
+                $this->_processAlwaysTask($jobCode, $jobConfig);
             }
-            $schedule->save();
         }
 
-        $this->generate();
-        $this->cleanup();
+        $defaultJobsRoot = Mage::getConfig()->getNode('default/crontab/jobs');
+        if ($defaultJobsRoot instanceof Varien_Simplexml_Element) {
+            foreach ($defaultJobsRoot->children() as $jobCode => $jobConfig) {
+                $this->_processAlwaysTask($jobCode, $jobConfig);
+            }
+        }
     }
 
     public function getPendingSchedules()
@@ -204,7 +173,7 @@ protected function _generateJobs($jobs, $exists)
             if (empty($cronExpr) && $jobConfig->schedule->cron_expr) {
                 $cronExpr = (string)$jobConfig->schedule->cron_expr;
             }
-            if (!$cronExpr) {
+            if (!$cronExpr || $cronExpr == 'always') {
                 continue;
             }
 
@@ -230,6 +199,11 @@ protected function _generateJobs($jobs, $exists)
         return $this;
     }
 
+    /**
+     * Clean up the history of tasks
+     *
+     * @return Mage_Cron_Model_Observer
+     */
     public function cleanup()
     {
         // check if history cleanup is needed
@@ -243,7 +217,8 @@ public function cleanup()
                 Mage_Cron_Model_Schedule::STATUS_SUCCESS,
                 Mage_Cron_Model_Schedule::STATUS_MISSED,
                 Mage_Cron_Model_Schedule::STATUS_ERROR,
-            )))->load();
+            )))
+            ->load();
 
         $historyLifetimes = array(
             Mage_Cron_Model_Schedule::STATUS_SUCCESS => Mage::getStoreConfig(self::XML_PATH_HISTORY_SUCCESS)*60,
@@ -263,4 +238,128 @@ public function cleanup()
 
         return $this;
     }
+
+    /**
+     * Processing cron task which is marked as always
+     *
+     * @param $jobCode
+     * @param $jobConfig
+     * @return Mage_Cron_Model_Observer
+     */
+    protected function _processAlwaysTask($jobCode, $jobConfig)
+    {
+        if (!$jobConfig || !$jobConfig->run) {
+            return;
+        }
+
+        $cronExpr = isset($jobConfig->schedule->cron_expr)? (string) $jobConfig->schedule->cron_expr : '';
+        if ($cronExpr != 'always') {
+            return;
+        }
+
+        $schedule = $this->_getAlwaysJobSchedule($jobCode);
+        if ($schedule !== false) {
+            $this->_processJob($schedule, $jobConfig, true);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Process cron task
+     *
+     * @param Mage_Cron_Model_Schedule $schedule
+     * @param $jobConfig
+     * @param bool $isAlways
+     * @return Mage_Cron_Model_Observer
+     */
+    protected function _processJob($schedule, $jobConfig, $isAlways = false)
+    {
+        $runConfig = $jobConfig->run;
+        if (!$isAlways) {
+            $scheduleLifetime = Mage::getStoreConfig(self::XML_PATH_SCHEDULE_LIFETIME) * 60;
+            $now = time();
+            $time = strtotime($schedule->getScheduledAt());
+            if ($time > $now) {
+                return;
+            }
+        }
+
+        $errorStatus = Mage_Cron_Model_Schedule::STATUS_ERROR;
+        try {
+            if (!$isAlways) {
+                if ($time < $now - $scheduleLifetime) {
+                    $errorStatus = Mage_Cron_Model_Schedule::STATUS_MISSED;
+                    Mage::throwException(Mage::helper('cron')->__('Too late for the schedule.'));
+                }
+            }
+            if ($runConfig->model) {
+                if (!preg_match(self::REGEX_RUN_MODEL, (string)$runConfig->model, $run)) {
+                    Mage::throwException(Mage::helper('cron')->__('Invalid model/method definition, expecting "model/class::method".'));
+                }
+                if (!($model = Mage::getModel($run[1])) || !method_exists($model, $run[2])) {
+                    Mage::throwException(Mage::helper('cron')->__('Invalid callback: %s::%s does not exist', $run[1], $run[2]));
+                }
+                $callback = array($model, $run[2]);
+                $arguments = array($schedule);
+            }
+            if (empty($callback)) {
+                Mage::throwException(Mage::helper('cron')->__('No callbacks found'));
+            }
+
+            if (!$isAlways) {
+                if (!$schedule->tryLockJob()) {
+                    // another cron started this job intermittently, so skip it
+                    return;
+                }
+                /**
+                though running status is set in tryLockJob we must set it here because the object
+                was loaded with a pending status and will set it back to pending if we don't set it here
+                 */
+            }
+
+            $schedule
+                ->setExecutedAt(strftime('%Y-%m-%d %H:%M:%S', time()))
+                ->save();
+
+            call_user_func_array($callback, $arguments);
+
+            $schedule
+                ->setStatus(Mage_Cron_Model_Schedule::STATUS_SUCCESS)
+                ->setFinishedAt(strftime('%Y-%m-%d %H:%M:%S', time()));
+
+        } catch (Exception $e) {
+            $schedule->setStatus($errorStatus)
+                ->setMessages($e->__toString());
+        }
+        $schedule->save();
+
+        return $this;
+    }
+
+    /**
+     * Get job for task marked as always
+     *
+     * @param $jobCode
+     * @return bool|Mage_Cron_Model_Schedule
+     */
+    protected function _getAlwaysJobSchedule($jobCode)
+    {
+        /** @var $schedule Mage_Cron_Model_Schedule */
+        $schedule = Mage::getModel('cron/schedule')->load($jobCode, 'job_code');
+        if ($schedule->getId() === null) {
+            $ts = strftime('%Y-%m-%d %H:%M:00', time());
+            $schedule->setJobCode($jobCode)
+                ->setStatus(Mage_Cron_Model_Schedule::STATUS_RUNNING)
+                ->setCreatedAt($ts)
+                ->setScheduledAt($ts)
+                ->save();
+            return $schedule;
+        } else if ($schedule->getStatus() != Mage_Cron_Model_Schedule::STATUS_RUNNING) {
+            $schedule->tryLockJob($schedule->getStatus());
+            return $schedule;
+        }
+
+        return false;
+    }
 }
diff --git a/app/code/core/Mage/Cron/Model/Schedule.php b/app/code/core/Mage/Cron/Model/Schedule.php
index f3d91597a92..7a02912e386 100644
--- a/app/code/core/Mage/Cron/Model/Schedule.php
+++ b/app/code/core/Mage/Cron/Model/Schedule.php
@@ -208,12 +208,13 @@ public function getNumeric($value)
      * Sets a job to STATUS_RUNNING only if it is currently in STATUS_PENDING.
      * Returns true if status was changed and false otherwise.
      *
+     * @param $oldStatus
      * This is used to implement locking for cron jobs.
      *
      * @return boolean
      */
-    public function tryLockJob()
+    public function tryLockJob($oldStatus = self::STATUS_PENDING)
     {
-        return $this->_getResource()->trySetJobStatusAtomic($this->getId(), self::STATUS_RUNNING,self::STATUS_PENDING);
+        return $this->_getResource()->trySetJobStatusAtomic($this->getId(), self::STATUS_RUNNING, $oldStatus);
     }
 }
diff --git a/app/code/core/Mage/Cron/etc/config.xml b/app/code/core/Mage/Cron/etc/config.xml
index e4da3ab834c..93fb7229ae3 100644
--- a/app/code/core/Mage/Cron/etc/config.xml
+++ b/app/code/core/Mage/Cron/etc/config.xml
@@ -65,6 +65,14 @@
                     </cron_observer>
                 </observers>
             </default>
+            <always>
+                <observers>
+                    <cron_observer>
+                        <class>cron/observer</class>
+                        <method>dispatchAlways</method>
+                    </cron_observer>
+                </observers>
+            </always>
         </events>
     </crontab>
     <default>
diff --git a/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php b/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php
index 475044df7ff..d7350ddffc7 100644
--- a/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php
+++ b/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php
@@ -32,7 +32,9 @@
  * @package    Mage_Customer
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_Customer_Block_Address_Renderer_Default extends Mage_Core_Block_Abstract implements Mage_Customer_Block_Address_Renderer_Interface
+class Mage_Customer_Block_Address_Renderer_Default
+    extends Mage_Core_Block_Abstract
+    implements Mage_Customer_Block_Address_Renderer_Interface
 {
     /**
      * Format type object
@@ -65,7 +67,9 @@ public function setType(Varien_Object $type)
 
     public function getFormat(Mage_Customer_Model_Address_Abstract $address=null)
     {
-        $countryFormat = is_null($address) ? false : $address->getCountryModel()->getFormat($this->getType()->getCode());
+        $countryFormat = is_null($address)
+            ? false
+            : $address->getCountryModel()->getFormat($this->getType()->getCode());
         $format = $countryFormat ? $countryFormat->getFormat() : $this->getType()->getDefaultFormat();
         return $format;
     }
@@ -105,7 +109,7 @@ public function render(Mage_Customer_Model_Address_Abstract $address, $format=nu
             if ($attribute->getAttributeCode() == 'country_id') {
                 $data['country'] = $address->getCountryModel()->getName();
             } else if ($attribute->getAttributeCode() == 'region') {
-                $data['region'] = $address->getRegion();
+                $data['region'] = Mage::helper('directory')->__($address->getRegion());
             } else {
                 $dataModel = Mage_Customer_Model_Attribute_Data::factory($attribute, $address);
                 $value     = $dataModel->outputValue($dataFormat);
@@ -123,7 +127,7 @@ public function render(Mage_Customer_Model_Address_Abstract $address, $format=nu
 
         if ($this->getType()->getHtmlEscape()) {
             foreach ($data as $key => $value) {
-                $data[$key] = $this->htmlEscape($value);
+                $data[$key] = $this->escapeHtml($value);
             }
         }
 
diff --git a/app/code/core/Mage/Customer/Model/Customer.php b/app/code/core/Mage/Customer/Model/Customer.php
index 75d5e9f59b8..747ce7a87c9 100644
--- a/app/code/core/Mage/Customer/Model/Customer.php
+++ b/app/code/core/Mage/Customer/Model/Customer.php
@@ -33,7 +33,7 @@
  */
 class Mage_Customer_Model_Customer extends Mage_Core_Model_Abstract
 {
-    /**
+    /**#@+
      * Configuration pathes for email templates and identities
      */
     const XML_PATH_REGISTER_EMAIL_TEMPLATE = 'customer/create_account/email_template';
@@ -41,23 +41,30 @@ class Mage_Customer_Model_Customer extends Mage_Core_Model_Abstract
     const XML_PATH_REMIND_EMAIL_TEMPLATE = 'customer/password/remind_email_template';
     const XML_PATH_FORGOT_EMAIL_TEMPLATE = 'customer/password/forgot_email_template';
     const XML_PATH_FORGOT_EMAIL_IDENTITY = 'customer/password/forgot_email_identity';
-
     const XML_PATH_DEFAULT_EMAIL_DOMAIN         = 'customer/create_account/email_domain';
     const XML_PATH_IS_CONFIRM                   = 'customer/create_account/confirm';
     const XML_PATH_CONFIRM_EMAIL_TEMPLATE       = 'customer/create_account/email_confirmation_template';
     const XML_PATH_CONFIRMED_EMAIL_TEMPLATE     = 'customer/create_account/email_confirmed_template';
     const XML_PATH_GENERATE_HUMAN_FRIENDLY_ID   = 'customer/create_account/generate_human_friendly_id';
+    /**#@-*/
 
-    /**
+    /**#@+
      * Codes of exceptions related to customer model
      */
     const EXCEPTION_EMAIL_NOT_CONFIRMED       = 1;
     const EXCEPTION_INVALID_EMAIL_OR_PASSWORD = 2;
     const EXCEPTION_EMAIL_EXISTS              = 3;
     const EXCEPTION_INVALID_RESET_PASSWORD_LINK_TOKEN = 4;
+    /**#@-*/
 
+    /**#@+
+     * Subscriptions
+     */
     const SUBSCRIBED_YES = 'yes';
     const SUBSCRIBED_NO  = 'no';
+    /**#@-*/
+
+    const CACHE_TAG = 'customer';
 
     /**
      * Model event prefix
@@ -116,6 +123,13 @@ class Mage_Customer_Model_Customer extends Mage_Core_Model_Abstract
      */
     protected $_isReadonly = false;
 
+    /**
+     * Model cache tag for clear cache in after save and after delete
+     *
+     * @var string
+     */
+    protected $_cacheTag = self::CACHE_TAG;
+
     /**
      * Confirmation requirement flag
      *
@@ -366,7 +380,19 @@ public function setPassword($password)
      */
     public function hashPassword($password, $salt = null)
     {
-        return Mage::helper('core')->getHash($password, !is_null($salt) ? $salt : 2);
+        return $this->_getHelper('core')
+            ->getHash($password, !is_null($salt) ? $salt : Mage_Admin_Model_User::HASH_SALT_LENGTH);
+    }
+
+    /**
+     * Get helper instance
+     *
+     * @param string $helperName
+     * @return Mage_Core_Helper_Abstract
+     */
+    protected function _getHelper($helperName)
+    {
+        return Mage::helper($helperName);
     }
 
     /**
@@ -561,9 +587,9 @@ public function isAddressPrimary(Mage_Customer_Model_Address $address)
     public function sendNewAccountEmail($type = 'registered', $backUrl = '', $storeId = '0')
     {
         $types = array(
-            'registered'   => self::XML_PATH_REGISTER_EMAIL_TEMPLATE,  // welcome email, when confirmation is disabled
+            'registered'   => self::XML_PATH_REGISTER_EMAIL_TEMPLATE, // welcome email, when confirmation is disabled
             'confirmed'    => self::XML_PATH_CONFIRMED_EMAIL_TEMPLATE, // welcome email, when confirmation is enabled
-            'confirmation' => self::XML_PATH_CONFIRM_EMAIL_TEMPLATE,   // email with confirmation link
+            'confirmation' => self::XML_PATH_CONFIRM_EMAIL_TEMPLATE, // email with confirmation link
         );
         if (!isset($types[$type])) {
             Mage::throwException(Mage::helper('customer')->__('Wrong transactional account email type'));
@@ -1096,7 +1122,7 @@ function validateAddress(array $data, $type = 'billing')
         $prefix = $type ? $type . '_' : '';
 
         if ($data) {
-            foreach($fields as $field) {
+            foreach ($fields as $field) {
                 if (!isset($data[$prefix . $field])) {
                     return false;
                 }
diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php
index b31de2fa925..275397eb37e 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php
@@ -35,4 +35,33 @@
 class Mage_Customer_Model_Entity_Address_Attribute_Source_Country
     extends Mage_Customer_Model_Resource_Address_Attribute_Source_Country
 {
+    /**
+     * Factory instance
+     *
+     * @var Mage_Core_Model_Abstract
+     */
+    protected $_factory;
+
+    /**
+     * Constructor for Mage_Customer_Model_Entity_Address_Attribute_Source_Country
+     *
+     * @param array $args
+     */
+    public function __construct(array $args = array())
+    {
+        $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('core/factory');
+    }
+    /**
+     * Retrieve all options
+     *
+     * @return array
+     */
+    public function getAllOptions()
+    {
+        if (!$this->_options) {
+            $this->_options = $this->_factory->getResourceModel('directory/country_collection')
+                ->loadByStore($this->getAttribute()->getStoreId())->toOptionArray();
+        }
+        return $this->_options;
+    }
 }
diff --git a/app/code/core/Mage/Customer/controllers/AccountController.php b/app/code/core/Mage/Customer/controllers/AccountController.php
index 98bac6a5094..4c503a264f5 100644
--- a/app/code/core/Mage/Customer/controllers/AccountController.php
+++ b/app/code/core/Mage/Customer/controllers/AccountController.php
@@ -153,8 +153,8 @@ public function loginPostAction()
                 } catch (Mage_Core_Exception $e) {
                     switch ($e->getCode()) {
                         case Mage_Customer_Model_Customer::EXCEPTION_EMAIL_NOT_CONFIRMED:
-                            $value = Mage::helper('customer')->getEmailConfirmationUrl($login['username']);
-                            $message = Mage::helper('customer')->__('This account is not confirmed. <a href="%s">Click here</a> to resend confirmation email.', $value);
+                            $value = $this->_getHelper('customer')->getEmailConfirmationUrl($login['username']);
+                            $message = $this->_getHelper('customer')->__('This account is not confirmed. <a href="%s">Click here</a> to resend confirmation email.', $value);
                             break;
                         case Mage_Customer_Model_Customer::EXCEPTION_INVALID_EMAIL_OR_PASSWORD:
                             $message = $e->getMessage();
@@ -184,7 +184,7 @@ protected function _loginPostRedirect()
 
         if (!$session->getBeforeAuthUrl() || $session->getBeforeAuthUrl() == Mage::getBaseUrl()) {
             // Set default URL to redirect customer to
-            $session->setBeforeAuthUrl(Mage::helper('customer')->getAccountUrl());
+            $session->setBeforeAuthUrl($this->_getHelper('customer')->getAccountUrl());
             // Redirect customer to the last page visited after logging in
             if ($session->isLoggedIn()) {
                 if (!Mage::getStoreConfigFlag(
@@ -193,8 +193,8 @@ protected function _loginPostRedirect()
                     $referer = $this->getRequest()->getParam(Mage_Customer_Helper_Data::REFERER_QUERY_PARAM_NAME);
                     if ($referer) {
                         // Rebuild referer URL to handle the case when SID was changed
-                        $referer = Mage::getModel('core/url')
-                            ->getRebuiltUrl(Mage::helper('core')->urlDecode($referer));
+                        $referer = $this->_getModel('core/url')
+                            ->getRebuiltUrl( $this->_getHelper('core')->urlDecode($referer));
                         if ($this->_isUrlInternal($referer)) {
                             $session->setBeforeAuthUrl($referer);
                         }
@@ -203,10 +203,10 @@ protected function _loginPostRedirect()
                     $session->setBeforeAuthUrl($session->getAfterAuthUrl(true));
                 }
             } else {
-                $session->setBeforeAuthUrl(Mage::helper('customer')->getLoginUrl());
+                $session->setBeforeAuthUrl( $this->_getHelper('customer')->getLoginUrl());
             }
-        } else if ($session->getBeforeAuthUrl() == Mage::helper('customer')->getLogoutUrl()) {
-            $session->setBeforeAuthUrl(Mage::helper('customer')->getDashboardUrl());
+        } else if ($session->getBeforeAuthUrl() ==  $this->_getHelper('customer')->getLogoutUrl()) {
+            $session->setBeforeAuthUrl( $this->_getHelper('customer')->getDashboardUrl());
         } else {
             if (!$session->getAfterAuthUrl()) {
                 $session->setAfterAuthUrl($session->getBeforeAuthUrl());
@@ -224,7 +224,8 @@ protected function _loginPostRedirect()
     public function logoutAction()
     {
         $this->_getSession()->logout()
-            ->setBeforeAuthUrl(Mage::getUrl());
+            ->renewSession()
+            ->setBeforeAuthUrl($this->_getRefererUrl());
 
         $this->_redirect('*/*/logoutSuccess');
     }
@@ -258,126 +259,255 @@ public function createAction()
      */
     public function createPostAction()
     {
+        /** @var $session Mage_Customer_Model_Session */
         $session = $this->_getSession();
         if ($session->isLoggedIn()) {
             $this->_redirect('*/*/');
             return;
         }
         $session->setEscapeMessages(true); // prevent XSS injection in user input
-        if ($this->getRequest()->isPost()) {
-            $errors = array();
+        if (!$this->getRequest()->isPost()) {
+            $errUrl = $this->_getUrl('*/*/create', array('_secure' => true));
+            $this->_redirectError($errUrl);
+            return;
+        }
 
-            if (!$customer = Mage::registry('current_customer')) {
-                $customer = Mage::getModel('customer/customer')->setId(null);
+        $customer = $this->_getCustomer();
+
+        try {
+            $errors = $this->_getCustomerErrors($customer);
+
+            if (empty($errors)) {
+                $customer->save();
+                $this->_dispatchRegisterSuccess($customer);
+                $this->_successProcessRegistration($customer);
+                return;
+            } else {
+                $this->_addSessionError($errors);
+            }
+        } catch (Mage_Core_Exception $e) {
+            $session->setCustomerFormData($this->getRequest()->getPost());
+            if ($e->getCode() === Mage_Customer_Model_Customer::EXCEPTION_EMAIL_EXISTS) {
+                $url = $this->_getUrl('customer/account/forgotpassword');
+                $message = $this->__('There is already an account with this email address. If you are sure that it is your email address, <a href="%s">click here</a> to get your password and access your account.', $url);
+                $session->setEscapeMessages(false);
+            } else {
+                $message = $e->getMessage();
             }
+            $session->addError($message);
+        } catch (Exception $e) {
+            $session->setCustomerFormData($this->getRequest()->getPost())
+                ->addException($e, $this->__('Cannot save the customer.'));
+        }
+        $errUrl = $this->_getUrl('*/*/create', array('_secure' => true));
+        $this->_redirectError($errUrl);
+    }
 
-            /* @var $customerForm Mage_Customer_Model_Form */
-            $customerForm = Mage::getModel('customer/form');
-            $customerForm->setFormCode('customer_account_create')
-                ->setEntity($customer);
+    /**
+     * Success Registration
+     *
+     * @param Mage_Customer_Model_Customer $customer
+     * @return Mage_Customer_AccountController
+     */
+    protected function _successProcessRegistration(Mage_Customer_Model_Customer $customer)
+    {
+        $session = $this->_getSession();
+        if ($customer->isConfirmationRequired()) {
+            /** @var $app Mage_Core_Model_App */
+            $app = $this->_getApp();
+            /** @var $store  Mage_Core_Model_Store*/
+            $store = $app->getStore();
+            $customer->sendNewAccountEmail(
+                'confirmation',
+                $session->getBeforeAuthUrl(),
+                $store->getId()
+            );
+            $customerHelper = $this->_getHelper('customer');
+            $session->addSuccess($this->__('Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href="%s">click here</a>.',
+                $customerHelper->getEmailConfirmationUrl($customer->getEmail())));
+            $url = $this->_getUrl('*/*/index', array('_secure' => true));
+        } else {
+            $session->setCustomerAsLoggedIn($customer);
+            $session->renewSession();
+            $url = $this->_welcomeCustomer($customer);
+        }
+        $this->_redirectSuccess($url);
+        return $this;
+    }
 
-            $customerData = $customerForm->extractData($this->getRequest());
+    /**
+     * Get Customer Model
+     *
+     * @return Mage_Customer_Model_Customer
+     */
+    protected function _getCustomer()
+    {
+        $customer = $this->_getFromRegistry('current_customer');
+        if (!$customer) {
+            $customer = $this->_getModel('customer/customer')->setId(null);
+        }
+        if ($this->getRequest()->getParam('is_subscribed', false)) {
+            $customer->setIsSubscribed(1);
+        }
+        /**
+         * Initialize customer group id
+         */
+        $customer->getGroupId();
 
-            if ($this->getRequest()->getParam('is_subscribed', false)) {
-                $customer->setIsSubscribed(1);
+        return $customer;
+    }
+
+    /**
+     * Add session error method
+     *
+     * @param string|array $errors
+     */
+    protected function _addSessionError($errors)
+    {
+        $session = $this->_getSession();
+        $session->setCustomerFormData($this->getRequest()->getPost());
+        if (is_array($errors)) {
+            foreach ($errors as $errorMessage) {
+                $session->addError($errorMessage);
             }
+        } else {
+            $session->addError($this->__('Invalid customer data'));
+        }
+    }
 
-            /**
-             * Initialize customer group id
-             */
-            $customer->getGroupId();
-
-            if ($this->getRequest()->getPost('create_address')) {
-                /* @var $address Mage_Customer_Model_Address */
-                $address = Mage::getModel('customer/address');
-                /* @var $addressForm Mage_Customer_Model_Form */
-                $addressForm = Mage::getModel('customer/form');
-                $addressForm->setFormCode('customer_register_address')
-                    ->setEntity($address);
-
-                $addressData    = $addressForm->extractData($this->getRequest(), 'address', false);
-                $addressErrors  = $addressForm->validateData($addressData);
-                if ($addressErrors === true) {
-                    $address->setId(null)
-                        ->setIsDefaultBilling($this->getRequest()->getParam('default_billing', false))
-                        ->setIsDefaultShipping($this->getRequest()->getParam('default_shipping', false));
-                    $addressForm->compactData($addressData);
-                    $customer->addAddress($address);
-
-                    $addressErrors = $address->validate();
-                    if (is_array($addressErrors)) {
-                        $errors = array_merge($errors, $addressErrors);
-                    }
-                } else {
-                    $errors = array_merge($errors, $addressErrors);
-                }
+    /**
+     * Validate customer data and return errors if they are
+     *
+     * @param Mage_Customer_Model_Customer $customer
+     * @return array|string
+     */
+    protected function _getCustomerErrors($customer)
+    {
+        $errors = array();
+        $request = $this->getRequest();
+        if ($request->getPost('create_address')) {
+            $errors = $this->_getErrorsOnCustomerAddress($customer);
+        }
+        $customerForm = $this->_getCustomerForm($customer);
+        $customerData = $customerForm->extractData($request);
+        $customerErrors = $customerForm->validateData($customerData);
+        if ($customerErrors !== true) {
+            $errors = array_merge($customerErrors, $errors);
+        } else {
+            $customerForm->compactData($customerData);
+            $customer->setPassword($request->getPost('password'));
+            $customer->setConfirmation($request->getPost('confirmation'));
+            $customerErrors = $customer->validate();
+            if (is_array($customerErrors)) {
+                $errors = array_merge($customerErrors, $errors);
             }
+        }
+        return $errors;
+    }
 
-            try {
-                $customerErrors = $customerForm->validateData($customerData);
-                if ($customerErrors !== true) {
-                    $errors = array_merge($customerErrors, $errors);
-                } else {
-                    $customerForm->compactData($customerData);
-                    $customer->setPassword($this->getRequest()->getPost('password'));
-                    $customer->setConfirmation($this->getRequest()->getPost('confirmation'));
-                    $customerErrors = $customer->validate();
-                    if (is_array($customerErrors)) {
-                        $errors = array_merge($customerErrors, $errors);
-                    }
-                }
+    /**
+     * Get Customer Form Initalized Model
+     *
+     * @param Mage_Customer_Model_Customer $customer
+     * @return Mage_Customer_Model_Form
+     */
+    protected function _getCustomerForm($customer)
+    {
+        /* @var $customerForm Mage_Customer_Model_Form */
+        $customerForm = $this->_getModel('customer/form');
+        $customerForm->setFormCode('customer_account_create');
+        $customerForm->setEntity($customer);
+        return $customerForm;
+    }
 
-                $validationResult = count($errors) == 0;
+    /**
+     * Get Helper
+     *
+     * @param string $path
+     * @return Mage_Core_Helper_Abstract
+     */
+    protected function _getHelper($path)
+    {
+        return Mage::helper($path);
+    }
 
-                if (true === $validationResult) {
-                    $customer->save();
+    /**
+     * Get App
+     *
+     * @return Mage_Core_Model_App
+     */
+    protected function _getApp()
+    {
+        return Mage::app();
+    }
 
-                    Mage::dispatchEvent('customer_register_success',
-                        array('account_controller' => $this, 'customer' => $customer)
-                    );
-
-                    if ($customer->isConfirmationRequired()) {
-                        $customer->sendNewAccountEmail(
-                            'confirmation',
-                            $session->getBeforeAuthUrl(),
-                            Mage::app()->getStore()->getId()
-                        );
-                        $session->addSuccess($this->__('Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href="%s">click here</a>.', Mage::helper('customer')->getEmailConfirmationUrl($customer->getEmail())));
-                        $this->_redirectSuccess(Mage::getUrl('*/*/index', array('_secure'=>true)));
-                        return;
-                    } else {
-                        $session->setCustomerAsLoggedIn($customer);
-                        $url = $this->_welcomeCustomer($customer);
-                        $this->_redirectSuccess($url);
-                        return;
-                    }
-                } else {
-                    $session->setCustomerFormData($this->getRequest()->getPost());
-                    if (is_array($errors)) {
-                        foreach ($errors as $errorMessage) {
-                            $session->addError($errorMessage);
-                        }
-                    } else {
-                        $session->addError($this->__('Invalid customer data'));
-                    }
-                }
-            } catch (Mage_Core_Exception $e) {
-                $session->setCustomerFormData($this->getRequest()->getPost());
-                if ($e->getCode() === Mage_Customer_Model_Customer::EXCEPTION_EMAIL_EXISTS) {
-                    $url = Mage::getUrl('customer/account/forgotpassword');
-                    $message = $this->__('There is already an account with this email address. If you are sure that it is your email address, <a href="%s">click here</a> to get your password and access your account.', $url);
-                    $session->setEscapeMessages(false);
-                } else {
-                    $message = $e->getMessage();
-                }
-                $session->addError($message);
-            } catch (Exception $e) {
-                $session->setCustomerFormData($this->getRequest()->getPost())
-                    ->addException($e, $this->__('Cannot save the customer.'));
-            }
+    /**
+     * Dispatch Event
+     *
+     * @param Mage_Customer_Model_Customer $customer
+     */
+    protected function _dispatchRegisterSuccess($customer)
+    {
+        Mage::dispatchEvent('customer_register_success',
+            array('account_controller' => $this, 'customer' => $customer)
+        );
+    }
+
+    /**
+     * Gets customer address
+     *
+     * @param $customer
+     * @return array $errors
+     */
+    protected function _getErrorsOnCustomerAddress($customer)
+    {
+        $errors = array();
+        /* @var $address Mage_Customer_Model_Address */
+        $address = $this->_getModel('customer/address');
+        /* @var $addressForm Mage_Customer_Model_Form */
+        $addressForm = $this->_getModel('customer/form');
+        $addressForm->setFormCode('customer_register_address')
+            ->setEntity($address);
+
+        $addressData = $addressForm->extractData($this->getRequest(), 'address', false);
+        $addressErrors = $addressForm->validateData($addressData);
+        if (is_array($addressErrors)) {
+            $errors = array_merge($errors, $addressErrors);
+        }
+        $address->setId(null)
+            ->setIsDefaultBilling($this->getRequest()->getParam('default_billing', false))
+            ->setIsDefaultShipping($this->getRequest()->getParam('default_shipping', false));
+        $addressForm->compactData($addressData);
+        $customer->addAddress($address);
+
+        $addressErrors = $address->validate();
+        if (is_array($addressErrors)) {
+            $errors = array_merge($errors, $addressErrors);
         }
+        return $errors;
+    }
 
-        $this->_redirectError(Mage::getUrl('*/*/create', array('_secure' => true)));
+    /**
+     * Get model by path
+     *
+     * @param string $path
+     * @param array|null $arguments
+     * @return false|Mage_Core_Model_Abstract
+     */
+    public function _getModel($path, $arguments = array())
+    {
+        return Mage::getModel($path, $arguments);
+    }
+
+    /**
+     * Get model from registry by path
+     *
+     * @param string $path
+     * @return mixed
+     */
+    protected function _getFromRegistry($path)
+    {
+        return Mage::registry($path);
     }
 
     /**
@@ -395,14 +525,16 @@ protected function _welcomeCustomer(Mage_Customer_Model_Customer $customer, $isJ
         );
         if ($this->_isVatValidationEnabled()) {
             // Show corresponding VAT message to customer
-            $configAddressType = Mage::helper('customer/address')->getTaxCalculationAddressType();
+            $configAddressType =  $this->_getHelper('customer/address')->getTaxCalculationAddressType();
             $userPrompt = '';
             switch ($configAddressType) {
                 case Mage_Customer_Model_Address_Abstract::TYPE_SHIPPING:
-                    $userPrompt = $this->__('If you are a registered VAT customer, please click <a href="%s">here</a> to enter you shipping address for proper VAT calculation', Mage::getUrl('customer/address/edit'));
+                    $userPrompt = $this->__('If you are a registered VAT customer, please click <a href="%s">here</a> to enter you shipping address for proper VAT calculation',
+                        $this->_getUrl('customer/address/edit'));
                     break;
                 default:
-                    $userPrompt = $this->__('If you are a registered VAT customer, please click <a href="%s">here</a> to enter you billing address for proper VAT calculation', Mage::getUrl('customer/address/edit'));
+                    $userPrompt = $this->__('If you are a registered VAT customer, please click <a href="%s">here</a> to enter you billing address for proper VAT calculation',
+                        $this->_getUrl('customer/address/edit'));
             }
             $this->_getSession()->addSuccess($userPrompt);
         }
@@ -413,7 +545,7 @@ protected function _welcomeCustomer(Mage_Customer_Model_Customer $customer, $isJ
             Mage::app()->getStore()->getId()
         );
 
-        $successUrl = Mage::getUrl('*/*/index', array('_secure'=>true));
+        $successUrl = $this->_getUrl('*/*/index', array('_secure' => true));
         if ($this->_getSession()->getBeforeAuthUrl()) {
             $successUrl = $this->_getSession()->getBeforeAuthUrl(true);
         }
@@ -425,7 +557,8 @@ protected function _welcomeCustomer(Mage_Customer_Model_Customer $customer, $isJ
      */
     public function confirmAction()
     {
-        if ($this->_getSession()->isLoggedIn()) {
+        $session = $this->_getSession();
+        if ($session->isLoggedIn()) {
             $this->_redirect('*/*/');
             return;
         }
@@ -439,7 +572,7 @@ public function confirmAction()
 
             // load customer by id (try/catch in case if it throws exceptions)
             try {
-                $customer = Mage::getModel('customer/customer')->load($id);
+                $customer = $this->_getModel('customer/customer')->load($id);
                 if ((!$customer) || (!$customer->getId())) {
                     throw new Exception('Failed to load customer by id.');
                 }
@@ -463,21 +596,22 @@ public function confirmAction()
                     throw new Exception($this->__('Failed to confirm customer account.'));
                 }
 
+                $session->renewSession();
                 // log in and send greeting email, then die happy
-                $this->_getSession()->setCustomerAsLoggedIn($customer);
+                $session->setCustomerAsLoggedIn($customer);
                 $successUrl = $this->_welcomeCustomer($customer, true);
                 $this->_redirectSuccess($backUrl ? $backUrl : $successUrl);
                 return;
             }
 
             // die happy
-            $this->_redirectSuccess(Mage::getUrl('*/*/index', array('_secure'=>true)));
+            $this->_redirectSuccess($this->_getUrl('*/*/index', array('_secure' => true)));
             return;
         }
         catch (Exception $e) {
             // die unhappy
             $this->_getSession()->addError($e->getMessage());
-            $this->_redirectError(Mage::getUrl('*/*/index', array('_secure'=>true)));
+            $this->_redirectError($this->_getUrl('*/*/index', array('_secure' => true)));
             return;
         }
     }
@@ -487,7 +621,7 @@ public function confirmAction()
      */
     public function confirmationAction()
     {
-        $customer = Mage::getModel('customer/customer');
+        $customer = $this->_getModel('customer/customer');
         if ($this->_getSession()->isLoggedIn()) {
             $this->_redirect('*/*/');
             return;
@@ -508,10 +642,10 @@ public function confirmationAction()
                     $this->_getSession()->addSuccess($this->__('This email does not require confirmation.'));
                 }
                 $this->_getSession()->setUsername($email);
-                $this->_redirectSuccess(Mage::getUrl('*/*/index', array('_secure' => true)));
+                $this->_redirectSuccess($this->_getUrl('*/*/index', array('_secure' => true)));
             } catch (Exception $e) {
                 $this->_getSession()->addException($e, $this->__('Wrong email.'));
-                $this->_redirectError(Mage::getUrl('*/*/*', array('email' => $email, '_secure' => true)));
+                $this->_redirectError($this->_getUrl('*/*/*', array('email' => $email, '_secure' => true)));
             }
             return;
         }
@@ -526,6 +660,18 @@ public function confirmationAction()
         $this->renderLayout();
     }
 
+    /**
+     * Get Url method
+     *
+     * @param string $url
+     * @param array $params
+     * @return string
+     */
+    protected function _getUrl($url, $params = array())
+    {
+        return Mage::getUrl($url, $params);
+    }
+
     /**
      * Forgot customer password page
      */
@@ -557,13 +703,13 @@ public function forgotPasswordPostAction()
             }
 
             /** @var $customer Mage_Customer_Model_Customer */
-            $customer = Mage::getModel('customer/customer')
+            $customer = $this->_getModel('customer/customer')
                 ->setWebsiteId(Mage::app()->getStore()->getWebsiteId())
                 ->loadByEmail($email);
 
             if ($customer->getId()) {
                 try {
-                    $newResetPasswordLinkToken = Mage::helper('customer')->generateResetPasswordLinkToken();
+                    $newResetPasswordLinkToken =  $this->_getHelper('customer')->generateResetPasswordLinkToken();
                     $customer->changeResetPasswordLinkToken($newResetPasswordLinkToken);
                     $customer->sendPasswordResetConfirmationEmail();
                 } catch (Exception $exception) {
@@ -573,7 +719,9 @@ public function forgotPasswordPostAction()
                 }
             }
             $this->_getSession()
-                ->addSuccess(Mage::helper('customer')->__('If there is an account associated with %s you will receive an email with a link to reset your password.', Mage::helper('customer')->htmlEscape($email)));
+                ->addSuccess( $this->_getHelper('customer')
+                ->__('If there is an account associated with %s you will receive an email with a link to reset your password.',
+                    $this->_getHelper('customer')->escapeHtml($email)));
             $this->_redirect('*/*/');
             return;
         } else {
@@ -602,16 +750,14 @@ public function resetPasswordAction()
                 ->setResetPasswordLinkToken($resetPasswordLinkToken);
             $this->renderLayout();
         } catch (Exception $exception) {
-            $this->_getSession()->addError(Mage::helper('customer')->__('Your password reset link has expired.'));
+            $this->_getSession()->addError( $this->_getHelper('customer')->__('Your password reset link has expired.'));
             $this->_redirect('*/*/forgotpassword');
         }
     }
 
     /**
      * Reset forgotten password
-     *
      * Used to handle data recieved from reset forgotten password form
-     *
      */
     public function resetPasswordPostAction()
     {
@@ -623,17 +769,17 @@ public function resetPasswordPostAction()
         try {
             $this->_validateResetPasswordLinkToken($customerId, $resetPasswordLinkToken);
         } catch (Exception $exception) {
-            $this->_getSession()->addError(Mage::helper('customer')->__('Your password reset link has expired.'));
+            $this->_getSession()->addError( $this->_getHelper('customer')->__('Your password reset link has expired.'));
             $this->_redirect('*/*/');
             return;
         }
 
         $errorMessages = array();
         if (iconv_strlen($password) <= 0) {
-            array_push($errorMessages, Mage::helper('customer')->__('New password field cannot be empty.'));
+            array_push($errorMessages, $this->_getHelper('customer')->__('New password field cannot be empty.'));
         }
         /** @var $customer Mage_Customer_Model_Customer */
-        $customer = Mage::getModel('customer/customer')->load($customerId);
+        $customer = $this->_getModel('customer/customer')->load($customerId);
 
         $customer->setPassword($password);
         $customer->setConfirmation($passwordConfirmation);
@@ -660,7 +806,7 @@ public function resetPasswordPostAction()
             $customer->setRpTokenCreatedAt(null);
             $customer->setConfirmation(null);
             $customer->save();
-            $this->_getSession()->addSuccess(Mage::helper('customer')->__('Your password has been updated.'));
+            $this->_getSession()->addSuccess( $this->_getHelper('customer')->__('Your password has been updated.'));
             $this->_redirect('*/*/login');
         } catch (Exception $exception) {
             $this->_getSession()->addException($exception, $this->__('Cannot save a new password.'));
@@ -687,18 +833,18 @@ protected function _validateResetPasswordLinkToken($customerId, $resetPasswordLi
             || empty($customerId)
             || $customerId < 0
         ) {
-            throw Mage::exception('Mage_Core', Mage::helper('customer')->__('Invalid password reset token.'));
+            throw Mage::exception('Mage_Core', $this->_getHelper('customer')->__('Invalid password reset token.'));
         }
 
         /** @var $customer Mage_Customer_Model_Customer */
-        $customer = Mage::getModel('customer/customer')->load($customerId);
+        $customer = $this->_getModel('customer/customer')->load($customerId);
         if (!$customer || !$customer->getId()) {
-            throw Mage::exception('Mage_Core', Mage::helper('customer')->__('Wrong customer account specified.'));
+            throw Mage::exception('Mage_Core', $this->_getHelper('customer')->__('Wrong customer account specified.'));
         }
 
         $customerToken = $customer->getRpToken();
         if (strcmp($customerToken, $resetPasswordLinkToken) != 0 || $customer->isResetPasswordLinkTokenExpired()) {
-            throw Mage::exception('Mage_Core', Mage::helper('customer')->__('Your password reset link has expired.'));
+            throw Mage::exception('Mage_Core', $this->_getHelper('customer')->__('Your password reset link has expired.'));
         }
     }
 
@@ -720,7 +866,7 @@ public function editAction()
         if (!empty($data)) {
             $customer->addData($data);
         }
-        if ($this->getRequest()->getParam('changepass')==1){
+        if ($this->getRequest()->getParam('changepass') == 1) {
             $customer->setChangePassword(1);
         }
 
@@ -743,7 +889,7 @@ public function editPostAction()
             $customer = $this->_getSession()->getCustomer();
 
             /** @var $customerForm Mage_Customer_Model_Form */
-            $customerForm = Mage::getModel('customer/form');
+            $customerForm = $this->_getModel('customer/form');
             $customerForm->setFormCode('customer_account_edit')
                 ->setEntity($customer);
 
@@ -764,7 +910,7 @@ public function editPostAction()
                     $confPass   = $this->getRequest()->getPost('confirmation');
 
                     $oldPass = $this->_getSession()->getCustomer()->getPasswordHash();
-                    if (Mage::helper('core/string')->strpos($oldPass, ':')) {
+                    if ( $this->_getHelper('core/string')->strpos($oldPass, ':')) {
                         list($_salt, $salt) = explode(':', $oldPass);
                     } else {
                         $salt = false;
@@ -842,6 +988,6 @@ protected function _filterPostData($data)
      */
     protected function _isVatValidationEnabled($store = null)
     {
-        return Mage::helper('customer/address')->isVatValidationEnabled($store);
+        return  $this->_getHelper('customer/address')->isVatValidationEnabled($store);
     }
 }
diff --git a/app/code/core/Mage/Customer/etc/config.xml b/app/code/core/Mage/Customer/etc/config.xml
index 590af35b42d..70faf77c235 100644
--- a/app/code/core/Mage/Customer/etc/config.xml
+++ b/app/code/core/Mage/Customer/etc/config.xml
@@ -548,18 +548,18 @@ T: {{var telephone}}
 {{depend fax}}F: {{var fax}}{{/depend}}
 {{depend vat_id}}VAT: {{var vat_id}}{{/depend}}</text>
                 <oneline>{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}, {{var street}}, {{var city}}, {{var region}} {{var postcode}}, {{var country}}</oneline>
-                <html>{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}&lt;br/&gt;
-{{depend company}}{{var company}}&lt;br /&gt;{{/depend}}
-{{if street1}}{{var street1}}&lt;br /&gt;{{/if}}
-{{depend street2}}{{var street2}}&lt;br /&gt;{{/depend}}
-{{depend street3}}{{var street3}}&lt;br /&gt;{{/depend}}
-{{depend street4}}{{var street4}}&lt;br /&gt;{{/depend}}
-{{if city}}{{var city}},  {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}&lt;br/&gt;
-{{var country}}&lt;br/&gt;
+                <html><![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}<br/>
+{{depend company}}{{var company}}<br />{{/depend}}
+{{if street1}}{{var street1}}<br />{{/if}}
+{{depend street2}}{{var street2}}<br />{{/depend}}
+{{depend street3}}{{var street3}}<br />{{/depend}}
+{{depend street4}}{{var street4}}<br />{{/depend}}
+{{if city}}{{var city}},  {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}<br/>
+{{var country}}<br/>
 {{depend telephone}}T: {{var telephone}}{{/depend}}
-{{depend fax}}&lt;br/&gt;F: {{var fax}}{{/depend}}
-{{depend vat_id}}&lt;br/&gt;VAT: {{var vat_id}}{{/depend}}</html>
-                <pdf>{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}|
+{{depend fax}}<br/>F: {{var fax}}{{/depend}}
+{{depend vat_id}}<br/>VAT: {{var vat_id}}{{/depend}}]]></html>
+                <pdf><![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}|
 {{depend company}}{{var company}}|{{/depend}}
 {{if street1}}{{var street1}}
 {{/if}}
@@ -570,9 +570,9 @@ T: {{var telephone}}
 {{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}|
 {{var country}}|
 {{depend telephone}}T: {{var telephone}}{{/depend}}|
-{{depend fax}}&lt;br/&gt;F: {{var fax}}{{/depend}}|
-{{depend vat_id}}&lt;br/&gt;VAT: {{var vat_id}}{{/depend}}|</pdf>
-                <js_template>#{prefix} #{firstname} #{middlename} #{lastname} #{suffix}&lt;br/&gt;#{company}&lt;br/&gt;#{street0}&lt;br/&gt;#{street1}&lt;br/&gt;#{street2}&lt;br/&gt;#{street3}&lt;br/&gt;#{city}, #{region}, #{postcode}&lt;br/&gt;#{country_id}&lt;br/&gt;T: #{telephone}&lt;br/&gt;F: #{fax}&lt;br/&gt;VAT: #{vat_id}</js_template>
+{{depend fax}}<br/>F: {{var fax}}{{/depend}}|
+{{depend vat_id}}<br/>VAT: {{var vat_id}}{{/depend}}|]]></pdf>
+                <js_template><![CDATA[#{prefix} #{firstname} #{middlename} #{lastname} #{suffix}<br/>#{company}<br/>#{street0}<br/>#{street1}<br/>#{street2}<br/>#{street3}<br/>#{city}, #{region}, #{postcode}<br/>#{country_id}<br/>T: #{telephone}<br/>F: #{fax}<br/>VAT: #{vat_id}]]></js_template>
             </address_templates>
         </customer>
     </default>
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php
index 4a226296c74..98146963208 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php
@@ -219,22 +219,16 @@ public function importXml(Varien_Simplexml_Element $actionNode)
     public function run(array $args=array())
     {
         if ($method = $this->getParam('method')) {
-//            print $method;
-            if (!is_callable(array($this->getContainer(), $method))) {
-                $this->getContainer()->addException('Unable to run action method: '.$method, Mage_Dataflow_Model_Convert_Exception::FATAL);
+            if (!method_exists($this->getContainer(), $method)) {
+                $this->getContainer()->addException(
+                    'Unable to run action method: ' . $method,
+                    Mage_Dataflow_Model_Convert_Exception::FATAL
+                );
             }
 
-//            printf('<pre>call %s::%s()</pre>', __CLASS__, __FUNCTION__);
-//            printf('<pre>call %s::%s()</pre>', get_class($this->getContainer()), $method);
-
-//            print '<pre>CONTAINER = ';
-//            print get_class($this->getContainer());
-//            print '</pre>';
-
             $this->getContainer()->addException('Starting '.get_class($this->getContainer()).' :: '.$method);
 
             if ($this->getParam('from')) {
-//                print '$this->getParam(\'from\') = ' . $this->getParam('from');
                 $this->getContainer()->setData($this->getContainer($this->getParam('from'))->getData());
             }
 
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php
index 8ee65cc0f3a..8fd667f0c15 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php
@@ -67,7 +67,7 @@ public function parse()
             return $this;
         }
 
-        if (!is_callable(array($adapter, $adapterMethod))) {
+        if (!method_exists($adapter, $adapterMethod)) {
             $message = Mage::helper('dataflow')->__('Method "%s" not defined in adapter %s.', $adapterMethod, $adapterName);
             $this->addException($message, Mage_Dataflow_Model_Convert_Exception::FATAL);
             return $this;
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php
index 56042591792..43e5652a4ed 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php
@@ -68,7 +68,7 @@ public function parse()
             return $this;
         }
 
-        if (!is_callable(array($adapter, $adapterMethod))) {
+        if (!method_exists($adapter, $adapterMethod)) {
             $message = Mage::helper('dataflow')->__('Method "%s" was not defined in adapter %s.', $adapterMethod, $adapterName);
             $this->addException($message, Mage_Dataflow_Model_Convert_Exception::FATAL);
             return $this;
diff --git a/app/code/core/Mage/Directory/Helper/Data.php b/app/code/core/Mage/Directory/Helper/Data.php
index 2ac0cf98bc9..a1c16dcfda5 100644
--- a/app/code/core/Mage/Directory/Helper/Data.php
+++ b/app/code/core/Mage/Directory/Helper/Data.php
@@ -81,6 +81,30 @@ class Mage_Directory_Helper_Data extends Mage_Core_Helper_Abstract
      */
     protected $_optionalZipCountries = null;
 
+    /**
+     * Factory instance
+     *
+     * @var Mage_Core_Model_Factory
+     */
+    protected $_factory;
+
+    /**
+     * Application instance
+     *
+     * @var Mage_Core_Model_App
+     */
+    protected $_app;
+
+    /**
+     * Constructor for Mage_Directory_Helper_Data
+     * @param array $args
+     */
+    public function __construct(array $args = array())
+    {
+        $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('core/factory');
+        $this->_app = !empty($args['app']) ? $args['app'] : Mage::app();
+    }
+
     /**
      * Retrieve region collection
      *
@@ -104,8 +128,7 @@ public function getRegionCollection()
     public function getCountryCollection()
     {
         if (!$this->_countryCollection) {
-            $this->_countryCollection = Mage::getModel('directory/country')->getResourceCollection()
-                ->loadByStore();
+            $this->_countryCollection = $this->_factory->getModel('directory/country')->getResourceCollection();
         }
         return $this->_countryCollection;
     }
@@ -113,53 +136,85 @@ public function getCountryCollection()
     /**
      * Retrieve regions data json
      *
+     * @deprecated after 1.7.0.2
+     * @see Mage_Directory_Helper_Data::getRegionJsonByStore()
      * @return string
      */
     public function getRegionJson()
     {
+        return $this->getRegionJsonByStore();
+    }
 
+    /**
+     * Retrieve regions data json
+     *
+     * @param int|null $storeId
+     * @return array()
+     */
+    public function getRegionJsonByStore($storeId = null)
+    {
         Varien_Profiler::start('TEST: '.__METHOD__);
         if (!$this->_regionJson) {
-            $cacheKey = 'DIRECTORY_REGIONS_JSON_STORE'.Mage::app()->getStore()->getId();
-            if (Mage::app()->useCache('config')) {
-                $json = Mage::app()->loadCache($cacheKey);
+            $store = $this->_app->getStore($storeId);
+            $cacheKey = 'DIRECTORY_REGIONS_JSON_STORE' . (string)$store->getId();
+            if ($this->_app->useCache('config')) {
+                $json = $this->_app->loadCache($cacheKey);
             }
             if (empty($json)) {
-                $countryIds = array();
-                foreach ($this->getCountryCollection() as $country) {
-                    $countryIds[] = $country->getCountryId();
-                }
-                $collection = Mage::getModel('directory/region')->getResourceCollection()
-                    ->addCountryFilter($countryIds)
-                    ->load();
-                $regions = array(
-                    'config' => array(
-                        'show_all_regions' => $this->getShowNonRequiredState(),
-                        'regions_required' => $this->getCountriesWithStatesRequired()
-                    )
-                );
-                foreach ($collection as $region) {
-                    if (!$region->getRegionId()) {
-                        continue;
-                    }
-                    $regions[$region->getCountryId()][$region->getRegionId()] = array(
-                        'code' => $region->getCode(),
-                        'name' => $this->__($region->getName())
-                    );
-                }
-                $json = Mage::helper('core')->jsonEncode($regions);
+                $regions = $this->_getRegions($storeId);
+                $helper = $this->_factory->getHelper('core');
+                $json = $helper->jsonEncode($regions);
 
-                if (Mage::app()->useCache('config')) {
-                    Mage::app()->saveCache($json, $cacheKey, array('config'));
+                if ($this->_app->useCache('config')) {
+                    $this->_app->saveCache($json, $cacheKey, array('config'));
                 }
             }
             $this->_regionJson = $json;
         }
 
-        Varien_Profiler::stop('TEST: '.__METHOD__);
+        Varien_Profiler::stop('TEST: ' . __METHOD__);
         return $this->_regionJson;
     }
 
+    /**
+     * Get Regions for specific Countries
+     * @param string $storeId
+     * @return array|null
+     */
+    protected function _getRegions($storeId)
+    {
+        $countryIds = array();
+
+        $countryCollection = $this->getCountryCollection()->loadByStore($storeId);
+        foreach ($countryCollection as $country) {
+            $countryIds[] = $country->getCountryId();
+        }
+
+        /** @var $regionModel Mage_Directory_Model_Region */
+        $regionModel = $this->_factory->getModel('directory/region');
+        /** @var $collection Mage_Directory_Model_Resource_Region_Collection */
+        $collection = $regionModel->getResourceCollection()
+            ->addCountryFilter($countryIds)
+            ->load();
+
+        $regions = array(
+            'config' => array(
+                'show_all_regions' => $this->getShowNonRequiredState(),
+                'regions_required' => $this->getCountriesWithStatesRequired()
+            )
+        );
+        foreach ($collection as $region) {
+            if (!$region->getRegionId()) {
+                continue;
+            }
+            $regions[$region->getCountryId()][$region->getRegionId()] = array(
+                'code' => $region->getCode(),
+                'name' => $this->__($region->getName())
+            );
+        }
+        return $regions;
+    }
+
     /**
      * Convert currency
      *
@@ -244,7 +299,7 @@ public function getShowNonRequiredState()
     public function isRegionRequired($countryId)
     {
         $countyList = $this->getCountriesWithStatesRequired();
-        if(!is_array($countyList)) {
+        if (!is_array($countyList)) {
             return false;
         }
         return in_array($countryId, $countyList);
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php
index 061fc3e337c..54430367bc1 100644
--- a/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php
+++ b/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php
@@ -26,7 +26,7 @@
 
 
 /**
- * Country collection
+ * Country Collection
  *
  * @category    Mage
  * @package     Mage_Directory
diff --git a/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php b/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php
index 4a4e99718c8..04bffbd43d5 100755
--- a/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php
+++ b/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php
@@ -36,7 +36,6 @@ class Mage_Directory_Model_Resource_Country_Collection extends Mage_Core_Model_R
 {
     /**
      * Define main table
-     *
      */
     protected function _construct()
     {
@@ -44,14 +43,26 @@ protected function _construct()
     }
 
     /**
-     * Load allowed countries for current store
+     * Get Store Config
+     *
+     * @param string $path
+     * @param mixed|null $store
+     * @return string
+     */
+    protected function _getStoreConfig($path, $store = null)
+    {
+        return Mage::getStoreConfig($path, $store);
+    }
+
+    /**
+     * Load allowed countries for specific store
      *
      * @param mixed $store
      * @return Mage_Directory_Model_Resource_Country_Collection
      */
     public function loadByStore($store = null)
     {
-        $allowCountries = explode(',', (string)Mage::getStoreConfig('general/country/allow', $store));
+        $allowCountries = explode(',', (string)$this->_getStoreConfig('general/country/allow', $store));
         if (!empty($allowCountries)) {
             $this->addFieldToFilter("country_id", array('in' => $allowCountries));
         }
@@ -95,7 +106,7 @@ public function addCountryCodeFilter($countryCode, $iso = array('iso3', 'iso2'))
                     }
                     $this->_select->where('(' . implode(') OR (', $whereOr) . ')');
                 } else {
-                    $this->addFieldToFilter("{$iso}_code", array('in'=>$countryCode));
+                    $this->addFieldToFilter("{$iso}_code", array('in' => $countryCode));
                 }
             } else {
                 if (is_array($iso)) {
@@ -138,7 +149,7 @@ public function addCountryIdFilter($countryId)
      */
     public function toOptionArray($emptyLabel = ' ')
     {
-        $options = $this->_toOptionArray('country_id', 'name', array('title'=>'iso2_code'));
+        $options = $this->_toOptionArray('country_id', 'name', array('title' => 'iso2_code'));
 
         $sort = array();
         foreach ($options as $data) {
@@ -150,10 +161,10 @@ public function toOptionArray($emptyLabel = ' ')
 
         Mage::helper('core/string')->ksortMultibyte($sort);
         $options = array();
-        foreach ($sort as $label=>$value) {
+        foreach ($sort as $label => $value) {
             $options[] = array(
-               'value' => $value,
-               'label' => $label
+                'value' => $value,
+                'label' => $label
             );
         }
 
diff --git a/app/code/core/Mage/Directory/Model/Resource/Region/Collection.php b/app/code/core/Mage/Directory/Model/Resource/Region/Collection.php
index 7f0e29e70b1..d8c86e7e551 100755
--- a/app/code/core/Mage/Directory/Model/Resource/Region/Collection.php
+++ b/app/code/core/Mage/Directory/Model/Resource/Region/Collection.php
@@ -154,6 +154,21 @@ public function addRegionNameFilter($regionName)
         return $this;
     }
 
+    /**
+     * Filter region by its code or name
+     *
+     * @param string|array $region
+     * @return Mage_Directory_Model_Resource_Region_Collection
+     */
+    public function addRegionCodeOrNameFilter($region)
+    {
+        if (!empty($region)) {
+            $condition = is_array($region) ? array('in' => $region) : $region;
+            $this->addFieldToFilter(array('main_table.code', 'main_table.default_name'), array($condition, $condition));
+        }
+        return $this;
+    }
+
     /**
      * Convert collection items to select options array
      *
diff --git a/app/code/core/Mage/Directory/etc/config.xml b/app/code/core/Mage/Directory/etc/config.xml
index 496dca51dcf..6f8d3264019 100644
--- a/app/code/core/Mage/Directory/etc/config.xml
+++ b/app/code/core/Mage/Directory/etc/config.xml
@@ -28,7 +28,7 @@
 <config>
     <modules>
         <Mage_Directory>
-            <version>1.6.0.1</version>
+            <version>1.6.0.2</version>
         </Mage_Directory>
     </modules>
     <global>
diff --git a/app/code/core/Mage/Directory/sql/directory_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Directory/sql/directory_setup/upgrade-1.6.0.1-1.6.0.2.php
new file mode 100644
index 00000000000..6fa9859690a
--- /dev/null
+++ b/app/code/core/Mage/Directory/sql/directory_setup/upgrade-1.6.0.1-1.6.0.2.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Directory
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/* @var $installer Mage_Core_Model_Resource_Setup */
+$installer = $this;
+
+foreach (array('AM', 'AC', 'AF') as $code) {
+    $installer->getConnection()->update(
+        $installer->getTable('directory/country_region'),
+        array('code' => 'AE'),
+        array('code = ?' => $code)
+    );
+}
diff --git a/app/code/core/Mage/Downloadable/controllers/DownloadController.php b/app/code/core/Mage/Downloadable/controllers/DownloadController.php
index a4f019070a6..8bc86fb5931 100644
--- a/app/code/core/Mage/Downloadable/controllers/DownloadController.php
+++ b/app/code/core/Mage/Downloadable/controllers/DownloadController.php
@@ -85,6 +85,7 @@ protected function _processDownload($resource, $resourceType)
         $this->getResponse()
             ->sendHeaders();
 
+        session_write_close();
         $helper->output();
     }
 
diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php
index 913ce127dba..f125a908e07 100644
--- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php
+++ b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php
@@ -37,7 +37,7 @@ abstract class Mage_Eav_Block_Adminhtml_Attribute_Edit_Options_Abstract extends
     public function __construct()
     {
         parent::__construct();
-        $this->setTemplate('catalog/product/attribute/options.phtml');
+        $this->setTemplate('eav/attribute/options.phtml');
     }
 
     /**
@@ -137,6 +137,7 @@ public function getOptionValues()
                 ->setPositionOrder('desc', true)
                 ->load();
 
+            $helper = Mage::helper('core');
             foreach ($optionCollection as $option) {
                 $value = array();
                 if (in_array($option->getId(), $defaultValues)) {
@@ -150,12 +151,8 @@ public function getOptionValues()
                 $value['sort_order'] = $option->getSortOrder();
                 foreach ($this->getStores() as $store) {
                     $storeValues = $this->getStoreOptionValues($store->getId());
-                    if (isset($storeValues[$option->getId()])) {
-                        $value['store'.$store->getId()] = htmlspecialchars($storeValues[$option->getId()]);
-                    }
-                    else {
-                        $value['store'.$store->getId()] = '';
-                    }
+                    $value['store' . $store->getId()] = isset($storeValues[$option->getId()])
+                        ? $helper->escapeHtml($storeValues[$option->getId()]) : '';
                 }
                 $values[] = new Varien_Object($value);
             }
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute.php b/app/code/core/Mage/Eav/Model/Entity/Attribute.php
index 32d2c827652..52e25aadf78 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute.php
@@ -135,16 +135,10 @@ public function loadEntityAttributeIdBySet()
      * Prepare data for save
      *
      * @return Mage_Eav_Model_Entity_Attribute
+     * @throws Mage_Eav_Exception
      */
     protected function _beforeSave()
     {
-        // prevent overriding product data
-        if (isset($this->_data['attribute_code'])
-            && Mage::getModel('catalog/product')->isReservedAttribute($this))
-        {
-            throw Mage::exception('Mage_Eav', Mage::helper('eav')->__('The attribute code \'%s\' is reserved by system. Please try another attribute code', $this->_data['attribute_code']));
-        }
-
         /**
          * Check for maximum attribute_code length
          */
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php
index 51ca14f3adf..0fc616781b5 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php
@@ -74,7 +74,7 @@ public function getAttribute()
     /**
      * Get a text for option value
      *
-     * @param  string|integer $value
+     * @param  string|int $value
      * @return string|bool
      */
     public function getOptionText($value)
@@ -143,4 +143,15 @@ public function getFlatUpdateSelect($store)
     {
         return null;
     }
+
+    /**
+     * Get a text for index option value
+     *
+     * @param string|int $value
+     * @return string|bool
+     */
+    public function getIndexOptionText($value)
+    {
+        return $this->getOptionText($value);
+    }
 }
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php
index 79894c82f33..a7001e83fec 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php
@@ -27,6 +27,13 @@
 
 class Mage_Eav_Model_Entity_Attribute_Source_Boolean extends Mage_Eav_Model_Entity_Attribute_Source_Abstract
 {
+    /**
+     * Option values
+     */
+    const VALUE_YES = 1;
+    const VALUE_NO = 0;
+
+
     /**
      * Retrieve all options array
      *
@@ -38,11 +45,11 @@ public function getAllOptions()
             $this->_options = array(
                 array(
                     'label' => Mage::helper('eav')->__('Yes'),
-                    'value' =>  1
+                    'value' => self::VALUE_YES
                 ),
                 array(
                     'label' => Mage::helper('eav')->__('No'),
-                    'value' =>  0
+                    'value' => self::VALUE_NO
                 ),
             );
         }
@@ -136,4 +143,22 @@ public function getFlatUpdateSelect($store)
         return Mage::getResourceModel('eav/entity_attribute')
             ->getFlatUpdateSelect($this->getAttribute(), $store);
     }
+
+    /**
+     * Get a text for index option value
+     *
+     * @param  string|int $value
+     * @return string|bool
+     */
+    public function getIndexOptionText($value)
+    {
+        switch ($value) {
+            case self::VALUE_YES:
+                return 'Yes';
+            case self::VALUE_NO:
+                return 'No';
+        }
+
+        return parent::getIndexOptionText($value);
+    }
 }
diff --git a/app/code/core/Mage/Eav/Model/Entity/Setup.php b/app/code/core/Mage/Eav/Model/Entity/Setup.php
index e2201b803c9..d1f5e6140d2 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Setup.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Setup.php
@@ -605,9 +605,7 @@ protected function _prepareValues($attr)
             'default_value'   => $this->_getValue($attr, 'default'),
             'is_unique'       => $this->_getValue($attr, 'unique', 0),
             'note'            => $this->_getValue($attr, 'note'),
-            'is_global'       => $this->_getValue($attr, 'global',
-                                     Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_GLOBAL
-                                 ),
+            'is_global'       => $this->_getValue($attr, 'global', 1),
         );
 
         return $data;
@@ -1223,6 +1221,7 @@ public function createEntityTables($baseTableName, array $options = array())
                     'identity'  => true,
                     'nullable'  => false,
                     'primary'   => true,
+                    'unsigned'  => true,
                  ), 'Entity Id')
                 ->addColumn('entity_type_id', Varien_Db_Ddl_Table::TYPE_SMALLINT, null, array(
                     'unsigned'  => true,
@@ -1302,6 +1301,7 @@ public function createEntityTables($baseTableName, array $options = array())
                     'identity'  => true,
                     'nullable'  => false,
                     'primary'   => true,
+                    'unsigned'  => true,
                     ), 'Value Id')
                 ->addColumn('entity_type_id', Varien_Db_Ddl_Table::TYPE_SMALLINT, null, array(
                     'unsigned'  => true,
@@ -1356,14 +1356,13 @@ public function createEntityTables($baseTableName, array $options = array())
             $tables[$this->getTable($eavTableName)] = $eavTable;
         }
 
-        $connection->beginTransaction();
+        // DDL operations are forbidden within transactions
+        // See Varien_Db_Adapter_Pdo_Mysql::_checkDdlTransaction()
         try {
             foreach ($tables as $tableName => $table) {
                 $connection->createTable($table);
             }
-            $connection->commit();
         } catch (Exception $e) {
-           $connection->rollBack();
            throw Mage::exception('Mage_Eav', Mage::helper('eav')->__('Can\'t create table: %s', $tableName));
         }
 
diff --git a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php
index 348a59436ea..ad1689a027f 100644
--- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php
+++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php
@@ -81,7 +81,7 @@ public function getMessageText()
     {
         if ($this->getItem()->getGiftMessageId()) {
             $model = $this->helper('giftmessage/message')->getGiftMessage($this->getItem()->getGiftMessageId());
-            return $this->htmlEscape($model->getMessage());
+            return $this->escapeHtml($model->getMessage());
         }
         return '';
     }
diff --git a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
index 4fa0684df4c..4ed308c21a4 100644
--- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
+++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
@@ -204,7 +204,7 @@ public function canDisplayGiftmessage()
      */
     public function getSender()
     {
-        return $this->htmlEscape($this->getMessage()->getSender());
+        return $this->escapeHtml($this->getMessage()->getSender());
     }
 
     /**
@@ -214,7 +214,7 @@ public function getSender()
      */
     public function getRecipient()
     {
-        return $this->htmlEscape($this->getMessage()->getRecipient());
+        return $this->escapeHtml($this->getMessage()->getRecipient());
     }
 
     /**
@@ -224,6 +224,6 @@ public function getRecipient()
      */
     public function getMessageText()
     {
-        return $this->htmlEscape($this->getMessage()->getMessage());
+        return $this->escapeHtml($this->getMessage()->getMessage());
     }
 }
diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Form.php b/app/code/core/Mage/GiftMessage/Block/Message/Form.php
index 0b43f9f5249..bd67e4dbcfc 100644
--- a/app/code/core/Mage/GiftMessage/Block/Message/Form.php
+++ b/app/code/core/Mage/GiftMessage/Block/Message/Form.php
@@ -97,7 +97,7 @@ public function getMessage()
 
     public function getEscaped($value)
     {
-        return $this->htmlEscape($value);
+        return $this->escapeHtml($value);
     }
 
     public function getEscapedForJs($value)
diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Inline.php b/app/code/core/Mage/GiftMessage/Block/Message/Inline.php
index 585e0b90fd5..529d5c0c0db 100644
--- a/app/code/core/Mage/GiftMessage/Block/Message/Inline.php
+++ b/app/code/core/Mage/GiftMessage/Block/Message/Inline.php
@@ -253,7 +253,7 @@ public function getEntityHasMessage()
      */
     public function getEscaped($value, $defaultValue='')
     {
-        return $this->htmlEscape(trim($value)!='' ? $value : $defaultValue);
+        return $this->escapeHtml(trim($value)!='' ? $value : $defaultValue);
     }
 
     /**
diff --git a/app/code/core/Mage/GiftMessage/Helper/Message.php b/app/code/core/Mage/GiftMessage/Helper/Message.php
index 743fd5de5c6..9caccca4a3d 100644
--- a/app/code/core/Mage/GiftMessage/Helper/Message.php
+++ b/app/code/core/Mage/GiftMessage/Helper/Message.php
@@ -85,7 +85,9 @@ public function getButton($type, Varien_Object $entity)
      */
     public function getInline($type, Varien_Object $entity, $dontDisplayContainer=false)
     {
-        if (!in_array($type, array('onepage_checkout','multishipping_adress')) && !$this->isMessagesAvailable($type, $entity)) {
+        if (!in_array($type, array('onepage_checkout','multishipping_adress'))
+            && !$this->isMessagesAvailable($type, $entity)
+        ) {
             return '';
         }
 
@@ -199,7 +201,7 @@ public function getEscapedGiftMessage(Varien_Object $entity)
     {
         $message = $this->getGiftMessageForEntity($entity);
         if ($message) {
-            return nl2br($this->htmlEscape($message->getMessage()));
+            return nl2br($this->escapeHtml($message->getMessage()));
         }
         return null;
     }
diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit.php
index a19cb6794e5..e8568580168 100644
--- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit.php
+++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit.php
@@ -53,9 +53,15 @@ public function __construct()
             var itemType = function() {
                 return {
                     updateAttributes: function() {
-                        if ($("select_attribute_set").value != "" && $("select_itemtype").value != "" && itemType.confirmChanges())
-                        {
-                            var elements = [$("select_attribute_set"),$("select_itemtype"),$("select_target_country")].flatten();
+                        if ($("select_attribute_set").value != ""
+                            && $("select_itemtype").value != ""
+                            && itemType.confirmChanges()
+                        ) {
+                            var elements = [
+                                $("select_attribute_set"),
+                                $("select_itemtype"),
+                                $("select_target_country")
+                            ].flatten();
                             $(\'save_button\').disabled = true;
                             new Ajax.Updater("attributes_details", "'.$this->getUrl('*/*/loadAttributes').'",
                                 {
@@ -70,7 +76,11 @@ public function __construct()
                     reloadItemTypes: function() {
                         if ($("select_target_country").value != "" && itemType.confirmChanges())
                         {
-                            var elements = [$("select_attribute_set"),$("select_itemtype"),$("select_target_country")].flatten();
+                            var elements = [
+                                $("select_attribute_set"),
+                                $("select_itemtype"),
+                                $("select_target_country")
+                            ].flatten();
                             new Ajax.Updater("gbase_itemtype_select", "'.$this->getUrl('*/*/loadItemTypes').'",
                                 {
                                     parameters:Form.serializeElements(elements),
@@ -98,8 +108,10 @@ public function __construct()
 
                     confirmChanges: function() {
                         var blocksCount = Element.select($("attributes_details"), "div[id^=gbase_attribute_]").length;
-                        if (blocksCount > 0 && confirm("'.$this->__('Current Mapping will be reloaded. Continue?').'") || blocksCount == 0)
-                        {
+                        if (blocksCount > 0
+                            && confirm("'.$this->__('Current Mapping will be reloaded. Continue?').'")
+                            || blocksCount == 0
+                        ) {
                             return true;
                         }
                         return false;
@@ -124,7 +136,7 @@ public function __construct()
     public function getHeaderText()
     {
         if(!is_null(Mage::registry('current_item_type')->getId())) {
-            return $this->__('Edit Item Type "%s"', $this->htmlEscape(Mage::registry('current_item_type')->getGbaseItemtype()));
+            return $this->__('Edit Item Type "%s"', $this->escapeHtml(Mage::registry('current_item_type')->getGbaseItemtype()));
         } else {
             return $this->__('New Item Type');
         }
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api.php b/app/code/core/Mage/GoogleCheckout/Model/Api.php
index 74deba2aade..cf5c388cce3 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Api.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Api.php
@@ -94,7 +94,9 @@ public function process($gOrderId)
 
     public function deliver($gOrderId, $carrier, $trackingNo, $sendMail = true)
     {
-        $gCarriers = array('dhl' => 'DHL', 'fedex' => 'FedEx', 'ups' => 'UPS', 'usps' => 'USPS');
+        $this->setCarriers(array('dhl' => 'DHL', 'fedex' => 'FedEx', 'ups' => 'UPS', 'usps' => 'USPS'));
+        Mage::dispatchEvent('googlecheckout_api_deliver_carriers_array', array('api' => $this));
+        $gCarriers = $this->getCarriers();
         $carrier = strtolower($carrier);
         $carrier = isset($gCarriers[$carrier]) ? $gCarriers[$carrier] : 'Other';
 
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Abstract.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Abstract.php
index 51a1d4030bb..8ae11e59509 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Abstract.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Abstract.php
@@ -124,6 +124,11 @@ public function getGRequest()
      */
     public function getGResponse()
     {
+        $merchantId = $this->getMerchantId();
+        $merchantKey = $this->getMerchantKey();
+        if (empty($merchantId) || empty($merchantKey)) {
+            Mage::throwException(Mage::helper('googlecheckout')->__('GoogleCheckout is not configured'));
+        }
         if (!$this->hasData('g_response')) {
             $this->setData('g_response', new GoogleResponse(
                 $this->getMerchantId(),
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Callback.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Callback.php
index 41620750c4e..6527652f728 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Callback.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Callback.php
@@ -809,6 +809,9 @@ protected function _responseChargeAmountNotification()
 
         $order = $this->getOrder();
         $payment = $order->getPayment();
+        if ($payment->getMethod() !== 'googlecheckout') {
+            return;
+        }
 
         $latestCharged = $this->getData('root/latest-charge-amount/VALUE');
         $totalCharged = $this->getData('root/total-charge-amount/VALUE');
diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit/Form.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit/Form.php
index 0b866aa1030..acf9c260aed 100644
--- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit/Form.php
+++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit/Form.php
@@ -40,25 +40,24 @@ class Mage_ImportExport_Block_Adminhtml_Export_Edit_Form extends Mage_Adminhtml_
      */
     protected function _prepareForm()
     {
-        $helper = Mage::helper('importexport');
         $form = new Varien_Data_Form(array(
             'id'     => 'edit_form',
             'action' => $this->getUrl('*/*/getFilter'),
             'method' => 'post'
         ));
-        $fieldset = $form->addFieldset('base_fieldset', array('legend' => $helper->__('Export Settings')));
+        $fieldset = $form->addFieldset('base_fieldset', array('legend' => Mage::helper('importexport')->__('Export Settings')));
         $fieldset->addField('entity', 'select', array(
             'name'     => 'entity',
-            'title'    => $helper->__('Entity Type'),
-            'label'    => $helper->__('Entity Type'),
+            'title'    => Mage::helper('importexport')->__('Entity Type'),
+            'label'    => Mage::helper('importexport')->__('Entity Type'),
             'required' => false,
             'onchange' => 'editForm.getFilter();',
             'values'   => Mage::getModel('importexport/source_export_entity')->toOptionArray()
         ));
         $fieldset->addField('file_format', 'select', array(
             'name'     => 'file_format',
-            'title'    => $helper->__('Export File Format'),
-            'label'    => $helper->__('Export File Format'),
+            'title'    => Mage::helper('importexport')->__('Export File Format'),
+            'label'    => Mage::helper('importexport')->__('Export File Format'),
             'required' => false,
             'values'   => Mage::getModel('importexport/source_export_format')->toOptionArray()
         ));
diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php
index 4564995d613..6b6c5ef9a63 100644
--- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php
+++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php
@@ -77,8 +77,8 @@ protected function _getDateFromToHtml(Mage_Eav_Model_Entity_Attribute $attribute
             'extra_params' => 'style="width:85px !important"',
             'image'        => $this->getSkinUrl('images/grid-cal.gif')
         ));
-        return '<strong>' . $this->_helper->__('From') . ':</strong>&nbsp;' . $dateBlock->getHtml()
-             . '&nbsp;<strong>' . $this->_helper->__('To') . ':</strong>&nbsp;'
+        return '<strong>' . Mage::helper('importexport')->__('From') . ':</strong>&nbsp;' . $dateBlock->getHtml()
+             . '&nbsp;<strong>' . Mage::helper('importexport')->__('To') . ':</strong>&nbsp;'
              . $dateBlock->setId($dateBlock->getId() . '_to')->getHtml();
     }
 
@@ -126,7 +126,7 @@ protected function _getMultiSelectHtml(Mage_Eav_Model_Entity_Attribute $attribut
             ));
             return $selectBlock->setOptions($options)->getHtml();
         } else {
-            return $this->_helper->__('Attribute does not has options, so filtering is impossible');
+            return Mage::helper('importexport')->__('Attribute does not has options, so filtering is impossible');
         }
     }
 
@@ -140,9 +140,9 @@ protected function _getMultiSelectHtml(Mage_Eav_Model_Entity_Attribute $attribut
     protected function _getNumberFromToHtml(Mage_Eav_Model_Entity_Attribute $attribute)
     {
         $name = $this->getFilterElementName($attribute->getAttributeCode());
-        return '<strong>' . $this->_helper->__('From') . ':</strong>&nbsp;'
+        return '<strong>' . Mage::helper('importexport')->__('From') . ':</strong>&nbsp;'
              . '<input type="text" name="' . $this->getFilterElementName($attribute->getAttributeCode())
-             . '[]" class="input-text" style="width:100px;"/>&nbsp;<strong>' . $this->_helper->__('To')
+             . '[]" class="input-text" style="width:100px;"/>&nbsp;<strong>' . Mage::helper('importexport')->__('To')
              . ':</strong>&nbsp;<input type="text" name="' . $name
              . '[]" class="input-text" style="width:100px;"/>';
     }
@@ -182,7 +182,7 @@ protected function _getSelectHtml(Mage_Eav_Model_Entity_Attribute $attribute)
             ));
             return $selectBlock->setOptions($options)->getHtml();
         } else {
-            return $this->_helper->__('Attribute does not has options, so filtering is impossible');
+            return Mage::helper('importexport')->__('Attribute does not has options, so filtering is impossible');
         }
     }
 
@@ -210,9 +210,9 @@ protected function _getDateFromToHtmlWithValue(Mage_Eav_Model_Entity_Attribute $
         }
 
 
-        return '<strong>' . $this->_helper->__('From') . ':</strong>&nbsp;'
+        return '<strong>' . Mage::helper('importexport')->__('From') . ':</strong>&nbsp;'
             . $dateBlock->setValue($fromValue)->getHtml()
-            . '&nbsp;<strong>' . $this->_helper->__('To') . ':</strong>&nbsp;'
+            . '&nbsp;<strong>' . Mage::helper('importexport')->__('To') . ':</strong>&nbsp;'
             . $dateBlock->setId($dateBlock->getId() . '_to')->setValue($toValue)->getHtml();
     }
 
@@ -266,7 +266,7 @@ protected function _getMultiSelectHtmlWithValue(Mage_Eav_Model_Entity_Attribute
                 ->setValue($value)
                 ->getHtml();
         } else {
-            return $this->_helper->__('Attribute does not has options, so filtering is impossible');
+            return Mage::helper('importexport')->__('Attribute does not has options, so filtering is impossible');
         }
     }
 
@@ -287,10 +287,10 @@ protected function _getNumberFromToHtmlWithValue(Mage_Eav_Model_Entity_Attribute
             $toValue   = $this->_helper->escapeHtml(next($value));
         }
 
-        return '<strong>' . $this->_helper->__('From') . ':</strong>&nbsp;'
+        return '<strong>' . Mage::helper('importexport')->__('From') . ':</strong>&nbsp;'
              . '<input type="text" name="' . $name . '[]" class="input-text input-text-range"'
              . ' value="' . $fromValue . '"/>&nbsp;'
-             . '<strong>' . $this->_helper->__('To')
+             . '<strong>' . Mage::helper('importexport')->__('To')
              . ':</strong>&nbsp;<input type="text" name="' . $name
              . '[]" class="input-text input-text-range" value="' . $toValue . '" />';
     }
@@ -331,7 +331,7 @@ protected function _getSelectHtmlWithValue(Mage_Eav_Model_Entity_Attribute $attr
                 ->setValue($value)
                 ->getHtml();
         } else {
-            return $this->_helper->__('Attribute does not has options, so filtering is impossible');
+            return Mage::helper('importexport')->__('Attribute does not has options, so filtering is impossible');
         }
     }
 
@@ -345,7 +345,7 @@ protected function _prepareColumns()
         parent::_prepareColumns();
 
         $this->addColumn('skip', array(
-            'header'     => $this->_helper->__('Skip'),
+            'header'     => Mage::helper('importexport')->__('Skip'),
             'type'       => 'checkbox',
             'name'       => 'skip',
             'field_name' => Mage_ImportExport_Model_Export::FILTER_ELEMENT_SKIP . '[]',
@@ -355,16 +355,16 @@ protected function _prepareColumns()
             'index'      => 'attribute_id'
         ));
         $this->addColumn('frontend_label', array(
-            'header'   => $this->_helper->__('Attribute Label'),
+            'header'   => Mage::helper('importexport')->__('Attribute Label'),
             'index'    => 'frontend_label',
             'sortable' => false,
         ));
         $this->addColumn('attribute_code', array(
-            'header' => $this->_helper->__('Attribute Code'),
+            'header' => Mage::helper('importexport')->__('Attribute Code'),
             'index'  => 'attribute_code'
         ));
         $this->addColumn('filter', array(
-            'header'         => $this->_helper->__('Filter'),
+            'header'         => Mage::helper('importexport')->__('Filter'),
             'sortable'       => false,
             'filter'         => false,
             'frame_callback' => array($this, 'decorateFilter')
@@ -417,7 +417,7 @@ public function decorateFilter($value, Mage_Eav_Model_Entity_Attribute $row, Var
                 $cell = $this->_getNumberFromToHtmlWithValue($row, $value);
                 break;
             default:
-                $cell = $this->_helper->__('Unknown attribute filter type');
+                $cell = Mage::helper('importexport')->__('Unknown attribute filter type');
         }
         return $cell;
     }
diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit/Form.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit/Form.php
index ee5f19568d3..fee95a01d76 100644
--- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit/Form.php
+++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit/Form.php
@@ -40,40 +40,33 @@ class Mage_ImportExport_Block_Adminhtml_Import_Edit_Form extends Mage_Adminhtml_
      */
     protected function _prepareForm()
     {
-        $helper = Mage::helper('importexport');
         $form = new Varien_Data_Form(array(
             'id'      => 'edit_form',
             'action'  => $this->getUrl('*/*/validate'),
             'method'  => 'post',
             'enctype' => 'multipart/form-data'
         ));
-        $fieldset = $form->addFieldset('base_fieldset', array('legend' => $helper->__('Import Settings')));
+        $fieldset = $form->addFieldset('base_fieldset', array('legend' => Mage::helper('importexport')->__('Import Settings')));
         $fieldset->addField('entity', 'select', array(
             'name'     => 'entity',
-            'title'    => $helper->__('Entity Type'),
-            'label'    => $helper->__('Entity Type'),
+            'title'    => Mage::helper('importexport')->__('Entity Type'),
+            'label'    => Mage::helper('importexport')->__('Entity Type'),
             'required' => true,
             'values'   => Mage::getModel('importexport/source_import_entity')->toOptionArray()
         ));
         $fieldset->addField('behavior', 'select', array(
             'name'     => 'behavior',
-            'title'    => $helper->__('Import Behavior'),
-            'label'    => $helper->__('Import Behavior'),
+            'title'    => Mage::helper('importexport')->__('Import Behavior'),
+            'label'    => Mage::helper('importexport')->__('Import Behavior'),
             'required' => true,
             'values'   => Mage::getModel('importexport/source_import_behavior')->toOptionArray()
         ));
         $fieldset->addField(Mage_ImportExport_Model_Import::FIELD_NAME_SOURCE_FILE, 'file', array(
             'name'     => Mage_ImportExport_Model_Import::FIELD_NAME_SOURCE_FILE,
-            'label'    => $helper->__('Select File to Import'),
-            'title'    => $helper->__('Select File to Import'),
+            'label'    => Mage::helper('importexport')->__('Select File to Import'),
+            'title'    => Mage::helper('importexport')->__('Select File to Import'),
             'required' => true
         ));
-        /*$fieldset->addField(Mage_ImportExport_Model_Import::FIELD_NAME_IMG_ARCHIVE_FILE, 'file', array(
-            'name'     => Mage_ImportExport_Model_Import::FIELD_NAME_IMG_ARCHIVE_FILE,
-            'label'    => $helper->__('Select Image Archive File to Import'),
-            'title'    => $helper->__('Select Image Archive File to Import'),
-            'required' => false
-        ));*/
 
         $form->setUseContainer(true);
         $this->setForm($form);
diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php
index 4d15e56350d..827b1ffa3d2 100644
--- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php
+++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php
@@ -405,15 +405,11 @@ public function getEntityTypeId()
      */
     public function getErrorMessages()
     {
-        $translator = Mage::helper('importexport');
         $messages = array();
-
         foreach ($this->_errors as $errorCode => $errorRows) {
-            if (isset($this->_messageTemplates[$errorCode])) {
-                $message = $translator->__($this->_messageTemplates[$errorCode]);
-            } else {
-                $message = $translator->__("Invalid value for '%s' column", $errorCode);
-            }
+            $message = isset($this->_messageTemplates[$errorCode])
+                ? Mage::helper('importexport')->__($this->_messageTemplates[$errorCode])
+                : Mage::helper('importexport')->__("Invalid value for '%s' column", $errorCode);
             $messages[$message] = $errorRows;
         }
         return $messages;
diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php
index e7a3a2b83be..a4026d4be61 100644
--- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php
+++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php
@@ -536,7 +536,9 @@ protected function _updateDataWithCategoryColumns(&$dataRow, &$rowCategories, $p
         }
 
         $categoryId = array_shift($rowCategories[$productId]);
-        $dataRow[self::COL_ROOT_CATEGORY] = $this->_rootCategories[$categoryId];
+        if (isset($this->_rootCategories[$categoryId])) {
+            $dataRow[self::COL_ROOT_CATEGORY] = $this->_rootCategories[$categoryId];
+        }
         if (isset($this->_categories[$categoryId])) {
             $dataRow[self::COL_CATEGORY] = $this->_categories[$categoryId];
         }
@@ -714,11 +716,12 @@ public function export()
                 foreach ($productAttributesOptions as $productAttributeOption) {
                     $configurableData[$product->getId()] = array();
                     foreach ($productAttributeOption as $optionValues) {
+                        $priceType = $optionValues['pricing_is_percent'] ? '%' : '';
                         $configurableData[$product->getId()][] = array(
                             '_super_products_sku'           => $optionValues['sku'],
                             '_super_attribute_code'         => $optionValues['attribute_code'],
                             '_super_attribute_option'       => $optionValues['option_title'],
-                            '_super_attribute_price_corr'   => $optionValues['pricing_value']
+                            '_super_attribute_price_corr'   => $optionValues['pricing_value'] . $priceType
                         );
                     }
                 }
diff --git a/app/code/core/Mage/ImportExport/Model/Import.php b/app/code/core/Mage/ImportExport/Model/Import.php
index 9d6ef28b493..6e136949ef1 100644
--- a/app/code/core/Mage/ImportExport/Model/Import.php
+++ b/app/code/core/Mage/ImportExport/Model/Import.php
@@ -143,9 +143,7 @@ public function getOperationResultMessages($validationResult)
                 if ($this->getProcessedRowsCount() == $this->getInvalidRowsCount()) {
                     $messages[] = Mage::helper('importexport')->__('File is totally invalid. Please fix errors and re-upload file');
                 } elseif ($this->getErrorsCount() >= $this->getErrorsLimit()) {
-                    $messages[] = Mage::helper('importexport')->__('Errors limit (%d) reached. Please fix errors and re-upload file',
-                        $this->getErrorsLimit()
-                    );
+                    $messages[] = Mage::helper('importexport')->__('Errors limit (%d) reached. Please fix errors and re-upload file', $this->getErrorsLimit());
                 } else {
                     if ($this->isImportAllowed()) {
                         $messages[] = Mage::helper('importexport')->__('Please fix errors and re-upload file');
@@ -171,10 +169,7 @@ public function getOperationResultMessages($validationResult)
             if (is_array($notices)) {
                 $messages = array_merge($messages, $notices);
             }
-            $messages[] = Mage::helper('importexport')->__('Checked rows: %d, checked entities: %d, invalid rows: %d, total errors: %d',
-                $this->getProcessedRowsCount(), $this->getProcessedEntitiesCount(),
-                $this->getInvalidRowsCount(), $this->getErrorsCount()
-            );
+            $messages[] = Mage::helper('importexport')->__('Checked rows: %d, checked entities: %d, invalid rows: %d, total errors: %d', $this->getProcessedRowsCount(), $this->getProcessedEntitiesCount(), $this->getInvalidRowsCount(), $this->getErrorsCount());
         } else {
             $messages[] = Mage::helper('importexport')->__('File does not contain data.');
         }
@@ -329,10 +324,7 @@ public function importSource()
         $this->addLogComment(Mage::helper('importexport')->__('Begin import of "%s" with "%s" behavior', $this->getEntity(), $this->getBehavior()));
         $result = $this->_getEntityAdapter()->importData();
         $this->addLogComment(array(
-            Mage::helper('importexport')->__('Checked rows: %d, checked entities: %d, invalid rows: %d, total errors: %d',
-                $this->getProcessedRowsCount(), $this->getProcessedEntitiesCount(),
-                $this->getInvalidRowsCount(), $this->getErrorsCount()
-            ),
+            Mage::helper('importexport')->__('Checked rows: %d, checked entities: %d, invalid rows: %d, total errors: %d', $this->getProcessedRowsCount(), $this->getProcessedEntitiesCount(), $this->getInvalidRowsCount(), $this->getErrorsCount()),
             Mage::helper('importexport')->__('Import has been done successfuly.')
         ));
         return $result;
diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php
index d6509eb403c..d33fe171dff 100644
--- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php
+++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php
@@ -369,6 +369,8 @@ protected function _saveCustomers()
             $entityRowsUp = array();
             $attributes   = array();
 
+            $oldCustomersToLower = array_change_key_case($this->_oldCustomers, CASE_LOWER);
+
             foreach ($bunch as $rowNum => $rowData) {
                 if (!$this->validateRow($rowData, $rowNum)) {
                     continue;
@@ -383,8 +385,10 @@ protected function _saveCustomers()
                                         ? now() : gmstrftime($strftimeFormat, strtotime($rowData['created_at'])),
                         'updated_at' => now()
                     );
-                    if (isset($this->_oldCustomers[$rowData[self::COL_EMAIL]][$rowData[self::COL_WEBSITE]])) { // edit
-                        $entityId = $this->_oldCustomers[$rowData[self::COL_EMAIL]][$rowData[self::COL_WEBSITE]];
+
+                    $emailToLower = strtolower($rowData[self::COL_EMAIL]);
+                    if (isset($oldCustomersToLower[$emailToLower][$rowData[self::COL_WEBSITE]])) { // edit
+                        $entityId = $oldCustomersToLower[$emailToLower][$rowData[self::COL_WEBSITE]];
                         $entityRow['entity_id'] = $entityId;
                         $entityRowsUp[] = $entityRow;
                     } else { // create
@@ -553,22 +557,28 @@ public function validateRow(array $rowData, $rowNum)
         if (self::SCOPE_DEFAULT == $rowScope) {
             $this->_processedEntitiesCount ++;
         }
+
+
+        $email        = $rowData[self::COL_EMAIL];
+        $emailToLower = strtolower($rowData[self::COL_EMAIL]);
+        $website      = $rowData[self::COL_WEBSITE];
+
+        $oldCustomersToLower = array_change_key_case($this->_oldCustomers, CASE_LOWER);
+        $newCustomersToLower = array_change_key_case($this->_newCustomers, CASE_LOWER);
+
         // BEHAVIOR_DELETE use specific validation logic
         if (Mage_ImportExport_Model_Import::BEHAVIOR_DELETE == $this->getBehavior()) {
             if (self::SCOPE_DEFAULT == $rowScope
-                    && !isset($this->_oldCustomers[$rowData[self::COL_EMAIL]][$rowData[self::COL_WEBSITE]])) {
+                && !isset($oldCustomersToLower[$emailToLower][$website])) {
                 $this->addRowError(self::ERROR_EMAIL_SITE_NOT_FOUND, $rowNum);
             }
         } elseif (self::SCOPE_DEFAULT == $rowScope) { // row is SCOPE_DEFAULT = new customer block begins
-            $email   = $rowData[self::COL_EMAIL];
-            $website = $rowData[self::COL_WEBSITE];
-
             if (!Zend_Validate::is($email, 'EmailAddress')) {
                 $this->addRowError(self::ERROR_INVALID_EMAIL, $rowNum);
             } elseif (!isset($this->_websiteCodeToId[$website])) {
                 $this->addRowError(self::ERROR_INVALID_WEBSITE, $rowNum);
             } else {
-                if (isset($this->_newCustomers[$email][$website])) {
+                if (isset($newCustomersToLower[$emailToLower][$website])) {
                     $this->addRowError(self::ERROR_DUPLICATE_EMAIL_SITE, $rowNum);
                 }
                 $this->_newCustomers[$email][$website] = false;
@@ -589,7 +599,7 @@ public function validateRow(array $rowData, $rowNum)
                     }
                     if (isset($rowData[$attrCode]) && strlen($rowData[$attrCode])) {
                         $this->isAttributeValid($attrCode, $attrParams, $rowData, $rowNum);
-                    } elseif ($attrParams['is_required'] && !isset($this->_oldCustomers[$email][$website])) {
+                    } elseif ($attrParams['is_required'] && !isset($oldCustomersToLower[$emailToLower][$website])) {
                         $this->addRowError(self::ERROR_VALUE_IS_REQUIRED, $rowNum, $attrCode);
                     }
                 }
diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php
index 815cb6c5e75..14fbea9dd64 100644
--- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php
+++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php
@@ -33,6 +33,9 @@
  */
 class Mage_ImportExport_Model_Import_Entity_Product extends Mage_ImportExport_Model_Import_Entity_Abstract
 {
+    /**
+     * Configuration key for product type
+     */
     const CONFIG_KEY_PRODUCT_TYPES = 'global/importexport/import_product_types';
 
     /**
@@ -45,15 +48,16 @@ class Mage_ImportExport_Model_Import_Entity_Product extends Mage_ImportExport_Mo
      */
     const VALUE_ALL = 'all';
 
-    /**
+    /**#@+
      * Data row scopes.
      */
     const SCOPE_DEFAULT = 1;
     const SCOPE_WEBSITE = 2;
     const SCOPE_STORE   = 0;
     const SCOPE_NULL    = -1;
+    /**#@-*/
 
-    /**
+    /**#@+
      * Permanent column names.
      *
      * Names that begins with underscore is not an attribute. This name convention is for
@@ -65,8 +69,9 @@ class Mage_ImportExport_Model_Import_Entity_Product extends Mage_ImportExport_Mo
     const COL_CATEGORY = '_category';
     const COL_ROOT_CATEGORY = '_root_category';
     const COL_SKU      = 'sku';
+    /**#@-*/
 
-    /**
+    /**#@+
      * Error codes.
      */
     const ERROR_INVALID_SCOPE                = 'invalidScope';
@@ -94,6 +99,7 @@ class Mage_ImportExport_Model_Import_Entity_Product extends Mage_ImportExport_Mo
     const ERROR_GROUP_PRICE_DATA_INCOMPLETE  = 'groupPriceDataIsIncomplete';
     const ERROR_SKU_NOT_FOUND_FOR_DELETE     = 'skuNotFoundToDelete';
     const ERROR_SUPER_PRODUCTS_SKU_NOT_FOUND = 'superProductsSkuNotFound';
+    /**#@-*/
 
     /**
      * Pairs of attribute set ID-to-name.
@@ -353,7 +359,7 @@ protected function _importData()
                 $productTypeModel->saveData();
             }
         }
-        Mage::dispatchEvent('catalog_product_import_finish_before', array('adapter'=>$this));
+        Mage::dispatchEvent('catalog_product_import_finish_before', array('adapter' => $this));
         return true;
     }
 
@@ -461,7 +467,8 @@ protected function _initTypeModels()
     {
         $config = Mage::getConfig()->getNode(self::CONFIG_KEY_PRODUCT_TYPES)->asCanonicalArray();
         foreach ($config as $type => $typeModel) {
-            if (!($model = Mage::getModel($typeModel, array($this, $type)))) {
+            $model = Mage::getModel($typeModel, array($this, $type));
+            if (!$model) {
                 Mage::throwException("Entity type model '{$typeModel}' is not found");
             }
             if (! $model instanceof Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract) {
@@ -700,6 +707,7 @@ protected function _saveCustomOptions()
             );
 
             foreach ($bunch as $rowNum => $rowData) {
+                $this->_filterRowData($rowData);
                 if (!$this->isRowAllowedToImport($rowData, $rowNum)) {
                     continue;
                 }
@@ -948,6 +956,7 @@ protected function _saveLinks()
             $positionRows = array();
 
             foreach ($bunch as $rowNum => $rowData) {
+                $this->_filterRowData($rowData);
                 if (!$this->isRowAllowedToImport($rowData, $rowNum)) {
                     continue;
                 }
@@ -955,10 +964,10 @@ protected function _saveLinks()
                     $sku = $rowData[self::COL_SKU];
                 }
                 foreach ($this->_linkNameToId as $linkName => $linkId) {
+                    $productId    = $this->_newSku[$sku]['entity_id'];
+                    $productIds[] = $productId;
                     if (isset($rowData[$linkName . 'sku'])) {
-                        $productId    = $this->_newSku[$sku]['entity_id'];
-                        $productIds[] = $productId;
-                        $linkedSku    = $rowData[$linkName . 'sku'];
+                        $linkedSku = $rowData[$linkName . 'sku'];
 
                         if ((isset($this->_newSku[$linkedSku]) || isset($this->_oldSku[$linkedSku]))
                                 && $linkedSku != $sku) {
@@ -992,7 +1001,7 @@ protected function _saveLinks()
             if (Mage_ImportExport_Model_Import::BEHAVIOR_APPEND != $this->getBehavior() && $productIds) {
                 $adapter->delete(
                     $mainTable,
-                    $adapter->quoteInto('product_id IN (?)', array_keys($productIds))
+                    $adapter->quoteInto('product_id IN (?)', array_unique($productIds))
                 );
             }
             if ($linkRows) {
@@ -1124,10 +1133,7 @@ protected function _saveProductEntity(array $entityRowsIn, array $entityRowsUp)
      */
     protected function _saveProducts()
     {
-        /** @var $resource Mage_ImportExport_Model_Import_Proxy_Product_Resource */
-        $resource       = Mage::getModel('importexport/import_proxy_product_resource');
         $priceIsGlobal  = Mage::helper('catalog')->isPriceGlobal();
-        $strftimeFormat = Varien_Date::convertZendToStrftime(Varien_Date::DATETIME_INTERNAL_FORMAT, true, true);
         $productLimit   = null;
         $productsQty    = null;
 
@@ -1145,6 +1151,7 @@ protected function _saveProducts()
             $previousAttributeSet = null;
 
             foreach ($bunch as $rowNum => $rowData) {
+                $this->_filterRowData($rowData);
                 if (!$this->validateRow($rowData, $rowNum)) {
                     continue;
                 }
@@ -1237,68 +1244,34 @@ protected function _saveProducts()
                 }
                 // 6. Attributes phase
                 $rowStore     = self::SCOPE_STORE == $rowScope ? $this->_storeCodeToId[$rowData[self::COL_STORE]] : 0;
-                $productType  = $rowData[self::COL_TYPE];
-                if(!is_null($rowData[self::COL_TYPE])) {
-                    $previousType = $rowData[self::COL_TYPE];
+                $productType  = isset($rowData[self::COL_TYPE]) ? $rowData[self::COL_TYPE] : null;
+                if (!is_null($productType)) {
+                    $previousType = $productType;
                 }
-                if(!is_null($rowData[self::COL_ATTR_SET])) {
+                if (!is_null($rowData[self::COL_ATTR_SET])) {
                     $previousAttributeSet = $rowData[Mage_ImportExport_Model_Import_Entity_Product::COL_ATTR_SET];
                 }
                 if (self::SCOPE_NULL == $rowScope) {
                     // for multiselect attributes only
-                    if(!is_null($previousAttributeSet)) {
-                        $rowData[Mage_ImportExport_Model_Import_Entity_Product::COL_ATTR_SET] = $previousAttributeSet;
+                    if (!is_null($previousAttributeSet)) {
+                         $rowData[Mage_ImportExport_Model_Import_Entity_Product::COL_ATTR_SET] = $previousAttributeSet;
                     }
-                    if(is_null($productType) && !is_null($previousType)) {
+                    if (is_null($productType) && !is_null($previousType)) {
                         $productType = $previousType;
                     }
-                    if(is_null($productType)) {
+                    if (is_null($productType)) {
                         continue;
                     }
                 }
-                $rowData      = $this->_productTypeModels[$productType]->prepareAttributesForSave($rowData);
-                $product      = Mage::getModel('importexport/import_proxy_product', $rowData);
-
-                foreach ($rowData as $attrCode => $attrValue) {
-                    $attribute = $resource->getAttribute($attrCode);
-                    if('multiselect' != $attribute->getFrontendInput()
-                        && self::SCOPE_NULL == $rowScope) {
-                        continue; // skip attribute processing for SCOPE_NULL rows
-                    }
-                    $attrId    = $attribute->getId();
-                    $backModel = $attribute->getBackendModel();
-                    $attrTable = $attribute->getBackend()->getTable();
-                    $storeIds  = array(0);
-
-                    if ('datetime' == $attribute->getBackendType() && strtotime($attrValue)) {
-                        $attrValue = gmstrftime($strftimeFormat, strtotime($attrValue));
-                    } elseif ($backModel) {
-                        $attribute->getBackend()->beforeSave($product);
-                        $attrValue = $product->getData($attribute->getAttributeCode());
-                    }
-                    if (self::SCOPE_STORE == $rowScope) {
-                        if (self::SCOPE_WEBSITE == $attribute->getIsGlobal()) {
-                            // check website defaults already set
-                            if (!isset($attributes[$attrTable][$rowSku][$attrId][$rowStore])) {
-                                $storeIds = $this->_storeIdToWebsiteStoreIds[$rowStore];
-                            }
-                        } elseif (self::SCOPE_STORE == $attribute->getIsGlobal()) {
-                            $storeIds = array($rowStore);
-                        }
-                    }
-                    foreach ($storeIds as $storeId) {
-                        if('multiselect' == $attribute->getFrontendInput()) {
-                            if(!isset($attributes[$attrTable][$rowSku][$attrId][$storeId])) {
-                                $attributes[$attrTable][$rowSku][$attrId][$storeId] = '';
-                            } else {
-                                $attributes[$attrTable][$rowSku][$attrId][$storeId] .= ',';
-                            }
-                            $attributes[$attrTable][$rowSku][$attrId][$storeId] .= $attrValue;
-                        } else {
-                            $attributes[$attrTable][$rowSku][$attrId][$storeId] = $attrValue;
-                        }
-                    }
-                    $attribute->setBackendModel($backModel); // restore 'backend_model' to avoid 'default' setting
+                $rowData = $this->_productTypeModels[$productType]->prepareAttributesForSave(
+                    $rowData,
+                    !isset($this->_oldSku[$rowSku])
+                );
+                try {
+                    $attributes = $this->_prepareAttributes($rowData, $rowScope, $attributes, $rowSku, $rowStore);
+                } catch (Exception $e) {
+                    Mage::logException($e);
+                    continue;
                 }
             }
             $this->_saveProductEntity($entityRowsIn, $entityRowsUp)
@@ -1312,6 +1285,93 @@ protected function _saveProducts()
         return $this;
     }
 
+    /**
+     * Retrieve pattern for time formatting
+     *
+     * @return string
+     */
+    protected function _getStrftimeFormat()
+    {
+        return Varien_Date::convertZendToStrftime(Varien_Date::DATETIME_INTERNAL_FORMAT, true, true);
+    }
+
+    /**
+     * Retrieve attribute by specified code
+     *
+     * @param string $code
+     * @return Mage_Eav_Model_Entity_Attribute_Abstract
+     */
+    protected function _getAttribute($code)
+    {
+        $attribute = Mage::getSingleton('importexport/import_proxy_product_resource')->getAttribute($code);
+        $backendModelName = (string)Mage::getConfig()->getNode(
+            'global/importexport/import/catalog_product/attributes/' . $attribute->getAttributeCode() . '/backend_model'
+        );
+        if (!empty($backendModelName)) {
+            $attribute->setBackendModel($backendModelName);
+        }
+        return $attribute;
+    }
+
+    /**
+     * Prepare attributes data
+     *
+     * @param array $rowData
+     * @param int $rowScope
+     * @param array $attributes
+     * @param string|null $rowSku
+     * @param int $rowStore
+     * @return array
+     */
+    protected function _prepareAttributes($rowData, $rowScope, $attributes, $rowSku, $rowStore)
+    {
+        $product = Mage::getModel('importexport/import_proxy_product', $rowData);
+
+        foreach ($rowData as $attrCode => $attrValue) {
+            $attribute = $this->_getAttribute($attrCode);
+            if ('multiselect' != $attribute->getFrontendInput()
+                && self::SCOPE_NULL == $rowScope
+            ) {
+                continue; // skip attribute processing for SCOPE_NULL rows
+            }
+            $attrId = $attribute->getId();
+            $backModel = $attribute->getBackendModel();
+            $attrTable = $attribute->getBackend()->getTable();
+            $storeIds = array(0);
+
+            if ('datetime' == $attribute->getBackendType() && strtotime($attrValue)) {
+                $attrValue = gmstrftime($this->_getStrftimeFormat(), strtotime($attrValue));
+            } elseif ($backModel) {
+                $attribute->getBackend()->beforeSave($product);
+                $attrValue = $product->getData($attribute->getAttributeCode());
+            }
+            if (self::SCOPE_STORE == $rowScope) {
+                if (self::SCOPE_WEBSITE == $attribute->getIsGlobal()) {
+                    // check website defaults already set
+                    if (!isset($attributes[$attrTable][$rowSku][$attrId][$rowStore])) {
+                        $storeIds = $this->_storeIdToWebsiteStoreIds[$rowStore];
+                    }
+                } elseif (self::SCOPE_STORE == $attribute->getIsGlobal()) {
+                    $storeIds = array($rowStore);
+                }
+            }
+            foreach ($storeIds as $storeId) {
+                if ('multiselect' == $attribute->getFrontendInput()) {
+                    if (!isset($attributes[$attrTable][$rowSku][$attrId][$storeId])) {
+                        $attributes[$attrTable][$rowSku][$attrId][$storeId] = '';
+                    } else {
+                        $attributes[$attrTable][$rowSku][$attrId][$storeId] .= ',';
+                    }
+                    $attributes[$attrTable][$rowSku][$attrId][$storeId] .= $attrValue;
+                } else {
+                    $attributes[$attrTable][$rowSku][$attrId][$storeId] = $attrValue;
+                }
+            }
+            $attribute->setBackendModel($backModel); // restore 'backend_model' to avoid 'default' setting
+        }
+        return $attributes;
+    }
+
     /**
      * Save product tier prices.
      *
@@ -1558,6 +1618,39 @@ protected function _saveProductWebsites(array $websiteData)
         return $this;
     }
 
+    /**
+     * Returns resource model
+     *
+     * @param string $resourceModelName
+     * @return Object
+     */
+    protected function getResourceModel($resourceModelName)
+    {
+        return Mage::getResourceModel($resourceModelName);
+    }
+
+    /**
+     * Returns helper
+     *
+     * @param string $helperName
+     * @return Mage_Core_Helper_Abstract
+     */
+    protected function getHelper($helperName)
+    {
+        return Mage::helper($helperName);
+    }
+
+    /**
+     * Returns model
+     *
+     * @param string $modelName
+     * @return bool|Mage_Core_Model_Abstract
+     */
+    protected function getModel($modelName)
+    {
+        return Mage::getModel($modelName);
+    }
+
     /**
      * Stock item saving.
      *
@@ -1590,14 +1683,15 @@ protected function _saveStockItem()
             'is_decimal_divided'            => 0
         );
 
-        $entityTable = Mage::getResourceModel('cataloginventory/stock_item')->getMainTable();
-        $helper      = Mage::helper('catalogInventory');
+        $entityTable = $this->getResourceModel('cataloginventory/stock_item')->getMainTable();
+        $helper      = $this->getHelper('catalogInventory');
 
-        while ($bunch = $this->_dataSourceModel->getNextBunch()) {
+        while ($bunch = $this->getNextBunch()) {
             $stockData = array();
 
             // Format bunch to stock data rows
             foreach ($bunch as $rowNum => $rowData) {
+                $this->_filterRowData($rowData);
                 if (!$this->isRowAllowedToImport($rowData, $rowNum)) {
                     continue;
                 }
@@ -1606,11 +1700,12 @@ protected function _saveStockItem()
                     continue;
                 }
 
+                $row = array();
                 $row['product_id'] = $this->_newSku[$rowData[self::COL_SKU]]['entity_id'];
                 $row['stock_id'] = 1;
 
                 /** @var $stockItem Mage_CatalogInventory_Model_Stock_Item */
-                $stockItem = Mage::getModel('cataloginventory/stock_item');
+                $stockItem = $this->getModel('cataloginventory/stock_item');
                 $stockItem->loadByProduct($row['product_id']);
                 $existStockData = $stockItem->getData();
 
@@ -1622,7 +1717,7 @@ protected function _saveStockItem()
                 );
 
                 $stockItem->setData($row);
-
+                unset($row);
                 if ($helper->isQty($this->_newSku[$rowData[self::COL_SKU]]['type_id'])) {
                     if ($stockItem->verifyNotification()) {
                         $stockItem->setLowStockDate(Mage::app()->getLocale()
@@ -1645,6 +1740,19 @@ protected function _saveStockItem()
         return $this;
     }
 
+    /**
+     * Removes empty keys in case value is null or empty string
+     *
+     * @param array $rowData
+     */
+    protected function _filterRowData(&$rowData)
+    {
+        $rowData = array_filter($rowData, 'strlen');
+        if (!isset($rowData[self::COL_SKU])) {
+            $rowData[self::COL_SKU] = null;
+        }
+    }
+
     /**
      * Atttribute set ID-to-name pairs getter.
      *
@@ -1714,7 +1822,7 @@ public function getOldSku()
      */
     public function getRowScope(array $rowData)
     {
-        if (strlen(trim($rowData[self::COL_SKU]))) {
+        if (isset($rowData[self::COL_SKU]) && strlen(trim($rowData[self::COL_SKU]))) {
             return self::SCOPE_DEFAULT;
         } elseif (empty($rowData[self::COL_STORE])) {
             return self::SCOPE_NULL;
@@ -1763,12 +1871,8 @@ public function validateRow(array $rowData, $rowNum)
             }
             return true;
         }
-        // common validation
-        $this->_isProductWebsiteValid($rowData, $rowNum);
-        $this->_isProductCategoryValid($rowData, $rowNum);
-        $this->_isTierPriceValid($rowData, $rowNum);
-        $this->_isGroupPriceValid($rowData, $rowNum);
-        $this->_isSuperProductsSkuValid($rowData, $rowNum);
+
+        $this->_validate($rowData, $rowNum, $sku);
 
         if (self::SCOPE_DEFAULT == $rowScope) { // SKU is specified, row is SCOPE_DEFAULT, new product block begins
             $this->_processedEntitiesCount ++;
@@ -1833,6 +1937,22 @@ public function validateRow(array $rowData, $rowNum)
         return !isset($this->_invalidRows[$rowNum]);
     }
 
+    /**
+     * Common validation
+     *
+     * @param array $rowData
+     * @param int $rowNum
+     * @param string|false|null $sku
+     */
+    protected function _validate($rowData, $rowNum, $sku)
+    {
+        $this->_isProductWebsiteValid($rowData, $rowNum);
+        $this->_isProductCategoryValid($rowData, $rowNum);
+        $this->_isTierPriceValid($rowData, $rowNum);
+        $this->_isGroupPriceValid($rowData, $rowNum);
+        $this->_isSuperProductsSkuValid($rowData, $rowNum);
+    }
+
     /**
      * Get array of affected products
      *
diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php
index 1d0889e4ea7..e58ca0c7a06 100644
--- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php
+++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php
@@ -96,9 +96,7 @@ abstract class Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract
      * Object constructor.
      *
      * @param array $params
-     * @param string $type Product type (simple, configurable, etc.)
      * @throws Exception
-     * @return void
      */
     final public function __construct(array $params)
     {
@@ -285,9 +283,10 @@ public function isSuitable()
      * Prepare attributes values for save: remove non-existent, remove empty values, remove static.
      *
      * @param array $rowData
+     * @param bool $withDefaultValue
      * @return array
      */
-    public function prepareAttributesForSave(array $rowData)
+    public function prepareAttributesForSave(array $rowData, $withDefaultValue = true)
     {
         $resultAttrs = array();
 
@@ -300,7 +299,7 @@ public function prepareAttributesForSave(array $rowData)
                         : $rowData[$attrCode];
                 } elseif (array_key_exists($attrCode, $rowData)) {
                     $resultAttrs[$attrCode] = $rowData[$attrCode];
-                } elseif (null !== $attrParams['default_value']) {
+                } elseif ($withDefaultValue && null !== $attrParams['default_value']) {
                     $resultAttrs[$attrCode] = $attrParams['default_value'];
                 }
             }
diff --git a/app/code/core/Mage/ImportExport/Model/Product/Attribute/Backend/Urlkey.php b/app/code/core/Mage/ImportExport/Model/Product/Attribute/Backend/Urlkey.php
new file mode 100644
index 00000000000..cd0c3bcec8c
--- /dev/null
+++ b/app/code/core/Mage/ImportExport/Model/Product/Attribute/Backend/Urlkey.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_ImportExport
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Backend model for product url_key attribute
+ *
+ * @category    Mage
+ * @package     Mage_ImportExport
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey
+    extends Mage_Catalog_Model_Product_Attribute_Backend_Urlkey
+{
+    /**
+     * No need to validate url_key during import
+     *
+     * @param Mage_Catalog_Model_Product $object
+     * @return Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey
+     */
+    protected function _validateUrlKey($object)
+    {
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/ImportExport/Model/Source/Import/Behavior.php b/app/code/core/Mage/ImportExport/Model/Source/Import/Behavior.php
index f2e8630233e..3139de34d48 100644
--- a/app/code/core/Mage/ImportExport/Model/Source/Import/Behavior.php
+++ b/app/code/core/Mage/ImportExport/Model/Source/Import/Behavior.php
@@ -40,20 +40,18 @@ class Mage_ImportExport_Model_Source_Import_Behavior
      */
     public function toOptionArray()
     {
-        $helper = Mage::helper('importexport');
-
         return array(
             array(
                 'value' => Mage_ImportExport_Model_Import::BEHAVIOR_APPEND,
-                'label' => $helper->__('Append Complex Data')
+                'label' => Mage::helper('importexport')->__('Append Complex Data')
             ),
             array(
                 'value' => Mage_ImportExport_Model_Import::BEHAVIOR_REPLACE,
-                'label' => $helper->__('Replace Existing Complex Data')
+                'label' => Mage::helper('importexport')->__('Replace Existing Complex Data')
             ),
             array(
                 'value' => Mage_ImportExport_Model_Import::BEHAVIOR_DELETE,
-                'label' => $helper->__('Delete Entities')
+                'label' => Mage::helper('importexport')->__('Delete Entities')
             )
         );
     }
diff --git a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php
index e1a3bebdbd5..0822791f217 100644
--- a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php
+++ b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php
@@ -154,10 +154,7 @@ public function validateAction()
                             );
                         } elseif ($import->getErrorsCount() >= $import->getErrorsLimit()) {
                             $resultBlock->addNotice(
-                                $this->__(
-                                    'Errors limit (%d) reached. Please fix errors and re-upload file',
-                                    $import->getErrorsLimit()
-                                )
+                                $this->__('Errors limit (%d) reached. Please fix errors and re-upload file', $import->getErrorsLimit())
                             );
                         } else {
                             if ($import->isImportAllowed()) {
@@ -188,13 +185,7 @@ public function validateAction()
                         }
                     }
                     $resultBlock->addNotice($import->getNotices());
-                    $resultBlock->addNotice(
-                        $this->__(
-                            'Checked rows: %d, checked entities: %d, invalid rows: %d, total errors: %d',
-                            $import->getProcessedRowsCount(), $import->getProcessedEntitiesCount(),
-                            $import->getInvalidRowsCount(), $import->getErrorsCount()
-                        )
-                    );
+                    $resultBlock->addNotice($this->__('Checked rows: %d, checked entities: %d, invalid rows: %d, total errors: %d', $import->getProcessedRowsCount(), $import->getProcessedEntitiesCount(), $import->getInvalidRowsCount(), $import->getErrorsCount()));
                 }
             } catch (Exception $e) {
                 $resultBlock->addNotice($this->__('Please fix errors and re-upload file'))
diff --git a/app/code/core/Mage/ImportExport/etc/config.xml b/app/code/core/Mage/ImportExport/etc/config.xml
index 81c348a83c4..3998266345d 100644
--- a/app/code/core/Mage/ImportExport/etc/config.xml
+++ b/app/code/core/Mage/ImportExport/etc/config.xml
@@ -103,6 +103,15 @@
                 <virtual>importexport/export_entity_product_type_simple</virtual>
                 <grouped>importexport/export_entity_product_type_grouped</grouped>
             </export_product_types>
+            <import>
+                <catalog_product>
+                    <attributes>
+                        <url_key>
+                            <backend_model>importexport/product_attribute_backend_urlkey</backend_model>
+                        </url_key>
+                    </attributes>
+                </catalog_product>
+            </import>
         </importexport>
     </global>
     <admin>
diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php
index b9ee489acc0..861e7e3bb3d 100644
--- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php
+++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php
@@ -54,16 +54,22 @@ public function __construct()
 
     /**
      * Prepare grid collection
+     *
+     * @return Mage_Index_Block_Adminhtml_Process_Grid
      */
     protected function _prepareCollection()
     {
         $collection = Mage::getResourceModel('index/process_collection');
         $this->setCollection($collection);
-        return parent::_prepareCollection();
+        parent::_prepareCollection();
+
+        return $this;
     }
 
     /**
      * Add name and description to collection elements
+     *
+     * @return Mage_Index_Block_Adminhtml_Process_Grid
      */
     protected function _afterLoadCollection()
     {
@@ -85,6 +91,8 @@ protected function _afterLoadCollection()
 
     /**
      * Prepare grid columns
+     *
+     * @return Mage_Index_Block_Adminhtml_Process_Grid
      */
     protected function _prepareColumns()
     {
@@ -161,7 +169,9 @@ protected function _prepareColumns()
                 'is_system' => true,
         ));
 
-        return parent::_prepareColumns();
+        parent::_prepareColumns();
+
+        return $this;
     }
 
     /**
@@ -171,6 +181,7 @@ protected function _prepareColumns()
      * @param Mage_Index_Model_Process $row
      * @param Mage_Adminhtml_Block_Widget_Grid_Column $column
      * @param bool $isExport
+     *
      * @return string
      */
     public function decorateStatus($value, $row, $column, $isExport)
@@ -197,6 +208,7 @@ public function decorateStatus($value, $row, $column, $isExport)
      * @param Mage_Index_Model_Process $row
      * @param Mage_Adminhtml_Block_Widget_Grid_Column $column
      * @param bool $isExport
+     *
      * @return string
      */
     public function decorateUpdateRequired($value, $row, $column, $isExport)
@@ -216,6 +228,11 @@ public function decorateUpdateRequired($value, $row, $column, $isExport)
     /**
      * Decorate last run date coumn
      *
+     * @param string $value
+     * @param Mage_Index_Model_Process $row
+     * @param Mage_Adminhtml_Block_Widget_Grid_Column $column
+     * @param bool $isExport
+     *
      * @return string
      */
     public function decorateDate($value, $row, $column, $isExport)
@@ -229,15 +246,19 @@ public function decorateDate($value, $row, $column, $isExport)
     /**
      * Get row edit url
      *
+     * @param Mage_Index_Model_Process $row
+     *
      * @return string
      */
     public function getRowUrl($row)
     {
-        return $this->getUrl('*/*/edit', array('process'=>$row->getId()));
+        return $this->getUrl('*/*/edit', array('process' => $row->getId()));
     }
 
     /**
      * Add mass-actions to grid
+     *
+     * @return Mage_Index_Block_Adminhtml_Process_Grid
      */
     protected function _prepareMassaction()
     {
diff --git a/app/code/core/Mage/Index/Model/Indexer.php b/app/code/core/Mage/Index/Model/Indexer.php
index 651d2d5d883..cf22d71c482 100644
--- a/app/code/core/Mage/Index/Model/Indexer.php
+++ b/app/code/core/Mage/Index/Model/Indexer.php
@@ -59,12 +59,19 @@ class Mage_Index_Model_Indexer
      */
     protected $_currentEvent = null;
 
+    /**
+     * Array of errors
+     *
+     * @var array
+     */
+    protected $_errors = array();
+
     /**
      * Class constructor. Initialize index processes based on configuration
      */
     public function __construct()
     {
-        $this->_processesCollection = Mage::getResourceModel('index/process_collection');
+        $this->getProcessesCollection();
     }
 
     /**
@@ -74,6 +81,9 @@ public function __construct()
      */
     public function getProcessesCollection()
     {
+        if (is_null($this->_processesCollection)) {
+            $this->_processesCollection = Mage::getResourceModel('index/process_collection');
+        }
         return $this->_processesCollection;
     }
 
@@ -85,7 +95,7 @@ public function getProcessesCollection()
      */
     public function getProcessById($processId)
     {
-        foreach ($this->_processesCollection as $process) {
+        foreach ($this->getProcessesCollection() as $process) {
             if ($process->getId() == $processId) {
                 return $process;
             }
@@ -101,7 +111,7 @@ public function getProcessById($processId)
      */
     public function getProcessByCode($code)
     {
-        foreach ($this->_processesCollection as $process) {
+        foreach ($this->getProcessesCollection() as $process) {
             if ($process->getIndexerCode() == $code) {
                 return $process;
             }
@@ -109,6 +119,47 @@ public function getProcessByCode($code)
         return false;
     }
 
+    /**
+     * Function returns array of indexer's process with order by sort_order field
+     *
+     * @param array $codes
+     * @return array
+     */
+    public function getProcessesCollectionByCodes(array $codes)
+    {
+        $processes = array();
+        $this->_errors = array();
+        foreach($codes as $code) {
+            $process = $this->getProcessByCode($code);
+            if (!$process) {
+                $this->_errors[] = sprintf('Warning: Unknown indexer with code %s', trim($code));
+                continue;
+            }
+            $processes[$process->getIndexerCode()] = $process;
+        }
+        return $processes;
+    }
+
+    /**
+     * Return true if model has errors
+     *
+     * @return bool
+     */
+    public function hasErrors()
+    {
+        return (bool)count($this->_errors);
+    }
+
+    /**
+     * Return array of errors
+     *
+     * @return array
+     */
+    public function getErrors()
+    {
+        return $this->_errors;
+    }
+
     /**
      * Lock indexer actions
      * @deprecated after 1.6.1.0
@@ -150,6 +201,7 @@ public function isLocked()
      *
      * @param   null | string $entity
      * @param   null | string $type
+     * @throws Exception
      * @return  Mage_Index_Model_Indexer
      */
     public function indexEvents($entity=null, $type=null)
@@ -199,6 +251,7 @@ public function indexEvent(Mage_Index_Model_Event $event)
      * Register event in each indexing process process
      *
      * @param Mage_Index_Model_Event $event
+     * @return Mage_Index_Model_Indexer
      */
     public function registerEvent(Mage_Index_Model_Event $event)
     {
@@ -237,6 +290,7 @@ public function logEvent(Varien_Object $entity, $entityType, $eventType, $doSave
      * @param   Varien_Object $entity
      * @param   string $entityType
      * @param   string $eventType
+     * @throws Exception
      * @return  Mage_Index_Model_Indexer
      */
     public function processEntityAction(Varien_Object $entity, $entityType, $eventType)
@@ -295,7 +349,7 @@ protected function _runAll($method, $args)
     {
         $checkLocks = $method != 'register';
         $processed = array();
-        foreach ($this->_processesCollection as $process) {
+        foreach ($this->getProcessesCollection() as $process) {
             $code = $process->getIndexerCode();
             if (in_array($code, $processed)) {
                 continue;
@@ -336,7 +390,7 @@ protected function _runAll($method, $args)
     protected function _changeKeyStatus($enable = true)
     {
         $processed = array();
-        foreach ($this->_processesCollection as $process) {
+        foreach ($this->getProcessesCollection() as $process) {
             $code = $process->getIndexerCode();
             if (in_array($code, $processed)) {
                 continue;
diff --git a/app/code/core/Mage/Index/Model/Process.php b/app/code/core/Mage/Index/Model/Process.php
index 014270af7f9..240a6c09457 100644
--- a/app/code/core/Mage/Index/Model/Process.php
+++ b/app/code/core/Mage/Index/Model/Process.php
@@ -68,6 +68,7 @@ class Mage_Index_Model_Process extends Mage_Core_Model_Abstract
      */
     const MODE_MANUAL              = 'manual';
     const MODE_REAL_TIME           = 'real_time';
+    const MODE_SCHEDULE            = 'schedule';
 
     /**
      * Indexer stategy object
@@ -222,6 +223,7 @@ public function reindexAll()
             throw $e;
         }
         Mage::dispatchEvent('after_reindex_process_' . $this->getIndexerCode());
+        return $this;
     }
 
     /**
@@ -242,6 +244,7 @@ public function reindexEverything()
         $this->setForcePartialReindex(count($unprocessedEvents) > 0 && $this->getStatus() == self::STATUS_PENDING);
 
         if ($this->getDepends()) {
+            /** @var $indexer Mage_Index_Model_Indexer */
             $indexer = Mage::getSingleton('index/indexer');
             foreach ($this->getDepends() as $code) {
                 $process = $indexer->getProcessByCode($code);
diff --git a/app/code/core/Mage/Index/Model/Resource/Process/Collection.php b/app/code/core/Mage/Index/Model/Resource/Process/Collection.php
index ad8fff6712f..8f0c0e5a706 100755
--- a/app/code/core/Mage/Index/Model/Resource/Process/Collection.php
+++ b/app/code/core/Mage/Index/Model/Resource/Process/Collection.php
@@ -34,6 +34,20 @@
  */
 class Mage_Index_Model_Resource_Process_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
+    /**
+     * Event object name
+     *
+     * @var string
+     */
+    protected $_eventObject = 'process_collection';
+
+    /**
+     * Event prefix name
+     *
+     * @var string
+     */
+    protected $_eventPrefix = 'process_collection';
+
     /**
      * Initialize resource
      *
diff --git a/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php b/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php
index c01f309aeb2..03ac335b23e 100644
--- a/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php
+++ b/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php
@@ -34,8 +34,9 @@ protected function _initProcess()
     {
         $processId = $this->getRequest()->getParam('process');
         if ($processId) {
+            /** @var $process Mage_Index_Model_Process */
             $process = Mage::getModel('index/process')->load($processId);
-            if ($process->getId()) {
+            if ($process->getId() && $process->getIndexer()->isVisible()) {
                 return $process;
             }
         }
@@ -51,7 +52,6 @@ public function listAction()
 
         $this->loadLayout();
         $this->_setActiveMenu('system/index');
-        $this->_addContent($this->getLayout()->createBlock('index/adminhtml_process'));
         $this->renderLayout();
     }
 
@@ -60,6 +60,7 @@ public function listAction()
      */
     public function editAction()
     {
+        /** @var $process Mage_Index_Model_Process */
         $process = $this->_initProcess();
         if ($process) {
             $this->_title($process->getIndexCode());
@@ -84,6 +85,7 @@ public function editAction()
      */
     public function saveAction()
     {
+        /** @var $process Mage_Index_Model_Process */
         $process = $this->_initProcess();
         if ($process) {
             $mode = $this->getRequest()->getPost('mode');
@@ -116,6 +118,7 @@ public function saveAction()
      */
     public function reindexProcessAction()
     {
+        /** @var $process Mage_Index_Model_Process */
         $process = $this->_initProcess();
         if ($process) {
             try {
@@ -171,16 +174,17 @@ public function massReindexAction()
             $this->_getSession()->addError(Mage::helper('index')->__('Please select Indexes'));
         } else {
             try {
+                $counter = 0;
                 foreach ($processIds as $processId) {
                     /* @var $process Mage_Index_Model_Process */
                     $process = $indexer->getProcessById($processId);
-                    if ($process) {
+                    if ($process && $process->getIndexer()->isVisible()) {
                         $process->reindexEverything();
+                        $counter++;
                     }
                 }
-                $count = count($processIds);
                 $this->_getSession()->addSuccess(
-                    Mage::helper('index')->__('Total of %d index(es) have reindexed data.', $count)
+                    Mage::helper('index')->__('Total of %d index(es) have reindexed data.', $counter)
                 );
             } catch (Mage_Core_Exception $e) {
                 $this->_getSession()->addError($e->getMessage());
@@ -203,18 +207,18 @@ public function massChangeModeAction()
             $this->_getSession()->addError(Mage::helper('index')->__('Please select Index(es)'));
         } else {
             try {
+                $counter = 0;
                 $mode = $this->getRequest()->getParam('index_mode');
                 foreach ($processIds as $processId) {
                     /* @var $process Mage_Index_Model_Process */
                     $process = Mage::getModel('index/process')->load($processId);
-                    if ($process->getId()) {
-                        $process->setMode($mode)
-                            ->save();
+                    if ($process->getId() && $process->getIndexer()->isVisible()) {
+                        $process->setMode($mode)->save();
+                        $counter++;
                     }
                 }
-                $count = count($processIds);
                 $this->_getSession()->addSuccess(
-                    Mage::helper('index')->__('Total of %d index(es) have changed index mode.', $count)
+                    Mage::helper('index')->__('Total of %d index(es) have changed index mode.', $counter)
                 );
             } catch (Mage_Core_Exception $e) {
                 $this->_getSession()->addError($e->getMessage());
diff --git a/app/code/core/Mage/Index/etc/config.xml b/app/code/core/Mage/Index/etc/config.xml
index ddc1e8849c0..a8e6ae4fa23 100644
--- a/app/code/core/Mage/Index/etc/config.xml
+++ b/app/code/core/Mage/Index/etc/config.xml
@@ -62,6 +62,7 @@
             </index_setup>
         </resources>
         <index>
+            <index_model>index/indexer</index_model>
             <indexer>
                 
             </indexer>
diff --git a/app/code/core/Mage/Install/Model/Config.php b/app/code/core/Mage/Install/Model/Config.php
index 4ac9d76c94e..a64dbd03649 100644
--- a/app/code/core/Mage/Install/Model/Config.php
+++ b/app/code/core/Mage/Install/Model/Config.php
@@ -39,6 +39,12 @@ class Mage_Install_Model_Config extends Varien_Simplexml_Config
     const XML_PATH_CHECK_WRITEABLE  = 'check/filesystem/writeable';
     const XML_PATH_CHECK_EXTENSIONS = 'check/php/extensions';
 
+    protected $_optionsMapping = array(self::XML_PATH_CHECK_WRITEABLE => array(
+        'app_etc' => 'etc_dir',
+        'var'     => 'var_dir',
+        'media'   => 'media_dir',
+    ));
+
     public function __construct()
     {
         parent::__construct();
@@ -76,6 +82,8 @@ public function getWizardSteps()
      *      )
      * )
      *
+     * @deprecated since 1.7.1.0
+     *
      * @return array
      */
     public function getPathForCheck()
@@ -91,6 +99,29 @@ public function getPathForCheck()
         return $res;
     }
 
+    /**
+     * Retrieve writable full paths for checking
+     *
+     * @return array
+     */
+    public function getWritableFullPathsForCheck()
+    {
+        $paths = array();
+        $items = (array) $this->getNode(self::XML_PATH_CHECK_WRITEABLE);
+        foreach ($items as $nodeKey => $item) {
+            $value = (array)$item;
+            if (isset($this->_optionsMapping[self::XML_PATH_CHECK_WRITEABLE][$nodeKey])) {
+                $configKey = $this->_optionsMapping[self::XML_PATH_CHECK_WRITEABLE][$nodeKey];
+                $value['path'] = Mage::app()->getConfig()->getOptions()->getData($configKey);
+            } else {
+                $value['path'] = dirname(Mage::getRoot()) . $value['path'];
+            }
+            $paths[$nodeKey] = $value;
+        }
+
+        return $paths;
+    }
+
     /**
      * Retrieve required PHP extensions
      *
diff --git a/app/code/core/Mage/Install/Model/Installer/Console.php b/app/code/core/Mage/Install/Model/Installer/Console.php
index 51c9b1b1ef0..0518b5e1e8d 100644
--- a/app/code/core/Mage/Install/Model/Installer/Console.php
+++ b/app/code/core/Mage/Install/Model/Installer/Console.php
@@ -157,10 +157,12 @@ public function setArgs($args = null)
         }
 
         /**
-         * Validate license aggreement acceptance
+         * Validate license agreement acceptance
          */
         if (!$this->_checkFlag($args['license_agreement_accepted'])) {
-            $this->addError('ERROR: You have to accept Magento license agreement terms and conditions to continue installation');
+            $this->addError(
+                'ERROR: You have to accept Magento license agreement terms and conditions to continue installation'
+            );
             return false;
         }
 
@@ -355,7 +357,7 @@ public function install()
             /**
              * Install configuration
              */
-            $installer->installConfig($this->_getDataModel()->getConfigData()); // TODO fix wizard and simplify this everywhere
+            $installer->installConfig($this->_getDataModel()->getConfigData());
 
             if ($this->hasErrors()) {
                 return false;
diff --git a/app/code/core/Mage/Install/Model/Installer/Db/Mysql4.php b/app/code/core/Mage/Install/Model/Installer/Db/Mysql4.php
index bc482b5d0ff..573d13b058e 100644
--- a/app/code/core/Mage/Install/Model/Installer/Db/Mysql4.php
+++ b/app/code/core/Mage/Install/Model/Installer/Db/Mysql4.php
@@ -59,7 +59,7 @@ public function getVersion()
     public function supportEngine()
     {
         $variables  = $this->_getConnection()
-            ->fetchPairs('SHOW VARIABLES');
-        return (!isset($variables['have_innodb']) || $variables['have_innodb'] != 'YES') ? false : true;
+            ->fetchPairs('SHOW ENGINES');
+        return isset($variables['InnoDB']) && ($variables['InnoDB'] == 'DEFAULT' || $variables['InnoDB'] == 'YES');
     }
 }
diff --git a/app/code/core/Mage/Install/Model/Installer/Filesystem.php b/app/code/core/Mage/Install/Model/Installer/Filesystem.php
index de522604d0a..859b4387074 100644
--- a/app/code/core/Mage/Install/Model/Installer/Filesystem.php
+++ b/app/code/core/Mage/Install/Model/Installer/Filesystem.php
@@ -33,8 +33,12 @@
  */
 class Mage_Install_Model_Installer_Filesystem extends Mage_Install_Model_Installer_Abstract
 {
+    /**#@+
+     * @deprecated since 1.7.1.0
+     */
     const MODE_WRITE = 'write';
     const MODE_READ  = 'read';
+    /**#@- */
 
     public function __construct()
     {
@@ -60,13 +64,13 @@ public function install()
     protected function _checkFilesystem()
     {
         $res = true;
-        $config = Mage::getSingleton('install/config')->getPathForCheck();
+        $config = Mage::getSingleton('install/config')->getWritableFullPathsForCheck();
 
-        if (isset($config['writeable'])) {
-            foreach ($config['writeable'] as $item) {
-                $recursive = isset($item['recursive']) ? $item['recursive'] : false;
-                $existence = isset($item['existence']) ? $item['existence'] : false;
-                $checkRes = $this->_checkPath($item['path'], $recursive, $existence, 'write');
+        if (is_array($config)) {
+            foreach ($config as $item) {
+                $recursive = isset($item['recursive']) ? (bool)$item['recursive'] : false;
+                $existence = isset($item['existence']) ? (bool)$item['existence'] : false;
+                $checkRes = $this->_checkFullPath($item['path'], $recursive, $existence);
                 $res = $res && $checkRes;
             }
         }
@@ -76,6 +80,7 @@ protected function _checkFilesystem()
     /**
      * Check file system path
      *
+     * @deprecated since 1.7.1.0
      * @param   string $path
      * @param   bool $recursive
      * @param   bool $existence
@@ -83,34 +88,37 @@ protected function _checkFilesystem()
      * @return  bool
      */
     protected function _checkPath($path, $recursive, $existence, $mode)
+    {
+        return $this->_checkFullPath(dirname(Mage::getRoot()) . $path, $recursive, $existence);
+    }
+
+    /**
+     * Check file system full path
+     *
+     * @param  string $fullPath
+     * @param  bool $recursive
+     * @param  bool $existence
+     * @return bool
+     */
+    protected function _checkFullPath($fullPath, $recursive, $existence)
     {
         $res = true;
-        $fullPath = dirname(Mage::getRoot()) . $path;
-        if ($mode == self::MODE_WRITE) {
-            $setError = false;
-            if ($existence) {
-                if ((is_dir($fullPath) && !is_dir_writeable($fullPath)) || !is_writable($fullPath)) {
-                    $setError = true;
-                }
-            }
-            else {
-                if (file_exists($fullPath) && !is_writable($fullPath)) {
-                    $setError = true;
-                }
-            }
+        $setError = $existence && (is_dir($fullPath) && !is_dir_writeable($fullPath) || !is_writable($fullPath))
+            || !$existence && file_exists($fullPath) && !is_writable($fullPath);
 
-            if ($setError) {
-                $this->_getInstaller()->getDataModel()->addError(
-                    Mage::helper('install')->__('Path "%s" must be writable.', $fullPath)
-                );
-                $res = false;
-            }
+        if ($setError) {
+            $this->_getInstaller()->getDataModel()->addError(
+                Mage::helper('install')->__('Path "%s" must be writable.', $fullPath)
+            );
+            $res = false;
         }
 
         if ($recursive && is_dir($fullPath)) {
+            $skipFileNames = array('.svn', '.htaccess');
             foreach (new DirectoryIterator($fullPath) as $file) {
-                if (!$file->isDot() && $file->getFilename() != '.svn' && $file->getFilename() != '.htaccess') {
-                    $res = $res && $this->_checkPath($path . DS . $file->getFilename(), $recursive, $existence, $mode);
+                $fileName = $file->getFilename();
+                if (!$file->isDot() && !in_array($fileName, $skipFileNames)) {
+                    $res = $this->_checkFullPath($fullPath . DS . $fileName, $recursive, $existence) && $res;
                 }
             }
         }
diff --git a/app/code/core/Mage/Install/etc/config.xml b/app/code/core/Mage/Install/etc/config.xml
index 5606b3e1ee9..65d7dd67d77 100644
--- a/app/code/core/Mage/Install/etc/config.xml
+++ b/app/code/core/Mage/Install/etc/config.xml
@@ -69,7 +69,7 @@
                 <initStatements>SET NAMES utf8</initStatements>
                 <min_version>4.1.20</min_version>
                 <extensions>
-                    <pdo_mysql/>
+                    <pdo_mysql>1</pdo_mysql>
                 </extensions>
             </mysql4>
         </databases>
diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php
index e57262b3047..3609e0888a0 100644
--- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php
+++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php
@@ -79,7 +79,7 @@ public function __construct()
 
         /** @var $session Mage_Admin_Model_Session */
         $session = Mage::getSingleton('admin/session');
-        if (!$this->getModel()->getId() || !$session->isAllowed('system/oauth/consumer/delete')) {
+        if (!$this->getModel() || !$this->getModel()->getId() || !$session->isAllowed('system/oauth/consumer/delete')) {
             $this->_removeButton('delete');
         }
     }
diff --git a/app/code/core/Mage/Oauth/Helper/Data.php b/app/code/core/Mage/Oauth/Helper/Data.php
index fa6b71aab78..17cd541c18d 100644
--- a/app/code/core/Mage/Oauth/Helper/Data.php
+++ b/app/code/core/Mage/Oauth/Helper/Data.php
@@ -88,13 +88,21 @@ class Mage_Oauth_Helper_Data extends Mage_Core_Helper_Abstract
      */
     protected function _generateRandomString($length)
     {
+        if (function_exists('openssl_random_pseudo_bytes')) {
+            // use openssl lib if it is install. It provides a better randomness
+            $bytes = openssl_random_pseudo_bytes(ceil($length/2), $strong);
+            $hex = bin2hex($bytes); // hex() doubles the length of the string
+            $randomString = substr($hex, 0, $length); // we truncate at most 1 char if length parameter is an odd number
+        } else {
+            // fallback to mt_rand() if openssl is not installed
+            /** @var $helper Mage_Core_Helper_Data */
+            $helper = Mage::helper('core');
+            $randomString = $helper->getRandomString(
+                $length, Mage_Core_Helper_Data::CHARS_DIGITS . Mage_Core_Helper_Data::CHARS_LOWERS
+            );
+        }
 
-        /** @var $helper Mage_Core_Helper_Data */
-        $helper = Mage::helper('core');
-
-        return $helper->getRandomString(
-            $length, Mage_Core_Helper_Data::CHARS_DIGITS . Mage_Core_Helper_Data::CHARS_LOWERS
-        );
+        return $randomString;
     }
 
     /**
diff --git a/app/code/core/Mage/Oauth/Model/Server.php b/app/code/core/Mage/Oauth/Model/Server.php
index b5fdb2c2f16..558c995af8d 100644
--- a/app/code/core/Mage/Oauth/Model/Server.php
+++ b/app/code/core/Mage/Oauth/Model/Server.php
@@ -348,6 +348,9 @@ protected function _initToken()
                 if ($this->_token->getRevoked()) {
                     $this->_throwException('', self::ERR_TOKEN_REVOKED);
                 }
+                if ($this->_token->getConsumerId() != $this->_consumer->getId()) {
+                    $this->_throwException('', self::ERR_TOKEN_REJECTED);
+                }
                 //TODO: Implement check for expiration (after it implemented in token model)
             }
         } else {
@@ -542,7 +545,7 @@ protected function _validateSignature()
         );
 
         if ($calculatedSign != $this->_protocolParams['oauth_signature']) {
-            $this->_throwException($calculatedSign, self::ERR_SIGNATURE_INVALID);
+            $this->_throwException('', self::ERR_SIGNATURE_INVALID);
         }
     }
 
diff --git a/app/code/core/Mage/Page/Block/Html/Footer.php b/app/code/core/Mage/Page/Block/Html/Footer.php
index 985b0276f7a..916b59abc99 100644
--- a/app/code/core/Mage/Page/Block/Html/Footer.php
+++ b/app/code/core/Mage/Page/Block/Html/Footer.php
@@ -38,9 +38,10 @@ class Mage_Page_Block_Html_Footer extends Mage_Core_Block_Template
 
     protected function _construct()
     {
-        $this->addData(array(
-            'cache_lifetime'=> false,
-            'cache_tags'    => array(Mage_Core_Model_Store::CACHE_TAG, Mage_Cms_Model_Block::CACHE_TAG)
+        $this->addData(array('cache_lifetime' => false));
+        $this->addCacheTag(array(
+            Mage_Core_Model_Store::CACHE_TAG,
+            Mage_Cms_Model_Block::CACHE_TAG
         ));
     }
 
diff --git a/app/code/core/Mage/Page/Block/Html/Header.php b/app/code/core/Mage/Page/Block/Html/Header.php
index 654b1a0f60c..dc2539f9176 100644
--- a/app/code/core/Mage/Page/Block/Html/Header.php
+++ b/app/code/core/Mage/Page/Block/Html/Header.php
@@ -71,6 +71,13 @@ public function getLogoAlt()
         return $this->_data['logo_alt'];
     }
 
+    /**
+     * Retrieve page welcome message
+     *
+     * @deprecated after 1.7.0.2
+     * @see Mage_Page_Block_Html_Welcome
+     * @return mixed
+     */
     public function getWelcome()
     {
         if (empty($this->_data['welcome'])) {
diff --git a/app/code/core/Mage/Page/Block/Html/Pager.php b/app/code/core/Mage/Page/Block/Html/Pager.php
index 20636064170..32ce532eba8 100644
--- a/app/code/core/Mage/Page/Block/Html/Pager.php
+++ b/app/code/core/Mage/Page/Block/Html/Pager.php
@@ -83,14 +83,24 @@ protected function _construct()
         $this->setTemplate('page/html/pager.phtml');
     }
 
+    /**
+     * Return current page
+     *
+     * @return int
+     */
     public function getCurrentPage()
     {
-        if ($page = (int) $this->getRequest()->getParam($this->getPageVarName())) {
-            return $page;
+        if (is_object($this->_collection)) {
+            return $this->_collection->getCurPage();
         }
-        return 1;
+        return (int) $this->getRequest()->getParam($this->getPageVarName(), 1);
     }
 
+    /**
+     * Return current page limit
+     *
+     * @return int
+     */
     public function getLimit()
     {
         if ($this->_limit !== null) {
@@ -118,6 +128,12 @@ public function setLimit($limit)
         return $this;
     }
 
+    /**
+     * Set collection for pagination
+     *
+     * @param  Varien_Data_Collection $collection
+     * @return Mage_Page_Block_Html_Pager
+     */
     public function setCollection($collection)
     {
         $this->_collection = $collection
@@ -238,7 +254,9 @@ public function getPages()
         }
         else {
             $half = ceil($this->_displayPages / 2);
-            if ($collection->getCurPage() >= $half && $collection->getCurPage() <= $collection->getLastPageNumber() - $half) {
+            if ($collection->getCurPage() >= $half
+                && $collection->getCurPage() <= $collection->getLastPageNumber() - $half
+            ) {
                 $start  = ($collection->getCurPage() - $half) + 1;
                 $finish = ($start + $this->_displayPages) - 1;
             }
@@ -501,7 +519,9 @@ protected function _initFrame()
             }
             else {
                 $half = ceil($this->getFrameLength() / 2);
-                if ($collection->getCurPage() >= $half && $collection->getCurPage() <= $collection->getLastPageNumber() - $half) {
+                if ($collection->getCurPage() >= $half
+                    && $collection->getCurPage() <= $collection->getLastPageNumber() - $half
+                ) {
                     $start  = ($collection->getCurPage() - $half) + 1;
                     $end = ($start + $this->getFrameLength()) - 1;
                 }
diff --git a/app/code/core/Mage/Page/Block/Html/Topmenu.php b/app/code/core/Mage/Page/Block/Html/Topmenu.php
index 2b7b162bbc9..23453e32623 100644
--- a/app/code/core/Mage/Page/Block/Html/Topmenu.php
+++ b/app/code/core/Mage/Page/Block/Html/Topmenu.php
@@ -40,12 +40,23 @@ class Mage_Page_Block_Html_Topmenu extends Mage_Core_Block_Template
      */
     protected $_menu;
 
+    /**
+     * Current entity key
+     *
+     * @var string|int
+     */
+    protected $_currentEntityKey;
+
     /**
      * Init top menu tree structure
      */
     public function _construct()
     {
         $this->_menu = new Varien_Data_Tree_Node(array(), 'root', new Varien_Data_Tree());
+
+        $this->addData(array(
+            'cache_lifetime' => false,
+        ));
     }
 
     /**
@@ -58,7 +69,8 @@ public function _construct()
     public function getHtml($outermostClass = '', $childrenWrapClass = '')
     {
         Mage::dispatchEvent('page_block_html_topmenu_gethtml_before', array(
-            'menu' => $this->_menu
+            'menu' => $this->_menu,
+            'block' => $this
         ));
 
         $this->_menu->setOutermostClass($outermostClass);
@@ -203,4 +215,47 @@ protected function _getMenuItemClasses(Varien_Data_Tree_Node $item)
 
         return $classes;
     }
+
+    /**
+     * Retrieve cache key data
+     *
+     * @return array
+     */
+    public function getCacheKeyInfo()
+    {
+        $shortCacheId = array(
+            'TOPMENU',
+            Mage::app()->getStore()->getId(),
+            Mage::getDesign()->getPackageName(),
+            Mage::getDesign()->getTheme('template'),
+            Mage::getSingleton('customer/session')->getCustomerGroupId(),
+            'template' => $this->getTemplate(),
+            'name' => $this->getNameInLayout(),
+            $this->getCurrentEntityKey()
+        );
+        $cacheId = $shortCacheId;
+
+        $shortCacheId = array_values($shortCacheId);
+        $shortCacheId = implode('|', $shortCacheId);
+        $shortCacheId = md5($shortCacheId);
+
+        $cacheId['entity_key'] = $this->getCurrentEntityKey();
+        $cacheId['short_cache_id'] = $shortCacheId;
+
+        return $cacheId;
+    }
+
+    /**
+     * Retrieve current entity key
+     *
+     * @return int|string
+     */
+    public function getCurrentEntityKey()
+    {
+        if (null === $this->_currentEntityKey) {
+            $this->_currentEntityKey = Mage::registry('current_entity_key')
+                ? Mage::registry('current_entity_key') : Mage::app()->getStore()->getRootCategoryId();
+        }
+        return $this->_currentEntityKey;
+    }
 }
diff --git a/app/code/core/Mage/Page/Block/Html/Welcome.php b/app/code/core/Mage/Page/Block/Html/Welcome.php
index 35a42db4c28..aef87b9ddfb 100644
--- a/app/code/core/Mage/Page/Block/Html/Welcome.php
+++ b/app/code/core/Mage/Page/Block/Html/Welcome.php
@@ -40,6 +40,28 @@ class Mage_Page_Block_Html_Welcome extends Mage_Core_Block_Template
      */
     protected function _toHtml()
     {
-        return Mage::app()->getLayout()->getBlock('header')->getWelcome();
+        if (empty($this->_data['welcome'])) {
+            if (Mage::isInstalled() && Mage::getSingleton('customer/session')->isLoggedIn()) {
+                $this->_data['welcome'] = $this->__('Welcome, %s!', $this->escapeHtml(Mage::getSingleton('customer/session')->getCustomer()->getName()));
+            } else {
+                $this->_data['welcome'] = Mage::getStoreConfig('design/header/welcome');
+            }
+        }
+
+        return $this->_data['welcome'];
+    }
+
+    /**
+     * Get tags array for saving cache
+     *
+     * @return array
+     */
+    public function getCacheTags()
+    {
+        if (Mage::getSingleton('customer/session')->isLoggedIn()) {
+            $this->addModelTags(Mage::getSingleton('customer/session')->getCustomer());
+        }
+
+        return parent::getCacheTags();
     }
 }
diff --git a/app/code/core/Mage/Page/Block/Template/Links.php b/app/code/core/Mage/Page/Block/Template/Links.php
index a7f4b09adda..e3109a676f2 100644
--- a/app/code/core/Mage/Page/Block/Template/Links.php
+++ b/app/code/core/Mage/Page/Block/Template/Links.php
@@ -238,4 +238,17 @@ protected function _getNewPosition($position = 0)
         return $position;
     }
 
+    /**
+     * Get tags array for saving cache
+     *
+     * @return array
+     */
+    public function getCacheTags()
+    {
+        if (Mage::getSingleton('customer/session')->isLoggedIn()) {
+            $this->addModelTags(Mage::getSingleton('customer/session')->getCustomer());
+        }
+
+        return parent::getCacheTags();
+    }
 }
diff --git a/app/code/core/Mage/Page/etc/config.xml b/app/code/core/Mage/Page/etc/config.xml
index eb075a4fd85..8da5b0400ab 100644
--- a/app/code/core/Mage/Page/etc/config.xml
+++ b/app/code/core/Mage/Page/etc/config.xml
@@ -129,7 +129,7 @@
                 <welcome>Default welcome msg!</welcome>
             </header>
             <footer translate="copyright" module="page">
-                <copyright>&amp;copy; 2012 Magento Demo Store. All Rights Reserved.</copyright>
+                <copyright>&amp;copy; 2013 Magento Demo Store. All Rights Reserved.</copyright>
             </footer>
         </design>
         <system>
diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet.php b/app/code/core/Mage/Paygate/Model/Authorizenet.php
index 0ad8cf2bfa4..e59e43e1b91 100644
--- a/app/code/core/Mage/Paygate/Model/Authorizenet.php
+++ b/app/code/core/Mage/Paygate/Model/Authorizenet.php
@@ -852,10 +852,7 @@ protected function _voidCardTransaction($payment, $card)
                         $card,
                         false,
                         false,
-                        Mage::helper('paygate')->__(
-                            'Parent Authorize.Net transaction (ID %s) expired',
-                            $realAuthTransactionId
-                        )
+                        Mage::helper('paygate')->__('Parent Authorize.Net transaction (ID %s) expired', $realAuthTransactionId)
                     )
                 );
             }
diff --git a/app/code/core/Mage/Payment/Block/Form.php b/app/code/core/Mage/Payment/Block/Form.php
index 5283adc54e9..f7f98c0e180 100644
--- a/app/code/core/Mage/Payment/Block/Form.php
+++ b/app/code/core/Mage/Payment/Block/Form.php
@@ -62,7 +62,7 @@ public function getMethodCode()
      */
     public function getInfoData($field)
     {
-        return $this->htmlEscape($this->getMethod()->getInfoInstance()->getData($field));
+        return $this->escapeHtml($this->getMethod()->getInfoInstance()->getData($field));
     }
 
     /**
diff --git a/app/code/core/Mage/Payment/Block/Form/Container.php b/app/code/core/Mage/Payment/Block/Form/Container.php
index 9d15385732d..1b1a0024d9d 100644
--- a/app/code/core/Mage/Payment/Block/Form/Container.php
+++ b/app/code/core/Mage/Payment/Block/Form/Container.php
@@ -27,6 +27,8 @@
 /**
  * Base container block for payment methods forms
  *
+ * @method Mage_Sales_Model_Quote getQuote()
+ *
  * @category   Mage
  * @package    Mage_Payment
  * @author      Magento Core Team <core@magentocommerce.com>
@@ -51,27 +53,18 @@ protected function _prepareLayout()
         return parent::_prepareLayout();
     }
 
+    /**
+     * Check payment method model
+     *
+     * @param Mage_Payment_Model_Method_Abstract $method
+     * @return bool
+     */
     protected function _canUseMethod($method)
     {
-        if (!$method->canUseForCountry($this->getQuote()->getBillingAddress()->getCountry())) {
-            return false;
-        }
-
-        if (!$method->canUseForCurrency($this->getQuote()->getStore()->getBaseCurrencyCode())) {
-            return false;
-        }
-
-        /**
-         * Checking for min/max order total for assigned payment method
-         */
-        $total = $this->getQuote()->getBaseGrandTotal();
-        $minTotal = $method->getConfigData('min_order_total');
-        $maxTotal = $method->getConfigData('max_order_total');
-
-        if((!empty($minTotal) && ($total < $minTotal)) || (!empty($maxTotal) && ($total > $maxTotal))) {
-            return false;
-        }
-        return true;
+        return $method->isApplicableToQuote($this->getQuote(), Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_COUNTRY
+            | Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_CURRENCY
+            | Mage_Payment_Model_Method_Abstract::CHECK_ORDER_TOTAL_MIN_MAX
+        );
     }
 
     /**
@@ -79,6 +72,7 @@ protected function _canUseMethod($method)
      *
      * Redeclare this method in child classes for declaring method info instance
      *
+     * @param Mage_Payment_Model_Method_Abstract $method
      * @return bool
      */
     protected function _assignMethod($method)
@@ -105,26 +99,24 @@ public function setMethodFormTemplate($method='', $template='')
     }
 
     /**
-     * Retrieve availale payment methods
+     * Retrieve available payment methods
      *
      * @return array
      */
     public function getMethods()
     {
         $methods = $this->getData('methods');
-        if (is_null($methods)) {
+        if ($methods === null) {
             $quote = $this->getQuote();
             $store = $quote ? $quote->getStoreId() : null;
-            $methods = $this->helper('payment')->getStoreMethods($store, $quote);
-            $total = $quote->getBaseSubtotal() + $quote->getShippingAddress()->getBaseShippingAmount();
-            foreach ($methods as $key => $method) {
-                if ($this->_canUseMethod($method)
-                    && ($total != 0
-                        || $method->getCode() == 'free'
-                        || ($quote->hasRecurringItems() && $method->canManageRecurringProfiles()))) {
+            $methods = array();
+            foreach ($this->helper('payment')->getStoreMethods($store, $quote) as $method) {
+                if ($this->_canUseMethod($method) && $method->isApplicableToQuote(
+                    $quote,
+                    Mage_Payment_Model_Method_Abstract::CHECK_ZERO_TOTAL
+                )) {
                     $this->_assignMethod($method);
-                } else {
-                    unset($methods[$key]);
+                    $methods[] = $method;
                 }
             }
             $this->setData('methods', $methods);
diff --git a/app/code/core/Mage/Payment/Block/Info.php b/app/code/core/Mage/Payment/Block/Info.php
index a72e77481b5..160f1b307a9 100644
--- a/app/code/core/Mage/Payment/Block/Info.php
+++ b/app/code/core/Mage/Payment/Block/Info.php
@@ -88,7 +88,7 @@ public function getChildPdfAsArray()
     {
         $result = array();
         foreach ($this->getChild() as $child) {
-            if (is_callable(array($child, 'toPdf'))) {
+            if (method_exists($child, 'toPdf')) {
                 $result[] = $child->toPdf();
             }
         }
diff --git a/app/code/core/Mage/Payment/Model/Method/Abstract.php b/app/code/core/Mage/Payment/Model/Method/Abstract.php
index 809c42d9919..21f967428b4 100644
--- a/app/code/core/Mage/Payment/Model/Method/Abstract.php
+++ b/app/code/core/Mage/Payment/Model/Method/Abstract.php
@@ -31,9 +31,9 @@
  */
 abstract class Mage_Payment_Model_Method_Abstract extends Varien_Object
 {
-    const ACTION_ORDER              = 'order';
-    const ACTION_AUTHORIZE          = 'authorize';
-    const ACTION_AUTHORIZE_CAPTURE  = 'authorize_capture';
+    const ACTION_ORDER             = 'order';
+    const ACTION_AUTHORIZE         = 'authorize';
+    const ACTION_AUTHORIZE_CAPTURE = 'authorize_capture';
 
     const STATUS_UNKNOWN    = 'UNKNOWN';
     const STATUS_APPROVED   = 'APPROVED';
@@ -42,6 +42,19 @@ abstract class Mage_Payment_Model_Method_Abstract extends Varien_Object
     const STATUS_VOID       = 'VOID';
     const STATUS_SUCCESS    = 'SUCCESS';
 
+    /**
+     * Bit masks to specify different payment method checks.
+     * @see Mage_Payment_Model_Method_Abstract::isApplicableToQuote
+     */
+    const CHECK_USE_FOR_COUNTRY       = 1;
+    const CHECK_USE_FOR_CURRENCY      = 2;
+    const CHECK_USE_CHECKOUT          = 4;
+    const CHECK_USE_FOR_MULTISHIPPING = 8;
+    const CHECK_USE_INTERNAL          = 16;
+    const CHECK_ORDER_TOTAL_MIN_MAX   = 32;
+    const CHECK_RECURRING_PROFILES    = 64;
+    const CHECK_ZERO_TOTAL            = 128;
+
     protected $_code;
     protected $_formBlockType = 'payment/form';
     protected $_infoBlockType = 'payment/info';
@@ -645,17 +658,71 @@ public function isAvailable($quote = null)
             'quote'           => $quote,
         ));
 
-        // disable method if it cannot implement recurring profiles management and there are recurring items in quote
-        if ($checkResult->isAvailable) {
-            $implementsRecurring = $this->canManageRecurringProfiles();
-            // the $quote->hasRecurringItems() causes big performance impact, thus it has to be called last
-            if ($quote && !$implementsRecurring && $quote->hasRecurringItems()) {
-                $checkResult->isAvailable = false;
-            }
+        if ($checkResult->isAvailable && $quote) {
+            $checkResult->isAvailable = $this->isApplicableToQuote($quote, self::CHECK_RECURRING_PROFILES);
         }
         return $checkResult->isAvailable;
     }
 
+    /**
+     * Check whether payment method is applicable to quote
+     * Purposed to allow use in controllers some logic that was implemented in blocks only before
+     *
+     * @param Mage_Sales_Model_Quote $quote
+     * @param int|null $checksBitMask
+     * @return bool
+     */
+    public function isApplicableToQuote($quote, $checksBitMask)
+    {
+        if ($checksBitMask & self::CHECK_USE_FOR_COUNTRY) {
+            if (!$this->canUseForCountry($quote->getBillingAddress()->getCountry())) {
+                return false;
+            }
+        }
+        if ($checksBitMask & self::CHECK_USE_FOR_CURRENCY) {
+            if (!$this->canUseForCurrency($quote->getStore()->getBaseCurrencyCode())) {
+                return false;
+            }
+        }
+        if ($checksBitMask & self::CHECK_USE_CHECKOUT) {
+            if (!$this->canUseCheckout()) {
+                return false;
+            }
+        }
+        if ($checksBitMask & self::CHECK_USE_FOR_MULTISHIPPING) {
+            if (!$this->canUseForMultishipping()) {
+                return false;
+            }
+        }
+        if ($checksBitMask & self::CHECK_USE_INTERNAL) {
+            if (!$this->canUseInternal()) {
+                return false;
+            }
+        }
+        if ($checksBitMask & self::CHECK_ORDER_TOTAL_MIN_MAX) {
+            $total = $quote->getBaseGrandTotal();
+            $minTotal = $this->getConfigData('min_order_total');
+            $maxTotal = $this->getConfigData('max_order_total');
+            if (!empty($minTotal) && $total < $minTotal || !empty($maxTotal) && $total > $maxTotal) {
+                return false;
+            }
+        }
+        if ($checksBitMask & self::CHECK_RECURRING_PROFILES) {
+            if (!$this->canManageRecurringProfiles() && $quote->hasRecurringItems()) {
+                return false;
+            }
+        }
+        if ($checksBitMask & self::CHECK_ZERO_TOTAL) {
+            $total = $quote->getBaseSubtotal() + $quote->getShippingAddress()->getBaseShippingAmount();
+            if ($total < 0.0001 && $this->getCode() != 'free'
+                && !($this->canManageRecurringProfiles() && $quote->hasRecurringItems())
+            ) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     /**
      * Method that will be executed instead of authorize or capture
      * if flag isInitializeNeeded set to true
diff --git a/app/code/core/Mage/Paypal/Block/Express/Review.php b/app/code/core/Mage/Paypal/Block/Express/Review.php
index fb6d70cc2cc..1cfe9be0a38 100644
--- a/app/code/core/Mage/Paypal/Block/Express/Review.php
+++ b/app/code/core/Mage/Paypal/Block/Express/Review.php
@@ -148,7 +148,7 @@ public function renderShippingRateOption($rate, $format = '%s - %s%s', $inclTaxF
                 $renderedInclTax = sprintf($inclTaxFormat, Mage::helper('tax')->__('Incl. Tax'), $incl);
             }
         }
-        return sprintf($format, $rate->getMethodTitle(), $price, $renderedInclTax);
+        return sprintf($format, $this->escapeHtml($rate->getMethodTitle()), $price, $renderedInclTax);
     }
 
     /**
diff --git a/app/code/core/Mage/Paypal/Helper/Checkout.php b/app/code/core/Mage/Paypal/Helper/Checkout.php
new file mode 100644
index 00000000000..5b783ddcfd3
--- /dev/null
+++ b/app/code/core/Mage/Paypal/Helper/Checkout.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Paypal
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Checkout workflow helper
+ */
+class Mage_Paypal_Helper_Checkout extends Mage_Core_Helper_Abstract
+{
+    /**
+     * Restore last active quote based on checkout session
+     *
+     * @return bool True if quote restored successfully, false otherwise
+     */
+    public function restoreQuote()
+    {
+        $order = $this->_getCheckoutSession()->getLastRealOrder();
+        if ($order->getId()) {
+            $quote = $this->_getQuote($order->getQuoteId());
+            if ($quote->getId()) {
+                $quote->setIsActive(1)
+                    ->setReservedOrderId(null)
+                    ->save();
+                $this->_getCheckoutSession()
+                    ->replaceQuote($quote)
+                    ->unsLastRealOrderId();
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Cancel last placed order with specified comment message
+     *
+     * @param string $comment Comment appended to order history
+     * @return bool True if order cancelled, false otherwise
+     */
+    public function cancelCurrentOrder($comment)
+    {
+        $order = $this->_getCheckoutSession()->getLastRealOrder();
+        if ($order->getId() && $order->getState() != Mage_Sales_Model_Order::STATE_CANCELED) {
+            $order->registerCancellation($comment)->save();
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Return checkout session instance
+     *
+     * @return Mage_Checkout_Model_Session
+     */
+    protected function _getCheckoutSession()
+    {
+        return Mage::getSingleton('checkout/session');
+    }
+
+    /**
+     * Return sales quote instance for specified ID
+     *
+     * @param int $quoteId Quote identifier
+     * @return Mage_Sales_Model_Quote
+     */
+    protected function _getQuote($quoteId)
+    {
+        return Mage::getModel('sales/quote')->load($quoteId);
+    }
+}
diff --git a/app/code/core/Mage/Paypal/Model/Api/Nvp.php b/app/code/core/Mage/Paypal/Model/Api/Nvp.php
index 87b07a71c62..0430fa10251 100644
--- a/app/code/core/Mage/Paypal/Model/Api/Nvp.php
+++ b/app/code/core/Mage/Paypal/Model/Api/Nvp.php
@@ -1178,9 +1178,8 @@ protected function _applyStreetAndRegionWorkarounds(Varien_Object $address)
         // attempt to fetch region_id from directory
         if ($address->getCountryId() && $address->getRegion()) {
             $regions = Mage::getModel('directory/country')->loadByCode($address->getCountryId())->getRegionCollection()
-                ->addRegionCodeFilter($address->getRegion())
-                ->setPageSize(1)
-            ;
+                ->addRegionCodeOrNameFilter($address->getRegion())
+                ->setPageSize(1);
             foreach ($regions as $region) {
                 $address->setRegionId($region->getId());
                 $address->setExportedKeys(array_merge($address->getExportedKeys(), array('region_id')));
diff --git a/app/code/core/Mage/Paypal/Model/Cart.php b/app/code/core/Mage/Paypal/Model/Cart.php
index bf12cb03714..a95538b445e 100644
--- a/app/code/core/Mage/Paypal/Model/Cart.php
+++ b/app/code/core/Mage/Paypal/Model/Cart.php
@@ -415,6 +415,16 @@ protected function _validate()
         $this->_areItemsValid = $this->_areItemsValid && $this->_areTotalsValid;
     }
 
+    /**
+     * Check whether items are valid
+     *
+     * @return bool
+     */
+    public function areItemsValid()
+    {
+        return $this->_areItemsValid;
+    }
+
     /**
      * Add a usual line item with amount and qty
      *
diff --git a/app/code/core/Mage/Paypal/Model/Config.php b/app/code/core/Mage/Paypal/Model/Config.php
index 56baa83d46f..44c5cd83ebd 100644
--- a/app/code/core/Mage/Paypal/Model/Config.php
+++ b/app/code/core/Mage/Paypal/Model/Config.php
@@ -630,7 +630,7 @@ public function getStartBillingAgreementUrl($token)
      */
     public function getPaypalUrl(array $params = array())
     {
-        return sprintf('https://www.%spaypal.com/webscr%s',
+        return sprintf('https://www.%spaypal.com/cgi-bin/webscr%s',
             $this->sandboxFlag ? 'sandbox.' : '',
             $params ? '?' . http_build_query($params) : ''
         );
@@ -1166,6 +1166,8 @@ protected function _getSpecificConfigPath($fieldName)
                     break;
                 case self::METHOD_WPP_PE_EXPRESS:
                 case self::METHOD_WPP_PE_DIRECT:
+                case self::METHOD_PAYFLOWADVANCED:
+                case self::METHOD_PAYFLOWLINK:
                     $path = $this->_mapWpukFieldset($fieldName);
                     break;
             }
@@ -1302,6 +1304,10 @@ protected function _mapWpukFieldset($fieldName)
         if ($this->_methodCode == self::METHOD_WPP_PE_EXPRESS
             && !$this->isMethodAvailable(self::METHOD_WPP_PE_DIRECT)) {
             $pathPrefix = 'payment/verisign';
+        } elseif ($this->_methodCode == self::METHOD_PAYFLOWADVANCED
+            || $this->_methodCode == self::METHOD_PAYFLOWLINK
+        ) {
+            $pathPrefix = 'payment/' . $this->_methodCode;
         }
         switch ($fieldName) {
             case 'partner':
diff --git a/app/code/core/Mage/Paypal/Model/Direct.php b/app/code/core/Mage/Paypal/Model/Direct.php
index ce966930186..efec702cb93 100644
--- a/app/code/core/Mage/Paypal/Model/Direct.php
+++ b/app/code/core/Mage/Paypal/Model/Direct.php
@@ -307,7 +307,7 @@ protected function _placeOrder(Mage_Sales_Model_Order_Payment $payment, $amount)
             ->setCurrencyCode($order->getBaseCurrencyCode())
             ->setInvNum($order->getIncrementId())
             ->setEmail($order->getCustomerEmail())
-            ->setNotifyUrl(Mage::getUrl('paypal/ipn/'))
+            ->setNotifyUrl($order->getStore()->getBaseUrl() . 'paypal/ipn/')
             ->setCreditCardType($payment->getCcType())
             ->setCreditCardNumber($payment->getCcNumber())
             ->setCreditCardExpirationDate(
diff --git a/app/code/core/Mage/Paypal/Model/Express/Checkout.php b/app/code/core/Mage/Paypal/Model/Express/Checkout.php
index 5f02c592efd..496d136119d 100644
--- a/app/code/core/Mage/Paypal/Model/Express/Checkout.php
+++ b/app/code/core/Mage/Paypal/Model/Express/Checkout.php
@@ -764,7 +764,7 @@ protected function _prepareShippingOptions(
 
                 $options[$i] = new Varien_Object(array(
                     'is_default' => $isDefault,
-                    'name'       => trim("{$rate->getCarrierTitle()} - {$rate->getMethodTitle()}", ' -'),
+                    'name'       => trim("{$rate->getCarrier()} - {$rate->getMethodTitle()}", ' -'),
                     'code'       => $rate->getCode(),
                     'amount'     => $amountExclTax,
                 ));
@@ -870,6 +870,19 @@ protected function _prepareGuestQuote()
         return $this;
     }
 
+    /**
+     * Checks if customer with email coming from Express checkout exists
+     *
+     * @return int
+     */
+    protected function _lookupCustomerId()
+    {
+        return Mage::getModel('customer/customer')
+            ->setWebsiteId(Mage::app()->getWebsite()->getId())
+            ->loadByEmail($this->_quote->getCustomerEmail())
+            ->getId();
+    }
+
     /**
      * Prepare quote for customer registration and customer order submit
      * and restore magento customer data from quote
@@ -882,6 +895,12 @@ protected function _prepareNewCustomerQuote()
         $billing    = $quote->getBillingAddress();
         $shipping   = $quote->isVirtual() ? null : $quote->getShippingAddress();
 
+        $customerId = $this->_lookupCustomerId();
+        if ($customerId) {
+            $this->getCustomerSession()->loginById($customerId);
+            return $this->_prepareCustomerQuote();
+        }
+
         $customer = $quote->getCustomer();
         /** @var $customer Mage_Customer_Model_Customer */
         $customerBilling = $billing->exportCustomerAddress();
diff --git a/app/code/core/Mage/Paypal/Model/Hostedpro/Request.php b/app/code/core/Mage/Paypal/Model/Hostedpro/Request.php
index 7f04428006c..aae83160775 100644
--- a/app/code/core/Mage/Paypal/Model/Hostedpro/Request.php
+++ b/app/code/core/Mage/Paypal/Model/Hostedpro/Request.php
@@ -136,7 +136,7 @@ protected function _getPaymentData(Mage_Paypal_Model_Hostedpro $paymentMethod)
 
             'template'              => 'templateD',
             'showBillingAddress'    => 'false',
-            'showShippingAddress'   => 'false',
+            'showShippingAddress'   => 'true',
             'showBillingEmail'      => 'false',
             'showBillingPhone'      => 'false',
             'showCustomerName'      => 'false',
@@ -164,7 +164,7 @@ protected function _getOrderData(Mage_Sales_Model_Order $order)
             'tax'           => $this->_formatPrice($order->getBaseTaxAmount()),
             'shipping'      => $this->_formatPrice($order->getBaseShippingAmount()),
             'invoice'       => $order->getIncrementId(),
-            'address_override' => 'false',
+            'address_override' => 'true',
             'currency_code'    => $order->getBaseCurrencyCode(),
             'buyer_email'      => $order->getCustomerEmail()
         );
@@ -194,7 +194,7 @@ protected function _getShippingAddress(Varien_Object $address)
             'first_name'=> $address->getFirstname(),
             'last_name' => $address->getLastname(),
             'city'      => $address->getCity(),
-            'state'     => $address->getRegion(),
+            'state'     => $address->getRegionCode() ? $address->getRegionCode() : $address->getCity(),
             'zip'       => $address->getPostcode(),
             'country'   => $address->getCountry(),
         );
@@ -221,7 +221,7 @@ protected function _getBillingAddress(Varien_Object $address)
             'billing_first_name'=> $address->getFirstname(),
             'billing_last_name' => $address->getLastname(),
             'billing_city'      => $address->getCity(),
-            'billing_state'     => $address->getRegion(),
+            'billing_state'     => $address->getRegionCode() ? $address->getRegionCode() : $address->getCity(),
             'billing_zip'       => $address->getPostcode(),
             'billing_country'   => $address->getCountry(),
         );
diff --git a/app/code/core/Mage/Paypal/Model/Info.php b/app/code/core/Mage/Paypal/Model/Info.php
index 9c54d69010a..7f53dc46d0a 100644
--- a/app/code/core/Mage/Paypal/Model/Info.php
+++ b/app/code/core/Mage/Paypal/Model/Info.php
@@ -120,6 +120,27 @@ class Mage_Paypal_Model_Info
     const PAYMENTSTATUS_PROCESSED    = 'processed';
     const PAYMENTSTATUS_VOIDED       = 'voided';
 
+    /**
+     * PayPal payment transaction type
+     */
+    const TXN_TYPE_ADJUSTMENT = 'adjustment';
+    const TXN_TYPE_NEW_CASE   = 'new_case';
+
+    /**
+     * PayPal payment reason code when payment_status is Reversed, Refunded, or Canceled_Reversal.
+     */
+    const PAYMENT_REASON_CODE_REFUND  = 'refund';
+
+    /**
+     * PayPal order status for Reverse payment status
+     */
+    const ORDER_STATUS_REVERSED = 'paypal_reversed';
+
+    /**
+     * PayPal order status for Canceled Reversal payment status
+     */
+    const ORDER_STATUS_CANCELED_REVERSAL = 'paypal_canceled_reversal';
+
     /**
      * Map of payment information available to customer
      *
@@ -330,26 +351,30 @@ public static function explainPendingReason($code)
      */
     public static function explainReasonCode($code)
     {
-        switch ($code) {
-            case 'chargeback':
-                return Mage::helper('paypal')->__('Chargeback by customer.');
-            case 'guarantee':
-                return Mage::helper('paypal')->__('Customer triggered a money-back guarantee.');
-            case 'buyer-complaint':
-                return Mage::helper('paypal')->__('Customer complaint.');
-            case 'refund':
-                return Mage::helper('paypal')->__('Refund issued by merchant.');
-            case 'adjustment_reversal':
-                return Mage::helper('paypal')->__('Reversal of an adjustment.');
-            case 'chargeback_reimbursement':
-                return Mage::helper('paypal')->__('Reimbursement for a chargeback.');
-            case 'chargeback_settlement':
-                return Mage::helper('paypal')->__('Settlement of a chargeback.');
-            case 'none': // break is intentionally omitted
-            case 'other':
-            default:
-                return Mage::helper('paypal')->__('Unknown reason. Please contact PayPal customer service.');
-        }
+        $comments = array(
+            'chargeback'               => Mage::helper('paypal')->__('A reversal has occurred on this transaction due to a chargeback by your customer.'),
+            'guarantee'                => Mage::helper('paypal')->__('A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.'),
+            'buyer-complaint'          => Mage::helper('paypal')->__('A reversal has occurred on this transaction due to a complaint about the transaction from your customer.'),
+            'buyer_complaint'          => Mage::helper('paypal')->__('A reversal has occurred on this transaction due to a complaint about the transaction from your customer.'),
+            'refund'                   => Mage::helper('paypal')->__('A reversal has occurred on this transaction because you have given the customer a refund.'),
+            'adjustment_reversal'      => Mage::helper('paypal')->__('Reversal of an adjustment.'),
+            'admin_fraud_reversal'     => Mage::helper('paypal')->__('Transaction reversal due to fraud detected by PayPal administrators.'),
+            'admin_reversal'           => Mage::helper('paypal')->__('Transaction reversal by PayPal administrators.'),
+            'chargeback_reimbursement' => Mage::helper('paypal')->__('Reimbursement for a chargeback.'),
+            'chargeback_settlement'    => Mage::helper('paypal')->__('Settlement of a chargeback.'),
+            'unauthorized_spoof'       => Mage::helper('paypal')->__('A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.'),
+            'non_receipt'              => Mage::helper('paypal')->__('Buyer claims that he did not receive goods or service.'),
+            'not_as_described'         => Mage::helper('paypal')->__('Buyer claims that the goods or service received differ from merchant’s description of the goods or service.'),
+            'unauthorized'             => Mage::helper('paypal')->__('Buyer claims that he/she did not authorize transaction.'),
+            'adjustment_reimburse'     => Mage::helper('paypal')->__('A case that has been resolved and close requires a reimbursement.'),
+            'duplicate'                => Mage::helper('paypal')->__('Buyer claims that a possible duplicate payment was made to the merchant.'),
+            'merchandise'              => Mage::helper('paypal')->__('Buyer claims that the received merchandise is unsatisfactory, defective, or damaged.'),
+        );
+        $value = (array_key_exists($code, $comments) && !empty($comments[$code]))
+            ? $comments[$code]
+            : Mage::helper('paypal')->__('Unknown reason. Please contact PayPal customer service.'
+        );
+        return $value;
     }
 
     /**
@@ -365,6 +390,7 @@ public static function isReversalDisputable($code)
             case 'other':
             case 'chargeback':
             case 'buyer-complaint':
+            case 'buyer_complaint':
             case 'adjustment_reversal':
                 return true;
             case 'guarantee':
@@ -451,6 +477,23 @@ protected function _getLabel($key)
         return '';
     }
 
+    /**
+     * Get case type label
+     *
+     * @param string $key
+     * @return string
+     */
+    public static function getCaseTypeLabel($key)
+    {
+        $labels = array(
+            'chargeback' => Mage::helper('paypal')->__('Chargeback'),
+            'complaint'  => Mage::helper('paypal')->__('Complaint'),
+            'dispute'    => Mage::helper('paypal')->__('Dispute')
+        );
+        $value = (array_key_exists($key, $labels) && !empty($labels[$key])) ? $labels[$key] : '';
+        return $value;
+    }
+
     /**
      * Apply a filter upon value getting
      *
diff --git a/app/code/core/Mage/Paypal/Model/Ipn.php b/app/code/core/Mage/Paypal/Model/Ipn.php
index ffc2332d1b5..80048ddc860 100644
--- a/app/code/core/Mage/Paypal/Model/Ipn.php
+++ b/app/code/core/Mage/Paypal/Model/Ipn.php
@@ -140,7 +140,9 @@ protected function _postBack(Zend_Http_Client_Adapter_Interface $httpAdapter)
             $this->_debugData['postback_to'] = $this->_config->getPaypalUrl();
 
             $httpAdapter->setConfig(array('verifypeer' => $this->_config->verifyPeer));
-            $httpAdapter->write(Zend_Http_Client::POST, $this->_config->getPaypalUrl(), '1.1', array(), $sReq);
+            $httpAdapter->write(Zend_Http_Client::POST, $this->_config->getPaypalUrl(), '1.1', array(
+                'Connection: close',
+            ), $sReq);
             try {
                 $response = $httpAdapter->read();
             } catch (Exception $e) {
@@ -257,13 +259,131 @@ protected function _processOrder()
 
         $this->_info = Mage::getSingleton('paypal/info');
         try {
-            // handle payment_status
-            $paymentStatus = $this->_filterPaymentStatus($this->_request['payment_status']);
+            // Handle payment_status
+            $transactionType = isset($this->_request['txn_type']) ? $this->_request['txn_type'] : null;
+            switch ($transactionType) {
+                // handle new case created
+                case Mage_Paypal_Model_Info::TXN_TYPE_NEW_CASE:
+                    $this->_registerDispute();
+                    break;
+
+                // handle new adjustment is created
+                case Mage_Paypal_Model_Info::TXN_TYPE_ADJUSTMENT:
+                    $this->_registerAdjustment();
+                    break;
+
+                //handle new transaction created
+                default:
+                    $this->_registerTransaction();
+            }
+        } catch (Mage_Core_Exception $e) {
+            $comment = $this->_createIpnComment(Mage::helper('paypal')->__('Note: %s', $e->getMessage()), true);
+            $comment->save();
+            throw $e;
+        }
+
+//            switch ($paymentStatus) {
+//                // paid
+//                case Mage_Paypal_Model_Info::PAYMENTSTATUS_COMPLETED:
+//                    $this->_registerPaymentCapture();
+//                    break;
+//
+//                // the holded payment was denied on paypal side
+//                case Mage_Paypal_Model_Info::PAYMENTSTATUS_DENIED:
+//                    $this->_registerPaymentDenial();
+//                    break;
+//
+//                // customer attempted to pay via bank account, but failed
+//                case Mage_Paypal_Model_Info::PAYMENTSTATUS_FAILED:
+//                    // cancel order
+//                    $this->_registerPaymentFailure();
+//                    break;
+//
+//                // refund forced by PayPal
+//                case Mage_Paypal_Model_Info::PAYMENTSTATUS_REVERSED: // break is intentionally omitted
+//                case Mage_Paypal_Model_Info::PAYMENTSTATUS_UNREVERSED: // or returned back :)
+//                    $this->_registerPaymentReversal();
+//                    break;
+//
+//                // refund by merchant on PayPal side
+//                case Mage_Paypal_Model_Info::PAYMENTSTATUS_REFUNDED:
+//                    $this->_registerPaymentRefund();
+//                    break;
+//
+//                // payment was obtained, but money were not captured yet
+//                case Mage_Paypal_Model_Info::PAYMENTSTATUS_PENDING:
+//                    $this->_registerPaymentPending();
+//                    break;
+//
+//                // MassPayments success
+//                case Mage_Paypal_Model_Info::PAYMENTSTATUS_PROCESSED:
+//                    $this->_registerMasspaymentsSuccess();
+//                    break;
+//
+//                // authorization expire/void
+//                case Mage_Paypal_Model_Info::PAYMENTSTATUS_EXPIRED: // break is intentionally omitted
+//                case Mage_Paypal_Model_Info::PAYMENTSTATUS_VOIDED:
+//                    $this->_registerPaymentVoid();
+//                    break;
+//
+//                default:
+//                    throw new Exception("Cannot handle payment status '{$paymentStatus}'.");
+//            }
+//        } catch (Mage_Core_Exception $e) {
+//            $comment = $this->_createIpnComment(Mage::helper('paypal')->__('Note: %s', $e->getMessage()), true);
+//            $comment->save();
+//            throw $e;
+//        }
+    }
+
+    /**
+     * Process adjustment notification
+     */
+    protected function _registerAdjustment()
+    {
+        $reasonCode = isset($this->_request['reason_code']) ? $this->_request['reason_code'] : null;
+        $reasonComment = $this->_info->explainReasonCode($reasonCode);
+        $notificationAmount = $this->_order->getBaseCurrency()->formatTxt($this->_request['mc_gross']);
+        /**
+         *  Add IPN comment about registered dispute
+         */
+        $message = Mage::helper('paypal')->__('IPN "%s". A dispute has been resolved and closed. %s Transaction amount %s.', ucfirst($reasonCode), $notificationAmount, $reasonComment);
+        $this->_order->addStatusHistoryComment($message)
+            ->setIsCustomerNotified(false)
+            ->save();
+    }
+
+    /**
+     * Process dispute notification
+     */
+    protected function _registerDispute()
+    {
+        $reasonCode = isset($this->_request['reason_code']) ? $this->_request['reason_code'] : null;
+        $reasonComment = $this->_info->explainReasonCode($reasonCode);
+        $caseType = isset($this->_request['case_type']) ? $this->_request['case_type'] : null;
+        $caseTypeLabel = $this->_info->getCaseTypeLabel($caseType);
+        $caseId = isset($this->_request['case_id']) ? $this->_request['case_id'] : null;
+        /**
+         *  Add IPN comment about registered dispute
+         */
+        $message = Mage::helper('paypal')->__('IPN "%s". Case type "%s". Case ID "%s" %s', ucfirst($caseType), $caseTypeLabel, $caseId, $reasonComment);
+        $this->_order->addStatusHistoryComment($message)
+            ->setIsCustomerNotified(false)
+            ->save();
+    }
 
+    /**
+     * Process regular IPN notifications
+     */
+    protected function _registerTransaction()
+    {
+        try {
+            // Handle payment_status
+            $paymentStatus = $this->_filterPaymentStatus($this->_request['payment_status']);
             switch ($paymentStatus) {
                 // paid
                 case Mage_Paypal_Model_Info::PAYMENTSTATUS_COMPLETED:
-                    $this->_registerPaymentCapture();
+                    $this->_registerPaymentCapture(true);
                     break;
 
                 // the holded payment was denied on paypal side
@@ -277,27 +397,24 @@ protected function _processOrder()
                     $this->_registerPaymentFailure();
                     break;
 
-                // refund forced by PayPal
-                case Mage_Paypal_Model_Info::PAYMENTSTATUS_REVERSED: // break is intentionally omitted
-                case Mage_Paypal_Model_Info::PAYMENTSTATUS_UNREVERSED: // or returned back :)
-                    $this->_registerPaymentReversal();
-                    break;
-
-                // refund by merchant on PayPal side
-                case Mage_Paypal_Model_Info::PAYMENTSTATUS_REFUNDED:
-                    $this->_registerPaymentRefund();
-                    break;
-
                 // payment was obtained, but money were not captured yet
                 case Mage_Paypal_Model_Info::PAYMENTSTATUS_PENDING:
                     $this->_registerPaymentPending();
                     break;
 
-                // MassPayments success
                 case Mage_Paypal_Model_Info::PAYMENTSTATUS_PROCESSED:
                     $this->_registerMasspaymentsSuccess();
                     break;
 
+                case Mage_Paypal_Model_Info::PAYMENTSTATUS_REVERSED:// break is intentionally omitted
+                case Mage_Paypal_Model_Info::PAYMENTSTATUS_UNREVERSED:
+                    $this->_registerPaymentReversal();
+                    break;
+
+                case Mage_Paypal_Model_Info::PAYMENTSTATUS_REFUNDED:
+                    $this->_registerPaymentRefund();
+                    break;
+
                 // authorization expire/void
                 case Mage_Paypal_Model_Info::PAYMENTSTATUS_EXPIRED: // break is intentionally omitted
                 case Mage_Paypal_Model_Info::PAYMENTSTATUS_VOIDED:
@@ -371,10 +488,11 @@ protected function _registerRecurringProfilePaymentCapture()
         $payment->registerCaptureNotification($this->getRequestData('mc_gross'));
         $order->save();
 
-        // notify customer
-        if ($invoice = $payment->getCreatedInvoice()) {
+        $invoice = $payment->getCreatedInvoice();
+        if ($invoice) {
+            // notify customer
             $message = Mage::helper('paypal')->__('Notified customer about invoice #%s.', $invoice->getIncrementId());
-            $comment = $order->sendNewOrderEmail()->addStatusHistoryComment($message)
+            $order->sendNewOrderEmail()->addStatusHistoryComment($message)
                 ->setIsCustomerNotified(true)
                 ->save();
         }
@@ -382,20 +500,26 @@ protected function _registerRecurringProfilePaymentCapture()
 
     /**
      * Process completed payment (either full or partial)
+     *
+     * @param bool $skipFraudDetection
      */
-    protected function _registerPaymentCapture()
+    protected function _registerPaymentCapture($skipFraudDetection = false)
     {
         if ($this->getRequestData('transaction_entity') == 'auth') {
             return;
         }
+        $parentTransactionId = $this->getRequestData('parent_txn_id');
         $this->_importPaymentInformation();
         $payment = $this->_order->getPayment();
         $payment->setTransactionId($this->getRequestData('txn_id'))
             ->setPreparedMessage($this->_createIpnComment(''))
-            ->setParentTransactionId($this->getRequestData('parent_txn_id'))
+            ->setParentTransactionId($parentTransactionId)
             ->setShouldCloseParentTransaction('Completed' === $this->getRequestData('auth_status'))
             ->setIsTransactionClosed(0)
-            ->registerCaptureNotification($this->getRequestData('mc_gross'));
+            ->registerCaptureNotification(
+                $this->getRequestData('mc_gross'),
+                $skipFraudDetection && $parentTransactionId
+            );
         $this->_order->save();
 
         // notify customer
@@ -451,38 +575,43 @@ protected function _registerPaymentRefund()
         $this->_order->save();
 
         // TODO: there is no way to close a capture right now
-
-        if ($creditmemo = $payment->getCreatedCreditmemo()) {
+        $creditmemo = $payment->getCreatedCreditmemo();
+        if ($creditmemo) {
             $creditmemo->sendEmail();
-            $comment = $this->_order->addStatusHistoryComment(
-                    Mage::helper('paypal')->__('Notified customer about creditmemo #%s.', $creditmemo->getIncrementId())
-                )
-                ->setIsCustomerNotified(true)
-                ->save();
+            $this->_order->addStatusHistoryComment(
+                Mage::helper('paypal')->__('Notified customer about creditmemo #%s.', $creditmemo->getIncrementId())
+            )
+            ->setIsCustomerNotified(true)
+            ->save();
         }
     }
 
     /**
-     * Process payment reversal notification
+     * Process payment reversal and cancelled reversal notification
      */
     protected function _registerPaymentReversal()
     {
+        $reasonCode = isset($this->_request['reason_code']) ? $this->_request['reason_code'] : null;
+        $reasonComment = $this->_info->explainReasonCode($reasonCode);
+        $notificationAmount = $this->_order
+            ->getBaseCurrency()
+            ->formatTxt($this->_request['mc_gross'] + $this->_request['mc_fee']);
+        $paymentStatus = $this->_filterPaymentStatus(isset($this->_request['payment_status'])
+            ? $this->_request['payment_status']
+            : null
+        );
+        $orderStatus = ($paymentStatus == Mage_Paypal_Model_Info::PAYMENTSTATUS_REVERSED)
+            ? Mage_Paypal_Model_Info::ORDER_STATUS_REVERSED
+            : Mage_Paypal_Model_Info::ORDER_STATUS_CANCELED_REVERSAL;
         /**
-         * PayPal may send such payment status when triggered IPR denial
-         * Note that this check is done on the old payment info object, before importing new payment information
+         * Change order status to PayPal Reversed/PayPal Cancelled Reversal if it is possible.
          */
-        if ($this->_info->isPaymentReviewRequired($this->_order->getPayment())) {
-            $this->_registerPaymentDenial();
-            return;
-        }
-
-        if ('chargeback_reimbursement' == $this->getRequestData('reason_code')) {
-            // TODO: chargebacks reversals are not implemented
-            return;
-        }
-
-        // treat as a usual charegeback
-        $this->_registerPaymentRefund();
+        $message = Mage::helper('paypal')->__('IPN "%s". %s Transaction amount %s. Transaction ID: "%s"', $this->_request['payment_status'], $reasonComment, $notificationAmount, $this->_request['txn_id']);
+        $this->_order->setStatus($orderStatus);
+        $this->_order->save();
+        $this->_order->addStatusHistoryComment($message, $orderStatus)
+            ->setIsCustomerNotified(false)
+            ->save();
     }
 
     /**
@@ -502,7 +631,9 @@ public function _registerPaymentPending()
         }
 
         // case when was placed using PayPal standard
-        if (Mage_Sales_Model_Order::STATE_PENDING_PAYMENT == $this->_order->getState()) {
+        if (Mage_Sales_Model_Order::STATE_PENDING_PAYMENT == $this->_order->getState()
+            && !$this->getRequestData('transaction_entity')
+        ) {
             $this->_registerPaymentCapture();
             return;
         }
diff --git a/app/code/core/Mage/Paypal/Model/Payflowpro.php b/app/code/core/Mage/Paypal/Model/Payflowpro.php
index 942d506553c..7a9f6be8880 100644
--- a/app/code/core/Mage/Paypal/Model/Payflowpro.php
+++ b/app/code/core/Mage/Paypal/Model/Payflowpro.php
@@ -79,8 +79,9 @@ class Mage_Paypal_Model_Payflowpro extends  Mage_Payment_Model_Method_Cc
     protected $_isGateway               = true;
     protected $_canAuthorize            = true;
     protected $_canCapture              = true;
-    protected $_canCapturePartial       = false;
+    protected $_canCapturePartial       = true;
     protected $_canRefund               = true;
+    protected $_canRefundInvoicePartial = true;
     protected $_canVoid                 = true;
     protected $_canUseInternal          = true;
     protected $_canUseCheckout          = true;
@@ -173,6 +174,20 @@ public function authorize(Varien_Object $payment, $amount)
         return $this;
     }
 
+    /**
+     * Get capture amount
+     *
+     * @param float $amount
+     * @return float
+     */
+    protected function _getCaptureAmount($amount)
+    {
+        $infoInstance = $this->getInfoInstance();
+        $amountToPay = round($amount, 2);
+        $authorizedAmount = round($infoInstance->getAmountAuthorized(), 2);
+        return $amountToPay != $authorizedAmount ? $amountToPay : 0;
+    }
+
     /**
      * Capture payment
      *
@@ -187,8 +202,13 @@ public function capture(Varien_Object $payment, $amount)
             $request->setOrigid($payment->getReferenceTransactionId());
         } elseif ($payment->getParentTransactionId()) {
             $request = $this->_buildBasicRequest($payment);
-            $request->setTrxtype(self::TRXTYPE_DELAYED_CAPTURE);
             $request->setOrigid($payment->getParentTransactionId());
+            $captureAmount = $this->_getCaptureAmount($amount);
+            if ($captureAmount) {
+                $request->setAmt($captureAmount);
+            }
+            $trxType = $this->getInfoInstance()->hasAmountPaid() ? self::TRXTYPE_SALE : self::TRXTYPE_DELAYED_CAPTURE;
+            $request->setTrxtype($trxType);
         } else {
             $request = $this->_buildPlaceRequest($payment, $amount);
             $request->setTrxtype(self::TRXTYPE_SALE);
@@ -233,6 +253,26 @@ public function void(Varien_Object $payment)
         return $this;
     }
 
+    /**
+     * Check void availability
+     *
+     * @param   Varien_Object $payment
+     * @return  bool
+     */
+    public function canVoid(Varien_Object $payment)
+    {
+        if ($payment instanceof Mage_Sales_Model_Order_Invoice
+            || $payment instanceof Mage_Sales_Model_Order_Creditmemo
+        ) {
+            return false;
+        }
+        if ($payment->getAmountPaid()) {
+            $this->_canVoid = false;
+        }
+
+        return $this->_canVoid;
+    }
+
     /**
      * Attempt to void the authorization on cancelling
      *
@@ -241,7 +281,11 @@ public function void(Varien_Object $payment)
      */
     public function cancel(Varien_Object $payment)
     {
-        return $this->void($payment);
+        if (!$payment->getOrder()->getInvoiceCollection()->count()) {
+            return $this->void($payment);
+        }
+
+        return false;
     }
 
     /**
@@ -262,6 +306,7 @@ public function refund(Varien_Object $payment, $amount)
         if ($response->getResultCode() == self::RESPONSE_CODE_APPROVED){
             $payment->setTransactionId($response->getPnref())
                 ->setIsTransactionClosed(1);
+            $payment->setShouldCloseParentTransaction(!$payment->getCreditmemo()->getInvoice()->canRefund());
         }
         return $this;
     }
@@ -419,13 +464,19 @@ protected function _buildPlaceRequest(Varien_Object $payment, $amount)
         }
 
         $order = $payment->getOrder();
-        if(!empty($order)){
-            $request->setCurrency($order->getBaseCurrencyCode());
-
+        if (!empty($order)) {
             $orderIncrementId = $order->getIncrementId();
-            $request->setCustref($orderIncrementId)
+
+            $request->setCurrency($order->getBaseCurrencyCode())
+                ->setInvnum($orderIncrementId)
+                ->setPonum($order->getId())
                 ->setComment1($orderIncrementId);
 
+            $customerId = $order->getCustomerId();
+            if ($customerId) {
+                $request->setCustref($customerId);
+            }
+
             $billing = $order->getBillingAddress();
             if (!empty($billing)) {
                 $request->setFirstname($billing->getFirstname())
diff --git a/app/code/core/Mage/Paypal/Model/Pro.php b/app/code/core/Mage/Paypal/Model/Pro.php
index 115d4091063..501eaa2b445 100644
--- a/app/code/core/Mage/Paypal/Model/Pro.php
+++ b/app/code/core/Mage/Paypal/Model/Pro.php
@@ -470,6 +470,6 @@ protected function _importRefundResultToPayment($api, $payment, $canRefundMore)
      */
     protected function _getParentTransactionId(Varien_Object $payment)
     {
-        return $payment->getParentTransactionId();
+        return $payment->getParentTransactionId() ? $payment->getParentTransactionId() : $payment->getLastTransId();
     }
 }
diff --git a/app/code/core/Mage/Paypal/Model/Report/Settlement.php b/app/code/core/Mage/Paypal/Model/Report/Settlement.php
index 9e2a8d91716..33ed34a1dd4 100644
--- a/app/code/core/Mage/Paypal/Model/Report/Settlement.php
+++ b/app/code/core/Mage/Paypal/Model/Report/Settlement.php
@@ -135,7 +135,7 @@ class Mage_Paypal_Model_Report_Settlement extends Mage_Core_Model_Abstract
                 'Transaction Event Code' => 5,
                 'Transaction Initiation Date' => 6,
                 'Transaction Completion Date' => 7,
-                'Transaction  Debit or Credit' => 8,
+                'Transaction Debit or Credit' => 8,
                 'Gross Transaction Amount' => 9,
                 'Gross Transaction Currency' => 10,
                 'Fee Debit or Credit' => 11,
@@ -143,7 +143,8 @@ class Mage_Paypal_Model_Report_Settlement extends Mage_Core_Model_Abstract
                 'Fee Currency' => 13,
                 'Custom Field' => 14,
                 'Consumer ID' => 15,
-                'Payment Tracking ID' => 16
+                'Payment Tracking ID' => 16,
+                'Store ID' => 17,
             ),
             'rowmap' => array(
                 'Transaction ID' => 'transaction_id',
@@ -153,7 +154,7 @@ class Mage_Paypal_Model_Report_Settlement extends Mage_Core_Model_Abstract
                 'Transaction Event Code' => 'transaction_event_code',
                 'Transaction Initiation Date' => 'transaction_initiation_date',
                 'Transaction Completion Date' => 'transaction_completion_date',
-                'Transaction  Debit or Credit' => 'transaction_debit_or_credit',
+                'Transaction Debit or Credit' => 'transaction_debit_or_credit',
                 'Gross Transaction Amount' => 'gross_transaction_amount',
                 'Gross Transaction Currency' => 'gross_transaction_currency',
                 'Fee Debit or Credit' => 'fee_debit_or_credit',
@@ -161,7 +162,8 @@ class Mage_Paypal_Model_Report_Settlement extends Mage_Core_Model_Abstract
                 'Fee Currency' => 'fee_currency',
                 'Custom Field' => 'custom_field',
                 'Consumer ID' => 'consumer_id',
-                'Payment Tracking ID' => 'payment_tracking_id'
+                'Payment Tracking ID' => 'payment_tracking_id',
+                'Store ID' => 'store_id'
             )
         )
     );
@@ -217,8 +219,11 @@ public function fetchAndSave($config)
 
                 $encoded = file_get_contents($localCsv);
                 $csvFormat = 'new';
-                if (self::FILES_OUT_CHARSET != mb_detect_encoding(($encoded))) {
-                    $decoded = @iconv(self::FILES_IN_CHARSET, self::FILES_OUT_CHARSET.'//IGNORE', $encoded);
+
+                $fileEncoding = mb_detect_encoding($encoded);
+
+                if (self::FILES_OUT_CHARSET != $fileEncoding) {
+                    $decoded = @iconv($fileEncoding, self::FILES_OUT_CHARSET.'//IGNORE', $encoded);
                     file_put_contents($localCsv, $decoded);
                     $csvFormat = 'old';
                 }
diff --git a/app/code/core/Mage/Paypal/controllers/HostedproController.php b/app/code/core/Mage/Paypal/controllers/HostedproController.php
index 6c7be175b64..4a11873f096 100644
--- a/app/code/core/Mage/Paypal/controllers/HostedproController.php
+++ b/app/code/core/Mage/Paypal/controllers/HostedproController.php
@@ -67,30 +67,12 @@ public function cancelAction()
     protected function _cancelPayment($errorMsg = '')
     {
         $gotoSection = false;
-        $session = $this->_getCheckout();
-        if ($session->getLastRealOrderId()) {
-            $order = Mage::getModel('sales/order')->loadByIncrementId($session->getLastRealOrderId());
-            if ($order->getId()) {
-                //Cancel order
-                if ($order->getState() != Mage_Sales_Model_Order::STATE_CANCELED) {
-                    $order->registerCancellation($errorMsg)->save();
-                }
-                $quote = Mage::getModel('sales/quote')
-                    ->load($order->getQuoteId());
-                //Return quote
-                if ($quote->getId()) {
-                    $quote->setIsActive(1)
-                        ->setReservedOrderId(NULL)
-                        ->save();
-                    $session->replaceQuote($quote);
-                }
-                //Unset data
-                $session->unsLastRealOrderId();
-                //Redirect to payment step
-                $gotoSection = 'payment';
-            }
+        /* @var $helper Mage_Paypal_Helper_Checkout */
+        $helper = Mage::helper('paypal/checkout');
+        $helper->cancelCurrentOrder($errorMsg);
+        if ($helper->restoreQuote()) {
+            $gotoSection = 'payment';
         }
-
         return $gotoSection;
     }
 
diff --git a/app/code/core/Mage/Paypal/controllers/PayflowController.php b/app/code/core/Mage/Paypal/controllers/PayflowController.php
index 2f426958876..81e4c0a41bd 100644
--- a/app/code/core/Mage/Paypal/controllers/PayflowController.php
+++ b/app/code/core/Mage/Paypal/controllers/PayflowController.php
@@ -111,30 +111,12 @@ public function silentPostAction()
     protected function _cancelPayment($errorMsg = '')
     {
         $gotoSection = false;
-        $session = $this->_getCheckout();
-        if ($session->getLastRealOrderId()) {
-            $order = Mage::getModel('sales/order')->loadByIncrementId($session->getLastRealOrderId());
-            if ($order->getId()) {
-                //Cancel order
-                if ($order->getState() != Mage_Sales_Model_Order::STATE_CANCELED) {
-                    $order->registerCancellation($errorMsg)->save();
-                }
-                $quote = Mage::getModel('sales/quote')
-                    ->load($order->getQuoteId());
-                //Return quote
-                if ($quote->getId()) {
-                    $quote->setIsActive(1)
-                        ->setReservedOrderId(NULL)
-                        ->save();
-                    $session->replaceQuote($quote);
-                }
-                //Unset data
-                $session->unsLastRealOrderId();
-                //Redirect to payment step
-                $gotoSection = 'payment';
-            }
+        /* @var $helper Mage_Paypal_Helper_Checkout */
+        $helper = Mage::helper('paypal/checkout');
+        $helper->cancelCurrentOrder($errorMsg);
+        if ($helper->restoreQuote()) {
+            $gotoSection = 'payment';
         }
-
         return $gotoSection;
     }
 
diff --git a/app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php b/app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php
index 4c38141135e..faaba4ba06f 100644
--- a/app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php
+++ b/app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php
@@ -33,6 +33,28 @@
  */
 class Mage_Paypal_PayflowadvancedController extends Mage_Paypal_Controller_Express_Abstract
 {
+    /**
+     * Config mode type
+     *
+     * @var string
+     */
+    protected $_configType = 'Mage_Paypal_Model_Config';
+
+    /**
+     * Config method type
+     *
+     * @var string
+     */
+    protected $_configMethod = Mage_Paypal_Model_Config::METHOD_PAYFLOWADVANCED;
+
+    /**
+     * Checkout mode type
+     *
+     * @var string
+     */
+    protected $_checkoutType = 'Mage_Paypal_Model_Payflowadvanced';
+
+
     /**
      * When a customer cancel payment from payflow gateway.
      *
@@ -119,30 +141,12 @@ public function silentPostAction()
     protected function _cancelPayment($errorMsg = '')
     {
         $gotoSection = false;
-        $session = $this->_getCheckout();
-        if ($session->getLastRealOrderId()) {
-            $order = Mage::getModel('sales/order')->loadByIncrementId($session->getLastRealOrderId());
-            if ($order->getId()) {
-                //Cancel order
-                if ($order->getState() != Mage_Sales_Model_Order::STATE_CANCELED) {
-                    $order->registerCancellation($errorMsg)->save();
-                }
-                $quote = Mage::getModel('sales/quote')
-                    ->load($order->getQuoteId());
-                //Return quote
-                if ($quote->getId()) {
-                    $quote->setIsActive(1)
-                        ->setReservedOrderId(NULL)
-                        ->save();
-                    $session->replaceQuote($quote);
-                }
-                //Unset data
-                $session->unsLastRealOrderId();
-                //Redirect to payment step
-                $gotoSection = 'payment';
-            }
+        /* @var $helper Mage_Paypal_Helper_Checkout */
+        $helper = Mage::helper('paypal/checkout');
+        $helper->cancelCurrentOrder($errorMsg);
+        if ($helper->restoreQuote()) {
+            $gotoSection = 'payment';
         }
-
         return $gotoSection;
     }
 
diff --git a/app/code/core/Mage/Paypal/controllers/StandardController.php b/app/code/core/Mage/Paypal/controllers/StandardController.php
index 870ae3f452c..75b5c39a8e0 100644
--- a/app/code/core/Mage/Paypal/controllers/StandardController.php
+++ b/app/code/core/Mage/Paypal/controllers/StandardController.php
@@ -42,7 +42,7 @@ class Mage_Paypal_StandardController extends Mage_Core_Controller_Front_Action
     /**
      *  Get order
      *
-     *  @return	  Mage_Sales_Model_Order
+     *  @return  Mage_Sales_Model_Order
      */
     public function getOrder()
     {
@@ -98,6 +98,7 @@ public function cancelAction()
             if ($order->getId()) {
                 $order->cancel()->save();
             }
+            Mage::helper('paypal/checkout')->restoreQuote();
         }
         $this->_redirect('checkout/cart');
     }
diff --git a/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.2-1.6.0.3.php
new file mode 100644
index 00000000000..8c68217f1df
--- /dev/null
+++ b/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.2-1.6.0.3.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Paypal
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/** @var $this Mage_Core_Model_Resource_Setup */
+$installer = $this;
+$connection = $installer->getConnection();
+$installer->startSetup();
+$data = array(
+    array('paypal_reversed', 'PayPal Reversed'),
+    array('paypal_canceled_reversal', 'PayPal Canceled Reversal')
+);
+$connection = $installer->getConnection()->insertArray(
+    $installer->getTable('sales/order_status'),
+    array('status', 'label'),
+    $data
+);
+$installer->endSetup();
diff --git a/app/code/core/Mage/Paypal/etc/config.xml b/app/code/core/Mage/Paypal/etc/config.xml
index ba0c6cf535a..59e9a5502f3 100644
--- a/app/code/core/Mage/Paypal/etc/config.xml
+++ b/app/code/core/Mage/Paypal/etc/config.xml
@@ -28,7 +28,7 @@
 <config>
     <modules>
         <Mage_Paypal>
-            <version>1.6.0.2</version>
+            <version>1.6.0.4</version>
         </Mage_Paypal>
     </modules>
     <global>
diff --git a/app/code/core/Mage/Paypal/etc/system.xml b/app/code/core/Mage/Paypal/etc/system.xml
index e37075085cd..86cc4ab7128 100644
--- a/app/code/core/Mage/Paypal/etc/system.xml
+++ b/app/code/core/Mage/Paypal/etc/system.xml
@@ -2663,6 +2663,15 @@
                                                 <show_in_default>1</show_in_default>
                                                 <show_in_website>1</show_in_website>
                                             </verify_peer>
+                                            <line_items_enabled translate="label">
+                                                <label>Transfer Cart Line Items</label>
+                                                <config_path>payment/paypaluk_direct/line_items_enabled</config_path>
+                                                <frontend_type>select</frontend_type>
+                                                <source_model>adminhtml/system_config_source_yesno</source_model>
+                                                <sort_order>37</sort_order>
+                                                <show_in_default>1</show_in_default>
+                                                <show_in_website>1</show_in_website>
+                                            </line_items_enabled>
                                             <useccv translate="label">
                                                 <label>Require CVV Entry</label>
                                                 <config_path>payment/paypaluk_direct/useccv</config_path>
diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.3-1.6.0.4.php b/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.3-1.6.0.4.php
new file mode 100644
index 00000000000..d68a3638a68
--- /dev/null
+++ b/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.3-1.6.0.4.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Paypal
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/** @var $installer Mage_Paypal_Model_Resource_Setup */
+$installer = $this;
+
+$installer->getConnection()
+    ->addColumn($installer->getTable('paypal/settlement_report_row'), 'store_id', array(
+        'type'    => Varien_Db_Ddl_Table::TYPE_TEXT,
+        'comment' => 'Store ID',
+        'length'  => '50'));
diff --git a/app/code/core/Mage/PaypalUk/Model/Direct.php b/app/code/core/Mage/PaypalUk/Model/Direct.php
index 96cb43861d3..a5d90ed97b2 100644
--- a/app/code/core/Mage/PaypalUk/Model/Direct.php
+++ b/app/code/core/Mage/PaypalUk/Model/Direct.php
@@ -31,6 +31,11 @@ class Mage_PaypalUk_Model_Direct extends Mage_Paypal_Model_Direct
 {
     protected $_code  = Mage_Paypal_Model_Config::METHOD_WPP_PE_DIRECT;
 
+    /**
+     * Transaction info fetching is not implemented in PayPal Uk
+     */
+    protected $_canFetchTransactionInfo = false;
+
     /**
      * Website Payments Pro instance type
      *
diff --git a/app/code/core/Mage/Persistent/Model/Observer.php b/app/code/core/Mage/Persistent/Model/Observer.php
index 84eec863729..572fd125ca8 100644
--- a/app/code/core/Mage/Persistent/Model/Observer.php
+++ b/app/code/core/Mage/Persistent/Model/Observer.php
@@ -151,7 +151,6 @@ public function emulateAccountLinks($block)
     public function emulateTopLinks($block)
     {
         $this->_applyAccountLinksPersistentData();
-        $block->removeLinkByUrl(Mage::getUrl('customer/account/login'));
     }
 
     /**
@@ -344,7 +343,7 @@ public function preventExpressCheckout($observer)
 
         /** @var $controllerAction Mage_Core_Controller_Front_Action */
         $controllerAction = $observer->getEvent()->getControllerAction();
-        if (is_callable(array($controllerAction, 'redirectLogin'))) {
+        if (method_exists($controllerAction, 'redirectLogin')) {
             Mage::getSingleton('core/session')->addNotice(
                 Mage::helper('persistent')->__('To proceed to Checkout, please log in using your email address.')
             );
@@ -494,7 +493,9 @@ public function checkExpirePersistentQuote(Varien_Event_Observer $observer)
             $customerSession->setCustomerId(null)->setCustomerGroupId(null);
         }
     }
-
+    /**
+     * Active Persistent Sessions
+     */
     protected function _expirePersistentSession()
     {
         /** @var $checkoutSession Mage_Checkout_Model_Session */
diff --git a/app/code/core/Mage/Reports/Block/Product/Abstract.php b/app/code/core/Mage/Reports/Block/Product/Abstract.php
index 91cc4aea296..d080c5f0e33 100644
--- a/app/code/core/Mage/Reports/Block/Product/Abstract.php
+++ b/app/code/core/Mage/Reports/Block/Product/Abstract.php
@@ -55,6 +55,13 @@ abstract class Mage_Reports_Block_Product_Abstract extends Mage_Catalog_Block_Pr
      */
     protected $_collection;
 
+    /**
+     * Defines whether specified products ids order should be used
+     *
+     * @var bool
+     */
+    protected $_useProductIdsOrder = false;
+
     /**
      * Retrieve page size
      *
@@ -139,6 +146,9 @@ public function getItemsCollection()
                 $this->_collection->addFilterByIds($ids);
             }
             $this->_collection->setAddedAtOrder();
+            if ($this-> _useProductIdsOrder && is_array($ids)) {
+                $this->_collection->setSortIds($ids);
+            }
 
             Mage::getSingleton('catalog/product_visibility')
                 ->addVisibleInSiteFilterToCollection($this->_collection);
@@ -147,6 +157,18 @@ public function getItemsCollection()
         return $this->_collection;
     }
 
+    /**
+     * Set flag that defines whether products ids order should be used
+     *
+     * @param bool $use
+     * @return Mage_Reports_Block_Product_Abstract
+     */
+    public function useProductIdsOrder($use = true)
+    {
+        $this->_useProductIdsOrder = $use;
+        return $this;
+    }
+
     /**
      * Retrieve count of product index items
      *
diff --git a/app/code/core/Mage/Reports/Block/Product/Compared.php b/app/code/core/Mage/Reports/Block/Product/Compared.php
index 44fee821f14..52ed0979571 100644
--- a/app/code/core/Mage/Reports/Block/Product/Compared.php
+++ b/app/code/core/Mage/Reports/Block/Product/Compared.php
@@ -40,7 +40,7 @@ class Mage_Reports_Block_Product_Compared extends Mage_Reports_Block_Product_Abs
      *
      * @var string
      */
-    protected $_indexName       = 'reports/product_index_compared';
+    protected $_indexName = 'reports/product_index_compared';
 
     /**
      * Retrieve page size (count)
@@ -71,4 +71,17 @@ protected function _toHtml()
 
         return parent::_toHtml();
     }
+
+    /**
+     * Retrieve block cache tags
+     *
+     * @return array
+     */
+    public function getCacheTags()
+    {
+        return array_merge(
+            parent::getCacheTags(),
+            $this->getItemsTags($this->getItemsCollection())
+        );
+    }
 }
diff --git a/app/code/core/Mage/Reports/Block/Product/Viewed.php b/app/code/core/Mage/Reports/Block/Product/Viewed.php
index 9b5b862cae3..7078dc07ee2 100644
--- a/app/code/core/Mage/Reports/Block/Product/Viewed.php
+++ b/app/code/core/Mage/Reports/Block/Product/Viewed.php
@@ -81,4 +81,17 @@ protected function _toHtml()
         $this->setRecentlyViewedProducts($this->getItemsCollection());
         return parent::_toHtml();
     }
+
+    /**
+     * Retrieve block cache tags
+     *
+     * @return array
+     */
+    public function getCacheTags()
+    {
+        return array_merge(
+            parent::getCacheTags(),
+            $this->getItemsTags($this->getItemsCollection())
+        );
+    }
 }
diff --git a/app/code/core/Mage/Reports/Model/Resource/Order/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Order/Collection.php
index a03745bf3b8..30eca3546d6 100755
--- a/app/code/core/Mage/Reports/Model/Resource/Order/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Order/Collection.php
@@ -41,6 +41,13 @@ class Mage_Reports_Model_Resource_Order_Collection extends Mage_Sales_Model_Reso
      */
     protected $_isLive   = false;
 
+    /**
+     * Sales amount expression
+     *
+     * @var string
+     */
+    protected $_salesAmountExpression;
+
     /**
      * Check range for live mode
      *
@@ -84,6 +91,40 @@ public function prepareSummary($range, $customStart, $customEnd, $isFilter = 0)
         return $this;
     }
 
+    /**
+     * Get sales amount expression
+     *
+     * @return string
+     */
+    protected function _getSalesAmountExpression()
+    {
+        if (is_null($this->_salesAmountExpression)) {
+            $adapter = $this->getConnection();
+            $expressionTransferObject = new Varien_Object(array(
+                'expression' => '%s - %s - %s - (%s - %s - %s)',
+                'arguments' => array(
+                    $adapter->getIfNullSql('main_table.base_total_invoiced', 0),
+                    $adapter->getIfNullSql('main_table.base_tax_invoiced', 0),
+                    $adapter->getIfNullSql('main_table.base_shipping_invoiced', 0),
+                    $adapter->getIfNullSql('main_table.base_total_refunded', 0),
+                    $adapter->getIfNullSql('main_table.base_tax_refunded', 0),
+                    $adapter->getIfNullSql('main_table.base_shipping_refunded', 0),
+                )
+            ));
+
+            Mage::dispatchEvent('sales_prepare_amount_expression', array(
+                'collection' => $this,
+                'expression_object' => $expressionTransferObject,
+            ));
+            $this->_salesAmountExpression = vsprintf(
+                $expressionTransferObject->getExpression(),
+                $expressionTransferObject->getArguments()
+            );
+        }
+
+        return $this->_salesAmountExpression;
+    }
+
     /**
      * Prepare report summary from live data
      *
@@ -103,14 +144,7 @@ protected function _prepareSummaryLive($range, $customStart, $customEnd, $isFilt
          */
         $this->getSelect()->reset(Zend_Db_Select::COLUMNS);
 
-        $expression = sprintf('%s - %s - %s - (%s - %s - %s)',
-            $adapter->getIfNullSql('main_table.base_total_invoiced', 0),
-            $adapter->getIfNullSql('main_table.base_tax_invoiced', 0),
-            $adapter->getIfNullSql('main_table.base_shipping_invoiced', 0),
-            $adapter->getIfNullSql('main_table.base_total_refunded', 0),
-            $adapter->getIfNullSql('main_table.base_tax_refunded', 0),
-            $adapter->getIfNullSql('main_table.base_shipping_refunded', 0)
-        );
+        $expression = $this->_getSalesAmountExpression();
         if ($isFilter == 0) {
             $this->getSelect()->columns(array(
                 'revenue' => new Zend_Db_Expr(
@@ -387,21 +421,12 @@ protected function _calculateTotalsLive($isFilter = 0)
 
         $adapter = $this->getConnection();
 
-        $baseTotalInvoiced    = $adapter->getIfNullSql('main_table.base_total_invoiced', 0);
-        $baseTotalRefunded    = $adapter->getIfNullSql('main_table.base_total_refunded', 0);
         $baseTaxInvoiced      = $adapter->getIfNullSql('main_table.base_tax_invoiced', 0);
         $baseTaxRefunded      = $adapter->getIfNullSql('main_table.base_tax_refunded', 0);
         $baseShippingInvoiced = $adapter->getIfNullSql('main_table.base_shipping_invoiced', 0);
         $baseShippingRefunded = $adapter->getIfNullSql('main_table.base_shipping_refunded', 0);
 
-        $revenueExp = sprintf('%s - %s - %s - (%s - %s - %s)',
-            $baseTotalInvoiced,
-            $baseTaxInvoiced,
-            $baseShippingInvoiced,
-            $baseTotalRefunded,
-            $baseTaxRefunded,
-            $baseShippingRefunded
-        );
+        $revenueExp = $this->_getSalesAmountExpression();
         $taxExp = sprintf('%s - %s', $baseTaxInvoiced, $baseTaxRefunded);
         $shippingExp = sprintf('%s - %s', $baseShippingInvoiced, $baseShippingRefunded);
 
@@ -503,14 +528,7 @@ public function calculateSales($isFilter = 0)
             $this->setMainTable('sales/order');
             $this->removeAllFieldsFromSelect();
 
-            $expr = sprintf('%s - %s - %s - (%s - %s - %s)',
-                $adapter->getIfNullSql('main_table.base_total_invoiced', 0),
-                $adapter->getIfNullSql('main_table.base_tax_invoiced', 0),
-                $adapter->getIfNullSql('main_table.base_shipping_invoiced', 0),
-                $adapter->getIfNullSql('main_table.base_total_refunded', 0),
-                $adapter->getIfNullSql('main_table.base_tax_refunded', 0),
-                $adapter->getIfNullSql('main_table.base_shipping_refunded', 0)
-            );
+            $expr = $this->_getSalesAmountExpression();
 
             if ($isFilter == 0) {
                 $expr = '(' . $expr . ') * main_table.base_to_global_rate';
diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Collection/Abstract.php
index 394d77e1080..5140d4da630 100755
--- a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Collection/Abstract.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Collection/Abstract.php
@@ -42,6 +42,14 @@ abstract class Mage_Reports_Model_Resource_Product_Index_Collection_Abstract
      */
     protected $_customerId = null;
 
+    /**
+     * List of ids
+     * After collection will be loaded Items will be sorted as this list
+     *
+     * @var array
+     */
+    protected $_sortIds = array();
+
     /**
      * Retrieve Product Index table name
      *
@@ -147,6 +155,50 @@ public function setAddedAtOrder($dir = self::SORT_ORDER_DESC)
         return $this;
     }
 
+    /**
+     * Set list of ids with expected order
+     *
+     * @param array $ids
+     * @return Mage_Reports_Model_Resource_Product_Index_Collection_Abstract
+     */
+    public function setSortIds(array $ids)
+    {
+        $this->_sortIds = $ids;
+        return $this;
+    }
+
+    /**
+     * Sort loaded collection by predefined items ids
+     *
+     * @return Mage_Reports_Model_Resource_Product_Index_Collection_Abstract
+     */
+    protected function _sort()
+    {
+        if (!empty($this->_sortIds)) {
+            $orderedItems = array();
+            foreach ($this->_sortIds as $id) {
+                if (isset($this->_items[$id])) {
+                    $orderedItems[$id] = $this->_items[$id];
+                }
+            }
+            $this->_items = $orderedItems;
+        }
+        return $this;
+    }
+
+    /**
+     * Sort items
+     *
+     * @return Mage_Catalog_Model_Resource_Product_Collection
+     */
+    protected function _afterLoad()
+    {
+        $result = parent::_afterLoad();
+        $this->_sort();
+        return $result;
+    }
+
+
     /**
      * Add exclude Product Ids
      *
diff --git a/app/code/core/Mage/Reports/Model/Resource/Tag/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Tag/Customer/Collection.php
index 863d21f60d4..9fbb7aed61c 100755
--- a/app/code/core/Mage/Reports/Model/Resource/Tag/Customer/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Tag/Customer/Collection.php
@@ -68,21 +68,4 @@ public function getSelectCountSql()
 
         return $countSelect;
     }
-
-    /**
-     * Set order
-     *
-     * @param string $attribute
-     * @param string $dir
-     * @return Mage_Reports_Model_Resource_Tag_Customer_Collection
-     */
-    public function setOrder($attribute, $dir = self::SORT_ORDER_DESC)
-    {
-        if (in_array($attribute, array('taged'))) {
-            $this->getSelect()->order($attribute . ' ' . $dir);
-        } else {
-            parent::setOrder($attribute, $dir);
-        }
-        return $this;
-    }
 }
diff --git a/app/code/core/Mage/Review/Helper/Data.php b/app/code/core/Mage/Review/Helper/Data.php
index 4a89c9bd235..0c0cfaa02ed 100644
--- a/app/code/core/Mage/Review/Helper/Data.php
+++ b/app/code/core/Mage/Review/Helper/Data.php
@@ -50,4 +50,33 @@ public function getIsGuestAllowToWrite()
     {
         return Mage::getStoreConfigFlag(self::XML_REVIEW_GUETS_ALLOW);
     }
+
+    /**
+     * Get review statuses with their codes
+     *
+     * @return array
+     */
+    public function getReviewStatuses()
+    {
+        return array(
+            Mage_Review_Model_Review::STATUS_APPROVED     => $this->__('Approved'),
+            Mage_Review_Model_Review::STATUS_PENDING      => $this->__('Pending'),
+            Mage_Review_Model_Review::STATUS_NOT_APPROVED => $this->__('Not Approved'),
+        );
+    }
+
+    /**
+     * Get review statuses as option array
+     *
+     * @return array
+     */
+    public function getReviewStatusesOptionArray()
+    {
+        $result = array();
+        foreach ($this->getReviewStatuses() as $k => $v) {
+            $result[] = array('value' => $k, 'label' => $v);
+        }
+
+        return $result;
+    }
 }
diff --git a/app/code/core/Mage/Review/Model/Resource/Review.php b/app/code/core/Mage/Review/Model/Resource/Review.php
index 7c543ed8ca0..67f5368f5d1 100755
--- a/app/code/core/Mage/Review/Model/Resource/Review.php
+++ b/app/code/core/Mage/Review/Model/Resource/Review.php
@@ -285,7 +285,7 @@ public function getTotalReviews($entityPkValue, $approvedOnly = false, $storeId
         }
         if ($approvedOnly) {
             $select->where("{$this->_reviewTable}.status_id = :status_id");
-            $bind[':status_id'] = 1;
+            $bind[':status_id'] = Mage_Review_Model_Review::STATUS_APPROVED;
         }
         return $adapter->fetchOne($select, $bind);
     }
diff --git a/app/code/core/Mage/Review/Model/Resource/Review/Collection.php b/app/code/core/Mage/Review/Model/Resource/Review/Collection.php
index 1ec8cfee5a3..931d26ae4a0 100755
--- a/app/code/core/Mage/Review/Model/Resource/Review/Collection.php
+++ b/app/code/core/Mage/Review/Model/Resource/Review/Collection.php
@@ -184,18 +184,14 @@ public function addEntityFilter($entity, $pkValue)
      */
     public function addStatusFilter($status)
     {
+        if (is_string($status)) {
+            $statuses = array_flip(Mage::helper('review')->getReviewStatuses());
+            $status = isset($statuses[$status]) ? $statuses[$status] : 0;
+        }
         if (is_numeric($status)) {
             $this->addFilter('status',
                 $this->getConnection()->quoteInto('main_table.status_id=?', $status),
                 'string');
-        } elseif (is_string($status)) {
-            $this->_select->join($this->_reviewStatusTable,
-                'main_table.status_id='.$this->_reviewStatusTable.'.status_id',
-                array('status_code'));
-
-            $this->addFilter('status',
-                $this->getConnection()->quoteInto($this->_reviewStatusTable.'.status_code=?', $status),
-                'string');
         }
         return $this;
     }
diff --git a/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php b/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php
index 239036dccc0..49e321f38a3 100644
--- a/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php
+++ b/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php
@@ -75,8 +75,6 @@ protected function _toHtml()
         );
         $rssObj->_addHeader($data);
 
-        $configManageStock = (int) Mage::getStoreConfigFlag(
-            Mage_CatalogInventory_Model_Stock_Item::XML_PATH_MANAGE_STOCK);
         $globalNotifyStockQty = (float) Mage::getStoreConfig(
             Mage_CatalogInventory_Model_Stock_Item::XML_PATH_NOTIFY_STOCK_QTY);
         Mage::helper('rss')->disableFlat();
@@ -84,27 +82,18 @@ protected function _toHtml()
         $product = Mage::getModel('catalog/product');
         /* @var $collection Mage_Catalog_Model_Resource_Product_Collection */
         $collection = $product->getCollection();
-        $stockItemTable = $collection->getTable('cataloginventory/stock_item');
-
-        $stockItemWhere = '({{table}}.low_stock_date is not null) '
-            . " AND ( ({{table}}.use_config_manage_stock=1 AND {$configManageStock}=1)"
-            . " AND {{table}}.qty < "
-            . "IF({$stockItemTable}.`use_config_notify_stock_qty`, {$globalNotifyStockQty}, {{table}}.notify_stock_qty)"
-            . ' OR ({{table}}.use_config_manage_stock=0 AND {{table}}.manage_stock=1) )';
-
+        Mage::getResourceModel('cataloginventory/stock')->addLowStockFilter($collection, array(
+            'qty',
+            'notify_stock_qty',
+            'low_stock_date',
+            'use_config' => 'use_config_notify_stock_qty'
+        ));
         $collection
             ->addAttributeToSelect('name', true)
-            ->joinTable('cataloginventory/stock_item', 'product_id=entity_id',
-                array(
-                     'qty'=>'qty',
-                     'notify_stock_qty'=>'notify_stock_qty',
-                     'use_config' => 'use_config_notify_stock_qty',
-                     'low_stock_date' => 'low_stock_date'),
-                $stockItemWhere, 'inner')
+            ->addAttributeToFilter('status',
+                array('in' => Mage::getSingleton('catalog/product_status')->getVisibleStatusIds())
+            )
             ->setOrder('low_stock_date');
-
-        $collection->addAttributeToFilter('status',
-            array('in' => Mage::getSingleton('catalog/product_status')->getVisibleStatusIds()));
         Mage::dispatchEvent('rss_catalog_notify_stock_collection_select', array('collection' => $collection));
 
         /*
diff --git a/app/code/core/Mage/Rss/Block/Catalog/Tag.php b/app/code/core/Mage/Rss/Block/Catalog/Tag.php
index 03cb07bc406..a82c9998afa 100644
--- a/app/code/core/Mage/Rss/Block/Catalog/Tag.php
+++ b/app/code/core/Mage/Rss/Block/Catalog/Tag.php
@@ -39,7 +39,9 @@ protected function _construct()
         * setting cache to save the rss for 10 minutes
         */
         $tagModel = Mage::registry('tag_model');
-        $this->setCacheKey('rss_catalog_tag_' . $this->getStoreId() . '_' . $tagModel->getName());
+        if ($tagModel) {
+            $this->setCacheKey('rss_catalog_tag_' . $this->getStoreId() . '_' . $tagModel->getName());
+        }
         $this->setCacheLifetime(600);
     }
 
diff --git a/app/code/core/Mage/Rss/Helper/Data.php b/app/code/core/Mage/Rss/Helper/Data.php
index 6dff269bd3e..0c9363d3873 100644
--- a/app/code/core/Mage/Rss/Helper/Data.php
+++ b/app/code/core/Mage/Rss/Helper/Data.php
@@ -34,6 +34,11 @@
  */
 class Mage_Rss_Helper_Data extends Mage_Core_Helper_Abstract
 {
+    /**
+     * Config path to RSS field
+     */
+    const XML_PATH_RSS_ACTIVE = 'rss/config/active';
+
     /**
      * Authenticate customer on frontend
      *
@@ -69,7 +74,7 @@ public function authAdmin($path)
         $adminSession = Mage::getSingleton('admin/session');
         $user = $adminSession->login($username, $password);
         //$user = Mage::getModel('admin/user')->login($username, $password);
-        if($user && $user->getId() && $user->getIsActive() == '1' && $adminSession->isAllowed($path)){
+        if ($user && $user->getId() && $user->getIsActive() == '1' && $adminSession->isAllowed($path)) {
             $session->setAdmin($user);
         } else {
             $this->authFailed();
@@ -82,7 +87,7 @@ public function authAdmin($path)
      * @param array $headers
      * @return array
      */
-    public function authValidate($headers=null)
+    public function authValidate($headers = null)
     {
         $userPass = Mage::helper('core/http')->authValidate($headers);
         return $userPass;
@@ -107,7 +112,7 @@ public function disableFlat()
     {
         /* @var $flatHelper Mage_Catalog_Helper_Product_Flat */
         $flatHelper = Mage::helper('catalog/product_flat');
-        if ($flatHelper->isEnabled()) {
+        if ($flatHelper->isAvailable()) {
             /* @var $emulationModel Mage_Core_Model_App_Emulation */
             $emulationModel = Mage::getModel('core/app_emulation');
             // Emulate admin environment to disable using flat model - otherwise we won't get global stats
@@ -115,4 +120,14 @@ public function disableFlat()
             $emulationModel->startEnvironmentEmulation(0, Mage_Core_Model_App_Area::AREA_ADMINHTML);
         }
     }
+
+    /**
+     * Check if module was activated in system configurations
+     *
+     * @return bool
+     */
+    public function isRssEnabled()
+    {
+        return Mage::getStoreConfigFlag(self::XML_PATH_RSS_ACTIVE);
+    }
 }
diff --git a/app/code/core/Mage/Rss/Helper/Order.php b/app/code/core/Mage/Rss/Helper/Order.php
index 68f8230da95..e1380084c61 100644
--- a/app/code/core/Mage/Rss/Helper/Order.php
+++ b/app/code/core/Mage/Rss/Helper/Order.php
@@ -31,6 +31,11 @@
  */
 class Mage_Rss_Helper_Order extends Mage_Core_Helper_Abstract
 {
+    /**
+     * Check whether status notification is allowed
+     *
+     * @return bool
+     */
     public function isStatusNotificationAllow()
     {
         if (Mage::getStoreConfig('rss/order/status_notified')) {
@@ -39,10 +44,60 @@ public function isStatusNotificationAllow()
         return false;
     }
 
+    /**
+     * Retrieve order status history url
+     *
+     * @param Mage_Sales_Model_Order $order
+     * @return string
+     */
     public function getStatusHistoryRssUrl($order)
     {
-        $key = $order->getId().":".$order->getIncrementId().":".$order->getCustomerId();
-        return $this->_getUrl('rss/order/status', array('_secure' => true, '_query'=>array('data'=>Mage::helper('core')->encrypt($key))));
+        return $this->_getUrl('rss/order/status',
+            array('_secure' => true, '_query' => array('data' => $this->getStatusUrlKey($order)))
+        );
     }
 
+    /**
+     * Retrieve order status url key
+     *
+     * @param Mage_Sales_Model_Order $order
+     * @return string
+     */
+    public function getStatusUrlKey($order)
+    {
+        $data = array(
+            'order_id' => $order->getId(),
+            'increment_id' => $order->getIncrementId(),
+            'customer_id' => $order->getCustomerId()
+        );
+        return base64_encode(json_encode($data));
+
+    }
+
+    /**
+     * Retrieve order instance by specified status url key
+     *
+     * @param string $key
+     * @return Mage_Sales_Model_Order|null
+     */
+    public function getOrderByStatusUrlKey($key)
+    {
+        $data = json_decode(base64_decode($key), true);
+        if (!is_array($data) || !isset($data['order_id']) || !isset($data['increment_id'])
+            || !isset($data['customer_id'])
+        ) {
+            return null;
+        }
+
+        /** @var $order Mage_Sales_Model_Order */
+        $order = Mage::getModel('sales/order')->load($data['order_id']);
+        if ($order->getId()
+            && $order->getIncrementId() == $data['increment_id']
+            && $order->getCustomerId() == $data['customer_id']
+        ) {
+            return $order;
+        }
+
+        return null;
+    }
 }
diff --git a/app/code/core/Mage/Rss/Model/Observer.php b/app/code/core/Mage/Rss/Model/Observer.php
index ed78507fbc3..29f2b8077f8 100644
--- a/app/code/core/Mage/Rss/Model/Observer.php
+++ b/app/code/core/Mage/Rss/Model/Observer.php
@@ -34,43 +34,71 @@
  */
 class Mage_Rss_Model_Observer
 {
+    /**
+     * Factory instance
+     *
+     * @var Mage_Core_Model_Abstract
+     */
+    protected $_factory;
+
+    /**
+     * Application instance
+     *
+     * @var Mage_Core_Model_App
+     */
+    protected $_app;
+
+    /**
+     * @param array $args
+     */
+    public function __construct(array $args = array())
+    {
+        $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('core/factory');
+        $this->_app = !empty($args['app']) ? $args['app'] : Mage::app();
+    }
 
     /**
      * Clean cache for catalog review rss
      *
-     * @param  Varien_Event_Observer $observer
+     * @param Varien_Event_Observer $observer
      * @return void
      */
     public function reviewSaveAfter(Varien_Event_Observer $observer)
     {
-
-        Mage::app()->cleanCache(array(Mage_Rss_Block_Catalog_Review::CACHE_TAG));
-
+        $this->_cleanCache(Mage_Rss_Block_Catalog_Review::CACHE_TAG);
     }
 
     /**
      * Clean cache for notify stock rss
      *
-     * @param  Varien_Event_Observer $observer
+     * @param Varien_Event_Observer $observer
      * @return void
      */
     public function salesOrderItemSaveAfterNotifyStock(Varien_Event_Observer $observer)
     {
-
-        Mage::app()->cleanCache(array(Mage_Rss_Block_Catalog_NotifyStock::CACHE_TAG));
-
+        $this->_cleanCache(Mage_Rss_Block_Catalog_NotifyStock::CACHE_TAG);
     }
 
     /**
      * Clean cache for catalog new orders rss
      *
-     * @param  Varien_Event_Observer $observer
+     * @param Varien_Event_Observer $observer
      * @return void
      */
     public function salesOrderItemSaveAfterOrderNew(Varien_Event_Observer $observer)
     {
+        $this->_cleanCache(Mage_Rss_Block_Order_New::CACHE_TAG);
+    }
 
-        Mage::app()->cleanCache(array(Mage_Rss_Block_Order_New::CACHE_TAG));
-
+    /**
+     * Cleaning cache
+     *
+     * @param string $tag
+     */
+    protected function _cleanCache($tag)
+    {
+        if ($this->_factory->getHelper('rss')->isRssEnabled()) {
+            $this->_app->cleanCache(array($tag));
+        }
     }
 }
diff --git a/app/code/core/Mage/Rss/controllers/IndexController.php b/app/code/core/Mage/Rss/controllers/IndexController.php
index b81c68ee1b8..5a2a52dc2f7 100644
--- a/app/code/core/Mage/Rss/controllers/IndexController.php
+++ b/app/code/core/Mage/Rss/controllers/IndexController.php
@@ -30,7 +30,6 @@
  * @file        IndexController.php
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-
 class Mage_Rss_IndexController extends Mage_Core_Controller_Front_Action
 {
     /**
@@ -52,7 +51,7 @@ class Mage_Rss_IndexController extends Mage_Core_Controller_Front_Action
      */
     public function indexAction()
     {
-        if (Mage::getStoreConfig('rss/config/active')) {
+        if ($this->_getHelper('rss')->isRssEnabled()) {
             $this->loadLayout();
             $this->renderLayout();
         } else {
@@ -129,7 +128,7 @@ protected function _getWishlist()
             if ($wishlistId) {
                 $this->_wishlist->load($wishlistId);
             } else {
-                if($this->_getCustomer()->getId()) {
+                if ($this->_getCustomer()->getId()) {
                     $this->_wishlist->loadByCustomer($this->_getCustomer());
                 }
             }
@@ -147,7 +146,7 @@ protected function _getCustomer()
         if (is_null($this->_customer)) {
             $this->_customer = Mage::getModel('customer/customer');
 
-            $params = Mage::helper('core')->urlDecode($this->getRequest()->getParam('data'));
+            $params = $this->_getHelper('core')->urlDecode($this->getRequest()->getParam('data'));
             $data   = explode(',', $params);
             $customerId    = abs(intval($data[0]));
             if ($customerId && ($customerId == Mage::getSingleton('customer/session')->getCustomerId()) ) {
@@ -157,4 +156,15 @@ protected function _getCustomer()
 
         return $this->_customer;
     }
+
+    /**
+     * Retrieve helper instance
+     *
+     * @param string $name
+     * @return Mage_Core_Helper_Abstract
+     */
+    protected function _getHelper($name)
+    {
+        return Mage::helper($name);
+    }
 }
diff --git a/app/code/core/Mage/Rss/controllers/OrderController.php b/app/code/core/Mage/Rss/controllers/OrderController.php
index df7e171fe4d..658f8d72b7a 100644
--- a/app/code/core/Mage/Rss/controllers/OrderController.php
+++ b/app/code/core/Mage/Rss/controllers/OrderController.php
@@ -52,20 +52,18 @@ public function customerAction()
         }
     }
 
+    /**
+     * Order status action
+     */
     public function statusAction()
     {
-        $decrypt = Mage::helper('core')->decrypt($this->getRequest()->getParam('data'));
-        $data = explode(":",$decrypt);
-        $oid = (int) $data[0];
-        if ($oid) {
-            $order = Mage::getModel('sales/order')->load($oid);
-            if ($order && $order->getId()) {
-                Mage::register('current_order', $order);
-                $this->getResponse()->setHeader('Content-type', 'text/xml; charset=UTF-8');
-                $this->loadLayout(false);
-                $this->renderLayout();
-                return;
-            }
+        $order = Mage::helper('rss/order')->getOrderByStatusUrlKey((string)$this->getRequest()->getParam('data'));
+        if (!is_null($order)) {
+            Mage::register('current_order', $order);
+            $this->getResponse()->setHeader('Content-type', 'text/xml; charset=UTF-8');
+            $this->loadLayout(false);
+            $this->renderLayout();
+            return;
         }
         $this->_forward('nofeed', 'index', 'rss');
     }
diff --git a/app/code/core/Mage/Rule/Model/Abstract.php b/app/code/core/Mage/Rule/Model/Abstract.php
index 9650f2fed91..f8a027bbb91 100644
--- a/app/code/core/Mage/Rule/Model/Abstract.php
+++ b/app/code/core/Mage/Rule/Model/Abstract.php
@@ -82,6 +82,20 @@ abstract public function getConditionsInstance();
      */
     abstract public function getActionsInstance();
 
+    /**
+     * Prepare select for condition
+     *
+     * @param int $storeId
+     * @return Varien_Db_Select
+     */
+    public function getProductFlatSelect($storeId)
+    {
+        /** @var $resource Mage_Rule_Model_Resource_Abstract */
+        $resource = $this->getResource();
+
+        return $resource->getProductFlatSelect($storeId, $this->getConditions());
+    }
+
     /**
      * Prepare data before saving
      *
diff --git a/app/code/core/Mage/Rule/Model/Condition/Abstract.php b/app/code/core/Mage/Rule/Model/Condition/Abstract.php
index 3ab17afca55..9c3f9ee4f85 100644
--- a/app/code/core/Mage/Rule/Model/Condition/Abstract.php
+++ b/app/code/core/Mage/Rule/Model/Condition/Abstract.php
@@ -75,6 +75,16 @@ public function __construct()
         }
     }
 
+    /**
+     * Prepare sql where by condition
+     *
+     * @return string
+     */
+    public function prepareConditionSql()
+    {
+        return '';
+    }
+
     /**
      * Default operator input by type map getter
      *
@@ -522,7 +532,7 @@ public function asStringRecursive($level=0)
     }
 
     /**
-     * Validate product attrbute value for condition
+     * Validate product attribute value for condition
      *
      * @param   mixed $validatedValue product attribute value
      * @return  bool
diff --git a/app/code/core/Mage/Rule/Model/Condition/Combine.php b/app/code/core/Mage/Rule/Model/Condition/Combine.php
index f7de5f49de8..ee9844db359 100644
--- a/app/code/core/Mage/Rule/Model/Condition/Combine.php
+++ b/app/code/core/Mage/Rule/Model/Condition/Combine.php
@@ -24,7 +24,9 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-
+/**
+ * @method string getAggregator()
+ */
 class Mage_Rule_Model_Condition_Combine extends Mage_Rule_Model_Condition_Abstract
 {
     /**
@@ -34,9 +36,25 @@ class Mage_Rule_Model_Condition_Combine extends Mage_Rule_Model_Condition_Abstra
      */
     static protected $_conditionModels = array();
 
+    /**
+     * Prepare sql where by condition
+     *
+     * @return string
+     */
+    public function prepareConditionSql()
+    {
+        $wheres = array();
+        foreach ($this->getConditions() as $condition) {
+            /** @var $condition Mage_Rule_Model_Condition_Abstract */
+            $wheres[] = $condition->prepareConditionSql();
+        }
 
-
-
+        if (empty($wheres)) {
+            return '';
+        }
+        $delimiter = $this->getAggregator() == "all" ? ' AND ' : ' OR ';
+        return ' (' . implode($delimiter, $wheres) . ') ';
+    }
 
     /**
      * Retrieve new object for each requested model.
diff --git a/app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php b/app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php
index 28ba4dbe02d..f419471348e 100644
--- a/app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php
+++ b/app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php
@@ -27,12 +27,22 @@
 /**
  * Abstract Rule product condition data model
  *
+ * @method string getAttribute()
+ * @method string getOperator()
+ *
  * @category Mage
  * @package Mage_Rule
  * @author Magento Core Team <core@magentocommerce.com>
  */
 abstract class Mage_Rule_Model_Condition_Product_Abstract extends Mage_Rule_Model_Condition_Abstract
 {
+    /**
+     * Rule condition SQL builder
+     *
+     * @var Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder
+     */
+    protected $_ruleResourceHelper;
+
     /**
      * All attribute values as array in form:
      * array(
@@ -76,6 +86,70 @@ public function getDefaultOperatorInputByType()
         return $this->_defaultOperatorInputByType;
     }
 
+    /**
+     * Prepare bind array of ids from string or array
+     *
+     * @param string|int|array $value
+     * @return array
+     */
+    public function bindArrayOfIds($value)
+    {
+        if (!is_array($value)) {
+            $value = explode(',', $value);
+        }
+
+        $value = array_map('trim', $value);
+        $value = array_filter($value, 'is_numeric');
+
+        return $value;
+    }
+
+    /**
+     * Prepare sql where by condition
+     *
+     * @return string
+     */
+    public function prepareConditionSql()
+    {
+        $alias     = 'cpf';
+        $attribute = $this->getAttribute();
+        $value     = $this->getValue();
+        $operator  = $this->correctOperator($this->getOperator(), $this->getInputType());
+        if ($attribute == 'category_ids') {
+            $alias     = 'ccp';
+            $attribute = 'category_id';
+            $value     = $this->bindArrayOfIds($value);
+        }
+
+        /** @var $ruleResource Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder */
+        $ruleResource = $this->getRuleResourceHelper();
+
+        return $ruleResource->getOperatorCondition($alias . '.' . $attribute, $operator, $value);
+    }
+
+    /**
+     * Rule condition SQL builder setter
+     *
+     * @param Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder $ruleHelper
+     */
+    public function setRuleResourceHelper(Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder $ruleHelper)
+    {
+        $this->_ruleResourceHelper = $ruleHelper;
+    }
+
+    /**
+     * Rule condition SQL builder getter
+     *
+     * @return Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder
+     */
+    public function getRuleResourceHelper()
+    {
+        if (!$this->_ruleResourceHelper) {
+            $this->_ruleResourceHelper = Mage::getModel('rule/resource_rule_condition_sqlBuilder');
+        }
+        return $this->_ruleResourceHelper;
+    }
+
     /**
      * Retrieve attribute object
      *
@@ -441,6 +515,9 @@ public function loadArray($arr)
     public function validate(Varien_Object $object)
     {
         $attrCode = $this->getAttribute();
+        if (!($object instanceof Mage_Catalog_Model_Product)) {
+            $object = Mage::getModel('catalog/product')->load($object->getId());
+        }
 
         if ('category_ids' == $attrCode) {
             return $this->validateAttribute($object->getAvailableInCategories());
@@ -494,23 +571,34 @@ public function validate(Varien_Object $object)
         }
     }
 
+    /**
+     * Get correct operator for validation
+     *
+     * @return string
+     */
+    public function getOperatorForValidate()
+    {
+        return $this->correctOperator($this->getOperator(), $this->getInputType());
+    }
+
     /**
      * Correct '==' and '!=' operators
      * Categories can't be equal because product is included categories selected by administrator and in their parents
      *
+     * @param string $operator
+     * @param string $inputType
      * @return string
      */
-    public function getOperatorForValidate()
+    public function correctOperator($operator, $inputType)
     {
-        $op = $this->getOperator();
-        if ($this->getInputType() == 'category') {
-            if ($op == '==') {
-                $op = '{}';
-            } elseif ($op == '!=') {
-                $op = '!{}';
+        if ($inputType == 'category') {
+            if ($operator == '==') {
+                $operator = '{}';
+            } elseif ($operator == '!=') {
+                $operator = '!{}';
             }
         }
 
-        return $op;
+        return $operator;
     }
 }
diff --git a/app/code/core/Mage/Rule/Model/Resource/Abstract.php b/app/code/core/Mage/Rule/Model/Resource/Abstract.php
index 6899edc40f7..2fd20164659 100644
--- a/app/code/core/Mage/Rule/Model/Resource/Abstract.php
+++ b/app/code/core/Mage/Rule/Model/Resource/Abstract.php
@@ -82,16 +82,50 @@ public function _beforeSave(Mage_Core_Model_Abstract $object)
         return $this;
     }
 
+    /**
+     * Prepare select for condition
+     *
+     * @param int $storeId
+     * @param Mage_Rule_Model_Condition_Abstract $condition
+     * @return Varien_Db_Select
+     */
+    public function getProductFlatSelect($storeId, $condition)
+    {
+        $select = $this->_getReadAdapter()->select();
+        $select->from(
+                array('p' => $this->getTable('catalog/product')),
+                array(new Zend_Db_Expr('DISTINCT p.entity_id'))
+            )
+            ->joinInner(
+                array('cpf' => $this->getTable('catalog/product_flat') . '_' . $storeId),
+                'cpf.entity_id = p.entity_id',
+                array()
+            )->joinLeft(
+                array('ccp' => $this->getTable('catalog/category_product')),
+                'ccp.product_id = p.entity_id',
+                array()
+            );
+
+        $where = $condition->prepareConditionSql();
+        if (!empty($where)) {
+            $select->where($where);
+        }
+
+        return $select;
+    }
+
     /**
      * Bind specified rules to entities
      *
      * @param array|int|string $ruleIds
      * @param array|int|string $entityIds
      * @param string $entityType
+     * @param bool $deleteOldResults
      *
+     * @throws Exception
      * @return Mage_Rule_Model_Resource_Abstract
      */
-    public function bindRuleToEntity($ruleIds, $entityIds, $entityType)
+    public function bindRuleToEntity($ruleIds, $entityIds, $entityType, $deleteOldResults = true)
     {
         if (empty($ruleIds) || empty($entityIds)) {
             return $this;
@@ -137,10 +171,12 @@ public function bindRuleToEntity($ruleIds, $entityIds, $entityType)
                 );
             }
 
-            $adapter->delete($this->getTable($entityInfo['associations_table']),
-                $adapter->quoteInto($entityInfo['rule_id_field']   . ' IN (?) AND ', $ruleIds) .
-                $adapter->quoteInto($entityInfo['entity_id_field'] . ' NOT IN (?)',  $entityIds)
-            );
+            if ($deleteOldResults) {
+                $adapter->delete($this->getTable($entityInfo['associations_table']),
+                    $adapter->quoteInto($entityInfo['rule_id_field']   . ' IN (?) AND ', $ruleIds) .
+                    $adapter->quoteInto($entityInfo['entity_id_field'] . ' NOT IN (?)',  $entityIds)
+                );
+            }
         } catch (Exception $e) {
             $adapter->rollback();
             throw $e;
@@ -243,9 +279,7 @@ protected function _getAssociatedEntityInfo($entityType)
 
         $e = Mage::exception(
             'Mage_Core',
-            Mage::helper('rule')->__(
-                'There is no information about associated entity type "%s".', $entityType
-            )
+            Mage::helper('rule')->__('There is no information about associated entity type "%s".', $entityType)
         );
         throw $e;
     }
diff --git a/app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php b/app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php
index cc2f4c7ba9c..ff584bb5c37 100644
--- a/app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php
+++ b/app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php
@@ -174,9 +174,7 @@ protected function _getAssociatedEntityInfo($entityType)
 
         $e = Mage::exception(
             'Mage_Core',
-            Mage::helper('rule')->__(
-                'There is no information about associated entity type "%s".', $entityType
-            )
+            Mage::helper('rule')->__('There is no information about associated entity type "%s".', $entityType)
         );
         throw $e;
     }
diff --git a/app/code/core/Mage/Rule/Model/Resource/Rule/Condition/SqlBuilder.php b/app/code/core/Mage/Rule/Model/Resource/Rule/Condition/SqlBuilder.php
new file mode 100644
index 00000000000..34ee7b1c971
--- /dev/null
+++ b/app/code/core/Mage/Rule/Model/Resource/Rule/Condition/SqlBuilder.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Rule
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+class Mage_Rule_Model_Resource_Rule_Condition_SqlBuilder
+{
+    /**
+     * Database adapter
+     *
+     * @var Varien_Db_Adapter_Interface
+     */
+    protected $_adapter;
+
+    /**
+     * Constructor
+     *
+     * @param array $config
+     */
+    public function __construct(array $config = array())
+    {
+        $this->_adapter = isset($config['adapter'])
+            ? $config['adapter']
+            : Mage::getSingleton('core/resource')->getConnection(Mage_Core_Model_Resource::DEFAULT_READ_RESOURCE);
+    }
+
+    /**
+     * Convert operator for sql where
+     *
+     * @param string $field
+     * @param string $operator
+     * @param string|array $value
+     * @return string
+     */
+    public function getOperatorCondition($field, $operator, $value)
+    {
+        switch ($operator) {
+            case '!=':
+            case '>=':
+            case '<=':
+            case '>':
+            case '<':
+                $selectOperator = sprintf('%s?', $operator);
+                break;
+            case '{}':
+            case '!{}':
+                if (preg_match('/^.*(category_id)$/', $field) && is_array($value)) {
+                    $selectOperator = ' IN (?)';
+                } else {
+                    $selectOperator = ' LIKE ?';
+                    $value          = '%' . $value . '%';
+                }
+                if (substr($operator, 0, 1) == '!') {
+                    $selectOperator = ' NOT' . $selectOperator;
+                }
+                break;
+
+            case '()':
+                $selectOperator = ' IN(?)';
+                break;
+
+            case '!()':
+                $selectOperator = ' NOT IN(?)';
+                break;
+
+            default:
+                $selectOperator = '=?';
+                break;
+        }
+        $field = $this->_adapter->quoteIdentifier($field);
+
+        if (is_array($value) && in_array($operator, array('==', '!=', '>=', '<=', '>', '<'))) {
+            $results = array();
+            foreach ($value as $v) {
+                $results[] = $this->_adapter->quoteInto("{$field}{$selectOperator}", $v);
+            }
+            $result = implode(' AND ', $results);
+        } else {
+            $result = $this->_adapter->quoteInto("{$field}{$selectOperator}", $value);
+        }
+        return $result;
+    }
+}
diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php
index 1a5ff9c6336..35972cba3f0 100644
--- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php
+++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php
@@ -60,7 +60,9 @@ public function __construct()
         if ($this->_getBillingAgreement()->canCancel() && $this->_isAllowed('sales/billing_agreement/actions/manage')) {
             $this->_addButton('cancel', array(
                 'label'     => Mage::helper('adminhtml')->__('Cancel'),
-                'onclick'   => "confirmSetLocation('{$this->__('Are you sure you want to do this?')}', '{$this->_getCancelUrl()}')",
+                'onclick'   => "confirmSetLocation("
+                    . "'{$this->__('Are you sure you want to do this?')}', '{$this->_getCancelUrl()}'"
+                . ")",
                 'class'     => 'cancel',
             ), -1);
         }
diff --git a/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php b/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php
index 1eda9f65709..daec5650051 100644
--- a/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php
+++ b/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php
@@ -63,7 +63,10 @@ public function getRelatedOrders()
             $this->_relatedOrders = Mage::getResourceModel('sales/order_collection')
                 ->addFieldToSelect('*')
                 ->addFieldToFilter('customer_id', Mage::getSingleton('customer/session')->getCustomer()->getId())
-                ->addFieldToFilter('state', array('in' => Mage::getSingleton('sales/order_config')->getVisibleOnFrontStates()))
+                ->addFieldToFilter(
+                    'state',
+                    array('in' => Mage::getSingleton('sales/order_config')->getVisibleOnFrontStates())
+                )
                 ->addBillingAgreementsFilter($this->_billingAgreementInstance->getAgreementId())
                 ->setOrder('created_at', 'desc');
         }
@@ -89,7 +92,7 @@ public function getOrderItemValue(Mage_Sales_Model_Order $order, $key)
                 break;
             case 'shipping_address':
                 $value = $order->getShippingAddress()
-                    ? $this->htmlEscape($order->getShippingAddress()->getName()) : $this->__('N/A');
+                    ? $this->escapeHtml($order->getShippingAddress()->getName()) : $this->__('N/A');
                 break;
             case 'order_total':
                 $value = $order->formatPrice($order->getGrandTotal());
diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php b/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php
index 43227b166ee..41d3d45e0b6 100644
--- a/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php
+++ b/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php
@@ -65,9 +65,10 @@ public function getItemOptions()
     public function getValueHtml($value)
     {
         if (is_array($value)) {
-            return sprintf('%d', $value['qty']) . ' x ' . $this->htmlEscape($value['title']) . " " . $this->getItem()->getOrder()->formatPrice($value['price']);
+            return sprintf('%d', $value['qty']) . ' x ' . $this->escapeHtml($value['title']) . " "
+                . $this->getItem()->getOrder()->formatPrice($value['price']);
         } else {
-            return $this->htmlEscape($value);
+            return $this->escapeHtml($value);
         }
     }
 
diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php
index 3e945448736..57440b7a995 100644
--- a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php
+++ b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php
@@ -65,9 +65,10 @@ public function getItemOptions()
     public function getValueHtml($value)
     {
         if (is_array($value)) {
-            return sprintf('%d', $value['qty']) . ' x ' . $this->htmlEscape($value['title']) . " " . $this->getItem()->getOrder()->formatPrice($value['price']);
+            return sprintf('%d', $value['qty']) . ' x ' . $this->escapeHtml($value['title']) . " "
+                . $this->getItem()->getOrder()->formatPrice($value['price']);
         } else {
-            return $this->htmlEscape($value);
+            return $this->escapeHtml($value);
         }
     }
 
diff --git a/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php b/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php
index 0382a06473c..4e861cbf2a6 100644
--- a/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php
+++ b/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php
@@ -46,7 +46,6 @@ public function __construct()
             $this->setTemplate('sales/order/history.phtml');
             $this->initOrders();
         }
-
     }
 
     /**
@@ -120,10 +119,14 @@ public function getFormActionUrl()
     /**
      * Last order getter
      *
-     * @return Mage_Sales_Model_Order|false
+     * @return Mage_Sales_Model_Order|bool
      */
     public function getLastOrder()
     {
+        if (!$this->getOrders()) {
+            return false;
+        }
+
         foreach ($this->getOrders() as $order) {
             return $order;
         }
@@ -149,4 +152,31 @@ protected function _getCustomerSession()
     {
         return Mage::getSingleton('customer/session');
     }
+
+    /**
+     * Retrieve block cache tags
+     *
+     * @return array
+     */
+    public function getCacheTags()
+    {
+        return array_merge(
+            parent::getCacheTags(),
+            $this->getItemsTags($this->_getItemProducts())
+        );
+    }
+
+    /**
+     * Retrieve products list from items
+     *
+     * @return array
+     */
+    protected function _getItemProducts()
+    {
+        $products =  array();
+        foreach ($this->getItems() as $item) {
+            $products[] = $item->getProduct();
+        }
+        return $products;
+    }
 }
diff --git a/app/code/core/Mage/Sales/Model/Abstract.php b/app/code/core/Mage/Sales/Model/Abstract.php
index c56d934e133..d7affbc03af 100644
--- a/app/code/core/Mage/Sales/Model/Abstract.php
+++ b/app/code/core/Mage/Sales/Model/Abstract.php
@@ -45,12 +45,12 @@ abstract public function getStore();
      *
      * @return Mage_Core_Model_Abstract
      */
-    protected function _afterSave()
+    public function afterCommitCallback()
     {
         if (!$this->getForceUpdateGridRecords()) {
             $this->_getResource()->updateGridRecords($this->getId());
         }
-        return parent::_afterSave();
+        return parent::afterCommitCallback();
     }
 
     /**
diff --git a/app/code/core/Mage/Sales/Model/Billing/Agreement.php b/app/code/core/Mage/Sales/Model/Billing/Agreement.php
index 4060da21bdf..dfd8c0658ea 100644
--- a/app/code/core/Mage/Sales/Model/Billing/Agreement.php
+++ b/app/code/core/Mage/Sales/Model/Billing/Agreement.php
@@ -140,6 +140,18 @@ public function verifyToken()
         return $this;
     }
 
+    /**
+     * Check for permissions
+     *
+     * @param int $customerIdSession
+     * @return boolean
+     */
+    public function canPerformAction($customerIdSession)
+    {
+        // Get the customer id from billing agreement and compare to logged in customer id
+        return ((int)$this->getCustomerId() === (int)$customerIdSession) ? true : false;
+    }
+
     /**
      * Create billing agreement
      *
diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address.php
index 329227719ef..31f9e5d775d 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address.php
@@ -47,7 +47,7 @@ public function collectTotals(Mage_Sales_Model_Quote_Address $address)
         $attributes = $this->loadAllAttributes()->getAttributesByCode();
         foreach ($attributes as $attrCode=>$attr) {
             $backend = $attr->getBackend();
-            if (is_callable(array($backend, 'collectTotals'))) {
+            if (method_exists($backend, 'collectTotals')) {
                 $backend->collectTotals($address);
             }
         }
@@ -59,7 +59,7 @@ public function fetchTotals(Mage_Sales_Model_Quote_Address $address)
         $attributes = $this->loadAllAttributes()->getAttributesByCode();
         foreach ($attributes as $attrCode=>$attr) {
             $frontend = $attr->getFrontend();
-            if (is_callable(array($frontend, 'fetchTotals'))) {
+            if (method_exists($frontend, 'fetchTotals')) {
                 $frontend->fetchTotals($address);
             }
         }
diff --git a/app/code/core/Mage/Sales/Model/Observer.php b/app/code/core/Mage/Sales/Model/Observer.php
index 02f2c20960a..a1fd460127f 100644
--- a/app/code/core/Mage/Sales/Model/Observer.php
+++ b/app/code/core/Mage/Sales/Model/Observer.php
@@ -418,6 +418,7 @@ public function changeQuoteCustomerGroupId(Varien_Event_Observer $observer)
         $quoteAddress = $observer->getQuoteAddress();
         $quoteInstance = $quoteAddress->getQuote();
         $customerInstance = $quoteInstance->getCustomer();
+        $isDisableAutoGroupChange = $customerInstance->getDisableAutoGroupChange();
 
         $storeId = $customerInstance->getStore();
 
@@ -437,7 +438,9 @@ public function changeQuoteCustomerGroupId(Varien_Event_Observer $observer)
         $customerCountryCode = $quoteAddress->getCountryId();
         $customerVatNumber = $quoteAddress->getVatId();
 
-        if (empty($customerVatNumber) || !Mage::helper('core')->isCountryInEU($customerCountryCode)) {
+        if ((empty($customerVatNumber) || !Mage::helper('core')->isCountryInEU($customerCountryCode))
+            && !$isDisableAutoGroupChange
+        ) {
             $groupId = ($customerInstance->getId()) ? $customerHelper->getDefaultCustomerGroupId($storeId)
                 : Mage_Customer_Model_Group::NOT_LOGGED_IN_ID;
 
@@ -485,9 +488,13 @@ public function changeQuoteCustomerGroupId(Varien_Event_Observer $observer)
         }
 
         // Magento always has to emulate group even if customer uses default billing/shipping address
-        $groupId = $customerHelper->getCustomerGroupIdBasedOnVatNumber(
-            $customerCountryCode, $gatewayResponse, $customerInstance->getStore()
-        );
+        if (!$isDisableAutoGroupChange) {
+            $groupId = $customerHelper->getCustomerGroupIdBasedOnVatNumber(
+                $customerCountryCode, $gatewayResponse, $customerInstance->getStore()
+            );
+        } else {
+            $groupId = $quoteInstance->getCustomerGroupId();
+        }
 
         if ($groupId) {
             $quoteAddress->setPrevQuoteCustomerGroupId($quoteInstance->getCustomerGroupId());
diff --git a/app/code/core/Mage/Sales/Model/Order.php b/app/code/core/Mage/Sales/Model/Order.php
index 3dc877dc11b..545a83f870c 100644
--- a/app/code/core/Mage/Sales/Model/Order.php
+++ b/app/code/core/Mage/Sales/Model/Order.php
@@ -265,7 +265,6 @@
  * @method Mage_Sales_Model_Order setRelationParentRealId(string $value)
  * @method string getRemoteIp()
  * @method Mage_Sales_Model_Order setRemoteIp(string $value)
- * @method string getShippingMethod()
  * @method Mage_Sales_Model_Order setShippingMethod(string $value)
  * @method string getStoreCurrencyCode()
  * @method Mage_Sales_Model_Order setStoreCurrencyCode(string $value)
@@ -534,6 +533,9 @@ public function getStore()
      */
     public function canCancel()
     {
+        if (!$this->_canVoidOrder()) {
+            return false;
+        }
         if ($this->canUnhold()) {  // $this->isPaymentReview()
             return false;
         }
@@ -557,7 +559,6 @@ public function canCancel()
         if ($this->getActionFlag(self::ACTION_FLAG_CANCEL) === false) {
             return false;
         }
-
         /**
          * Use only state for availability detect
          */
@@ -572,18 +573,25 @@ public function canCancel()
 
     /**
      * Getter whether the payment can be voided
+     *
      * @return bool
      */
     public function canVoidPayment()
+    {
+        return $this->_canVoidOrder() ? $this->getPayment()->canVoid($this->getPayment()) : false;
+    }
+
+    /**
+     * Check whether order could be canceled by states and flags
+     *
+     * @return bool
+     */
+    protected function _canVoidOrder()
     {
         if ($this->canUnhold() || $this->isPaymentReview()) {
             return false;
         }
-        $state = $this->getState();
-        if ($this->isCanceled() || $state === self::STATE_COMPLETE || $state === self::STATE_CLOSED) {
-            return false;
-        }
-        return $this->getPayment()->canVoid(new Varien_Object);
+        return true;
     }
 
     /**
@@ -1053,7 +1061,7 @@ public function addStatusToHistory($status, $comment = '', $isCustomerNotified =
      *
      * @param string $comment
      * @param string $status
-     * @return Mage_Sales_Order_Status_History
+     * @return Mage_Sales_Model_Order_Status_History
      */
     public function addStatusHistoryComment($comment, $status = false)
     {
@@ -1151,7 +1159,7 @@ public function cancel()
      */
     public function registerCancellation($comment = '', $graceful = true)
     {
-        if ($this->canCancel()) {
+        if ($this->canCancel() || $this->isPaymentReview()) {
             $cancelState = self::STATE_CANCELED;
             foreach ($this->getAllItems() as $item) {
                 if ($cancelState != self::STATE_PROCESSING && $item->getQtyToRefund()) {
diff --git a/app/code/core/Mage/Sales/Model/Order/Api.php b/app/code/core/Mage/Sales/Model/Order/Api.php
index aaac1c6cb2c..d419495db6f 100644
--- a/app/code/core/Mage/Sales/Model/Order/Api.php
+++ b/app/code/core/Mage/Sales/Model/Order/Api.php
@@ -170,11 +170,12 @@ public function info($orderIncrementId)
      * @param boolean $notify
      * @return boolean
      */
-    public function addComment($orderIncrementId, $status, $comment = null, $notify = false)
+    public function addComment($orderIncrementId, $status, $comment = '', $notify = false)
     {
         $order = $this->_initOrder($orderIncrementId);
 
-        $order->addStatusToHistory($status, $comment, $notify);
+        $historyItem = $order->addStatusHistoryComment($comment, $status);
+        $historyItem->setIsCustomerNotified($notify)->save();
 
 
         try {
diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php
index 69e90bd3547..291603d6d40 100644
--- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php
+++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php
@@ -121,7 +121,7 @@ public function info($creditmemoIncrementId)
     /**
      * Create new credit memo for order
      *
-     * @param string $creditmemoIncrementId
+     * @param string $orderIncrementId
      * @param array $creditmemoData array('qtys' => array('sku1' => qty1, ... , 'skuN' => qtyN),
      *      'shipping_amount' => value, 'adjustment_positive' => value, 'adjustment_negative' => value)
      * @param string|null $comment
@@ -130,11 +130,11 @@ public function info($creditmemoIncrementId)
      * @param string $refundToStoreCreditAmount
      * @return string $creditmemoIncrementId
      */
-    public function create($creditmemoIncrementId, $creditmemoData = null, $comment = null, $notifyCustomer = false,
+    public function create($orderIncrementId, $creditmemoData = null, $comment = null, $notifyCustomer = false,
         $includeComment = false, $refundToStoreCreditAmount = null)
     {
         /** @var $order Mage_Sales_Model_Order */
-        $order = Mage::getModel('sales/order')->load($creditmemoIncrementId, 'increment_id');
+        $order = Mage::getModel('sales/order')->load($orderIncrementId, 'increment_id');
         if (!$order->getId()) {
             $this->_fault('order_not_exists');
         }
diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php
index 476e8d704e6..87ffae29a99 100644
--- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php
+++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php
@@ -82,8 +82,8 @@ public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo)
             }
         }
 
-        $creditmemo->setDiscountAmount($totalDiscountAmount);
-        $creditmemo->setBaseDiscountAmount($baseTotalDiscountAmount);
+        $creditmemo->setDiscountAmount(-$totalDiscountAmount);
+        $creditmemo->setBaseDiscountAmount(-$baseTotalDiscountAmount);
 
         $creditmemo->setGrandTotal($creditmemo->getGrandTotal() - $totalDiscountAmount);
         $creditmemo->setBaseGrandTotal($creditmemo->getBaseGrandTotal() - $baseTotalDiscountAmount);
diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php
index fafd10decb9..b0a893647b9 100644
--- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php
+++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php
@@ -83,9 +83,8 @@ public function collect(Mage_Sales_Model_Order_Invoice $invoice)
             }
         }
 
-
-        $invoice->setDiscountAmount($totalDiscountAmount);
-        $invoice->setBaseDiscountAmount($baseTotalDiscountAmount);
+        $invoice->setDiscountAmount(-$totalDiscountAmount);
+        $invoice->setBaseDiscountAmount(-$baseTotalDiscountAmount);
 
         $invoice->setGrandTotal($invoice->getGrandTotal() - $totalDiscountAmount);
         $invoice->setBaseGrandTotal($invoice->getBaseGrandTotal() - $baseTotalDiscountAmount);
diff --git a/app/code/core/Mage/Sales/Model/Order/Item.php b/app/code/core/Mage/Sales/Model/Order/Item.php
index dbd23a0637d..07a895d80f5 100644
--- a/app/code/core/Mage/Sales/Model/Order/Item.php
+++ b/app/code/core/Mage/Sales/Model/Order/Item.php
@@ -368,7 +368,6 @@ public function getQtyToRefund()
         if ($this->isDummy()) {
             return 0;
         }
-
         return max($this->getQtyInvoiced()-$this->getQtyRefunded(), 0);
     }
 
@@ -379,10 +378,49 @@ public function getQtyToRefund()
      */
     public function getQtyToCancel()
     {
-        $qtyToCancel = min($this->getQtyToInvoice(), $this->getQtyToShip());
+        if ($this->getProductType() == Mage_Catalog_Model_Product_Type::TYPE_BUNDLE) {
+            $qtyToCancel = $this->getQtyToCancelBundle();
+        } elseif ($this->getParentItem()
+            && $this->getParentItem()->getProductType() == Mage_Catalog_Model_Product_Type::TYPE_BUNDLE
+        ) {
+            $qtyToCancel = $this->getQtyToCancelBundleItem();
+        } else {
+            $qtyToCancel = min($this->getQtyToInvoice(), $this->getQtyToShip());
+        }
         return max($qtyToCancel, 0);
     }
 
+    /**
+     * Retrieve Bundle item qty available for cancel
+     * getQtyToInvoice() will always deliver 0 for Bundle
+     *
+     * @return float|integer
+     */
+    public function getQtyToCancelBundle()
+    {
+        if ($this->isDummy()) {
+            $qty = $this->getQtyOrdered()
+                - $this->getQtyInvoiced()
+                - $this->getQtyCanceled();
+            return min(max($qty, 0), $this->getQtyToShip());
+        }
+        return min($this->getQtyToInvoice(), $this->getQtyToShip());
+    }
+
+    /**
+     * Retrieve Bundle child item qty available for cancel
+     * getQtyToShip() always returns 0 for BundleItems that ship together
+     *
+     * @return float|integer
+     */
+    public function getQtyToCancelBundleItem()
+    {
+        if ($this->isDummy(true)) {
+            return min($this->getQtyToInvoice(), $this->getSimpleQtyToShip());
+        }
+        return min($this->getQtyToInvoice(), $this->getQtyToShip());
+    }
+
     /**
      * Declare order
      *
@@ -511,8 +549,14 @@ public function cancel()
         if ($this->getStatusId() !== self::STATUS_CANCELED) {
             Mage::dispatchEvent('sales_order_item_cancel', array('item'=>$this));
             $this->setQtyCanceled($this->getQtyToCancel());
-            $this->setTaxCanceled($this->getTaxCanceled() + $this->getBaseTaxAmount() * $this->getQtyCanceled() / $this->getQtyOrdered());
-            $this->setHiddenTaxCanceled($this->getHiddenTaxCanceled() + $this->getHiddenTaxAmount() * $this->getQtyCanceled() / $this->getQtyOrdered());
+            $this->setTaxCanceled(
+                $this->getTaxCanceled() +
+                $this->getBaseTaxAmount() * $this->getQtyCanceled() / $this->getQtyOrdered()
+            );
+            $this->setHiddenTaxCanceled(
+                $this->getHiddenTaxCanceled() +
+                $this->getHiddenTaxAmount() * $this->getQtyCanceled() / $this->getQtyOrdered()
+            );
         }
         return $this;
     }
diff --git a/app/code/core/Mage/Sales/Model/Order/Payment.php b/app/code/core/Mage/Sales/Model/Order/Payment.php
index e3c84ccc283..9004b04b097 100644
--- a/app/code/core/Mage/Sales/Model/Order/Payment.php
+++ b/app/code/core/Mage/Sales/Model/Order/Payment.php
@@ -155,12 +155,20 @@
 class Mage_Sales_Model_Order_Payment extends Mage_Payment_Model_Info
 {
     /**
-     * Actions for payment when it triggered review state
+     * Actions for payment when it triggered review state:
      *
-     * @var string
+     * Accept action
      */
     const REVIEW_ACTION_ACCEPT = 'accept';
+
+    /**
+     * Deny action
+     */
     const REVIEW_ACTION_DENY   = 'deny';
+
+    /**
+     * Update action
+     */
     const REVIEW_ACTION_UPDATE = 'update';
 
     /**
@@ -190,7 +198,18 @@ class Mage_Sales_Model_Order_Payment extends Mage_Payment_Model_Info
      */
     protected $_transactionsLookup = array();
 
+    /**
+     * Event prefix
+     *
+     * @var string
+     */
     protected $_eventPrefix = 'sales_order_payment';
+
+    /**
+     * Event object
+     *
+     * @var string
+     */
     protected $_eventObject = 'payment';
 
     /**
@@ -251,16 +270,31 @@ public function canCapture()
         return true;
     }
 
+    /**
+     * Check whether refund could be done
+     *
+     * @return bool
+     */
     public function canRefund()
     {
         return $this->getMethodInstance()->canRefund();
     }
 
+    /**
+     * Check whether partial refund could be done
+     *
+     * @return bool
+     */
     public function canRefundPartialPerInvoice()
     {
         return $this->getMethodInstance()->canRefundPartialPerInvoice();
     }
 
+    /**
+     * Check whether partial capture could be done
+     *
+     * @return bool
+     */
     public function canCapturePartial()
     {
         return $this->getMethodInstance()->canCapturePartial();
@@ -284,10 +318,7 @@ public function place()
 
         $methodInstance = $this->getMethodInstance();
         $methodInstance->setStore($order->getStoreId());
-
         $orderState = Mage_Sales_Model_Order::STATE_NEW;
-        $orderStatus= false;
-
         $stateObject = new Varien_Object();
 
         /**
@@ -343,13 +374,11 @@ public function place()
             if ($message) {
                 $order->addStatusToHistory($order->getStatus(), $message, $isCustomerNotified);
             }
-        }
-        // add message to history if order state already declared
-        elseif ($order->getState() && ($orderStatus !== $order->getStatus() || $message)) {
+        } elseif ($order->getState() && ($orderStatus !== $order->getStatus() || $message)) {
+            // add message to history if order state already declared
             $order->setState($orderState, $orderStatus, $message, $isCustomerNotified);
-        }
-        // set order state
-        elseif (($order->getState() != $orderState) || ($order->getStatus() != $orderStatus) || $message) {
+        } elseif (($order->getState() != $orderState) || ($order->getStatus() != $orderStatus) || $message) {
+            // set order state
             $order->setState($orderState, $orderStatus, $message, $isCustomerNotified);
         }
 
@@ -451,9 +480,10 @@ public function capture($invoice)
      * TODO: eliminate logic duplication with capture()
      *
      * @param float $amount
+     * @param bool $skipFraudDetection
      * @return Mage_Sales_Model_Order_Payment
      */
-    public function registerCaptureNotification($amount)
+    public function registerCaptureNotification($amount, $skipFraudDetection = false)
     {
         $this->_generateTransactionId(Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE,
             $this->getAuthorizationTransaction()
@@ -470,7 +500,9 @@ public function registerCaptureNotification($amount)
                 $order->addRelatedObject($invoice);
                 $this->setCreatedInvoice($invoice);
             } else {
-                $this->setIsFraudDetected(true);
+                if (!$skipFraudDetection) {
+                    $this->setIsFraudDetected(true);
+                }
                 $this->_updateTotals(array('base_amount_paid_online' => $amount));
             }
         }
@@ -728,8 +760,8 @@ public function registerRefundNotification($amount)
             $amount = $amountRefundLeft;
         }
 
-        if ($amount <= 0) {
-            $order->addStatusHistoryComment(Mage::helper('sales')->__('IPN "Refunded". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: "%s"', $this->_formatPrice($notificationAmount), $this->getTransactionId()), false);
+        if ($amount != $baseGrandTotal) {
+            $order->addStatusHistoryComment(Mage::helper('sales')->__('IPN "Refunded". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: "%s". Credit Memo has not been created. Please create offline Credit Memo.', $this->_formatPrice($notificationAmount), $this->getTransactionId()), false);
             return $this;
         }
 
@@ -808,7 +840,7 @@ public function cancelCreditmemo($creditmemo)
     public function cancel()
     {
         $isOnline = true;
-        if (!$this->canVoid(new Varien_Object())) {
+        if (!$this->canVoid($this)) {
             $isOnline = false;
         }
 
@@ -837,6 +869,11 @@ public function canReviewPayment()
         return (bool)$this->getMethodInstance()->canReviewPayment($this);
     }
 
+    /**
+     * Check whether fetching info of transaction could be done
+     *
+     * @return bool
+     */
     public function canFetchTransactionInfo()
     {
         return (bool)$this->getMethodInstance()->canFetchTransactionInfo();
@@ -940,7 +977,15 @@ public function registerPaymentReviewAction($action, $isOnline)
 
         // process payment in case of positive or negative result, or add a comment
         if (-1 === $result) { // switch won't work with such $result!
-            $order->addStatusHistoryComment($message);
+            if ($order->getState() != Mage_Sales_Model_Order::STATE_PAYMENT_REVIEW) {
+                $status = $this->getIsFraudDetected() ? Mage_Sales_Model_Order::STATUS_FRAUD : false;
+                $order->setState(Mage_Sales_Model_Order::STATE_PAYMENT_REVIEW, $status, $message);
+                if ($transactionId) {
+                    $this->setLastTransId($transactionId);
+                }
+            } else {
+                $order->addStatusHistoryComment($message);
+            }
         } elseif (true === $result) {
             if ($invoice) {
                 $invoice->pay();
@@ -1013,6 +1058,12 @@ protected function _order($amount)
      */
     protected function _authorize($isOnline, $amount)
     {
+        // check for authorization amount to be equal to grand total
+        $this->setShouldCloseParentTransaction(false);
+        if (!$this->_isCaptureFinal($amount)) {
+            $this->setIsFraudDetected(true);
+        }
+
         // update totals
         $amount = $this->_formatAmount($amount, true);
         $this->setBaseAmountAuthorized($amount);
@@ -1034,7 +1085,13 @@ protected function _authorize($isOnline, $amount)
                 $status = Mage_Sales_Model_Order::STATUS_FRAUD;
             }
         } else {
-            $message = Mage::helper('sales')->__('Authorized amount of %s.', $this->_formatPrice($amount));
+            if ($this->getIsFraudDetected()) {
+                $state = Mage_Sales_Model_Order::STATE_PAYMENT_REVIEW;
+                $message = Mage::helper('sales')->__('Order is suspended as its authorizing amount %s is suspected to be fraudulent.', $this->_formatPrice($amount));
+                $status = Mage_Sales_Model_Order::STATUS_FRAUD;
+            } else {
+                $message = Mage::helper('sales')->__('Authorized amount of %s.', $this->_formatPrice($amount));
+            }
         }
 
         // update transactions, order state and add comments
@@ -1453,7 +1510,8 @@ protected function _generateTransactionId($type, $transactionBasedOn = false)
             $this->setParentTransactionId($transactionBasedOn->getTxnId());
         }
         // generate transaction id for an offline action or payment method that didn't set it
-        if (($parentTxnId = $this->getParentTransactionId()) && !$this->getTransactionId()) {
+        $parentTxnId = $this->getParentTransactionId();
+        if ($parentTxnId && !$this->getTransactionId()) {
             $this->setTransactionId("{$parentTxnId}-{$type}");
         }
     }
diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php
index b16b39c631d..5db318789ce 100644
--- a/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php
+++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php
@@ -727,6 +727,28 @@ public function getRenderer($type)
         return $this->_getRenderer($type);
     }
 
+    /**
+     * Render item
+     *
+     * @param Varien_Object $item
+     * @param Zend_Pdf_Page $page
+     * @param Mage_Sales_Model_Order $order
+     * @param Mage_Sales_Model_Order_Pdf_Items_Abstract $renderer
+     *
+     * @return Mage_Sales_Model_Order_Pdf_Abstract
+     */
+    public function renderItem(Varien_Object $item, Zend_Pdf_Page $page, Mage_Sales_Model_Order $order, $renderer)
+    {
+        $renderer->setOrder($order)
+            ->setItem($item)
+            ->setPdf($this)
+            ->setPage($page)
+            ->setRenderedModel($this)
+            ->draw();
+
+        return $this;
+    }
+
     /**
      * Draw Item process
      *
@@ -737,15 +759,24 @@ public function getRenderer($type)
      */
     protected function _drawItem(Varien_Object $item, Zend_Pdf_Page $page, Mage_Sales_Model_Order $order)
     {
-        $type = $item->getOrderItem()->getProductType();
+        $orderItem = $item->getOrderItem();
+        $type = $orderItem->getProductType();
         $renderer = $this->_getRenderer($type);
-        $renderer->setOrder($order);
-        $renderer->setItem($item);
-        $renderer->setPdf($this);
-        $renderer->setPage($page);
-        $renderer->setRenderedModel($this);
 
-        $renderer->draw();
+        $this->renderItem($item, $page, $order, $renderer);
+
+        $transportObject = new Varien_Object(array('renderer_type_list' => array()));
+        Mage::dispatchEvent('pdf_item_draw_after', array(
+            'transport_object' => $transportObject,
+            'entity_item'      => $item
+        ));
+
+        foreach ($transportObject->getRendererTypeList() as $type) {
+            $renderer = $this->_getRenderer($type);
+            if ($renderer) {
+                $this->renderItem($orderItem, $page, $order, $renderer);
+            }
+        }
 
         return $renderer->getPage();
     }
diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php
index d92f0d460fc..0016bb815f3 100644
--- a/app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php
+++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php
@@ -50,7 +50,13 @@ public function getTotalsForDisplay()
         if ($this->getAmountPrefix()) {
             $amount = $this->getAmountPrefix().$amount;
         }
-        $label = Mage::helper('sales')->__($this->getTitle()) . ':';
+        $title = $this->_getSalesHelper()->__($this->getTitle());
+        if ($this->getTitleSourceField()) {
+            $label = $title . ' (' . $this->getTitleDescription() . '):';
+        } else {
+            $label = $title . ':';
+        }
+
         $fontSize = $this->getFontSize() ? $this->getFontSize() : 7;
         $total = array(
             'amount'    => $amount,
@@ -60,6 +66,14 @@ public function getTotalsForDisplay()
         return array($total);
     }
 
+    /**
+     * @return Mage_Sales_Helper_Data
+     */
+    protected function _getSalesHelper()
+    {
+        return Mage::helper('sales');
+    }
+
     /**
      * Get array of arrays with tax information for display in PDF
      * array(
@@ -73,22 +87,20 @@ public function getTotalsForDisplay()
      */
     public function getFullTaxInfo()
     {
-        $taxClassAmount = Mage::helper('tax')->getCalculatedTaxes($this->getOrder());
         $fontSize       = $this->getFontSize() ? $this->getFontSize() : 7;
+        $taxClassAmount = $this->_getCalculatedTaxes();
+        $shippingTax    = $this->_getShippingTax();
+        $taxClassAmount = array_merge($taxClassAmount, $shippingTax);
 
         if (!empty($taxClassAmount)) {
-            $shippingTax    = Mage::helper('tax')->getShippingTax($this->getOrder());
-            $taxClassAmount = array_merge($shippingTax, $taxClassAmount);
-
             foreach ($taxClassAmount as &$tax) {
                 $percent          = $tax['percent'] ? ' (' . $tax['percent']. '%)' : '';
-                $tax['amount']    = $this->getAmountPrefix().$this->getOrder()->formatPriceTxt($tax['tax_amount']);
-                $tax['label']     = Mage::helper('tax')->__($tax['title']) . $percent . ':';
+                $tax['amount']    = $this->getAmountPrefix() . $this->getOrder()->formatPriceTxt($tax['tax_amount']);
+                $tax['label']     = $this->_getTaxHelper()->__($tax['title']) . $percent . ':';
                 $tax['font_size'] = $fontSize;
             }
         } else {
-            $rates    = Mage::getResourceModel('sales/order_tax_collection')->loadByOrder($this->getOrder())->toArray();
-            $fullInfo = Mage::getSingleton('tax/calculation')->reproduceProcess($rates['items']);
+            $fullInfo = $this->_getFullRateInfo();
             $tax_info = array();
 
             if ($fullInfo) {
@@ -104,7 +116,7 @@ public function getFullTaxInfo()
 
                         $tax_info[] = array(
                             'amount'    => $this->getAmountPrefix() . $this->getOrder()->formatPriceTxt($_amount),
-                            'label'     => Mage::helper('tax')->__($rate['title']) . $percent . ':',
+                            'label'     => $this->_getTaxHelper()->__($rate['title']) . $percent . ':',
                             'font_size' => $fontSize
                         );
                     }
@@ -116,6 +128,46 @@ public function getFullTaxInfo()
         return $taxClassAmount;
     }
 
+    /**
+     * Get full rate info
+     *
+     * @return array
+     */
+    protected function _getFullRateInfo()
+    {
+        $rates = Mage::getModel('tax/sales_order_tax')->getCollection()->loadByOrder($this->getOrder())->toArray();
+        $fullInfo = Mage::getSingleton('tax/calculation')->reproduceProcess($rates['items']);
+        return $fullInfo;
+    }
+
+    /**
+     * @return Mage_Tax_Helper_Data
+     */
+    protected function _getTaxHelper()
+    {
+        return Mage::helper('tax');
+    }
+
+    /**
+     * Get shipping tax
+     *
+     * @return array
+     */
+    protected function _getShippingTax()
+    {
+        return $this->_getTaxHelper()->getShippingTax($this->getOrder());
+    }
+
+    /**
+     * Get calculated taxes
+     *
+     * @return array
+     */
+    protected function _getCalculatedTaxes()
+    {
+        return $this->_getTaxHelper()->getCalculatedTaxes($this->getOrder());
+    }
+
     /**
      * Check if we can display total information in PDF
      *
@@ -136,4 +188,14 @@ public function getAmount()
     {
         return $this->getSource()->getDataUsingMethod($this->getSourceField());
     }
+
+    /**
+     * Get title description from source
+     *
+     * @return mixed
+     */
+    public function getTitleDescription()
+    {
+        return $this->getSource()->getDataUsingMethod($this->getTitleSourceField());
+    }
 }
diff --git a/app/code/core/Mage/Sales/Model/Quote.php b/app/code/core/Mage/Sales/Model/Quote.php
index 8325c20144c..a55d9f3f1e2 100644
--- a/app/code/core/Mage/Sales/Model/Quote.php
+++ b/app/code/core/Mage/Sales/Model/Quote.php
@@ -141,6 +141,15 @@ class Mage_Sales_Model_Quote extends Mage_Core_Model_Abstract
     protected $_eventPrefix = 'sales_quote';
     protected $_eventObject = 'quote';
 
+    /**
+     * Model cache tag for clear cache in after save and after delete
+     *
+     * When you use true - all cache will be clean
+     *
+     * @var string || true
+     */
+    protected $_cacheTag = 'quote';
+
     /**
      * Quote customer model object
      *
@@ -548,7 +557,7 @@ public function getBillingAddress()
     }
 
     /**
-     * retrieve quote shipping address
+     * Retrieve quote shipping address
      *
      * @return Mage_Sales_Model_Quote_Address
      */
@@ -627,11 +636,40 @@ public function removeAddress($addressId)
         return $this;
     }
 
+    /**
+     * Leave no more than one billing and one shipping address, fill them with default data
+     *
+     * @return Mage_Sales_Model_Quote
+     */
     public function removeAllAddresses()
     {
-        foreach ($this->getAddressesCollection() as $address) {
+        $addressByType = array();
+        $addressesCollection = $this->getAddressesCollection();
+
+        // mark all addresses as deleted
+        foreach ($addressesCollection as $address) {
+            $type = $address->getAddressType();
+            if (!isset($addressByType[$type]) || $addressByType[$type]->getId() > $address->getId()) {
+                $addressByType[$type] = $address;
+            }
             $address->isDeleted(true);
         }
+
+        // create new billing and shipping addresses filled with default values, set this data to existing records
+        foreach ($addressByType as $type => $address) {
+            $id = $address->getId();
+            $emptyAddress = $this->_getAddressByType($type);
+            $address->setData($emptyAddress->getData())->setId($id)->isDeleted(false);
+            $emptyAddress->setDeleteImmediately(true);
+        }
+
+        // remove newly created billing and shipping addresses from collection to avoid senseless delete queries
+        foreach ($addressesCollection as $key => $item) {
+            if ($item->getDeleteImmediately()) {
+                $addressesCollection->removeItemByKey($key);
+            }
+        }
+
         return $this;
     }
 
@@ -795,6 +833,36 @@ public function getItemById($itemId)
         return $this->getItemsCollection()->getItemById($itemId);
     }
 
+    /**
+     * Delete quote item. If it does not have identifier then it will be only removed from collection
+     *
+     * @param   Mage_Sales_Model_Quote_Item $item
+     * @return  Mage_Sales_Model_Quote
+     */
+    public function deleteItem(Mage_Sales_Model_Quote_Item $item)
+    {
+        if ($item->getId()) {
+            $this->removeItem($item->getId());
+        } else {
+            $quoteItems = $this->getItemsCollection();
+            $items = array($item);
+            if ($item->getHasChildren()) {
+                foreach ($item->getChildren() as $child) {
+                    $items[] = $child;
+                }
+            }
+            foreach ($quoteItems as $key => $quoteItem) {
+                foreach ($items as $item) {
+                    if ($quoteItem->compare($item)) {
+                        $quoteItems->removeItemByKey($key);
+                    }
+                }
+            }
+        }
+
+        return $this;
+    }
+
     /**
      * Remove quote item by item identifier
      *
diff --git a/app/code/core/Mage/Sales/Model/Quote/Address.php b/app/code/core/Mage/Sales/Model/Quote/Address.php
index be1bab12b62..ec1dc98caec 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Address.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Address.php
@@ -110,6 +110,8 @@
  * @method Mage_Sales_Model_Quote_Address setCustomerNotes(string $value)
  * @method string getDiscountDescription()
  * @method Mage_Sales_Model_Quote_Address setDiscountDescription(string $value)
+ * @method null|array getDiscountDescriptionArray()
+ * @method Mage_Sales_Model_Quote_Address setDiscountDescriptionArray(array $value)
  * @method float getShippingDiscountAmount()
  * @method Mage_Sales_Model_Quote_Address setShippingDiscountAmount(float $value)
  * @method float getBaseShippingDiscountAmount()
@@ -139,8 +141,10 @@
  */
 class Mage_Sales_Model_Quote_Address extends Mage_Customer_Model_Address_Abstract
 {
-    const RATES_FETCH = 1;
-    const RATES_RECALCULATE = 2;
+    /**
+     * Default value for Destination street
+     */
+    const DEFAULT_DEST_STREET = -1;
 
     /**
      * Prefix of model events
@@ -180,7 +184,7 @@ class Mage_Sales_Model_Quote_Address extends Mage_Customer_Model_Address_Abstrac
     /**
      * Total models collector
      *
-     * @var Mage_Sales_Model_Quote_Address_Totla_Collector
+     * @var Mage_Sales_Model_Quote_Address_Total_Collector
      */
     protected $_totalCollector = null;
 
@@ -191,7 +195,18 @@ class Mage_Sales_Model_Quote_Address extends Mage_Customer_Model_Address_Abstrac
      */
     protected $_totals = array();
 
+    /**
+     * Total amounts
+     *
+     * @var array
+     */
     protected $_totalAmounts = array();
+
+    /**
+     * Total base amounts
+     *
+     * @var array
+     */
     protected $_baseTotalAmounts = array();
 
     /**
@@ -221,34 +236,79 @@ protected function _initOldFieldsMap()
     }
 
     /**
-     * Initialize quote identifier before save
+     * Initialize Quote identifier before save
      *
      * @return Mage_Sales_Model_Quote_Address
      */
     protected function _beforeSave()
     {
         parent::_beforeSave();
+        $this->_populateBeforeSaveData();
+        return $this;
+    }
+
+    /**
+     * Set the required fields
+     */
+    protected function _populateBeforeSaveData()
+    {
         if ($this->getQuote()) {
-            $quoteId = $this->getQuote()->getId();
-            if ($quoteId) {
-                $this->setQuoteId($quoteId);
-            } else {
-                $this->_dataSaveAllowed = false;
+            $this->_dataSaveAllowed = (bool)$this->getQuote()->getId();
+
+            if ($this->getQuote()->getId()) {
+                $this->setQuoteId($this->getQuote()->getId());
             }
             $this->setCustomerId($this->getQuote()->getCustomerId());
+
             /**
              * Init customer address id if customer address is assigned
              */
             if ($this->getCustomerAddress()) {
                 $this->setCustomerAddressId($this->getCustomerAddress()->getId());
             }
+
+            /**
+             * Set same_as_billing to "1" when default shipping address is set as default
+             * and it is not equal billing address
+             */
+            if (!$this->getId()) {
+                $this->setSameAsBilling((int)$this->_isSameAsBilling());
+            }
         }
-        if ($this->getAddressType() == Mage_Sales_Model_Quote_Address::TYPE_SHIPPING
-            && $this->getSameAsBilling() === null
-        ) {
-            $this->setSameAsBilling(1);
-        }
-        return $this;
+    }
+
+    /**
+     * Returns true if the billing address is same as the shipping
+     *
+     * @return bool
+     */
+    protected function _isSameAsBilling()
+    {
+        return ($this->getAddressType() == Mage_Sales_Model_Quote_Address::TYPE_SHIPPING
+            && ($this->_isNotRegisteredCustomer() || $this->_isDefaultShippingNullOrSameAsBillingAddress()));
+    }
+
+    /**
+     * Checks if the user is a registered customer
+     *
+     * @return bool
+     */
+    protected function _isNotRegisteredCustomer()
+    {
+        return !$this->getQuote()->getCustomerId() || $this->getCustomerAddressId() === null;
+    }
+
+    /**
+     * Returns true if the def billing address is same as customer address
+     *
+     * @return bool
+     */
+    protected function _isDefaultShippingNullOrSameAsBillingAddress()
+    {
+        $customer = $this->getQuote()->getCustomer();
+        return !$customer->getDefaultShippingAddress()
+            || $customer->getDefaultBillingAddress() && $customer->getDefaultShippingAddress()
+                && $customer->getDefaultBillingAddress()->getId() == $customer->getDefaultShippingAddress()->getId();
     }
 
     /**
@@ -302,9 +362,8 @@ public function importCustomerAddress(Mage_Customer_Model_Address $address)
         Mage::helper('core')->copyFieldset('customer_address', 'to_quote_address', $address, $this);
         $email = null;
         if ($address->hasEmail()) {
-            $email =  $address->getEmail();
-        }
-        elseif ($address->getCustomer()) {
+            $email = $address->getEmail();
+        } elseif ($address->getCustomer()) {
             $email = $address->getCustomer()->getEmail();
         }
         if ($email) {
@@ -354,7 +413,7 @@ public function toArray(array $arrAttributes = array())
         $arr = parent::toArray($arrAttributes);
         $arr['rates'] = $this->getShippingRatesCollection()->toArray($arrAttributes);
         $arr['items'] = $this->getItemsCollection()->toArray($arrAttributes);
-        foreach ($this->getTotals() as $k=>$total) {
+        foreach ($this->getTotals() as $k => $total) {
             $arr['totals'][$k] = $total->toArray();
         }
         return $arr;
@@ -563,7 +622,7 @@ public function hasItems()
     public function getItemById($itemId)
     {
         foreach ($this->getItemsCollection() as $item) {
-            if ($item->getId()==$itemId) {
+            if ($item->getId() == $itemId) {
                 return $item;
             }
         }
@@ -579,7 +638,7 @@ public function getItemById($itemId)
     public function getValidItemById($itemId)
     {
         foreach ($this->getAllItems() as $item) {
-            if ($item->getId()==$itemId) {
+            if ($item->getId() == $itemId) {
                 return $item;
             }
         }
@@ -595,7 +654,7 @@ public function getValidItemById($itemId)
     public function getItemByQuoteItemId($itemId)
     {
         foreach ($this->getItemsCollection() as $item) {
-            if ($item->getQuoteItemId()==$itemId) {
+            if ($item->getQuoteItemId() == $itemId) {
                 return $item;
             }
         }
@@ -624,7 +683,7 @@ public function removeItem($itemId)
      * @param   int $qty
      * @return  Mage_Sales_Model_Quote_Address
      */
-    public function addItem(Mage_Sales_Model_Quote_Item_Abstract $item, $qty=null)
+    public function addItem(Mage_Sales_Model_Quote_Item_Abstract $item, $qty = null)
     {
         if ($item instanceof Mage_Sales_Model_Quote_Item) {
             if ($item->getParentItemId()) {
@@ -644,8 +703,7 @@ public function addItem(Mage_Sales_Model_Quote_Item_Abstract $item, $qty=null)
                     $this->getItemsCollection()->addItem($addressChildItem);
                 }
             }
-        }
-        else {
+        } else {
             $addressItem = $item;
             $addressItem->setAddress($this);
             if (!$addressItem->getId()) {
@@ -730,11 +788,9 @@ protected function _sortRates($a, $b)
     {
         if ((int)$a[0]->carrier_sort_order < (int)$b[0]->carrier_sort_order) {
             return -1;
-        }
-        elseif ((int)$a[0]->carrier_sort_order > (int)$b[0]->carrier_sort_order) {
+        } elseif ((int)$a[0]->carrier_sort_order > (int)$b[0]->carrier_sort_order) {
             return 1;
-        }
-        else {
+        } else {
             return 0;
         }
     }
@@ -748,7 +804,7 @@ protected function _sortRates($a, $b)
     public function getShippingRateById($rateId)
     {
         foreach ($this->getShippingRatesCollection() as $rate) {
-            if ($rate->getId()==$rateId) {
+            if ($rate->getId() == $rateId) {
                 return $rate;
             }
         }
@@ -764,7 +820,7 @@ public function getShippingRateById($rateId)
     public function getShippingRateByCode($code)
     {
         foreach ($this->getShippingRatesCollection() as $rate) {
-            if ($rate->getCode()==$code) {
+            if ($rate->getCode() == $code) {
                 return $rate;
             }
         }
@@ -846,7 +902,7 @@ public function requestShippingRates(Mage_Sales_Model_Quote_Item_Abstract $item
          * need to call getStreet with -1
          * to get data in string instead of array
          */
-        $request->setDestStreet($this->getStreet(-1));
+        $request->setDestStreet($this->getStreet(self::DEFAULT_DEST_STREET));
         $request->setDestCity($this->getCity());
         $request->setDestPostcode($this->getPostcode());
         $request->setPackageValue($item ? $item->getBaseRowTotal() : $this->getBaseSubtotal());
@@ -883,7 +939,7 @@ public function requestShippingRates(Mage_Sales_Model_Quote_Item_Abstract $item
         $request->setPackageCurrency($this->getQuote()->getStore()->getCurrentCurrency());
         $request->setLimitCarrier($this->getLimitCarrier());
 
-        $request->setBaseSubtotalInclTax($this->getBaseSubtotalInclTax());
+        $request->setBaseSubtotalInclTax($this->getBaseSubtotalInclTax() + $this->getBaseExtraTaxAmount());
 
         $result = Mage::getModel('shipping/shipping')->collectRates($request)->getResult();
 
@@ -928,7 +984,7 @@ public function getTotalCollector()
         if ($this->_totalCollector === null) {
             $this->_totalCollector = Mage::getSingleton(
                 'sales/quote_address_total_collector',
-                array('store'=>$this->getQuote()->getStore())
+                array('store' => $this->getQuote()->getStore())
             );
         }
         return $this->_totalCollector;
@@ -1016,8 +1072,7 @@ public function validateMinimumAmount()
 
         if ($this->getQuote()->getIsVirtual() && $this->getAddressType() == self::TYPE_SHIPPING) {
             return true;
-        }
-        elseif (!$this->getQuote()->getIsVirtual() && $this->getAddressType() != self::TYPE_SHIPPING) {
+        } elseif (!$this->getQuote()->getIsVirtual() && $this->getAddressType() != self::TYPE_SHIPPING) {
             return true;
         }
 
diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Item.php b/app/code/core/Mage/Sales/Model/Quote/Address/Item.php
index f1170f9ef63..4fdac816054 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Address/Item.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Address/Item.php
@@ -165,7 +165,12 @@ public function getQuote()
         return $this->_quote;
     }
 
-
+    /**
+     * Import item to quote
+     *
+     * @param Mage_Sales_Model_Quote_Item $quoteItem
+     * @return Mage_Sales_Model_Quote_Address_Item
+     */
     public function importQuoteItem(Mage_Sales_Model_Quote_Item $quoteItem)
     {
         $this->_quote = $quoteItem->getQuote();
@@ -178,6 +183,7 @@ public function importQuoteItem(Mage_Sales_Model_Quote_Item $quoteItem)
             ->setDescription($quoteItem->getDescription())
             ->setWeight($quoteItem->getWeight())
             ->setPrice($quoteItem->getPrice())
+            ->setIsQtyDecimal($quoteItem->getIsQtyDecimal())
             ->setCost($quoteItem->getCost());
 
         if (!$this->hasQty()) {
diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php
index ffa168074bb..602e35d7ec8 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php
@@ -24,7 +24,13 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-
+/**
+ * Model to calculate grand total or an order
+ *
+ * @category    Mage
+ * @package     Mage_Sales
+ * @author      Magento Core Team
+ */
 class Mage_Sales_Model_Quote_Address_Total_Grand extends Mage_Sales_Model_Quote_Address_Total_Abstract
 {
     /**
@@ -38,8 +44,11 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
         $grandTotal     = $address->getGrandTotal();
         $baseGrandTotal = $address->getBaseGrandTotal();
 
+        $store      = $address->getQuote()->getStore();
         $totals     = array_sum($address->getAllTotalAmounts());
+        $totals     = $store->roundPrice($totals);
         $baseTotals = array_sum($address->getAllBaseTotalAmounts());
+        $baseTotals = $store->roundPrice($baseTotals);
 
         $address->setGrandTotal($grandTotal+$totals);
         $address->setBaseGrandTotal($baseGrandTotal+$baseTotals);
diff --git a/app/code/core/Mage/Sales/Model/Quote/Item.php b/app/code/core/Mage/Sales/Model/Quote/Item.php
index 7b676ff2e84..76ace7c3e80 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Item.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Item.php
@@ -126,6 +126,9 @@
  * @method Mage_Sales_Model_Quote_Item setHiddenTaxAmount(float $value)
  * @method float getBaseHiddenTaxAmount()
  * @method Mage_Sales_Model_Quote_Item setBaseHiddenTaxAmount(float $value)
+ * @method null|bool getHasConfigurationUnavailableError()
+ * @method Mage_Sales_Model_Quote_Item setHasConfigurationUnavailableError(bool $value)
+ * @method Mage_Sales_Model_Quote_Item unsHasConfigurationUnavailableError()
  *
  * @category    Mage
  * @package     Mage_Sales
@@ -357,23 +360,6 @@ public function setQtyOptions($qtyOptions)
         return $this->setData('qty_options', $qtyOptions);
     }
 
-    /**
-     * Checking item data
-     *
-     * @return Mage_Sales_Model_Quote_Item_Abstract
-     */
-    public function checkData()
-    {
-        $parent = parent::checkData();
-        if ($this->getProduct()->getHasError()) {
-            $this->setHasError(true);
-            $this->setMessage(Mage::helper('sales')->__('Item options declaration error.'));
-            $this->getQuote()->setHasError(true);
-            $this->getQuote()->addMessage($this->getProduct()->getMessage(), 'options');
-        }
-        return $parent;
-    }
-
     /**
      * Setup product for quote item
      *
@@ -635,11 +621,9 @@ public function addOption($option)
      * Exemple: cataloginventory decimal qty validation may change qty to int,
      * so need to change quote item qty option value.
      *
-     * @param array         $options
      * @param Varien_Object $option
-     * @param mixed         $value
-     *
-     * @return object       Mage_Catalog_Model_Product_Type_Abstract
+     * @param int|float|null $value
+     * @return Mage_Sales_Model_Quote_Item
      */
     public function updateQtyOption(Varien_Object $option, $value)
     {
diff --git a/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php b/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php
index eeab9d5c415..968c1378f4f 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php
@@ -60,7 +60,7 @@ abstract function getQuote();
     public function getProduct()
     {
         $product = $this->_getData('product');
-        if (($product === null) && $this->getProductId()) {
+        if ($product === null && $this->getProductId()) {
             $product = Mage::getModel('catalog/product')
                 ->setStoreId($this->getQuote()->getStoreId())
                 ->load($this->getProductId());
@@ -261,17 +261,30 @@ public function checkData()
         try {
             $this->getProduct()->getTypeInstance(true)->checkProductBuyState($this->getProduct());
         } catch (Mage_Core_Exception $e) {
-            $this->setHasError(true);
-            $this->setMessage($e->getMessage());
-            $this->getQuote()->setHasError(true);
-            $this->getQuote()->addMessage(
-                Mage::helper('sales')->__('Some of the products below do not have all the required options. Please edit them and configure all the required options.')
-            );
+            $this->setHasError(true)
+                ->setMessage($e->getMessage());
+            $this->getQuote()->setHasError(true)
+                ->addMessage(Mage::helper('sales')->__('Some of the products below do not have all the required options.'));
         } catch (Exception $e) {
-            $this->setHasError(true);
-            $this->setMessage(Mage::helper('sales')->__('Item options declaration error.'));
-            $this->getQuote()->setHasError(true);
-            $this->getQuote()->addMessage(Mage::helper('sales')->__('Items options declaration error.'));
+            $this->setHasError(true)
+                ->setMessage(Mage::helper('sales')->__('Item options declaration error.'));
+            $this->getQuote()->setHasError(true)
+                ->addMessage(Mage::helper('sales')->__('Items options declaration error.'));
+        }
+
+        if ($this->getProduct()->getHasError()) {
+            $this->setHasError(true)
+                ->setMessage(Mage::helper('sales')->__('Some of the selected options are not currently available.'));
+            $this->getQuote()->setHasError(true)
+                ->addMessage($this->getProduct()->getMessage(), 'options');
+        }
+
+        if ($this->getHasConfigurationUnavailableError()) {
+            $this->setHasError(true)
+                ->setMessage(Mage::helper('sales')->__('Selected option(s) or their combination is not currently available.'));
+            $this->getQuote()->setHasError(true)
+                ->addMessage(Mage::helper('sales')->__('Some item options or their combination are not currently available.'), 'unavailable-configuration');
+            $this->unsHasConfigurationUnavailableError();
         }
 
         return $this;
diff --git a/app/code/core/Mage/Sales/Model/Quote/Payment.php b/app/code/core/Mage/Sales/Model/Quote/Payment.php
index be4db0c55d4..148fb08aeb4 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Payment.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Payment.php
@@ -143,11 +143,13 @@ public function importData(array $data)
 
         /**
          * Payment availability related with quote totals.
-         * We have recollect quote totals before checking
+         * We have to recollect quote totals before checking
          */
         $this->getQuote()->collectTotals();
 
-        if (!$method->isAvailable($this->getQuote())) {
+        if (!$method->isAvailable($this->getQuote())
+            || !$method->isApplicableToQuote($this->getQuote(), $data->getChecks())
+        ) {
             Mage::throwException(Mage::helper('sales')->__('The requested Payment Method is not available.'));
         }
 
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php
index 83a9f2ecd3b..89bf8ab918e 100755
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php
@@ -433,7 +433,7 @@ public function save(Mage_Core_Model_Abstract $object)
      *
      * @param string $field
      * @param int $entityId
-     * @return int
+     * @return Mage_Sales_Model_Resource_Order_Abstract
      */
     public function updateOnRelatedRecordChanged($field, $entityId)
     {
@@ -445,13 +445,13 @@ public function updateOnRelatedRecordChanged($field, $entityId)
         $this->joinVirtualGridColumnsToSelect('main_table', $select, $column);
         $fieldsToUpdate = $adapter->fetchRow($select);
         if ($fieldsToUpdate) {
-            return $adapter->update(
+            $adapter->update(
                 $this->getGridTable(),
                 $fieldsToUpdate,
                 $adapter->quoteInto($this->getGridTable() . '.' . $field . ' = ?', $entityId)
             );
         }
-        return 0;
+        return $this;
     }
 }
 
diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote.php b/app/code/core/Mage/Sales/Model/Resource/Quote.php
index fb37c3e90aa..a565945d53e 100755
--- a/app/code/core/Mage/Sales/Model/Resource/Quote.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Quote.php
@@ -181,23 +181,21 @@ public function isOrderIncrementIdUsed($orderIncrementId)
      */
     public function markQuotesRecollectOnCatalogRules()
     {
-        $tableQuote = $this->getTable('sales/quote');
-        $subSelect = $this->_getReadAdapter()
-            ->select()
-            ->from(array('t2' => $this->getTable('sales/quote_item')), array('entity_id' => 'quote_id'))
-            ->from(array('t3' => $this->getTable('catalogrule/rule_product_price')), array())
-            ->where('t2.product_id = t3.product_id')
-            ->group('quote_id');
+        $quoteItemTable = $this->getTable('sales/quote_item');
+        $productPriceTable = $this->getTable('catalogrule/rule_product_price');
 
-        $select = $this->_getReadAdapter()->select()->join(
-            array('t2' => $subSelect),
-            't1.entity_id = t2.entity_id',
-            array('trigger_recollect' => new Zend_Db_Expr('1'))
-        );
+        $select = $this->_getReadAdapter()
+          ->select()
+          ->distinct()
+          ->from(array('t2' => $quoteItemTable), array('entity_id' => 'quote_id'))
+          ->join(array('t3' => $productPriceTable), 't2.product_id = t3.product_id', array());
 
-        $updateQuery = $select->crossUpdateFromSelect(array('t1' => $tableQuote));
+        $entityIds = $this->_getReadAdapter()->fetchCol($select);
 
-        $this->_getWriteAdapter()->query($updateQuery);
+        if (count($entityIds) > 0) {
+            $where = $this->_getWriteAdapter()->quoteInto('entity_id IN (?)', $entityIds);
+            $this->_getWriteAdapter()->update($this->getTable('sales/quote'), array('trigger_recollect' => 1), $where);
+        }
 
         return $this;
     }
diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Collection.php
index d9aac63199d..70953af1cbd 100755
--- a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Collection.php
@@ -201,13 +201,13 @@ protected function _assignProducts()
                 $optionProductIds   = array();
                 foreach ($item->getOptions() as $option) {
                     /**
-                     * Call type specified logic for product associated with quote item
+                     * Call type-specific logic for product associated with quote item
                      */
                     $product->getTypeInstance(true)->assignProductToOption(
-                            $productCollection->getItemById($option->getProductId()),
-                            $option,
-                            $product
-                        );
+                        $productCollection->getItemById($option->getProductId()),
+                        $option,
+                        $product
+                    );
 
                     if (is_object($option->getProduct()) && $option->getProduct()->getId() != $product->getId()) {
                         $optionProductIds[$option->getProduct()->getId()] = $option->getProduct()->getId();
@@ -222,9 +222,8 @@ protected function _assignProducts()
                         }
                     }
                 }
-                $item->setQtyOptions($qtyOptions);
 
-                $item->setProduct($product);
+                $item->setQtyOptions($qtyOptions)->setProduct($product);
             } else {
                 $item->isDeleted(true);
                 $recollectQuote = true;
diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php
index 2274cd58bdb..28173584f51 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php
@@ -79,7 +79,7 @@ protected function _aggregateByField($aggregationField, $from, $to)
             if ($from !== null || $to !== null) {
                 $subSelect = $this->_getTableDateRangeSelect(
                     $this->getTable('sales/order'),
-                    'created_at', 'updated_at', $from, $to
+                    $aggregationField, $aggregationField, $from, $to
                 );
             } else {
                 $subSelect = null;
diff --git a/app/code/core/Mage/Sales/Model/Service/Order.php b/app/code/core/Mage/Sales/Model/Service/Order.php
index c899b263797..569e87d0d7a 100644
--- a/app/code/core/Mage/Sales/Model/Service/Order.php
+++ b/app/code/core/Mage/Sales/Model/Service/Order.php
@@ -76,6 +76,35 @@ public function getOrder()
         return $this->_order;
     }
 
+    /**
+     * Updates numeric data taking into account locale
+     *
+     * @param array $data
+     * @return Mage_Sales_Model_Service_Order
+     */
+    public function updateLocaleNumbers(&$data)
+    {
+        if (is_array($data)) {
+            foreach ($data as $key => $value) {
+                if (is_string($value) || is_numeric($value)) {
+                    $data[$key] = $this->_getLocaleNumber($value);
+                }
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Perform numbers conversion according to locale
+     *
+     * @param mixed $value
+     * @return float
+     */
+    protected function _getLocaleNumber($value)
+    {
+        return Mage::app()->getLocale()->getNumber($value);
+    }
+
     /**
      * Prepare order invoice based on order data and requested items qtys. If $qtys is not empty - the function will
      * prepare only specified items, otherwise all containing in the order.
@@ -85,6 +114,7 @@ public function getOrder()
      */
     public function prepareInvoice($qtys = array())
     {
+        $this->updateLocaleNumbers($qtys);
         $invoice = $this->_convertor->toInvoice($this->_order);
         $totalQty = 0;
         foreach ($this->_order->getAllItems() as $orderItem) {
@@ -119,6 +149,7 @@ public function prepareInvoice($qtys = array())
      */
     public function prepareShipment($qtys = array())
     {
+        $this->updateLocaleNumbers($qtys);
         $totalQty = 0;
         $shipment = $this->_convertor->toShipment($this->_order);
         foreach ($this->_order->getAllItems() as $orderItem) {
@@ -178,6 +209,7 @@ public function prepareCreditmemo($data = array())
         $totalQty = 0;
         $creditmemo = $this->_convertor->toCreditmemo($this->_order);
         $qtys = isset($data['qtys']) ? $data['qtys'] : array();
+        $this->updateLocaleNumbers($qtys);
 
         foreach ($this->_order->getAllItems() as $orderItem) {
             if (!$this->_canRefundItem($orderItem, $qtys)) {
@@ -212,6 +244,7 @@ public function prepareCreditmemo($data = array())
     /**
      * Prepare order creditmemo based on invoice items and requested requested params
      *
+     * @param Mage_Sales_Model_Order_Invoice $invoice
      * @param array $data
      * @return Mage_Sales_Model_Order_Creditmemo
      */
@@ -219,6 +252,8 @@ public function prepareInvoiceCreditmemo($invoice, $data = array())
     {
         $totalQty = 0;
         $qtys = isset($data['qtys']) ? $data['qtys'] : array();
+        $this->updateLocaleNumbers($qtys);
+
         $creditmemo = $this->_convertor->toCreditmemo($this->_order);
         $creditmemo->setInvoice($invoice);
 
@@ -304,6 +339,7 @@ public function prepareInvoiceCreditmemo($invoice, $data = array())
      */
     protected function _initCreditmemoData($creditmemo, $data)
     {
+        $this->updateLocaleNumbers($data);
         if (isset($data['shipping_amount'])) {
             $creditmemo->setBaseShippingAmount((float)$data['shipping_amount']);
         }
@@ -330,6 +366,8 @@ protected function _canInvoiceItem($item, $qtys=array())
         if ($item->getLockedDoInvoice()) {
             return false;
         }
+        $this->updateLocaleNumbers($qtys);
+
         if ($item->isDummy()) {
             if ($item->getHasChildren()) {
                 foreach ($item->getChildrenItems() as $child) {
@@ -370,6 +408,8 @@ protected function _canShipItem($item, $qtys=array())
         if ($item->getIsVirtual() || $item->getLockedDoShip()) {
             return false;
         }
+        $this->updateLocaleNumbers($qtys);
+
         if ($item->isDummy(true)) {
             if ($item->getHasChildren()) {
                 if ($item->isShipSeparately()) {
@@ -413,6 +453,7 @@ protected function _canShipItem($item, $qtys=array())
      */
     protected function _canRefundItem($item, $qtys=array(), $invoiceQtysRefundLimits=array())
     {
+        $this->updateLocaleNumbers($qtys);
         if ($item->isDummy()) {
             if ($item->getHasChildren()) {
                 foreach ($item->getChildrenItems() as $child) {
diff --git a/app/code/core/Mage/Sales/controllers/Billing/AgreementController.php b/app/code/core/Mage/Sales/controllers/Billing/AgreementController.php
index 8899dcb5a8e..e737e6643a7 100644
--- a/app/code/core/Mage/Sales/controllers/Billing/AgreementController.php
+++ b/app/code/core/Mage/Sales/controllers/Billing/AgreementController.php
@@ -65,9 +65,18 @@ public function preDispatch()
      */
     public function viewAction()
     {
-        if (!$agreement = $this->_initAgreement()) {
+        $agreement = $this->_initAgreement();
+        if (!$agreement) {
+            $this->_redirect('*/*/index');
             return;
         }
+
+        $customerIdSession = $this->_getSession()->getCustomer()->getId();
+        if (!$agreement->canPerformAction($customerIdSession)) {
+            $this->_redirect('*/*/index');
+            return;
+        }
+
         $this->_title($this->__('Billing Agreements'))
             ->_title($this->__('Billing Agreement # %s', $agreement->getReferenceId()));
         $this->loadLayout();
@@ -154,7 +163,18 @@ public function cancelWizardAction()
     public function cancelAction()
     {
         $agreement = $this->_initAgreement();
-        if ($agreement && $agreement->canCancel()) {
+        if(!$agreement) {
+            $this->_redirect('*/*/view', array('_current' => true));
+            return;
+        }
+
+        $customerIdSession = $this->_getSession()->getCustomer()->getId();
+        if (!$agreement->canPerformAction($customerIdSession)) {
+            $this->_redirect('*/*/view', array('_current' => true));
+            return;
+        }
+
+        if ($agreement->canCancel()) {
             try {
                 $agreement->cancel();
                 $this->_getSession()->addNotice($this->__('The billing agreement "%s" has been canceled.', $agreement->getReferenceId()));
diff --git a/app/code/core/Mage/Sales/etc/config.xml b/app/code/core/Mage/Sales/etc/config.xml
index 4c8820deb63..6f2e38a1488 100644
--- a/app/code/core/Mage/Sales/etc/config.xml
+++ b/app/code/core/Mage/Sales/etc/config.xml
@@ -28,7 +28,7 @@
 <config>
     <modules>
         <Mage_Sales>
-            <version>1.6.0.7</version>
+            <version>1.6.0.8</version>
         </Mage_Sales>
     </modules>
     <global>
@@ -622,6 +622,12 @@
                 <discount_amount>
                     <to_quote_address_shipping>*</to_quote_address_shipping>
                 </discount_amount>
+                <discount_description>
+                    <to_invoice>*</to_invoice>
+                </discount_description>
+                <discount_description>
+                    <to_cm>*</to_cm>
+                </discount_description>
                 <shipping_amount>
                     <to_quote_address_shipping>*</to_quote_address_shipping>
                 </shipping_amount>
@@ -1443,7 +1449,8 @@
                 <discount translate="title">
                     <title>Discount</title>
                     <source_field>discount_amount</source_field>
-                    <amount_prefix>-</amount_prefix>
+                    <amount_prefix></amount_prefix>
+                    <title_source_field>discount_description</title_source_field>
                     <font_size>7</font_size>
                     <display_zero>0</display_zero>
                     <sort_order>200</sort_order>
@@ -1577,14 +1584,6 @@
                     </sales_quote_observer>
                 </observers>
             </catalog_product_delete_before>
-            <catalogrule_before_apply>
-                <observers>
-                    <sales_quote_observer>
-                        <class>sales/observer</class>
-                        <method>markQuotesRecollectOnCatalogRules</method>
-                    </sales_quote_observer>
-                </observers>
-            </catalogrule_before_apply>
             <catalogrule_after_apply>
                 <observers>
                     <sales_quote_observer>
diff --git a/app/code/core/Mage/Sales/etc/system.xml b/app/code/core/Mage/Sales/etc/system.xml
index 4f5dd1c6231..77e2c3698a7 100644
--- a/app/code/core/Mage/Sales/etc/system.xml
+++ b/app/code/core/Mage/Sales/etc/system.xml
@@ -148,7 +148,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
-                            <comment>Default logo, will be used in PDF and HTML documents.&lt;br /&gt;(jpeg, tiff, png) If you see image distortion in PDF, try to use larger image</comment>
+                            <comment><![CDATA[Default logo, will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If you see image distortion in PDF, try to use larger image]]></comment>
                         </logo>
                         <logo_html translate="label comment">
                             <label>Logo for HTML Print View</label>
@@ -160,7 +160,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
-                            <comment>Logo for HTML documents only. If empty, default will be used.&lt;br /&gt;(jpeg, gif, png)</comment>
+                            <comment><![CDATA[Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)]]></comment>
                         </logo_html>
                         <address translate="label">
                             <label>Address</label>
diff --git a/app/code/core/Mage/Sales/etc/wsdl.xml b/app/code/core/Mage/Sales/etc/wsdl.xml
index 969eeb42c14..742d637c77c 100644
--- a/app/code/core/Mage/Sales/etc/wsdl.xml
+++ b/app/code/core/Mage/Sales/etc/wsdl.xml
@@ -921,7 +921,7 @@
     </message>
     <message name="salesOrderCreditmemoCreateRequest">
         <part name="sessionId" type="xsd:string" />
-        <part name="creditmemoIncrementId" type="xsd:string" />
+        <part name="orderIncrementId" type="xsd:string" />
         <part name="creditmemoData" type="typens:salesOrderCreditmemoData" />
         <part name="comment" type="xsd:string" />
         <part name="notifyCustomer" type="xsd:int" />
diff --git a/app/code/core/Mage/Sales/etc/wsi.xml b/app/code/core/Mage/Sales/etc/wsi.xml
index 5ed29468d1d..c237ea0ab81 100644
--- a/app/code/core/Mage/Sales/etc/wsi.xml
+++ b/app/code/core/Mage/Sales/etc/wsi.xml
@@ -1102,7 +1102,7 @@
                 <xsd:complexType>
                     <xsd:sequence>
                         <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
-                        <xsd:element minOccurs="1" maxOccurs="1" name="creditmemoIncrementId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="orderIncrementId" type="xsd:string" />
                         <xsd:element minOccurs="0" maxOccurs="1" name="creditmemoData" type="typens:salesOrderCreditmemoData" />
                         <xsd:element minOccurs="0" maxOccurs="1" name="comment" type="xsd:string" />
                         <xsd:element minOccurs="0" maxOccurs="1" name="notifyCustomer" type="xsd:int" />
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.7-1.6.0.8.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.7-1.6.0.8.php
new file mode 100644
index 00000000000..f01fd420399
--- /dev/null
+++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.7-1.6.0.8.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Sales
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/* @var $installer Mage_Sales_Model_Entity_Setup */
+$installer = $this;
+
+$invoiceTable = $installer->getTable('sales/invoice');
+$installer->getConnection()
+    ->addColumn($invoiceTable, 'discount_description', array(
+            'type'      => Varien_Db_Ddl_Table::TYPE_TEXT,
+            'length'    => 255,
+            'comment'   => 'Discount Description'
+    ));
+
+$creditmemoTable = $installer->getTable('sales/creditmemo');
+$installer->getConnection()
+    ->addColumn($creditmemoTable, 'discount_description', array(
+            'type'      => Varien_Db_Ddl_Table::TYPE_TEXT,
+            'length'    => 255,
+            'comment'   => 'Discount Description'
+    ));
diff --git a/app/code/core/Mage/SalesRule/Helper/Coupon.php b/app/code/core/Mage/SalesRule/Helper/Coupon.php
index 950dc5aaa7c..8fc7226d26e 100644
--- a/app/code/core/Mage/SalesRule/Helper/Coupon.php
+++ b/app/code/core/Mage/SalesRule/Helper/Coupon.php
@@ -142,6 +142,6 @@ public function getCharset($format)
      */
     public function getCodeSeparator()
     {
-        return (string) Mage::app()->getConfig()->getNode(Mage_SalesRule_Helper_Coupon::XML_CHARSET_SEPARATOR);
+        return (string)Mage::app()->getConfig()->getNode(Mage_SalesRule_Helper_Coupon::XML_CHARSET_SEPARATOR);
     }
 }
diff --git a/app/code/core/Mage/SalesRule/Model/Observer.php b/app/code/core/Mage/SalesRule/Model/Observer.php
index 745eede9503..b120fdb2a40 100644
--- a/app/code/core/Mage/SalesRule/Model/Observer.php
+++ b/app/code/core/Mage/SalesRule/Model/Observer.php
@@ -24,9 +24,21 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-
+/**
+ * SalesRule Model Observer
+ *
+ * @category    Mage
+ * @package     Mage_SalesRule
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
 class Mage_SalesRule_Model_Observer
 {
+
+    /**
+     * Sales Rule Validator
+     *
+     * @var Mage_SalesRule_Model_Validator
+     */
     protected $_validator;
 
     /**
@@ -57,6 +69,11 @@ public function sales_quote_address_discount_item($observer)
             ->process($observer->getEvent()->getItem());
     }
 
+    /**
+     * Registered callback: called after an order is placed
+     *
+     * @param Varien_Event_Observer $observer
+     */
     public function sales_order_afterPlace($observer)
     {
         $order = $observer->getEvent()->getOrder();
@@ -73,43 +90,44 @@ public function sales_order_afterPlace($observer)
         $customerId = $order->getCustomerId();
 
         // use each rule (and apply to customer, if applicable)
-        foreach ($ruleIds as $ruleId) {
-            if (!$ruleId) {
-                continue;
-            }
-            $rule = Mage::getModel('salesrule/rule');
-            $rule->load($ruleId);
-            if ($rule->getId()) {
-                $rule->setTimesUsed($rule->getTimesUsed() + 1);
-                $rule->save();
-
-                if ($customerId) {
-                    $ruleCustomer = Mage::getModel('salesrule/rule_customer');
-                    $ruleCustomer->loadByCustomerRule($customerId, $ruleId);
-
-                    if ($ruleCustomer->getId()) {
-                        $ruleCustomer->setTimesUsed($ruleCustomer->getTimesUsed()+1);
-                    }
-                    else {
-                        $ruleCustomer
-                        ->setCustomerId($customerId)
-                        ->setRuleId($ruleId)
-                        ->setTimesUsed(1);
+        if ($order->getDiscountAmount() != 0) {
+            foreach ($ruleIds as $ruleId) {
+                if (!$ruleId) {
+                    continue;
+                }
+                $rule = Mage::getModel('salesrule/rule');
+                $rule->load($ruleId);
+                if ($rule->getId()) {
+                    $rule->setTimesUsed($rule->getTimesUsed() + 1);
+                    $rule->save();
+
+                    if ($customerId) {
+                        $ruleCustomer = Mage::getModel('salesrule/rule_customer');
+                        $ruleCustomer->loadByCustomerRule($customerId, $ruleId);
+
+                        if ($ruleCustomer->getId()) {
+                            $ruleCustomer->setTimesUsed($ruleCustomer->getTimesUsed() + 1);
+                        }
+                        else {
+                            $ruleCustomer
+                            ->setCustomerId($customerId)
+                            ->setRuleId($ruleId)
+                            ->setTimesUsed(1);
+                        }
+                        $ruleCustomer->save();
                     }
-                    $ruleCustomer->save();
                 }
             }
-        }
-
-        $coupon = Mage::getModel('salesrule/coupon');
-        /** @var Mage_SalesRule_Model_Coupon */
-        $coupon->load($order->getCouponCode(), 'code');
-        if ($coupon->getId()) {
-            $coupon->setTimesUsed($coupon->getTimesUsed() + 1);
-            $coupon->save();
-            if ($customerId) {
-                $couponUsage = Mage::getResourceModel('salesrule/coupon_usage');
-                $couponUsage->updateCustomerCouponTimesUsed($customerId, $coupon->getId());
+            $coupon = Mage::getModel('salesrule/coupon');
+            /** @var Mage_SalesRule_Model_Coupon */
+            $coupon->load($order->getCouponCode(), 'code');
+            if ($coupon->getId()) {
+                $coupon->setTimesUsed($coupon->getTimesUsed() + 1);
+                $coupon->save();
+                if ($customerId) {
+                    $couponUsage = Mage::getResourceModel('salesrule/coupon_usage');
+                    $couponUsage->updateCustomerCouponTimesUsed($customerId, $coupon->getId());
+                }
             }
         }
     }
diff --git a/app/code/core/Mage/SalesRule/Model/Quote/Discount.php b/app/code/core/Mage/SalesRule/Model/Quote/Discount.php
index 7b3f68eb1a7..731c426089e 100644
--- a/app/code/core/Mage/SalesRule/Model/Quote/Discount.php
+++ b/app/code/core/Mage/SalesRule/Model/Quote/Discount.php
@@ -24,7 +24,13 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-
+/**
+ * Discount calculation model
+ *
+ * @category    Mage
+ * @package     Mage_SalesRule
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
 class Mage_SalesRule_Model_Quote_Discount extends Mage_Sales_Model_Quote_Address_Total_Abstract
 {
     /**
@@ -34,6 +40,9 @@ class Mage_SalesRule_Model_Quote_Discount extends Mage_Sales_Model_Quote_Address
      */
     protected $_calculator;
 
+    /**
+     * Initialize discount collector
+     */
     public function __construct()
     {
         $this->setCode('discount');
@@ -90,6 +99,7 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
                         $this->_calculator->process($child);
                         $eventArgs['item'] = $child;
                         Mage::dispatchEvent('sales_quote_address_discount_item', $eventArgs);
+
                         $this->_aggregateItemDiscount($child);
                     }
                 } else {
@@ -99,6 +109,13 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
             }
         }
 
+        /**
+         * process weee amount
+         */
+        if (Mage::helper('weee')->isEnabled() && Mage::helper('weee')->isDiscounted($store)) {
+            $this->_calculator->processWeeeAmount($address, $items);
+        }
+
         /**
          * Process shipping amount discount
          */
@@ -137,7 +154,7 @@ public function fetch(Mage_Sales_Model_Quote_Address $address)
     {
         $amount = $address->getDiscountAmount();
 
-        if ($amount!=0) {
+        if ($amount != 0) {
             $description = $address->getDiscountDescription();
             if (strlen($description)) {
                 $title = Mage::helper('sales')->__('Discount (%s)', $description);
diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php
index 5227e105cae..b71f02483af 100755
--- a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php
+++ b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php
@@ -84,7 +84,7 @@ public function addRuleIdsToFilter(array $ruleIds)
      */
     public function addGeneratedCouponsFilter()
     {
-        $this->addFieldToFilter('is_primary', array('null' => 1));
+        $this->addFieldToFilter('is_primary', array('null' => 1))->addFieldToFilter('type', '1');
         return $this;
     }
 
diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php
index 04055109a5d..9d8d8ce6b07 100644
--- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php
+++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php
@@ -56,12 +56,10 @@ protected function _addSpecialAttributes(array &$attributes)
      */
     public function validate(Varien_Object $object)
     {
-        $product = false;
-        if ($object->getProduct() instanceof Mage_Catalog_Model_Product) {
-            $product = $object->getProduct();
-        } else {
-            $product = Mage::getModel('catalog/product')
-                ->load($object->getProductId());
+        /** @var Mage_Catalog_Model_Product $product */
+        $product = $object->getProduct();
+        if (!($product instanceof Mage_Catalog_Model_Product)) {
+            $product = Mage::getModel('catalog/product')->load($object->getProductId());
         }
 
         $product
@@ -69,6 +67,12 @@ public function validate(Varien_Object $object)
             ->setQuoteItemPrice($object->getPrice()) // possible bug: need to use $object->getBasePrice()
             ->setQuoteItemRowTotal($object->getBaseRowTotal());
 
-        return parent::validate($product);
+        $valid = parent::validate($product);
+        if (!$valid && $product->getTypeId() == Mage_Catalog_Model_Product_Type_Configurable::TYPE_CODE) {
+            $children = $object->getChildren();
+            $valid = $children && $this->validate($children[0]);
+        }
+
+        return $valid;
     }
 }
diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php
index 10fecc0e083..cd1e9b48a53 100644
--- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php
+++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php
@@ -113,7 +113,7 @@ public function validate(Varien_Object $object)
 
         $attr = $this->getAttribute();
         $total = 0;
-        foreach ($object->getQuote()->getAllItems() as $item) {
+        foreach ($object->getQuote()->getAllVisibleItems() as $item) {
             if (parent::validate($item)) {
                 $total += $item->getData($attr);
             }
diff --git a/app/code/core/Mage/SalesRule/Model/Validator.php b/app/code/core/Mage/SalesRule/Model/Validator.php
index ad8788d7e1e..9ca4ff96bf3 100644
--- a/app/code/core/Mage/SalesRule/Model/Validator.php
+++ b/app/code/core/Mage/SalesRule/Model/Validator.php
@@ -43,10 +43,27 @@ class Mage_SalesRule_Model_Validator extends Mage_Core_Model_Abstract
      */
     protected $_rules;
 
+    /**
+     * Rounding deltas
+     *
+     * @var array
+     */
     protected $_roundingDeltas = array();
 
+    /**
+     * Base rounding deltas
+     *
+     * @var array
+     */
     protected $_baseRoundingDeltas = array();
 
+    /**
+     * Quote address
+     *
+     * @var null|Mage_Sales_Model_Quote_Address
+     */
+    protected $_address = null;
+
     /**
      * Defines if method Mage_SalesRule_Model_Validator::process() was already called
      * Used for clearing applied rule ids in Quote and in Address
@@ -123,6 +140,8 @@ protected function _getAddress(Mage_Sales_Model_Quote_Item_Abstract $item)
     {
         if ($item instanceof Mage_Sales_Model_Quote_Address_Item) {
             $address = $item->getAddress();
+        } elseif ($this->_address) {
+            $address = $this->_address;
         } elseif ($item->getQuote()->getItemVirtualQty() > 0) {
             $address = $item->getQuote()->getBillingAddress();
         } else {
@@ -257,6 +276,7 @@ public function reset(Mage_Sales_Model_Quote_Address $address)
             $address->getQuote()->setAppliedRuleIds('');
             $this->_isFirstTimeResetRun = false;
         }
+        $this->_address = $address;
 
         return $this;
     }
@@ -314,11 +334,12 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item)
                         $qty = floor($qty/$step)*$step;
                     }
                     $_rulePct = $rulePercent/100;
-                    $discountAmount    = ($qty*$itemPrice - $item->getDiscountAmount()) * $_rulePct;
-                    $baseDiscountAmount= ($qty*$baseItemPrice - $item->getBaseDiscountAmount()) * $_rulePct;
+                    $discountAmount    = ($qty * $itemPrice - $item->getDiscountAmount()) * $_rulePct;
+                    $baseDiscountAmount = ($qty * $baseItemPrice - $item->getBaseDiscountAmount()) * $_rulePct;
                     //get discount for original price
-                    $originalDiscountAmount    = ($qty*$itemOriginalPrice - $item->getDiscountAmount()) * $_rulePct;
-                    $baseOriginalDiscountAmount= ($qty*$baseItemOriginalPrice - $item->getDiscountAmount()) * $_rulePct;
+                    $originalDiscountAmount    = ($qty * $itemOriginalPrice - $item->getDiscountAmount()) * $_rulePct;
+                    $baseOriginalDiscountAmount =
+                        ($qty * $baseItemOriginalPrice - $item->getDiscountAmount()) * $_rulePct;
 
                     if (!$rule->getDiscountQty() || $rule->getDiscountQty()>$qty) {
                         $discountPercent = min(100, $item->getDiscountPercent()+$rulePercent);
@@ -327,11 +348,11 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item)
                     break;
                 case Mage_SalesRule_Model_Rule::TO_FIXED_ACTION:
                     $quoteAmount = $quote->getStore()->convertPrice($rule->getDiscountAmount());
-                    $discountAmount    = $qty*($itemPrice-$quoteAmount);
-                    $baseDiscountAmount= $qty*($baseItemPrice-$rule->getDiscountAmount());
+                    $discountAmount    = $qty * ($itemPrice-$quoteAmount);
+                    $baseDiscountAmount = $qty * ($baseItemPrice-$rule->getDiscountAmount());
                     //get discount for original price
-                    $originalDiscountAmount    = $qty*($itemOriginalPrice-$quoteAmount);
-                    $baseOriginalDiscountAmount= $qty*($baseItemOriginalPrice-$rule->getDiscountAmount());
+                    $originalDiscountAmount    = $qty * ($itemOriginalPrice-$quoteAmount);
+                    $baseOriginalDiscountAmount = $qty * ($baseItemOriginalPrice-$rule->getDiscountAmount());
                     break;
 
                 case Mage_SalesRule_Model_Rule::BY_FIXED_ACTION:
@@ -340,8 +361,8 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item)
                         $qty = floor($qty/$step)*$step;
                     }
                     $quoteAmount        = $quote->getStore()->convertPrice($rule->getDiscountAmount());
-                    $discountAmount     = $qty*$quoteAmount;
-                    $baseDiscountAmount = $qty*$rule->getDiscountAmount();
+                    $discountAmount     = $qty * $quoteAmount;
+                    $baseDiscountAmount = $qty * $rule->getDiscountAmount();
                     break;
 
                 case Mage_SalesRule_Model_Rule::CART_FIXED_ACTION:
@@ -385,7 +406,6 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item)
 
                         //get discount for original price
                         $originalDiscountAmount = min($itemOriginalPrice * $qty, $quoteAmount);
-                        $baseOriginalDiscountAmount = $quote->getStore()->roundPrice($originalDiscountAmount);
                         $baseOriginalDiscountAmount = $quote->getStore()->roundPrice($baseItemOriginalPrice);
 
                         $cartRules[$rule->getId()] -= $baseDiscountAmount;
@@ -411,10 +431,10 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item)
                     }
 
                     $discountAmount    = $discountQty * $itemPrice;
-                    $baseDiscountAmount= $discountQty * $baseItemPrice;
+                    $baseDiscountAmount = $discountQty * $baseItemPrice;
                     //get discount for original price
                     $originalDiscountAmount    = $discountQty * $itemOriginalPrice;
-                    $baseOriginalDiscountAmount= $discountQty * $baseItemOriginalPrice;
+                    $baseOriginalDiscountAmount = $discountQty * $baseItemOriginalPrice;
                     break;
             }
 
@@ -443,8 +463,8 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item)
                 $baseDelta  = isset($this->_baseRoundingDeltas[$percentKey])
                         ? $this->_baseRoundingDeltas[$percentKey]
                         : 0;
-                $discountAmount+= $delta;
-                $baseDiscountAmount+=$baseDelta;
+                $discountAmount += $delta;
+                $baseDiscountAmount += $baseDelta;
 
                 $this->_roundingDeltas[$percentKey]     = $discountAmount -
                                                           $quote->getStore()->roundPrice($discountAmount);
@@ -491,6 +511,121 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item)
         return $this;
     }
 
+    /**
+     * Apply discount amount to FPT
+     *
+     * @param Mage_Sales_Model_Quote_Address $address
+     * @param array $items
+     * @return Mage_SalesRule_Model_Validator
+     */
+    public function processWeeeAmount(Mage_Sales_Model_Quote_Address $address, $items)
+    {
+        $quote = $address->getQuote();
+        $store = $quote->getStore();
+
+        if (!$this->_getHelper('weee')->isEnabled() || !$this->_getHelper('weee')->isDiscounted()) {
+            return $this;
+        }
+
+        /**
+         *   for calculating weee tax discount
+         */
+        $config = $this->_getSingleton('tax/config');
+        $calculator = $this->_getSingleton('tax/calculation');
+        $request = $calculator->getRateRequest(
+            $address,
+            $quote->getBillingAddress(),
+            $quote->getCustomerTaxClassId(),
+            $store
+        );
+
+        $applyTaxAfterDiscount = $config->applyTaxAfterDiscount();
+        $discountTax = $config->discountTax();
+        $includeInSubtotal = $this->_getHelper('weee')->includeInSubtotal();
+
+        foreach ($this->_getRules() as $rule) {
+            /* @var $rule Mage_SalesRule_Model_Rule */
+            $rulePercent = min(100, $rule->getDiscountAmount());
+            switch ($rule->getSimpleAction()) {
+                case Mage_SalesRule_Model_Rule::TO_PERCENT_ACTION:
+                    $rulePercent = max(0, 100 - $rule->getDiscountAmount());
+                case Mage_SalesRule_Model_Rule::BY_PERCENT_ACTION:
+                    foreach ($items as $item) {
+                        $weeeTaxAppliedRowAmount = $item->getWeeeTaxAppliedRowAmount();
+                        $baseWeeeTaxAppliedRowAmount = $item->getBaseWeeeTaxAppliedRowAmount();
+                        $request->setProductClassId($item->getProduct()->getTaxClassId());
+                        $rate = $calculator->getRate($request);
+
+                        /*
+                         * calculate weee discount
+                         */
+                        $weeeDiscount = 0;
+                        $baseWeeeDiscount = 0;
+
+                        if ($this->_getHelper('weee')->isTaxable()) {
+                            if ($applyTaxAfterDiscount) {
+                                if ($discountTax) {
+                                    $weeeTax = $weeeTaxAppliedRowAmount * $rate / 100;
+                                    $baseWeeeTax = $baseWeeeTaxAppliedRowAmount * $rate / 100;
+                                    $weeeDiscount = ($weeeTaxAppliedRowAmount + $weeeTax) * $rulePercent / 100;
+                                    $baseWeeeDiscount = ($baseWeeeTaxAppliedRowAmount + $baseWeeeTax)
+                                        * $rulePercent / 100;
+                                } else {
+                                    $weeeDiscount = $weeeTaxAppliedRowAmount * $rulePercent / 100;
+                                    $baseWeeeDiscount = $baseWeeeTaxAppliedRowAmount * $rulePercent / 100;
+                                }
+                            } else {
+                                if ($discountTax) {
+                                    $weeeTax = $weeeTaxAppliedRowAmount * $rate / 100;
+                                    $baseWeeeTax = $baseWeeeTaxAppliedRowAmount * $rate / 100;
+                                    $weeeDiscount = ($weeeTaxAppliedRowAmount + $weeeTax) * $rulePercent / 100;
+                                    $baseWeeeDiscount = ($baseWeeeTaxAppliedRowAmount + $baseWeeeTax)
+                                        * $rulePercent / 100;
+                                } else {
+                                    $weeeDiscount = $weeeTaxAppliedRowAmount * $rulePercent / 100;
+                                    $baseWeeeDiscount = $baseWeeeTaxAppliedRowAmount * $rulePercent / 100;
+                                }
+                            }
+                        } else {
+                            // weee is not taxable
+                            $weeeDiscount = $weeeTaxAppliedRowAmount * $rulePercent / 100;
+                            $baseWeeeDiscount = $baseWeeeTaxAppliedRowAmount * $rulePercent / 100;
+                        }
+                        $item->setWeeeDiscount($weeeDiscount);
+                        $item->setBaseWeeeDiscount($baseWeeeDiscount);
+
+                           // weee after discount can be displayed instead of original
+                        $applied = $this->_getHelper('weee')->getApplied($item);
+                        $applied[0]['weee_discount'] = $weeeDiscount;
+                        $this->_getHelper('weee')->setApplied($item, $applied);
+
+                        $item->setDiscountAmount($item->getDiscountAmount() + $weeeDiscount);
+                        $item->setBaseDiscountAmount($item->getBaseDiscountAmount() + $baseWeeeDiscount);
+                        if ($includeInSubtotal) {
+                            $address->addTotalAmount('discount', -$weeeDiscount);
+                            $address->addBaseTotalAmount('discount', -$baseWeeeDiscount);
+                        } else {
+                            if ($applyTaxAfterDiscount ) {
+                                $address->setExtraTaxAmount($address->getExtraTaxAmount() - $weeeDiscount);
+                                $address->setBaseExtraTaxAmount($address->getBaseExtraTaxAmount() - $baseWeeeDiscount);
+                                $address->setWeeeDiscount($address->getWeeeDiscount() + $weeeDiscount);
+                                $address->setBaseWeeeDiscount($address->getBaseWeeeDiscount() + $baseWeeeDiscount);
+                            } else {
+                                //tax has already been calculated, we need to remove weeeDiscount from total tax
+                                $address->setExtraTaxAmount($address->getExtraTaxAmount() - $weeeDiscount);
+                                $address->setBaseExtraTaxAmount($address->getBaseExtraTaxAmount() - $baseWeeeDiscount);
+                                $address->addTotalAmount('tax', -$weeeDiscount);
+                                $address->addBaseTotalAmount('tax', -$baseWeeeDiscount);
+                                $address->setWeeeDiscount($address->getWeeeDiscount() + $weeeDiscount);
+                                $address->setBaseWeeeDiscount($address->getBaseWeeeDiscount() + $baseWeeeDiscount);
+                            }
+                        }
+                    }
+                    break;
+            }
+        }
+        return $this;
+    }
     /**
      * Apply discounts to shipping amount
      *
@@ -499,8 +634,8 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item)
      */
     public function processShippingAmount(Mage_Sales_Model_Quote_Address $address)
     {
-        $shippingAmount     = $address->getShippingAmountForDiscount();
-        if ($shippingAmount!==null) {
+        $shippingAmount = $address->getShippingAmountForDiscount();
+        if ($shippingAmount !== null) {
             $baseShippingAmount = $address->getBaseShippingAmountForDiscount();
         } else {
             $shippingAmount     = $address->getShippingAmount();
@@ -522,7 +657,7 @@ public function processShippingAmount(Mage_Sales_Model_Quote_Address $address)
                     $rulePercent = max(0, 100-$rule->getDiscountAmount());
                 case Mage_SalesRule_Model_Rule::BY_PERCENT_ACTION:
                     $discountAmount    = ($shippingAmount - $address->getShippingDiscountAmount()) * $rulePercent/100;
-                    $baseDiscountAmount= ($baseShippingAmount -
+                    $baseDiscountAmount = ($baseShippingAmount -
                                           $address->getBaseShippingDiscountAmount()) * $rulePercent/100;
                     $discountPercent = min(100, $address->getShippingDiscountPercent()+$rulePercent);
                     $address->setShippingDiscountPercent($discountPercent);
@@ -530,7 +665,7 @@ public function processShippingAmount(Mage_Sales_Model_Quote_Address $address)
                 case Mage_SalesRule_Model_Rule::TO_FIXED_ACTION:
                     $quoteAmount = $quote->getStore()->convertPrice($rule->getDiscountAmount());
                     $discountAmount    = $shippingAmount-$quoteAmount;
-                    $baseDiscountAmount= $baseShippingAmount-$rule->getDiscountAmount();
+                    $baseDiscountAmount = $baseShippingAmount-$rule->getDiscountAmount();
                     break;
                 case Mage_SalesRule_Model_Rule::BY_FIXED_ACTION:
                     $quoteAmount        = $quote->getStore()->convertPrice($rule->getDiscountAmount());
@@ -690,7 +825,8 @@ protected function _maintainAddressCouponCode($address, $rule)
     {
         /*
         Rule is a part of rules collection, which includes only rules with 'No Coupon' type or with validated coupon.
-        As a result, if rule uses coupon code(s) ('Specific' or 'Auto' Coupon Type), it always contains validated coupon
+        As a result, if rule uses coupon code(s) ('Specific' or 'Auto' Coupon Type), it always contains validated
+        coupon
         */
         if ($rule->getCouponType() != Mage_SalesRule_Model_Rule::COUPON_TYPE_NO_COUPON) {
             $address->setCouponCode($this->getCouponCode());
@@ -793,20 +929,39 @@ protected function _getItemQty($item, $rule)
      * @param string $separator
      * @return Mage_SalesRule_Model_Validator
      */
-    public function prepareDescription($address, $separator=', ')
+    public function prepareDescription($address, $separator = ', ')
     {
-        $description = $address->getDiscountDescriptionArray();
-
-        if (is_array($description) && !empty($description)) {
-            $description = array_unique($description);
-            $description = implode($separator, $description);
-        } else {
-            $description = '';
+        $descriptionArray = $address->getDiscountDescriptionArray();
+        /** @see Mage_SalesRule_Model_Validator::_getAddress */
+        if (!$descriptionArray && $address->getQuote()->getItemVirtualQty() > 0) {
+            $descriptionArray = $address->getQuote()->getBillingAddress()->getDiscountDescriptionArray();
         }
+
+        $description = $descriptionArray && is_array($descriptionArray)
+            ? implode($separator, array_unique($descriptionArray))
+            :  '';
+
         $address->setDiscountDescription($description);
         return $this;
     }
 
+    /**
+     * wrap Mage::getSingleton
+     *
+     * @param string $name
+     * @return mixed
+     */
+    protected  function _getSingleton($name) {
+        return Mage::getSingleton($name);
+    }
 
-
+    /**
+     * wrap Mage::helper
+     *
+     * @param string $name
+     * @return mixed
+     */
+    protected function _getHelper($name) {
+        return Mage::helper($name);
+    }
 }
diff --git a/app/code/core/Mage/Sendfriend/Model/Sendfriend.php b/app/code/core/Mage/Sendfriend/Model/Sendfriend.php
index c98165a6141..4dfc1bfeace 100644
--- a/app/code/core/Mage/Sendfriend/Model/Sendfriend.php
+++ b/app/code/core/Mage/Sendfriend/Model/Sendfriend.php
@@ -126,8 +126,8 @@ public function send()
 
         $message = nl2br(htmlspecialchars($this->getSender()->getMessage()));
         $sender  = array(
-            'name'  => $this->_getHelper()->htmlEscape($this->getSender()->getName()),
-            'email' => $this->_getHelper()->htmlEscape($this->getSender()->getEmail())
+            'name'  => $this->_getHelper()->escapeHtml($this->getSender()->getName()),
+            'email' => $this->_getHelper()->escapeHtml($this->getSender()->getEmail())
         );
 
         $mailTemplate->setDesignConfig(array(
@@ -392,7 +392,7 @@ public function getSender()
      * @deprecated after 1.3.2.4
      * For get count sent letters use Mage_Sendfriend_Model_Sendfriend::getSentCount
      * or Mage_Sendfriend_Model_Sendfriend::isExceedLimit
-     * 
+     *
      * @param int $ip
      * @param int $startTime
      * @return int
@@ -461,8 +461,8 @@ public function isExceedLimit()
 
     /**
      * Return count of sent in last period
-     * 
-     * @param bool $useCache - flag, is allow to use value of attribute of model if it is processed last time 
+     *
+     * @param bool $useCache - flag, is allow to use value of attribute of model if it is processed last time
      * @return int
      */
     public function getSentCount($useCache = true)
@@ -483,7 +483,7 @@ public function getSentCount($useCache = true)
 
     /**
      * Increase count of sent
-     * 
+     *
      * @return int
      */
     protected function _incrementSentCount()
@@ -501,7 +501,7 @@ protected function _incrementSentCount()
     /**
      * Return count of sent in last period by cookie
      *
-     * @param bool $increment - flag, increase count before return value 
+     * @param bool $increment - flag, increase count before return value
      * @return int
      */
     protected function _sentCountByCookies($increment = false)
@@ -554,7 +554,7 @@ protected function _sentCountByIp($increment = false)
             $this->_getResource()->addSendItem($this->getRemoteAddr(), $time, $websiteId);
         }
 
-        return $this->_getResource()->getSendCount($this, $this->getRemoteAddr(), time() - $period, $websiteId); 
+        return $this->_getResource()->getSendCount($this, $this->getRemoteAddr(), time() - $period, $websiteId);
     }
     /**
      * Register self in global register with name send_to_friend_model
@@ -572,7 +572,7 @@ public function register()
     /**
      * @deprecated after 1.3.2.4
      * use Mage_Sendfriend_Model_Sendfriend::_sentCountByCookies
-     * 
+     *
      * @return int
      */
     protected function _amountByCookies()
diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php b/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php
index 619b323fefb..7c36a0c84d8 100644
--- a/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php
+++ b/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php
@@ -37,9 +37,9 @@ abstract class Mage_Shipping_Model_Carrier_Abstract extends Varien_Object
     /**
      * Rates result
      *
-     * @var array
+     * @var array|null
      */
-    protected $_rates = null;
+    protected $_rates;
 
     /**
      * Number of boxes in package
@@ -398,22 +398,19 @@ protected function _updateFreeMethodQuote($request)
      *
      * @param string $cost
      * @param string $method
-     * @return string
+     * @return float|string
      */
-    public function getMethodPrice($cost, $method='')
+    public function getMethodPrice($cost, $method = '')
     {
-        if ($method == $this->getConfigData($this->_freeMethod) && $this->getConfigData('free_shipping_enable')
+        return $method == $this->getConfigData($this->_freeMethod)
+            && $this->getConfigFlag('free_shipping_enable')
             && $this->getConfigData('free_shipping_subtotal') <= $this->_rawRequest->getBaseSubtotalInclTax()
-        ) {
-            $price = '0.00';
-        } else {
-            $price = $this->getFinalPriceWithHandlingFee($cost);
-        }
-        return $price;
+            ? '0.00'
+            : $this->getFinalPriceWithHandlingFee($cost);
     }
 
     /**
-     * get the handling fee for the shipping + cost
+     * Get the handling fee for the shipping + cost
      *
      * @param float $cost
      * @return float final price for shipping method
@@ -430,7 +427,7 @@ public function getFinalPriceWithHandlingFee($cost)
             $handlingAction = self::HANDLING_ACTION_PERORDER;
         }
 
-        return ($handlingAction == self::HANDLING_ACTION_PERPACKAGE)
+        return $handlingAction == self::HANDLING_ACTION_PERPACKAGE
             ? $this->_getPerpackagePrice($cost, $handlingType, $handlingFee)
             : $this->_getPerorderPrice($cost, $handlingType, $handlingFee);
     }
diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php b/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php
index 16797761828..57cc902bcb7 100644
--- a/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php
+++ b/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php
@@ -37,7 +37,18 @@ class Mage_Shipping_Model_Carrier_Freeshipping
     implements Mage_Shipping_Model_Carrier_Interface
 {
 
+    /**
+     * Carrier's code
+     *
+     * @var string
+     */
     protected $_code = 'freeshipping';
+
+    /**
+     * Whether this carrier has fixed rates calculation
+     *
+     * @var bool
+     */
     protected $_isFixed = true;
 
     /**
@@ -57,7 +68,8 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request)
         $this->_updateFreeMethodQuote($request);
 
         if (($request->getFreeShipping())
-            || ($request->getBaseSubtotalInclTax() >= $this->getConfigData('free_shipping_subtotal'))
+            || ($request->getBaseSubtotalInclTax() >=
+                $this->getConfigData('free_shipping_subtotal'))
         ) {
             $method = Mage::getModel('shipping/rate_result_method');
 
@@ -101,9 +113,14 @@ protected function _updateFreeMethodQuote($request)
         }
     }
 
+    /**
+     * Get allowed shipping methods
+     *
+     * @return array
+     */
     public function getAllowedMethods()
     {
-        return array('freeshipping'=>$this->getConfigData('name'));
+        return array('freeshipping' => $this->getConfigData('name'));
     }
 
 }
diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php
index 083316f7505..8672e19fcc6 100644
--- a/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php
+++ b/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php
@@ -45,9 +45,9 @@ public function __construct()
     }
 
     /**
-     * Enter description here...
+     * Collect and get rates
      *
-     * @param Mage_Shipping_Model_Rate_Request $data
+     * @param Mage_Shipping_Model_Rate_Request $request
      * @return Mage_Shipping_Model_Rate_Result
      */
     public function collectRates(Mage_Shipping_Model_Rate_Request $request)
@@ -77,6 +77,7 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request)
         // Free shipping by qty
         $freeQty = 0;
         if ($request->getAllItems()) {
+            $freePackageValue = 0;
             foreach ($request->getAllItems() as $item) {
                 if ($item->getProduct()->isVirtual() || $item->getParentItem()) {
                     continue;
@@ -85,17 +86,26 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request)
                 if ($item->getHasChildren() && $item->isShipSeparately()) {
                     foreach ($item->getChildren() as $child) {
                         if ($child->getFreeShipping() && !$child->getProduct()->isVirtual()) {
-                            $freeQty += $item->getQty() * ($child->getQty() - (is_numeric($child->getFreeShipping()) ? $child->getFreeShipping() : 0));
+                            $freeShipping = is_numeric($child->getFreeShipping()) ? $child->getFreeShipping() : 0;
+                            $freeQty += $item->getQty() * ($child->getQty() - $freeShipping);
                         }
                     }
                 } elseif ($item->getFreeShipping()) {
-                    $freeQty += ($item->getQty() - (is_numeric($item->getFreeShipping()) ? $item->getFreeShipping() : 0));
+                    $freeShipping = is_numeric($item->getFreeShipping()) ? $item->getFreeShipping() : 0;
+                    $freeQty += $item->getQty() - $freeShipping;
+                    $freePackageValue += $item->getBaseRowTotal();
                 }
             }
+            $oldValue = $request->getPackageValue();
+            $request->setPackageValue($oldValue - $freePackageValue);
         }
 
+        if ($freePackageValue) {
+            $request->setPackageValue($request->getPackageValue() - $freePackageValue);
+        }
         if (!$request->getConditionName()) {
-            $request->setConditionName($this->getConfigData('condition_name') ? $this->getConfigData('condition_name') : $this->_default_condition_name);
+            $conditionName = $this->getConfigData('condition_name');
+            $request->setConditionName($conditionName ? $conditionName : $this->_default_condition_name);
         }
 
          // Package weight and qty free shipping
@@ -130,6 +140,36 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request)
             $method->setCost($rate['cost']);
 
             $result->append($method);
+        } elseif (empty($rate) && $request->getFreeShipping() === true) {
+            /**
+             * was applied promotion rule for whole cart
+             * other shipping methods could be switched off at all
+             * we must show table rate method with 0$ price, if grand_total more, than min table condition_value
+             * free setPackageWeight() has already was taken into account
+             */
+            $request->setPackageValue($freePackageValue);
+            $request->setPackageQty($freeQty);
+            $rate = $this->getRate($request);
+            if (!empty($rate) && $rate['price'] >= 0) {
+                $method = Mage::getModel('shipping/rate_result_method');
+
+                $method->setCarrier('tablerate');
+                $method->setCarrierTitle($this->getConfigData('title'));
+
+                $method->setMethod('bestway');
+                $method->setMethodTitle($this->getConfigData('name'));
+
+                $method->setPrice(0);
+                $method->setCost(0);
+
+                $result->append($method);
+            }
+        } else {
+            $error = Mage::getModel('shipping/rate_result_error');
+            $error->setCarrier('tablerate');
+            $error->setCarrierTitle($this->getConfigData('title'));
+            $error->setErrorMessage($this->getConfigData('specificerrmsg'));
+            $result->append($error);
         }
 
         return $result;
diff --git a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php
index 33352bd6722..a61edfadc81 100755
--- a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php
+++ b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php
@@ -125,7 +125,7 @@ public function getRate(Mage_Shipping_Model_Rate_Request $request)
         $select = $adapter->select()
             ->from($this->getMainTable())
             ->where('website_id = :website_id')
-            ->order(array('dest_country_id DESC', 'dest_region_id DESC', 'dest_zip DESC'))
+            ->order(array('dest_country_id DESC', 'dest_region_id DESC', 'dest_zip DESC', 'condition_value DESC'))
             ->limit(1);
 
         // Render destination condition
diff --git a/app/code/core/Mage/Shipping/Model/Shipping.php b/app/code/core/Mage/Shipping/Model/Shipping.php
index ae02d95c9fc..f610d587f41 100644
--- a/app/code/core/Mage/Shipping/Model/Shipping.php
+++ b/app/code/core/Mage/Shipping/Model/Shipping.php
@@ -174,8 +174,10 @@ public function collectCarrierRates($carrierCode, $request)
                     if (!empty($packages)) {
                         $sumResults = array();
                         foreach ($packages as $weight => $packageCount) {
+                            //clone carrier for multi-requests
+                            $carrierObj = clone $carrier;
                             $request->setPackageWeight($weight);
-                            $result = $carrier->collectRates($request);
+                            $result = $carrierObj->collectRates($request);
                             if (!$result) {
                                 return $this;
                             } else {
@@ -383,7 +385,8 @@ public function collectRatesByAddress(Varien_Object $address, $limitCarrier = nu
         $request->setPackageCurrency(Mage::app()->getStore()->getCurrentCurrency());
         $request->setLimitCarrier($limitCarrier);
 
-        $request->setBaseSubtotalInclTax($address->getBaseSubtotalInclTax());
+        $request->setBaseSubtotalInclTax($address->getBaseSubtotalInclTax()
+            + $address->getBaseExtraTaxAmount());
 
         return $this->collectRates($request);
     }
diff --git a/app/code/core/Mage/Shipping/etc/system.xml b/app/code/core/Mage/Shipping/etc/system.xml
index 36393e76e78..2636c801f77 100644
--- a/app/code/core/Mage/Shipping/etc/system.xml
+++ b/app/code/core/Mage/Shipping/etc/system.xml
@@ -458,6 +458,7 @@
                             <label>Show Method if Not Applicable</label>
                             <frontend_type>select</frontend_type>
                             <sort_order>92</sort_order>
+                            <frontend_class>shipping-skip-hide</frontend_class>
                             <source_model>adminhtml/system_config_source_yesno</source_model>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Abstract.php b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Abstract.php
new file mode 100644
index 00000000000..4a5e9816c7b
--- /dev/null
+++ b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Abstract.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Sitemap
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+
+/**
+ * Sitemap resource catalog collection model
+ *
+ * @category    Mage
+ * @package     Mage_Sitemap
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+abstract class Mage_Sitemap_Model_Resource_Catalog_Abstract extends Mage_Core_Model_Resource_Db_Abstract
+{
+    /**
+     * Collection Zend Db select
+     *
+     * @var Zend_Db_Select
+     */
+    protected $_select;
+
+    /**
+     * Attribute cache
+     *
+     * @var array
+     */
+    protected $_attributesCache = array();
+
+    /**
+     * Catalog factory instance
+     *
+     * @var Mage_Catalog_Model_Factory
+     */
+    protected $_factory;
+
+    /**
+     * Initialize factory instance
+     *
+     * @param array $args
+     */
+    public function __construct(array $args = array())
+    {
+        $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('catalog/factory');
+        parent::__construct();
+    }
+
+    /**
+     * Retrieve catalog collection
+     *
+     * @param int $storeId
+     * @return array
+     */
+    abstract public function getCollection($storeId);
+
+    /**
+     * Add attribute to filter
+     *
+     * @param int $storeId
+     * @param string $attributeCode
+     * @param mixed $value
+     * @param string $type
+     * @return Zend_Db_Select
+     */
+    protected function _addFilter($storeId, $attributeCode, $value, $type = '=')
+    {
+        if (!isset($this->_attributesCache[$attributeCode])) {
+            $this->_loadAttribute($attributeCode);
+        }
+
+        $attribute = $this->_attributesCache[$attributeCode];
+
+        if (!$this->_select instanceof Zend_Db_Select) {
+            return false;
+        }
+
+        switch ($type) {
+            case '=':
+                $conditionRule = '=?';
+                break;
+            case 'in':
+                $conditionRule = ' IN(?)';
+                break;
+            default:
+                return false;
+                break;
+        }
+
+        if ($attribute['backend_type'] == 'static') {
+            $this->_select->where('main_table.' . $attributeCode . $conditionRule, $value);
+        } else {
+            $this->_select->join(
+                array('t1_' . $attributeCode => $attribute['table']),
+                'main_table.entity_id=t1_' . $attributeCode . '.entity_id AND t1_' . $attributeCode . '.store_id=0',
+                array()
+            )
+                ->where('t1_' . $attributeCode . '.attribute_id=?', $attribute['attribute_id']);
+
+            if ($attribute['is_global']) {
+                $this->_select->where('t1_' . $attributeCode . '.value' . $conditionRule, $value);
+            } else {
+                $ifCase = $this->_select->getAdapter()->getCheckSql('t2_' . $attributeCode . '.value_id > 0',
+                    't2_' . $attributeCode . '.value', 't1_' . $attributeCode . '.value'
+                );
+                $this->_select->joinLeft(
+                    array('t2_' . $attributeCode => $attribute['table']),
+                    $this->_getWriteAdapter()->quoteInto(
+                        't1_' . $attributeCode . '.entity_id = t2_' . $attributeCode . '.entity_id AND t1_'
+                            . $attributeCode . '.attribute_id = t2_' . $attributeCode . '.attribute_id AND t2_'
+                            . $attributeCode . '.store_id = ?', $storeId
+                    ),
+                    array()
+                )
+                ->where('(' . $ifCase . ')' . $conditionRule, $value);
+            }
+        }
+
+        return $this->_select;
+    }
+
+    /**
+     * Prepare catalog object
+     *
+     * @param array $row
+     * @return Varien_Object
+     */
+    protected function _prepareObject(array $row)
+    {
+        $entity = new Varien_Object();
+        $entity->setId($row[$this->getIdFieldName()]);
+        $entity->setUrl($this->_getEntityUrl($row, $entity));
+        return $entity;
+    }
+
+    /**
+     * Load and prepare entities
+     *
+     * @return array
+     */
+    protected function _loadEntities()
+    {
+        $entities = array();
+        $query = $this->_getWriteAdapter()->query($this->_select);
+        while ($row = $query->fetch()) {
+            $entity = $this->_prepareObject($row);
+            $entities[$entity->getId()] = $entity;
+        }
+        return $entities;
+    }
+
+    /**
+     * Retrieve entity url
+     *
+     * @param array $row
+     * @param Varien_Object $entity
+     * @return string
+     */
+    abstract protected function _getEntityUrl($row, $entity);
+
+    /**
+     * Loads attribute by given attribute_code
+     *
+     * @param string $attributeCode
+     * @return Mage_Sitemap_Model_Resource_Catalog_Abstract
+     */
+    abstract protected function _loadAttribute($attributeCode);
+}
diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Category.php b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Category.php
index 987be8b5b9e..ce2fbdffa88 100755
--- a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Category.php
+++ b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Category.php
@@ -32,25 +32,10 @@
  * @package     Mage_Sitemap
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_Sitemap_Model_Resource_Catalog_Category extends Mage_Core_Model_Resource_Db_Abstract
+class Mage_Sitemap_Model_Resource_Catalog_Category extends Mage_Sitemap_Model_Resource_Catalog_Abstract
 {
-    /**
-     * Collection Zend Db select
-     *
-     * @var Zend_Db_Select
-     */
-    protected $_select;
-
-    /**
-     * Attribute cache
-     *
-     * @var array
-     */
-    protected $_attributesCache    = array();
-
     /**
      * Init resource model (catalog/category)
-     *
      */
     protected function _construct()
     {
@@ -60,16 +45,13 @@ protected function _construct()
     /**
      * Get category collection array
      *
-     * @param unknown_type $storeId
+     * @param int $storeId
      * @return array
      */
     public function getCollection($storeId)
     {
-        $categories = array();
-
-        $store = Mage::app()->getStore($storeId);
         /* @var $store Mage_Core_Model_Store */
-
+        $store = Mage::app()->getStore($storeId);
         if (!$store) {
             return false;
         }
@@ -77,117 +59,69 @@ public function getCollection($storeId)
         $this->_select = $this->_getWriteAdapter()->select()
             ->from($this->getMainTable())
             ->where($this->getIdFieldName() . '=?', $store->getRootCategoryId());
-        $categoryRow = $this->_getWriteAdapter()->fetchRow($this->_select);
 
+        $categoryRow = $this->_getWriteAdapter()->fetchRow($this->_select);
         if (!$categoryRow) {
             return false;
         }
 
-        $urConditions = array(
-            'e.entity_id=ur.category_id',
-            $this->_getWriteAdapter()->quoteInto('ur.store_id=?', $store->getId()),
-            'ur.product_id IS NULL',
-            $this->_getWriteAdapter()->quoteInto('ur.is_system=?', 1),
-        );
         $this->_select = $this->_getWriteAdapter()->select()
-            ->from(array('e' => $this->getMainTable()), array($this->getIdFieldName()))
-            ->joinLeft(
-                array('ur' => $this->getTable('core/url_rewrite')),
-                join(' AND ', $urConditions),
-                array('url'=>'request_path')
-            )
-            ->where('e.path LIKE ?', $categoryRow['path'] . '/%');
+            ->from(array('main_table' => $this->getMainTable()), array($this->getIdFieldName()))
+            ->where('main_table.path LIKE ?', $categoryRow['path'] . '/%');
 
-        $this->_addFilter($storeId, 'is_active', 1);
+        $storeId = (int)$store->getId();
 
-        $query = $this->_getWriteAdapter()->query($this->_select);
-        while ($row = $query->fetch()) {
-            $category = $this->_prepareCategory($row);
-            $categories[$category->getId()] = $category;
-        }
+        /** @var $urlRewrite Mage_Catalog_Helper_Category_Url_Rewrite_Interface */
+        $urlRewrite = $this->_factory->getCategoryUrlRewriteHelper();
+        $urlRewrite->joinTableToSelect($this->_select, $storeId);
+
+        $this->_addFilter($storeId, 'is_active', 1);
 
-        return $categories;
+        return $this->_loadEntities();
     }
 
     /**
      * Prepare category
      *
+     * @deprecated after 1.7.0.2
+     *
      * @param array $categoryRow
      * @return Varien_Object
      */
     protected function _prepareCategory(array $categoryRow)
     {
-        $category = new Varien_Object();
-        $category->setId($categoryRow[$this->getIdFieldName()]);
-        $categoryUrl = !empty($categoryRow['url']) ? $categoryRow['url'] : 'catalog/category/view/id/' . $category->getId();
-        $category->setUrl($categoryUrl);
-        return $category;
+        return $this->_prepareObject($categoryRow);
     }
 
     /**
-     * Add attribute to filter
+     * Retrieve entity url
      *
-     * @param int $storeId
-     * @param string $attributeCode
-     * @param mixed $value
-     * @param string $type
-     * @return Zend_Db_Select
+     * @param array $row
+     * @param Varien_Object $entity
+     * @return string
      */
-    protected function _addFilter($storeId, $attributeCode, $value, $type = '=')
+    protected function _getEntityUrl($row, $entity)
     {
-        if (!isset($this->_attributesCache[$attributeCode])) {
-            $attribute = Mage::getSingleton('catalog/category')->getResource()->getAttribute($attributeCode);
-
-            $this->_attributesCache[$attributeCode] = array(
-                'entity_type_id'    => $attribute->getEntityTypeId(),
-                'attribute_id'      => $attribute->getId(),
-                'table'             => $attribute->getBackend()->getTable(),
-                'is_global'         => $attribute->getIsGlobal(),
-                'backend_type'      => $attribute->getBackendType()
-            );
-        }
-
-        $attribute = $this->_attributesCache[$attributeCode];
-
-        if (!$this->_select instanceof Zend_Db_Select) {
-            return false;
-        }
-
-        switch ($type) {
-            case '=':
-                $conditionRule = '=?';
-                break;
-            case 'in':
-                $conditionRule = ' IN(?)';
-                break;
-            default:
-                return false;
-                break;
-        }
-
-        if ($attribute['backend_type'] == 'static') {
-            $this->_select->where('e.' . $attributeCode . $conditionRule, $value);
-        } else {
-            $this->_select->join(
-                array('t1_'.$attributeCode => $attribute['table']),
-                'e.entity_id=t1_'.$attributeCode.'.entity_id AND t1_'.$attributeCode.'.store_id=0',
-                array()
-            )
-            ->where('t1_'.$attributeCode.'.attribute_id=?', $attribute['attribute_id']);
-
-            if ($attribute['is_global']) {
-                $this->_select->where('t1_'.$attributeCode.'.value'.$conditionRule, $value);
-            } else {
-                $ifCase = $this->_select->getAdapter()->getCheckSql('t2_'.$attributeCode.'.value_id > 0', 't2_'.$attributeCode.'.value', 't1_'.$attributeCode.'.value');
-                $this->_select->joinLeft(
-                    array('t2_'.$attributeCode => $attribute['table']),
-                    $this->_getWriteAdapter()->quoteInto('t1_'.$attributeCode.'.entity_id = t2_'.$attributeCode.'.entity_id AND t1_'.$attributeCode.'.attribute_id = t2_'.$attributeCode.'.attribute_id AND t2_'.$attributeCode.'.store_id=?', $storeId),
-                    array()
-                )
-                ->where('('.$ifCase.')'.$conditionRule, $value);
-            }
-        }
+        return !empty($row['request_path']) ? $row['request_path'] : 'catalog/category/view/id/' . $entity->getId();
+    }
 
-        return $this->_select;
+    /**
+     * Loads category attribute by given attribute code.
+     *
+     * @param string $attributeCode
+     * @return Mage_Sitemap_Model_Resource_Catalog_Abstract
+     */
+    protected function _loadAttribute($attributeCode)
+    {
+        $attribute = Mage::getSingleton('catalog/category')->getResource()->getAttribute($attributeCode);
+
+        $this->_attributesCache[$attributeCode] = array(
+            'entity_type_id' => $attribute->getEntityTypeId(),
+            'attribute_id'   => $attribute->getId(),
+            'table'          => $attribute->getBackend()->getTable(),
+            'is_global'      => $attribute->getIsGlobal(),
+            'backend_type'   => $attribute->getBackendType()
+        );
+        return $this;
     }
 }
diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Product.php b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Product.php
index 8dcca57e526..47c6e03140e 100755
--- a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Product.php
+++ b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Product.php
@@ -32,25 +32,10 @@
  * @package     Mage_Sitemap
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_Sitemap_Model_Resource_Catalog_Product extends Mage_Core_Model_Resource_Db_Abstract
+class Mage_Sitemap_Model_Resource_Catalog_Product extends Mage_Sitemap_Model_Resource_Catalog_Abstract
 {
     /**
-     * Collection Zend Db select
-     *
-     * @var Zend_Db_Select
-     */
-    protected $_select;
-
-    /**
-     * Attribute cache
-     *
-     * @var array
-     */
-    protected $_attributesCache    = array();
-
-    /**
-     * Init resource model (catalog/category)
-     *
+     * Init resource model (catalog/product)
      */
     protected function _construct()
     {
@@ -58,133 +43,86 @@ protected function _construct()
     }
 
     /**
-     * Add attribute to filter
+     * Get product collection array
      *
      * @param int $storeId
-     * @param string $attributeCode
-     * @param mixed $value
-     * @param string $type
-     * @return Zend_Db_Select
-     */
-    protected function _addFilter($storeId, $attributeCode, $value, $type = '=')
-    {
-        if (!isset($this->_attributesCache[$attributeCode])) {
-            $attribute = Mage::getSingleton('catalog/product')->getResource()->getAttribute($attributeCode);
-
-            $this->_attributesCache[$attributeCode] = array(
-                'entity_type_id'    => $attribute->getEntityTypeId(),
-                'attribute_id'      => $attribute->getId(),
-                'table'             => $attribute->getBackend()->getTable(),
-                'is_global'         => $attribute->getIsGlobal() == Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_GLOBAL,
-                'backend_type'      => $attribute->getBackendType()
-            );
-        }
-
-        $attribute = $this->_attributesCache[$attributeCode];
-
-        if (!$this->_select instanceof Zend_Db_Select) {
-            return false;
-        }
-
-        switch ($type) {
-            case '=':
-                $conditionRule = '=?';
-                break;
-            case 'in':
-                $conditionRule = ' IN(?)';
-                break;
-            default:
-                return false;
-                break;
-        }
-
-        if ($attribute['backend_type'] == 'static') {
-            $this->_select->where('e.' . $attributeCode . $conditionRule, $value);
-        } else {
-            $this->_select->join(
-                array('t1_'.$attributeCode => $attribute['table']),
-                'e.entity_id=t1_'.$attributeCode.'.entity_id AND t1_'.$attributeCode.'.store_id=0',
-                array()
-            )
-            ->where('t1_'.$attributeCode.'.attribute_id=?', $attribute['attribute_id']);
-
-            if ($attribute['is_global']) {
-                $this->_select->where('t1_'.$attributeCode.'.value'.$conditionRule, $value);
-            } else {
-                $ifCase = $this->_select->getAdapter()->getCheckSql('t2_'.$attributeCode.'.value_id > 0', 't2_'.$attributeCode.'.value', 't1_'.$attributeCode.'.value');
-                $this->_select->joinLeft(
-                    array('t2_'.$attributeCode => $attribute['table']),
-                    $this->_getWriteAdapter()->quoteInto('t1_'.$attributeCode.'.entity_id = t2_'.$attributeCode.'.entity_id AND t1_'.$attributeCode.'.attribute_id = t2_'.$attributeCode.'.attribute_id AND t2_'.$attributeCode.'.store_id=?', $storeId),
-                    array()
-                )
-                ->where('('.$ifCase.')'.$conditionRule, $value);
-            }
-        }
-
-        return $this->_select;
-    }
-
-    /**
-     * Get category collection array
-     *
-     * @param unknown_type $storeId
      * @return array
      */
     public function getCollection($storeId)
     {
-        $products = array();
-
-        $store = Mage::app()->getStore($storeId);
         /* @var $store Mage_Core_Model_Store */
-
+        $store = Mage::app()->getStore($storeId);
         if (!$store) {
             return false;
         }
 
-        $urCondions = array(
-            'e.entity_id=ur.product_id',
-            'ur.category_id IS NULL',
-            $this->_getWriteAdapter()->quoteInto('ur.store_id=?', $store->getId()),
-            $this->_getWriteAdapter()->quoteInto('ur.is_system=?', 1),
-        );
         $this->_select = $this->_getWriteAdapter()->select()
-            ->from(array('e' => $this->getMainTable()), array($this->getIdFieldName()))
+            ->from(array('main_table' => $this->getMainTable()), array($this->getIdFieldName()))
             ->join(
                 array('w' => $this->getTable('catalog/product_website')),
-                'e.entity_id=w.product_id',
+                'main_table.entity_id = w.product_id',
                 array()
             )
-            ->where('w.website_id=?', $store->getWebsiteId())
-            ->joinLeft(
-                array('ur' => $this->getTable('core/url_rewrite')),
-                join(' AND ', $urCondions),
-                array('url' => 'request_path')
-            );
+            ->where('w.website_id=?', $store->getWebsiteId());
 
-        $this->_addFilter($storeId, 'visibility', Mage::getSingleton('catalog/product_visibility')->getVisibleInSiteIds(), 'in');
-        $this->_addFilter($storeId, 'status', Mage::getSingleton('catalog/product_status')->getVisibleStatusIds(), 'in');
+        $storeId = (int)$store->getId();
 
-        $query = $this->_getWriteAdapter()->query($this->_select);
-        while ($row = $query->fetch()) {
-            $product = $this->_prepareProduct($row);
-            $products[$product->getId()] = $product;
-        }
+        /** @var $urlRewrite Mage_Catalog_Helper_Product_Url_Rewrite_Interface */
+        $urlRewrite = $this->_factory->getProductUrlRewriteHelper();
+        $urlRewrite->joinTableToSelect($this->_select, $storeId);
 
-        return $products;
+        $this->_addFilter($storeId, 'visibility',
+            Mage::getSingleton('catalog/product_visibility')->getVisibleInSiteIds(), 'in'
+        );
+        $this->_addFilter($storeId, 'status',
+            Mage::getSingleton('catalog/product_status')->getVisibleStatusIds(), 'in'
+        );
+
+        return $this->_loadEntities();
     }
 
     /**
      * Prepare product
      *
+     * @deprecated after 1.7.0.2
+     *
      * @param array $productRow
      * @return Varien_Object
      */
     protected function _prepareProduct(array $productRow)
     {
-        $product = new Varien_Object();
-        $product->setId($productRow[$this->getIdFieldName()]);
-        $productUrl = !empty($productRow['url']) ? $productRow['url'] : 'catalog/product/view/id/' . $product->getId();
-        $product->setUrl($productUrl);
-        return $product;
+        return $this->_prepareObject($productRow);
+    }
+
+    /**
+     * Retrieve entity url
+     *
+     * @param array $row
+     * @param Varien_Object $entity
+     * @return string
+     */
+    protected function _getEntityUrl($row, $entity)
+    {
+        return !empty($row['request_path']) ? $row['request_path'] : 'catalog/product/view/id/' . $entity->getId();
+    }
+
+    /**
+     * Loads product attribute by given attribute code
+     *
+     * @param string $attributeCode
+     * @return Mage_Sitemap_Model_Resource_Catalog_Abstract
+     */
+    protected function _loadAttribute($attributeCode)
+    {
+        $attribute = Mage::getSingleton('catalog/product')->getResource()->getAttribute($attributeCode);
+
+        $this->_attributesCache[$attributeCode] = array(
+            'entity_type_id' => $attribute->getEntityTypeId(),
+            'attribute_id'   => $attribute->getId(),
+            'table'          => $attribute->getBackend()->getTable(),
+            'is_global'      => $attribute->getIsGlobal() == Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_GLOBAL,
+            'backend_type'   => $attribute->getBackendType()
+        );
+        return $this;
     }
 }
diff --git a/app/code/core/Mage/Sitemap/Model/Sitemap.php b/app/code/core/Mage/Sitemap/Model/Sitemap.php
index a9fadb1a154..0e5414fc615 100644
--- a/app/code/core/Mage/Sitemap/Model/Sitemap.php
+++ b/app/code/core/Mage/Sitemap/Model/Sitemap.php
@@ -77,7 +77,7 @@ protected function _beforeSave()
          * Check exists and writeable path
          */
         if (!$io->fileExists($realPath, false)) {
-            Mage::throwException(Mage::helper('sitemap')->__('Please create the specified folder "%s" before saving the sitemap.', Mage::helper('core')->htmlEscape($this->getSitemapPath())));
+            Mage::throwException(Mage::helper('sitemap')->__('Please create the specified folder "%s" before saving the sitemap.', Mage::helper('core')->escapeHtml($this->getSitemapPath())));
         }
 
         if (!$io->isWriteable($realPath)) {
@@ -153,7 +153,8 @@ public function generateXml()
         $priority   = (string)Mage::getStoreConfig('sitemap/category/priority', $storeId);
         $collection = Mage::getResourceModel('sitemap/catalog_category')->getCollection($storeId);
         foreach ($collection as $item) {
-            $xml = sprintf('<url><loc>%s</loc><lastmod>%s</lastmod><changefreq>%s</changefreq><priority>%.1f</priority></url>',
+            $xml = sprintf(
+                '<url><loc>%s</loc><lastmod>%s</lastmod><changefreq>%s</changefreq><priority>%.1f</priority></url>',
                 htmlspecialchars($baseUrl . $item->getUrl()),
                 $date,
                 $changefreq,
@@ -170,7 +171,8 @@ public function generateXml()
         $priority   = (string)Mage::getStoreConfig('sitemap/product/priority', $storeId);
         $collection = Mage::getResourceModel('sitemap/catalog_product')->getCollection($storeId);
         foreach ($collection as $item) {
-            $xml = sprintf('<url><loc>%s</loc><lastmod>%s</lastmod><changefreq>%s</changefreq><priority>%.1f</priority></url>',
+            $xml = sprintf(
+                '<url><loc>%s</loc><lastmod>%s</lastmod><changefreq>%s</changefreq><priority>%.1f</priority></url>',
                 htmlspecialchars($baseUrl . $item->getUrl()),
                 $date,
                 $changefreq,
@@ -187,7 +189,8 @@ public function generateXml()
         $priority   = (string)Mage::getStoreConfig('sitemap/page/priority', $storeId);
         $collection = Mage::getResourceModel('sitemap/cms_page')->getCollection($storeId);
         foreach ($collection as $item) {
-            $xml = sprintf('<url><loc>%s</loc><lastmod>%s</lastmod><changefreq>%s</changefreq><priority>%.1f</priority></url>',
+            $xml = sprintf(
+                '<url><loc>%s</loc><lastmod>%s</lastmod><changefreq>%s</changefreq><priority>%.1f</priority></url>',
                 htmlspecialchars($baseUrl . $item->getUrl()),
                 $date,
                 $changefreq,
diff --git a/app/code/core/Mage/Tag/Block/Product/List.php b/app/code/core/Mage/Tag/Block/Product/List.php
index b082278085f..a83c173dcc3 100644
--- a/app/code/core/Mage/Tag/Block/Product/List.php
+++ b/app/code/core/Mage/Tag/Block/Product/List.php
@@ -99,7 +99,7 @@ public function renderTags($pattern, $glue = ' ')
         $out = array();
         foreach ($this->getTags() as $tag) {
             $out[] = sprintf($pattern,
-                $tag->getTaggedProductsUrl(), $this->htmlEscape($tag->getName()), $tag->getProducts()
+                $tag->getTaggedProductsUrl(), $this->escapeHtml($tag->getName()), $tag->getProducts()
             );
         }
         return implode($out, $glue);
diff --git a/app/code/core/Mage/Tag/Block/Product/Result.php b/app/code/core/Mage/Tag/Block/Product/Result.php
index d3c6ae3d464..8053bad01fc 100644
--- a/app/code/core/Mage/Tag/Block/Product/Result.php
+++ b/app/code/core/Mage/Tag/Block/Product/Result.php
@@ -88,7 +88,9 @@ protected function _getProductCollection()
                 ->addUrlRewrite()
                 ->setActiveFilter();
             Mage::getSingleton('catalog/product_status')->addSaleableFilterToCollection($this->_productCollection);
-            Mage::getSingleton('catalog/product_visibility')->addVisibleInSiteFilterToCollection($this->_productCollection);
+            Mage::getSingleton('catalog/product_visibility')->addVisibleInSiteFilterToCollection(
+                $this->_productCollection
+            );
         }
 
         return $this->_productCollection;
@@ -106,7 +108,7 @@ public function getResultCount()
     public function getHeaderText()
     {
         if( $this->getTag()->getName() ) {
-            return Mage::helper('tag')->__("Products tagged with '%s'", $this->htmlEscape($this->getTag()->getName()));
+            return Mage::helper('tag')->__("Products tagged with '%s'", $this->escapeHtml($this->getTag()->getName()));
         } else {
             return false;
         }
diff --git a/app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php b/app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php
index 13879830faa..c635f55fffb 100755
--- a/app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php
+++ b/app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php
@@ -250,7 +250,7 @@ protected function _joinFields()
         ->join(
             array('tr' => $tagRelationTable),
             'tr.customer_id = e.entity_id',
-            array('tag_relation_id', 'product_id', 'active')
+            array('tag_relation_id', 'product_id', 'active', 'added_in' => 'store_id')
         )
         ->join(array('t' => $tagTable), 't.tag_id = tr.tag_id', array('*'));
     }
@@ -273,13 +273,13 @@ public function getSelectCountSql()
     }
 
     /**
-     * Adds Product names to select
+     * Adds Product names to item
      *
      * @return Mage_Tag_Model_Resource_Customer_Collection
      */
     public function addProductName()
     {
-        $productsId = array();
+        $productsId   = array();
         $productsData = array();
 
         foreach ($this->getItems() as $item) {
@@ -313,23 +313,31 @@ public function addProductName()
     }
 
     /**
-     * Sets order by attribute
+     * Adds Product names to select
      *
-     * @param string $attribute
-     * @param string $dir
      * @return Mage_Tag_Model_Resource_Customer_Collection
      */
-    public function setOrder($attribute, $dir = 'desc')
+    public function addProductToSelect()
     {
-        switch( $attribute ) {
-            case 'name':
-            case 'status':
-                $this->getSelect()->order($attribute . ' ' . $dir);
-                break;
-
-            default:
-                parent::setOrder($attribute, $dir);
+        $resource = Mage::getModel('catalog/product')->getResource();
+
+        // add product attributes to select
+        foreach (array('name' => 'value') as $field => $fieldName) {
+            $attr = $resource->getAttribute($field);
+            $this->_select->joinLeft(
+                array($field => $attr->getBackend()->getTable()),
+                'tr.product_id = ' . $field . '.entity_id AND ' . $field . '.attribute_id = ' . $attr->getId(),
+                array('product_' . $field => $fieldName)
+            );
         }
+
+        // add product fields
+        $this->_select->joinLeft(
+            array('p' => $this->getTable('catalog/product')),
+            'tr.product_id = p.entity_id',
+            array('product_sku' => 'sku')
+        );
+
         return $this;
     }
 
@@ -373,4 +381,30 @@ public function addFieldToFilter($attribute, $condition = null)
         }
     }
 
+    /**
+     * Treat "order by" items as attributes to sort
+     *
+     * @return Mage_Tag_Model_Resource_Customer_Collection
+     */
+    protected function _renderOrders()
+    {
+        if (!$this->_isOrdersRendered) {
+            parent::_renderOrders();
+
+            $orders = $this->getSelect()
+                ->getPart(Zend_Db_Select::ORDER);
+
+            $appliedOrders = array();
+            foreach ($orders as $order) {
+                $appliedOrders[$order[0]] = true;
+            }
+
+            foreach ($this->_orders as $field => $direction) {
+                if (empty($appliedOrders[$field])) {
+                    $this->_select->order(new Zend_Db_Expr($field . ' ' . $direction));
+                }
+            }
+        }
+        return $this;
+    }
 }
diff --git a/app/code/core/Mage/Tag/Model/Resource/Product/Collection.php b/app/code/core/Mage/Tag/Model/Resource/Product/Collection.php
index 8cb3685ccf5..e50559fc50c 100755
--- a/app/code/core/Mage/Tag/Model/Resource/Product/Collection.php
+++ b/app/code/core/Mage/Tag/Model/Resource/Product/Collection.php
@@ -71,7 +71,7 @@ protected function _initSelect()
          * Allow analytic function usage
          */
         $this->_useAnalyticFunction = true;
-        
+
         return $this;
     }
 
@@ -451,18 +451,28 @@ public function getSelectCountSql()
     }
 
     /**
-     * Set attribute order
+     * Treat "order by" items as attributes to sort
      *
-     * @param string $attribute
-     * @param string $dir
      * @return Mage_Tag_Model_Resource_Product_Collection
      */
-    public function setOrder($attribute, $dir = 'desc')
+    protected function _renderOrders()
     {
-        if ($attribute == 'popularity') {
-            $this->getSelect()->order($attribute . ' ' . $dir);
-        } else {
-            parent::setOrder($attribute, $dir);
+        if (!$this->_isOrdersRendered) {
+            parent::_renderOrders();
+
+            $orders = $this->getSelect()
+                ->getPart(Zend_Db_Select::ORDER);
+
+            $appliedOrders = array();
+            foreach ($orders as $order) {
+                $appliedOrders[$order[0]] = true;
+            }
+
+            foreach ($this->_orders as $field => $direction) {
+                if (empty($appliedOrders[$field])) {
+                    $this->_select->order(new Zend_Db_Expr($field . ' ' . $direction));
+                }
+            }
         }
         return $this;
     }
diff --git a/app/code/core/Mage/Tag/Model/Tag.php b/app/code/core/Mage/Tag/Model/Tag.php
index 200c61380ba..6d14d85afde 100644
--- a/app/code/core/Mage/Tag/Model/Tag.php
+++ b/app/code/core/Mage/Tag/Model/Tag.php
@@ -402,4 +402,19 @@ protected function _getLinkBetweenTagCustomerProduct($relationModel)
         );
     }
 
+    /**
+     * Processing object after save data
+     *
+     * @return Mage_Core_Model_Abstract
+     */
+    protected function _afterSave()
+    {
+        if ($this->hasData('tag_assigned_products')) {
+            $tagRelationModel = Mage::getModel('tag/tag_relation');
+            $tagRelationModel->addRelations($this, $this->getData('tag_assigned_products'));
+        }
+
+        return parent::_afterSave();
+    }
+
 }
diff --git a/app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php b/app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php
new file mode 100644
index 00000000000..51cf1350772
--- /dev/null
+++ b/app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Tax
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Notifications about not correct tax settings
+ *
+ * @category    Mage
+ * @package     Mage_Tax
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Tax_Block_Adminhtml_Notifications extends Mage_Adminhtml_Block_Template
+{
+    /**
+     * Factory instance
+     *
+     * @var Mage_Core_Model_Factory
+     */
+    protected $_factory;
+
+    /**
+     * Application instance
+     *
+     * @var Mage_Core_Model_App
+     */
+    protected $_app;
+
+    /**
+     * Initialize block instance
+     *
+     * @param array $args
+     */
+    public function __construct(array $args = array())
+    {
+        $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('core/factory');
+        $this->_app = !empty($args['app']) ? $args['app'] : Mage::app();
+        unset($args['factory'], $args['app']);
+        parent::__construct($args);
+    }
+
+    /**
+     * Return list of store names which have not compatible tax calculation type and price display settings.
+     * Return true if settings are wrong for default store.
+     *
+     * @return bool|array
+     */
+    public function getStoresWithWrongDisplaySettings()
+    {
+        $defaultStoreId = Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID;
+        //check default store first
+        if (!$this->_factory->getSingleton('tax/config')->checkDisplaySettings($defaultStoreId)) {
+            return true;
+        }
+        $storeNames = array();
+        $stores = $this->_app->getStores();
+        foreach ($stores as $store) {
+            if (!$this->checkDisplaySettings($store)) {
+                $website = $store->getWebsite();
+                $storeNames[] = $website->getName() . '(' . $store->getName() . ')';
+            }
+        }
+        return $storeNames;
+    }
+
+    /**
+     * Check if tax calculation type and price display settings are compatible
+     *
+     * @param mixed $store
+     * @return bool
+     */
+    public function checkDisplaySettings($store = null)
+    {
+        return $this->_factory->getSingleton('tax/config')->checkDisplaySettings($store);
+    }
+
+    /**
+     * Return list of store names where tax discount settings are compatible.
+     * Return true if settings are wrong for default store.
+     *
+     * @return bool|array
+     */
+    public function getWebsitesWithWrongDiscountSettings()
+    {
+        $defaultStoreId = Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID;
+        //check default store first
+        if (!$this->_factory->getSingleton('tax/config')->checkDiscountSettings($defaultStoreId)) {
+            return true;
+        }
+        $storeNames = array();
+        $stores = $this->_app->getStores();
+        foreach ($stores as $store) {
+            if (!$this->_factory->getSingleton('tax/config')->checkDiscountSettings($store)) {
+                $website = $store->getWebsite();
+                $storeNames[] = $website->getName() . '(' . $store->getName() . ')';
+            }
+        }
+        return $storeNames;
+    }
+
+    /**
+     * Get URL to ignore tax notifications
+     *
+     * @param string $section
+     * @return string
+     */
+    public function getIgnoreTaxNotificationUrl($section)
+    {
+        return $this->getUrl('adminhtml/tax/ignoreTaxNotification', array('section' => $section));
+    }
+
+    /**
+     * Get tax management url
+     *
+     * @return string
+     */
+    public function getInfoUrl()
+    {
+        return $this->_app->getStore()->getConfig(Mage_Tax_Model_Config::XML_PATH_TAX_NOTIFICATION_URL);
+    }
+
+    /**
+     * Get tax management url
+     *
+     * @return string
+     */
+    public function getManageUrl()
+    {
+        return $this->getUrl('adminhtml/system_config/edit/section/tax');
+    }
+
+    /**
+     * ACL validation before html generation
+     *
+     * @return string
+     */
+    protected function _toHtml()
+    {
+        if ($this->_factory->getSingleton('admin/session')->isAllowed('system/config/tax')) {
+            return parent::_toHtml();
+        }
+        return '';
+    }
+}
diff --git a/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php b/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php
index effb4891713..c650d48734e 100644
--- a/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php
+++ b/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php
@@ -32,8 +32,31 @@
 
 class Mage_Tax_Block_Checkout_Subtotal extends Mage_Checkout_Block_Total_Default
 {
+    /**
+     *  Template for the block
+     *
+     * @var string
+     */
     protected $_template = 'tax/checkout/subtotal.phtml';
 
+    /**
+     * The factory instance to get helper
+     *
+     * @var Mage_Core_Model_Factory
+     *
+     */
+    protected $_factory;
+
+    /**
+     * Initialize factory instance
+     *
+     * @param array $args
+     */
+    public function __construct(array $args = array())
+    {
+        $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('core/factory');
+    }
+
     public function displayBoth()
     {
         return Mage::getSingleton('tax/config')->displayCartSubtotalBoth($this->getStore());
diff --git a/app/code/core/Mage/Tax/Block/Checkout/Tax.php b/app/code/core/Mage/Tax/Block/Checkout/Tax.php
index 6ad9b042dd7..e15193c96ac 100644
--- a/app/code/core/Mage/Tax/Block/Checkout/Tax.php
+++ b/app/code/core/Mage/Tax/Block/Checkout/Tax.php
@@ -32,5 +32,54 @@
  */
 class Mage_Tax_Block_Checkout_Tax extends Mage_Checkout_Block_Total_Default
 {
+    /**
+     * Template used in the block
+     *
+     * @var string
+     */
     protected $_template = 'tax/checkout/tax.phtml';
+
+    /**
+     * The factory instance to get helper
+     *
+     * @var Mage_Core_Model_Factory
+     */
+    protected $_factory;
+
+    /**
+     * Initialize factory instance
+     *
+     * @param array $args
+     */
+    public function __construct(array $args = array())
+    {
+        $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('core/factory');
+    }
+
+    /**
+     * Get all FPTs
+     *
+     * @return array
+     */
+    public function getAllWeee()
+    {
+        $allWeee = array();
+        $store = $this->getTotal()->getAddress()->getQuote()->getStore();
+        $helper = $this->_factory->getHelper('weee');
+        if (!$helper->includeInSubtotal($store)) {
+            foreach ($this->getTotal()->getAddress()->getCachedItemsAll() as $item) {
+                foreach ($helper->getApplied($item) as $tax) {
+                    $weeeDiscount = isset($tax['weee_discount']) ? $tax['weee_discount'] : 0;
+                    $title = $tax['title'];
+                    $amount = isset($tax['row_amount']) ? $tax['row_amount'] : 0;
+                    if (array_key_exists($title, $allWeee)) {
+                        $allWeee[$title] = $allWeee[$title] + $amount - $weeeDiscount;
+                    } else {
+                        $allWeee[$title] = $amount - $weeeDiscount;
+                    }
+                }
+            }
+        }
+        return $allWeee;
+    }
 }
diff --git a/app/code/core/Mage/Tax/Helper/Data.php b/app/code/core/Mage/Tax/Helper/Data.php
index 36e6cb2df87..ac3473f1cc2 100644
--- a/app/code/core/Mage/Tax/Helper/Data.php
+++ b/app/code/core/Mage/Tax/Helper/Data.php
@@ -29,7 +29,14 @@
  */
 class Mage_Tax_Helper_Data extends Mage_Core_Helper_Abstract
 {
+    /**
+     * Price conversion constant for positive
+     */
     const PRICE_CONVERSION_PLUS = 1;
+
+    /**
+     * Price conversion constat for negative
+     */
     const PRICE_CONVERSION_MINUS = 2;
 
     /**
@@ -37,14 +44,62 @@ class Mage_Tax_Helper_Data extends Mage_Core_Helper_Abstract
      *
      * @var Mage_Tax_Model_Config
      */
-    protected $_config      = null;
+    protected $_config = null;
+
+    /**
+     * Tax calculator
+     *
+     * @var Mage_Tac_Model_Calculation
+     */
     protected $_calculator  = null;
+
+    /**
+     * Display tax column
+     *
+     * @var bool
+     */
     protected $_displayTaxColumn;
+
+    /**
+     * Tax data
+     *
+     * @var mixed
+     */
     protected $_taxData;
+
+    /**
+     * Price includes tax
+     *
+     * @var bool
+     */
     protected $_priceIncludesTax;
+
+    /**
+     * Shipping price includes tax
+     *
+     * @var bool
+     */
     protected $_shippingPriceIncludesTax;
+
+    /**
+     * Apply tax after discount
+     *
+     * @var bool
+     */
     protected $_applyTaxAfterDiscount;
+
+    /**
+     * Price display type
+     *
+     * @var int
+     */
     protected $_priceDisplayType;
+
+    /**
+     * Shipping price display type
+     *
+     * @var int
+     */
     protected $_shippingPriceDisplayType;
 
     /**
@@ -54,9 +109,22 @@ class Mage_Tax_Helper_Data extends Mage_Core_Helper_Abstract
      */
     protected $_postCodeSubStringLength = 10;
 
-    public function  __construct()
+    /**
+     * Application instance
+     *
+     * @var Mage_Core_Model_App
+     */
+    protected $_app;
+
+    /**
+     * Initialize helper instance
+     *
+     * @param array $args
+     */
+    public function  __construct(array $args = array())
     {
         $this->_config = Mage::getSingleton('tax/config');
+        $this->_app = !empty($args['app']) ? $args['app'] : Mage::app();
     }
 
     /**
@@ -97,30 +165,30 @@ public function getCalculator()
     }
 
     /**
-     * Get product price including store convertion rate
+     * Get product price including store conversion rate
      *
      * @param   Mage_Catalog_Model_Product $product
      * @param   null|string $format
      * @return  float|string
      */
-    public function getProductPrice($product, $format=null)
+    public function getProductPrice($product, $format = null)
     {
         try {
             $value = $product->getPrice();
-            $value = Mage::app()->getStore()->convertPrice($value, $format);
-        } catch (Exception $e){
+            $value = $this->_app->getStore()->convertPrice($value, $format);
+        } catch (Exception $e) {
             $value = $e->getMessage();
         }
         return $value;
     }
 
     /**
-     * Check if product prices inputed include tax
+     * Check if product prices inputted include tax
      *
      * @param   mix $store
      * @return  bool
      */
-    public function priceIncludesTax($store=null)
+    public function priceIncludesTax($store = null)
     {
         return $this->_config->priceIncludesTax($store) || $this->_config->getNeedUseShippingExcludeTax();
     }
@@ -131,7 +199,7 @@ public function priceIncludesTax($store=null)
      * @param   mixed $store
      * @return  bool
      */
-    public function applyTaxAfterDiscount($store=null)
+    public function applyTaxAfterDiscount($store = null)
     {
         return $this->_config->applyTaxAfterDiscount($store);
     }
@@ -139,9 +207,11 @@ public function applyTaxAfterDiscount($store=null)
     /**
      * Output
      *
-     * @param boolean $includes
+     * @param bool $flag
+     * @param mixed $store
+     * @return string
      */
-    public function getIncExcText($flag, $store=null)
+    public function getIncExcText($flag, $store = null)
     {
         if ($flag) {
             $s = $this->__('Incl. Tax');
@@ -340,11 +410,11 @@ public function displayTaxColumn($store = null)
      */
     public function getPriceFormat($store = null)
     {
-        Mage::app()->getLocale()->emulate($store);
-        $priceFormat = Mage::app()->getLocale()->getJsPriceFormat();
-        Mage::app()->getLocale()->revert();
+        $this->_app->getLocale()->emulate($store);
+        $priceFormat = $this->_app->getLocale()->getJsPriceFormat();
+        $this->_app->getLocale()->revert();
         if ($store) {
-            $priceFormat['pattern'] = Mage::app()->getStore($store)->getCurrentCurrency()->getOutputFormat();
+            $priceFormat['pattern'] = $this->_app->getStore($store)->getCurrentCurrency()->getOutputFormat();
         }
         return Mage::helper('core')->jsonEncode($priceFormat);
     }
@@ -369,9 +439,11 @@ public function getTaxRatesByProductClass()
      * array(
      *      value_{$productTaxVlassId} => $rate
      * )
+     *
+     * @param mixed $store
      * @return string
      */
-    public function getAllRatesByProductClass($store=null)
+    public function getAllRatesByProductClass($store = null)
     {
         return $this->_getAllRatesByProductClass($store);
     }
@@ -383,15 +455,17 @@ public function getAllRatesByProductClass($store=null)
      * array(
      *      value_{$productTaxVlassId} => $rate
      * )
+     *
+     * @param mixed $store
      * @return string
      */
-    protected function _getAllRatesByProductClass($store=null)
+    protected function _getAllRatesByProductClass($store = null)
     {
         $result = array();
         $calc = Mage::getSingleton('tax/calculation');
         $rates = $calc->getRatesForAllProductTaxClasses($calc->getRateOriginRequest($store));
 
-        foreach ($rates as $class=>$rate) {
+        foreach ($rates as $class => $rate) {
             $result["value_{$class}"] = $rate;
         }
 
@@ -417,7 +491,7 @@ public function getPrice($product, $price, $includingTax = null, $shippingAddres
         if (!$price) {
             return $price;
         }
-        $store = Mage::app()->getStore($store);
+        $store = $this->_app->getStore($store);
         if (!$this->needPriceConversion($store)) {
             return $store->roundPrice($price);
         }
@@ -490,7 +564,12 @@ public function getPrice($product, $price, $includingTax = null, $shippingAddres
                 switch ($this->getPriceDisplayType($store)) {
                     case Mage_Tax_Model_Config::DISPLAY_TYPE_EXCLUDING_TAX:
                     case Mage_Tax_Model_Config::DISPLAY_TYPE_BOTH:
-                        $price = $this->_calculatePrice($price, $includingPercent, false);
+                        if ($includingPercent != $percent) {
+                            $price = $this->_calculatePrice($price, $includingPercent, false);
+                        }
+                        else {
+                            $price = $this->_calculatePrice($price, $includingPercent, false, true);
+                        }
                         break;
 
                     case Mage_Tax_Model_Config::DISPLAY_TYPE_INCLUDING_TAX:
@@ -549,59 +628,104 @@ public function displayBothPrices()
      * @param   float $price
      * @param   float $percent
      * @param   bool $type true - for calculate price including tax and false if price excluding tax
+     * @param   bool $roundTaxFirst
      * @return  float
      */
-    protected function _calculatePrice($price, $percent, $type)
+    protected function _calculatePrice($price, $percent, $type, $roundTaxFirst = false)
     {
         $calculator = Mage::getSingleton('tax/calculation');
         if ($type) {
-            $taxAmount = $calculator->calcTaxAmount($price, $percent, false, false);
+            $taxAmount = $calculator->calcTaxAmount($price, $percent, false, $roundTaxFirst);
             return $price + $taxAmount;
         } else {
-            $taxAmount = $calculator->calcTaxAmount($price, $percent, true, false);
+            $taxAmount = $calculator->calcTaxAmount($price, $percent, true, $roundTaxFirst);
             return $price - $taxAmount;
         }
     }
 
+    /**
+     * Returns the include / exclude tax label
+     *
+     * @param bool $flag
+     * @return string
+     */
     public function getIncExcTaxLabel($flag)
     {
         $text = $this->getIncExcText($flag);
-        return $text ? ' <span class="tax-flag">('.$text.')</span>' : '';
+        return $text ? ' <span class="tax-flag">(' . $text . ')</span>' : '';
     }
 
+    /**
+     * Check if shipping prices include tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function shippingPriceIncludesTax($store = null)
     {
         return $this->_config->shippingPriceIncludesTax($store);
     }
 
+    /**
+     * Get shipping methods prices display type
+     *
+     * @param mixed $store
+     * @return int
+     */
     public function getShippingPriceDisplayType($store = null)
     {
         return $this->_config->getShippingPriceDisplayType($store);
     }
 
+    /**
+     * Returns whether the shipping price should display with taxes included
+     *
+     * @return bool
+     */
     public function displayShippingPriceIncludingTax()
     {
         return $this->getShippingPriceDisplayType() == Mage_Tax_Model_Config::DISPLAY_TYPE_INCLUDING_TAX;
     }
 
+    /**
+     * Returns whether the shipping price should display without taxes
+     *
+     * @return bool
+     */
     public function displayShippingPriceExcludingTax()
     {
         return $this->getShippingPriceDisplayType() == Mage_Tax_Model_Config::DISPLAY_TYPE_EXCLUDING_TAX;
     }
 
+    /**
+     * Returns whether the shipping price should display both with and without taxes
+     *
+     * @return bool
+     */
     public function displayShippingBothPrices()
     {
         return $this->getShippingPriceDisplayType() == Mage_Tax_Model_Config::DISPLAY_TYPE_BOTH;
     }
 
+    /**
+     * Get tax class id specified for shipping tax estimation
+     *
+     * @param mixed $store
+     * @return int
+     */
     public function getShippingTaxClass($store)
     {
         return $this->_config->getShippingTaxClass($store);
     }
 
     /**
-     * Get shipping price
+     * Get Shipping Price
      *
+     * @param float $price
+     * @param null|bool $includingTax
+     * @param mixed $shippingAddress
+     * @param mixed $ctc
+     * @param mixed $store
      * @return float
      */
     public function getShippingPrice($price, $includingTax = null, $shippingAddress = null, $ctc = null, $store = null)
@@ -627,6 +751,13 @@ public function getShippingPrice($price, $includingTax = null, $shippingAddress
         return $price;
     }
 
+    /**
+     * Returns the SQL for the price tax
+     *
+     * @param string $priceField
+     * @param string $taxClassField
+     * @return string
+     */
     public function getPriceTaxSql($priceField, $taxClassField)
     {
         if (!$this->priceIncludesTax() && $this->displayPriceExcludingTax()) {
@@ -642,15 +773,15 @@ public function getPriceTaxSql($priceField, $taxClassField)
         $defaultTaxString = $currentTaxString = '';
 
         $rateToVariable = array(
-                            'defaultTaxString'=>'defaultTaxes',
-                            'currentTaxString'=>'currentTaxes',
-                            );
-        foreach ($rateToVariable as $rateVariable=>$rateArray) {
+            'defaultTaxString' => 'defaultTaxes',
+            'currentTaxString' => 'currentTaxes',
+        );
+        foreach ($rateToVariable as $rateVariable => $rateArray) {
             if ($$rateArray && is_array($$rateArray)) {
                 $$rateVariable = '';
-                foreach ($$rateArray as $classId=>$rate) {
+                foreach ($$rateArray as $classId => $rate) {
                     if ($rate) {
-                        $$rateVariable .= sprintf("WHEN %d THEN %12.4f ", $classId, $rate/100);
+                        $$rateVariable .= sprintf("WHEN %d THEN %12.4f ", $classId, $rate / 100);
                     }
                 }
                 if ($$rateVariable) {
@@ -718,16 +849,17 @@ public function joinTaxClass($select, $storeId, $priceTable = 'main_table')
      * @param   null|int $store
      * @return  0|1
      */
-    public function discountTax($store=null)
+    public function discountTax($store = null)
     {
         return $this->_config->discountTax($store);
     }
 
     /**
-     * Get value of "Apply Tax On" custom/original price configuration settings
+     * Get value of "Apply Tax On" custom/original price configuration settings.
+     * Result is 0 or 1
      *
-     * @param $store
-     * @return 0|1
+     * @param mixed $store
+     * @return mixed
      */
     public function getTaxBasedOn($store = null)
     {
@@ -764,18 +896,18 @@ public function applyTaxOnOriginalPrice($store = null)
      * @param   null|int|string|Mage_Core_Model_Store $store
      * @return  string
      */
-    public function getCalculationSequence($store=null)
+    public function getCalculationSequence($store = null)
     {
         return $this->_config->getCalculationSequence($store);
     }
 
     /**
-     * Get tax caclulation algorithm code
+     * Get tax calculation algorithm code
      *
      * @param   null|int $store
      * @return  string
      */
-    public function getCalculationAgorithm($store=null)
+    public function getCalculationAgorithm($store = null)
     {
         return $this->_config->getAlgorithm($store);
     }
@@ -788,8 +920,8 @@ public function getCalculationAgorithm($store=null)
      *  $index => array(
      *      'tax_amount'        => $taxAmount,
      *      'base_tax_amount'   => $baseTaxAmount,
-     *      'hidden_tax_amount' => $hiddenTaxAmount
-     *      'title'             => $title
+     *      'hidden_tax_amount' => $hiddenTaxAmount,
+     *      'title'             => $title,
      *      'percent'           => $percent
      *  )
      * )
@@ -799,46 +931,70 @@ public function getCalculationAgorithm($store=null)
      */
     public function getCalculatedTaxes($source)
     {
-        if (Mage::registry('current_invoice')) {
-            $current = Mage::registry('current_invoice');
-        } elseif (Mage::registry('current_creditmemo')) {
-            $current = Mage::registry('current_creditmemo');
+        if ($this->_getFromRegistry('current_invoice')) {
+            $current = $this->_getFromRegistry('current_invoice');
+        } elseif ($this->_getFromRegistry('current_creditmemo')) {
+            $current = $this->_getFromRegistry('current_creditmemo');
         } else {
             $current = $source;
         }
 
         $taxClassAmount = array();
         if ($current && $source) {
-            foreach($current->getItemsCollection() as $item) {
-                $taxCollection = Mage::getResourceModel('tax/sales_order_tax_item')
-                    ->getTaxItemsByItemId(
+            if ($current == $source) {
+                // use the actuals
+                $rates = $this->_getTaxRateSubtotals($source);
+                foreach ($rates['items'] as $rate) {
+                    $taxClassId = $rate['tax_id'];
+                    $taxClassAmount[$taxClassId]['tax_amount']      = $rate['amount'];
+                    $taxClassAmount[$taxClassId]['base_tax_amount'] = $rate['base_amount'];
+                    $taxClassAmount[$taxClassId]['title']           = $rate['title'];
+                    $taxClassAmount[$taxClassId]['percent']         = $rate['percent'];
+                }
+            } else {
+                // regenerate tax subtotals
+                foreach ($current->getItemsCollection() as $item) {
+                    $taxCollection = Mage::getResourceModel('tax/sales_order_tax_item')
+                        ->getTaxItemsByItemId(
                         $item->getOrderItemId() ? $item->getOrderItemId() : $item->getItemId()
                     );
 
-                foreach ($taxCollection as $tax) {
-                    $taxClassId = $tax['tax_id'];
-                    $percent    = $tax['tax_percent'];
+                    $shippingAmount = $current->getShippingAmount();
+                    $baseShippingAmount = $current->getBaseShippingAmount();
+                    $shippingTaxAmount = $current->getShippingTaxAmount();
 
-                    $price     = $item->getRowTotal();
-                    $basePrice = $item->getBaseRowTotal();
-                    if ($this->applyTaxAfterDiscount($item->getStoreId())) {
-                        $price     = $price - $item->getDiscountAmount() + $item->getHiddenTaxAmount();
-                        $basePrice = $basePrice - $item->getBaseDiscountAmount() + $item->getBaseHiddenTaxAmount();
-                    }
+                    foreach ($taxCollection as $tax) {
+                        $taxClassId = $tax['tax_id'];
+                        $percent    = $tax['tax_percent'];
 
-                    if (isset($taxClassAmount[$taxClassId])) {
-                        $taxClassAmount[$taxClassId]['tax_amount']      += $price * $percent / 100;
-                        $taxClassAmount[$taxClassId]['base_tax_amount'] += $basePrice * $percent / 100;
-                    } else {
-                        $taxClassAmount[$taxClassId]['tax_amount']      = $price * $percent / 100;
-                        $taxClassAmount[$taxClassId]['base_tax_amount'] = $basePrice * $percent / 100;
-                        $taxClassAmount[$taxClassId]['title']           = $tax['title'];
-                        $taxClassAmount[$taxClassId]['percent']         = $tax['percent'];
+                        $price     = $item->getRowTotal();
+                        $basePrice = $item->getBaseRowTotal();
+                        if ($this->applyTaxAfterDiscount($item->getStoreId())) {
+                            $price     = $price - $item->getDiscountAmount() + $item->getHiddenTaxAmount();
+                            $basePrice = $basePrice - $item->getBaseDiscountAmount() + $item->getBaseHiddenTaxAmount();
+                        }
+                        $tax_amount      = $price * $percent / 100;
+                        $base_tax_amount = $basePrice * $percent / 100;
+
+                        if ($shippingTaxAmount) {
+                            $tax_amount = $tax_amount + $shippingAmount * $percent / 100;
+                            $base_tax_amount = $base_tax_amount + $baseShippingAmount * $percent /100;
+                        }
+
+                        if (isset($taxClassAmount[$taxClassId])) {
+                            $taxClassAmount[$taxClassId]['tax_amount']      += $tax_amount;
+                            $taxClassAmount[$taxClassId]['base_tax_amount'] += $base_tax_amount;
+                        } else {
+                            $taxClassAmount[$taxClassId]['tax_amount']      = $tax_amount;
+                            $taxClassAmount[$taxClassId]['base_tax_amount'] = $base_tax_amount;
+                            $taxClassAmount[$taxClassId]['title']           = $tax['title'];
+                            $taxClassAmount[$taxClassId]['percent']         = $tax['percent'];
+                        }
                     }
                 }
             }
 
-            foreach ($taxClassAmount as $key=>$tax) {
+            foreach ($taxClassAmount as $key => $tax) {
                  if ($tax['tax_amount'] == 0 && $tax['base_tax_amount'] == 0) {
                      unset($taxClassAmount[$key]);
                  }
@@ -850,6 +1006,28 @@ public function getCalculatedTaxes($source)
         return $taxClassAmount;
     }
 
+    /**
+     * Returns the array of tax rates for the order
+     *
+     * @param Mage_Sales_Model_Order $order
+     * @return array
+     */
+    protected function _getTaxRateSubtotals($order)
+    {
+        return Mage::getModel('tax/sales_order_tax')->getCollection()->loadByOrder($order)->toArray();
+    }
+
+    /**
+     * Retrieve a value from registry by a key
+     *
+     * @param string $key
+     * @return mixed
+     */
+    protected function _getFromRegistry($key)
+    {
+        return Mage::registry($key);
+    }
+
     /**
      * Get calculated Shipping & Handling Tax
      *
@@ -892,4 +1070,24 @@ public function getShippingTax($source)
 
         return $taxClassAmount;
     }
+
+    /**
+     * Check if do not show notification about wrong display settings
+     *
+     * @return bool
+     */
+    public function isWrongDisplaySettingsIgnored()
+    {
+        return (bool)$this->_app->getStore()->getConfig(Mage_Tax_Model_Config::XML_PATH_TAX_NOTIFICATION_PRICE_DISPLAY);
+    }
+
+    /**
+     * Check if do not show notification about wrong discount settings
+     *
+     * @return bool
+     */
+    public function isWrongDiscountSettingsIgnored()
+    {
+        return (bool)$this->_app->getStore()->getConfig(Mage_Tax_Model_Config::XML_PATH_TAX_NOTIFICATION_DISCOUNT);
+    }
 }
diff --git a/app/code/core/Mage/Tax/Model/Calculation/Rate.php b/app/code/core/Mage/Tax/Model/Calculation/Rate.php
index 06182a451b9..2a39ebed4c3 100644
--- a/app/code/core/Mage/Tax/Model/Calculation/Rate.php
+++ b/app/code/core/Mage/Tax/Model/Calculation/Rate.php
@@ -70,14 +70,36 @@ protected function _construct()
      */
     protected function _beforeSave()
     {
+        if ($this->getCode() === '' || $this->getTaxCountryId() === '' || $this->getRate() === ''
+            || $this->getZipIsRange() && ($this->getZipFrom() === '' || $this->getZipTo() === '')
+        ) {
+            Mage::throwException(Mage::helper('tax')->__('Please fill all required fields with valid information.'));
+        }
+
+        if (!is_numeric($this->getRate()) || $this->getRate() <= 0) {
+            Mage::throwException(Mage::helper('tax')->__('Rate Percent should be a positive number.'));
+        }
+
         if ($this->getZipIsRange()) {
-            $zipFrom = substr($this->getZipFrom(), 0, 9);
-            $zipTo = substr($this->getZipTo(), 0, 9);
+            $zipFrom = $this->getZipFrom();
+            $zipTo = $this->getZipTo();
+
+            if (strlen($zipFrom) > 9 || strlen($zipTo) > 9) {
+                Mage::throwException(Mage::helper('tax')->__('Maximum zip code length is 9.'));
+            }
+
+            if (!is_numeric($zipFrom) || !is_numeric($zipTo) || $zipFrom < 0 || $zipTo < 0) {
+                Mage::throwException(Mage::helper('tax')->__('Zip code should not contain characters other than digits.'));
+            }
+
+            if ($zipFrom > $zipTo) {
+                Mage::throwException(Mage::helper('tax')->__('Range To should be equal or greater than Range From.'));
+            }
+
             $this->setTaxPostcode($zipFrom . '-' . $zipTo);
         } else {
             $taxPostCode = $this->getTaxPostcode();
 
-            // postcode must be not longer than 10 symbols
             if (strlen($taxPostCode) > 10) {
                 $taxPostCode = substr($taxPostCode, 0, 10);
             }
diff --git a/app/code/core/Mage/Tax/Model/Config.php b/app/code/core/Mage/Tax/Model/Config.php
index 90dc0825ddd..def9b38f617 100644
--- a/app/code/core/Mage/Tax/Model/Config.php
+++ b/app/code/core/Mage/Tax/Model/Config.php
@@ -25,7 +25,7 @@
  */
 
 /**
- * Configuration pathes storage
+ * Configuration paths storage
  *
  * @category   Mage
  * @package    Mage_Tax
@@ -33,10 +33,22 @@
  */
 class Mage_Tax_Model_Config
 {
-    // tax classes
+    /**#@+
+     * Paths to tax notification configs
+     */
+    const XML_PATH_TAX_NOTIFICATION_DISCOUNT = 'tax/ignore_notification/discount';
+    const XML_PATH_TAX_NOTIFICATION_PRICE_DISPLAY = 'tax/ignore_notification/price_display';
+    const XML_PATH_TAX_NOTIFICATION_URL = 'tax/notification/url';
+    /**#@-*/
+
+    /**
+     * Tax classes
+     */
     const CONFIG_XML_PATH_SHIPPING_TAX_CLASS = 'tax/classes/shipping_tax_class';
 
-    // tax calculation
+    /**#@+
+     * Paths to tax calculation configs
+     */
     const CONFIG_XML_PATH_PRICE_INCLUDES_TAX = 'tax/calculation/price_includes_tax';
     const CONFIG_XML_PATH_SHIPPING_INCLUDES_TAX = 'tax/calculation/shipping_includes_tax';
     const CONFIG_XML_PATH_BASED_ON = 'tax/calculation/based_on';
@@ -44,19 +56,24 @@ class Mage_Tax_Model_Config
     const CONFIG_XML_PATH_APPLY_AFTER_DISCOUNT = 'tax/calculation/apply_after_discount';
     const CONFIG_XML_PATH_DISCOUNT_TAX = 'tax/calculation/discount_tax';
     const XML_PATH_ALGORITHM = 'tax/calculation/algorithm';
+    /**#@-*/
 
-    // tax defaults
+    /**#@+
+     * Paths to tax defaults configs
+     */
     const CONFIG_XML_PATH_DEFAULT_COUNTRY = 'tax/defaults/country';
     const CONFIG_XML_PATH_DEFAULT_REGION = 'tax/defaults/region';
     const CONFIG_XML_PATH_DEFAULT_POSTCODE = 'tax/defaults/postcode';
+    /**#@-*/
 
-    /**
+    /**#@+
      * Prices display settings
      */
     const CONFIG_XML_PATH_PRICE_DISPLAY_TYPE    = 'tax/display/type';
     const CONFIG_XML_PATH_DISPLAY_SHIPPING      = 'tax/display/shipping';
+    /**#@-*/
 
-    /**
+    /**#@+
      * Shopping cart display settings
      */
     const XML_PATH_DISPLAY_CART_PRICE       = 'tax/cart_display/price';
@@ -64,10 +81,11 @@ class Mage_Tax_Model_Config
     const XML_PATH_DISPLAY_CART_SHIPPING    = 'tax/cart_display/shipping';
     const XML_PATH_DISPLAY_CART_DISCOUNT    = 'tax/cart_display/discount';
     const XML_PATH_DISPLAY_CART_GRANDTOTAL  = 'tax/cart_display/grandtotal';
-    const XML_PATH_DISPLAY_CART_FULL_SUMMARY= 'tax/cart_display/full_summary';
+    const XML_PATH_DISPLAY_CART_FULL_SUMMARY = 'tax/cart_display/full_summary';
     const XML_PATH_DISPLAY_CART_ZERO_TAX    = 'tax/cart_display/zero_tax';
+    /**#@-*/
 
-    /**
+    /**#@+
      * Shopping cart display settings
      */
     const XML_PATH_DISPLAY_SALES_PRICE       = 'tax/sales_display/price';
@@ -75,16 +93,24 @@ class Mage_Tax_Model_Config
     const XML_PATH_DISPLAY_SALES_SHIPPING    = 'tax/sales_display/shipping';
     const XML_PATH_DISPLAY_SALES_DISCOUNT    = 'tax/sales_display/discount';
     const XML_PATH_DISPLAY_SALES_GRANDTOTAL  = 'tax/sales_display/grandtotal';
-    const XML_PATH_DISPLAY_SALES_FULL_SUMMARY= 'tax/sales_display/full_summary';
+    const XML_PATH_DISPLAY_SALES_FULL_SUMMARY = 'tax/sales_display/full_summary';
     const XML_PATH_DISPLAY_SALES_ZERO_TAX    = 'tax/sales_display/zero_tax';
+    /**#@-*/
 
+    /**
+     * String separator
+     */
     const CALCULATION_STRING_SEPARATOR = '|';
 
+    /**#@+
+     * Indexes for tax display types
+     */
     const DISPLAY_TYPE_EXCLUDING_TAX = 1;
     const DISPLAY_TYPE_INCLUDING_TAX = 2;
     const DISPLAY_TYPE_BOTH = 3;
+    /**#@-*/
 
-    /**
+    /**#@+
      * @deprecated
      */
     const CONFIG_XML_PATH_SHOW_IN_CATALOG = 'tax/display/show_in_catalog';
@@ -92,6 +118,7 @@ class Mage_Tax_Model_Config
     const CONFIG_XML_PATH_DISPLAY_TAX_COLUMN    = 'tax/display/column_in_summary';
     const CONFIG_XML_PATH_DISPLAY_FULL_SUMMARY  = 'tax/display/full_summary';
     const CONFIG_XML_PATH_DISPLAY_ZERO_TAX      = 'tax/display/zero_tax';
+    /**#@-*/
 
     /**
      * Flag which notify what we need use prices exclude tax for calculations
@@ -112,18 +139,30 @@ class Mage_Tax_Model_Config
      */
     protected $_shippingPriceIncludeTax = null;
 
+    /**
+     * Retrieve config value for store by path
+     *
+     * @param string $path
+     * @param mixed $store
+     * @return mixed
+     */
+    protected function _getStoreConfig($path, $store)
+    {
+        return Mage::getStoreConfig($path, $store);
+    }
+
     /**
      * Check if product prices inputed include tax
      *
      * @param   mix $store
      * @return  bool
      */
-    public function priceIncludesTax($store=null)
+    public function priceIncludesTax($store = null)
     {
         if ($this->_needUsePriceExcludeTax) {
             return false;
         }
-        return (bool)Mage::getStoreConfig(self::CONFIG_XML_PATH_PRICE_INCLUDES_TAX, $store);
+        return (bool)$this->_getStoreConfig(self::CONFIG_XML_PATH_PRICE_INCLUDES_TAX, $store);
     }
 
     /**
@@ -132,9 +171,9 @@ public function priceIncludesTax($store=null)
      * @param   mixed $store
      * @return  bool
      */
-    public function applyTaxAfterDiscount($store=null)
+    public function applyTaxAfterDiscount($store = null)
     {
-        return (bool)Mage::getStoreConfig(self::CONFIG_XML_PATH_APPLY_AFTER_DISCOUNT, $store);
+        return (bool)$this->_getStoreConfig(self::CONFIG_XML_PATH_APPLY_AFTER_DISCOUNT, $store);
     }
 
     /**
@@ -148,7 +187,7 @@ public function applyTaxAfterDiscount($store=null)
      */
     public function getPriceDisplayType($store = null)
     {
-        return (int)Mage::getStoreConfig(self::CONFIG_XML_PATH_PRICE_DISPLAY_TYPE, $store);
+        return (int)$this->_getStoreConfig(self::CONFIG_XML_PATH_PRICE_DISPLAY_TYPE, $store);
     }
 
     /**
@@ -157,9 +196,9 @@ public function getPriceDisplayType($store = null)
      * @param   null|int $store
      * @return  0|1
      */
-    public function discountTax($store=null)
+    public function discountTax($store = null)
     {
-        return ((int)Mage::getStoreConfig(self::CONFIG_XML_PATH_DISCOUNT_TAX, $store) == 1);
+        return ((int)$this->_getStoreConfig(self::CONFIG_XML_PATH_DISCOUNT_TAX, $store) == 1);
     }
 
     /**
@@ -169,7 +208,7 @@ public function discountTax($store=null)
      * @param   null|int|string|Mage_Core_Model_Store $store
      * @return  string
      */
-    public function getCalculationSequence($store=null)
+    public function getCalculationSequence($store = null)
     {
         if ($this->applyTaxAfterDiscount($store)) {
             if ($this->discountTax($store)) {
@@ -238,9 +277,9 @@ public function getNeedUseShippingExcludeTax()
      * @param   store $store
      * @return  string
      */
-    public function getAlgorithm($store=null)
+    public function getAlgorithm($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_ALGORITHM, $store);
+        return $this->_getStoreConfig(self::XML_PATH_ALGORITHM, $store);
     }
 
     /**
@@ -249,9 +288,9 @@ public function getAlgorithm($store=null)
      * @param   store $store
      * @return  int
      */
-    public function getShippingTaxClass($store=null)
+    public function getShippingTaxClass($store = null)
     {
-        return (int)Mage::getStoreConfig(self::CONFIG_XML_PATH_SHIPPING_TAX_CLASS, $store);
+        return (int)$this->_getStoreConfig(self::CONFIG_XML_PATH_SHIPPING_TAX_CLASS, $store);
     }
 
     /**
@@ -262,11 +301,11 @@ public function getShippingTaxClass($store=null)
      */
     public function getShippingPriceDisplayType($store = null)
     {
-        return (int)Mage::getStoreConfig(self::CONFIG_XML_PATH_DISPLAY_SHIPPING, $store);
+        return (int)$this->_getStoreConfig(self::CONFIG_XML_PATH_DISPLAY_SHIPPING, $store);
     }
 
     /**
-     * Check if shiping prices include tax
+     * Check if shipping prices include tax
      *
      * @param   store $store
      * @return  bool
@@ -274,7 +313,7 @@ public function getShippingPriceDisplayType($store = null)
     public function shippingPriceIncludesTax($store = null)
     {
         if ($this->_shippingPriceIncludeTax === null) {
-            $this->_shippingPriceIncludeTax = (bool)Mage::getStoreConfig(
+            $this->_shippingPriceIncludeTax = (bool)$this->_getStoreConfig(
                 self::CONFIG_XML_PATH_SHIPPING_INCLUDES_TAX,
                 $store
             );
@@ -285,6 +324,7 @@ public function shippingPriceIncludesTax($store = null)
     /**
      * Declare shipping prices type
      * @param bool $flag
+     * @return Mage_Tax_Model_Config
      */
     public function setShippingPriceIncludeTax($flag)
     {
@@ -326,161 +366,382 @@ public function displayZeroTax($store = null)
      */
     public function displayTaxColumn($store = null)
     {
-        return (bool)Mage::getStoreConfig(self::CONFIG_XML_PATH_DISPLAY_TAX_COLUMN, $store);
+        return (bool)$this->_getStoreConfig(self::CONFIG_XML_PATH_DISPLAY_TAX_COLUMN, $store);
     }
 
-
-
-
+    /**
+     * Check if display cart prices included tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displayCartPricesInclTax($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_CART_PRICE, $store) == self::DISPLAY_TYPE_INCLUDING_TAX;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_CART_PRICE, $store) == self::DISPLAY_TYPE_INCLUDING_TAX;
     }
 
+    /**
+     * Check if display cart prices excluded tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displayCartPricesExclTax($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_CART_PRICE, $store) == self::DISPLAY_TYPE_EXCLUDING_TAX;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_CART_PRICE, $store) == self::DISPLAY_TYPE_EXCLUDING_TAX;
     }
 
+    /**
+     * Check if display cart prices included and excluded tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displayCartPricesBoth($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_CART_PRICE, $store) == self::DISPLAY_TYPE_BOTH;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_CART_PRICE, $store) == self::DISPLAY_TYPE_BOTH;
     }
 
+    /**
+     * Check if display cart subtotal included tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displayCartSubtotalInclTax($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_CART_SUBTOTAL, $store) == self::DISPLAY_TYPE_INCLUDING_TAX;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_CART_SUBTOTAL, $store) == self::DISPLAY_TYPE_INCLUDING_TAX;
     }
 
+    /**
+     * Check if display cart subtotal excluded tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displayCartSubtotalExclTax($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_CART_SUBTOTAL, $store) == self::DISPLAY_TYPE_EXCLUDING_TAX;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_CART_SUBTOTAL, $store) == self::DISPLAY_TYPE_EXCLUDING_TAX;
     }
 
+    /**
+     * Check if display cart subtotal included and excluded tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displayCartSubtotalBoth($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_CART_SUBTOTAL, $store) == self::DISPLAY_TYPE_BOTH;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_CART_SUBTOTAL, $store) == self::DISPLAY_TYPE_BOTH;
     }
 
+    /**
+     * Check if display cart shipping included tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displayCartShippingInclTax($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_CART_SHIPPING, $store) == self::DISPLAY_TYPE_INCLUDING_TAX;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_CART_SHIPPING, $store) == self::DISPLAY_TYPE_INCLUDING_TAX;
     }
 
+    /**
+     * Check if display cart shipping excluded tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displayCartShippingExclTax($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_CART_SHIPPING, $store) == self::DISPLAY_TYPE_EXCLUDING_TAX;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_CART_SHIPPING, $store) == self::DISPLAY_TYPE_EXCLUDING_TAX;
     }
 
+    /**
+     * Check if display cart shipping included and excluded tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displayCartShippingBoth($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_CART_SHIPPING, $store) == self::DISPLAY_TYPE_BOTH;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_CART_SHIPPING, $store) == self::DISPLAY_TYPE_BOTH;
     }
 
+    /**
+     * Check if display cart discount included tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displayCartDiscountInclTax($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_CART_DISCOUNT, $store) == self::DISPLAY_TYPE_INCLUDING_TAX;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_CART_DISCOUNT, $store) == self::DISPLAY_TYPE_INCLUDING_TAX;
     }
 
+    /**
+     * Check if display cart discount excluded tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displayCartDiscountExclTax($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_CART_DISCOUNT, $store) == self::DISPLAY_TYPE_EXCLUDING_TAX;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_CART_DISCOUNT, $store) == self::DISPLAY_TYPE_EXCLUDING_TAX;
     }
 
+    /**
+     * Check if display cart discount included and excluded tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displayCartDiscountBoth($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_CART_DISCOUNT, $store) == self::DISPLAY_TYPE_BOTH;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_CART_DISCOUNT, $store) == self::DISPLAY_TYPE_BOTH;
     }
 
+    /**
+     * Get display cart tax with grand total
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displayCartTaxWithGrandTotal($store = null)
     {
-        return (bool)Mage::getStoreConfig(self::XML_PATH_DISPLAY_CART_GRANDTOTAL, $store);
+        return (bool)$this->_getStoreConfig(self::XML_PATH_DISPLAY_CART_GRANDTOTAL, $store);
     }
 
+    /**
+     * Get display cart full summary
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displayCartFullSummary($store = null)
     {
-        return (bool)Mage::getStoreConfig(self::XML_PATH_DISPLAY_CART_FULL_SUMMARY, $store);
+        return (bool)$this->_getStoreConfig(self::XML_PATH_DISPLAY_CART_FULL_SUMMARY, $store);
     }
 
+    /**
+     * Get display cart zero tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displayCartZeroTax($store = null)
     {
-        return (bool)Mage::getStoreConfig(self::XML_PATH_DISPLAY_CART_ZERO_TAX, $store);
+        return (bool)$this->_getStoreConfig(self::XML_PATH_DISPLAY_CART_ZERO_TAX, $store);
     }
 
-
+    /**
+     * Check if display sales prices include tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displaySalesPricesInclTax($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_SALES_PRICE, $store) == self::DISPLAY_TYPE_INCLUDING_TAX;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_SALES_PRICE, $store) == self::DISPLAY_TYPE_INCLUDING_TAX;
     }
 
+    /**
+     * Check if display sales prices exclude tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displaySalesPricesExclTax($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_SALES_PRICE, $store) == self::DISPLAY_TYPE_EXCLUDING_TAX;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_SALES_PRICE, $store) == self::DISPLAY_TYPE_EXCLUDING_TAX;
     }
 
+    /**
+     * Check if display sales prices include and exclude tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displaySalesPricesBoth($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_SALES_PRICE, $store) == self::DISPLAY_TYPE_BOTH;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_SALES_PRICE, $store) == self::DISPLAY_TYPE_BOTH;
     }
 
+    /**
+     * Check if display sales subtotal include tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displaySalesSubtotalInclTax($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_SALES_SUBTOTAL, $store) == self::DISPLAY_TYPE_INCLUDING_TAX;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_SALES_SUBTOTAL, $store)
+            == self::DISPLAY_TYPE_INCLUDING_TAX;
     }
 
+    /**
+     * Check if display sales subtotal exclude tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displaySalesSubtotalExclTax($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_SALES_SUBTOTAL, $store) == self::DISPLAY_TYPE_EXCLUDING_TAX;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_SALES_SUBTOTAL, $store)
+            == self::DISPLAY_TYPE_EXCLUDING_TAX;
     }
 
+    /**
+     * Check if display sales subtotal include and exclude tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displaySalesSubtotalBoth($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_SALES_SUBTOTAL, $store) == self::DISPLAY_TYPE_BOTH;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_SALES_SUBTOTAL, $store) == self::DISPLAY_TYPE_BOTH;
     }
 
+    /**
+     * Check if display sales shipping include tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displaySalesShippingInclTax($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_SALES_SHIPPING, $store) == self::DISPLAY_TYPE_INCLUDING_TAX;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_SALES_SHIPPING, $store)
+            == self::DISPLAY_TYPE_INCLUDING_TAX;
     }
 
+    /**
+     * Check if display sales shipping exclude tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displaySalesShippingExclTax($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_SALES_SHIPPING, $store) == self::DISPLAY_TYPE_EXCLUDING_TAX;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_SALES_SHIPPING, $store)
+            == self::DISPLAY_TYPE_EXCLUDING_TAX;
     }
 
+    /**
+     * Check if display sales shipping include and exclude tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displaySalesShippingBoth($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_SALES_SHIPPING, $store) == self::DISPLAY_TYPE_BOTH;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_SALES_SHIPPING, $store) == self::DISPLAY_TYPE_BOTH;
     }
 
+    /**
+     * Check if display sales discount include tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displaySalesDiscountInclTax($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_SALES_DISCOUNT, $store) == self::DISPLAY_TYPE_INCLUDING_TAX;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_SALES_DISCOUNT, $store)
+            == self::DISPLAY_TYPE_INCLUDING_TAX;
     }
 
+    /**
+     * Check if display sales discount exclude tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displaySalestDiscountExclTax($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_SALES_DISCOUNT, $store) == self::DISPLAY_TYPE_EXCLUDING_TAX;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_SALES_DISCOUNT, $store)
+            == self::DISPLAY_TYPE_EXCLUDING_TAX;
     }
 
+    /**
+     * Check if display sales discount include and exclude tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displaySalesDiscountBoth($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_DISPLAY_SALES_DISCOUNT, $store) == self::DISPLAY_TYPE_BOTH;
+        return $this->_getStoreConfig(self::XML_PATH_DISPLAY_SALES_DISCOUNT, $store) == self::DISPLAY_TYPE_BOTH;
     }
 
+    /**
+     * Get display sales tax with grand total
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displaySalesTaxWithGrandTotal($store = null)
     {
-        return (bool)Mage::getStoreConfig(self::XML_PATH_DISPLAY_SALES_GRANDTOTAL, $store);
+        return (bool)$this->_getStoreConfig(self::XML_PATH_DISPLAY_SALES_GRANDTOTAL, $store);
     }
 
+    /**
+     * Get display sales full summary
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displaySalesFullSummary($store = null)
     {
-        return (bool)Mage::getStoreConfig(self::XML_PATH_DISPLAY_SALES_FULL_SUMMARY, $store);
+        return (bool)$this->_getStoreConfig(self::XML_PATH_DISPLAY_SALES_FULL_SUMMARY, $store);
     }
 
+    /**
+     * Get display sales zero tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
     public function displaySalesZeroTax($store = null)
     {
-        return (bool)Mage::getStoreConfig(self::XML_PATH_DISPLAY_SALES_ZERO_TAX, $store);
+        return (bool)$this->_getStoreConfig(self::XML_PATH_DISPLAY_SALES_ZERO_TAX, $store);
+    }
+
+    /**
+     * Check if tax calculation type and price display settings are compatible
+     *
+     * invalid settings if
+     *      Tax Calculation Method Based On 'Total' or 'Row'
+     *      and at least one Price Display Settings has 'Including and Excluding Tax' value
+     *
+     * @param mixed $store
+     * @return bool
+     */
+    public function checkDisplaySettings($store = null)
+    {
+        if ($this->getAlgorithm($store) == Mage_Tax_Model_Calculation::CALC_UNIT_BASE) {
+            return true;
+        }
+        return $this->getPriceDisplayType($store) != self::DISPLAY_TYPE_BOTH
+            && $this->getShippingPriceDisplayType($store) != self::DISPLAY_TYPE_BOTH
+            && !$this->displayCartPricesBoth($store)
+            && !$this->displayCartSubtotalBoth($store)
+            && !$this->displayCartShippingBoth($store)
+            && !$this->displaySalesPricesBoth($store)
+            && !$this->displaySalesSubtotalBoth($store)
+            && !$this->displaySalesShippingBoth($store);
     }
-}
 
+    /**
+     * Check if tax discount settings are compatible
+     *
+     * Matrix for invalid discount settings is as follows:
+     *      Before Discount / Excluding Tax
+     *      After Discount / Including Tax
+     *
+     * @param mixed $store
+     * @return bool
+     */
+    public function checkDiscountSettings($store = null)
+    {
+        return $this->applyTaxAfterDiscount($store) != $this->discountTax($store);
+    }
+}
diff --git a/app/code/core/Mage/Tax/Model/Config/Notification.php b/app/code/core/Mage/Tax/Model/Config/Notification.php
new file mode 100644
index 00000000000..4e3648eb100
--- /dev/null
+++ b/app/code/core/Mage/Tax/Model/Config/Notification.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Tax
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Tax Config Notification
+ *
+ * @category   Mage
+ * @package    Mage_Tax
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Tax_Model_Config_Notification extends Mage_Core_Model_Config_Data
+{
+    /**
+     * Factory instance
+     *
+     * @var Mage_Core_Model_Factory
+     */
+    protected $_factory;
+
+    /**
+     * Initialize class instance
+     *
+     * @param array $args
+     */
+    public function __construct(array $args = array())
+    {
+        $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('core/factory');
+        parent::__construct($args);
+    }
+
+    /**
+     * Get config model
+     *
+     * @return Mage_Core_Model_Config_Data
+     */
+    protected function _getConfig()
+    {
+        return $this->_factory->getModel('core/config_data');
+    }
+
+    /**
+     * Prepare and store cron settings after save
+     *
+     * @return Mage_Tax_Model_Config_Notification
+     */
+    protected function _afterSave()
+    {
+        if ($this->isValueChanged()) {
+            $this->_resetNotificationFlag(Mage_Tax_Model_Config::XML_PATH_TAX_NOTIFICATION_DISCOUNT);
+            $this->_resetNotificationFlag(Mage_Tax_Model_Config::XML_PATH_TAX_NOTIFICATION_PRICE_DISPLAY);
+        }
+        return parent::_afterSave();
+    }
+
+    /**
+     * Reset flag for showing tax notifications
+     *
+     * @param string $path
+     * @return Mage_Tax_Model_Config_Notification
+     */
+    protected function _resetNotificationFlag($path)
+    {
+        $this->_getConfig()
+            ->load($path, 'path')
+            ->setValue(0)
+            ->setPath($path)
+            ->save();
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation.php b/app/code/core/Mage/Tax/Model/Resource/Calculation.php
index 1d83d49e87d..0bbce216ace 100755
--- a/app/code/core/Mage/Tax/Model/Resource/Calculation.php
+++ b/app/code/core/Mage/Tax/Model/Resource/Calculation.php
@@ -135,14 +135,14 @@ public function getCalculationProcess($request, $rates = null)
         $countedRates = count($rates);
         for ($i = 0; $i < $countedRates; $i++) {
             $rate = $rates[$i];
-            $value = (isset($rate['value']) ? $rate['value'] : $rate['percent'])*1;
+            $value = (isset($rate['value']) ? $rate['value'] : $rate['percent']) * 1;
 
             $oneRate = array(
-                'code'=>$rate['code'],
-                'title'=>$rate['title'],
-                'percent'=>$value,
-                'position'=>$rate['position'],
-                'priority'=>$rate['priority'],
+                'code' => $rate['code'],
+                'title' => $rate['title'],
+                'percent' => $value,
+                'position' => $rate['position'],
+                'priority' => $rate['priority'],
             );
             if (isset($rate['tax_calculation_rule_id'])) {
                 $oneRate['rule_id'] = $rate['tax_calculation_rule_id'];
@@ -164,30 +164,35 @@ public function getCalculationProcess($request, $rates = null)
             }
             $row['rates'][] = $oneRate;
 
-            if (isset($rates[$i+1]['tax_calculation_rule_id'])) {
+            if (isset($rates[$i + 1]['tax_calculation_rule_id'])) {
                 $rule = $rate['tax_calculation_rule_id'];
             }
             $priority = $rate['priority'];
             $ids[] = $rate['code'];
 
-            if (isset($rates[$i+1]['tax_calculation_rule_id'])) {
-                while(isset($rates[$i+1]) && $rates[$i+1]['tax_calculation_rule_id'] == $rule) {
+            if (isset($rates[$i + 1]['tax_calculation_rule_id'])) {
+                while (isset($rates[$i + 1]) && $rates[$i + 1]['tax_calculation_rule_id'] == $rule) {
                     $i++;
                 }
             }
 
             $currentRate += $value;
 
-            if (!isset($rates[$i+1]) || $rates[$i+1]['priority'] != $priority
-                || (isset($rates[$i+1]['process']) && $rates[$i+1]['process'] != $rate['process'])
+            if (!isset($rates[$i + 1]) || $rates[$i + 1]['priority'] != $priority
+                || (isset($rates[$i + 1]['process']) && $rates[$i + 1]['process'] != $rate['process'])
             ) {
-                $row['percent'] = (100+$totalPercent)*($currentRate/100);
+                if (!empty($rates[$i]['calculate_subtotal'])) {
+                    $row['percent'] = $currentRate;
+                    $totalPercent += $currentRate;
+                } else {
+                    $row['percent'] = $this->_collectPercent($totalPercent, $currentRate);
+                    $totalPercent += $row['percent'];
+                }
                 $row['id'] = implode($ids);
                 $result[] = $row;
                 $row = array();
                 $ids = array();
 
-                $totalPercent += (100+$totalPercent)*($currentRate/100);
                 $currentRate = 0;
             }
         }
@@ -195,6 +200,18 @@ public function getCalculationProcess($request, $rates = null)
         return $result;
     }
 
+    /**
+     * Return combined percent value
+     *
+     * @param float|int $percent
+     * @param float|int $rate
+     * @return int
+     */
+    protected function _collectPercent($percent, $rate)
+    {
+        return (100 + $percent) * ($rate / 100);
+    }
+
     /**
      * Create search templates for postcode
      *
@@ -254,10 +271,10 @@ protected function _getRates($request)
             $select = $this->_getReadAdapter()->select();
             $select
                 ->from(array('main_table' => $this->getMainTable()),
-                array(  'tax_calculation_rate_id',
-                        'tax_calculation_rule_id',
-                        'customer_tax_class_id',
-                        'product_tax_class_id'
+                array('tax_calculation_rate_id',
+                      'tax_calculation_rule_id',
+                      'customer_tax_class_id',
+                      'product_tax_class_id'
                     )
                 )
                 ->where('customer_tax_class_id = ?', (int)$customerClassId);
@@ -274,9 +291,9 @@ protected function _getRates($request)
                 ->join(
                     array('rule' => $this->getTable('tax/tax_calculation_rule')),
                     $ruleTableAliasName . ' = main_table.tax_calculation_rule_id',
-                    array('rule.priority', 'rule.position'))
+                    array('rule.priority', 'rule.position', 'rule.calculate_subtotal'))
                 ->join(
-                    array('rate'=>$this->getTable('tax/tax_calculation_rate')),
+                    array('rate' => $this->getTable('tax/tax_calculation_rate')),
                     'rate.tax_calculation_rate_id = main_table.tax_calculation_rate_id',
                     array(
                         'value' => 'rate.rate',
@@ -361,14 +378,18 @@ protected function _calculateRate($rates)
             $value      = $rate['value'];
             $priority   = $rate['priority'];
 
-            while(isset($rates[$i+1]) && $rates[$i+1]['tax_calculation_rule_id'] == $rule) {
+            while (isset($rates[$i + 1]) && $rates[$i + 1]['tax_calculation_rule_id'] == $rule) {
                 $i++;
             }
 
             $currentRate += $value;
 
-            if (!isset($rates[$i+1]) || $rates[$i+1]['priority'] != $priority) {
-                $result += (100+$result)*($currentRate/100);
+            if (!isset($rates[$i + 1]) || $rates[$i + 1]['priority'] != $priority) {
+                if (!empty($rates[$i]['calculate_subtotal'])) {
+                    $result += $currentRate;
+                } else {
+                    $result += $this->_collectPercent($result, $currentRate);
+                }
                 $currentRate = 0;
             }
         }
@@ -391,7 +412,7 @@ public function getRateIds($request)
             $rate = $rates[$i];
             $rule = $rate['tax_calculation_rule_id'];
             $result[] = $rate['tax_calculation_rate_id'];
-            while(isset($rates[$i+1]) && $rates[$i+1]['tax_calculation_rule_id'] == $rule) {
+            while (isset($rates[$i + 1]) && $rates[$i + 1]['tax_calculation_rule_id'] == $rule) {
                 $i++;
             }
         }
diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Collection.php
index 9539fdbfebc..853629c538c 100755
--- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Collection.php
+++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Collection.php
@@ -34,6 +34,11 @@
  */
 class Mage_Tax_Model_Resource_Calculation_Rate_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
+    /**
+     * Value of fetched from DB of rules per cycle
+     */
+    const TAX_RULES_CHUNK_SIZE = 1000;
+
     /**
      * Resource initialization
      */
@@ -84,7 +89,8 @@ public function joinTitle($store = null)
         $storeId = (int)Mage::app()->getStore($store)->getId();
         $this->_select->joinLeft(
             array('title_table' => $this->getTable('tax/tax_calculation_rate_title')),
-            $this->getConnection()->quoteInto('main_table.tax_calculation_rate_id = title_table.tax_calculation_rate_id AND title_table.store_id = ?', $storeId),
+            $this->getConnection()->quoteInto('main_table.tax_calculation_rate_id = title_table.tax_calculation_rate_id'
+                . ' AND title_table.store_id = ?', $storeId),
             array('title' => 'value')
         );
 
@@ -161,5 +167,31 @@ public function toOptionHashOptimized()
     {
         return $this->_toOptionHashOptimized('tax_calculation_rate_id', 'code');
     }
-}
 
+    /**
+     * Get rates array without memory leak
+     *
+     * @return array
+     */
+    public function getOptionRates()
+    {
+        $size = self::TAX_RULES_CHUNK_SIZE;
+        $page = 1;
+        $rates = array();
+        do {
+            $offset = $size * ($page - 1);
+            $this->getSelect()->reset();
+            $this->getSelect()
+                ->from(
+                    array('rates' => $this->getMainTable()),
+                array('tax_calculation_rate_id', 'code'))
+                ->limit($size, $offset);
+
+            $rates = array_merge($rates, $this->toOptionArray());
+            $this->clear();
+            $page++;
+        } while ($this->getSize() > $offset);
+
+        return $rates;
+    }
+}
diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php
index b02aef5f2a8..96136cb6c36 100644
--- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php
+++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php
@@ -24,7 +24,13 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-
+/**
+ * Model to calculate shipping tax
+ *
+ * @category    Mage
+ * @package     Mage_Tax
+ * @author      Magento Core Team
+ */
 class Mage_Tax_Model_Sales_Total_Quote_Shipping extends Mage_Sales_Model_Quote_Address_Total_Abstract
 {
     /**
@@ -99,15 +105,17 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
         $rate               = $calc->getRate($addressTaxRequest);
         if ($priceIncludesTax) {
             if ($this->_areTaxRequestsSimilar) {
-                $tax            = $this->_round($calc->calcTaxAmount($shipping, $rate, true, false), $rate, true);
-                $baseTax        = $this->_round($calc->calcTaxAmount($baseShipping, $rate, true, false), $rate, true, 'base');
+                $taxExact       = $calc->calcTaxAmount($shipping, $rate, true, false);
+                $baseTaxExact   = $calc->calcTaxAmount($baseShipping, $rate, true, false);
                 $taxShipping    = $shipping;
-                $baseTaxShipping= $baseShipping;
-                $shipping       = $shipping - $tax;
-                $baseShipping   = $baseShipping - $baseTax;
+                $baseTaxShipping = $baseShipping;
+                $shippingExact  = $shipping - $taxExact;
+                $baseShippingExact = $baseShipping - $baseTaxExact;
                 $taxable        = $taxShipping;
                 $baseTaxable    = $baseTaxShipping;
                 $isPriceInclTax = true;
+                $address->setTotalAmount('shipping', $shippingExact);
+                $address->setBaseTotalAmount('shipping', $baseShippingExact);
             } else {
                 $storeRate      = $calc->getStoreRate($addressTaxRequest, $store);
                 $storeTax       = $calc->calcTaxAmount($shipping, $storeRate, true, false);
@@ -115,24 +123,28 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
                 $shipping       = $calc->round($shipping - $storeTax);
                 $baseShipping   = $calc->round($baseShipping - $baseStoreTax);
                 $tax            = $this->_round($calc->calcTaxAmount($shipping, $rate, false, false), $rate, false);
-                $baseTax        = $this->_round($calc->calcTaxAmount($baseShipping, $rate, false, false), $rate, false, 'base');
+                $baseTax        = $this->_round(
+                    $calc->calcTaxAmount($baseShipping, $rate, false, false), $rate, false, 'base');
                 $taxShipping    = $shipping + $tax;
-                $baseTaxShipping= $baseShipping + $baseTax;
+                $baseTaxShipping = $baseShipping + $baseTax;
                 $taxable        = $shipping;
                 $baseTaxable    = $baseShipping;
                 $isPriceInclTax = false;
+                $address->setTotalAmount('shipping', $shipping);
+                $address->setBaseTotalAmount('shipping', $baseShipping);
             }
         } else {
             $tax            = $this->_round($calc->calcTaxAmount($shipping, $rate, false, false), $rate, false);
-            $baseTax        = $this->_round($calc->calcTaxAmount($baseShipping, $rate, false, false), $rate, false, 'base');
+            $baseTax        = $this->_round(
+                $calc->calcTaxAmount($baseShipping, $rate, false, false), $rate, false, 'base');
             $taxShipping    = $shipping + $tax;
-            $baseTaxShipping= $baseShipping + $baseTax;
+            $baseTaxShipping = $baseShipping + $baseTax;
             $taxable        = $shipping;
             $baseTaxable    = $baseShipping;
             $isPriceInclTax = false;
+            $address->setTotalAmount('shipping', $shipping);
+            $address->setBaseTotalAmount('shipping', $baseShipping);
         }
-        $address->setTotalAmount('shipping', $shipping);
-        $address->setBaseTotalAmount('shipping', $baseShipping);
         $address->setShippingInclTax($taxShipping);
         $address->setBaseShippingInclTax($baseTaxShipping);
         $address->setShippingTaxable($taxable);
@@ -167,18 +179,6 @@ protected function _round($price, $rate, $direction, $type = 'regular')
         return $this->_calculator->round($price+$delta);
     }
 
-
-
-
-
-
-
-
-
-
-
-
-
     /**
      * Get request for fetching store tax rate
      *
diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php
index d4062b2d469..fe4abd0130d 100644
--- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php
+++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php
@@ -42,12 +42,41 @@ class Mage_Tax_Model_Sales_Total_Quote_Subtotal extends Mage_Sales_Model_Quote_A
      * @var Mage_Tax_Model_Config
      */
     protected $_config = null;
+
+    /**
+     * Tax helper instance
+     *
+     * @var Mage_Tax_Helper_Data|null
+     */
     protected $_helper = null;
 
-    protected $_subtotalInclTax     = 0;
+    /**
+     * Default value for subtotal that include taxes
+     *
+     * @var float
+     */
+    protected $_subtotalInclTax = 0;
+
+    /**
+     * Default value for base subtotal that include taxes
+     *
+     * @var float
+     */
     protected $_baseSubtotalInclTax = 0;
-    protected $_subtotal            = 0;
-    protected $_baseSubtotal        = 0;
+
+    /**
+     * Default value for subtotal
+     *
+     * @var float
+     */
+    protected $_subtotal = 0;
+
+    /**
+     * Default value for base subtotal
+     *
+     * @var float
+     */
+    protected $_baseSubtotal = 0;
 
     /**
      * Flag which is initialized when collect method is started and catalog prices include tax.
@@ -156,10 +185,10 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
     }
 
     /**
-     * Caclulate item price and row total with configured rounding level
+     * Calculate item price and row total with configured rounding level
      *
-     * @param Mage_Sales_Model_Quote_Address $address
      * @param Mage_Sales_Model_Quote_Item_Abstract $item
+     * @param Varien_Object $taxRequest
      * @return Mage_Tax_Model_Sales_Total_Quote_Subtotal
      */
     protected function _processItem($item, $taxRequest)
@@ -193,8 +222,8 @@ protected function _unitBaseCalculation($item, $request)
         $rate   = $this->_calculator->getRate($request);
         $qty    = $item->getTotalQty();
 
-        $price          = $taxPrice         = $item->getCalculationPriceOriginal();
-        $basePrice      = $baseTaxPrice     = $item->getBaseCalculationPriceOriginal();
+        $price          = $taxPrice         = $this->_calculator->round($item->getCalculationPriceOriginal());
+        $basePrice      = $baseTaxPrice     = $this->_calculator->round($item->getBaseCalculationPriceOriginal());
         $subtotal       = $taxSubtotal      = $item->getRowTotal();
         $baseSubtotal   = $baseTaxSubtotal  = $item->getBaseRowTotal();
         $taxOnOrigPrice = !$this->_helper->applyTaxOnCustomPrice($this->_store) && $item->hasCustomPrice();
@@ -207,16 +236,16 @@ protected function _unitBaseCalculation($item, $request)
         $item->setTaxPercent($rate);
         if ($this->_config->priceIncludesTax($this->_store)) {
             if ($this->_sameRateAsStore($request)) {
-                $tax            = $this->_calculator->calcTaxAmount($price, $rate, true);
-                $baseTax        = $this->_calculator->calcTaxAmount($basePrice, $rate, true);
-                $taxPrice       = $price;
-                $baseTaxPrice   = $basePrice;
-                $taxSubtotal    = $subtotal;
-                $baseTaxSubtotal= $baseSubtotal;
-                $price          = $price - $tax;
-                $basePrice      = $basePrice - $baseTax;
-                $subtotal       = $price * $qty;
-                $baseSubtotal   = $basePrice * $qty;
+                $tax             = $this->_calculator->calcTaxAmount($price, $rate, true);
+                $baseTax         = $this->_calculator->calcTaxAmount($basePrice, $rate, true);
+                $taxPrice        = $price;
+                $baseTaxPrice    = $basePrice;
+                $taxSubtotal     = $subtotal;
+                $baseTaxSubtotal = $baseSubtotal;
+                $price           = $price - $tax;
+                $basePrice       = $basePrice - $baseTax;
+                $subtotal        = $price * $qty;
+                $baseSubtotal    = $basePrice * $qty;
                 if ($taxOnOrigPrice) {
                     $taxable        = $origPrice;
                     $baseTaxable    = $baseOrigPrice;
@@ -226,36 +255,36 @@ protected function _unitBaseCalculation($item, $request)
                 }
                 $isPriceInclTax = true;
             } else {
-                $storeRate      = $this->_calculator->getStoreRate($request, $this->_store);
-                $storeTax       = $this->_calculator->calcTaxAmount($price, $storeRate, true);
-                $baseStoreTax   = $this->_calculator->calcTaxAmount($basePrice, $storeRate, true);
-                $price          = $price - $storeTax;
-                $basePrice      = $basePrice - $baseStoreTax;
-                $subtotal       = $price * $qty;
-                $baseSubtotal   = $basePrice * $qty;
-
-                $tax            = $this->_calculator->calcTaxAmount($price, $rate, false);
-                $baseTax        = $this->_calculator->calcTaxAmount($basePrice, $rate, false);
-                $taxPrice       = $price + $tax;
-                $baseTaxPrice   = $basePrice + $baseTax;
-                $taxSubtotal    = $taxPrice * $qty;
-                $baseTaxSubtotal= $baseTaxPrice * $qty;
+                $storeRate       = $this->_calculator->getStoreRate($request, $this->_store);
+                $storeTax        = $this->_calculator->calcTaxAmount($price, $storeRate, true, false);
+                $baseStoreTax    = $this->_calculator->calcTaxAmount($basePrice, $storeRate, true, false);
+                $price           = $this->_calculator->round($price - $storeTax);
+                $basePrice       = $this->_calculator->round($basePrice - $baseStoreTax);
+                $subtotal        = $price * $qty;
+                $baseSubtotal    = $basePrice * $qty;
+
+                $tax             = $this->_calculator->calcTaxAmount($price, $rate, false);
+                $baseTax         = $this->_calculator->calcTaxAmount($basePrice, $rate, false);
+                $taxPrice        = $price + $tax;
+                $baseTaxPrice    = $basePrice + $baseTax;
+                $taxSubtotal     = $taxPrice * $qty;
+                $baseTaxSubtotal = $baseTaxPrice * $qty;
                 if ($taxOnOrigPrice) {
-                    $taxable        = $origPrice - $storeTax;
-                    $baseTaxable    = $baseOrigPrice - $baseStoreTax;
+                    $taxable        = $this->_calculator->round($origPrice - $storeTax + $tax);
+                    $baseTaxable    = $this->_calculator->round($baseOrigPrice - $baseStoreTax + $baseTax);
                 } else {
-                    $taxable        = $price;
-                    $baseTaxable    = $basePrice;
+                    $taxable        = $taxPrice;
+                    $baseTaxable    = $baseTaxPrice;
                 }
-                $isPriceInclTax = false;
+                $isPriceInclTax = true;
             }
         } else {
-            $tax            = $this->_calculator->calcTaxAmount($price, $rate, false);
-            $baseTax        = $this->_calculator->calcTaxAmount($basePrice, $rate, false);
-            $taxPrice       = $price + $tax;
-            $baseTaxPrice   = $basePrice + $baseTax;
-            $taxSubtotal    = $taxPrice * $qty;
-            $baseTaxSubtotal= $baseTaxPrice * $qty;
+            $tax             = $this->_calculator->calcTaxAmount($price, $rate, false);
+            $baseTax         = $this->_calculator->calcTaxAmount($basePrice, $rate, false);
+            $taxPrice        = $price + $tax;
+            $baseTaxPrice    = $basePrice + $baseTax;
+            $taxSubtotal     = $taxPrice * $qty;
+            $baseTaxSubtotal = $baseTaxPrice * $qty;
             if ($taxOnOrigPrice) {
                 $taxable        = $origPrice;
                 $baseTaxable    = $baseOrigPrice;
@@ -305,8 +334,8 @@ protected function _rowBaseCalculation($item, $request)
         $rate   = $this->_calculator->getRate($request);
         $qty    = $item->getTotalQty();
 
-        $price          = $taxPrice         = $item->getCalculationPriceOriginal();
-        $basePrice      = $baseTaxPrice     = $item->getBaseCalculationPriceOriginal();
+        $price          = $taxPrice         = $this->_calculator->round($item->getCalculationPriceOriginal());
+        $basePrice      = $baseTaxPrice     = $this->_calculator->round($item->getBaseCalculationPriceOriginal());
         $subtotal       = $taxSubtotal      = $item->getRowTotal();
         $baseSubtotal   = $baseTaxSubtotal  = $item->getBaseRowTotal();
         $taxOnOrigPrice = !$this->_helper->applyTaxOnCustomPrice($this->_store) && $item->hasCustomPrice();
@@ -318,16 +347,16 @@ protected function _rowBaseCalculation($item, $request)
         $item->setTaxPercent($rate);
         if ($this->_config->priceIncludesTax($this->_store)) {
             if ($this->_sameRateAsStore($request)) {
-                $rowTax         = $this->_calculator->calcTaxAmount($subtotal, $rate, true, false);
-                $baseRowTax     = $this->_calculator->calcTaxAmount($baseSubtotal, $rate, true, false);
-                $taxPrice       = $price;
-                $baseTaxPrice   = $basePrice;
-                $taxSubtotal    = $subtotal;
-                $baseTaxSubtotal= $baseSubtotal;
-                $subtotal       = $this->_calculator->round($subtotal - $rowTax);
-                $baseSubtotal   = $this->_calculator->round($baseSubtotal - $baseRowTax);
-                $price          = $this->_calculator->round($subtotal/$qty);
-                $basePrice      = $this->_calculator->round($baseSubtotal/$qty);
+                $rowTax          = $this->_calculator->calcTaxAmount($subtotal, $rate, true, true);
+                $baseRowTax      = $this->_calculator->calcTaxAmount($baseSubtotal, $rate, true, true);
+                $taxPrice        = $price;
+                $baseTaxPrice    = $basePrice;
+                $taxSubtotal     = $subtotal;
+                $baseTaxSubtotal = $baseSubtotal;
+                $subtotal        = $this->_calculator->round($subtotal - $rowTax);
+                $baseSubtotal    = $this->_calculator->round($baseSubtotal - $baseRowTax);
+                $price           = $this->_calculator->round($subtotal/$qty);
+                $basePrice       = $this->_calculator->round($baseSubtotal/$qty);
                 if ($taxOnOrigPrice) {
                     $taxable        = $origSubtotal;
                     $baseTaxable    = $baseOrigSubtotal;
@@ -337,36 +366,37 @@ protected function _rowBaseCalculation($item, $request)
                 }
                 $isPriceInclTax = true;
             } else {
-                $storeRate      = $this->_calculator->getStoreRate($request, $this->_store);
-                $storeTax       = $this->_calculator->calcTaxAmount($subtotal, $storeRate, true, false);
-                $baseStoreTax   = $this->_calculator->calcTaxAmount($baseSubtotal, $storeRate, true, false);
-                $subtotal       = $this->_calculator->round($subtotal - $storeTax);
-                $baseSubtotal   = $this->_calculator->round($baseSubtotal - $baseStoreTax);
-                $price          = $this->_calculator->round($subtotal/$qty);
-                $basePrice      = $this->_calculator->round($baseSubtotal/$qty);
-
-                $rowTax         = $this->_calculator->calcTaxAmount($subtotal, $rate, false, false);
-                $baseRowTax     = $this->_calculator->calcTaxAmount($baseSubtotal, $rate, false, false);
-                $taxSubtotal    = $subtotal + $rowTax;
-                $baseTaxSubtotal= $baseSubtotal + $baseRowTax;
-                $taxPrice       = $this->_calculator->round($taxSubtotal/$qty);
-                $baseTaxPrice   = $this->_calculator->round($baseTaxSubtotal/$qty);
+                $storeRate       = $this->_calculator->getStoreRate($request, $this->_store);
+                $storeTax        = $this->_calculator->calcTaxAmount($subtotal, $storeRate, true, false);
+                $baseStoreTax    = $this->_calculator->calcTaxAmount($baseSubtotal, $storeRate, true, false);
+                $subtotal        = $this->_calculator->round($subtotal - $storeTax);
+                $baseSubtotal    = $this->_calculator->round($baseSubtotal - $baseStoreTax);
+                $price           = $this->_calculator->round($subtotal/$qty);
+                $basePrice       = $this->_calculator->round($baseSubtotal/$qty);
+
+                $rowTax          = $this->_calculator->calcTaxAmount($subtotal, $rate, false, false);
+                $baseRowTax      = $this->_calculator->calcTaxAmount($baseSubtotal, $rate, false, false);
+                $taxSubtotal     = $subtotal + $rowTax;
+                $baseTaxSubtotal = $baseSubtotal + $baseRowTax;
+                $taxPrice        = $this->_calculator->round($taxSubtotal/$qty);
+                $baseTaxPrice    = $this->_calculator->round($baseTaxSubtotal/$qty);
                 if ($taxOnOrigPrice) {
-                    $taxable        = $this->_calculator->round($origSubtotal - $storeTax);
-                    $baseTaxable    = $this->_calculator->round($baseOrigSubtotal - $baseStoreTax);
+                    $taxable        = $this->_calculator->round($origSubtotal - $storeTax + $rowTax);
+                    $baseTaxable    = $this->_calculator->round($baseOrigSubtotal - $baseStoreTax + $baseRowTax);
                 } else {
-                    $taxable        = $subtotal;
-                    $baseTaxable    = $baseSubtotal;
+                    $taxable        = $taxSubtotal;
+                    $baseTaxable    = $baseTaxSubtotal;
                 }
-                $isPriceInclTax = false;
+                $isPriceInclTax = true;
             }
         } else {
             $rowTax     = $this->_calculator->calcTaxAmount($subtotal, $rate, false, false);
             $baseRowTax = $this->_calculator->calcTaxAmount($baseSubtotal, $rate, false, false);
-            $taxSubtotal    = $subtotal + $rowTax;
-            $baseTaxSubtotal= $baseSubtotal + $baseRowTax;
-            $taxPrice       = $this->_calculator->round($taxSubtotal/$qty);
-            $baseTaxPrice   = $this->_calculator->round($baseTaxSubtotal/$qty);
+
+            $taxSubtotal     = $subtotal + $rowTax;
+            $baseTaxSubtotal = $baseSubtotal + $baseRowTax;
+            $taxPrice        = $this->_calculator->round($taxSubtotal/$qty);
+            $baseTaxPrice    = $this->_calculator->round($baseTaxSubtotal/$qty);
             if ($taxOnOrigPrice) {
                 $taxable        = $origSubtotal;
                 $baseTaxable    = $baseOrigSubtotal;
@@ -421,11 +451,13 @@ protected function _totalBaseCalculation($item, $request)
         $rate   = $calc->getRate($request);
         $qty    = $item->getTotalQty();
 
-        $price          = $taxPrice         = $item->getCalculationPriceOriginal();
-        $basePrice      = $baseTaxPrice     = $item->getBaseCalculationPriceOriginal();
+        $price          = $taxPrice         = $this->_calculator->round($item->getCalculationPriceOriginal());
+        $basePrice      = $baseTaxPrice     = $this->_calculator->round($item->getBaseCalculationPriceOriginal());
         $subtotal       = $taxSubtotal      = $item->getRowTotal();
         $baseSubtotal   = $baseTaxSubtotal  = $item->getBaseRowTotal();
 
+        $subtotalExact = $baseSubtotalExact = 0;
+
         $taxOnOrigPrice = !$this->_helper->applyTaxOnCustomPrice($this->_store) && $item->hasCustomPrice();
         if ($taxOnOrigPrice) {
             $origSubtotal       = $item->getOriginalPrice() * $qty;
@@ -435,39 +467,40 @@ protected function _totalBaseCalculation($item, $request)
         if ($this->_config->priceIncludesTax($this->_store)) {
             if ($this->_sameRateAsStore($request)) {
                 if ($taxOnOrigPrice) {
-                    $rowTax =
-                        $this->_deltaRound($calc->calcTaxAmount($origSubtotal, $rate, true, false), $rate, true);
-                    $baseRowTax =
-                        $this->_deltaRound(
-                            $calc->calcTaxAmount($baseOrigSubtotal, $rate, true, false), $rate, true, 'base'
-                        );
+                    $rowTaxExact = $calc->calcTaxAmount($origSubtotal, $rate, true, false);
+                    $rowTax = $this->_deltaRound($rowTaxExact, $rate, true);
+                    $baseRowTaxExact = $calc->calcTaxAmount($baseOrigSubtotal, $rate, true, false);
+                    $baseRowTax = $this->_deltaRound($baseRowTaxExact, $rate, true, 'base');
 
                     $taxable        = $origSubtotal;
                     $baseTaxable    = $baseOrigSubtotal;
                 } else {
-                    $rowTax =
-                        $this->_deltaRound($calc->calcTaxAmount($subtotal, $rate, true, false), $rate, true);
-                    $baseRowTax =
-                        $this->_deltaRound(
-                            $calc->calcTaxAmount($baseSubtotal, $rate, true, false), $rate, true, 'base'
-                        );
+                    $rowTaxExact = $calc->calcTaxAmount($subtotal, $rate, true, false);
+                    $rowTax = $this->_deltaRound($rowTaxExact, $rate, true);
+                    $baseRowTaxExact = $calc->calcTaxAmount($baseSubtotal, $rate, true, false);
+                    $baseRowTax = $this->_deltaRound($baseRowTaxExact, $rate, true, 'base');
 
                     $taxable        = $subtotal;
                     $baseTaxable    = $baseSubtotal;
                 }
-                $taxPrice       = $price;
-                $baseTaxPrice   = $basePrice;
+                $taxPrice        = $price;
+                $baseTaxPrice    = $basePrice;
 
-                $taxSubtotal    = $subtotal;
-                $baseTaxSubtotal= $baseSubtotal;
+                $taxSubtotal     = $subtotal;
+                $baseTaxSubtotal = $baseSubtotal;
 
+                $subtotalExact  = $subtotal - $rowTaxExact;
                 $subtotal       = $subtotal - $rowTax;
+                $baseSubtotalExact = $baseSubtotal - $baseRowTaxExact;
                 $baseSubtotal   = $baseSubtotal - $baseRowTax;
 
-                $price          = $calc->round($subtotal/$qty);
-                $basePrice      = $calc->round($baseSubtotal/$qty);
+                $price           = $calc->round($subtotal/$qty);
+                $basePrice       = $calc->round($baseSubtotal/$qty);
 
                 $isPriceInclTax = true;
+
+                $item->setRowTotalExact($subtotalExact);
+                $item->setBaseRowTotalExact($baseSubtotalExact);
             } else {
                 $storeRate      = $calc->getStoreRate($request, $this->_store);
                 if ($taxOnOrigPrice) {
@@ -483,23 +516,23 @@ protected function _totalBaseCalculation($item, $request)
                 $price          = $calc->round($subtotal/$qty);
                 $basePrice      = $calc->round($baseSubtotal/$qty);
 
-                $rowTax =
+                $rowTax         =
                     $this->_deltaRound($calc->calcTaxAmount($subtotal, $rate, false, false), $rate, true);
-                $baseRowTax =
+                $baseRowTax     =
                     $this->_deltaRound(
                         $calc->calcTaxAmount($baseSubtotal, $rate, false, false), $rate, true, 'base'
                     );
 
-                $taxSubtotal    = $subtotal + $rowTax;
-                $baseTaxSubtotal= $baseSubtotal + $baseRowTax;
+                $taxSubtotal     = $subtotal + $rowTax;
+                $baseTaxSubtotal = $baseSubtotal + $baseRowTax;
 
-                $taxPrice       = $calc->round($taxSubtotal/$qty);
-                $baseTaxPrice   = $calc->round($baseTaxSubtotal/$qty);
+                $taxPrice        = $calc->round($taxSubtotal/$qty);
+                $baseTaxPrice    = $calc->round($baseTaxSubtotal/$qty);
 
-                $taxable        = $subtotal;
-                $baseTaxable    = $baseSubtotal;
+                $taxable         = $taxSubtotal;
+                $baseTaxable     = $baseTaxSubtotal;
 
-                $isPriceInclTax = false;
+                $isPriceInclTax  = true;
             }
         } else {
             if ($taxOnOrigPrice) {
@@ -521,13 +554,13 @@ protected function _totalBaseCalculation($item, $request)
                 $baseTaxable    = $baseSubtotal;
             }
 
-            $taxSubtotal    = $subtotal + $rowTax;
-            $baseTaxSubtotal= $baseSubtotal + $baseRowTax;
+            $taxSubtotal     = $subtotal + $rowTax;
+            $baseTaxSubtotal = $baseSubtotal + $baseRowTax;
 
-            $taxPrice       = $calc->round($taxSubtotal/$qty);
-            $baseTaxPrice   = $calc->round($baseTaxSubtotal/$qty);
+            $taxPrice        = $calc->round($taxSubtotal/$qty);
+            $baseTaxPrice    = $calc->round($baseTaxSubtotal/$qty);
 
-            $isPriceInclTax = false;
+            $isPriceInclTax  = false;
         }
 
         if ($item->hasCustomPrice()) {
@@ -591,7 +624,7 @@ protected function _sameRateAsStore($request)
      * @param string $type
      * @return float
      */
-    protected function _deltaRound($price, $rate, $direction, $type='regular')
+    protected function _deltaRound($price, $rate, $direction, $type = 'regular')
     {
         if ($price) {
             $rate  = (string) $rate;
@@ -612,30 +645,33 @@ protected function _deltaRound($price, $rate, $direction, $type='regular')
      */
     protected function _recalculateParent(Mage_Sales_Model_Quote_Item_Abstract $item)
     {
-        $price       = 0;
-        $basePrice   = 0;
-        $rowTotal    = 0;
-        $baseRowTotal= 0;
-        $priceInclTax       = 0;
-        $basePriceInclTax   = 0;
-        $rowTotalInclTax    = 0;
-        $baseRowTotalInclTax= 0;
+        $price = 0;
+        $basePrice = 0;
+        $rowTotal = 0;
+        $baseRowTotal = 0;
+        $priceInclTax = 0;
+        $basePriceInclTax = 0;
+        $rowTotalInclTax = 0;
+        $baseRowTotalInclTax = 0;
+        $store = $item->getStore();
+        $qty = $item->getQty();
+
         foreach ($item->getChildren() as $child) {
-            $price              += $child->getPrice() * $child->getQty();
-            $basePrice          += $child->getBasePrice() * $child->getQty();
-            $rowTotal           += $child->getRowTotal();
-            $baseRowTotal       += $child->getBaseRowTotal();
-            $priceInclTax       += $child->getPriceInclTax() * $child->getQty();
-            $basePriceInclTax   += $child->getBasePriceInclTax() * $child->getQty();
-            $rowTotalInclTax    += $child->getRowTotalInclTax();
-            $baseRowTotalInclTax+= $child->getBaseRowTotalInclTax();
+            $price += $child->getRowTotal();
+            $basePrice += $child->getBaseRowTotal();
+            $rowTotal += $child->getRowTotal();
+            $baseRowTotal += $child->getBaseRowTotal();
+            $priceInclTax += $child->getRowTotalInclTax();
+            $basePriceInclTax += $child->getBaseRowTotalInclTax();
+            $rowTotalInclTax += $child->getRowTotalInclTax();
+            $baseRowTotalInclTax += $child->getBaseRowTotalInclTax();
         }
-        $item->setConvertedPrice($price);
-        $item->setPrice($basePrice);
+        $item->setConvertedPrice($store->roundPrice($price) / $qty);
+        $item->setPrice($store->roundPrice($basePrice) / $qty);
         $item->setRowTotal($rowTotal);
         $item->setBaseRowTotal($baseRowTotal);
-        $item->setPriceInclTax($priceInclTax);
-        $item->setBasePriceInclTax($basePriceInclTax);
+        $item->setPriceInclTax($store->roundPrice($priceInclTax) / $qty);
+        $item->setBasePriceInclTax($store->roundPrice($basePriceInclTax) / $qty);
         $item->setRowTotalInclTax($rowTotalInclTax);
         $item->setBaseRowTotalInclTax($baseRowTotalInclTax);
         return $this;
@@ -681,26 +717,25 @@ protected function _getAddressTaxRequest($address)
      */
     protected function _addSubtotalAmount(Mage_Sales_Model_Quote_Address $address, $item)
     {
-        $address->setTotalAmount('subtotal', $address->getTotalAmount('subtotal')+$item->getRowTotal());
-        $address->setBaseTotalAmount('subtotal', $address->getBaseTotalAmount('subtotal')+$item->getBaseRowTotal());
-        $address->setSubtotalInclTax($address->getSubtotalInclTax()+$item->getRowTotalInclTax());
-        $address->setBaseSubtotalInclTax($address->getBaseSubtotalInclTax()+$item->getBaseRowTotalInclTax());
+        if ($item->getRowTotalExact() && $item->getBaseRowTotalExact()) {
+            $address->setTotalAmount('subtotal',
+                $address->getTotalAmount('subtotal') + $item->getRowTotalExact()
+            );
+            $address->setBaseTotalAmount('subtotal',
+                $address->getBaseTotalAmount('subtotal') + $item->getBaseRowTotalExact());
+        }
+        else {
+            $address->setTotalAmount('subtotal',
+                $address->getTotalAmount('subtotal') + $item->getRowTotal()
+            );
+            $address->setBaseTotalAmount('subtotal',
+                $address->getBaseTotalAmount('subtotal') + $item->getBaseRowTotal());
+        }
+        $address->setSubtotalInclTax($address->getSubtotalInclTax() + $item->getRowTotalInclTax());
+        $address->setBaseSubtotalInclTax($address->getBaseSubtotalInclTax() + $item->getBaseRowTotalInclTax());
         return $this;
     }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
     /**
      * Unset item prices/totals with price include tax.
      * Operation is necessary for reset item state in case if configuration was changed
@@ -732,7 +767,9 @@ protected function _processShippingAmount($address)
     /**
      * Recollect item price and row total using after taxes subtract.
      * Declare item price including tax attributes
+     *
      * @deprecated after 1.4.1
+     * @param   Mage_Sales_Model_Quote_Address $address
      * @param   Mage_Sales_Model_Quote_Item_Abstract $item
      * @return  Mage_Tax_Model_Sales_Total_Quote_Subtotal
      */
@@ -824,6 +861,8 @@ protected function _needSubtractTax($address)
     }
 
     /**
+     * Subtract shipping tax
+     *
      * @deprecated after 1.4.0.1
      *
      * @param Mage_Sales_Model_Quote_Address $address
diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php
index 2c16e5ebd06..c9761c00a31 100644
--- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php
+++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php
@@ -58,10 +58,23 @@ class Mage_Tax_Model_Sales_Total_Quote_Tax extends Mage_Sales_Model_Quote_Addres
      */
     protected $_areTaxRequestsSimilar = false;
 
-
+    /**
+     * Array for the rounding deltas
+     *
+     * @var array
+     */
     protected $_roundingDeltas = array();
+
+    /**
+     * Array for the base rounding deltas
+     *
+     * @var array
+     */
     protected $_baseRoundingDeltas = array();
 
+    /**
+     * @var Mage_Core_Model_Store
+     */
     protected $_store;
 
     /**
@@ -80,6 +93,51 @@ public function __construct()
         $this->_helper      = Mage::helper('tax');
         $this->_calculator  = Mage::getSingleton('tax/calculation');
         $this->_config      = Mage::getSingleton('tax/config');
+        $this->_weeeHelper = Mage::helper('weee');
+    }
+
+    /**
+     * Round the total amounts in address
+     *
+     * @param Mage_Sales_Model_Quote_Address $address
+     * @return Mage_Tax_Model_Sales_Total_Quote_Tax
+     */
+    protected function _roundTotals(Mage_Sales_Model_Quote_Address $address)
+    {
+        // initialize the delta to a small number to avoid non-deterministic behavior with rounding of 0.5
+        $totalDelta = 0.000001;
+        $baseTotalDelta = 0.000001;
+        /*
+         * The order of rounding is import here.
+         * Tax is rounded first, to be consistent with unit based calculation.
+         * Hidden tax and shipping_hidden_tax are rounded next, which are really part of tax.
+         * Shipping is rounded before subtotal to minimize the chance that subtotal is
+         * rounded differently because of the delta.
+         * Here is an example: 19.2% tax rate, subtotal = 49.95, shipping = 9.99, discount = 20%
+         * subtotalExclTax = 41.90436, tax = 7.7238, hidden_tax = 1.609128, shippingPriceExclTax = 8.38087
+         * shipping_hidden_tax = 0.321826, discount = -11.988
+         * The grand total is 47.952 ~= 47.95
+         * The rounded values are:
+         * tax = 7.72, hidden_tax = 1.61, shipping_hidden_tax = 0.32,
+         * shipping = 8.39 (instead of 8.38 from simple rounding), subtotal = 41.9, discount = -11.99
+         * The grand total calculated from the rounded value is 47.95
+         * If we simply round each value and add them up, the result is 47.94, which is one penny off
+         */
+        $totalCodes = array('tax', 'hidden_tax', 'shipping_hidden_tax', 'shipping', 'subtotal', 'weee', 'discount');
+        foreach ($totalCodes as $totalCode) {
+            $exactAmount = $address->getTotalAmount($totalCode);
+            $baseExactAmount = $address->getBaseTotalAmount($totalCode);
+            if (!$exactAmount && !$baseExactAmount) {
+                continue;
+            }
+            $roundedAmount = $this->_calculator->round($exactAmount + $totalDelta);
+            $baseRoundedAmount = $this->_calculator->round($baseExactAmount + $baseTotalDelta);
+            $address->setTotalAmount($totalCode, $roundedAmount);
+            $address->setBaseTotalAmount($totalCode, $baseRoundedAmount);
+            $totalDelta = $exactAmount + $totalDelta - $roundedAmount;
+            $baseTotalDelta = $baseExactAmount + $baseTotalDelta - $baseRoundedAmount;
+        }
+        return $this;
     }
 
     /**
@@ -145,6 +203,8 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
 
         $this->_processHiddenTaxes();
 
+        //round total amounts in address
+        $this->_roundTotals($address);
         return $this;
     }
 
@@ -170,17 +230,20 @@ protected function _processHiddenTaxes()
                 $qty            = $taxInfoItem['qty'];
 
                 if ($this->_config->getAlgorithm($this->_store) == Mage_Tax_Model_Calculation::CALC_TOTAL_BASE) {
+                    $this->_getAddress()->addTotalAmount('hidden_tax', max(0, $qty * $hiddenTax));
+                    $this->_getAddress()->addBaseTotalAmount('hidden_tax', max(0, $qty * $baseHiddenTax));
                     $hiddenTax      = $this->_deltaRound($hiddenTax, $rateKey, $inclTax);
                     $baseHiddenTax  = $this->_deltaRound($baseHiddenTax, $rateKey, $inclTax, 'base');
+                    $item->setHiddenTaxAmount(max(0, $qty * $hiddenTax));
+                    $item->setBaseHiddenTaxAmount(max(0, $qty * $baseHiddenTax));
                 } else {
                     $hiddenTax      = $this->_calculator->round($hiddenTax);
                     $baseHiddenTax  = $this->_calculator->round($baseHiddenTax);
+                    $item->setHiddenTaxAmount(max(0, $qty * $hiddenTax));
+                    $item->setBaseHiddenTaxAmount(max(0, $qty * $baseHiddenTax));
+                    $this->_getAddress()->addTotalAmount('hidden_tax', $item->getHiddenTaxAmount());
+                    $this->_getAddress()->addBaseTotalAmount('hidden_tax', $item->getBaseHiddenTaxAmount());
                 }
-
-                $item->setHiddenTaxAmount(max(0, $qty * $hiddenTax));
-                $item->setBaseHiddenTaxAmount(max(0, $qty * $baseHiddenTax));
-                $this->_getAddress()->addTotalAmount('hidden_tax', $item->getHiddenTaxAmount());
-                $this->_getAddress()->addBaseTotalAmount('hidden_tax', $item->getBaseHiddenTaxAmount());
             } else {
                 // Shipping hidden taxes
                 $rateKey        = $taxInfoItem['rate_key'];
@@ -188,13 +251,24 @@ protected function _processHiddenTaxes()
                 $baseHiddenTax  = $taxInfoItem['base_value'];
                 $inclTax        = $taxInfoItem['incl_tax'];
 
-                $hiddenTax      = $this->_deltaRound($hiddenTax, $rateKey, $inclTax);
-                $baseHiddenTax  = $this->_deltaRound($baseHiddenTax, $rateKey, $inclTax, 'base');
+                if ($this->_config->getAlgorithm($this->_store) == Mage_Tax_Model_Calculation::CALC_TOTAL_BASE) {
+                    $this->_getAddress()->addTotalAmount('shipping_hidden_tax', $hiddenTax);
+                    $this->_getAddress()->addBaseTotalAmount('shipping_hidden_tax', $baseHiddenTax);
 
-                $this->_getAddress()->setShippingHiddenTaxAmount(max(0, $hiddenTax));
-                $this->_getAddress()->setBaseShippingHiddenTaxAmount(max(0, $baseHiddenTax));
-                $this->_getAddress()->addTotalAmount('shipping_hidden_tax', $hiddenTax);
-                $this->_getAddress()->addBaseTotalAmount('shipping_hidden_tax', $baseHiddenTax);
+                    $hiddenTax      = $this->_deltaRound($hiddenTax, $rateKey, $inclTax);
+                    $baseHiddenTax  = $this->_deltaRound($baseHiddenTax, $rateKey, $inclTax, 'base');
+
+                    $this->_getAddress()->setShippingHiddenTaxAmount(max(0, $hiddenTax));
+                    $this->_getAddress()->setBaseShippingHiddenTaxAmount(max(0, $baseHiddenTax));
+                } else {
+                    $hiddenTax      = $this->_deltaRound($hiddenTax, $rateKey, $inclTax);
+                    $baseHiddenTax  = $this->_deltaRound($baseHiddenTax, $rateKey, $inclTax, 'base');
+
+                    $this->_getAddress()->setShippingHiddenTaxAmount(max(0, $hiddenTax));
+                    $this->_getAddress()->setBaseShippingHiddenTaxAmount(max(0, $baseHiddenTax));
+                    $this->_getAddress()->addTotalAmount('shipping_hidden_tax', $hiddenTax);
+                    $this->_getAddress()->addBaseTotalAmount('shipping_hidden_tax', $baseHiddenTax);
+                }
             }
         }
     }
@@ -259,11 +333,15 @@ protected function _calculateShippingTax(Mage_Sales_Model_Quote_Address $address
         }
 
         if ($this->_config->getAlgorithm($this->_store) == Mage_Tax_Model_Calculation::CALC_TOTAL_BASE) {
+            $this->_addAmount(max(0, $tax));
+            $this->_addBaseAmount(max(0, $baseTax));
             $tax        = $this->_deltaRound($tax, $rate, $inclTax);
             $baseTax    = $this->_deltaRound($baseTax, $rate, $inclTax, 'base');
         } else {
             $tax        = $this->_calculator->round($tax);
             $baseTax    = $this->_calculator->round($baseTax);
+            $this->_addAmount(max(0, $tax));
+            $this->_addBaseAmount(max(0, $baseTax));
         }
 
         if ($inclTax && !empty($discountAmount)) {
@@ -277,8 +355,6 @@ protected function _calculateShippingTax(Mage_Sales_Model_Quote_Address $address
             );
         }
 
-        $this->_addAmount(max(0, $tax));
-        $this->_addBaseAmount(max(0, $baseTax));
         $address->setShippingTaxAmount(max(0, $tax));
         $address->setBaseShippingTaxAmount(max(0, $baseTax));
         $applied = $this->_calculator->getAppliedRates($taxRateRequest);
@@ -297,6 +373,7 @@ protected function _unitBaseCalculation(Mage_Sales_Model_Quote_Address $address,
     {
         $items = $this->_getAddressItems($address);
         $itemTaxGroups  = array();
+
         foreach ($items as $item) {
             if ($item->getParentItem()) {
                 continue;
@@ -362,37 +439,61 @@ protected function _calcUnitTaxAmount(Mage_Sales_Model_Quote_Item_Abstract $item
     {
         $qty        = $item->getTotalQty();
         $inclTax    = $item->getIsPriceInclTax();
-        $price      = $item->getTaxableAmount() + $item->getExtraTaxableAmount();
-        $basePrice  = $item->getBaseTaxableAmount() + $item->getBaseExtraTaxableAmount();
+        $price      = $item->getTaxableAmount();
+        $basePrice  = $item->getBaseTaxableAmount();
         $rateKey    = (string)$rate;
         $item->setTaxPercent($rate);
 
+        $isWeeeEnabled = $this->_weeeHelper->isEnabled();
+        $isWeeeTaxable = $this->_weeeHelper->isTaxable();
+
         $hiddenTax      = null;
         $baseHiddenTax  = null;
         switch ($this->_config->getCalculationSequence($this->_store)) {
             case Mage_Tax_Model_Calculation::CALC_TAX_BEFORE_DISCOUNT_ON_EXCL:
             case Mage_Tax_Model_Calculation::CALC_TAX_BEFORE_DISCOUNT_ON_INCL:
-                $unitTax        = $this->_calculator->calcTaxAmount($price, $rate, $inclTax);
-                $baseUnitTax    = $this->_calculator->calcTaxAmount($basePrice, $rate, $inclTax);
+                $unitTax        = $this->_calculator->calcTaxAmount($price, $rate, $inclTax, false);
+                $baseUnitTax    = $this->_calculator->calcTaxAmount($basePrice, $rate, $inclTax, false);
+
+                if ($isWeeeEnabled && $isWeeeTaxable) {
+                    $unitTax += $item->getWeeeTaxAppliedAmount() * $rate /100;
+                    $baseUnitTax += $item->getBaseWeeeTaxAppliedAmount() * $rate /100;
+                }
+                $unitTax = $this->_calculator->round($unitTax);
+                $baseUnitTax = $this->_calculator->round($baseUnitTax);
                 break;
             case Mage_Tax_Model_Calculation::CALC_TAX_AFTER_DISCOUNT_ON_EXCL:
             case Mage_Tax_Model_Calculation::CALC_TAX_AFTER_DISCOUNT_ON_INCL:
                 $discountAmount     = $item->getDiscountAmount() / $qty;
                 $baseDiscountAmount = $item->getBaseDiscountAmount() / $qty;
 
-                $unitTax = $this->_calculator->calcTaxAmount($price, $rate, $inclTax);
-                $discountRate = ($unitTax/$price) * 100;
-                $unitTaxDiscount = $this->_calculator->calcTaxAmount($discountAmount, $discountRate, $inclTax, false);
-                $unitTax = max($unitTax - $unitTaxDiscount, 0);
-                $baseUnitTax = $this->_calculator->calcTaxAmount($basePrice, $rate, $inclTax);
-                $baseDiscountRate = ($baseUnitTax/$basePrice) * 100;
-                $baseUnitTaxDiscount = $this->_calculator
-                    ->calcTaxAmount($baseDiscountAmount, $baseDiscountRate, $inclTax, false);
-                $baseUnitTax = max($baseUnitTax - $baseUnitTaxDiscount, 0);
+                if ($isWeeeEnabled) {
+                    $discountAmount = $discountAmount - $item->getWeeeDiscount() / $qty;
+                    $baseDiscountAmount = $baseDiscountAmount - $item->getBaseWeeeDiscount() / $qty;
+                }
 
+                $unitTaxBeforeDiscount = $this->_calculator->calcTaxAmount($price, $rate, $inclTax, false);
+                $unitTaxDiscount = $this->_calculator->calcTaxAmount($discountAmount, $rate, $inclTax, false);
+                $unitTax = $this->_calculator->round(max($unitTaxBeforeDiscount - $unitTaxDiscount, 0));
+
+                $baseUnitTaxBeforeDiscount = $this->_calculator->calcTaxAmount($basePrice, $rate, $inclTax, false);
+                $baseUnitTaxDiscount = $this->_calculator->calcTaxAmount($baseDiscountAmount, $rate, $inclTax, false);
+                $baseUnitTax = $this->_calculator->round(max($baseUnitTaxBeforeDiscount - $baseUnitTaxDiscount, 0));
+
+                if ($isWeeeEnabled && $this->_weeeHelper->isTaxable()) {
+                    $weeeTax = ($item->getWeeeTaxAppliedRowAmount() - $item->getWeeeDiscount()) * $rate / 100;
+                    $weeeTax = $weeeTax / $qty;
+                    $unitTax += $weeeTax;
+                    $baseWeeeTax =
+                        ($item->getBaseWeeeTaxAppliedRowAmount() - $item->getBaseWeeeDiscount()) * $rate / 100;
+                    $baseWeeeTax = $baseWeeeTax / $qty;
+                    $baseUnitTax += $baseWeeeTax;
+                }
+                $unitTax = $this->_calculator->round($unitTax);
+                $baseUnitTax = $this->_calculator->round($baseUnitTax);
                 if ($inclTax && $discountAmount > 0) {
-                    $hiddenTax      = $this->_calculator->calcTaxAmount($discountAmount, $rate, $inclTax, false);
-                    $baseHiddenTax  = $this->_calculator->calcTaxAmount($baseDiscountAmount, $rate, $inclTax, false);
+                    $hiddenTax      = $this->_calculator->round($unitTaxBeforeDiscount) - $unitTax;
+                    $baseHiddenTax  = $this->_calculator->round($baseUnitTaxBeforeDiscount) - $baseUnitTax;
                     $this->_hiddenTaxes[] = array(
                         'rate_key'   => $rateKey,
                         'qty'        => $qty,
@@ -413,11 +514,57 @@ protected function _calcUnitTaxAmount(Mage_Sales_Model_Quote_Item_Abstract $item
                         'incl_tax'   => $inclTax,
                     );
                 }
+                // calculate discount compensation
+                if (!$item->getNoDiscount() && $item->getWeeeTaxApplied()) {
+                    $unitTaxBeforeDiscount = $this->_calculator->calcTaxAmount(
+                        $price,
+                        $rate,
+                        $inclTax,
+                        false
+                    );
+                    $baseUnitTaxBeforeDiscount = $this->_calculator->calcTaxAmount(
+                        $price,
+                        $rate,
+                        $inclTax,
+                        false
+                    );
+                    if ($isWeeeTaxable) {
+                        $unitTaxBeforeDiscount += $item->getWeeeTaxAppliedAmount() * $rate / 100;
+                        $baseUnitTaxBeforeDiscount += $item->getBaseWeeeTaxAppliedAmount() * $rate / 100;
+                    }
+                    $unitTaxBeforeDiscount = max(0, $this->_calculator->round($unitTaxBeforeDiscount));
+                    $baseUnitTaxBeforeDiscount = max(0, $this->_calculator->round($baseUnitTaxBeforeDiscount));
+                    $item->setDiscountTaxCompensation($unitTaxBeforeDiscount * $qty - max(0, $unitTax) * $qty);
+                    $item->setBaseDiscountTaxCompensation(
+                        $baseUnitTaxBeforeDiscount * $qty - max(0, $baseUnitTax) * $qty
+                    );
+                }
                 break;
         }
+
         $item->setTaxAmount($this->_store->roundPrice(max(0, $qty*$unitTax)));
         $item->setBaseTaxAmount($this->_store->roundPrice(max(0, $qty*$baseUnitTax)));
 
+        $rowTotalInclTax = $item->getRowTotalInclTax();
+        if (!isset($rowTotalInclTax)) {
+            if ($this->_config->priceIncludesTax($this->_store)) {
+                $weeeTaxBeforeDiscount = 0;
+                $baseWeeeTaxBeforeDiscount = 0;
+                if ($isWeeeTaxable) {
+                    $weeeTaxBeforeDiscount = $item->getWeeeTaxAppliedRowAmount() * $rate/100;
+                    $baseWeeeTaxBeforeDiscount = $item->getBaseWeeeTaxAppliedRowAmount() * $rate/100;
+                }
+                $item->setRowTotalInclTax($price * $qty + $weeeTaxBeforeDiscount);
+                $item->setBaseRowTotalInclTax($basePrice * $qty + $baseWeeeTaxBeforeDiscount);
+            } else {
+                $taxCompensation = $item->getDiscountTaxCompensation() ? $item->getDiscountTaxCompensation() : 0;
+                $item->setRowTotalInclTax($price * $qty + $unitTax * $qty + $taxCompensation);
+                $item->setBaseRowTotalInclTax(
+                    $basePrice * $qty + $baseUnitTax * $qty + $item->getBaseDiscountTaxCompensation()
+                );
+            }
+        }
+
         return $this;
     }
 
@@ -432,6 +579,7 @@ protected function _rowBaseCalculation(Mage_Sales_Model_Quote_Address $address,
     {
         $items = $this->_getAddressItems($address);
         $itemTaxGroups  = array();
+
         foreach ($items as $item) {
             if ($item->getParentItem()) {
                 continue;
@@ -440,6 +588,7 @@ protected function _rowBaseCalculation(Mage_Sales_Model_Quote_Address $address,
                 foreach ($item->getChildren() as $child) {
                     $taxRateRequest->setProductClassId($child->getProduct()->getTaxClassId());
                     $rate = $this->_calculator->getRate($taxRateRequest);
+
                     $this->_calcRowTaxAmount($child, $rate);
                     $this->_addAmount($child->getTaxAmount());
                     $this->_addBaseAmount($child->getBaseTaxAmount());
@@ -496,23 +645,39 @@ protected function _rowBaseCalculation(Mage_Sales_Model_Quote_Address $address,
     protected function _calcRowTaxAmount($item, $rate)
     {
         $inclTax        = $item->getIsPriceInclTax();
-        $subtotal       = $item->getTaxableAmount() + $item->getExtraRowTaxableAmount();
-        $baseSubtotal   = $item->getBaseTaxableAmount() + $item->getBaseExtraRowTaxableAmount();
+        $subtotal       = $taxSubtotal = $item->getTaxableAmount();
+        $baseSubtotal   = $baseTaxSubtotal = $item->getBaseTaxableAmount();
         $rateKey        = (string)$rate;
         $item->setTaxPercent($rate);
 
+        $isWeeeEnabled = $this->_weeeHelper->isEnabled();
+        $isWeeeTaxable = $this->_weeeHelper->isTaxable();
+
         $hiddenTax      = null;
         $baseHiddenTax  = null;
         switch ($this->_helper->getCalculationSequence($this->_store)) {
             case Mage_Tax_Model_Calculation::CALC_TAX_BEFORE_DISCOUNT_ON_EXCL:
             case Mage_Tax_Model_Calculation::CALC_TAX_BEFORE_DISCOUNT_ON_INCL:
-                $rowTax     = $this->_calculator->calcTaxAmount($subtotal, $rate, $inclTax);
-                $baseRowTax = $this->_calculator->calcTaxAmount($baseSubtotal, $rate, $inclTax);
+                $rowTax = $this->_calculator->calcTaxAmount($subtotal, $rate, $inclTax, false);
+                $baseRowTax = $this->_calculator->calcTaxAmount($baseSubtotal, $rate, $inclTax, false);
+
+                if ($isWeeeEnabled && $isWeeeTaxable) {
+                    $rowTax += $item->getWeeeTaxAppliedRowAmount() * $rate / 100;
+                    $baseRowTax += $item->getBaseWeeeTaxAppliedRowAmount() * $rate / 100;
+                }
+                $rowTax = $this->_calculator->round($rowTax);
+                $baseRowTax = $this->_calculator->round($baseRowTax);
                 break;
             case Mage_Tax_Model_Calculation::CALC_TAX_AFTER_DISCOUNT_ON_EXCL:
             case Mage_Tax_Model_Calculation::CALC_TAX_AFTER_DISCOUNT_ON_INCL:
-                $discountAmount     = $item->getDiscountAmount();
+                $discountAmount = $item->getDiscountAmount();
                 $baseDiscountAmount = $item->getBaseDiscountAmount();
+
+                if ($isWeeeEnabled) {
+                    $discountAmount = $discountAmount - $item->getWeeeDiscount();
+                    $baseDiscountAmount = $baseDiscountAmount - $item->getBaseWeeeDiscount();
+                }
+
                 $rowTax = $this->_calculator->calcTaxAmount(
                     max($subtotal - $discountAmount, 0),
                     $rate,
@@ -523,9 +688,21 @@ protected function _calcRowTaxAmount($item, $rate)
                     $rate,
                     $inclTax
                 );
+
+                if ($isWeeeEnabled && $this->_weeeHelper->isTaxable()) {
+                    $weeeTax = ($item->getWeeeTaxAppliedRowAmount() - $item->getWeeeDiscount()) * $rate / 100;
+                    $rowTax += $weeeTax;
+                    $baseWeeeTax =
+                        ($item->getBaseWeeeTaxAppliedRowAmount() - $item->getBaseWeeeDiscount()) * $rate / 100;
+                    $baseRowTax += $baseWeeeTax;
+                }
+
+                $rowTax = $this->_calculator->round($rowTax);
+                $baseRowTax = $this->_calculator->round($baseRowTax);
+
                 if ($inclTax && $discountAmount > 0) {
-                    $hiddenTax      = $this->_calculator->calcTaxAmount($discountAmount, $rate, $inclTax, false);
-                    $baseHiddenTax  = $this->_calculator->calcTaxAmount($baseDiscountAmount, $rate, $inclTax, false);
+                    $hiddenTax      = $this->_calculator->calcTaxAmount($subtotal, $rate, $inclTax) - $rowTax;
+                    $baseHiddenTax  = $this->_calculator->calcTaxAmount($baseSubtotal, $rate, $inclTax) - $baseRowTax;
                     $this->_hiddenTaxes[] = array(
                         'rate_key'   => $rateKey,
                         'qty'        => 1,
@@ -546,10 +723,53 @@ protected function _calcRowTaxAmount($item, $rate)
                         'incl_tax'   => $inclTax,
                     );
                 }
+                // calculate discount compensation
+                if (!$item->getNoDiscount() && $item->getWeeeTaxApplied()) {
+                    $rowTaxBeforeDiscount = $this->_calculator->calcTaxAmount(
+                        $subtotal,
+                        $rate,
+                        $inclTax,
+                        false
+                    );
+                    $baseRowTaxBeforeDiscount = $this->_calculator->calcTaxAmount(
+                        $baseSubtotal,
+                        $rate,
+                        $inclTax,
+                        false
+                    );
+                    if ($isWeeeTaxable) {
+                        $rowTaxBeforeDiscount += $item->getWeeeTaxAppliedRowAmount() * $rate / 100;
+                        $baseRowTaxBeforeDiscount += $item->getBaseWeeeTaxAppliedRowAmount() * $rate / 100;
+                    }
+                    $rowTaxBeforeDiscount = max(0, $this->_calculator->round($rowTaxBeforeDiscount));
+                    $baseRowTaxBeforeDiscount = max(0, $this->_calculator->round($baseRowTaxBeforeDiscount));
+                    $item->setDiscountTaxCompensation($rowTaxBeforeDiscount - max(0, $rowTax));
+                    $item->setBaseDiscountTaxCompensation($baseRowTaxBeforeDiscount - max(0, $baseRowTax));
+                }
+
                 break;
         }
         $item->setTaxAmount(max(0, $rowTax));
         $item->setBaseTaxAmount(max(0, $baseRowTax));
+
+        $rowTotalInclTax = $item->getRowTotalInclTax();
+        if (!isset($rowTotalInclTax)) {
+            $weeeTaxBeforeDiscount = 0;
+            $baseWeeeTaxBeforeDiscount = 0;
+            if ($isWeeeTaxable) {
+                $weeeTaxBeforeDiscount = $item->getWeeeTaxAppliedRowAmount() * $rate/100;
+                $baseWeeeTaxBeforeDiscount = $item->getBaseWeeeTaxAppliedRowAmount() * $rate/100;
+            }
+            if ($this->_config->priceIncludesTax($this->_store)) {
+                $item->setRowTotalInclTax($subtotal + $weeeTaxBeforeDiscount);
+                $item->setBaseRowTotalInclTax($baseSubtotal + $baseWeeeTaxBeforeDiscount);
+            } else {
+                $taxCompensation = $item->getDiscountTaxCompensation() ? $item->getDiscountTaxCompensation() : 0;
+                $item->setRowTotalInclTax($subtotal + $rowTax + $taxCompensation);
+                $item->setBaseRowTotalInclTax($baseSubtotal + $baseRowTax + $item->getBaseDiscountTaxCompensation());
+            }
+        }
+
         return $this;
     }
 
@@ -606,11 +826,16 @@ protected function _totalBaseCalculation(Mage_Sales_Model_Quote_Address $address
         foreach ($taxGroups as $rateKey => $data) {
             $rate = (float) $rateKey;
             $inclTax = $data['incl_tax'];
-            $totalTax = $this->_calculator->calcTaxAmount(array_sum($data['totals']), $rate, $inclTax);
-            $baseTotalTax = $this->_calculator->calcTaxAmount(array_sum($data['base_totals']), $rate, $inclTax);
+
+            $totalTax = $this->_calculator->calcTaxAmount(array_sum($data['totals']), $rate, $inclTax, false);
+            $totalTax += array_sum($data['weee_tax']);
+            $baseTotalTax = $this->_calculator->calcTaxAmount(array_sum($data['base_totals']), $rate, $inclTax, false);
+            $baseTotalTax += array_sum($data['base_weee_tax']);
             $this->_addAmount($totalTax);
             $this->_addBaseAmount($baseTotalTax);
-            $this->_saveAppliedTaxes($address, $data['applied_rates'], $totalTax, $baseTotalTax, $rate);
+            $totalTaxRounded = $this->_calculator->round($totalTax);
+            $baseTotalTaxRounded = $this->_calculator->round($totalTaxRounded);
+            $this->_saveAppliedTaxes($address, $data['applied_rates'], $totalTaxRounded, $baseTotalTaxRounded, $rate);
         }
         return $this;
     }
@@ -625,15 +850,21 @@ protected function _totalBaseCalculation(Mage_Sales_Model_Quote_Address $address
      */
     protected function _aggregateTaxPerRate($item, $rate, &$taxGroups)
     {
-        $inclTax        = $item->getIsPriceInclTax();
-        $rateKey        = (string) $rate;
-        $taxSubtotal    = $subtotal     = $item->getTaxableAmount() + $item->getExtraRowTaxableAmount();
-        $baseTaxSubtotal= $baseSubtotal = $item->getBaseTaxableAmount() + $item->getBaseExtraRowTaxableAmount();
+        $inclTax         = $item->getIsPriceInclTax();
+        $rateKey         = (string) $rate;
+        $taxSubtotal     = $subtotal     = $item->getTaxableAmount();
+        $baseTaxSubtotal = $baseSubtotal = $item->getBaseTaxableAmount();
+
+        $isWeeeEnabled = $this->_weeeHelper->isEnabled();
+        $isWeeeTaxable = $this->_weeeHelper->isTaxable();
+
         $item->setTaxPercent($rate);
 
         if (!isset($taxGroups[$rateKey]['totals'])) {
             $taxGroups[$rateKey]['totals'] = array();
             $taxGroups[$rateKey]['base_totals'] = array();
+            $taxGroups[$rateKey]['weee_tax'] = array();
+            $taxGroups[$rateKey]['base_weee_tax'] = array();
         }
 
         $hiddenTax      = null;
@@ -641,23 +872,48 @@ protected function _aggregateTaxPerRate($item, $rate, &$taxGroups)
         switch ($this->_helper->getCalculationSequence($this->_store)) {
             case Mage_Tax_Model_Calculation::CALC_TAX_BEFORE_DISCOUNT_ON_EXCL:
             case Mage_Tax_Model_Calculation::CALC_TAX_BEFORE_DISCOUNT_ON_INCL:
-                $rowTax             = $this->_calculator->calcTaxAmount($subtotal, $rate, $inclTax, false);
-                $baseRowTax         = $this->_calculator->calcTaxAmount($baseSubtotal, $rate, $inclTax, false);
+                $rowTax = $this->_calculator->calcTaxAmount($subtotal, $rate, $inclTax, false);
+                $baseRowTax = $this->_calculator->calcTaxAmount($baseSubtotal, $rate, $inclTax, false);
+
+                if ($isWeeeEnabled && $isWeeeTaxable) {
+                    $weeeTax = $item->getWeeeTaxAppliedRowAmount() * $rate / 100;
+                    $baseWeeeTax = $item->getBaseWeeeTaxAppliedRowAmount() * $rate / 100;
+                    $rowTax  += $weeeTax;
+                    $baseRowTax += $baseWeeeTax;
+                    $taxGroups[$rateKey]['weee_tax'][] = $this->_deltaRound($weeeTax, $rateKey, $inclTax);
+                    $taxGroups[$rateKey]['base_weee_tax'][] = $this->_deltaRound($baseWeeeTax, $rateKey, $inclTax);
+                }
                 break;
             case Mage_Tax_Model_Calculation::CALC_TAX_AFTER_DISCOUNT_ON_EXCL:
             case Mage_Tax_Model_Calculation::CALC_TAX_AFTER_DISCOUNT_ON_INCL:
                 if ($this->_helper->applyTaxOnOriginalPrice($this->_store)) {
-                    $discount           = $item->getOriginalDiscountAmount();
-                    $baseDiscount       = $item->getBaseOriginalDiscountAmount();
+                    $discount = $item->getOriginalDiscountAmount();
+                    $baseDiscount = $item->getBaseOriginalDiscountAmount();
                 } else {
-                    $discount           = $item->getDiscountAmount();
-                    $baseDiscount       = $item->getBaseDiscountAmount();
+                    $discount = $item->getDiscountAmount();
+                    $baseDiscount = $item->getBaseDiscountAmount();
                 }
 
-                $taxSubtotal        = max($subtotal - $discount, 0);
-                $baseTaxSubtotal    = max($baseSubtotal - $baseDiscount, 0);
-                $rowTax             = $this->_calculator->calcTaxAmount($taxSubtotal, $rate, $inclTax, false);
-                $baseRowTax         = $this->_calculator->calcTaxAmount($baseTaxSubtotal, $rate, $inclTax, false);
+                //weee discount should be removed when calculating hidden tax
+                if ($isWeeeEnabled) {
+                    $discount = $discount - $item->getWeeeDiscount();
+                    $baseDiscount = $baseDiscount - $item->getBaseWeeeDiscount();
+                }
+                $taxSubtotal = max($subtotal - $discount, 0);
+                $baseTaxSubtotal = max($baseSubtotal - $baseDiscount, 0);
+
+                $rowTax = $this->_calculator->calcTaxAmount($taxSubtotal, $rate, $inclTax, false);
+                $baseRowTax = $this->_calculator->calcTaxAmount($baseTaxSubtotal, $rate, $inclTax, false);
+
+                if ($isWeeeEnabled && $this->_weeeHelper->isTaxable()) {
+                    $weeeTax = ($item->getWeeeTaxAppliedRowAmount() - $item->getWeeeDiscount()) * $rate / 100;
+                    $rowTax += $weeeTax;
+                    $baseWeeeTax =
+                        ($item->getBaseWeeeTaxAppliedRowAmount() - $item->getBaseWeeeDiscount()) * $rate / 100;
+                    $baseRowTax += $baseWeeeTax;
+                    $taxGroups[$rateKey]['weee_tax'][] = $weeeTax;
+                    $taxGroups[$rateKey]['base_weee_tax'][] = $baseWeeeTax;
+                }
                 if (!$item->getNoDiscount() && $item->getWeeeTaxApplied()) {
                     $rowTaxBeforeDiscount = $this->_calculator->calcTaxAmount(
                         $subtotal,
@@ -671,18 +927,22 @@ protected function _aggregateTaxPerRate($item, $rate, &$taxGroups)
                         $inclTax,
                         false
                     );
+                    if ($isWeeeTaxable) {
+                        $rowTaxBeforeDiscount += $item->getWeeeTaxAppliedRowAmount() * $rate / 100;
+                        $baseRowTaxBeforeDiscount += $item->getBaseWeeeTaxAppliedRowAmount() * $rate / 100;
+                    }
                 }
 
                 if ($inclTax && $discount > 0) {
-                    $hiddenTax      = $this->_calculator->calcTaxAmount($discount, $rate, $inclTax, false);
-                    $baseHiddenTax  = $this->_calculator->calcTaxAmount($baseDiscount, $rate, $inclTax, false);
+                    $hiddenTax = $this->_calculator->calcTaxAmount($discount, $rate, $inclTax, false);
+                    $baseHiddenTax = $this->_calculator->calcTaxAmount($baseDiscount, $rate, $inclTax, false);
                     $this->_hiddenTaxes[] = array(
-                        'rate_key'   => $rateKey,
-                        'qty'        => 1,
-                        'item'       => $item,
-                        'value'      => $hiddenTax,
+                        'rate_key' => $rateKey,
+                        'qty' => 1,
+                        'item' => $item,
+                        'value' => $hiddenTax,
                         'base_value' => $baseHiddenTax,
-                        'incl_tax'   => $inclTax,
+                        'incl_tax' => $inclTax,
                     );
                 }
                 break;
@@ -696,19 +956,38 @@ protected function _aggregateTaxPerRate($item, $rate, &$taxGroups)
         if (isset($rowTaxBeforeDiscount) && isset($baseRowTaxBeforeDiscount)) {
             $taxBeforeDiscount = max(
                 0,
-                $this->_deltaRound($rowTaxBeforeDiscount, $rateKey, $inclTax)
+                $this->_deltaRound($rowTaxBeforeDiscount, $rateKey, $inclTax, 'tax_before_discount')
             );
             $baseTaxBeforeDiscount = max(
                 0,
-                $this->_deltaRound($baseRowTaxBeforeDiscount, $rateKey, $inclTax, 'base')
+                $this->_deltaRound($baseRowTaxBeforeDiscount, $rateKey, $inclTax, 'tax_before_discount_base')
             );
 
             $item->setDiscountTaxCompensation($taxBeforeDiscount - max(0, $rowTax));
             $item->setBaseDiscountTaxCompensation($baseTaxBeforeDiscount - max(0, $baseRowTax));
         }
 
+        $rowTotalInclTax = $item->getRowTotalInclTax();
+        if (!isset($rowTotalInclTax)) {
+            $weeeTaxBeforeDiscount = 0;
+            $baseWeeeTaxBeforeDiscount = 0;
+            if ($isWeeeTaxable) {
+                $weeeTaxBeforeDiscount = $item->getWeeeTaxAppliedRowAmount() * $rate/100;
+                $baseWeeeTaxBeforeDiscount = $item->getBaseWeeeTaxAppliedRowAmount() * $rate/100;
+            }
+            if ($this->_config->priceIncludesTax($this->_store)) {
+                $item->setRowTotalInclTax($subtotal + $weeeTaxBeforeDiscount);
+                $item->setBaseRowTotalInclTax($baseSubtotal + $baseWeeeTaxBeforeDiscount);
+            } else {
+                $taxCompensation = $item->getDiscountTaxCompensation() ? $item->getDiscountTaxCompensation() : 0;
+                $item->setRowTotalInclTax($subtotal + $rowTax + $taxCompensation);
+                $item->setBaseRowTotalInclTax($baseSubtotal + $baseRowTax + $item->getBaseDiscountTaxCompensation());
+            }
+        }
+
         $taxGroups[$rateKey]['totals'][]        = max(0, $taxSubtotal);
         $taxGroups[$rateKey]['base_totals'][]   = max(0, $baseTaxSubtotal);
+
         return $this;
     }
 
@@ -721,7 +1000,7 @@ protected function _aggregateTaxPerRate($item, $rate, &$taxGroups)
      * @param string $type
      * @return float
      */
-    protected function _deltaRound($price, $rate, $direction, $type='regular')
+    protected function _deltaRound($price, $rate, $direction, $type = 'regular')
     {
         if ($price) {
             $rate  = (string) $rate;
@@ -762,7 +1041,8 @@ protected function _recalculateParent(Mage_Sales_Model_Quote_Item_Abstract $item
      * @param   float $baseAmount
      * @param   float $rate
      */
-    protected function _saveAppliedTaxes(Mage_Sales_Model_Quote_Address $address, $applied, $amount, $baseAmount, $rate)
+    protected function _saveAppliedTaxes(Mage_Sales_Model_Quote_Address $address,
+                                         $applied, $amount, $baseAmount, $rate)
     {
         $previouslyAppliedTaxes = $address->getAppliedTaxes();
         $process = count($previouslyAppliedTaxes);
@@ -822,6 +1102,14 @@ public function fetch(Mage_Sales_Model_Quote_Address $address)
             $discountTaxCompensation += $item->getDiscountTaxCompensation();
         }
         $taxAmount = $amount + $discountTaxCompensation;
+        /*
+         * when weee discount is not included in extraTaxAmount, we need to add it to the total tax
+         */
+        if ($this->_weeeHelper->isEnabled()) {
+            if (!$this->_weeeHelper->includeInSubtotal()) {
+                $taxAmount  += $address->getWeeeDiscount();
+            }
+        }
 
         $area       = null;
         if ($this->_config->displayCartTaxWithGrandTotal($store) && $address->getGrandTotal()) {
diff --git a/app/code/core/Mage/Tax/etc/config.xml b/app/code/core/Mage/Tax/etc/config.xml
index 5be814944fd..0db75ee3a01 100644
--- a/app/code/core/Mage/Tax/etc/config.xml
+++ b/app/code/core/Mage/Tax/etc/config.xml
@@ -28,7 +28,7 @@
 <config>
     <modules>
         <Mage_Tax>
-            <version>1.6.0.3</version>
+            <version>1.6.0.4</version>
         </Mage_Tax>
     </modules>
     <global>
@@ -229,6 +229,13 @@
         </pdf>
     </global>
     <adminhtml>
+        <layout>
+            <updates>
+                <tax>
+                    <file>tax.xml</file>
+                </tax>
+            </updates>
+        </layout>
         <translate>
             <modules>
                 <Mage_Tax>
@@ -257,12 +264,11 @@
             </classes>
             <calculation>
                 <algorithm>TOTAL_BASE_CALCULATION</algorithm>
-                <apply_after_discount>0</apply_after_discount>
+                <apply_after_discount>1</apply_after_discount>
                 <discount_tax>0</discount_tax>
                 <based_on>shipping</based_on>
                 <price_includes_tax>0</price_includes_tax>
                 <shipping_includes_tax>0</shipping_includes_tax>
-                <discount_tax>0</discount_tax>
                 <apply_tax_on>0</apply_tax_on>
             </calculation>
             <defaults>
@@ -292,6 +298,9 @@
                 <full_summary>0</full_summary>
                 <zero_tax>0</zero_tax>
             </sales_display>
+            <notification>
+                <url>http://www.magentocommerce.com/knowledge-base/entry/magento-ce-18-ee-113-tax-calc</url>
+            </notification>
         </tax>
     </default>
     <crontab>
diff --git a/app/code/core/Mage/Tax/etc/system.xml b/app/code/core/Mage/Tax/etc/system.xml
index 904acc29c65..d1786ac773e 100644
--- a/app/code/core/Mage/Tax/etc/system.xml
+++ b/app/code/core/Mage/Tax/etc/system.xml
@@ -74,6 +74,7 @@
                             <label>Tax Calculation Based On</label>
                             <frontend_type>select</frontend_type>
                             <source_model>adminhtml/system_config_source_tax_basedon</source_model>
+                            <backend_model>tax/config_notification</backend_model>
                             <sort_order>10</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
@@ -105,6 +106,7 @@
                             <label>Apply Customer Tax</label>
                             <frontend_type>select</frontend_type>
                             <source_model>tax/system_config_source_apply</source_model>
+                            <backend_model>tax/config_notification</backend_model>
                             <sort_order>40</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
@@ -114,6 +116,7 @@
                             <label>Apply Discount On Prices</label>
                             <frontend_type>select</frontend_type>
                             <source_model>tax/system_config_source_priceType</source_model>
+                            <backend_model>tax/config_notification</backend_model>
                             <sort_order>50</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
@@ -178,6 +181,7 @@
                             <label>Display Product Prices In Catalog</label>
                             <frontend_type>select</frontend_type>
                             <source_model>tax/system_config_source_tax_display_type</source_model>
+                            <backend_model>tax/config_notification</backend_model>
                             <sort_order>10</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
@@ -187,6 +191,7 @@
                             <label>Display Shipping Prices</label>
                             <frontend_type>select</frontend_type>
                             <source_model>tax/system_config_source_tax_display_type</source_model>
+                            <backend_model>tax/config_notification</backend_model>
                             <sort_order>20</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
@@ -205,6 +210,7 @@
                             <label>Display Prices</label>
                             <frontend_type>select</frontend_type>
                             <source_model>tax/system_config_source_tax_display_type</source_model>
+                            <backend_model>tax/config_notification</backend_model>
                             <sort_order>10</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
@@ -214,6 +220,7 @@
                             <label>Display Subtotal</label>
                             <frontend_type>select</frontend_type>
                             <source_model>tax/system_config_source_tax_display_type</source_model>
+                            <backend_model>tax/config_notification</backend_model>
                             <sort_order>20</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
@@ -223,6 +230,7 @@
                             <label>Display Shipping Amount</label>
                             <frontend_type>select</frontend_type>
                             <source_model>tax/system_config_source_tax_display_type</source_model>
+                            <backend_model>tax/config_notification</backend_model>
                             <sort_order>30</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
@@ -277,6 +285,7 @@
                             <label>Display Prices</label>
                             <frontend_type>select</frontend_type>
                             <source_model>tax/system_config_source_tax_display_type</source_model>
+                            <backend_model>tax/config_notification</backend_model>
                             <sort_order>10</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
@@ -286,6 +295,7 @@
                             <label>Display Subtotal</label>
                             <frontend_type>select</frontend_type>
                             <source_model>tax/system_config_source_tax_display_type</source_model>
+                            <backend_model>tax/config_notification</backend_model>
                             <sort_order>20</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
@@ -295,6 +305,7 @@
                             <label>Display Shipping Amount</label>
                             <frontend_type>select</frontend_type>
                             <source_model>tax/system_config_source_tax_display_type</source_model>
+                            <backend_model>tax/config_notification</backend_model>
                             <sort_order>30</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
diff --git a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.3-1.6.0.4.php b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.3-1.6.0.4.php
new file mode 100644
index 00000000000..db4069ba820
--- /dev/null
+++ b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.3-1.6.0.4.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Tax
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/* @var $this Mage_Tax_Model_Resource_Setup */
+
+/**
+ * Add new field to 'tax/tax_calculation_rule'
+ */
+$this->getConnection()
+    ->addColumn(
+        $this->getTable('tax/tax_calculation_rule'),
+        'calculate_subtotal',
+        array(
+            'TYPE' => Varien_Db_Ddl_Table::TYPE_INTEGER,
+            'NULLABLE' => false,
+            'COMMENT' => 'Calculate off subtotal option',
+        )
+);
diff --git a/app/code/core/Mage/Usa/Helper/Data.php b/app/code/core/Mage/Usa/Helper/Data.php
index 615f7433787..c8597ac51bc 100644
--- a/app/code/core/Mage/Usa/Helper/Data.php
+++ b/app/code/core/Mage/Usa/Helper/Data.php
@@ -110,25 +110,25 @@ public function getMeasureDimensionName($key)
     public function displayGirthValue($shippingMethod)
     {
         if (in_array($shippingMethod, array(
-            'usps_Priority Mail International',
-            'usps_Priority Mail International Small Flat Rate Box',
-            'usps_Priority Mail International Medium Flat Rate Box',
-            'usps_Priority Mail International Large Flat Rate Box',
-            'usps_Priority Mail International Flat Rate Envelope',
-            'usps_Express Mail International Flat Rate Envelope',
-            'usps_Express Mail Hold For Pickup',
-            'usps_Express Mail International',
-            'usps_First-Class Mail International Package',
-            'usps_First-Class Mail International Parcel',
-            'usps_First-Class Mail International Large Envelope',
-            'usps_First-Class Mail International',
-            'usps_Global Express Guaranteed (GXG)',
-            'usps_USPS GXG Envelopes',
-            'usps_Global Express Guaranteed Non-Document Non-Rectangular',
-            'usps_Media Mail',
-            'usps_Parcel Post',
-            'usps_Express Mail',
-            'usps_Priority Mail'
+             'usps_0_FCLE', // First-Class Mail Large Envelope
+             'usps_1',      // Priority Mail
+             'usps_2',      // Priority Mail Express Hold For Pickup
+             'usps_3',      // Priority Mail Express
+             'usps_4',      // Standard Post
+             'usps_6',      // Media Mail
+             'usps_INT_1',  // Priority Mail Express International
+             'usps_INT_2',  // Priority Mail International
+             'usps_INT_4',  // Global Express Guaranteed (GXG)
+             'usps_INT_7',  // Global Express Guaranteed Non-Document Non-Rectangular
+             'usps_INT_8',  // Priority Mail International Flat Rate Envelope
+             'usps_INT_9',  // Priority Mail International Medium Flat Rate Box
+             'usps_INT_10', // Priority Mail Express International Flat Rate Envelope
+             'usps_INT_11', // Priority Mail International Large Flat Rate Box
+             'usps_INT_12', // USPS GXG Envelopes
+             'usps_INT_14', // First-Class Mail International Large Envelope
+             'usps_INT_16', // Priority Mail International Small Flat Rate Box
+             'usps_INT_20', // Priority Mail International Small Flat Rate Envelope
+             'usps_INT_26', // Priority Mail Express International Flat Rate Boxes
         ))) {
             return true;
         } else {
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
index ed20e08cbfe..10a5080045e 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
@@ -33,7 +33,7 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Mage_Usa_Model_Shipping_Carrier_Dhl
-    extends Mage_Usa_Model_Shipping_Carrier_Abstract
+    extends Mage_Usa_Model_Shipping_Carrier_Dhl_Abstract
     implements Mage_Shipping_Model_Carrier_Interface
 {
 
@@ -424,34 +424,6 @@ protected function _setFreeMethodRequest($freeMethod)
         $r->setService($freeMethod);
     }
 
-    /**
-     * Get shipping date
-     *
-     * @param bool $domestic
-     * @return string
-     */
-    protected function _getShipDate($domestic = true)
-    {
-        if ($domestic) {
-            $days = explode(',', $this->getConfigData('shipment_days'));
-        } else {
-            $days = explode(',', $this->getConfigData('intl_shipment_days'));
-        }
-
-        if (!$days) {
-            return date('Y-m-d');
-        }
-
-        $i = 0;
-        $weekday = date('w');
-        while (!in_array($weekday, $days) && $i < 10) {
-            $i++;
-            $weekday = date('w', strtotime("+$i day"));
-        }
-
-        return date('Y-m-d', strtotime("+$i day"));
-    }
-
     /**
      * Get xml quotes
      *
@@ -1032,10 +1004,9 @@ protected function setTrackingReqeust()
     }
 
     /**
-     * Send request for tracking
+     * Send request for trackings
      *
-     * @param array $tracking
-     * @return null
+     * @param array $trackings
      */
     protected function _getXMLTracking($trackings)
     {
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Abstract.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Abstract.php
new file mode 100644
index 00000000000..c9f850396dc
--- /dev/null
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Abstract.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Usa
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * DHL Abstract class
+ *
+ * @category Mage
+ * @package  Mage_Usa
+ * @author   Magento Core Team <core@magentocommerce.com>
+ */
+abstract class Mage_Usa_Model_Shipping_Carrier_Dhl_Abstract extends Mage_Usa_Model_Shipping_Carrier_Abstract
+{
+    /**
+     * Response condition code for service is unavailable at the requested date
+     */
+    const CONDITION_CODE_SERVICE_DATE_UNAVAILABLE = 1003;
+
+    /**
+     * Count of days to look forward if day is not unavailable
+     */
+    const UNAVAILABLE_DATE_LOOK_FORWARD = 5;
+
+    /**
+     * Date format for request
+     */
+    const REQUEST_DATE_FORMAT = 'Y-m-d';
+
+    /**
+     * Get shipping date
+     *
+     * @param bool $domestic
+     * @return string
+     */
+    protected function _getShipDate($domestic = true)
+    {
+        return $this->_determineShippingDay(
+            $this->getConfigData($domestic ? 'shipment_days' : 'intl_shipment_days'),
+            date(self::REQUEST_DATE_FORMAT)
+        );
+    }
+
+    /**
+     * Determine shipping day according to configuration settings
+     *
+     * @param array $shippingDays
+     * @param string $date
+     * @return string
+     */
+    protected function _determineShippingDay($shippingDays, $date)
+    {
+        if (empty($shippingDays)) {
+            return $date;
+        }
+
+        $shippingDays = explode(',', $shippingDays);
+
+        $i = 0;
+        $weekday = date('D', strtotime($date));
+        while (!in_array($weekday, $shippingDays) && $i < 10) {
+            $i++;
+            $weekday = date('D', strtotime("$date +$i day"));
+        }
+
+        return date(self::REQUEST_DATE_FORMAT, strtotime("$date +$i day"));
+    }
+}
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php
index 06bf2f55c15..b5872667172 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php
@@ -32,7 +32,7 @@
  * @author   Magento Core Team <core@magentocommerce.com>
  */
 class Mage_Usa_Model_Shipping_Carrier_Dhl_International
-    extends Mage_Usa_Model_Shipping_Carrier_Abstract
+    extends Mage_Usa_Model_Shipping_Carrier_Dhl_Abstract
     implements Mage_Shipping_Model_Carrier_Interface
 {
     /**
@@ -785,13 +785,76 @@ protected function _addDimension($nodePiece)
      * @return Mage_Core_Model_Abstract|Mage_Shipping_Model_Rate_Result
      */
     protected function _getQuotes()
+    {
+        $responseBody = '';
+        try {
+            $debugData = array();
+            for ($offset = 0; $offset <= self::UNAVAILABLE_DATE_LOOK_FORWARD; $offset++) {
+                $debugData['try-' . $offset] = array();
+                $debugPoint = &$debugData['try-' . $offset];
+
+                $requestXml = $this->_buildQuotesRequestXml();
+                $date = date(self::REQUEST_DATE_FORMAT, strtotime($this->_getShipDate() . " +$offset days"));
+                $this->_setQuotesRequestXmlDate($requestXml, $date);
+
+                $request = $requestXml->asXML();
+                $debugPoint['request'] = $request;
+                $responseBody = $this->_getCachedQuotes($request);
+
+                if ($debugPoint['from_cache'] = ($responseBody === null)) {
+                    $responseBody = $this->_getQuotesFromServer($request);
+                }
+
+                $debugPoint['response'] = $responseBody;
+
+                $bodyXml = new SimpleXMLElement($responseBody);
+                $code = $bodyXml->xpath('//GetQuoteResponse/Note/Condition/ConditionCode');
+                if (isset($code[0]) && (int)$code[0] == self::CONDITION_CODE_SERVICE_DATE_UNAVAILABLE) {
+                    $debugPoint['info'] = sprintf(
+                        Mage::helper('usa')->__("DHL service is not available at %s date"),
+                        $date
+                    );
+                } else {
+                    break;
+                }
+
+                $this->_setCachedQuotes($request, $responseBody);
+            }
+            $this->_debug($debugData);
+        } catch (Exception $e) {
+            $this->_errors[$e->getCode()] = $e->getMessage();
+        }
+        return $this->_parseResponse($responseBody);
+    }
+
+    /**
+     * Get shipping quotes from DHL service
+     *
+     * @param string $request
+     * @return string
+     */
+    protected function _getQuotesFromServer($request)
+    {
+        $client = new Varien_Http_Client();
+        $client->setUri((string)$this->getConfigData('gateway_url'));
+        $client->setConfig(array('maxredirects' => 0, 'timeout' => 30));
+        $client->setRawData(utf8_encode($request));
+        return $client->request(Varien_Http_Client::POST)->getBody();
+    }
+
+    /**
+     * Build qoutes request XML object
+     *
+     * @return SimpleXMLElement
+     */
+    protected function _buildQuotesRequestXml()
     {
         $rawRequest = $this->_rawRequest;
         $xmlStr = '<?xml version = "1.0" encoding = "UTF-8"?>'
-                . '<p:DCTRequest xmlns:p="http://www.dhl.com" xmlns:p1="http://www.dhl.com/datatypes" '
-                . 'xmlns:p2="http://www.dhl.com/DCTRequestdatatypes" '
-                . 'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" '
-                . 'xsi:schemaLocation="http://www.dhl.com DCT-req.xsd "/>';
+            . '<p:DCTRequest xmlns:p="http://www.dhl.com" xmlns:p1="http://www.dhl.com/datatypes" '
+            . 'xmlns:p2="http://www.dhl.com/DCTRequestdatatypes" '
+            . 'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" '
+            . 'xsi:schemaLocation="http://www.dhl.com DCT-req.xsd "/>';
         $xml = new SimpleXMLElement($xmlStr);
         $nodeGetQuote = $xml->addChild('GetQuote', '', '');
         $nodeRequest = $nodeGetQuote->addChild('Request');
@@ -807,7 +870,7 @@ protected function _getQuotes()
 
         $nodeBkgDetails = $nodeGetQuote->addChild('BkgDetails');
         $nodeBkgDetails->addChild('PaymentCountryCode', $rawRequest->getOrigCountryId());
-        $nodeBkgDetails->addChild('Date', Varien_Date::now(true));
+        $nodeBkgDetails->addChild('Date', $this->_getShipDate());
         $nodeBkgDetails->addChild('ReadyTime', 'PT' . (int)(string)$this->getConfigData('ready_time') . 'H00M');
 
         $nodeBkgDetails->addChild('DimensionUnit', $this->_getDimensionUnit());
@@ -832,28 +895,20 @@ protected function _getQuotes()
             $nodeDutiable->addChild('DeclaredCurrency', $baseCurrencyCode);
             $nodeDutiable->addChild('DeclaredValue', sprintf("%.2F", $rawRequest->getValue()));
         }
+        return $xml;
+    }
 
-        $request = $xml->asXML();
-        $request = utf8_encode($request);
-        $responseBody = $this->_getCachedQuotes($request);
-        if ($responseBody === null) {
-            $debugData = array('request' => $request);
-            try {
-                $client = new Varien_Http_Client();
-                $client->setUri((string)$this->getConfigData('gateway_url'));
-                $client->setConfig(array('maxredirects' => 0, 'timeout' => 30));
-                $client->setRawData($request);
-                $responseBody = $client->request(Varien_Http_Client::POST)->getBody();
-                $debugData['result'] = $responseBody;
-                $this->_setCachedQuotes($request, $responseBody);
-            } catch (Exception $e) {
-                $this->_errors[$e->getCode()] = $e->getMessage();
-                $responseBody = '';
-            }
-            $this->_debug($debugData);
-        }
-
-        return $this->_parseResponse($responseBody);
+    /**
+     * Set pick-up date in request XML object
+     *
+     * @param SimpleXMLElement $requestXml
+     * @param string $date
+     * @return SimpleXMLElement
+     */
+    protected function _setQuotesRequestXmlDate(SimpleXMLElement $requestXml, $date)
+    {
+        $requestXml->GetQuote->BkgDetails->Date = $date;
+        return $requestXml;
     }
 
     /**
@@ -908,12 +963,8 @@ protected function _parseResponse($response)
                             $result = new Varien_Object();
                             $result->setTrackingNumber((string)$xml->AirwayBillNumber);
                             try {
-                                /* @var $pdf Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf */
-                                $pdf = Mage::getModel(
-                                    'usa/shipping_carrier_dhl_label_pdf',
-                                    array('info' => $xml, 'request' => $this->_request)
-                                );
-                                $result->setShippingLabelContent($pdf->render());
+                                $labelContent = (string)$xml->LabelImage->OutputImage;
+                                $result->setShippingLabelContent(base64_decode($labelContent));
                             } catch (Exception $e) {
                                 Mage::throwException(Mage::helper('usa')->__($e->getMessage()));
                             }
@@ -1353,6 +1404,8 @@ protected function _doRequest()
         $nodeContact->addChild('PersonName', substr($rawRequest->getShipperContactPersonName(), 0, 34));
         $nodeContact->addChild('PhoneNumber', substr($rawRequest->getShipperContactPhoneNumber(), 0, 24));
 
+        $xml->addChild('LabelImageFormat', 'PDF', '');
+
         $request = $xml->asXML();
         $request = utf8_encode($request);
 
@@ -1442,7 +1495,7 @@ protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
             $nodeShipmentDetails->addChild('GlobalProductCode', $rawRequest->getShippingMethod());
             $nodeShipmentDetails->addChild('LocalProductCode', $rawRequest->getShippingMethod());
 
-            $nodeShipmentDetails->addChild('Date', Mage::getModel('core/date')->date('Y-m-d'));
+            $nodeShipmentDetails->addChild('Date', Mage::getModel('core/date')->date(self::REQUEST_DATE_FORMAT));
             $nodeShipmentDetails->addChild('Contents', 'DHL Parcel');
             /*
              * The DoorTo Element defines the type of delivery service that applies to the shipment.
@@ -1480,7 +1533,7 @@ protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
              * Door non-compliant)
              */
             $nodeShipmentDetails->addChild('DoorTo', 'DD');
-            $nodeShipmentDetails->addChild('Date', Mage::getModel('core/date')->date('Y-m-d'));
+            $nodeShipmentDetails->addChild('Date', Mage::getModel('core/date')->date(self::REQUEST_DATE_FORMAT));
             $nodeShipmentDetails->addChild('Contents', 'DHL Parcel');
         }
     }
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf.php
index 3157c1abf50..89e8cbe6400 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf.php
@@ -27,6 +27,7 @@
 /**
  * DHL International (API v1.4) Label Creation
  *
+ * @deprecated now the process of creating the label is on DHL side
  * @category Mage
  * @package  Mage_Usa
  * @author   Magento Core Team <core@magentocommerce.com>
@@ -62,8 +63,6 @@ public function __construct(array $arguments)
      * Create Label
      *
      * @return string
-     * @throws Zend_Pdf_Exception
-     * @throws InvalidArgumentException
      */
     public function render()
     {
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/Page.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/Page.php
index d1b5dea0118..2b425f4f1a5 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/Page.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/Page.php
@@ -27,6 +27,7 @@
 /**
  * DHL International (API v1.4) Label Creation
  *
+ * @deprecated now the process of creating the label is on DHL side
  * @category Mage
  * @package  Mage_Usa
  * @author   Magento Core Team <core@magentocommerce.com>
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php
index 6c7c34a9c96..703babc1512 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php
@@ -27,6 +27,7 @@
 /**
  * DHL International (API v1.4) Label Creation
  *
+ * @deprecated now the process of creating the label is on DHL side
  * @category Mage
  * @package  Mage_Usa
  * @author   Magento Core Team <core@magentocommerce.com>
@@ -107,7 +108,6 @@ protected function _y($pt)
      * Add Border
      *
      * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_Page
-     * @throws Zend_Pdf_Exception
      */
     public function addBorder()
     {
@@ -163,7 +163,6 @@ public function addBorder()
      * @param string $name
      * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_PageBuilder
      * @throws InvalidArgumentException
-     * @throws Zend_Pdf_Exception
      */
     public function addProductName($name)
     {
@@ -182,7 +181,6 @@ public function addProductName($name)
      *
      * @param string $code
      * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_PageBuilder
-     * @throws Zend_Pdf_Exception
      * @throws InvalidArgumentException
      */
     public function addProductContentCode($code)
@@ -221,7 +219,6 @@ public function addProductContentCode($code)
      *
      * @param int $id
      * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_Page
-     * @throws Zend_Pdf_Exception
      */
     public function addUnitId($id)
     {
@@ -238,7 +235,6 @@ public function addUnitId($id)
      *
      * @param $data
      * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_Page
-     * @throws Zend_Pdf_Exception
      */
     public function addReferenceData($data)
     {
@@ -256,7 +252,6 @@ public function addReferenceData($data)
      * @param SimpleXMLElement $sender
      * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_PageBuilder
      * @throws InvalidArgumentException
-     * @throws Zend_Pdf_Exception
      */
     public function addSenderInfo(SimpleXMLElement $sender)
     {
@@ -301,7 +296,6 @@ public function addSenderInfo(SimpleXMLElement $sender)
      * @param SimpleXMLElement $addressLines
      * @param string $phoneNumber
      * @return float
-     * @throws Zend_Pdf_Exception
      */
     protected function _drawSenderAddress(SimpleXMLElement $addressLines, $phoneNumber)
     {
@@ -332,7 +326,6 @@ protected function _drawSenderAddress(SimpleXMLElement $addressLines, $phoneNumb
      * @param string $serviceAreaCode
      * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_PageBuilder
      * @throws InvalidArgumentException
-     * @throws Zend_Pdf_Exception
      */
     public function addOriginInfo($serviceAreaCode)
     {
@@ -354,7 +347,6 @@ public function addOriginInfo($serviceAreaCode)
      *
      * @param SimpleXMLElement $consignee
      * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_PageBuilder
-     * @throws Zend_Pdf_Exception
      */
     public function addReceiveInfo(SimpleXMLElement $consignee)
     {
@@ -397,7 +389,6 @@ public function addReceiveInfo(SimpleXMLElement $consignee)
      * @param string $facilityCode
      * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_PageBuilder
      * @throws InvalidArgumentException
-     * @throws Zend_Pdf_Exception
      */
     public function addDestinationFacilityCode($countryCode, $serviceAreaCode, $facilityCode)
     {
@@ -420,7 +411,6 @@ public function addDestinationFacilityCode($countryCode, $serviceAreaCode, $faci
      * Add Service Features Codes
      *
      * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_PageBuilder
-     * @throws Zend_Pdf_Exception
      */
     public function addServiceFeaturesCodes()
     {
@@ -436,7 +426,6 @@ public function addServiceFeaturesCodes()
      * Add Delivery Date Code
      *
      * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_PageBuilder
-     * @throws Zend_Pdf_Exception
      */
     public function addDeliveryDateCode()
     {
@@ -457,7 +446,7 @@ public function addDeliveryDateCode()
      *
      * @param Mage_Sales_Model_Order_Shipment $data
      * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_Page
-     * @throws Exception
+     * @throws InvalidArgumentException
      */
     public function addShipmentInformation($data)
     {
@@ -479,7 +468,6 @@ public function addShipmentInformation($data)
      * Add Date Info
      * @param string $date
      * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_PageBuilder
-     * @throws Zend_Pdf_Exception
      */
     public function addDateInfo($date)
     {
@@ -500,7 +488,6 @@ public function addDateInfo($date)
      * @param string $unit
      * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_PageBuilder
      * @throws InvalidArgumentException
-     * @throws Zend_Pdf_Exception
      */
     public function addWeightInfo($weight, $unit)
     {
@@ -526,7 +513,7 @@ public function addWeightInfo($weight, $unit)
      *
      * @param array $package
      * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_PageBuilder
-     * @throws Exception
+     * @throws InvalidArgumentException
      */
     public function addContentInfo($package)
     {
@@ -558,7 +545,6 @@ public function addContentInfo($package)
      * @param string $barCode
      * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_PageBuilder
      * @throws InvalidArgumentException
-     * @throws Zend_Pdf_Exception
      */
     public function addWaybillBarcode($number, $barCode)
     {
@@ -586,7 +572,6 @@ public function addWaybillBarcode($number, $barCode)
      * @param string $barCode
      * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_PageBuilder
      * @throws InvalidArgumentException
-     * @throws Zend_Pdf_Exception
      */
     public function addRoutingBarcode($routingCode, $id, $barCode)
     {
@@ -615,7 +600,6 @@ public function addRoutingBarcode($routingCode, $id, $barCode)
      * @param string $barCode
      * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_PageBuilder
      * @throws InvalidArgumentException
-     * @throws Zend_Pdf_Exception
      */
     public function addPieceIdBarcode($dataIdentifier, $licensePlate, $barCode)
     {
@@ -645,7 +629,6 @@ public function addPieceIdBarcode($dataIdentifier, $licensePlate, $barCode)
      * @param int $piecesTotal
      * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_PageBuilder
      * @throws InvalidArgumentException
-     * @throws Zend_Pdf_Exception
      */
     public function addPieceNumber($pieceNumber, $piecesTotal)
     {
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php
index 604f1fadb09..c62036239d8 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php
@@ -368,7 +368,7 @@ protected function _formRateRequest($purpose)
                     '0' => array(
                         'Weight' => array(
                             'Value' => (float)$r->getWeight(),
-                            'Units' => 'LB'
+                            'Units' => $this->getConfigData('unit_of_measure')
                         ),
                         'GroupPackageCount' => 1,
                     )
@@ -462,7 +462,12 @@ protected function _prepareRateResponse($response)
 
         if (is_object($response)) {
             if ($response->HighestSeverity == 'FAILURE' || $response->HighestSeverity == 'ERROR') {
-                $errorTitle = (string)$response->Notifications->Message;
+                if (is_array($response->Notifications)) {
+                    $notification = array_pop($response->Notifications);
+                    $errorTitle = (string)$notification->Message;
+                } else {
+                    $errorTitle = (string)$response->Notifications->Message;
+                }
             } elseif (isset($response->RateReplyDetails)) {
                 $allowedMethods = explode(",", $this->getConfigData('allowed_methods'));
 
@@ -531,7 +536,17 @@ protected function _getRateAmountOriginBased($rate)
             }
 
             // Order is important
-            foreach (array('RATED_ACCOUNT_SHIPMENT', 'RATED_LIST_SHIPMENT', 'RATED_LIST_PACKAGE') as $rateType) {
+            $ratesOrder = array(
+                'RATED_ACCOUNT_PACKAGE',
+                'PAYOR_ACCOUNT_PACKAGE',
+                'RATED_ACCOUNT_SHIPMENT',
+                'PAYOR_ACCOUNT_SHIPMENT',
+                'RATED_LIST_PACKAGE',
+                'PAYOR_LIST_PACKAGE',
+                'RATED_LIST_SHIPMENT',
+                'PAYOR_LIST_SHIPMENT'
+            );
+            foreach ($ratesOrder as $rateType) {
                 if (!empty($rateTypeAmounts[$rateType])) {
                     $amount = $rateTypeAmounts[$rateType];
                     break;
@@ -877,6 +892,11 @@ public function getCode($type, $code='')
                 'DIRECT'                => Mage::helper('usa')->__('Direct'),
                 'INDIRECT'              => Mage::helper('usa')->__('Indirect'),
             ),
+
+            'unit_of_measure'=>array(
+                'LB'   =>  Mage::helper('usa')->__('Pounds'),
+                'KG'   =>  Mage::helper('usa')->__('Kilograms'),
+            ),
         );
 
         if (!isset($codes[$type])) {
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Unitofmeasure.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Unitofmeasure.php
new file mode 100644
index 00000000000..dea146d5565
--- /dev/null
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Unitofmeasure.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Usa
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Fedex packaging source implementation
+ *
+ * @category   Mage
+ * @package    Mage_Usa
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Usa_Model_Shipping_Carrier_Fedex_Source_Unitofmeasure
+{
+    /**
+     * Return array of Measure units
+     *
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        $measureUnits = Mage::getSingleton('usa/shipping_carrier_fedex')->getCode('unit_of_measure');
+        $result = array();
+        foreach ($measureUnits as $key => $val){
+            $result[] = array('value'=>$key,'label'=>$val);
+        }
+        return $result;
+    }
+}
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
index a026a7e847a..806aaeaeece 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
@@ -102,13 +102,15 @@ class Mage_Usa_Model_Shipping_Carrier_Ups
     protected $_defaultCgiGatewayUrl = 'http://www.ups.com:80/using/services/rave/qcostcgi.cgi';
 
     /**
-     * Default urls for shipment
+     * Default urls for XML
      *
      * @var array
      */
     protected $_defaultUrls = array(
-        'ShipConfirm' => 'https://wwwcie.ups.com/ups.app/xml/ShipConfirm',
-        'ShipAccept'  => 'https://wwwcie.ups.com/ups.app/xml/ShipAccept',
+        'Rate'        => 'https://onlinetools.ups.com/ups.app/xml/Rate',
+        'Track'       => 'https://onlinetools.ups.com/ups.app/xml/Track',
+        'ShipConfirm' => 'https://onlinetools.ups.com/ups.app/xml/ShipConfirm',
+        'ShipAccept'  => 'https://onlinetools.ups.com/ups.app/xml/ShipAccept',
     );
 
     /**
@@ -441,7 +443,7 @@ protected function _parseCgiResponse($response)
                 switch (substr($r[0],-1)) {
                     case 3: case 4:
                         if (in_array($r[1], $allowedMethods)) {
-                            $responsePrice = Mage::app()->getLocale()->getNumber($r[8]);
+                            $responsePrice = Mage::app()->getLocale()->getNumber($r[10]);
                             $costArr[$r[1]] = $responsePrice;
                             $priceArr[$r[1]] = $this->getMethodPrice($responsePrice, $r[1]);
                         }
@@ -476,7 +478,7 @@ protected function _parseCgiResponse($response)
                 $rate->setCarrierTitle($this->getConfigData('title'));
                 $rate->setMethod($method);
                 $method_arr = $this->getCode('method', $method);
-                $rate->setMethodTitle(Mage::helper('usa')->__($method_arr));
+                $rate->setMethodTitle($method_arr);
                 $rate->setCost($costArr[$method]);
                 $rate->setPrice($price);
                 $result->append($rate);
@@ -791,6 +793,9 @@ public function getCode($type, $code='')
     protected function _getXmlQuotes()
     {
         $url = $this->getConfigData('gateway_xml_url');
+        if (!$url) {
+            $url = $this->_defaultUrls['Rate'];
+        }
 
         $this->setXMLAccessRequest();
         $xmlRequest=$this->_xmlAccessRequest;
@@ -1144,6 +1149,9 @@ protected function _getCgiTracking($trackings)
     protected function _getXmlTracking($trackings)
     {
         $url = $this->getConfigData('tracking_xml_url');
+        if (!$url) {
+            $url = $this->_defaultUrls['Track'];
+        }
 
         foreach($trackings as $tracking){
             $xmlRequest=$this->_xmlAccessRequest;
@@ -1166,7 +1174,7 @@ protected function _getXmlTracking($trackings)
 
             try {
                 $ch = curl_init();
-                   curl_setopt($ch, CURLOPT_URL, $url);
+                curl_setopt($ch, CURLOPT_URL, $url);
                 curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
                 curl_setopt($ch, CURLOPT_HEADER, 0);
                 curl_setopt($ch, CURLOPT_POST, 1);
@@ -1559,7 +1567,10 @@ protected function _sendShipmentAcceptRequest(SimpleXMLElement $shipmentConfirmR
 
         $debugData = array('request' => $xmlRequest->asXML());
         try {
-            $url = $this->_defaultUrls['ShipAccept'];
+            $url = $this->getConfigData('shipaccept_xml_url');
+            if (!$url) {
+                $url = $this->_defaultUrls['ShipAccept'];
+            }
 
             $ch = curl_init($url);
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
@@ -1612,7 +1623,7 @@ protected function _doShipmentRequest(Varien_Object $request)
         $xmlResponse = $this->_getCachedQuotes($xmlRequest);
 
         if ($xmlResponse === null) {
-            $url = $this->getConfigData('url');
+            $url = $this->getConfigData('shipconfirm_xml_url');
             if (!$url) {
                 $url = $this->_defaultUrls['ShipConfirm'];
             }
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php
index a268101a10f..773dd0b85af 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php
@@ -299,7 +299,7 @@ protected function _setFreeMethodRequest($freeMethod)
 
         $weight = $this->getTotalNumOfBoxes($r->getFreeMethodWeight());
         $r->setWeightPounds(floor($weight));
-        $r->setWeightOunces(round(($weight-floor($weight)) * self::OUNCES_POUND, 1));
+        $r->setWeightOunces(round(($weight - floor($weight)) * self::OUNCES_POUND, 1));
         $r->setService($freeMethod);
     }
 
@@ -314,7 +314,7 @@ protected function _getXmlQuotes()
         $r = $this->_rawRequest;
 
         // The origin address(shipper) must be only in USA
-        if(!$this->_isUSCountry($r->getOrigCountryId())){
+        if (!$this->_isUSCountry($r->getOrigCountryId())){
             $responseBody = '';
             return $this->_parseXmlResponse($responseBody);
         }
@@ -332,7 +332,7 @@ protected function _getXmlQuotes()
                 $service = $r->getService();
             }
             if ($r->getContainer() == 'FLAT RATE BOX' || $r->getContainer() == 'FLAT RATE ENVELOPE') {
-                $service = 'PRIORITY';
+                $service = 'Priority';
             }
             $package->addChild('Service', $service);
 
@@ -341,7 +341,7 @@ protected function _getXmlQuotes()
                 $package->addChild('FirstClassMailType', 'PARCEL');
             }
             $package->addChild('ZipOrigination', $r->getOrigPostal());
-            //only 5 chars avaialble
+            //only 5 chars available
             $package->addChild('ZipDestination', substr($r->getDestPostal(), 0, 5));
             $package->addChild('Pounds', $r->getWeightPounds());
             $package->addChild('Ounces', $r->getWeightOunces());
@@ -403,7 +403,7 @@ protected function _getXmlQuotes()
                 }
                 $client = new Zend_Http_Client();
                 $client->setUri($url);
-                $client->setConfig(array('maxredirects'=>0, 'timeout'=>30));
+                $client->setConfig(array('maxredirects' => 0, 'timeout' => 30));
                 $client->setParameterGet('API', $api);
                 $client->setParameterGet('XML', $request);
                 $response = $client->request();
@@ -429,6 +429,7 @@ protected function _getXmlQuotes()
      */
     protected function _parseXmlResponse($response)
     {
+        $r = $this->_rawRequest;
         $costArr = array();
         $priceArr = array();
         if (strlen(trim($response)) > 0) {
@@ -440,79 +441,52 @@ protected function _parseXmlResponse($response)
                         $response
                     );
                 }
-
                 $xml = simplexml_load_string($response);
 
                 if (is_object($xml)) {
-                    if (is_object($xml->Number) && is_object($xml->Description) && (string)$xml->Description!='') {
-                        $errorTitle = (string)$xml->Description;
-                    } elseif (is_object($xml->Package)
-                          && is_object($xml->Package->Error)
-                          && is_object($xml->Package->Error->Description)
-                          && (string)$xml->Package->Error->Description!=''
-                    ) {
-                        $errorTitle = (string)$xml->Package->Error->Description;
-                    } else {
-                        $errorTitle = 'Unknown error';
-                    }
-                    $r = $this->_rawRequest;
-                    $allowedMethods = explode(",", $this->getConfigData('allowed_methods'));
-                    $allMethods = $this->getCode('method');
-                    $newMethod = false;
-                    if ($this->_isUSCountry($r->getDestCountryId())) {
-                        if (is_object($xml->Package) && is_object($xml->Package->Postage)) {
-                            foreach ($xml->Package->Postage as $postage) {
+                     $allowedMethods = explode(',', $this->getConfigData('allowed_methods'));
+                     $serviceCodeToActualNameMap = array();
+                     /**
+                      * US Rates
+                      */
+                      if ($this->_isUSCountry($r->getDestCountryId())) {
+                          if (is_object($xml->Package) && is_object($xml->Package->Postage)) {
+                             foreach ($xml->Package->Postage as $postage) {
                                 $serviceName = $this->_filterServiceName((string)$postage->MailService);
-                                $postage->MailService = $serviceName;
-                                if (in_array($serviceName, $allowedMethods)) {
-                                    $costArr[$serviceName] = (string)$postage->Rate;
-                                    $priceArr[$serviceName] = $this->getMethodPrice(
-                                        (string)$postage->Rate,
-                                        $serviceName
-                                    );
-                                } elseif (!in_array($serviceName, $allMethods)) {
-                                    $allMethods[] = $serviceName;
-                                    $newMethod = true;
-                                }
+                                $_serviceCode = $this->getCode('method_to_code', $serviceName);
+                                $serviceCode = $_serviceCode ? $_serviceCode : (string)$postage->attributes()->CLASSID;
+                                $serviceCodeToActualNameMap[$serviceCode] = $serviceName;
+                                if (in_array($serviceCode, $allowedMethods)) {
+                                     $costArr[$serviceCode] = (string)$postage->Rate;
+                                     $priceArr[$serviceCode] = $this->getMethodPrice(
+                                         (string)$postage->Rate,
+                                         $serviceCode
+                                     );
+                                 }
                             }
                             asort($priceArr);
                         }
-                    } else {
-                        /*
-                         * International Rates
-                         */
+                     }
+                     /**
+                      * International Rates
+                      */
+                     else {
                         if (is_object($xml->Package) && is_object($xml->Package->Service)) {
                             foreach ($xml->Package->Service as $service) {
                                 $serviceName = $this->_filterServiceName((string)$service->SvcDescription);
-                                $service->SvcDescription = $serviceName;
-                                if (in_array($serviceName, $allowedMethods)) {
-                                    $costArr[$serviceName] = (string)$service->Postage;
-                                    $priceArr[$serviceName] = $this->getMethodPrice(
-                                        (string)$service->Postage,
-                                        $serviceName
-                                    );
-                                } elseif (!in_array($serviceName, $allMethods)) {
-                                    $allMethods[] = $serviceName;
-                                    $newMethod = true;
+                                $serviceCode = 'INT_' . (string)$service->attributes()->ID;
+                                $serviceCodeToActualNameMap[$serviceCode] = $serviceName;
+                                    if (in_array($serviceCode, $allowedMethods)) {
+                                        $costArr[$serviceCode] = (string)$service->Postage;
+                                        $priceArr[$serviceCode] = $this->getMethodPrice(
+                                         (string)$service->Postage,
+                                            $serviceCode);
                                 }
                             }
                             asort($priceArr);
                         }
                     }
-                    /**
-                     * following if statement is obsolete
-                     * we don't have adminhtml/config resoure model
-                     */
-                    if (false && $newMethod) {
-                        sort($allMethods);
-                        $insert['usps']['fields']['methods']['value'] = $allMethods;
-                        Mage::getResourceModel('adminhtml/config')->saveSectionPost('carriers','','',$insert);
-                    }
                 }
-            } else {
-                $errorTitle = 'Response is in the wrong format';
-            }
-        }
 
         $result = Mage::getModel('shipping/rate_result');
         if (empty($priceArr)) {
@@ -522,12 +496,16 @@ protected function _parseXmlResponse($response)
             $error->setErrorMessage($this->getConfigData('specificerrmsg'));
             $result->append($error);
         } else {
-            foreach ($priceArr as $method=>$price) {
+            foreach ($priceArr as $method => $price) {
                 $rate = Mage::getModel('shipping/rate_result_method');
                 $rate->setCarrier('usps');
                 $rate->setCarrierTitle($this->getConfigData('title'));
                 $rate->setMethod($method);
-                $rate->setMethodTitle($method);
+                 $rate->setMethodTitle(
+                     isset($serviceCodeToActualNameMap[$method])
+                         ? $serviceCodeToActualNameMap[$method]
+                         : $this->getCode('method', $method)
+                );
                 $rate->setCost($costArr[$method]);
                 $rate->setPrice($price);
                 $result->append($rate);
@@ -535,8 +513,9 @@ protected function _parseXmlResponse($response)
         }
 
         return $result;
+            }
+        }
     }
-
     /**
      * Get configuration data of carrier
      *
@@ -544,63 +523,175 @@ protected function _parseXmlResponse($response)
      * @param string $code
      * @return array|bool
      */
-    public function getCode($type, $code='')
-    {
+     public function getCode($type, $code = '')
+     {
         $codes = array(
+             'method' => array(
+                 '0_FCLE' => Mage::helper('usa')->__('First-Class Mail Large Envelope'),
+                 '0_FCL'  => Mage::helper('usa')->__('First-Class Mail Letter'),
+                 '0_FCP'  => Mage::helper('usa')->__('First-Class Mail Parcel'),
+                 '0_FCPC' => Mage::helper('usa')->__('First-Class Mail Postcards'),
+                 '1'      => Mage::helper('usa')->__('Priority Mail'),
+                 '2'      => Mage::helper('usa')->__('Priority Mail Express Hold For Pickup'),
+                 '3'      => Mage::helper('usa')->__('Priority Mail Express'),
+                 '4'      => Mage::helper('usa')->__('Standard Post'),
+                 '6'      => Mage::helper('usa')->__('Media Mail'),
+                 '7'      => Mage::helper('usa')->__('Library Mail'),
+                 '13'     => Mage::helper('usa')->__('Priority Mail Express Flat Rate Envelope'),
+                 '15'     => Mage::helper('usa')->__('First-Class Mail Large Postcards'),
+                 '16'     => Mage::helper('usa')->__('Priority Mail Flat Rate Envelope'),
+                 '17'     => Mage::helper('usa')->__('Priority Mail Medium Flat Rate Box'),
+                 '22'     => Mage::helper('usa')->__('Priority Mail Large Flat Rate Box'),
+                 '23'     => Mage::helper('usa')->__('Priority Mail Express Sunday/Holiday Delivery'),
+                 '25'     => Mage::helper('usa')->__('Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope'),
+                 '27'     => Mage::helper('usa')->__('Priority Mail Express Flat Rate Envelope Hold For Pickup'),
+                 '28'     => Mage::helper('usa')->__('Priority Mail Small Flat Rate Box'),
+                 '29'     => Mage::helper('usa')->__('Priority Mail Padded Flat Rate Envelope'),
+                 '30'     => Mage::helper('usa')->__('Priority Mail Express Legal Flat Rate Envelope'),
+                 '31'     => Mage::helper('usa')->__('Priority Mail Express Legal Flat Rate Envelope Hold For Pickup'),
+                 '32'     => Mage::helper('usa')->__('Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope'),
+                 '33'     => Mage::helper('usa')->__('Priority Mail Hold For Pickup'),
+                 '34'     => Mage::helper('usa')->__('Priority Mail Large Flat Rate Box Hold For Pickup'),
+                 '35'     => Mage::helper('usa')->__('Priority Mail Medium Flat Rate Box Hold For Pickup'),
+                 '36'     => Mage::helper('usa')->__('Priority Mail Small Flat Rate Box Hold For Pickup'),
+                 '37'     => Mage::helper('usa')->__('Priority Mail Flat Rate Envelope Hold For Pickup'),
+                 '38'     => Mage::helper('usa')->__('Priority Mail Gift Card Flat Rate Envelope'),
+                 '39'     => Mage::helper('usa')->__('Priority Mail Gift Card Flat Rate Envelope Hold For Pickup'),
+                 '40'     => Mage::helper('usa')->__('Priority Mail Window Flat Rate Envelope'),
+                 '41'     => Mage::helper('usa')->__('Priority Mail Window Flat Rate Envelope Hold For Pickup'),
+                 '42'     => Mage::helper('usa')->__('Priority Mail Small Flat Rate Envelope'),
+                 '43'     => Mage::helper('usa')->__('Priority Mail Small Flat Rate Envelope Hold For Pickup'),
+                 '44'     => Mage::helper('usa')->__('Priority Mail Legal Flat Rate Envelope'),
+                 '45'     => Mage::helper('usa')->__('Priority Mail Legal Flat Rate Envelope Hold For Pickup'),
+                 '46'     => Mage::helper('usa')->__('Priority Mail Padded Flat Rate Envelope Hold For Pickup'),
+                 '47'     => Mage::helper('usa')->__('Priority Mail Regional Rate Box A'),
+                 '48'     => Mage::helper('usa')->__('Priority Mail Regional Rate Box A Hold For Pickup'),
+                 '49'     => Mage::helper('usa')->__('Priority Mail Regional Rate Box B'),
+                 '50'     => Mage::helper('usa')->__('Priority Mail Regional Rate Box B Hold For Pickup'),
+                 '53'     => Mage::helper('usa')->__('First-Class Package Service Hold For Pickup'),
+                 '55'     => Mage::helper('usa')->__('Priority Mail Express Flat Rate Boxes'),
+                 '56'     => Mage::helper('usa')->__('Priority Mail Express Flat Rate Boxes Hold For Pickup'),
+                 '57'     => Mage::helper('usa')->__('Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes'),
+                 '58'     => Mage::helper('usa')->__('Priority Mail Regional Rate Box C'),
+                 '59'     => Mage::helper('usa')->__('Priority Mail Regional Rate Box C Hold For Pickup'),
+                 '61'     => Mage::helper('usa')->__('First-Class Package Service'),
+                 '62'     => Mage::helper('usa')->__('Priority Mail Express Padded Flat Rate Envelope'),
+                 '63'     => Mage::helper('usa')->__('Priority Mail Express Padded Flat Rate Envelope Hold For Pickup'),
+                 '64'     => Mage::helper('usa')->__('Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope'),
+                 'INT_1'  => Mage::helper('usa')->__('Priority Mail Express International'),
+                 'INT_2'  => Mage::helper('usa')->__('Priority Mail International'),
+                 'INT_4'  => Mage::helper('usa')->__('Global Express Guaranteed (GXG)'),
+                 'INT_5'  => Mage::helper('usa')->__('Global Express Guaranteed Document'),
+                 'INT_6'  => Mage::helper('usa')->__('Global Express Guaranteed Non-Document Rectangular'),
+                 'INT_7'  => Mage::helper('usa')->__('Global Express Guaranteed Non-Document Non-Rectangular'),
+                 'INT_8'  => Mage::helper('usa')->__('Priority Mail International Flat Rate Envelope'),
+                 'INT_9'  => Mage::helper('usa')->__('Priority Mail International Medium Flat Rate Box'),
+                 'INT_10' => Mage::helper('usa')->__('Priority Mail Express International Flat Rate Envelope'),
+                 'INT_11' => Mage::helper('usa')->__('Priority Mail International Large Flat Rate Box'),
+                 'INT_12' => Mage::helper('usa')->__('USPS GXG Envelopes'),
+                 'INT_13' => Mage::helper('usa')->__('First-Class Mail International Letter'),
+                 'INT_14' => Mage::helper('usa')->__('First-Class Mail International Large Envelope'),
+                 'INT_15' => Mage::helper('usa')->__('First-Class Package International Service'),
+                 'INT_16' => Mage::helper('usa')->__('Priority Mail International Small Flat Rate Box'),
+                 'INT_17' => Mage::helper('usa')->__('Priority Mail Express International Legal Flat Rate Envelope'),
+                 'INT_18' => Mage::helper('usa')->__('Priority Mail International Gift Card Flat Rate Envelope'),
+                 'INT_19' => Mage::helper('usa')->__('Priority Mail International Window Flat Rate Envelope'),
+                 'INT_20' => Mage::helper('usa')->__('Priority Mail International Small Flat Rate Envelope'),
+                 'INT_21' => Mage::helper('usa')->__('First-Class Mail International Postcard'),
+                 'INT_22' => Mage::helper('usa')->__('Priority Mail International Legal Flat Rate Envelope'),
+                 'INT_23' => Mage::helper('usa')->__('Priority Mail International Padded Flat Rate Envelope'),
+                 'INT_24' => Mage::helper('usa')->__('Priority Mail International DVD Flat Rate priced box'),
+                 'INT_25' => Mage::helper('usa')->__('Priority Mail International Large Video Flat Rate priced box'),
+                 'INT_26' => Mage::helper('usa')->__('Priority Mail Express International Flat Rate Boxes'),
+                 'INT_27' => Mage::helper('usa')->__('Priority Mail Express International Padded Flat Rate Envelope'),
+             ),
 
-            'service'=>array(
-                'FIRST CLASS' => Mage::helper('usa')->__('First-Class'),
-                'PRIORITY'    => Mage::helper('usa')->__('Priority Mail'),
-                'EXPRESS'     => Mage::helper('usa')->__('Express Mail'),
-                'BPM'         => Mage::helper('usa')->__('Bound Printed Matter'),
-                'PARCEL'      => Mage::helper('usa')->__('Parcel Post'),
-                'MEDIA'       => Mage::helper('usa')->__('Media Mail'),
-                'LIBRARY'     => Mage::helper('usa')->__('Library'),
-            ),
+           'service_to_code' => array(
+                 '0_FCLE' => 'First Class',
+                 '0_FCL'  => 'First Class',
+                 '0_FCP'  => 'First Class',
+                 '0_FCPC' => 'First Class',
+                 '1'      => 'Priority',
+                 '2'      => 'Priority Express',
+                 '3'      => 'Priority Express',
+                 '4'      => 'Standard Post',
+                 '6'      => 'Media',
+                 '7'      => 'Library',
+                 '13'     => 'Priority Express',
+                 '15'     => 'First Class',
+                 '16'     => 'Priority',
+                 '17'     => 'Priority',
+                 '22'     => 'Priority',
+                 '23'     => 'Priority Express',
+                 '25'     => 'Priority Express',
+                 '27'     => 'Priority Express',
+                 '28'     => 'Priority',
+                 '29'     => 'Priority',
+                 '30'     => 'Priority Express',
+                 '31'     => 'Priority Express',
+                 '32'     => 'Priority Express',
+                 '33'     => 'Priority',
+                 '34'     => 'Priority',
+                 '35'     => 'Priority',
+                 '36'     => 'Priority',
+                 '37'     => 'Priority',
+                 '38'     => 'Priority',
+                 '39'     => 'Priority',
+                 '40'     => 'Priority',
+                 '41'     => 'Priority',
+                 '42'     => 'Priority',
+                 '43'     => 'Priority',
+                 '44'     => 'Priority',
+                 '45'     => 'Priority',
+                 '46'     => 'Priority',
+                 '47'     => 'Priority',
+                 '48'     => 'Priority',
+                 '49'     => 'Priority',
+                 '50'     => 'Priority',
+                 '53'     => 'First Class',
+                 '55'     => 'Priority Express',
+                 '56'     => 'Priority Express',
+                 '57'     => 'Priority Express',
+                 '58'     => 'Priority',
+                 '59'     => 'Priority',
+                 '61'     => 'First Class',
+                 '62'     => 'Priority Express',
+                 '63'     => 'Priority Express',
+                 '64'     => 'Priority Express',
+                 'INT_1'  => 'Priority Express',
+                 'INT_2'  => 'Priority',
+                 'INT_4'  => 'Priority Express',
+                 'INT_5'  => 'Priority Express',
+                 'INT_6'  => 'Priority Express',
+                 'INT_7'  => 'Priority Express',
+                 'INT_8'  => 'Priority',
+                 'INT_9'  => 'Priority',
+                 'INT_10' => 'Priority Express',
+                 'INT_11' => 'Priority',
+                 'INT_12' => 'Priority Express',
+                 'INT_13' => 'First Class',
+                 'INT_14' => 'First Class',
+                 'INT_15' => 'First Class',
+                 'INT_16' => 'Priority',
+                 'INT_17' => 'Priority',
+                 'INT_18' => 'Priority',
+                 'INT_19' => 'Priority',
+                 'INT_20' => 'Priority',
+                 'INT_21' => 'First Class',
+                 'INT_22' => 'Priority',
+                 'INT_23' => 'Priority',
+                 'INT_24' => 'Priority',
+                 'INT_25' => 'Priority',
+                 'INT_26' => 'Priority Express',
+                 'INT_27' => 'Priority Express',
+             ),
 
-            'service_to_code'=>array(
-                'First-Class'                                   => 'FIRST CLASS',
-                'First-Class Mail International Large Envelope' => 'FIRST CLASS',
-                'First-Class Mail International Letter'         => 'FIRST CLASS',
-                'First-Class Mail International Package'        => 'FIRST CLASS',
-                'First-Class Mail International Parcel'         => 'FIRST CLASS',
-                'First-Class Mail'                 => 'FIRST CLASS',
-                'First-Class Mail Flat'            => 'FIRST CLASS',
-                'First-Class Mail Large Envelope'  => 'FIRST CLASS',
-                'First-Class Mail International'   => 'FIRST CLASS',
-                'First-Class Mail Letter'          => 'FIRST CLASS',
-                'First-Class Mail Parcel'          => 'FIRST CLASS',
-                'First-Class Mail Package'         => 'FIRST CLASS',
-                'Parcel Post'                      => 'PARCEL',
-                'Bound Printed Matter'             => 'BPM',
-                'Media Mail'                       => 'MEDIA',
-                'Library Mail'                     => 'LIBRARY',
-                'Express Mail'                     => 'EXPRESS',
-                'Express Mail PO to PO'            => 'EXPRESS',
-                'Express Mail Flat Rate Envelope'  => 'EXPRESS',
-                'Express Mail Flat-Rate Envelope Sunday/Holiday Guarantee'  => 'EXPRESS',
-                'Express Mail Sunday/Holiday Guarantee'            => 'EXPRESS',
-                'Express Mail Flat Rate Envelope Hold For Pickup'  => 'EXPRESS',
-                'Express Mail Hold For Pickup'                     => 'EXPRESS',
-                'Global Express Guaranteed (GXG)'                  => 'EXPRESS',
-                'Global Express Guaranteed Non-Document Rectangular'     => 'EXPRESS',
-                'Global Express Guaranteed Non-Document Non-Rectangular' => 'EXPRESS',
-                'USPS GXG Envelopes'                               => 'EXPRESS',
-                'Express Mail International'                       => 'EXPRESS',
-                'Express Mail International Flat Rate Envelope'    => 'EXPRESS',
-                'Priority Mail'                        => 'PRIORITY',
-                'Priority Mail Small Flat Rate Box'    => 'PRIORITY',
-                'Priority Mail Medium Flat Rate Box'   => 'PRIORITY',
-                'Priority Mail Large Flat Rate Box'    => 'PRIORITY',
-                'Priority Mail Flat Rate Box'          => 'PRIORITY',
-                'Priority Mail Flat Rate Envelope'     => 'PRIORITY',
-                'Priority Mail International'                            => 'PRIORITY',
-                'Priority Mail International Flat Rate Envelope'         => 'PRIORITY',
-                'Priority Mail International Small Flat Rate Box'        => 'PRIORITY',
-                'Priority Mail International Medium Flat Rate Box'       => 'PRIORITY',
-                'Priority Mail International Large Flat Rate Box'        => 'PRIORITY',
-                'Priority Mail International Flat Rate Box'              => 'PRIORITY'
-            ),
+       // Added because USPS has different services but with same CLASSID value, which is "0"
+             'method_to_code' => array(
+                 'First-Class Mail Large Envelope' => '0_FCLE',
+                 'First-Class Mail Letter'         => '0_FCL',
+                 'First-Class Mail Parcel'         => '0_FCP',
+             ),
 
             'first_class_mail_type'=>array(
                 'LETTER'      => Mage::helper('usa')->__('Letter'),
@@ -610,8 +701,8 @@ public function getCode($type, $code='')
 
             'container'=>array(
                 'VARIABLE'           => Mage::helper('usa')->__('Variable'),
-                'FLAT RATE BOX'      => Mage::helper('usa')->__('Flat-Rate Box'),
                 'FLAT RATE ENVELOPE' => Mage::helper('usa')->__('Flat-Rate Envelope'),
+                'FLAT RATE BOX'      => Mage::helper('usa')->__('Flat-Rate Box'),
                 'RECTANGULAR'        => Mage::helper('usa')->__('Rectangular'),
                 'NONRECTANGULAR'     => Mage::helper('usa')->__('Non-rectangular'),
             ),
@@ -622,33 +713,49 @@ public function getCode($type, $code='')
                     'filters'    => array(
                         'within_us' => array(
                             'method' => array(
-                                'Express Mail Flat Rate Envelope',
-                                'Express Mail Flat Rate Envelope Hold For Pickup',
+                                'Priority Mail Express Flat Rate Envelope',
+                                'Priority Mail Express Flat Rate Envelope Hold For Pickup',
                                 'Priority Mail Flat Rate Envelope',
                                 'Priority Mail Large Flat Rate Box',
                                 'Priority Mail Medium Flat Rate Box',
                                 'Priority Mail Small Flat Rate Box',
-                                'Express Mail',
+                                'Priority Mail Express Hold For Pickup',
+                                'Priority Mail Express',
                                 'Priority Mail',
-                                'Parcel Post',
+                                'Priority Mail Hold For Pickup',
+                                'Priority Mail Large Flat Rate Box Hold For Pickup',
+                                'Priority Mail Medium Flat Rate Box Hold For Pickup',
+                                'Priority Mail Small Flat Rate Box Hold For Pickup',
+                                'Priority Mail Flat Rate Envelope Hold For Pickup',
+                                'Priority Mail Small Flat Rate Envelope',
+                                'Priority Mail Small Flat Rate Envelope Hold For Pickup',
+                                'First-Class Package Service Hold For Pickup',
+                                'Priority Mail Express Flat Rate Boxes',
+                                'Priority Mail Express Flat Rate Boxes Hold For Pickup',
+                                'Standard Post',
                                 'Media Mail',
                                 'First-Class Mail Large Envelope',
+                                'Priority Mail Express Sunday/Holiday Delivery',
+                                'Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope',
+                                'Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes',
                             )
                         ),
                         'from_us' => array(
                             'method' => array(
-                                'Express Mail International Flat Rate Envelope',
+                                'Priority Mail Express International Flat Rate Envelope',
                                 'Priority Mail International Flat Rate Envelope',
                                 'Priority Mail International Large Flat Rate Box',
                                 'Priority Mail International Medium Flat Rate Box',
                                 'Priority Mail International Small Flat Rate Box',
+                                'Priority Mail International Small Flat Rate Envelope',
+                                'Priority Mail Express International Flat Rate Boxes',
                                 'Global Express Guaranteed (GXG)',
                                 'USPS GXG Envelopes',
-                                'Express Mail International',
+                                'Priority Mail Express International',
                                 'Priority Mail International',
-                                'First-Class Mail International Package',
+                                'First-Class Mail International Letter',
                                 'First-Class Mail International Large Envelope',
-                                'First-Class Mail International Parcel',
+                                'First-Class Package International Service',
                             )
                         )
                     )
@@ -661,6 +768,11 @@ public function getCode($type, $code='')
                                 'Priority Mail Large Flat Rate Box',
                                 'Priority Mail Medium Flat Rate Box',
                                 'Priority Mail Small Flat Rate Box',
+                                'Priority Mail International Large Flat Rate Box',
+                                'Priority Mail International Medium Flat Rate Box',
+                                'Priority Mail International Small Flat Rate Box',
+                                'Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes',
+
                             )
                         ),
                         'from_us' => array(
@@ -668,6 +780,8 @@ public function getCode($type, $code='')
                                 'Priority Mail International Large Flat Rate Box',
                                 'Priority Mail International Medium Flat Rate Box',
                                 'Priority Mail International Small Flat Rate Box',
+                                'Priority Mail International DVD Flat Rate priced box',
+                                'Priority Mail International Large Video Flat Rate priced box'
                             )
                         )
                     )
@@ -677,15 +791,28 @@ public function getCode($type, $code='')
                     'filters'    => array(
                         'within_us' => array(
                             'method' => array(
-                                'Express Mail Flat Rate Envelope',
-                                'Express Mail Flat Rate Envelope Hold For Pickup',
+                                'Priority Mail Express Flat Rate Envelope',
+                                'Priority Mail Express Flat Rate Envelope Hold For Pickup',
                                 'Priority Mail Flat Rate Envelope',
+                                'First-Class Mail Large Envelope',
+                                'Priority Mail Flat Rate Envelope Hold For Pickup',
+                                'Priority Mail Small Flat Rate Envelope',
+                                'Priority Mail Small Flat Rate Envelope Hold For Pickup',
+                                'Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope',
+                                'Priority Mail Express Padded Flat Rate Envelope'
                             )
                         ),
                         'from_us' => array(
                             'method' => array(
-                                'Express Mail International Flat Rate Envelope',
-                                'Priority Mail International Flat Rate Envelope',
+                                 'Priority Mail Express International Flat Rate Envelope',
+                                 'Priority Mail International Flat Rate Envelope',
+                                 'First-Class Mail International Large Envelope',
+                                 'Priority Mail International Small Flat Rate Envelope',
+                                 'Priority Mail Express International Legal Flat Rate Envelope',
+                                 'Priority Mail International Gift Card Flat Rate Envelope',
+                                 'Priority Mail International Window Flat Rate Envelope',
+                                 'Priority Mail International Legal Flat Rate Envelope',
+                                 'Priority Mail Express International Padded Flat Rate Envelope',
                             )
                         )
                     )
@@ -695,19 +822,20 @@ public function getCode($type, $code='')
                     'filters'    => array(
                         'within_us' => array(
                             'method' => array(
-                                'Express Mail',
+                                'Priority Mail Express',
                                 'Priority Mail',
-                                'Parcel Post',
+                                'Standard Post',
                                 'Media Mail',
+                                'Library Mail',
+                                'First-Class Package Service'
                             )
                         ),
                         'from_us' => array(
                             'method' => array(
                                 'USPS GXG Envelopes',
-                                'Express Mail International',
+                                'Priority Mail Express International',
                                 'Priority Mail International',
-                                'First-Class Mail International Package',
-                                'First-Class Mail International Parcel',
+                                'First-Class Package International Service',
                             )
                         )
                     )
@@ -717,26 +845,25 @@ public function getCode($type, $code='')
                     'filters'    => array(
                         'within_us' => array(
                             'method' => array(
-                                'Express Mail',
+                                'Priority Mail Express',
                                 'Priority Mail',
-                                'Parcel Post',
+                                'Standard Post',
                                 'Media Mail',
+                                'Library Mail',
+                                'First-Class Package Service'
                             )
                         ),
                         'from_us' => array(
                             'method' => array(
                                 'Global Express Guaranteed (GXG)',
-                                'USPS GXG Envelopes',
-                                'Express Mail International',
+                                'Priority Mail Express International',
                                 'Priority Mail International',
-                                'First-Class Mail International Package',
-                                'First-Class Mail International Parcel',
+                                'First-Class Package International Service',
                             )
                         )
                     )
                 ),
-             ),
-
+          ),
             'size'=>array(
                 'REGULAR'     => Mage::helper('usa')->__('Regular'),
                 'LARGE'       => Mage::helper('usa')->__('Large'),
@@ -753,13 +880,6 @@ public function getCode($type, $code='')
             ),
         );
 
-        $methods = $this->getConfigData('methods');
-        if (!empty($methods)) {
-            $codes['method'] = explode(",", $methods);
-        } else {
-            $codes['method'] = array();
-        }
-
         if (!isset($codes[$type])) {
             return false;
         } elseif (''===$code) {
@@ -772,22 +892,21 @@ public function getCode($type, $code='')
             return $codes[$type][$code];
         }
     }
-
     /**
      * Get tracking
      *
-     * @param mixed $trackings
+     * @param mixed $trackingData
      * @return mixed
      */
-    public function getTracking($trackings)
+    public function getTracking($trackingData)
     {
-        $this->setTrackingReqeust();
+        $this->setTrackingRequest();
 
-        if (!is_array($trackings)) {
-            $trackings = array($trackings);
-        }
+       if (!is_array($trackingData)) {
+          $trackingData = array($trackingData);
+         }
 
-        $this->_getXmlTracking($trackings);
+        $this->_getXMLTracking($trackingData);
 
         return $this->_result;
     }
@@ -797,7 +916,7 @@ public function getTracking($trackings)
      *
      * @return null
      */
-    protected function setTrackingReqeust()
+    protected function setTrackingRequest()
     {
         $r = new Varien_Object();
 
@@ -810,14 +929,13 @@ protected function setTrackingReqeust()
     /**
      * Send request for tracking
      *
-     * @param array $tracking
-     * @return null
+     * @param array $trackingData
      */
-    protected function _getXmlTracking($trackings)
+    protected function _getXmlTracking($trackingData)
     {
          $r = $this->_rawTrackRequest;
 
-         foreach ($trackings as $tracking) {
+         foreach ($trackingData as $tracking) {
              $xml = new SimpleXMLElement('<?xml version = "1.0" encoding = "UTF-8"?><TrackRequest/>');
              $xml->addAttribute('USERID', $r->getUserId());
 
@@ -851,15 +969,14 @@ protected function _getXmlTracking($trackings)
             $this->_parseXmlTrackingResponse($tracking, $responseBody);
          }
     }
-
     /**
      * Parse xml tracking response
      *
-     * @param array $trackingvalue
+     * @param array $trackingValue
      * @param string $response
      * @return null
      */
-    protected function _parseXmlTrackingResponse($trackingvalue, $response)
+    protected function _parseXmlTrackingResponse($trackingValue, $response)
     {
         $errorTitle = Mage::helper('usa')->__('Unable to retrieve tracking');
         $resultArr=array();
@@ -890,20 +1007,19 @@ protected function _parseXmlTrackingResponse($trackingvalue, $response)
         if (!$this->_result) {
             $this->_result = Mage::getModel('shipping/tracking_result');
         }
-        $defaults = $this->getDefaults();
 
         if ($resultArr) {
              $tracking = Mage::getModel('shipping/tracking_result_status');
              $tracking->setCarrier('usps');
              $tracking->setCarrierTitle($this->getConfigData('title'));
-             $tracking->setTracking($trackingvalue);
+             $tracking->setTracking($trackingValue);
              $tracking->setTrackSummary($resultArr['tracksummary']);
              $this->_result->append($tracking);
          } else {
             $error = Mage::getModel('shipping/tracking_result_error');
             $error->setCarrier('usps');
             $error->setCarrierTitle($this->getConfigData('title'));
-            $error->setTracking($trackingvalue);
+            $error->setTracking($trackingValue);
             $error->setErrorMessage($errorTitle);
             $this->_result->append($error);
          }
@@ -918,8 +1034,8 @@ public function getResponse()
     {
         $statuses = '';
         if ($this->_result instanceof Mage_Shipping_Model_Tracking_Result) {
-            if ($trackings = $this->_result->getAllTrackings()) {
-                foreach ($trackings as $tracking) {
+            if ($trackingData = $this->_result->getAllTrackings()) {
+                foreach ($trackingData as $tracking) {
                     if($data = $tracking->getAllData()) {
                         if (!empty($data['track_summary'])) {
                             $statuses .= Mage::helper('usa')->__($data['track_summary']);
@@ -946,7 +1062,7 @@ public function getAllowedMethods()
         $allowed = explode(',', $this->getConfigData('allowed_methods'));
         $arr = array();
         foreach ($allowed as $k) {
-            $arr[$k] = $k;
+            $arr[$k] = $this->getCode('method', $k);
         }
         return $arr;
     }
@@ -1279,24 +1395,32 @@ protected function _formUsExpressShipmentRequest(Varien_Object $request)
      *
      * @param Varien_Object $request
      * @param string $serviceType
+     * 
+     * @throws Exception
+     * 
      * @return string
      */
     protected function _formUsSignatureConfirmationShipmentRequest(Varien_Object $request, $serviceType)
     {
         switch ($serviceType) {
             case 'PRIORITY':
+            case 'Priority':
                 $serviceType = 'Priority';
                 break;
             case 'FIRST CLASS':
+            case 'First Class':
                 $serviceType = 'First Class';
                 break;
-            case 'PARCEL':
-                $serviceType = 'Parcel Post';
+            case 'STANDARD':
+            case 'Standard Post':
+                $serviceType = 'Standard Post';
                 break;
             case 'MEDIA':
+            case 'Media':
                 $serviceType = 'Media Mail';
                 break;
             case 'LIBRARY':
+            case 'Library':
                 $serviceType = 'Library Mail';
                 break;
             default:
@@ -1439,11 +1563,12 @@ protected function _formIntlShipmentRequest(Varien_Object $request)
         // the wrap node needs for remove xml declaration above
         $xmlWrap = new SimpleXMLElement('<?xml version = "1.0" encoding = "UTF-8"?><wrap/>');
         $method = '';
-        if (stripos($shippingMethod, 'Priority') !== false) {
+        $service = $this->getCode('service_to_code', $shippingMethod);
+        if ($service == 'Priority') {
             $method = 'Priority';
             $rootNode = 'PriorityMailIntlRequest';
             $xml = $xmlWrap->addChild($rootNode);
-        } else if (stripos($shippingMethod, 'First-Class') !== false) {
+        } else if ($service == 'First Class') {
             $method = 'FirstClass';
             $rootNode = 'FirstClassMailIntlRequest';
             $xml = $xmlWrap->addChild($rootNode);
@@ -1478,7 +1603,8 @@ protected function _formIntlShipmentRequest(Varien_Object $request)
             }
             $xml->addChild('FromCustomsReference', 'Order #' . $referenceData);
         }
-        $xml->addChild('ToName', $request->getRecipientContactPersonName());
+        $xml->addChild('ToFirstName', $request->getRecipientContactPersonFirstName());
+        $xml->addChild('ToLastName', $request->getRecipientContactPersonLastName());
         $xml->addChild('ToFirm', $request->getRecipientContactCompanyName());
         $xml->addChild('ToAddress1', $request->getRecipientAddressStreet1());
         $xml->addChild('ToAddress2', $request->getRecipientAddressStreet2());
@@ -1615,7 +1741,7 @@ protected function _doShipmentRequest(Varien_Object $request)
         $service = $this->getCode('service_to_code', $request->getShippingMethod());
         $recipientUSCountry = $this->_isUSCountry($request->getRecipientAddressCountryCode());
 
-        if ($recipientUSCountry && $service == 'EXPRESS') {
+        if ($recipientUSCountry && $service == 'Priority Express') {
             $requestXml = $this->_formUsExpressShipmentRequest($request);
             $api = 'ExpressMailLabel';
         } else if ($recipientUSCountry) {
@@ -1625,10 +1751,10 @@ protected function _doShipmentRequest(Varien_Object $request)
             } else {
                 $api = 'SignatureConfirmationCertifyV3';
             }
-        } else if ($service == 'FIRST CLASS') {
+        } else if ($service == 'First Class') {
             $requestXml = $this->_formIntlShipmentRequest($request);
             $api = 'FirstClassMailIntl';
-        } else if ($service == 'PRIORITY') {
+        } else if ($service == 'Priority') {
             $requestXml = $this->_formIntlShipmentRequest($request);
             $api = 'PriorityMailIntl';
         } else {
@@ -1658,7 +1784,7 @@ protected function _doShipmentRequest(Varien_Object $request)
             $this->_debug($debugData);
             $result->setErrors($debugData['result']['error']);
         } else {
-            if ($recipientUSCountry && $service == 'EXPRESS') {
+            if ($recipientUSCountry && $service == 'Priority Express') {
                 $labelContent = base64_decode((string) $response->EMLabel);
                 $trackingNumber = (string) $response->EMConfirmationNumber;
             } else if ($recipientUSCountry) {
@@ -1796,4 +1922,37 @@ protected function _parseZip($zipString, $returnFull = false)
 
         return array($zip5, $zip4);
     }
+
+    /**
+     * @deprecated
+     */
+    protected function _methodsMapper($method, $valuesToLabels = true)
+    {
+        return $method;
+    }
+
+    /**
+     * @deprecate
+     */
+    public function getMethodLabel($value)
+    {
+        return $this->_methodsMapper($value, true);
+    }
+
+    /**
+     * Get value of method by its label
+     * @deprecated
+     */
+    public function getMethodValue($label)
+    {
+        return $this->_methodsMapper($label, false);
+    }
+    
+    /**
+      * @deprecated
+      */
+    protected function setTrackingReqeust()
+    {
+        $this->setTrackingRequest();
+    }
 }
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Method.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Method.php
index 642a62b78cf..727c9267139 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Method.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Method.php
@@ -29,10 +29,11 @@ class Mage_Usa_Model_Shipping_Carrier_Usps_Source_Method
 {
     public function toOptionArray()
     {
+        /** @var $usps Mage_Usa_Model_Shipping_Carrier_Usps */
         $usps = Mage::getSingleton('usa/shipping_carrier_usps');
         $arr = array();
-        foreach ($usps->getCode('method') as $v) {
-            $arr[] = array('value'=>$v, 'label'=>$v);
+        foreach ($usps->getCode('method') as $k => $v) {
+            $arr[] = array('value' => $k, 'label' => Mage::helper('usa')->__($v));
         }
         return $arr;
     }
diff --git a/app/code/core/Mage/Usa/etc/config.xml b/app/code/core/Mage/Usa/etc/config.xml
index 627317840b3..98457c7d887 100644
--- a/app/code/core/Mage/Usa/etc/config.xml
+++ b/app/code/core/Mage/Usa/etc/config.xml
@@ -28,7 +28,7 @@
 <config>
     <modules>
         <Mage_Usa>
-            <version>1.6.0.1</version>
+            <version>1.6.0.3</version>
         </Mage_Usa>
     </modules>
     <global>
@@ -123,11 +123,12 @@
                 <shipping_intlkey backend_model="adminhtml/system_config_backend_encrypted"/>
                 <title>DHL (Deprecated)</title>
                 <specificerrmsg>This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us.</specificerrmsg>
+                <unit_of_measure>LB</unit_of_measure>
                 <max_package_weight>150</max_package_weight>
                 <handling_type>F</handling_type>
                 <handling_action>O</handling_action>
-                <shipment_days>1,2,3,4,5,6</shipment_days>
-                <intl_shipment_days>1,2,3,4,5</intl_shipment_days>
+                <shipment_days>Mon,Tue,Wed,Thu,Fri,Sat</shipment_days>
+                <intl_shipment_days>Mon,Tue,Wed,Thu,Fri</intl_shipment_days>
                 <additional_protection_rounding>0</additional_protection_rounding>
             </dhl>
             <fedex>
@@ -165,11 +166,13 @@
                 <free_method>GND</free_method>
                 <gateway_url>http://www.ups.com/using/services/rave/qcostcgi.cgi</gateway_url>
                 <gateway_xml_url>https://onlinetools.ups.com/ups.app/xml/Rate</gateway_xml_url>
+                <tracking_xml_url>https://onlinetools.ups.com/ups.app/xml/Track</tracking_xml_url>
+                <shipconfirm_xml_url>https://onlinetools.ups.com/ups.app/xml/ShipConfirm</shipconfirm_xml_url>
+                <shipaccept_xml_url>https://onlinetools.ups.com/ups.app/xml/ShipAccept</shipaccept_xml_url>
                 <handling>0</handling>
                 <model>usa/shipping_carrier_ups</model>
                 <pickup>CC</pickup>
                 <title>United Parcel Service</title>
-                <tracking_xml_url>https://www.ups.com/ups.app/xml/Track</tracking_xml_url>
                 <unit_of_measure>LBS</unit_of_measure>
                 <username backend_model="adminhtml/system_config_backend_encrypted"/>
                 <password backend_model="adminhtml/system_config_backend_encrypted"/>
@@ -185,7 +188,7 @@
             <usps>
                 <active>0</active>
                 <sallowspecific>0</sallowspecific>
-                <allowed_methods>Bound Printed Matter,Express Mail,Express Mail Flat Rate Envelope,Express Mail Flat Rate Envelope Hold For Pickup,Express Mail Flat-Rate Envelope Sunday/Holiday Guarantee,Express Mail Hold For Pickup,Express Mail International,Express Mail International Flat Rate Envelope,Express Mail PO to PO,Express Mail Sunday/Holiday Guarantee,First-Class Mail International Large Envelope,First-Class Mail International Letters,First-Class Mail International Package,First-Class Mail International Parcel,First-Class,First-Class Mail,First-Class Mail Flat,First-Class Mail Large Envelope,First-Class Mail International,First-Class Mail Letter,First-Class Mail Parcel,First-Class Mail Package,Global Express Guaranteed (GXG),Global Express Guaranteed Non-Document Non-Rectangular,Global Express Guaranteed Non-Document Rectangular,Library Mail,Media Mail,Parcel Post,Priority Mail,Priority Mail Small Flat Rate Box,Priority Mail Medium Flat Rate Box,Priority Mail Large Flat Rate Box,Priority Mail Flat Rate Box,Priority Mail Flat Rate Envelope,Priority Mail International,Priority Mail International Flat Rate Box,Priority Mail International Flat Rate Envelope,Priority Mail International Small Flat Rate Box,Priority Mail International Medium Flat Rate Box,Priority Mail International Large Flat Rate Box,USPS GXG Envelopes</allowed_methods>
+                <allowed_methods>0_FCLE,0_FCL,0_FCP,1,2,3,4,6,7,13,16,17,22,23,25,27,28,33,34,35,36,37,42,43,53,55,56,57,61,INT_1,INT_2,INT_4,INT_6,INT_7,INT_8,INT_9,INT_10,INT_11,INT_12,INT_13,INT_14,INT_15,INT_16,INT_20,INT_26</allowed_methods>
                 <container>VARIABLE</container>
                 <cutoff_cost/>
                 <free_method/>
@@ -194,7 +197,7 @@
                 <shipment_requesttype>0</shipment_requesttype>
                 <handling/>
                 <machinable>true</machinable>
-                <methods>Bound Printed Matter,Express Mail,Express Mail Flat Rate Envelope,Express Mail Flat Rate Envelope Hold For Pickup,Express Mail Flat-Rate Envelope Sunday/Holiday Guarantee,Express Mail Hold For Pickup,Express Mail International,Express Mail International Flat Rate Envelope,Express Mail PO to PO,Express Mail Sunday/Holiday Guarantee,First-Class Mail International Large Envelope,First-Class Mail International Letters,First-Class Mail International Package,First-Class Mail International Parcel,First-Class,First-Class Mail,First-Class Mail Flat,First-Class Mail Large Envelope,First-Class Mail International,First-Class Mail Letter,First-Class Mail Parcel,First-Class Mail Package,Global Express Guaranteed (GXG),Global Express Guaranteed Non-Document Non-Rectangular,Global Express Guaranteed Non-Document Rectangular,Library Mail,Media Mail,Parcel Post,Priority Mail,Priority Mail Small Flat Rate Box,Priority Mail Medium Flat Rate Box,Priority Mail Large Flat Rate Box,Priority Mail Flat Rate Box,Priority Mail Flat Rate Envelope,Priority Mail International,Priority Mail International Flat Rate Box,Priority Mail International Flat Rate Envelope,Priority Mail International Small Flat Rate Box,Priority Mail International Medium Flat Rate Box,Priority Mail International Large Flat Rate Box,USPS GXG Envelopes</methods>
+                <methods></methods>
                 <model>usa/shipping_carrier_usps</model>
                 <size>REGULAR</size>
                 <title>United States Postal Service</title>
@@ -225,6 +228,7 @@
                 <size>R</size>
                 <handling_type>F</handling_type>
                 <handling_action>O</handling_action>
+                <shipment_days>Mon,Tue,Wed,Thu,Fri</shipment_days>
             </dhlint>
         </carriers>
     </default>
diff --git a/app/code/core/Mage/Usa/etc/system.xml b/app/code/core/Mage/Usa/etc/system.xml
index b6e7ba5bc7d..341dd1eaefe 100644
--- a/app/code/core/Mage/Usa/etc/system.xml
+++ b/app/code/core/Mage/Usa/etc/system.xml
@@ -360,7 +360,7 @@
                         <shipment_days translate="label">
                             <label>Domestic Shipment Days</label>
                             <frontend_type>multiselect</frontend_type>
-                            <source_model>adminhtml/system_config_source_locale_weekdays</source_model>
+                            <source_model>adminhtml/system_config_source_locale_weekdaycodes</source_model>
                             <sort_order>1390</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
@@ -371,7 +371,7 @@
                         <intl_shipment_days translate="label">
                             <label>International Shipment Days</label>
                             <frontend_type>multiselect</frontend_type>
-                            <source_model>adminhtml/system_config_source_locale_weekdays</source_model>
+                            <source_model>adminhtml/system_config_source_locale_weekdaycodes</source_model>
                             <sort_order>1400</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
@@ -487,6 +487,15 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                         </dropoff>
+                        <unit_of_measure translate="label">
+                            <label>Weight Unit</label>
+                            <frontend_type>select</frontend_type>
+                            <source_model>usa/shipping_carrier_fedex_source_unitofmeasure</source_model>
+                            <sort_order>95</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>0</show_in_store>
+                        </unit_of_measure>
                         <max_package_weight translate="label">
                             <label>Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)</label>
                             <frontend_type>text</frontend_type>
@@ -738,11 +747,35 @@
                         <gateway_xml_url translate="label">
                             <label>Gateway XML URL</label>
                             <frontend_type>text</frontend_type>
-                            <sort_order>30</sort_order>
+                            <sort_order>22</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
                         </gateway_xml_url>
+                        <tracking_xml_url translate="label">
+                            <label>Tracking XML URL</label>
+                            <frontend_type>text</frontend_type>
+                            <sort_order>24</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>0</show_in_store>
+                        </tracking_xml_url>
+                        <shipconfirm_xml_url translate="label">
+                            <label>Shipping Confirm XML URL</label>
+                            <frontend_type>text</frontend_type>
+                            <sort_order>26</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>0</show_in_store>
+                        </shipconfirm_xml_url>
+                        <shipaccept_xml_url translate="label">
+                            <label>Shipping Accept XML URL</label>
+                            <frontend_type>text</frontend_type>
+                            <sort_order>28</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>0</show_in_store>
+                        </shipaccept_xml_url>
                         <handling_type translate="label">
                             <label>Calculate Handling Fee</label>
                             <frontend_type>select</frontend_type>
@@ -822,7 +855,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>0</show_in_store>
-                        0</sort_order>
+                        </sort_order>
                         <title translate="label">
                             <label>Title</label>
                             <frontend_type>text</frontend_type>
@@ -831,14 +864,6 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                         </title>
-                        <tracking_xml_url translate="label">
-                            <label>Tracking XML URL</label>
-                            <frontend_type>text</frontend_type>
-                            <sort_order>60</sort_order>
-                            <show_in_default>1</show_in_default>
-                            <show_in_website>1</show_in_website>
-                            <show_in_store>0</show_in_store>
-                        </tracking_xml_url>
                         <type translate="label">
                             <label>UPS Type</label>
                             <frontend_type>select</frontend_type>
diff --git a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php
new file mode 100644
index 00000000000..eeb302b6cf2
--- /dev/null
+++ b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Usa
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/* @var $installer Mage_Core_Model_Resource_Setup */
+$installer = $this;
+$configDataTable = $installer->getTable('core/config_data');
+$connection = $installer->getConnection();
+
+$oldToNewMethodCodesMap = array(
+    'First-Class'                                               => '0_FCLE',
+    'First-Class Mail International Large Envelope'             => 'INT_14',
+    'First-Class Mail International Letter'                     => 'INT_13',
+    'First-Class Mail International Letters'                    => 'INT_13',
+    'First-Class Mail International Package'                    => 'INT_15',
+    'First-Class Mail International Parcel'                     => 'INT_13',
+    'First-Class Package International Service'                 => 'INT_15',
+    'First-Class Mail'                                          => '0_FCLE',
+    'First-Class Mail Flat'                                     => '0_FCLE',
+    'First-Class Mail Large Envelope'                           => '0_FCLE',
+    'First-Class Mail International'                            => 'INT_14',
+    'First-Class Mail Letter'                                   => '0_FCL',
+    'First-Class Mail Parcel'                                   => '0_FCP',
+    'First-Class Mail Package'                                  => '0_FCP',
+    'Parcel Post'                                               => '4',
+    'Standard Post'                                             => '4',
+    'Media Mail'                                                => '6',
+    'Library Mail'                                              => '7',
+    'Express Mail'                                              => '3',
+    'Express Mail PO to PO'                                     => '3',
+    'Express Mail Flat Rate Envelope'                           => '13',
+    'Express Mail Flat-Rate Envelope Sunday/Holiday Guarantee'  => '25',
+    'Express Mail Sunday/Holiday Guarantee'                     => '23',
+    'Express Mail Flat Rate Envelope Hold For Pickup'           => '27',
+    'Express Mail Hold For Pickup'                              => '2',
+    'Global Express Guaranteed (GXG)'                           => 'INT_4',
+    'Global Express Guaranteed Non-Document Rectangular'        => 'INT_6',
+    'Global Express Guaranteed Non-Document Non-Rectangular'    => 'INT_7',
+    'USPS GXG Envelopes'                                        => 'INT_12',
+    'Express Mail International'                                => 'INT_1',
+    'Express Mail International Flat Rate Envelope'             => 'INT_10',
+    'Priority Mail'                                             => '1',
+    'Priority Mail Small Flat Rate Box'                         => '28',
+    'Priority Mail Medium Flat Rate Box'                        => '17',
+    'Priority Mail Large Flat Rate Box'                         => '22',
+    'Priority Mail Flat Rate Envelope'                          => '16',
+    'Priority Mail International'                               => 'INT_2',
+    'Priority Mail International Flat Rate Envelope'            => 'INT_8',
+    'Priority Mail International Small Flat Rate Box'           => 'INT_16',
+    'Priority Mail International Medium Flat Rate Box'          => 'INT_9',
+    'Priority Mail International Large Flat Rate Box'           => 'INT_11',
+);
+
+$select = $connection->select()
+        ->from($configDataTable)
+        ->where('path IN (?)',
+                array(
+                    'carriers/usps/free_method',
+                    'carriers/usps/allowed_methods'
+               )
+        );
+$oldConfigValues = $connection->fetchAll($select);
+
+foreach ($oldConfigValues as $oldValue) {
+    $newValue = '';
+    if (stripos($oldValue['path'], 'free_method') && isset($oldToNewMethodCodesMap[$oldValue['value']])) {
+        $newValue = $oldToNewMethodCodesMap[$oldValue['value']];
+    } else if (stripos($oldValue['path'], 'allowed_methods')) {
+        foreach (explode(',', $oldValue['value']) as $shippingMethod) {
+            if (isset($oldToNewMethodCodesMap[$shippingMethod])) {
+                $newValue[] = $oldToNewMethodCodesMap[$shippingMethod];
+            }
+        }
+        $newValue = implode($newValue, ',');
+    } else {
+        continue;
+    }
+
+    if (!empty($newValue) && $newValue != $oldValue['value']) {
+        $whereConfigId = $connection->quoteInto('config_id = ?', $oldValue['config_id']);
+        $connection->update($configDataTable,
+                      array('value' => $newValue),
+                      $whereConfigId
+        );
+    }
+}
diff --git a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.2-1.6.0.3.php
new file mode 100644
index 00000000000..7df0efb3d56
--- /dev/null
+++ b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.2-1.6.0.3.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Usa
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/* @var $this Mage_Core_Model_Resource_Setup */
+
+$days = Mage::app()->getLocale()->getTranslationList('days');
+$days = array_keys($days['format']['wide']);
+foreach ($days as $key => $value) {
+    $days[$key] = ucfirst($value);
+}
+
+$select = $this->getConnection()
+    ->select()
+    ->from($this->getTable('core/config_data'), array('config_id', 'value'))
+    ->where('path = ?', 'carriers/dhl/shipment_days')
+    ->orWhere('path = ?', 'carriers/dhl/intl_shipment_days');
+
+foreach ($this->getConnection()->fetchAll($select) as $configRow) {
+    $row = array('value' => implode(',', array_intersect_key($days, array_flip(explode(',', $configRow['value'])))));
+    $this->getConnection()->update(
+        $this->getTable('core/config_data'),
+        $row,
+        array(
+            'config_id = ?' => $configRow['config_id']
+        )
+    );
+}
diff --git a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php
index bdb36808ae9..a98a04c810f 100644
--- a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php
+++ b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php
@@ -24,7 +24,13 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-
+/**
+ * Weee calculation model
+ *
+ * @category    Mage
+ * @package     Mage_Weee
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
 class Mage_Weee_Model_Total_Quote_Weee extends Mage_Tax_Model_Sales_Total_Quote_Tax
 {
     /**
@@ -33,6 +39,12 @@ class Mage_Weee_Model_Total_Quote_Weee extends Mage_Tax_Model_Sales_Total_Quote_
      * @var Mage_Weee_Helper_Data
      */
     protected $_helper;
+
+    /**
+     * Store model
+     *
+     * @var Mage_Core_Model_Store
+     */
     protected $_store;
 
     /**
@@ -130,7 +142,7 @@ protected function _process(Mage_Sales_Model_Quote_Address $address, $item)
         $totalRowValue      = 0;
         $baseTotalRowValue  = 0;
 
-        foreach ($attributes as $k=>$attribute) {
+        foreach ($attributes as $k => $attribute) {
             $baseValue      = $attribute->getAmount();
             $value          = $this->_store->convertPrice($baseValue);
             $rowValue       = $value*$item->getTotalQty();
@@ -147,7 +159,7 @@ protected function _process(Mage_Sales_Model_Quote_Address $address, $item)
                 'base_amount'   => $baseValue,
                 'amount'        => $value,
                 'row_amount'    => $rowValue,
-                'base_row_amount'=> $baseRowValue,
+                'base_row_amount' => $baseRowValue,
                 /**
                  * Tax value can't be presented as include/exclude tax
                  */
@@ -162,7 +174,7 @@ protected function _process(Mage_Sales_Model_Quote_Address $address, $item)
                 'percent'   => null,
                 'hidden'    => $this->_helper->includeInSubtotal($this->_store),
                 'rates'     => array(array(
-                    'base_real_amount'=> $baseRowValue,
+                    'base_real_amount' => $baseRowValue,
                     'base_amount'   => $baseRowValue,
                     'amount'        => $rowValue,
                     'code'          => $attribute->getCode(),
@@ -180,8 +192,7 @@ protected function _process(Mage_Sales_Model_Quote_Address $address, $item)
             ->setBaseWeeeTaxAppliedRowAmount($baseTotalRowValue);
 
         $this->_processTaxSettings($item, $totalValue, $baseTotalValue, $totalRowValue, $baseTotalRowValue)
-            ->_processTotalAmount($address, $totalRowValue, $baseTotalRowValue)
-            ->_processDiscountSettings($item, $totalValue, $baseTotalValue);
+            ->_processTotalAmount($address, $totalRowValue, $baseTotalRowValue);
 
         $this->_helper->setApplied($item, array_merge($this->_helper->getApplied($item), $productTaxes));
         if ($applied) {
@@ -197,6 +208,7 @@ protected function _process(Mage_Sales_Model_Quote_Address $address, $item)
     /**
      * Check if discount should be applied to weee and add weee to discounted price
      *
+     * @deprecated since 1.8
      * @param   Mage_Sales_Model_Quote_Item_Abstract $item
      * @param   float $value
      * @param   float $baseValue
@@ -222,18 +234,20 @@ protected function _processDiscountSettings($item, $value, $baseValue)
      */
     protected function _processTaxSettings($item, $value, $baseValue, $rowValue, $baseRowValue)
     {
+        if ($rowValue) {
+            $this->_isTaxAffected = true;
+            $item->unsRowTotalInclTax()
+                ->unsBaseRowTotalInclTax()
+                ->unsPriceInclTax()
+                ->unsBasePriceInclTax();
+        }
         if ($this->_helper->isTaxable($this->_store) && $rowValue) {
-            if (!$this->_config->priceIncludesTax($this->_store)) {
+            if (!$this->_helper->includeInSubtotal($this->_store)) {
                 $item->setExtraTaxableAmount($value)
                     ->setBaseExtraTaxableAmount($baseValue)
                     ->setExtraRowTaxableAmount($rowValue)
                     ->setBaseExtraRowTaxableAmount($baseRowValue);
             }
-            $item->unsRowTotalInclTax()
-                ->unsBaseRowTotalInclTax()
-                ->unsPriceInclTax()
-                ->unsBasePriceInclTax();
-            $this->_isTaxAffected = true;
         }
         return $this;
     }
@@ -354,7 +368,7 @@ protected function _processItem(Mage_Sales_Model_Quote_Address $address, $item,
         $applied = array();
         $productTaxes = array();
 
-        foreach ($attributes as $k=>$attribute) {
+        foreach ($attributes as $k => $attribute) {
             $baseValue = $attribute->getAmount();
             $value = $store->convertPrice($baseValue);
 
@@ -456,33 +470,33 @@ protected function _processItem(Mage_Sales_Model_Quote_Address $address, $item,
 
 
             $productTaxes[] = array(
-                'title'=>$title,
-                'base_amount'=>$baseValue,
-                'amount'=>$value,
+                'title' => $title,
+                'base_amount' => $baseValue,
+                'amount' => $value,
 
-                'row_amount'=>$rowValue,
-                'base_row_amount'=>$baseRowValue,
+                'row_amount' => $rowValue,
+                'base_row_amount' => $baseRowValue,
 
-                'base_amount_incl_tax'=>$baseValue+$baseOneDisposition,
-                'amount_incl_tax'=>$value+$oneDisposition,
+                'base_amount_incl_tax' => $baseValue+$baseOneDisposition,
+                'amount_incl_tax' => $value+$oneDisposition,
 
-                'row_amount_incl_tax'=>$rowValue+$disposition,
-                'base_row_amount_incl_tax'=>$baseRowValue+$baseDisposition,
+                'row_amount_incl_tax' => $rowValue+$disposition,
+                'base_row_amount_incl_tax' => $baseRowValue+$baseDisposition,
             );
 
             $applied[] = array(
-                'id'=>$attribute->getCode(),
-                'percent'=>null,
-                'hidden'=>$this->_helper->includeInSubtotal($store),
+                'id' => $attribute->getCode(),
+                'percent' => null,
+                'hidden' => $this->_helper->includeInSubtotal($store),
                 'rates' => array(array(
-                    'amount'=>$rowValue,
-                    'base_amount'=>$baseRowValue,
-                    'base_real_amount'=>$baseRowValue,
-                    'code'=>$attribute->getCode(),
-                    'title'=>$title,
-                    'percent'=>null,
-                    'position'=>1,
-                    'priority'=>-1000+$k,
+                    'amount' => $rowValue,
+                    'base_amount' => $baseRowValue,
+                    'base_real_amount' => $baseRowValue,
+                    'code' => $attribute->getCode(),
+                    'title' => $title,
+                    'percent' => null,
+                    'position' => 1,
+                    'priority' => -1000 + $k,
                 ))
             );
 
diff --git a/app/code/core/Mage/Weee/etc/config.xml b/app/code/core/Mage/Weee/etc/config.xml
index 151f003d0de..3c787355e0e 100644
--- a/app/code/core/Mage/Weee/etc/config.xml
+++ b/app/code/core/Mage/Weee/etc/config.xml
@@ -182,7 +182,7 @@
                     <weee>
                         <class>weee/total_quote_weee</class>
                         <after>subtotal,tax_subtotal</after>
-                        <before>tax,discount</before>
+                        <before>shipping,tax,discount</before>
                     </weee>
                 </totals>
                 <nominal_totals>
@@ -196,8 +196,8 @@
                 <totals>
                     <weee>
                         <class>weee/total_invoice_weee</class>
-                        <after>subtotal,tax,discount,grand_total,cost_total,shipping</after>
-                        <before></before>
+                        <after>subtotal,tax,discount,grand_total,cost_total</after>
+                        <before>shipping</before>
                     </weee>
                 </totals>
             </order_invoice>
@@ -206,7 +206,7 @@
                     <weee>
                         <class>weee/total_creditmemo_weee</class>
                         <after>subtotal</after>
-                        <before>tax,discount,grand_total</before>
+                        <before>shipping,tax,discount,grand_total</before>
                     </weee>
                 </totals>
             </order_creditmemo>
diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php
index 7c8d5fe7c36..a0ff763e2df 100644
--- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php
+++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php
@@ -87,7 +87,7 @@ protected function _preparelayout()
     public function getHeaderText()
     {
         if ($this->getWidgetInstance()->getId()) {
-            return Mage::helper('widget')->__('Widget "%s"', $this->htmlEscape($this->getWidgetInstance()->getTitle()));
+            return Mage::helper('widget')->__('Widget "%s"', $this->escapeHtml($this->getWidgetInstance()->getTitle()));
         }
         else {
             return Mage::helper('widget')->__('New Widget Instance');
diff --git a/app/code/core/Mage/Widget/Model/Template/Filter.php b/app/code/core/Mage/Widget/Model/Template/Filter.php
index cf6961ab03c..cc1dba1ddb6 100644
--- a/app/code/core/Mage/Widget/Model/Template/Filter.php
+++ b/app/code/core/Mage/Widget/Model/Template/Filter.php
@@ -60,13 +60,13 @@ public function widgetDirective($construction)
         } else {
             return '';
         }
-        
-        // we have no other way to avoid fatal errors for type like 'cms/widget__link', '_cms/widget_link' etc. 
+
+        // we have no other way to avoid fatal errors for type like 'cms/widget__link', '_cms/widget_link' etc.
         $xml = Mage::getSingleton('widget/widget')->getXmlElementByType($type);
         if ($xml === null) {
             return '';
         }
-        
+
         // define widget block and check the type is instance of Widget Interface
         $widget = Mage::app()->getLayout()->createBlock($type, $name, $params);
         if (!$widget instanceof Mage_Widget_Block_Interface) {
diff --git a/app/code/core/Mage/Widget/Model/Widget/Instance.php b/app/code/core/Mage/Widget/Model/Widget/Instance.php
index b5e316cc435..5e61d58948a 100644
--- a/app/code/core/Mage/Widget/Model/Widget/Instance.php
+++ b/app/code/core/Mage/Widget/Model/Widget/Instance.php
@@ -76,6 +76,7 @@ class Mage_Widget_Model_Widget_Instance extends Mage_Core_Model_Abstract
      */
     protected function _construct()
     {
+        $this->_cacheTag = 'widget_instance';
         parent::_construct();
         $this->_init('widget/widget_instance');
         $this->_layoutHandles = array(
@@ -122,7 +123,6 @@ protected function _beforeSave()
         $pageGroups = $this->getData('page_groups');
         if ($pageGroups) {
             foreach ($pageGroups as $pageGroup) {
-                $tmpPageGroup = array();
                 if (isset($pageGroup[$pageGroup['page_group']])) {
                     $pageGroupData = $pageGroup[$pageGroup['page_group']];
                     if ($pageGroupData['page_id']) {
@@ -479,7 +479,7 @@ public function getWidgetSupportedTemplatesByBlock($blockReference)
      * Generate layout update xml
      *
      * @param string $blockReference
-     * @param string $position
+     * @param string $templatePath
      * @return string
      */
     public function generateLayoutUpdateXml($blockReference, $templatePath = '')
@@ -513,7 +513,7 @@ public function generateLayoutUpdateXml($blockReference, $templatePath = '')
             if ($name && strlen((string)$value)) {
                 $xml .= '<action method="setData">'
                     . '<name>' . $name . '</name>'
-                    . '<value>' . Mage::helper('widget')->htmlEscape($value) . '</value>'
+                    . '<value>' . Mage::helper('widget')->escapeHtml($value) . '</value>'
                     . '</action>';
             }
         }
diff --git a/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php b/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php
index 48517492a17..879c98d8a3e 100644
--- a/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php
+++ b/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php
@@ -182,21 +182,21 @@ public function saveAction()
                 Mage::helper('widget')->__('The widget instance has been saved.')
             );
             if ($this->getRequest()->getParam('back', false)) {
-                    $this->_redirect('*/*/edit', array(
-                        'instance_id' => $widgetInstance->getId(),
-                        '_current' => true
-                    ));
+                $this->_redirect('*/*/edit', array(
+                    'instance_id' => $widgetInstance->getId(),
+                    '_current' => true
+                ));
             } else {
                 $this->_redirect('*/*/');
             }
             return;
-        } catch (Exception $e) {
+        } catch (Mage_Core_Exception $e) {
             $this->_getSession()->addError($e->getMessage());
-            $this->_redirect('*/*/edit', array('_current' => true));
-            return;
+        } catch (Exception $e) {
+            Mage::logException($e);
+            $this->_getSession()->addError($this->__('An error occurred during saving a widget: %s', $e->getMessage()));
         }
-        $this->_redirect('*/*/');
-        return;
+        $this->_redirect('*/*/edit', array('_current' => true));
     }
 
     /**
diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php b/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php
index 7961da0e16c..65a5d89f0be 100644
--- a/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php
+++ b/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php
@@ -81,7 +81,7 @@ public function getEnteredData($key)
             return null;
         }
         else {
-            return $this->htmlEscape($this->_enteredData[$key]);
+            return $this->escapeHtml($this->_enteredData[$key]);
         }
     }
 
diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php b/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php
index dbea4d88b1f..2f5e8e22855 100644
--- a/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php
+++ b/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php
@@ -144,4 +144,19 @@ public function hasWishlistItems()
     {
         return $this->getItemCount() > 0;
     }
+
+    /**
+     * Retrieve cache tags
+     *
+     * @return array
+     */
+    public function getCacheTags()
+    {
+        if ($this->getItemCount()) {
+            $this->addModelTags($this->_getHelper()->getWishlist());
+        }
+        return parent::getCacheTags();
+    }
+
+
 }
diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Options.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Options.php
index 8dc5d0be075..ad8d428c28e 100644
--- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Options.php
+++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Options.php
@@ -84,34 +84,53 @@ public function getOptionsRenderCfg($productType)
     }
 
     /**
-     * Render block html
+     * Retrieve product configured options
      *
-     * @return string
+     * @return array
      */
-    protected function _toHtml()
+    public function getConfiguredOptions()
     {
-        $cfg = $this->getOptionsRenderCfg($this->getItem()->getProduct()->getTypeId());
-        if (!$cfg) {
-            return '';
+        $item = $this->getItem();
+        $data = $this->getOptionsRenderCfg($item->getProduct()->getTypeId());
+        if (empty($data['helper'])
+            || !$this->helper($data['helper']) instanceof Mage_Catalog_Helper_Product_Configuration_Interface
+        ) {
+            Mage::throwException($this->__("Helper for wishlist options rendering doesn't implement required interface."));
         }
 
-        $helper = Mage::helper($cfg['helper']);
-        if (!($helper instanceof Mage_Catalog_Helper_Product_Configuration_Interface)) {
-            Mage::throwException($this->__("Helper for wishlist options rendering doesn't implement required interface."));
+        return $this->helper($data['helper'])->getOptions($item);
+    }
+
+    /**
+     * Retrieve block template
+     *
+     * @return string
+     */
+    public function getTemplate()
+    {
+        $template = parent::getTemplate();
+        if ($template) {
+            return $template;
         }
 
-        if ($cfg['template']) {
-            $template = $cfg['template'];
-        } else {
-            $cfgDefault = $this->getOptionsRenderCfg('default');
-            if (!$cfgDefault) {
-                return '';
-            }
-            $template = $cfgDefault['template'];
+        $item = $this->getItem();
+        $data = $this->getOptionsRenderCfg($item->getProduct()->getTypeId());
+        if (empty($data['template'])) {
+            $data = $this->getOptionsRenderCfg('default');
         }
 
-        $this->setTemplate($template)
-            ->setOptionList($helper->getOptions($this->getItem()));
+        return empty($data['template']) ? '' : $data['template'];
+    }
+
+    /**
+     * Render block html
+     *
+     * @return string
+     */
+    protected function _toHtml()
+    {
+        $this->setOptionList($this->getConfiguredOptions());
+
         return parent::_toHtml();
     }
 }
diff --git a/app/code/core/Mage/Wishlist/Block/Links.php b/app/code/core/Mage/Wishlist/Block/Links.php
index f1d15d753d9..2449a448449 100644
--- a/app/code/core/Mage/Wishlist/Block/Links.php
+++ b/app/code/core/Mage/Wishlist/Block/Links.php
@@ -105,4 +105,20 @@ public function addWishlistLink()
     {
         return $this;
     }
+
+    /**
+     * Retrieve block cache tags
+     *
+     * @return array
+     */
+    public function getCacheTags()
+    {
+        /** @var $wishlist Mage_Wishlist_Model_Wishlist */
+        $wishlist = $this->helper('wishlist')->getWishlist();
+        $this->addModelTags($wishlist);
+        foreach ($wishlist->getItemCollection() as $item) {
+            $this->addModelTags($item);
+        }
+        return parent::getCacheTags();
+    }
 }
diff --git a/app/code/core/Mage/Wishlist/Helper/Data.php b/app/code/core/Mage/Wishlist/Helper/Data.php
index 93a1e7f1d8b..0cd72609e6f 100644
--- a/app/code/core/Mage/Wishlist/Helper/Data.php
+++ b/app/code/core/Mage/Wishlist/Helper/Data.php
@@ -135,11 +135,9 @@ public function getWishlist()
         if (is_null($this->_wishlist)) {
             if (Mage::registry('shared_wishlist')) {
                 $this->_wishlist = Mage::registry('shared_wishlist');
-            }
-            elseif (Mage::registry('wishlist')) {
+            } elseif (Mage::registry('wishlist')) {
                 $this->_wishlist = Mage::registry('wishlist');
-            }
-            else {
+            } else {
                 $this->_wishlist = Mage::getModel('wishlist/wishlist');
                 if ($this->getCustomer()) {
                     $this->_wishlist->loadByCustomer($this->getCustomer());
@@ -260,8 +258,7 @@ protected function _getUrlStore($item)
         if ($product) {
             if ($product->isVisibleInSiteVisibility()) {
                 $storeId = $product->getStoreId();
-            }
-            else if ($product->hasUrlDataObject()) {
+            } else if ($product->hasUrlDataObject()) {
                 $storeId = $product->getUrlDataObject()->getStoreId();
             }
         }
@@ -362,6 +359,7 @@ public function getAddUrlWithParams($item, array $params = array())
 
         if ($productId) {
             $params['product'] = $productId;
+            $params[Mage_Core_Model_Url::FORM_KEY] = $this->_getSingletonModel('core/session')->getFormKey();
             return $this->_getUrlStore($item)->getUrl('wishlist/index/add', $params);
         }
 
@@ -376,23 +374,44 @@ public function getAddUrlWithParams($item, array $params = array())
      */
     public function getAddToCartUrl($item)
     {
-        $urlParamName = Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED;
-        $continueUrl  = Mage::helper('core')->urlEncode(
-            Mage::getUrl('*/*/*', array(
+        $continueUrl  = $this->_getHelperInstance('core')->urlEncode(
+            $this->_getUrl('*/*/*', array(
                 '_current'      => true,
                 '_use_rewrite'  => true,
                 '_store_to_url' => true,
             ))
         );
-
-        $urlParamName = Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED;
         $params = array(
             'item' => is_string($item) ? $item : $item->getWishlistItemId(),
-            $urlParamName => $continueUrl
+            Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED => $continueUrl,
+            Mage_Core_Model_Url::FORM_KEY => $this->_getSingletonModel('core/session')->getFormKey()
         );
         return $this->_getUrlStore($item)->getUrl('wishlist/index/cart', $params);
     }
 
+    /**
+     * Return helper instance
+     *
+     * @param string $helperName
+     * @return Mage_Core_Helper_Abstract
+     */
+    protected function _getHelperInstance($helperName)
+    {
+        return Mage::helper($helperName);
+    }
+
+    /**
+     * Return model instance
+     *
+     * @param string $className
+     * @param array $arguments
+     * @return Mage_Core_Model_Abstract
+     */
+    protected function _getSingletonModel($className, $arguments = array())
+    {
+        return Mage::getSingleton($className, $arguments);
+    }
+
     /**
      * Retrieve URL for adding item to shoping cart from shared wishlist
      *
@@ -407,10 +426,10 @@ public function getSharedAddToCartUrl($item)
             '_store_to_url' => true,
         )));
 
-        $urlParamName = Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED;
         $params = array(
             'item' => is_string($item) ? $item : $item->getWishlistItemId(),
-            $urlParamName => $continueUrl
+            Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED => $continueUrl,
+            Mage_Core_Model_Url::FORM_KEY => $this->_getSingletonModel('core/session')->getFormKey()
         );
         return $this->_getUrlStore($item)->getUrl('wishlist/shared/cart', $params);
     }
diff --git a/app/code/core/Mage/Wishlist/Model/Item.php b/app/code/core/Mage/Wishlist/Model/Item.php
index a4b14584674..1eb64736daf 100644
--- a/app/code/core/Mage/Wishlist/Model/Item.php
+++ b/app/code/core/Mage/Wishlist/Model/Item.php
@@ -28,7 +28,6 @@
 /**
  * Wishlist item model
  *
- * @method Mage_Wishlist_Model_Resource_Item _getResource()
  * @method Mage_Wishlist_Model_Resource_Item getResource()
  * @method int getWishlistId()
  * @method Mage_Wishlist_Model_Item setWishlistId(int $value)
@@ -113,6 +112,7 @@ class Mage_Wishlist_Model_Item extends Mage_Core_Model_Abstract
      */
     protected function _construct()
     {
+        $this->_cacheTag = 'wishlist_item';
         $this->_init('wishlist/item');
     }
 
@@ -361,7 +361,6 @@ public function getProduct()
     public function addToCart(Mage_Checkout_Model_Cart $cart, $delete = false)
     {
         $product = $this->getProduct();
-
         $storeId = $this->getStoreId();
 
         if ($product->getStatus() != Mage_Catalog_Model_Product_Status::STATUS_ENABLED) {
@@ -372,16 +371,6 @@ public function addToCart(Mage_Checkout_Model_Cart $cart, $delete = false)
             if ($product->getStoreId() == $storeId) {
                 return false;
             }
-            $urlData = Mage::getResourceSingleton('catalog/url')
-                ->getRewriteByProductStore(array($product->getId() => $storeId));
-            if (!isset($urlData[$product->getId()])) {
-                return false;
-            }
-            $product->setUrlDataObject(new Varien_Object($urlData));
-            $visibility = $product->getUrlDataObject()->getVisibility();
-            if (!in_array($visibility, $product->getVisibleInSiteVisibilities())) {
-                return false;
-            }
         }
 
         if (!$product->isSalable()) {
diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php
index e4493252042..cb1ecc320ca 100755
--- a/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php
+++ b/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php
@@ -90,6 +90,21 @@ class Mage_Wishlist_Model_Resource_Item_Collection extends Mage_Core_Model_Resou
      */
     protected $_isProductNameJoined = false;
 
+    /**
+     * Customer website ID
+     *
+     * @var int
+     */
+    protected $_websiteId = null;
+
+    /**
+     * Customer group ID
+     *
+     * @var int
+     */
+    protected $_customerGroupId = null;
+
+
     /**
      * Initialize resource model for collection
      *
@@ -178,7 +193,7 @@ protected function _assignProducts()
             Mage::getSingleton('catalog/product_visibility')->addVisibleInSiteFilterToCollection($productCollection);
         }
 
-        $productCollection->addPriceData()
+        $productCollection->addPriceData($this->_customerGroupId, $this->_websiteId)
             ->addTaxPercents()
             ->addIdFilter($this->_productIds)
             ->addAttributeToSelect($attributes)
@@ -488,4 +503,28 @@ public function getItemsQty(){
 
         return (int)$this->_itemsQty;
     }
+
+    /**
+     * Setter for $_websiteId
+     *
+     * @param int $websiteId
+     * @return Mage_Wishlist_Model_Resource_Item_Collection
+     */
+    public function setWebsiteId($websiteId)
+    {
+        $this->_websiteId = $websiteId;
+        return $this;
+    }
+
+    /**
+     * Setter for $_customerGroupId
+     *
+     * @param int $customerGroupId
+     * @return Mage_Wishlist_Model_Resource_Item_Collection
+     */
+    public function setCustomerGroupId($customerGroupId)
+    {
+        $this->_customerGroupId = $customerGroupId;
+        return $this;
+    }
 }
diff --git a/app/code/core/Mage/Wishlist/Model/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Wishlist.php
index c28ebf22b3e..52f3c5774a1 100644
--- a/app/code/core/Mage/Wishlist/Model/Wishlist.php
+++ b/app/code/core/Mage/Wishlist/Model/Wishlist.php
@@ -70,6 +70,13 @@ class Mage_Wishlist_Model_Wishlist extends Mage_Core_Model_Abstract
      */
     protected $_storeIds = null;
 
+    /**
+     * Entity cache tag
+     *
+     * @var string
+     */
+    protected $_cacheTag = 'wishlist';
+
     /**
      * Initialize resource model
      */
@@ -211,6 +218,9 @@ protected function _addCatalogProduct(Mage_Catalog_Model_Product $product, $qty
                 ->setProduct($product)
                 ->setQty($qty)
                 ->save();
+
+            Mage::dispatchEvent('wishlist_item_add_after', array('wishlist' => $this));
+
             if ($item->getId()) {
                 $this->getItemCollection()->addItem($item);
             }
@@ -239,6 +249,12 @@ public function getItemCollection()
                 ->addWishlistFilter($this)
                 ->addStoreFilter($this->getSharedStoreIds($currentWebsiteOnly))
                 ->setVisibilityFilter();
+
+            if (Mage::app()->getStore()->isAdmin()) {
+                $customer = Mage::getModel('customer/customer')->load($this->getCustomerId());
+                $this->_itemCollection->setWebsiteId($customer->getWebsiteId());
+                $this->_itemCollection->setCustomerGroupId($customer->getGroupId());
+            }
         }
 
         return $this->_itemCollection;
diff --git a/app/code/core/Mage/Wishlist/controllers/IndexController.php b/app/code/core/Mage/Wishlist/controllers/IndexController.php
index c750064633a..6d6209cd998 100644
--- a/app/code/core/Mage/Wishlist/controllers/IndexController.php
+++ b/app/code/core/Mage/Wishlist/controllers/IndexController.php
@@ -48,6 +48,11 @@ class Mage_Wishlist_IndexController extends Mage_Wishlist_Controller_Abstract
      */
     protected $_skipAuthentication = false;
 
+    /**
+     * Extend preDispatch
+     *
+     * @return Mage_Core_Controller_Front_Action|void
+     */
     public function preDispatch()
     {
         parent::preDispatch();
@@ -152,8 +157,23 @@ public function indexAction()
 
     /**
      * Adding new item
+     *
+     * @return Mage_Core_Controller_Varien_Action|void
      */
     public function addAction()
+    {
+        if (!$this->_validateFormKey()) {
+            return $this->_redirect('*/*');
+        }
+        $this->_addItemToWishList();
+    }
+
+    /**
+     * Add the item to wish list
+     *
+     * @return Mage_Core_Controller_Varien_Action|void
+     */
+    protected function _addItemToWishList()
     {
         $wishlist = $this->_getWishlist();
         if (!$wishlist) {
@@ -162,7 +182,7 @@ public function addAction()
 
         $session = Mage::getSingleton('customer/session');
 
-        $productId = (int) $this->getRequest()->getParam('product');
+        $productId = (int)$this->getRequest()->getParam('product');
         if (!$productId) {
             $this->_redirect('*/');
             return;
@@ -192,9 +212,9 @@ public function addAction()
             Mage::dispatchEvent(
                 'wishlist_add_product',
                 array(
-                    'wishlist'  => $wishlist,
-                    'product'   => $product,
-                    'item'      => $result
+                    'wishlist' => $wishlist,
+                    'product' => $product,
+                    'item' => $result
                 )
             );
 
@@ -212,10 +232,10 @@ public function addAction()
 
             Mage::helper('wishlist')->calculate();
 
-            $message = $this->__('%1$s has been added to your wishlist. Click <a href="%2$s">here</a> to continue shopping.', $product->getName(), Mage::helper('core')->escapeUrl($referer));
+            $message = $this->__('%1$s has been added to your wishlist. Click <a href="%2$s">here</a> to continue shopping.',
+                $product->getName(), Mage::helper('core')->escapeUrl($referer));
             $session->addSuccess($message);
-        }
-        catch (Mage_Core_Exception $e) {
+        } catch (Mage_Core_Exception $e) {
             $session->addError($this->__('An error occurred while adding item to wishlist: %s', $e->getMessage()));
         }
         catch (Exception $e) {
@@ -337,7 +357,7 @@ public function updateAction()
         }
 
         $post = $this->getRequest()->getPost();
-        if($post && isset($post['description']) && is_array($post['description'])) {
+        if ($post && isset($post['description']) && is_array($post['description'])) {
             $updatedItems = 0;
 
             foreach ($post['description'] as $itemId => $description) {
@@ -347,8 +367,11 @@ public function updateAction()
                 }
 
                 // Extract new values
-                $description = (string) $description;
-                if (!strlen($description)) {
+                $description = (string)$description;
+
+                if ($description == Mage::helper('wishlist')->defaultCommentString()) {
+                    $description = '';
+                } elseif (!strlen($description)) {
                     $description = $item->getDescription();
                 }
 
@@ -383,7 +406,7 @@ public function updateAction()
                     $updatedItems++;
                 } catch (Exception $e) {
                     Mage::getSingleton('customer/session')->addError(
-                        $this->__('Can\'t save description %s', Mage::helper('core')->htmlEscape($description))
+                        $this->__('Can\'t save description %s', Mage::helper('core')->escapeHtml($description))
                     );
                 }
             }
@@ -393,8 +416,7 @@ public function updateAction()
                 try {
                     $wishlist->save();
                     Mage::helper('wishlist')->calculate();
-                }
-                catch (Exception $e) {
+                } catch (Exception $e) {
                     Mage::getSingleton('customer/session')->addError($this->__('Can\'t update wishlist'));
                 }
             }
@@ -428,7 +450,7 @@ public function removeAction()
             Mage::getSingleton('customer/session')->addError(
                 $this->__('An error occurred while deleting the item from wishlist: %s', $e->getMessage())
             );
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             Mage::getSingleton('customer/session')->addError(
                 $this->__('An error occurred while deleting the item from wishlist.')
             );
@@ -447,6 +469,9 @@ public function removeAction()
      */
     public function cartAction()
     {
+        if (!$this->_validateFormKey()) {
+            return $this->_redirect('*/*');
+        }
         $itemId = (int) $this->getRequest()->getParam('item');
 
         /* @var $item Mage_Wishlist_Model_Item */
@@ -490,10 +515,11 @@ public function cartAction()
             );
 
             $item->mergeBuyRequest($buyRequest);
-            $item->addToCart($cart, true);
-            $cart->save()->getQuote()->collectTotals();
-            $wishlist->save();
+            if ($item->addToCart($cart, true)) {
+                $cart->save()->getQuote()->collectTotals();
+            }
 
+            $wishlist->save();
             Mage::helper('wishlist')->calculate();
 
             if (Mage::helper('checkout/cart')->getShouldRedirectToCart()) {
@@ -504,7 +530,7 @@ public function cartAction()
             Mage::helper('wishlist')->calculate();
         } catch (Mage_Core_Exception $e) {
             if ($e->getCode() == Mage_Wishlist_Model_Item::EXCEPTION_CODE_NOT_SALABLE) {
-                $session->addError(Mage::helper('wishlist')->__('This product(s) is currently out of stock'));
+                $session->addError($this->__('This product(s) is currently out of stock'));
             } else if ($e->getCode() == Mage_Wishlist_Model_Item::EXCEPTION_CODE_HAS_REQUIRED_OPTIONS) {
                 Mage::getSingleton('catalog/session')->addNotice($e->getMessage());
                 $redirectUrl = Mage::getUrl('*/*/configure/', array('id' => $item->getId()));
@@ -513,7 +539,8 @@ public function cartAction()
                 $redirectUrl = Mage::getUrl('*/*/configure/', array('id' => $item->getId()));
             }
         } catch (Exception $e) {
-            $session->addException($e, Mage::helper('wishlist')->__('Cannot add item to shopping cart'));
+            Mage::logException($e);
+            $session->addException($e, $this->__('Cannot add item to shopping cart'));
         }
 
         Mage::helper('wishlist')->calculate();
@@ -536,7 +563,7 @@ public function fromcartAction()
         $cart = Mage::getSingleton('checkout/cart');
         $session = Mage::getSingleton('checkout/session');
 
-        try{
+        try {
             $item = $cart->getQuote()->getItemById($itemId);
             if (!$item) {
                 Mage::throwException(
@@ -632,7 +659,7 @@ public function sendAction()
                     ->createBlock('wishlist/share_email_rss')
                     ->setWishlistId($wishlist->getId())
                     ->toHtml();
-                $message .=$rss_url;
+                $message .= $rss_url;
             }
             $wishlistBlock = $this->getLayout()->createBlock('wishlist/share_email_items')->toHtml();
 
@@ -641,19 +668,19 @@ public function sendAction()
             $emailModel = Mage::getModel('core/email_template');
 
             $sharingCode = $wishlist->getSharingCode();
-            foreach($emails as $email) {
+            foreach ($emails as $email) {
                 $emailModel->sendTransactional(
                     Mage::getStoreConfig('wishlist/email/email_template'),
                     Mage::getStoreConfig('wishlist/email/email_identity'),
                     $email,
                     null,
                     array(
-                        'customer'      => $customer,
-                        'salable'       => $wishlist->isSalable() ? 'yes' : '',
-                        'items'         => $wishlistBlock,
-                        'addAllLink'    => Mage::getUrl('*/shared/allcart', array('code' => $sharingCode)),
-                        'viewOnSiteLink'=> Mage::getUrl('*/shared/index', array('code' => $sharingCode)),
-                        'message'       => $message
+                        'customer'       => $customer,
+                        'salable'        => $wishlist->isSalable() ? 'yes' : '',
+                        'items'          => $wishlistBlock,
+                        'addAllLink'     => Mage::getUrl('*/shared/allcart', array('code' => $sharingCode)),
+                        'viewOnSiteLink' => Mage::getUrl('*/shared/index', array('code' => $sharingCode)),
+                        'message'        => $message
                     )
                 );
             }
@@ -663,7 +690,7 @@ public function sendAction()
 
             $translate->setTranslateInline(true);
 
-            Mage::dispatchEvent('wishlist_share', array('wishlist'=>$wishlist));
+            Mage::dispatchEvent('wishlist_share', array('wishlist' => $wishlist));
             Mage::getSingleton('customer/session')->addSuccess(
                 $this->__('Your Wishlist has been shared.')
             );
@@ -719,7 +746,7 @@ public function downloadCustomOptionAction()
                 ));
             }
 
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             $this->_forward('noRoute');
         }
         exit(0);
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit.php
new file mode 100644
index 00000000000..dc4973f7150
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Xmlconnect edit admin application settings block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Admin_Application_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
+{
+    /**
+     * Setting action buttons for admin application settings
+     */
+    public function __construct()
+    {
+        $this->_objectId    = 'id';
+        $this->_controller  = 'adminhtml_admin_application';
+        $this->_blockGroup  = 'xmlconnect';
+        parent::__construct();
+
+        $this->_removeButton('back');
+        $this->_removeButton('reset');
+        $this->_removeButton('delete');
+    }
+
+    /**
+     * Get header text
+     *
+     * @return string
+     */
+    public function getHeaderText()
+    {
+        return $this->__('Admin Application Settings');
+    }
+
+    /**
+     * Check permission for passed action
+     *
+     * @param string $action
+     * @return bool
+     */
+    protected function _isAllowedAction($action)
+    {
+        return true;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Form.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Form.php
new file mode 100644
index 00000000000..c738759f732
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Form.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Admin application form block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Admin_Application_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
+{
+    /**
+     * Prepare form before rendering HTML
+     * Setting Form Fieldsets and fields
+     *
+     * @return Mage_Adminhtml_Block_Widget_Form
+     */
+    protected function _prepareForm()
+    {
+        /** @var $form Varien_Data_Form */
+        $form = Mage::getModel('varien/data_form', array(
+            'id' => 'edit_form',
+            'action' => $this->getUrl('*/admin_application', array('_current'  => true)),
+            'method'  => 'post'
+        ));
+
+        $form->setUseContainer(true);
+        $this->setForm($form);
+        return parent::_prepareForm();
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Tab/Settings.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Tab/Settings.php
new file mode 100644
index 00000000000..6919c19c1d6
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Tab/Settings.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Tab for Settings Management
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Admin_Application_Edit_Tab_Settings
+    extends Mage_Adminhtml_Block_Widget_Form
+    implements Mage_Adminhtml_Block_Widget_Tab_Interface
+{
+    /**
+     * Prepare form before rendering HTML
+     * Setting Form Fieldsets and fields
+     *
+     * @return Mage_Adminhtml_Block_Widget_Form
+     */
+    protected function _prepareForm()
+    {
+        /** @var $form Varien_Data_Form */
+        $form = Mage::getModel('varien/data_form', array(
+            'id' => 'edit_form',
+            'action' => $this->getUrl('*/admin_application', array('_current'  => true)),
+            'method'  => 'post'
+        ));
+
+        $form->setHtmlIdPrefix('admin_app_');
+        $fieldset = $form->addFieldset('base_fieldset', array('legend' => $this->__('Admin Application Settings')));
+
+        $fieldset->addField('type', 'select', array(
+            'name'      => 'is_active',
+            'label'     => $this->__('Enable Admin Application'),
+            'title'     => $this->__('Enable Admin Application'),
+            'values'    => Mage::getModel('adminhtml/system_config_source_yesno')->toOptionArray(),
+            'required'  => true,
+            'value'     => (int)Mage::getSingleton('xmlconnect/configuration')->isActiveAdminApp()
+        ));
+
+        $this->setForm($form);
+        return parent::_prepareForm();
+    }
+
+    /**
+     * Tab label getter
+     *
+     * @return string
+     */
+    public function getTabLabel()
+    {
+        return $this->__('Settings');
+    }
+
+    /**
+     * Tab title getter
+     *
+     * @return string
+     */
+    public function getTabTitle()
+    {
+        return $this->__('Settings');
+    }
+
+    /**
+     * Check if tab can be shown
+     *
+     * @return bool
+     */
+    public function canShowTab()
+    {
+        return true;
+    }
+
+    /**
+     * Check if tab hidden
+     *
+     * @return bool
+     */
+    public function isHidden()
+    {
+        return false;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Tabs.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Tabs.php
new file mode 100644
index 00000000000..ad0396185f9
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Admin/Application/Edit/Tabs.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Admin Application Settings Tabs block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Admin_Application_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs
+{
+    /**
+     * Setting tab id, DOM destination element id, title
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->setId('admin_application_app_tabs');
+        $this->setDestElementId('edit_form');
+        $this->setTitle($this->__('Admin Mobile Application'));
+    }
+
+    /**
+     * Preparing global layout
+     *
+     * @return Mage_Core_Block_Abstract
+     */
+    protected function _prepareLayout()
+    {
+        $this->addTab('set', array(
+            'label'     => $this->__('Settings'),
+            'content'   => $this->getLayout()->createBlock('xmlconnect/adminhtml_admin_application_edit_tab_settings')
+                ->toHtml(),
+            'active'    => true
+        ));
+        return parent::_prepareLayout();
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Config.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Config.php
new file mode 100644
index 00000000000..723561fb629
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Config.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Admin application config renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Connect_Config extends Mage_Core_Block_Abstract
+{
+    /**
+     * Render login form xml
+     *
+     * @return string
+     */
+    protected function _toHtml()
+    {
+        /** @var Mage_XmlConnect_Model_Simplexml_Element $configXmlObj */
+        $configXmlObj = Mage::getModel('xmlconnect/simplexml_element', '<configuration></configuration>');
+        $this->_addLocalization($configXmlObj);
+        $configXmlObj->addCustomChild('xmlconnect_version', Mage::getConfig()->getNode(
+            Mage_XmlConnect_Model_Application::XML_PATH_MODULE_VERSION
+        ));
+
+        return $configXmlObj->asNiceXml();
+    }
+
+    /**
+     * Add localization data to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xml
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Config
+     */
+    protected function _addLocalization(Mage_XmlConnect_Model_Simplexml_Element $xml)
+    {
+        /** @var $translateHelper Mage_XmlConnect_Helper_Translate */
+        $translateHelper = Mage::helper('xmlconnect/translate');
+        $xml->addCustomChild('localization', $this->getUrl('*/*/localization'), array(
+            'hash' => sha1(serialize($translateHelper->getLocalizationArray()))
+        ));
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard.php
new file mode 100644
index 00000000000..288da2a83d5
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard.php
@@ -0,0 +1,249 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Admin application dashboard renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard extends Mage_Core_Block_Abstract
+{
+    /**
+     * Simple xml object
+     *
+     * @var Mage_XmlConnect_Model_Simplexml_Element
+     */
+    protected $_xmlObject;
+
+    /**
+     * Render dashboard xml
+     *
+     * @return string
+     */
+    protected function _toHtml()
+    {
+        return $this->setXmlObject(Mage::getModel('xmlconnect/simplexml_element', '<dashboard></dashboard>'))
+            ->_addStoreSwitcher()->_addSalesInfo()->_addGraphInfo()->_addDashboardFormData()->getXmlObject()
+            ->asNiceXml();
+    }
+
+    /**
+     * Add store switcher xml
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard
+     */
+    protected function _addStoreSwitcher()
+    {
+        $this->getChild('store_switcher')->addSwitcherToXmlObj($this->getXmlObject());
+        return $this;
+    }
+
+    /**
+     * Add sales info
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard
+     */
+    protected function _addSalesInfo()
+    {
+        $this->getChild('sales_info')->addSalesInfoToXmlObj($this->getXmlObject());
+        return $this;
+    }
+
+    /**
+     * Add graph info to xml object
+     *
+     * Add orders and amounts info to show diagram by selected range in application
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard
+     */
+    protected function _addGraphInfo()
+    {
+        $this->getChild('graph_info')->addGraphInfoToXmlObj($this->getXmlObject());
+        return $this;
+    }
+
+    /**
+     * Add dashboard form data
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard
+     */
+    protected function _addDashboardFormData()
+    {
+        /** @var Mage_XmlConnect_Model_Simplexml_Form $fromXmlObj */
+        $fromXmlObj = Mage::getModel('xmlconnect/simplexml_form', array(
+            'xml_id' => 'dashboard_form', 'action' => '', 'use_container' => true
+        ));
+
+        $recentActivityFieldset = $fromXmlObj->addFieldset('recent_activity', array(
+            'title' => $this->__('Recent Activity')
+        ));
+
+        $this->_addLastOrders($recentActivityFieldset)->_addLastSearchTerms($recentActivityFieldset)
+            ->_addNewCustomers($recentActivityFieldset);
+
+        $overallActivityFieldset = $fromXmlObj->addFieldset('overall_activity', array(
+            'title' => $this->__('Overall Activity')
+        ));
+
+        $this->_addTopSearchTerms($overallActivityFieldset)->_addMostViewedProducts($overallActivityFieldset)
+            ->_addBestSellers($overallActivityFieldset)->_addCustomers($overallActivityFieldset);
+
+        $this->getXmlObject()->appendChild($fromXmlObj->toXmlObject());
+        return $this;
+    }
+
+    /**
+     * Add last orders info to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $recentActivityFieldset
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard
+     */
+    protected function _addLastOrders(Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $recentActivityFieldset)
+    {
+        $lastOrdersField = $recentActivityFieldset->addField('last_orders', 'custom', array(
+            'label' => $this->__('Last 5 Orders')
+        ));
+        $this->getChild('last_orders')->addLastOrdersToXmlObj($lastOrdersField->getXmlObject());
+        return $this;
+    }
+
+    /**
+     * Add last search terms data
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $recentActivityFieldset
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard
+     */
+    protected function _addLastSearchTerms(
+        Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $recentActivityFieldset
+    ) {
+        $lastSearchTermsField = $recentActivityFieldset->addField('last_search', 'custom', array(
+            'label' => $this->__('Last 5 Search Terms')
+        ));
+        $this->getChild('last_search_terms')->addLastSearchTermsToXmlObj($lastSearchTermsField->getXmlObject());
+        return $this;
+    }
+
+    /**
+     * Add new customers info to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $recentActivityFieldset
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard
+     */
+    protected function _addNewCustomers(Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $recentActivityFieldset)
+    {
+        $newCustomersField = $recentActivityFieldset->addField('new_customers', 'custom', array(
+            'label' => $this->__('New Customers')
+        ));
+        $this->getChild('new_customers')->addNewCustomersToXmlObj($newCustomersField->getXmlObject());
+        return $this;
+    }
+
+    /**
+     * Add top search queries info to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $overallActivityFieldset
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard
+     */
+    protected function _addTopSearchTerms(
+        Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $overallActivityFieldset
+    ) {
+        $topSearchField = $overallActivityFieldset->addField('top_search', 'custom', array(
+            'label' => $this->__('Top Search Terms')
+        ));
+        $this->getChild('top_search_terms')->addTopSearchTermsToXmlObj($topSearchField->getXmlObject());
+        return $this;
+    }
+
+    /**
+     * Add most viewed products to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $overallActivityFieldset
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard
+     */
+    protected function _addMostViewedProducts(
+        Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $overallActivityFieldset
+    ) {
+        $mostViewedField = $overallActivityFieldset->addField('most_viewed', 'custom', array(
+            'label' => $this->__('Most Viewed Products')
+        ));
+        $this->getChild('most_viewed')->addMostViewedProductsToXmlObj($mostViewedField->getXmlObject());
+        return $this;
+    }
+
+    /**
+     * Add best sellers info to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $overallActivityFieldset
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard
+     */
+    protected function _addBestSellers(Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $overallActivityFieldset)
+    {
+        $bestSellersField = $overallActivityFieldset->addField('best_sellers', 'custom', array(
+            'label' => $this->__('Best Sellers')
+        ));
+        $this->getChild('best_sellers')->addBestSellersToXmlObj($bestSellersField->getXmlObject());
+        return $this;
+    }
+
+    /**
+     * Add customer info to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $overallActivityFieldset
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard
+     */
+    protected function _addCustomers(Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $overallActivityFieldset)
+    {
+        $customersField = $overallActivityFieldset->addField('customers', 'custom', array(
+            'label' => $this->__('Customers')
+        ));
+        $this->getChild('customers')->addCustomersToXmlObj($customersField->getXmlObject());
+        return $this;
+    }
+
+    /**
+     * Get xml object
+     *
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    public function getXmlObject()
+    {
+        return $this->_xmlObject;
+    }
+
+    /**
+     * Set xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObject
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard
+     */
+    public function setXmlObject($xmlObject)
+    {
+        $this->_xmlObject = $xmlObject;
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/BestSellers.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/BestSellers.php
new file mode 100644
index 00000000000..c9cd6756ee9
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/BestSellers.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Best sellers products xml renderer block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_BestSellers
+    extends Mage_Adminhtml_Block_Dashboard_Tab_Products_Ordered
+{
+    /**
+     * Best sellers count to display
+     */
+    const BESTSELLERS_COUNT_LIMIT = 5;
+
+    /**
+     * Get rid of unnecessary collection initialization
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_BestSellers
+     */
+    protected function _prepareCollection()
+    {
+        return $this;
+    }
+
+    /**
+     * Init last search terms collection
+     *
+     * @param int|null $storeId
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_BestSellers
+     */
+    protected function _initCollection($storeId)
+    {
+        /** @var $collection Mage_Sales_Model_Resource_Report_Bestsellers_Collection */
+        $collection = Mage::getResourceModel('sales/report_bestsellers_collection')->setModel('catalog/product')
+            ->addStoreFilter($storeId)->setPageSize(self::BESTSELLERS_COUNT_LIMIT);
+        $this->setCollection($collection);
+        return $this;
+    }
+
+    /**
+     * Clear collection
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_BestSellers
+     */
+    protected function _clearCollection()
+    {
+        $this->_collection = null;
+        return $this;
+    }
+
+    /**
+     * Add best sellers products to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObj
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_BestSellers
+     */
+    public function addBestSellersToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
+    {
+        foreach (Mage::helper('xmlconnect/adminApplication')->getSwitcherList() as $storeId) {
+            $this->_clearCollection()->_initCollection($storeId);
+            $valuesXml = $xmlObj->addCustomChild('values', null, array(
+                'store_id' => $storeId ? $storeId : Mage_XmlConnect_Helper_AdminApplication::ALL_STORE_VIEWS
+            ));
+
+            if(!count($this->getCollection()->getItems()) > 0) {
+                continue;
+            }
+
+            /** @var $orderHelper Mage_XmlConnect_Helper_Adminhtml_Dashboard_Order */
+            $orderHelper = Mage::helper('xmlconnect/adminhtml_dashboard_order');
+
+            foreach ($this->getCollection()->getItems() as $item) {
+                $itemListXml = $valuesXml->addCustomChild('item');
+                $itemListXml->addCustomChild('name', $item->getName(), array(
+                    'label' => Mage::helper('sales')->__('Product Name')
+                ));
+                $itemListXml->addCustomChild('price', $orderHelper->preparePrice($item->getProductPrice(), $storeId),
+                    array('label' => Mage::helper('sales')->__('Price')));
+                $itemListXml->addCustomChild('qty_ordered', $item->getQtyOrdered(), array(
+                    'label' => Mage::helper('sales')->__('Quantity Ordered')
+                ));
+            }
+        }
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/Customers.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/Customers.php
new file mode 100644
index 00000000000..02bf7744a09
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/Customers.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Customers xml renderer block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_Customers
+    extends Mage_Adminhtml_Block_Dashboard_Tab_Customers_Most
+{
+    /**
+     * Customers count to display
+     */
+    const CUSTOMERS_COUNT_LIMIT = 5;
+
+    /**
+     * Get rid of unnecessary collection initialization
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_Customers
+     */
+    protected function _prepareCollection()
+    {
+        return $this;
+    }
+
+    /**
+     * Init order collection
+     *
+     * @param int|null $storeId
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_Customers
+     */
+    protected function _initCollection($storeId)
+    {
+        /** @var $collection Mage_Reports_Model_Resource_Order_Collection */
+        $collection = Mage::getResourceModel('reports/order_collection');
+        $collection->groupByCustomer()->addOrdersCount()->joinCustomerName()->setPageSize(self::CUSTOMERS_COUNT_LIMIT);
+
+        $storeFilter = 0;
+        if ($storeId) {
+            $collection->addAttributeToFilter('store_id', $storeId);
+            $storeFilter = 1;
+        }
+
+        $collection->addSumAvgTotals($storeFilter)->orderByTotalAmount();
+        $this->setCollection($collection);
+        return $this;
+    }
+
+    /**
+     * Clear collection
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_Customers
+     */
+    protected function _clearCollection()
+    {
+        $this->_collection = null;
+        return $this;
+    }
+
+    /**
+     * Add customers statistic to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObj
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_Customers
+     */
+    public function addCustomersToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
+    {
+        foreach (Mage::helper('xmlconnect/adminApplication')->getSwitcherList() as $storeId) {
+            $this->_clearCollection()->_initCollection($storeId);
+            $valuesXml = $xmlObj->addCustomChild('values', null, array(
+                'store_id' => $storeId ? $storeId : Mage_XmlConnect_Helper_AdminApplication::ALL_STORE_VIEWS
+            ));
+
+            if(!count($this->getCollection()->getItems()) > 0) {
+                continue;
+            }
+
+            /** @var $orderHelper Mage_XmlConnect_Helper_Adminhtml_Dashboard_Order */
+            $orderHelper = Mage::helper('xmlconnect/adminhtml_dashboard_order');
+
+            foreach ($this->getCollection()->getItems() as $item) {
+                $itemListXml = $valuesXml->addCustomChild('item');
+                $itemListXml->addCustomChild('name', $item->getName(), array(
+                    'label' => $this->__('Customer Name')
+                ));
+                $itemListXml->addCustomChild('orders_count', $item->getOrdersCount(), array(
+                    'label' => $this->__('Number of Orders')
+                ));
+                $itemListXml->addCustomChild(
+                    'orders_avg_amount',
+                    $orderHelper->preparePrice($item->getOrdersAvgAmount(), $storeId),
+                    array('label' => $this->__('Average Order Amount'))
+                );
+                $itemListXml->addCustomChild(
+                    'orders_sum_amount',
+                    $orderHelper->preparePrice($item->getOrdersSumAmount(), $storeId),
+                    array('label' => $this->__('Total Order Amount'))
+                );
+            }
+        }
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphAmountsData.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphAmountsData.php
new file mode 100644
index 00000000000..6056cf02015
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphAmountsData.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Amounts chart data xml renderer block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphAmountsData
+    extends Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphDataAbstract
+{
+    /**
+     * Initialize object
+     */
+    public function __construct()
+    {
+        $this->setHtmlId('amounts');
+        parent::__construct();
+    }
+
+    /**
+     * Prepare chart data
+     *
+     * @return null
+     */
+    protected function _prepareData()
+    {
+        $this->setDataHelperName('xmlconnect/adminhtml_dashboard_order');
+        $this->setDataRows('revenue');
+        $this->_axisMaps = array('x' => 'range', 'y' => 'revenue');
+        parent::_prepareData();
+    }
+
+    /**
+     * Add order chart data to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObj
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphAmountsData
+     */
+    public function addAmountsChartDataToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
+    {
+        $this->_xmlObj = $xmlObj->addCustomChild('chart_data_details', null, array('id' => 'amounts'));
+        $this->_addAllStoreData();
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphDataAbstract.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphDataAbstract.php
new file mode 100644
index 00000000000..71a9e1b4b1b
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphDataAbstract.php
@@ -0,0 +1,350 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Chart data xml renderer block abstract
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+abstract class Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphDataAbstract
+    extends Mage_Adminhtml_Block_Dashboard_Graph
+{
+    /**
+     * X axis param
+     */
+    const AXIS_X = 'x';
+
+    /**
+     * Y axis param
+     */
+    const AXIS_Y = 'y';
+
+    /**
+     * Date range param for 24 hours
+     */
+    const DATE_RANGE_24H = '24h';
+
+    /**
+     * Date range param for 7 days
+     */
+    const DATE_RANGE_7D = '7d';
+
+    /**
+     * Date range param for 1 month
+     */
+    const DATE_RANGE_1M = '1m';
+
+    /**
+     * Date range param for 1 year
+     */
+    const DATE_RANGE_1Y = '1y';
+
+    /**
+     * Date range param for 2 years
+     */
+    const DATE_RANGE_2Y = '2y';
+
+    /**
+     * Chart xml object
+     *
+     * @var Mage_XmlConnect_Model_Simplexml_Element
+     */
+    protected $_xmlObj;
+
+    /**
+     * Add chart data from all stores
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphDataAbstract
+     */
+    protected function _addAllStoreData()
+    {
+        $dataValuesXml = $this->getXmlObj()->addCustomChild('chart_data_values');
+        $dataDescriptionXml = $this->getXmlObj()->addCustomChild('chart_data_description');
+
+        foreach (Mage::helper('xmlconnect/adminApplication')->getSwitcherList() as $storeFilter) {
+            $this->getDataHelper()->setParam('store', $storeFilter ? $storeFilter : null);
+            $storeId = $this->getDataHelper()->getParam('store');
+            $storeId = $storeId ? $storeId : Mage_XmlConnect_Helper_AdminApplication::ALL_STORE_VIEWS;
+
+            $valuesXml = $dataValuesXml->addCustomChild('values', null, array(
+                'store_id' => $storeId
+            ));
+
+            $descriptionXml = $dataDescriptionXml->addCustomChild('values', null, array(
+                'store_id' => $storeId
+            ));
+
+            foreach ($this->getRangeOptions() as $rangeFilter) {
+                $this->getDataHelper()->setParam('period', $rangeFilter['value']);
+                $this->getDataHelper()->initCollection();
+                $chartData = $this->getChartData();
+                $valuesXml->addCustomChild('item', $chartData['values'], array(
+                    'range_id' => $this->getDataHelper()->getParam('period')
+                ));
+                $descriptionXml->addCustomChild('item', $chartData['description'], array(
+                    'range_id' => $this->getDataHelper()->getParam('period')
+                ));
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Get chart data array as chart values => chart reference axis description
+     *
+     * @throws Mage_Core_Exception
+     * @return array
+     */
+    public function getChartData()
+    {
+        if (!$this->getCount()) {
+            return array('values' => '', 'description' => '');
+        }
+
+        $this->_allSeries = $this->getRowsData($this->_dataRows);
+
+        foreach ($this->_axisMaps as $axis => $attr) {
+            $this->setAxisLabels($axis, $this->getRowsData($attr, true));
+        }
+
+        list($dateSeries, $dataSeries) = $this->_getRangeAndData();
+
+        $this->_axisLabels[self::AXIS_X] = $this->_normalizeDateSeries($dateSeries);
+        $this->_allSeries = $dataSeries;
+
+        $valueBuffer = array();
+        $params = array();
+
+        if (sizeof($this->_axisLabels) > 0) {
+            $indexId = 0;
+            foreach ($this->_axisLabels as $idx => $labels) {
+                if ($idx == self::AXIS_X) {
+                    $valueBuffer[] = $indexId . ":|" . implode('|', $this->_getXLabels());
+                } elseif ($idx == self::AXIS_Y) {
+                    $valueBuffer[] = $indexId . ":|" . implode('|', $this->_getYLabels());
+                }
+                $indexId++;
+            }
+            $params['description'] = implode('|', $valueBuffer);
+        };
+
+        foreach ($this->getAllSeries() as $row) {
+            array_walk($row, create_function('&$val', '$val = ceil($val);'));
+            $params['values'] = implode('|', $row);
+        }
+        return $params;
+    }
+
+    /**
+     * Get array of date range and values range series
+     *
+     * @return array
+     */
+    protected function _getRangeAndData()
+    {
+        $timezoneLocal = Mage::app()->getStore()->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_TIMEZONE);
+
+        list ($dateStart, $dateEnd) = Mage::getResourceModel('reports/order_collection')
+            ->getDateRange($this->getDataHelper()->getParam('period'), '', '', true);
+
+        $dateStart->setTimezone($timezoneLocal);
+        $dateEnd->setTimezone($timezoneLocal);
+
+        $dateSeries = array();
+        $dataSeries = array();
+        while ($dateStart->compare($dateEnd) < 0) {
+            switch ($this->getDataHelper()->getParam('period')) {
+                case self::DATE_RANGE_24H:
+                    $date = $dateStart->toString('yyyy-MM-dd HH:00');
+                    $dateStart->addHour(1);
+                    break;
+                case self::DATE_RANGE_7D:
+                case self::DATE_RANGE_1M:
+                    $date = $dateStart->toString('yyyy-MM-dd');
+                    $dateStart->addDay(1);
+                    break;
+                case self::DATE_RANGE_1Y:
+                case self::DATE_RANGE_2Y:
+                    $date = $dateStart->toString('yyyy-MM');
+                    $dateStart->addMonth(1);
+                    break;
+            }
+            foreach ($this->getAllSeries() as $index => $series) {
+                if (in_array($date, $this->_axisLabels[self::AXIS_X])) {
+                    $dataSeries[$index][] = (float)array_shift($this->_allSeries[$index]);
+                } else {
+                    $dataSeries[$index][] = 0;
+                }
+            }
+            $dateSeries[] = $date;
+        }
+        return array($dateSeries, $dataSeries);
+    }
+
+    /**
+     * Skip excess values of date series
+     *
+     * Keep count of date series up to 15 items
+     *
+     * @param array $dateSeries
+     * @return array
+     */
+    protected function _normalizeDateSeries($dateSeries)
+    {
+        /**
+         * setting skip step
+         */
+        if (count($dateSeries) > 8 && count($dateSeries) < 15) {
+            $skipStep = 1;
+        } elseif (count($dateSeries) >= 15) {
+            $skipStep = 2;
+        } else {
+            $skipStep = 0;
+        }
+        /**
+         * skipping some x labels for good reading
+         */
+        $i = 0;
+        foreach ($dateSeries as $index => $date) {
+            if ($i == $skipStep) {
+                $dateSeries[$index] = $date;
+                $i = 0;
+            } else {
+                $dateSeries[$index] = '';
+                ++$i;
+            }
+        }
+        return $dateSeries;
+    }
+
+    /**
+     * Get X axis params array
+     *
+     * @return array
+     */
+    protected function _getXLabels()
+    {
+        /**
+         * Format date
+         */
+        foreach ($this->_axisLabels[self::AXIS_X] as $index => $label) {
+            if ($label != '') {
+                switch ($this->getDataHelper()->getParam('period')) {
+                    case self::DATE_RANGE_24H:
+                        $this->_axisLabels[self::AXIS_X][$index] = $this->formatTime(
+                            new Zend_Date($label, 'yyyy-MM-dd HH:00'), 'short', false
+                        );
+                        break;
+                    case self::DATE_RANGE_7D:
+                    case self::DATE_RANGE_1M:
+                        $this->_axisLabels[self::AXIS_X][$index] = $this->formatDate(
+                            new Zend_Date($label, 'yyyy-MM-dd')
+                        );
+                        break;
+                    case self::DATE_RANGE_1Y:
+                    case self::DATE_RANGE_2Y:
+                        $formats = Mage::app()->getLocale()->getTranslationList('datetime');
+                        $format = isset($formats['yyMM']) ? $formats['yyMM'] : 'MM/yyyy';
+                        $format = str_replace(array("yyyy", "yy", "MM"), array("Y", "y", "m"), $format);
+                        $this->_axisLabels[self::AXIS_X][$index] = date($format, strtotime($label));
+                        break;
+                    default:
+                        Mage::throwException($this->__('Range param doesn\'t recognized'));
+                        break;
+                }
+            } else {
+                $this->_axisLabels[self::AXIS_X][$index] = '';
+            }
+        }
+        return $this->_axisLabels[self::AXIS_X];
+    }
+
+    /**
+     * Get Y axis params array
+     *
+     * @return array
+     */
+    protected function _getYLabels()
+    {
+        $localMaxValue = $localMinValue = array();
+        // process each string in the array, and find the max length
+        foreach ($this->getAllSeries() as $index => $series) {
+            $localMaxValue[$index] = max($series);
+            $localMinValue[$index] = min($series);
+        }
+
+        if (is_numeric($this->_max)) {
+            $maxvalue = $this->_max;
+        } else {
+            $maxvalue = max($localMaxValue);
+        }
+        if (is_numeric($this->_min)) {
+            $minvalue = $this->_min;
+        } else {
+            $minvalue = min($localMinValue);
+        }
+
+        // default values
+        $yLabels = array();
+
+        if ($minvalue >= 0 && $maxvalue >= 0) {
+            $miny = 0;
+            if ($maxvalue > 10) {
+                $p = pow(10, $this->_getPow($maxvalue));
+                $maxy = ceil($maxvalue / $p) * $p;
+                $yLabels = range($miny, $maxy, $p);
+            } else {
+                $maxy = ceil($maxvalue + 1);
+                $yLabels = range($miny, $maxy, 1);
+            }
+        }
+        return $yLabels;
+    }
+
+    /**
+     * Get chart xml object
+     *
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    public function getXmlObj()
+    {
+        return $this->_xmlObj;
+    }
+
+    /**
+     * Set chart xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObj
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphDataAbstract
+     */
+    public function setXmlObj($xmlObj)
+    {
+        $this->_xmlObj = $xmlObj;
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphInfo.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphInfo.php
new file mode 100644
index 00000000000..23fd308ed86
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphInfo.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Admin application diagram info renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphInfo extends Mage_Core_Block_Abstract
+{
+    /**
+     * Time range filter options
+     *
+     * @var array
+     */
+    protected $_timeRangeOptions;
+
+    /**
+     * Add last orders info to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObj
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphInfo
+     */
+    public function addGraphInfoToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
+    {
+        /** @var $graphInfoXmlObj Mage_XmlConnect_Model_Simplexml_Element */
+        $graphInfoXmlObj = $xmlObj->addCustomChild('chart');
+        $this->_addRangeValues($graphInfoXmlObj)->_addDataSelector($graphInfoXmlObj)->_addTotalsBar($graphInfoXmlObj);
+
+        $graphInfoXmlObj = $graphInfoXmlObj->addCustomChild('chart_data');
+        $this->_addChartDataOrders($graphInfoXmlObj)->_addChartDataAmounts($graphInfoXmlObj);
+        return $this;
+    }
+
+    /**
+     * Add time range select filed to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObj
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphInfo
+     */
+    protected function _addRangeValues(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
+    {
+        $options = $this->_getRangeOptions();
+
+        /** @var $rangeXmlObj Mage_XmlConnect_Model_Simplexml_Form_Element_Select */
+        $rangeXmlObj = Mage::getModel('xmlconnect/simplexml_form_element_select', array(
+            'label' => $this->__('Select Range'),
+            'options' => $options,
+            'value' => $options[0]['value']
+        ));
+        $rangeXmlObj->setId('range_id');
+        $xmlObj->appendChild($rangeXmlObj->toXmlObject());
+        return $this;
+    }
+
+    /**
+     * Get range filter options
+     *
+     * @return array
+     */
+    protected function _getRangeOptions()
+    {
+        if (null === $this->_timeRangeOptions) {
+            $options = array();
+            foreach ($this->helper('adminhtml/dashboard_data')->getDatePeriods() as $value => $label) {
+                if (in_array($value, array('custom'))) {
+                    continue;
+                }
+                $options[] = array('label' => $label, 'value' => $value);
+            }
+            $this->_timeRangeOptions = $options;
+        }
+        return $this->_timeRangeOptions;
+    }
+
+    /**
+     * Add data select field to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObj
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphInfo
+     */
+    protected function _addDataSelector(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
+    {
+        /** @var $rangeXmlObj Mage_XmlConnect_Model_Simplexml_Form_Element_Select */
+        $rangeXmlObj = Mage::getModel('xmlconnect/simplexml_form_element_select', array(
+            'label' => $this->__('Select Chart'),
+            'value' => 'orders',
+            'options' => array(
+                array('label' => $this->__('Orders'), 'value' => 'orders'),
+                array('label' => $this->__('Amounts'), 'value' => 'amounts')
+        )));
+        $rangeXmlObj->setId('data_details_id');
+        $xmlObj->appendChild($rangeXmlObj->toXmlObject());
+        return $this;
+    }
+
+    /**
+     * Add orders chart data to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $graphInfoXmlObj
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphInfo
+     */
+    protected function _addChartDataOrders(Mage_XmlConnect_Model_Simplexml_Element $graphInfoXmlObj)
+    {
+        $this->getChild('graph_order_data')->setRangeOptions($this->_getRangeOptions())
+            ->addOrderChartDataToXmlObj($graphInfoXmlObj);
+        return $this;
+    }
+
+    /**
+     * Add amounts chart data to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $graphInfoXmlObj
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphInfo
+     */
+    protected function _addChartDataAmounts(Mage_XmlConnect_Model_Simplexml_Element $graphInfoXmlObj)
+    {
+        $this->getChild('graph_amounts_data')->setRangeOptions($this->_getRangeOptions())
+            ->addAmountsChartDataToXmlObj($graphInfoXmlObj);
+        return $this;
+    }
+
+    /**
+     * Add totals chart data to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $graphInfoXmlObj
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphInfo
+     */
+    protected function _addTotalsBar(Mage_XmlConnect_Model_Simplexml_Element $graphInfoXmlObj)
+    {
+        $this->getChild('graph_totals_data')->setRangeOptions($this->_getRangeOptions())
+            ->addTotalsDataToXmlObj($graphInfoXmlObj);
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphOrderData.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphOrderData.php
new file mode 100644
index 00000000000..82ac2ab6191
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphOrderData.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Orders chart data xml renderer block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphOrderData
+    extends Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphDataAbstract
+{
+    /**
+     * Initialize object
+     */
+    public function __construct()
+    {
+        $this->setHtmlId('orders');
+        parent::__construct();
+    }
+
+    /**
+     * Prepare chart data
+     *
+     * @return null
+     */
+    protected function _prepareData()
+    {
+        $this->setDataHelperName('xmlconnect/adminhtml_dashboard_order');
+        $this->setDataRows('quantity');
+        $this->_axisMaps = array('x' => 'range', 'y' => 'quantity');
+        parent::_prepareData();
+    }
+
+    /**
+     * Add order chart data to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObj
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphOrderData
+     */
+    public function addOrderChartDataToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
+    {
+        $this->_xmlObj = $xmlObj->addCustomChild('chart_data_details', null, array('id' => 'orders'));
+        $this->_addAllStoreData();
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphTotalsData.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphTotalsData.php
new file mode 100644
index 00000000000..12f9d6c4eef
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/GraphTotalsData.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Totals chart data xml renderer block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphTotalsData extends Mage_Adminhtml_Block_Dashboard_Totals
+{
+    /**
+     * Get rid of unnecessary collection initialization by parent
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphTotalsData
+     */
+    protected function _prepareLayout()
+    {
+        return $this;
+    }
+
+    /**
+     * Init totals collection and assign totals values
+     *
+     * @param null|int $storeId
+     * @param string $rangeId
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphTotalsData
+     */
+    protected function _initCollection($storeId, $rangeId)
+    {
+        if (!Mage::helper('core')->isModuleEnabled('Mage_Reports')) {
+            return $this;
+        }
+
+        /* @var $collection Mage_Reports_Model_Mysql4_Order_Collection */
+        $collection = Mage::getResourceModel('reports/order_collection')->addCreateAtPeriodFilter($rangeId)
+            ->calculateTotals((bool)$storeId);
+
+        if ($storeId) {
+            $collection->addFieldToFilter('store_id', $storeId);
+        } elseif (!$collection->isLive()) {
+            $collection->addFieldToFilter('store_id', array(
+                'eq' => Mage::app()->getStore(Mage_Core_Model_Store::ADMIN_CODE)->getId()
+            ));
+        }
+
+        $collection->load();
+        $totals = $collection->getFirstItem();
+
+        $this->addTotal($this->__('Revenue'), $totals->getRevenue());
+        $this->addTotal($this->__('Tax'), $totals->getTax());
+        $this->addTotal($this->__('Shipping'), $totals->getShipping());
+        $this->addTotal($this->__('Quantity'), $totals->getQuantity() * 1, true);
+        return $this;
+    }
+
+    /**
+     * Add cart totals data to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObj
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphTotalsData
+     */
+    public function addTotalsDataToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
+    {
+        $dataValuesXml = $xmlObj->addCustomChild('chart_totals');
+
+        foreach (Mage::helper('xmlconnect/adminApplication')->getSwitcherList() as $storeFilter) {
+            $storeId = $storeFilter ? $storeFilter : null;
+
+            $totalsXml = $dataValuesXml->addCustomChild('totals', null, array(
+                'store_id' => $storeId ? $storeId : Mage_XmlConnect_Helper_AdminApplication::ALL_STORE_VIEWS
+            ));
+
+            foreach ($this->getRangeOptions() as $rangeFilter) {
+                $this->_initCollection($storeId, $rangeFilter['value']);
+                $valuesXml = $totalsXml->addCustomChild('values', null, array(
+                    'range_id' => $rangeFilter['value']
+                ));
+                foreach ($this->getTotals() as $total) {
+                    $totalValue = $valuesXml->escapeXml($total['value'] . $total['decimals']);
+                    $valuesXml->addCustomChild('item', $totalValue, array('label' => $total['label']));
+                }
+                $this->_clearTotals();
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Clear totals values array
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_GraphTotalsData
+     */
+    protected function _clearTotals()
+    {
+        $this->_totals = array();
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/LastOrders.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/LastOrders.php
new file mode 100644
index 00000000000..6a6efeb9fba
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/LastOrders.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Admin application last orders renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_LastOrders extends Mage_Adminhtml_Block_Dashboard_Orders_Grid
+{
+    /**
+     * Last orders count limit
+     */
+    const LAST_ORDER_COUNT_LIMIT = 5;
+
+    /**
+     * Add last orders info to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObj
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_LastOrders
+     */
+    public function addLastOrdersToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
+    {
+        if (!Mage::helper('core')->isModuleEnabled('Mage_Reports')) {
+            return $this;
+        }
+
+        /** @var $collection Mage_Reports_Model_Resource_Order_Collection */
+        $collection = Mage::getResourceModel('reports/order_collection')->addItemCountExpr()
+            ->joinCustomerName('customer')->orderByCreatedAt()->setPageSize(self::LAST_ORDER_COUNT_LIMIT);
+
+        foreach (Mage::helper('xmlconnect/adminApplication')->getSwitcherList() as $storeId) {
+            if ($storeId) {
+                $collection->addAttributeToFilter('store_id', $storeId);
+                $collection->addRevenueToSelect();
+            } else {
+                $collection->addRevenueToSelect(true);
+            }
+
+            $this->setCollection($collection);
+            $orderList = $this->_prepareColumns()->getCollection()->load();
+            $valuesXmlObj = $xmlObj->addCustomChild('values', null, array(
+                'store_id' => $storeId ? $storeId : Mage_XmlConnect_Helper_AdminApplication::ALL_STORE_VIEWS
+            ));
+
+            foreach ($orderList as $order) {
+                $itemXmlObj = $valuesXmlObj->addCustomChild('item');
+                $itemXmlObj->addCustomChild('customer', $order->getCustomer(), array('label' => $this->__('Customer')));
+                $itemXmlObj->addCustomChild('items_count', $order->getItemsCount(), array(
+                    'label' => $this->__('Items')
+                ));
+                $currency_code = Mage::app()->getStore($storeId)->getBaseCurrencyCode();
+                $itemXmlObj->addCustomChild('currency', Mage::app()->getLocale()->currency($currency_code)
+                    ->toCurrency($order->getRevenue()), array('label' => $this->__('Grand Total')));
+            }
+            $collection->clear();
+        }
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/LastSearchTerms.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/LastSearchTerms.php
new file mode 100644
index 00000000000..801559eeaa0
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/LastSearchTerms.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Admin application last search terms xml renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_LastSearchTerms
+    extends Mage_Adminhtml_Block_Dashboard_Searches_Last
+{
+    /**
+     * Search terms count to display
+     */
+    const TERMS_COUNT_LIMIT = 5;
+
+    /**
+     * Get rid of unnecessary collection initialization
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_LastSearchTerms
+     */
+    protected function _prepareCollection()
+    {
+        return $this;
+    }
+
+    /**
+     * Init last search terms collection
+     *
+     * @param int|null $storeId
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_LastSearchTerms
+     */
+    protected function _initCollection($storeId)
+    {
+        if (!Mage::helper('core')->isModuleEnabled('Mage_CatalogSearch')) {
+            return $this;
+        }
+        /** @var $_collection Mage_CatalogSearch_Model_Resource_Query_Collection */
+        $this->_collection = Mage::getModel('catalogsearch/query')->getResourceCollection();
+        $this->_collection->setRecentQueryFilter()->setPageSize(self::TERMS_COUNT_LIMIT);
+
+        if ($storeId) {
+            $this->_collection->addFieldToFilter('store_id', $storeId);
+        }
+        $this->setCollection($this->_collection);
+        return $this;
+    }
+
+    /**
+     * Clear collection
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_LastSearchTerms
+     */
+    protected function _clearCollection()
+    {
+        $this->_collection = null;
+        return $this;
+    }
+
+    /**
+     * Add last search terms info to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObj
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_LastSearchTerms
+     */
+    public function addLastSearchTermsToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
+    {
+        foreach (Mage::helper('xmlconnect/adminApplication')->getSwitcherList() as $storeId) {
+            $this->_clearCollection()->_initCollection($storeId);
+            $valuesXml = $xmlObj->addCustomChild('values', null, array(
+                'store_id' => $storeId ? $storeId : Mage_XmlConnect_Helper_AdminApplication::ALL_STORE_VIEWS
+            ));
+
+            if(!count($this->getCollection()->getItems()) > 0) {
+                continue;
+            }
+
+            foreach ($this->getCollection()->getItems() as $item) {
+                $itemListXml = $valuesXml->addCustomChild('item');
+                $itemListXml->addCustomChild('query_text', $item->getQueryText(), array(
+                    'label' => $this->__('Search Term')
+                ));
+                $itemListXml->addCustomChild('num_results', $item->getNumResults(), array(
+                    'label' => $this->__('Results')
+                ));
+                $itemListXml->addCustomChild('popularity', $item->getPopularity(), array(
+                    'label' => $this->__('Number of Uses')
+                ));
+            }
+        }
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/MostViewedProducts.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/MostViewedProducts.php
new file mode 100644
index 00000000000..14e859861a0
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/MostViewedProducts.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Most viewed products xml renderer block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_MostViewedProducts
+    extends Mage_Adminhtml_Block_Dashboard_Tab_Products_Viewed
+{
+    /**
+     * Products count to display
+     */
+    const PRODUCTS_COUNT_LIMIT = 5;
+
+    /**
+     * Get rid of unnecessary collection initialization
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_MostViewedProducts
+     */
+    protected function _prepareCollection()
+    {
+        return $this;
+    }
+
+    /**
+     * Init last search terms collection
+     *
+     * @param int|null $storeId
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_MostViewedProducts
+     */
+    protected function _initCollection($storeId)
+    {
+        $collection = Mage::getResourceModel('reports/product_collection')->addAttributeToSelect('*')->addViewsCount()
+            ->setStoreId($storeId)->addStoreFilter($storeId)->setPageSize(self::PRODUCTS_COUNT_LIMIT);
+        $this->setCollection($collection);
+        return $this;
+    }
+
+    /**
+     * Clear collection
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_MostViewedProducts
+     */
+    protected function _clearCollection()
+    {
+        $this->_collection = null;
+        return $this;
+    }
+
+    /**
+     * Add most viewed products to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObj
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_MostViewedProducts
+     */
+    public function addMostViewedProductsToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
+    {
+        foreach (Mage::helper('xmlconnect/adminApplication')->getSwitcherList() as $storeId) {
+            $this->_clearCollection()->_initCollection($storeId);
+            $valuesXml = $xmlObj->addCustomChild('values', null, array(
+                'store_id' => $storeId ? $storeId : Mage_XmlConnect_Helper_AdminApplication::ALL_STORE_VIEWS
+            ));
+
+            if(!count($this->getCollection()->getItems()) > 0) {
+                continue;
+            }
+
+            /** @var $orderHelper Mage_XmlConnect_Helper_Adminhtml_Dashboard_Order */
+            $orderHelper = Mage::helper('xmlconnect/adminhtml_dashboard_order');
+
+            foreach ($this->getCollection()->getItems() as $item) {
+                $itemListXml = $valuesXml->addCustomChild('item');
+                $itemListXml->addCustomChild('name', $item->getName(), array(
+                    'label' => Mage::helper('reports')->__('Product Name')
+                ));
+                $itemListXml->addCustomChild(
+                    'price',
+                    $orderHelper->preparePrice($item->getPrice(), $storeId),
+                    array('label' => Mage::helper('reports')->__('Price'))
+                );
+                $itemListXml->addCustomChild(
+                    'views',
+                    $item->getViews(),
+                    array('label' => Mage::helper('reports')->__('Number of Views'))
+                );
+            }
+        }
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/NewCustomers.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/NewCustomers.php
new file mode 100644
index 00000000000..27db9a0057c
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/NewCustomers.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * New customers xml block renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_NewCustomers
+    extends Mage_Adminhtml_Block_Dashboard_Tab_Customers_Newest
+{
+    /**
+     * Customers count to display
+     */
+    const CUSTOMERS_COUNT_LIMIT = 5;
+
+    /**
+     * Get rid of unnecessary collection initialization
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_NewCustomers
+     */
+    protected function _prepareCollection()
+    {
+        return $this;
+    }
+
+    /**
+     * Init new customers collection
+     *
+     * @param int|null $storeId
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_NewCustomers
+     */
+    protected function _initCollection($storeId)
+    {
+        /** @var $collection Mage_Reports_Model_Resource_Customer_Collection */
+        $collection = Mage::getResourceModel('reports/customer_collection')->addCustomerName()
+            ->setPageSize(self::CUSTOMERS_COUNT_LIMIT);
+
+        $storeFilter = 0;
+        if ($storeId) {
+            $collection->addAttributeToFilter('store_id', $storeId);
+            $storeFilter = 1;
+        }
+
+        $collection->addOrdersStatistics($storeFilter)->orderByCustomerRegistration();
+        $this->setCollection($collection);
+        return $this;
+    }
+
+    /**
+     * Clear collection
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_NewCustomers
+     */
+    protected function _clearCollection()
+    {
+        $this->_collection = null;
+        return $this;
+    }
+
+    /**
+     * Add new customers statistic to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObj
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_NewCustomers
+     */
+    public function addNewCustomersToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
+    {
+        foreach (Mage::helper('xmlconnect/adminApplication')->getSwitcherList() as $storeId) {
+            $this->_clearCollection()->_initCollection($storeId);
+            $valuesXml = $xmlObj->addCustomChild('values', null, array(
+                'store_id' => $storeId ? $storeId : Mage_XmlConnect_Helper_AdminApplication::ALL_STORE_VIEWS
+            ));
+
+            if(!count($this->getCollection()->getItems()) > 0) {
+                continue;
+            }
+
+            /** @var $orderHelper Mage_XmlConnect_Helper_Adminhtml_Dashboard_Order */
+            $orderHelper = Mage::helper('xmlconnect/adminhtml_dashboard_order');
+
+            foreach ($this->getCollection()->getItems() as $item) {
+                $itemListXml = $valuesXml->addCustomChild('item');
+                $itemListXml->addCustomChild('name', $item->getName(), array(
+                    'label' => $this->__('Customer Name')
+                ));
+                $itemListXml->addCustomChild('orders_count', $item->getOrdersCount(), array(
+                    'label' => $this->__('Number of Orders')
+                ));
+                $itemListXml->addCustomChild(
+                    'orders_avg_amount',
+                    $orderHelper->preparePrice($item->getOrdersAvgAmount(), $storeId),
+                    array('label' => $this->__('Average Order Amount'))
+                );
+                $itemListXml->addCustomChild(
+                    'orders_sum_amount',
+                    $orderHelper->preparePrice($item->getOrdersSumAmount(), $storeId),
+                    array('label' => $this->__('Total Order Amount'))
+                );
+            }
+        }
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/SalesInfo.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/SalesInfo.php
new file mode 100644
index 00000000000..d093da67038
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/SalesInfo.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Admin application sales info renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_SalesInfo extends Mage_Adminhtml_Block_Dashboard_Sales
+{
+    /**
+     * Add sales info to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObj
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_SalesInfo
+     */
+    public function addSalesInfoToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
+    {
+        if (count($this->getTotals()) > 0) {
+            /** @var $salesInfoField Mage_XmlConnect_Model_Simplexml_Form_Element_Custom */
+            $salesInfoField = Mage::getModel('xmlconnect/simplexml_form_element_custom', array(
+                'label' => ''
+            ));
+            $salesInfoField->setId('sales_info');
+            $salesInfoXmlObj = $salesInfoField->toXmlObject();
+            $storeId = null;
+            foreach ($this->getTotals() as $total) {
+                if (null === $storeId || $storeId !== $total['store_id']) {
+                    $storeId = $total['store_id'];
+                    $valuesXmlObj = $salesInfoXmlObj->addCustomChild('values', null, array('store_id' => $storeId));
+                }
+                $valuesXmlObj->addCustomChild('item', strip_tags($total['value']), array(
+                    'label' => $total['label']
+                ));
+            }
+            $xmlObj->appendChild($salesInfoXmlObj);
+        }
+        return $this;
+    }
+
+    /**
+     * Prepare sales data collection
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_SalesInfo
+     */
+    protected function _prepareLayout()
+    {
+        if (!Mage::helper('core')->isModuleEnabled('Mage_Reports')) {
+            return $this;
+        }
+
+        foreach (Mage::helper('xmlconnect/adminApplication')->getSwitcherList() as $filter) {
+            $this->setCurrentStore($filter);
+            if ($filter) {
+                Mage::app()->getStore($filter);
+            }
+            $collection = Mage::getResourceModel('reports/order_collection')
+                ->calculateSales($filter);
+
+            if ($filter) {
+                $collection->addFieldToFilter('store_id', $filter);
+            }
+
+            $collection->load();
+            $sales = $collection->getFirstItem();
+
+            $this->addTotal($this->__('Lifetime Sales'), $sales->getLifetime());
+            $this->addTotal($this->__('Average Orders'), $sales->getAverage());
+        }
+    }
+
+    /**
+     * Add totals data with current store id to totals array
+     *
+     * @param string $label
+     * @param string $value
+     * @param bool $isQuantity
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_SalesInfo
+     */
+    public function addTotal($label, $value, $isQuantity = false)
+    {
+        if (!$isQuantity) {
+            $value = $this->format($value);
+        }
+        $this->_totals[] = array(
+            'label' => $label,
+            'value' => $value,
+            'store_id' => $this->getCurrentStore() ? $this->getCurrentStore()
+                : Mage_XmlConnect_Helper_AdminApplication::ALL_STORE_VIEWS
+        );
+
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/StoreSwitcher.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/StoreSwitcher.php
new file mode 100644
index 00000000000..d1022d3f4f0
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/StoreSwitcher.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Admin application store switcher renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_StoreSwitcher extends Mage_Adminhtml_Block_Store_Switcher
+{
+    /**
+     * Add sales info to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObj
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_StoreSwitcher
+     */
+    public function addSwitcherToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
+    {
+        $websites = $this->getWebsites();
+        if ($websites) {
+            $this->setUseConfirm(false);
+
+            /** @var $storeSwitcherField Mage_XmlConnect_Model_Simplexml_Form_Element_Custom */
+            $storeSwitcherField = Mage::getModel('xmlconnect/simplexml_form_element_custom', array(
+                'label' => $this->__('Choose Store View')
+            ));
+            $storeSwitcherField->setId('store_id');
+            $storeSwitcherXmlObj = $storeSwitcherField->toXmlObject();
+            $this->_createStoreItemList($websites, $storeSwitcherXmlObj);
+
+            if (!$storeSwitcherXmlObj->getAttribute('value')) {
+                $storeSwitcherXmlObj->addAttribute('value', Mage_XmlConnect_Helper_AdminApplication::ALL_STORE_VIEWS);
+            }
+            $xmlObj->appendChild($storeSwitcherXmlObj);
+        }
+        return $this;
+    }
+
+    /**
+     * Create store item list for xml object
+     *
+     * @param array $websites
+     * @param Mage_XmlConnect_Model_Simplexml_Element $storeSwitcherXmlObj
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_StoreSwitcher
+     */
+    protected function _createStoreItemList($websites, Mage_XmlConnect_Model_Simplexml_Element $storeSwitcherXmlObj)
+    {
+        $switcherItemsXmlObj = $storeSwitcherXmlObj->addCustomChild('values');
+
+        if ($this->hasDefaultOption()) {
+            $this->_addSwitcherItem($switcherItemsXmlObj, Mage_XmlConnect_Helper_AdminApplication::ALL_STORE_VIEWS,
+                array('label' => $this->getDefaultStoreName(), 'level' => 1));
+        }
+
+        foreach ($websites as $website) {
+            foreach ($website->getGroups() as $group) {
+                $this->_setStoreItemsByNestingLevel($storeSwitcherXmlObj, $switcherItemsXmlObj, $website, $group);
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Set store items to xml object by nesting level
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $storeSwitcherXmlObj
+     * @param Mage_XmlConnect_Model_Simplexml_Element $switcherItemsXmlObj
+     * @param array $website
+     * @param array $group
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_StoreSwitcher
+     */
+    protected function _setStoreItemsByNestingLevel($storeSwitcherXmlObj, $switcherItemsXmlObj, $website, $group)
+    {
+        $showWebsite = $showGroup = false;
+        foreach ($this->getStores($group) as $store) {
+            if ($showWebsite == false) {
+                $showWebsite = true;
+                $this->_addSwitcherItem($switcherItemsXmlObj, null, array(
+                    'label' => $website->getName(), 'level' => 1
+                ), true);
+            }
+
+            if ($showGroup == false) {
+                $showGroup = true;
+                $this->_addSwitcherItem($switcherItemsXmlObj, null, array(
+                    'label' => $group->getName(), 'level' => 2
+                ), true);
+            }
+
+            if ($this->getStoreId() == $store->getId()) {
+                $storeSwitcherXmlObj->addAttribute('value', $this->getStoreId());
+            }
+
+            $this->_addSwitcherItem($switcherItemsXmlObj, $store->getId(), array(
+                'label' => $store->getName(), 'level' => 3
+            ));
+        }
+        return $this;
+    }
+
+    /**
+     * Add switcher item to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObj
+     * @param string $value
+     * @param array $config
+     * @param bool $isDisabled
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_StoreSwitcher
+     */
+    protected function _addSwitcherItem($xmlObj, $value, $config, $isDisabled = false)
+    {
+        if ($isDisabled) {
+            $config += array('disabled' => 1);
+        }
+        $xmlObj->addCustomChild('item', $value, $config);
+        return $this;
+    }
+
+    /**
+     * Get store switcher params as array
+     *
+     * @return array
+     */
+    protected function _getStoreSwitcherParams()
+    {
+        $result = array();
+        $websites =  $this->getWebsites();
+        foreach ($websites as $website) {
+            $showWebsite = false;
+            foreach ($website->getGroups() as $group) {
+                $showGroup = false;
+                foreach ($this->getStores($group) as $store) {
+                    if ($showWebsite == false) {
+                        $showWebsite = true;
+                        $result[$website->getId()]['name'] = $website->getName();
+                        $result[$website->getId()]['store_list'] = array();
+                    }
+
+                    if ($showGroup == false) {
+                        $showGroup = true;
+                        $result[$website->getId()]['store_list'][$group->getId()]['name'] =  $group->getName();
+                        $result[$website->getId()]['store_list'][$group->getId()]['view_list'] = array();
+                    }
+                    $result[$website->getId()]['store_list'][$group->getId()]['view_list'][$store->getId()] = $store
+                        ->getName();
+                }
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Prepare sales data collection
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_SalesInfo
+     */
+    protected function _prepareLayout()
+    {
+        $this->registerStoreSwitcher();
+        return parent::_prepareLayout();
+    }
+
+    /**
+     * Set store switcher to registry
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_StoreSwitcher
+     */
+    public function registerStoreSwitcher()
+    {
+        Mage::register('store_switcher', $this->_getStoreSwitcherParams());
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/TopSearchTerms.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/TopSearchTerms.php
new file mode 100644
index 00000000000..958c5d1daa3
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Dashboard/TopSearchTerms.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Top search terms xml renderer block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_TopSearchTerms
+    extends Mage_Adminhtml_Block_Dashboard_Searches_Top
+{
+    /**
+     * Search terms count to display
+     */
+    const TERMS_COUNT_LIMIT = 5;
+
+    /**
+     * Get rid of unnecessary collection initialization
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_TopSearchTerms
+     */
+    protected function _prepareCollection()
+    {
+        return $this;
+    }
+
+    /**
+     * Init last search terms collection
+     *
+     * @param int|null $storeId
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_TopSearchTerms
+     */
+    protected function _initCollection($storeId)
+    {
+        if (!Mage::helper('core')->isModuleEnabled('Mage_CatalogSearch')) {
+            return $this;
+        }
+        /** @var $_collection Mage_CatalogSearch_Model_Resource_Query_Collection */
+        $this->_collection = Mage::getModel('catalogsearch/query')->getResourceCollection();
+        $this->_collection->setPopularQueryFilter($storeId ? $storeId : '')->setPageSize(self::TERMS_COUNT_LIMIT);
+        $this->setCollection($this->_collection);
+        return $this;
+    }
+
+    /**
+     * Clear collection
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_TopSearchTerms
+     */
+    protected function _clearCollection()
+    {
+        $this->_collection = null;
+        return $this;
+    }
+
+    /**
+     * Add last search terms info to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObj
+     * @return Mage_XmlConnect_Block_Adminhtml_Connect_Dashboard_TopSearchTerms
+     */
+    public function addTopSearchTermsToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
+    {
+        foreach (Mage::helper('xmlconnect/adminApplication')->getSwitcherList() as $storeId) {
+            $this->_clearCollection()->_initCollection($storeId);
+            $valuesXml = $xmlObj->addCustomChild('values', null, array(
+                'store_id' => $storeId ? $storeId : Mage_XmlConnect_Helper_AdminApplication::ALL_STORE_VIEWS
+            ));
+
+            if(!count($this->getCollection()->getItems()) > 0) {
+                continue;
+            }
+
+            foreach ($this->getCollection()->getItems() as $item) {
+                $itemListXml = $valuesXml->addCustomChild('item');
+                $itemListXml->addCustomChild('name', $item->getName(), array(
+                    'label' => $this->__('Search Term')
+                ));
+                $itemListXml->addCustomChild('num_results', $item->getNumResults(), array(
+                    'label' => $this->__('Results')
+                ));
+                $itemListXml->addCustomChild('popularity', $item->getPopularity(), array(
+                    'label' => $this->__('Number of Uses')
+                ));
+            }
+        }
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Loginform.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Loginform.php
new file mode 100644
index 00000000000..c4782d9a747
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Connect/Loginform.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Admin application login form renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Connect_Loginform extends Mage_Core_Block_Abstract
+{
+    /**
+     * Render login form xml
+     *
+     * @return string
+     */
+    protected function _toHtml()
+    {
+        $action = $this->getUrl('*/*/login');
+
+        /** @var Mage_XmlConnect_Model_Simplexml_Form $fromXmlObj */
+        $fromXmlObj = Mage::getModel('xmlconnect/simplexml_form', array(
+            'xml_id' => 'login_form',
+            'action' => $action,
+            'use_container' => true
+        ))->setFieldNameSuffix('login_info');
+
+        $formFieldset = $fromXmlObj->addFieldset('account_info', array(
+            'title' => $this->__('Log in to Admin Panel')
+        ));
+
+        $formFieldset->addField('username', 'text', array(
+            'label' => $this->__('User Name:'),
+            'name'  => 'username',
+            'required' => 1
+        ));
+
+        $formFieldset->addField('password', 'password', array(
+            'label' => $this->__('Password:'),
+            'name'  => 'password',
+            'required' => 1
+        ));
+
+        return $fromXmlObj->getXml();
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile.php
index 81359d4a453..a5c1875ef62 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile.php
@@ -40,12 +40,8 @@ public function __construct()
     {
         $this->_controller = 'adminhtml_mobile';
         $this->_blockGroup = 'xmlconnect';
-        $xmlconnectVersion = Mage::getConfig()->getNode(
-            Mage_XmlConnect_Model_Application::XML_PATH_MODULE_VERSION
-        );
-        $this->_headerText = $this->__('Manage Apps')
-            . ' '
-            . $this->__('ver. %s', $xmlconnectVersion);
+        $xmlconnectVersion = Mage::getConfig()->getNode(Mage_XmlConnect_Model_Application::XML_PATH_MODULE_VERSION);
+        $this->_headerText = $this->__('Manage Apps') . ' ' . $this->__('ver. %s', $xmlconnectVersion);
         $this->_addButtonLabel = $this->__('Add App');
 
         parent::__construct();
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit.php
index 0062010544b..c3923a196d9 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit
-    extends Mage_Adminhtml_Block_Widget_Form_Container
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
 {
     /**
      * Setting app action buttons for application
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Submission.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Submission.php
index 2318d01c851..b8666099ecb 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Submission.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Submission.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Submission
-    extends Mage_Adminhtml_Block_Widget_Tabs
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Submission extends Mage_Adminhtml_Block_Widget_Tabs
 {
     /**
      * Constructor
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Content.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Content.php
index 94a972135aa..c43391f538a 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Content.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Content.php
@@ -35,6 +35,11 @@ class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Content
     extends Mage_XmlConnect_Block_Adminhtml_Mobile_Widget_Form
     implements Mage_Adminhtml_Block_Widget_Tab_Interface
 {
+    /**
+     * List of static CMS pages
+     *
+     * @var array
+     */
     protected $_pages;
 
     /**
@@ -45,63 +50,58 @@ public function __construct()
     {
         parent::__construct();
         $this->setShowGlobalIcon(true);
+        $this->setTemplate('/xmlconnect/edit/tab/content.phtml');
+        $this->_pages = Mage::getResourceModel('xmlconnect/cms_page_collection')->toOptionIdArray();
     }
 
     /**
      * Add page input to fieldset
      *
+     * @deprecated will delete in the next version
      * @param Varien_Data_Form_Element_Fieldset $fieldset
      * @param string $fieldPrefix
+     * @return null
      */
     protected function _addPage($fieldset, $fieldPrefix)
     {
-        $element = $fieldset->addField($fieldPrefix, 'page', array(
-            'name'      => $fieldPrefix,
-        ));
-        $element->initFields(array(
-            'name'      => $fieldPrefix,
-            'values'    => $this->_pages,
-        ));
+        $element = $fieldset->addField($fieldPrefix, 'page', array('name' => $fieldPrefix));
+        $element->initFields(array('name' => $fieldPrefix, 'values' => $this->_pages));
     }
 
     /**
      * Prepare form before rendering HTML
-     * Setting Form Fieldsets and fields
      *
      * @return Mage_Adminhtml_Block_Widget_Form
      */
     protected function _prepareForm()
     {
-        $model = Mage::helper('xmlconnect')->getApplication();
-        $conf = $model->getConf();
-        $form = new Varien_Data_Form();
-        $this->setForm($form);
-
-        $pages = Mage::getResourceModel('xmlconnect/cms_page_collection')->toOptionIdArray();
-        $dummy = array(array( 'value' => '', 'label' => '' ));
-        $this->_pages = array_merge($dummy, $pages);
+        $this->_prepareButtons();
+        return parent::_prepareForm();
+    }
 
-        $fieldset = $form->addFieldset('cms_pages', array('legend' => $this->__('Pages')));
-        $this->_addElementTypes($fieldset);
+    /**
+     * Prepare add and delete buttons for content tab
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Content
+     */
+    protected function _prepareButtons()
+    {
+        $addButton = $this->getLayout()->createBlock('adminhtml/widget_button')->setData(array(
+            'label'     => $this->__('Add Page'),
+            'onclick'   => 'cmsPageActionHelper.insertPage(); return false;',
+            'class'     => 'add'
+        ))->setName('add_page_item_button');
 
-        $fieldset->addField('page_row_add', 'addrow', array(
-            'onclick' => 'insertNewTableRow(this)',
-            'options' => $this->_pages,
-            'class' => ' scalable save ',
-            'label' => $this->__('Label'),
-            'before_element_html' => $this->__('Get Content from CMS Page').'</td><td class="label">',
-        ));
+        $this->setChild('add_button', $addButton);
 
-        if (!empty($conf['native']['pages'])) {
-            foreach ($conf['native']['pages'] as $key=>$dummy) {
-                $this->_addPage($fieldset, 'conf[native][pages]['.$key.']');
-            }
-        }
+        $deleteButton = $this->getLayout()->createBlock('adminhtml/widget_button')->setData(array(
+            'label'     => $this->__('Delete'),
+            'onclick'   => "$(\'config_data[{{deleteId}}][tr]\').remove(); return false;",
+            'class'     => 'delete'
+        ))->setName('add_page_item_button');
 
-        $data = $model->getFormData();
-        $data['page_row_add'] = $this->__('Add Page');
-        $form->setValues($data);
-        return parent::_prepareForm();
+        $this->setChild('delete_button', $deleteButton);
+        return $this;
     }
 
     /**
@@ -143,4 +143,24 @@ public function isHidden()
     {
         return false;
     }
+
+    /**
+     * Return cms page list
+     *
+     * @return array
+     */
+    public function getPages()
+    {
+        return $this->_pages;
+    }
+
+    /**
+     * Return saved static page list
+     *
+     * @return array
+     */
+    public function getStaticPageList()
+    {
+        return Mage::getSingleton('xmlconnect/configuration')->getDeviceStaticPages();
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion.php
index ff110010fc3..58b5ccbe5f3 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion.php
@@ -25,7 +25,7 @@
  */
 
 /**
- * Tab design accordion xml renderer
+ * Tab design accordion block renderer
  *
  * @category     Mage
  * @package      Mage_Xmlconnect
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Images.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Images.php
index a6200ce42cf..2e757555a6e 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Images.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Images.php
@@ -27,6 +27,7 @@
 /**
  * Tab design Accordion Images xml renderer
  *
+ * @deprecated will delete in the next version
  * @category     Mage
  * @package      Mage_Xmlconnect
  * @author       Magento Core Team <core@magentocommerce.com>
@@ -37,6 +38,7 @@ class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Design_Accordion_Images
     /**
      * Getter for accordion item title
      *
+     * @deprecated will delete in the next version
      * @return string
      */
     public function getTitle()
@@ -47,6 +49,7 @@ public function getTitle()
     /**
      * Getter for accordion item is open flag
      *
+     * @deprecated will delete in the next version
      * @return bool
      */
     public function getIsOpen()
@@ -57,6 +60,7 @@ public function getIsOpen()
     /**
      * Prepare form
      *
+     * @deprecated will delete in the next version
      * @throws Mage_Core_Exception
      * @return Mage_XmlConnect_Block_Adminhtml_Mobile_Widget_Form
      */
@@ -69,7 +73,7 @@ protected function _prepareForm()
         $this->addImage($fieldset,
             'conf[native][navigationBar][icon]',
             $this->__('Logo in Header'),
-            $this->__('Recommended size 35px x 35px.'),
+            $this->__('Recommended size %spx x %spx.', 35, 35),
             $this->_getDesignPreviewImageUrl('conf/native/navigationBar/icon'),
             true
         );
@@ -80,14 +84,18 @@ protected function _prepareForm()
                 $this->addImage($fieldset,
                     'conf[native][body][bannerImage]',
                     $this->__('Banner on Home Screen'),
-                    $this->__('Recommended size 320px x 230px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance.'),
+                    $this->__('Recommended size %spx x %spx.', 320, 230)
+                        . $this->__(' Note: Image size affects the performance of your app.')
+                        . $this->__('Keep your image size below %s KB for optimal performance.', 50),
                     $this->_getDesignPreviewImageUrl('conf/native/body/bannerImage'),
                     true
                 );
                 $this->addImage($fieldset,
                     'conf[native][body][backgroundImage]',
                     $this->__('App Background'),
-                    $this->__('Recommended size 320px x 367px. Note: Image size affects the performance of your app. Keep your image size below 75 KB for optimal performance.'),
+                    $this->__('Recommended size %spx x %spx.', 320, 367)
+                        . $this->__('Note: Image size affects the performance of your app.')
+                        . $this->__('Keep your image size below %s KB for optimal performance.', 75),
                     $this->_getDesignPreviewImageUrl('conf/native/body/backgroundImage'),
                     true
                 );
@@ -95,29 +103,33 @@ protected function _prepareForm()
             case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPAD:
                 $this->addImage($fieldset,
                     'conf[native][body][bannerIpadLandscapeImage]',
-                    $this->__('Banner on Home Screen <br />(landscape mode)'),
-                    $this->__('Recommended size 1024px x 344px. Note: Image size affects the performance of your app.'),
+                    $this->__('Banner on Home Screen (landscape mode)'),
+                    $this->__('Recommended size %spx x %spx.', 1024, 344)
+                        . $this->__('Note: Image size affects the performance of your app.'),
                     $this->_getDesignPreviewImageUrl('conf/native/body/bannerIpadLandscapeImage'),
                     true
                 );
                 $this->addImage($fieldset,
                     'conf[native][body][bannerIpadImage]',
-                    $this->__('Banner on Home Screen <br />(portrait mode)'),
-                    $this->__('Recommended size 768px x 294px. Note: Image size affects the performance of your app.'),
+                    $this->__('Banner on Home Screen (portrait mode)'),
+                    $this->__('Recommended size %spx x %spx.', 768, 294)
+                        . $this->__('Note: Image size affects the performance of your app.'),
                     $this->_getDesignPreviewImageUrl('conf/native/body/bannerIpadImage'),
                     true
                 );
                 $this->addImage($fieldset,
                     'conf[native][body][backgroundIpadLandscapeImage]',
-                    $this->__('App Background <br />(landscape mode)'),
-                    $this->__('Recommended size 1024px x 704px. Note: Image size affects the performance of your app.'),
+                    $this->__('App Background (landscape mode)'),
+                    $this->__('Recommended size %spx x %spx.', 1024, 704)
+                        . $this->__('Note: Image size affects the performance of your app.'),
                     $this->_getDesignPreviewImageUrl('conf/native/body/backgroundIpadLandscapeImage'),
                     true
                 );
                 $this->addImage($fieldset,
                     'conf[native][body][backgroundIpadPortraitImage]',
-                    $this->__('App Background <br />(portrait mode)'),
-                    $this->__('Recommended size 768px x 960px. Note: Image size affects the performance of your app.'),
+                    $this->__('App Background (portrait mode)'),
+                    $this->__('Recommended size %spx x %spx.', 768, 960)
+                        . $this->__('Note: Image size affects the performance of your app.'),
                     $this->_getDesignPreviewImageUrl('conf/native/body/backgroundIpadPortraitImage'),
                     true
                 );
@@ -126,7 +138,9 @@ protected function _prepareForm()
                 $this->addImage($fieldset,
                     'conf[native][body][bannerAndroidImage]',
                     $this->__('Banner on Home Screen'),
-                    $this->__('Recommended size 320px x 258px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance.'),
+                    $this->__('Recommended size %spx x %spx.', 320, 258)
+                        . $this->__('Note: Image size affects the performance of your app.')
+                        . $this->__('Keep your image size below %s KB for optimal performance.', 50),
                     $this->_getDesignPreviewImageUrl('conf/native/body/bannerAndroidImage'),
                     true
                 );
@@ -146,6 +160,7 @@ protected function _prepareForm()
    /**
     * Retrieve url for images in the skin folder
     *
+    * @deprecated will delete in the next version
     * @param string $name - path to file name relative to the skin dir
     * @return string
     */
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Images.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Images.php
new file mode 100644
index 00000000000..3bb801789f8
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Images.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Tab design images block renderer
+ *
+ * @category    Mage
+ * @package     Mage_Xmlconnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Design_Images extends Mage_Adminhtml_Block_Template
+{
+    /**
+     * Init block, set preview template
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        $device = Mage::helper('xmlconnect')->getDeviceType();
+        if (array_key_exists($device, Mage::helper('xmlconnect')->getSupportedDevices())) {
+            $template = 'xmlconnect/edit/tab/design/images_' . strtolower($device) . '.phtml';
+        } else {
+            Mage::throwException($this->__('Device doesn\'t recognized. Unable to load a template.'));
+        }
+
+        $this->setTemplate($template);
+    }
+
+    /**
+     * Get application id
+     *
+     * @return int
+     */
+    public function getApplicationId()
+    {
+        return Mage::helper('xmlconnect')->getApplicationId();
+    }
+
+    /**
+     * Get image data array for uploader needs
+     *
+     * @param string $type
+     * @param int $imageLimit
+     * @return array
+     */
+    public function getImagesData($type, $imageLimit = 1)
+    {
+        if (!$this->{'get' . ucwords($type)}()) {
+            /** @var $imagesModel Mage_XmlConnect_Model_Images */
+            $imagesModel = Mage::getModel('xmlconnect/images');
+            $this->setImageCount($imagesModel->getImageCount($type));
+            $result = $imagesModel->getDeviceImagesByType($type, $imageLimit);
+            $imageCount = count($result);
+            $this->setIsShowUploder(true);
+            if ($imageCount < $imageLimit) {
+                $result[] = array('image_type' => $type, 'order' => ++$imageCount,
+                    'application_id' => $this->getApplicationId(), 'show_uploader' => (int)$this->getIsShowUploder());
+                $this->setIsShowUploder(false);
+            }
+            $this->{'set' . ucwords($type)}($result);
+        }
+        return $this->{'get' . ucwords($type)}();
+    }
+
+    /**
+     * Get image list by type and limit
+     *
+     * @param string $imageType
+     * @param int $count
+     * @return array
+     */
+    public function getImageList($imageType, $count)
+    {
+        $imageList = $this->getImagesData($imageType, $count);
+        $result = array();
+        foreach ($imageList as $image) {
+            $result[] = $this->_prepareImagesData($image);
+        }
+        return $result;
+    }
+
+    /**
+     * Prepare image data for uploader
+     *
+     * @param array $image
+     * @return array
+     */
+    protected function _prepareImagesData($image)
+    {
+        $this->clearConfig();
+        $params = array('image_type' => $image['image_type'], '_secure' => true, 'order' => $image['order'],
+            'application_id' => $this->getApplicationId());
+
+        if (isset($image['image_id'])) {
+            $this->getConfig()->setFileSave(Mage::getModel('xmlconnect/images')->getImageUrl($image['image_file']))
+                ->setImageId($image['image_id']);
+
+            $this->getConfig()->setThumbnail(Mage::getModel('xmlconnect/images')->getCustomSizeImageUrl(
+                $image['image_file'],
+                Mage_XmlConnect_Helper_Data::THUMBNAIL_IMAGE_WIDTH,
+                Mage_XmlConnect_Helper_Data::THUMBNAIL_IMAGE_HEIGHT
+            ))->setImageId($image['image_id']);
+
+            $imageActionData = Mage::helper('xmlconnect')->getApplication()->getImageActionModel()
+                ->getImageActionData($image['image_id']);
+            if ($imageActionData) {
+                $this->getConfig()->setImageActionData($imageActionData);
+            }
+        }
+
+        if (isset($image['show_uploader'])) {
+            $this->getConfig()->setShowUploader($image['show_uploader']);
+        }
+
+        $this->getConfig()->setUrl(
+            Mage::getModel('adminhtml/url')->addSessionParam()->getUrl('*/*/uploadimages', $params)
+        );
+        $this->getConfig()->setParams(array('form_key' => $this->getFormKey()));
+        $this->getConfig()->setFileField($image['image_type']);
+        $this->getConfig()->setFilters(array(
+            'images' => array(
+                'label' => Mage::helper('adminhtml')->__('Images (.gif, .jpg, .png)'),
+                'files' => array('*.gif', '*.jpg','*.jpeg', '*.png')
+        )));
+        $this->getConfig()->setReplaceBrowseWithRemove(true);
+        $this->getConfig()->setWidth('32');
+        $this->getConfig()->setHideUploadButton(true);
+        $this->getConfig()->setImageCount($this->getImageCount());
+
+        return $this->getConfig()->getData();
+    }
+
+    /**
+     * Retrieve config json
+     *
+     * @param array $image
+     * @return string
+     */
+    public function getConfigJson($image)
+    {
+        return Mage::helper('core')->jsonEncode($this->_prepareImagesData($image));
+    }
+
+    /**
+     * Retrieve image config object
+     *
+     * @return Varien_Object
+     */
+    public function getConfig()
+    {
+        if(is_null($this->_config)) {
+            $this->_config = new Varien_Object();
+        }
+
+        return $this->_config;
+    }
+
+    /**
+     * Clear Image config object
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Design_Images
+     */
+    public function clearConfig()
+    {
+        $this->_config = null;
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Preview.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Preview.php
index 1a227922098..4c462bfc397 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Preview.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Preview.php
@@ -25,14 +25,13 @@
  */
 
 /**
- * Tab design preview xml renderer
+ * Tab design preview renderer
  *
  * @category     Mage
  * @package      Mage_Xmlconnect
  * @author       Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Design_Preview
-    extends Mage_Adminhtml_Block_Template
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Design_Preview extends Mage_Adminhtml_Block_Template
 {
     /**
      * Set preview template
@@ -45,9 +44,7 @@ public function __construct()
         if (array_key_exists($device, Mage::helper('xmlconnect')->getSupportedDevices())) {
             $template = 'xmlconnect/edit/tab/design/preview_' . strtolower($device) . '.phtml';
         } else {
-            Mage::throwException(
-                $this->__('Device doesn\'t recognized. Unable to load a template.')
-            );
+            Mage::throwException($this->__('Device doesn\'t recognized. Unable to load a template.'));
         }
 
         $this->setTemplate($template);
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/General.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/General.php
index 01cb42cc77d..b6399022cdc 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/General.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/General.php
@@ -100,16 +100,16 @@ protected function _prepareForm()
         }
 
         $fieldset->addField('showdev', 'select', array(
-                'name'      => 'showdev',
-                'label'     => $this->__('Device Type'),
-                'title'     => $this->__('Device Type'),
-                'values'    => array($model->getType() => $model->getDevtype()),
-                'disabled'  => true,
+            'name'      => 'showdev',
+            'label'     => $this->__('Device Type'),
+            'title'     => $this->__('Device Type'),
+            'values'    => array($model->getType() => $model->getDevtype()),
+            'disabled'  => true,
         ));
 
         $fieldset->addField('devtype', 'hidden', array(
-                'name'  => 'devtype',
-                'value' => $model->getType(),
+            'name'  => 'devtype',
+            'value' => $model->getType(),
         ));
 
         $yesNoValues = Mage::getModel('adminhtml/system_config_source_yesno')->toOptionArray();
@@ -153,7 +153,7 @@ public function getTabTitle()
      */
     public function canShowTab()
     {
-        return (bool) !Mage::getSingleton('adminhtml/session')->getNewApplication();
+        return (bool)!Mage::getSingleton('adminhtml/session')->getNewApplication();
     }
 
     /**
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/OfflineCatalog.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/OfflineCatalog.php
new file mode 100644
index 00000000000..cb4a72c5b06
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/OfflineCatalog.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Tab for offline catalog management
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_OfflineCatalog
+    extends Mage_Adminhtml_Block_Template
+    implements Mage_Adminhtml_Block_Widget_Tab_Interface
+{
+    /**
+     * Set design tab template
+     * Set to show global icon
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->setShowGlobalIcon(true);
+        $this->setTemplate('xmlconnect/edit/tab/offlinecatalog.phtml');
+    }
+
+    /**
+     * Prepare layout
+     *
+     * @return Mage_Core_Block_Abstract
+     */
+    protected function _prepareLayout()
+    {
+        $this->_addGenerateButton();
+        return parent::_prepareLayout();
+    }
+
+    /**
+     * Add generate button
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_OfflineCatalog
+     */
+    protected function _addGenerateButton()
+    {
+        $generateButton = $this->getLayout()->createBlock('adminhtml/widget_button')->setData(array(
+            'label'     => $this->__('Generate Offline Catalog'),
+            'onclick'   => 'generateOfflineCatalog(); return false;',
+            'class'     => 'save'
+        ))->setName('generate_offline_catalog_button');
+        $this->setChild('offline_catalog', $generateButton);
+        return $this;
+    }
+
+    /**
+     * Tab label getter
+     *
+     * @return string
+     */
+    public function getTabLabel()
+    {
+        return $this->__('Offline Catalog');
+    }
+
+    /**
+     * Tab title getter
+     *
+     * @return string
+     */
+    public function getTabTitle()
+    {
+        return $this->__('Offline Catalog');
+    }
+
+    /**
+     * Check if tab can be shown
+     *
+     * @return bool
+     */
+    public function canShowTab()
+    {
+        return (bool) !Mage::getSingleton('adminhtml/session')->getNewApplication();
+    }
+
+    /**
+     * Check if tab hidden
+     *
+     * @return bool
+     */
+    public function isHidden()
+    {
+        return false;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Payment.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Payment.php
index 536cab6e6dc..ff264c8d20b 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Payment.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Payment.php
@@ -80,7 +80,6 @@ protected function _prepareForm()
 
         $deviceType = Mage::helper('xmlconnect')->getDeviceType();
         switch ($deviceType) {
-            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE:
             case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPAD:
                 /**
                  * PayPal MEP management
@@ -192,13 +191,13 @@ protected function _prepareForm()
                     )
                 );
                 break;
+            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE:
             case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_ANDROID:
                 /**
                  * PayPal MECL management
                  */
                 if (Mage::app()->isSingleStoreMode() || Mage::helper('xmlconnect')->getApplication()->getId()) {
-                    $paypalMeclIsAvailable = Mage::getModel('xmlconnect/payment_method_paypal_mecl')
-                        ->isAvailable();
+                    $paypalMeclIsAvailable = Mage::getModel('xmlconnect/payment_method_paypal_mecl')->isAvailable();
                     $activateMeclMethodNote = $this->__('You need to enable PayPal Express Checkout first from the Payment configuration before enabling PayPal MECL.');
                 } else {
                     $paypalMeclIsAvailable = false;
@@ -224,17 +223,6 @@ protected function _prepareForm()
                     'value'     => $paypalMeclActive,
                     'disabled'  => !$paypalMeclIsAvailable
                 ));
-
-                /**
-                 * PayPal MEP management
-                 */
-                $fieldsetPaypal = $form->addFieldset('paypal_mep_checkout', array(
-                    'legend' => $this->__('PayPal Mobile Embedded Payment (MEP)')
-                ));
-                $fieldsetPaypal->addField('paypal_note', 'note', array(
-                    'label' => $this->__('Notice'),
-                    'text'  => $this->__('Currently, PayPal MEP is not available for the Android application')
-                ));
                 break;
             default:
                 Mage::throwException(
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Settings.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Settings.php
index 567aa0c5f22..58d64ecc974 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Settings.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Settings.php
@@ -37,15 +37,11 @@ class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Settings
 {
     protected function _prepareLayout()
     {
-        $this->setChild('continue_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(array(
-                    'label'     => Mage::helper('catalog')->__('Continue'),
-                    'onclick'   => "if (editForm.submit()) { return false }",
-                    'class'     => 'save'
-                )
-            )
-        );
+        $this->setChild('continue_button', $this->getLayout()->createBlock('adminhtml/widget_button')->setData(array(
+            'label'     => Mage::helper('catalog')->__('Continue'),
+            'onclick'   => "if (editForm.submit()) { return false }",
+            'class'     => 'save'
+        )));
         return parent::_prepareLayout();
     }
 
@@ -63,11 +59,11 @@ protected function _prepareForm()
         $fieldset = $form->addFieldset('base_fieldset', array('legend' => $this->__('Device Information')));
 
         $fieldset->addField('type', 'select', array(
-                'name'      => 'type',
-                'label'     => $this->__('Device Type'),
-                'title'     => $this->__('Device Type'),
-                'values'    => Mage::helper('xmlconnect')->getDeviceTypeOptions(),
-                'required'  => true
+            'name'      => 'type',
+            'label'     => $this->__('Device Type'),
+            'title'     => $this->__('Device Type'),
+            'values'    => Mage::helper('xmlconnect')->getDeviceTypeOptions(),
+            'required'  => true
         ));
 
         $fieldset->addField('continue_button', 'note', array(
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Social.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Social.php
index 284a542aeb4..a1b3d8d0daf 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Social.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Social.php
@@ -60,9 +60,7 @@ protected function _prepareForm()
         /**
          * Twitter fieldset options
          */
-        $fieldsetTwitter = $form->addFieldset('twitter', array(
-            'legend' => $this->__('Twitter API')
-        ));
+        $fieldsetTwitter = $form->addFieldset('twitter', array('legend' => $this->__('Twitter API')));
 
         if (isset($data['conf[native][socialNetworking][twitter][isActive]'])) {
             $twitterStatus = (int)$data['conf[native][socialNetworking][twitter][isActive]'];
@@ -113,16 +111,11 @@ protected function _prepareForm()
             )
         );
 
-        $fieldsetTwitter->addField(
-            'twitterNote',
-            'note',
-            array(
-                'text'  => sprintf(
-                    $noteText,
-                    Mage::getStoreConfig(Mage_XmlConnect_Model_Application::XML_PATH_HOWTO_TWITTER_URL)
-                ),
-            )
-        );
+        $fieldsetTwitter->addField('twitterNote', 'note', array(
+            'text'  => sprintf(
+                $noteText,
+                Mage::getStoreConfig(Mage_XmlConnect_Model_Application::XML_PATH_HOWTO_TWITTER_URL)
+        )));
 
         /**
          * Facebook fieldset options
@@ -163,23 +156,15 @@ protected function _prepareForm()
             )
         );
 
-        $fieldsetFacebook->addField(
-            'facebookNote',
-            'note',
-            array(
-                'text'  => sprintf(
-                    $noteText,
-                    Mage::getStoreConfig(Mage_XmlConnect_Model_Application::XML_PATH_HOWTO_FACEBOOK_URL)
-                ),
-            )
-        );
+        $fieldsetFacebook->addField('facebookNote', 'note', array(
+            'text'  => sprintf(
+                $noteText, Mage::getStoreConfig(Mage_XmlConnect_Model_Application::XML_PATH_HOWTO_FACEBOOK_URL)
+        )));
 
         /**
          * LinkedIn fieldset options
          */
-        $fieldsetLinkedin = $form->addFieldset('linkedin', array(
-            'legend' => $this->__('LinkedIn API'),
-        ));
+        $fieldsetLinkedin = $form->addFieldset('linkedin', array('legend' => $this->__('LinkedIn API')));
 
         if (isset($data['conf[native][socialNetworking][linkedin][isActive]'])) {
             $linkedinStatus = (int)$data['conf[native][socialNetworking][linkedin][isActive]'];
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Submission/History.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Submission/History.php
index 16e1aedee28..c5d5c6a6596 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Submission/History.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Submission/History.php
@@ -79,7 +79,7 @@ public function getTabTitle()
      */
     public function canShowTab()
     {
-        return (bool) !Mage::getSingleton('adminhtml/session')->getNewApplication();
+        return (bool)$this->_getApplication()->getId();
     }
 
     /**
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tabs.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tabs.php
index 439cb314739..daa98624c23 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tabs.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tabs.php
@@ -31,11 +31,9 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tabs
-    extends Mage_Adminhtml_Block_Widget_Tabs
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs
 {
     /**
-     * Constructor
      * Setting grid_id, DOM destination element id, Title
      */
     public function __construct()
@@ -56,8 +54,7 @@ protected function _prepareLayout()
         if (Mage::getSingleton('adminhtml/session')->getNewApplication()) {
             $this->addTab('set', array(
                 'label'     => $this->__('Settings'),
-                'content'   => $this->getLayout()
-                    ->createBlock('xmlconnect/adminhtml_mobile_edit_tab_settings')
+                'content'   => $this->getLayout()->createBlock('xmlconnect/adminhtml_mobile_edit_tab_settings')
                     ->toHtml(),
                 'active'    => true
             ));
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Addrow.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Addrow.php
index 5b7f08f57ca..816d5d665df 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Addrow.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Addrow.php
@@ -27,12 +27,12 @@
 /**
  * Xmlconnect Add row form element
  *
+ * @deprecated will be removed
  * @category    Mage
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Addrow
-    extends Varien_Data_Form_Element_Button
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Addrow extends Varien_Data_Form_Element_Button
 {
     /**
      * Render Element Html
@@ -41,17 +41,9 @@ class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Addrow
      */
     public function getElementHtml()
     {
-        $html = $this->getBeforeElementHtml()
-            . '<button id="'.$this->getHtmlId()
-            . '" name="'
-            . $this->getName()
-            . '" value="'.$this->getEscapedValue()
-            . '" '
-            . $this->serialize($this->getHtmlAttributes())
-            . ' ><span><span><span>'
-            . $this->getEscapedValue()
-            . '</span></span></span></button>'
-            . $this->getAfterElementHtml();
+        $html = $this->getBeforeElementHtml() . '<button id="'.$this->getHtmlId() . '" name="' . $this->getName()
+            . '" value="'.$this->getEscapedValue() . '" ' . $this->serialize($this->getHtmlAttributes()) . ' ><span>'
+            . $this->getEscapedValue() . '</span></button>' . $this->getAfterElementHtml();
         return $html;
     }
 
@@ -74,10 +66,8 @@ public function getBeforeElementHtml()
     public function getLabelHtml($idSuffix = '')
     {
         if ($this->getLabel() !== null) {
-            $html = '<label  for="' . $this->getHtmlId() . $idSuffix . '">'
-                . $this->getLabel()
-                . ($this->getRequired() ? ' <span class="required">*</span>' : '')
-                . '</label>';
+            $html = '<label  for="' . $this->getHtmlId() . $idSuffix . '">' . $this->getLabel()
+                . ($this->getRequired() ? ' <span class="required">*</span>' : '') . '</label>';
         } else {
             $html = '';
         }
@@ -93,7 +83,7 @@ public function getLabelHtml($idSuffix = '')
     public function toHtml()
     {
         $blockClassName = Mage::getConfig()->getBlockClassName('adminhtml/template');
-        $jsBlock = new $blockClassName;
+        $jsBlock = Mage::getModel($blockClassName);
         $jsBlock->setTemplate('xmlconnect/form/element/addrow.phtml');
         $jsBlock->setOptions($this->getOptions());
         return parent::toHtml() . $jsBlock->toHtml();
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Color.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Color.php
index 1bedd5149dc..189d287b31c 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Color.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Color.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Color
-    extends Varien_Data_Form_Element_Text
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Color extends Varien_Data_Form_Element_Text
 {
     /**
      * Return html code for current block
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Country.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Country.php
index 432cdc01042..99c409b39d1 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Country.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Country.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Country
-    extends Varien_Data_Form_Element_Checkboxes
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Country extends Varien_Data_Form_Element_Checkboxes
 {
     /**
      * Flag of using the border in the table's TD
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Datetime.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Datetime.php
index 0e4e4e15b7b..fdd3552fa1e 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Datetime.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Datetime.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Datetime
-    extends Varien_Data_Form_Element_Abstract
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Datetime extends Varien_Data_Form_Element_Abstract
 {
     /**
      * Date
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Font.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Font.php
index 148f26ae4ba..41d64359149 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Font.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Font.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Font
-    extends Varien_Data_Form_Element_Abstract
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Font extends Varien_Data_Form_Element_Abstract
 {
     /**
      * Init font element
@@ -97,9 +96,7 @@ public function getElementHtml()
         foreach ($this->getElements() as $element) {
             $elementsArray[] .= $element->toHtml();
         }
-        return $elementsArray[0]
-            . $elementsArray[1]
-            . '</td><td class="label" style="width: 2em !important">'
+        return $elementsArray[0] . $elementsArray[1] . '</td><td class="label" style="width: 2em !important">'
             . $elementsArray[2];
     }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Image.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Image.php
index eb3eb992980..eacf0944c7b 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Image.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Image.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Image
-    extends Varien_Data_Form_Element_Image
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Image extends Varien_Data_Form_Element_Image
 {
     /**
      * Function fetches image Url actual or default
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Page.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Page.php
index 9a0af5a78b5..8f1769e1dbf 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Page.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Page.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Page
-    extends Varien_Data_Form_Element_Abstract
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Page extends Varien_Data_Form_Element_Abstract
 {
     /**
      * Init page element
@@ -98,10 +97,8 @@ public function getLabelHtml($idSuffix = '')
     public function getElementHtml()
     {
         list($label, $element) = $this->getElements();
-        return $element->toHtml()
-            . '</td><td class="label" style="width: 5em">'
-            . '<button class="scalable save onclick_button" value="&minus;"><span><span><span>'
-            . Mage::helper('xmlconnect')->__('Delete')
-            . '</span></span></span></button>';
+        return $element->toHtml() . '</td><td class="label" style="width: 5em">'
+            . '<button class=" scalable save onclick_button" value="&minus;"><span>'
+            . Mage::helper('xmlconnect')->__('Delete') . '</span></button>';
     }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Tabs.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Tabs.php
index 3a587bd61c1..31178a6edac 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Tabs.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Tabs.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Tabs
-    extends Varien_Data_Form_Element_Text
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Tabs extends Varien_Data_Form_Element_Text
 {
     /**
      * Generate application tabs html
@@ -46,14 +45,12 @@ public function getHtml()
         }
 
         $blockClassName = Mage::getConfig()->getBlockClassName('adminhtml/template');
-        $block = new $blockClassName;
+        $block = Mage::getModel($blockClassName);
         $device = Mage::helper('xmlconnect')->getDeviceType();
         if (array_key_exists($device, Mage::helper('xmlconnect')->getSupportedDevices())) {
             $template = 'xmlconnect/form/element/app_tabs_' . strtolower($device) . '.phtml';
         } else {
-            Mage::throwException(
-                $this->__('Device doesn\'t recognized. Unable to load a template.')
-            );
+            Mage::throwException($this->__('Device doesn\'t recognized. Unable to load a template.'));
         }
 
         $block->setTemplate($template);
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Theme.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Theme.php
index fbb6eba69c3..3171c557546 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Theme.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Theme.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Theme
-    extends Varien_Data_Form_Element_Text
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Theme extends Varien_Data_Form_Element_Text
 {
     /**
      * Generate themes (colors) html
@@ -41,9 +40,8 @@ class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Theme
      */
     public function getHtml()
     {
-        $blockClassName = Mage::getConfig()
-            ->getBlockClassName('xmlconnect/adminhtml_mobile_edit_tab_design_themes');
-        $block = new $blockClassName;
+        $blockClassName = Mage::getConfig()->getBlockClassName('xmlconnect/adminhtml_mobile_edit_tab_design_themes');
+        $block = Mage::getModel($blockClassName);
         $block->setThemes($this->getThemes());
         $block->setName($this->getName());
         $block->setValue($this->getValue());
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid/Renderer/Bool.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid/Renderer/Bool.php
index 669565e8e3e..126d8b9f5af 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid/Renderer/Bool.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid/Renderer/Bool.php
@@ -46,14 +46,10 @@ public function render(Varien_Object $row)
         $status = (int) $row->getData($this->getColumn()->getIndex());
         $options = Mage::helper('xmlconnect')->getStatusOptions();
         if ($status == Mage_XmlConnect_Model_Application::APP_STATUS_SUCCESS) {
-            $result = '<img src="'
-                . Mage::helper('xmlconnect/image')->getSkinImagesUrl('gel_green.png')
-                . '" >&nbsp;'
+            $result = '<img src="' . Mage::helper('xmlconnect/image')->getSkinImagesUrl('gel_green.png') . '" >&nbsp;'
                 . (isset($options[$status]) ? $options[$status] : '');
         } else if ($status == Mage_XmlConnect_Model_Application::APP_STATUS_INACTIVE) {
-            $result = '<img src="'
-            . Mage::helper('xmlconnect/image')->getSkinImagesUrl('gel_red.png')
-            . '" >&nbsp;'
+            $result = '<img src="' . Mage::helper('xmlconnect/image')->getSkinImagesUrl('gel_red.png') . '" >&nbsp;'
             . (isset($options[$status]) ? $options[$status] : '');
         }
         return $result;
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Form.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Form.php
index 324b717b767..17a8575d4bd 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Form.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Adminhtml_Mobile_Submission_Form
-    extends Mage_Adminhtml_Block_Widget_Form
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Submission_Form extends Mage_Adminhtml_Block_Widget_Form
 {
     /**
      * Prepare form before rendering HTML
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container/Submission.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container/Submission.php
index 88e1fa67723..085bede917b 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container/Submission.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container/Submission.php
@@ -191,7 +191,7 @@ protected function _prepareForm()
         $fieldset->addField('conf/submit_text/contact_email', 'text', array(
             'name'      => 'conf[submit_text][email]',
             'label'     => $this->__('Contact Email'),
-            'class'     => 'email',
+            'class'     => 'validate-email email',
             'maxlength' => '40',
             'value'     => isset($formData['conf[submit_text][email]']) ? $formData['conf[submit_text][email]'] : null,
             'note'      => $this->__('Administrative contact for this app and for app submission issues.'),
@@ -270,54 +270,54 @@ protected function _prepareForm()
         switch ($deviceType) {
             case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE:
                 $this->addImage($fieldset, 'conf/submit/icon', $this->__('Large iTunes Icon'),
-                    $this->__('Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Required size: 512px x 512px.'), '', true);
+                    $this->__('Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple).') . $this->__('Required size: %spx x %spx.', 1024, 1024), '', true);
 
                 $this->addImage($fieldset, 'conf/submit/loader_image', $this->__('Loader Splash Screen'),
-                    $this->__('Image that appears on first screen while your app is loading. Required size: 320px x 460px.'), '', true);
+                    $this->__('Image that appears on first screen while your app is loading.') . $this->__('Required size: %spx x %spx.', 320, 460), '', true);
 
-                $this->addImage($fieldset, 'conf/submit/loader_image_i4', $this->__('Loader Splash Screen <br />(iPhone 4 retina)'),
-                    $this->__('Image that appears on first screen while your app is loading. Required size: 640px x 920px.'), '', false);
+                $this->addImage($fieldset, 'conf/submit/loader_image_i4', $this->__('Loader Splash Screen (iPhone 4 retina)'),
+                    $this->__('Image that appears on first screen while your app is loading.') . $this->__('Required size: %spx x %spx.', 640, 920), '', false);
 
                 $this->addImage($fieldset, 'conf/submit/logo', $this->__('Custom App Icon'),
-                    $this->__('Icon that will appear on the user’s phone after they download your app.  You do not need to apply a gradient or soft edges (this is done automatically by Apple).  Recommended size: 57px x 57px at 72 dpi.'), '', true);
+                    $this->__('Icon that will appear on the user\'s phone after they download your app.  You do not need to apply a gradient or soft edges (this is done automatically by Apple).') . $this->__('Recommended size: %spx x %spx at %s dpi.', 57, 57, 72), '', true);
 
-                $this->addImage($fieldset, 'conf/submit/logo_i4', $this->__('Custom App Icon <br />(iPhone 4 retina)'),
-                    $this->__('Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 114px x 114px.'), '', false);
+                $this->addImage($fieldset, 'conf/submit/logo_i4', $this->__('Custom App Icon (iPhone 4 retina)'),
+                    $this->__('Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).') . $this->__('Recommended size: %spx x %spx.', 114, 114), '', false);
 
                 $this->addImage($fieldset, 'conf/submit/big_logo', $this->__('Copyright Page Logo'),
-                    $this->__('Store logo that is displayed on copyright page of app. Preferred size: 100px x 100px.'), '', true);
+                    $this->__('Store logo that is displayed on copyright page of app.') . $this->__('Preferred size: %spx x %spx.', 100, 100), '', true);
 
-                $this->addImage($fieldset, 'conf/submit/big_logo_i4', $this->__('Copyright Page Logo <br />(iPhone 4 retina)'),
-                    $this->__('Store logo that is displayed on copyright page of app. Preferred size: 200px x 200px.'), '', false);
+                $this->addImage($fieldset, 'conf/submit/big_logo_i4', $this->__('Copyright Page Logo (iPhone 4 retina)'),
+                    $this->__('Store logo that is displayed on copyright page of app.') . $this->__('Preferred size: %spx x %spx.', 200, 200), '', false);
                 break;
             case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPAD:
                 $this->addImage($fieldset, 'conf/submit/icon', $this->__('Large iTunes Icon'),
-                    $this->__('Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Required size: 512px x 512px.'), '', true);
+                    $this->__('Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple).') . $this->__('Required size: %spx x %spx.', 1024, 1024), '', true);
 
-                $this->addImage($fieldset, 'conf/submit/ipad_loader_portrait_image', $this->__('Loader Splash Screen <br />(portrait mode)'),
-                    $this->__('Image that appears on first screen while your app is loading. Required size: 768px x 1024px.'), '', true);
+                $this->addImage($fieldset, 'conf/submit/ipad_loader_portrait_image', $this->__('Loader Splash Screen (portrait mode)'),
+                    $this->__('Image that appears on first screen while your app is loading.') . $this->__('Required size: %spx x %spx.', 768, 1024), '', true);
 
-                $this->addImage($fieldset, 'conf/submit/ipad_loader_landscape_image', $this->__('Loader Splash Screen <br />(landscape mode)'),
-                    $this->__('Image that appears on first screen while your app is loading. Required size: 1024px x 768px.'), '', true);
+                $this->addImage($fieldset, 'conf/submit/ipad_loader_landscape_image', $this->__('Loader Splash Screen (landscape mode)'),
+                    $this->__('Image that appears on first screen while your app is loading.') . $this->__('Required size: %spx x %spx.', 1024, 768), '', true);
 
                 $this->addImage($fieldset, 'conf/submit/ipad_logo', $this->__('Custom App Icon'),
-                    $this->__('Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 72px x 72px.'), '', true);
+                    $this->__('Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).') . $this->__('Recommended size: %spx x %spx.', 72, 72), '', true);
 
                 $this->addImage($fieldset, 'conf/submit/big_logo', $this->__('Copyright Page Logo'),
-                    $this->__('Store logo that is displayed on copyright page of app. Preferred size: 100px x 100px.'), '', true);
+                    $this->__('Store logo that is displayed on copyright page of app.') . $this->__('Preferred size: %spx x %spx.', 100, 100), '', true);
                 break;
             case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_ANDROID:
                 $this->addImage($fieldset, 'conf/submit/icon', $this->__('High Resolution Application Icon'),
-                    $this->__('The icon that appears in the Android Market. Recommended size: 512px x 512px. Maximum size: 1024 KB.'), '', true);
+                    $this->__('The icon that appears in the Android Market.') . $this->__('Recommended size: %spx x %spx.', 512, 512) . $this->__('Maximum size: %s KB.', 1024), '', true);
 
                 $this->addImage($fieldset, 'conf/submit/android_loader_image', $this->__('Loader Splash Screen'),
-                    $this->__('Image that appears on first screen while your app is loading. Required size: 320px x 455px.'), '', true);
+                    $this->__('Image that appears on first screen while your app is loading.') . $this->__('Required size: %spx x %spx.', 320, 455), '', true);
 
                 $this->addImage($fieldset, 'conf/submit/android_logo', $this->__('Custom App Icon'),
-                    $this->__('Icon that will appear on the user\'s device after they download your app. Recommended size: 48px x 48px.'), '', true);
+                    $this->__('Icon that will appear on the user\'s device after they download your app.') . $this->__('Recommended size: %spx x %spx.', 48, 48), '', true);
 
                 $this->addImage($fieldset, 'conf/submit/big_logo', $this->__('Copyright Page Logo'),
-                    $this->__('Store logo that is displayed on copyright page of app. Preferred size: 100px x 100px.'), '', true);
+                    $this->__('Store logo that is displayed on copyright page of app.') . $this->__('Preferred size: %spx x %spx.', 100, 100), '', true);
                 break;
         }
 
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tabs.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tabs.php
index 22e87602d1a..af29b19d811 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tabs.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tabs.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Adminhtml_Mobile_Submission_Tabs
-    extends Mage_Adminhtml_Block_Widget_Tabs
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Submission_Tabs extends Mage_Adminhtml_Block_Widget_Tabs
 {
     /**
      * Constructor
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit.php
index c0ff18aa2da..88b669328ab 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Adminhtml_Queue_Edit
-    extends Mage_Adminhtml_Block_Widget_Form_Container
+class Mage_XmlConnect_Block_Adminhtml_Queue_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
 {
     /**
      * Constructor
@@ -66,8 +65,7 @@ public function getBackUrl()
     {
         $template = Mage::registry('current_template');
         $message  = Mage::registry('current_message');
-        return $message && !$message->getId() && $template && $template->getId()
-            ? $this->getUrl('*/*/template')
+        return $message && !$message->getId() && $template && $template->getId() ? $this->getUrl('*/*/template')
             : $this->getUrl('*/*/queue');
     }
 
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit/Form.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit/Form.php
index 42543a31b67..a81788eb9c4 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit/Form.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Adminhtml_Queue_Edit_Form
-    extends Mage_XmlConnect_Block_Adminhtml_Template_Edit_Form
+class Mage_XmlConnect_Block_Adminhtml_Queue_Edit_Form extends Mage_XmlConnect_Block_Adminhtml_Template_Edit_Form
 {
     /**
      * Prepare form before rendering HTML
@@ -59,15 +58,11 @@ protected function _prepareForm()
         }
 
         $fieldset = $this->getForm()->addFieldset(
-            "message_settings",
-            array('legend' => $this->__('Message Settings')),
-            '^'
+            "message_settings", array('legend' => $this->__('Message Settings')), '^'
         );
 
         if ($model->getId()) {
-            $fieldset->addField('message_id', 'hidden', array(
-                'name'  => 'message_id'
-            ));
+            $fieldset->addField('message_id', 'hidden', array('name'  => 'message_id'));
         }
 
         // set exec_time for showing accordingly to locale datetime settings
@@ -155,12 +150,14 @@ protected function _prepareForm()
         if (!$model->getTemplateId()) {
             $model->setTemplateId($templateModel->getId());
         }
+        if (!$model->getApplicationId()) {
+            $model->setApplicationId($templateModel->getApplicationId());
+        }
         $model->setMessageId($model->getId());
-        $model->setData('app_code', $templateModel->getData('app_code'));
 
         $this->getForm()->setAction($this->getUrl('*/*/saveMessage'));
         $this->getForm()->setValues($model->getData());
 
         $this->setForm($this->getForm());
-     }
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid.php
index f20f38f6635..2efc33b20dc 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid.php
@@ -55,8 +55,7 @@ protected function _prepareCollection()
         $collection = Mage::getModel('xmlconnect/queue')->getCollection();
 
         $collection->addFieldToFilter(
-            'main_table.status',
-            array('neq' => Mage_XmlConnect_Model_Queue::STATUS_DELETED)
+            'main_table.status', array('neq' => Mage_XmlConnect_Model_Queue::STATUS_DELETED)
         );
         $this->setCollection($collection);
         return parent::_prepareCollection();
@@ -159,13 +158,13 @@ protected function _prepareMassaction()
         $this->getMassactionBlock()->addItem('delete', array(
              'label'    => $this->__('Delete'),
              'url'      => $this->getUrl('*/*/massDeleteQueue'),
-             'confirm'  => $this->__('Are you sure you what to delete selected records?')
+             'confirm'  => $this->__('Are you sure you want to delete selected records?')
         ));
 
         $this->getMassactionBlock()->addItem('cancel', array(
              'label'    => $this->__('Cancel'),
              'url'      => $this->getUrl('*/*/massCancelQueue'),
-             'confirm'  => $this->__('Are you sure you what to cancel selected records?')
+             'confirm'  => $this->__('Are you sure you want to cancel selected records?')
         ));
         return $this;
     }
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Action.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Action.php
index d7e64838d19..f9bf44a99d1 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Action.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Action.php
@@ -58,14 +58,14 @@ public function render(Varien_Object $row)
             $actions[] = array(
                 'caption'   => $this->__('Cancel'),
                 'url'       => $this->getUrl('*/*/cancelQueue', array('id' => $row->getId())),
-                'confirm'   => $this->__('Are you sure you whant to cancel a message?')
+                'confirm'   => $this->__('Are you sure you want to cancel a message?')
             );
         }
 
         $actions[] = array(
             'caption'   => $this->__('Delete'),
             'url'       => $this->getUrl('*/*/deleteQueue', array('id' => $row->getId())),
-            'confirm'   => $this->__('Are you sure you whant to delete a message?')
+            'confirm'   => $this->__('Are you sure you want to delete a message?')
         );
 
         $this->getColumn()->setActions($actions);
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit.php
index 930ae08125a..e004432b1c3 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit.php
@@ -43,9 +43,8 @@ public function __construct()
         $this->_blockGroup  = 'xmlconnect';
         parent::__construct();
 
-        $this->_updateButton('delete', 'onclick', 'deleteConfirm(\''
-            . $this->__('Warning: All related AirMail messages will be deleted!') . PHP_EOL
-            . $this->__('Are you sure you want to do this?') .'\', \'' . $this->getDeleteUrl() . '\')'
+        $this->_updateButton('delete', 'onclick', 'deleteConfirm(\'' . $this->__('Warning: All related AirMail messages will be deleted!')
+            . '\n' . $this->__('Are you sure you want to do this?') .'\', \'' . $this->getDeleteUrl() . '\')'
         );
         $this->_updateButton('save', 'label', $this->__('Save'));
         $this->_updateButton('save', 'onclick', 'if (editForm.submit()) {disableElements(\'save\')}');
@@ -59,7 +58,9 @@ public function __construct()
      */
     public function getDeleteUrl()
     {
-        return $this->getUrl('*/*/deletetemplate', array($this->_objectId => $this->getRequest()->getParam($this->_objectId)));
+        return $this->getUrl('*/*/deletetemplate', array(
+            $this->_objectId => $this->getRequest()->getParam($this->_objectId)
+        ));
     }
 
     /**
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit/Form.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit/Form.php
index 28e19ff1d9d..b7c33b22d52 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit/Form.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Adminhtml_Template_Edit_Form
-    extends Mage_XmlConnect_Block_Adminhtml_Mobile_Widget_Form
+class Mage_XmlConnect_Block_Adminhtml_Template_Edit_Form extends Mage_XmlConnect_Block_Adminhtml_Mobile_Widget_Form
 {
     /**
      * Enabled fields flag
@@ -86,12 +85,8 @@ protected function _prepareForm()
         $this->_addElementTypes($fieldset);
 
         if ($model->getId()) {
-            $fieldset->addField('id', 'hidden', array(
-                'name'  => 'id',
-            ));
-            $fieldset->addField('template_id', 'hidden', array(
-                'name'  => 'template_id',
-            ));
+            $fieldset->addField('id', 'hidden', array('name'  => 'id'));
+            $fieldset->addField('template_id', 'hidden', array('name'  => 'template_id'));
         }
 
         $fieldset->addField('application_id', 'select', array(
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid/Renderer/Name.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid/Renderer/Name.php
index d51810f6e72..09a055e8f81 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid/Renderer/Name.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid/Renderer/Name.php
@@ -44,5 +44,5 @@ public function render(Varien_Object $row)
     {
         $str = $this->escapeHtml($row->getName());
         return $str;
-     }
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Preview/Form.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Preview/Form.php
index d52ecd73476..4dc36711d47 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Preview/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Preview/Form.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Adminhtml_Template_Preview_Form
-    extends Mage_Adminhtml_Block_Widget_Form
+class Mage_XmlConnect_Block_Adminhtml_Template_Preview_Form extends Mage_Adminhtml_Block_Widget_Form
 {
     /**
      * Preparing from for revision page
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart.php b/app/code/core/Mage/XmlConnect/Block/Cart.php
index bb0eb2df992..9a8b50966b2 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart.php
@@ -49,6 +49,8 @@ protected function _toHtml()
         if (strlen($quote->getCouponCode())) {
             $xmlObject->addAttribute('has_coupon_code', 1);
         }
+
+        $productSmallImageSize = Mage::getModel('xmlconnect/images')->getImageLimitParam('content/product_small');
         $products = $xmlObject->addChild('products');
          /* @var $item Mage_Sales_Model_Quote_Item */
         foreach ($this->getItems() as $item) {
@@ -64,12 +66,9 @@ protected function _toHtml()
             $itemXml->addChild('name', $xmlObject->escapeXml($renderer->getProductName()));
             $itemXml->addChild('code', 'cart[' . $item->getId() . '][qty]');
             $itemXml->addChild('qty', $renderer->getQty());
-            $icon = $renderer->getProductThumbnail()->resize(
-                Mage::helper('xmlconnect/image')->getImageSizeForContent('product_small')
-            );
+            $icon = $renderer->getProductThumbnail()->resize($productSmallImageSize);
             $iconXml = $itemXml->addChild('icon', $icon);
-            $file = Mage::helper('xmlconnect')->urlToPath($icon);
-            $iconXml->addAttribute('modification_time', filemtime($file));
+            $iconXml->addAttribute('modification_time', filemtime($icon->getNewFile()));
             /**
              * Price
              */
@@ -79,19 +78,19 @@ protected function _toHtml()
                     && $item->getWeeeTaxAppliedAmount()
                 ) {
                     $exclPrice = $item->getCalculationPrice() + $item->getWeeeTaxAppliedAmount()
-                        + $item->getWeeeTaxDisposition();
+                                 + $item->getWeeeTaxDisposition();
                 } else {
                     $exclPrice = $item->getCalculationPrice();
                 }
             }
             if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()) {
-                $_incl = $this->helper('checkout')->getPriceInclTax($item);
+                $incl = $this->helper('checkout')->getPriceInclTax($item);
                 if (Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales')
                     && $item->getWeeeTaxAppliedAmount()
                 ) {
-                    $inclPrice = $_incl + $item->getWeeeTaxAppliedAmount();
+                    $inclPrice = $incl + $item->getWeeeTaxAppliedAmount();
                 } else {
-                    $inclPrice = $_incl - $item->getWeeeTaxDisposition();
+                    $inclPrice = $incl - $item->getWeeeTaxDisposition();
                 }
             }
             $exclPrice = Mage::helper('xmlconnect')->formatPriceForXml($exclPrice);
@@ -151,13 +150,13 @@ protected function _toHtml()
                 }
             }
             if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()) {
-                $_incl = $this->helper('checkout')->getSubtotalInclTax($item);
+                $incl = $this->helper('checkout')->getSubtotalInclTax($item);
                 if (Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales')
                     && $item->getWeeeTaxAppliedAmount()
                 ) {
-                    $inclPrice = $_incl + $item->getWeeeTaxAppliedRowAmount();
+                    $inclPrice = $incl + $item->getWeeeTaxAppliedRowAmount();
                 } else {
-                    $inclPrice = $_incl - $item->getWeeeTaxRowDisposition();
+                    $inclPrice = $incl - $item->getWeeeTaxRowDisposition();
                 }
             }
 
@@ -190,14 +189,27 @@ protected function _toHtml()
             /**
              * Options list
              */
-            $_options = $renderer->getOptionList();
-            if ($_options) {
+            $options = $renderer->getOptionList();
+            if ($options) {
                 $itemOptionsXml = $itemXml->addChild('options');
-                foreach ($_options as $_option) {
-                    $_formattedOptionValue = $renderer->getFormatedOptionValue($_option);
+                foreach ($options as $option) {
+                    $formattedOptionValue = $renderer->getFormatedOptionValue($option);
                     $optionXml = $itemOptionsXml->addChild('option');
-                    $optionXml->addAttribute('label', $xmlObject->xmlAttribute($_option['label']));
-                    $optionXml->addAttribute('text', $xmlObject->xmlAttribute($_formattedOptionValue['value']));
+                    $optionXml->addAttribute('label', $xmlObject->xmlAttribute($option['label']));
+                    $optionXml->addAttribute('text', $xmlObject->xmlAttribute($formattedOptionValue['value']));
+                }
+            }
+
+            /**
+             * Downloadable products
+             */
+            $links = $renderer->getLinks();
+            if ($links) {
+                $itemOptionsXml = $itemXml->addCustomChild('options', null, array(
+                    'label' => $renderer->getLinksTitle()
+                ));
+                foreach ($links as $link) {
+                    $itemOptionsXml->addCustomChild('option', null, array('label' => $link->getTitle()));
                 }
             }
 
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals.php b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals.php
new file mode 100644
index 00000000000..e2c14c958fc
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Shopping cart totals xml renderer
+ *
+ * @category    Mage
+ * @package     Mage_Xmlconnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Cart_CartTotals extends Mage_Checkout_Block_Cart_Totals
+{
+    /**
+     * Default totals renderer
+     *
+     * @var string
+     */
+    protected $_defaultRenderer = 'xmlconnect/cart_cartTotals_default';
+
+    /**
+     * Render cart totals xml
+     *
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    protected function _toHtml()
+    {
+        /** @var $cartXmlObject Mage_XmlConnect_Model_Simplexml_Element */
+        $cartXmlObject = $this->getCartXmlObject();
+        /** @var $totalsXmlObj Mage_XmlConnect_Model_Simplexml_Element */
+        $totalsXmlObj = Mage::getModel('xmlconnect/simplexml_element', '<totals></totals>');
+
+        foreach($this->getTotals() as $total) {
+            $code = $total->getCode();
+            if ($total->getAs()) {
+                $code = $total->getAs();
+            }
+            $isNode = Mage::getConfig()->getNode("global/xmlconnect/sales/quote/totals/{$code}/is_node");
+            if ($isNode) {
+                $this->_getTotalRenderer($code)->setTotal($total)->setCartObject($cartXmlObject)->toHtml();
+            } else {
+                $this->_getTotalRenderer($code)->setTotal($total)->setCartObject($totalsXmlObj)->toHtml();
+            }
+        }
+        $cartXmlObject->appendChild($totalsXmlObj);
+        return $this;
+    }
+
+    /**
+     * Get renderer block
+     *
+     * @param string $code
+     * @return Mage_Core_Block_Abstract
+     */
+    protected function _getTotalRenderer($code)
+    {
+        $blockName = $code . '_total_renderer';
+        $block = $this->getLayout()->getBlock($blockName);
+        if (!$block) {
+            $block = $this->_defaultRenderer;
+            $config = Mage::getConfig()->getNode("global/xmlconnect/sales/quote/totals/{$code}/renderer");
+            if ($config) {
+                $block = (string) $config;
+            }
+            $block = $this->getLayout()->createBlock($block, $blockName);
+        }
+        /**
+         * Transfer totals to renderer
+         */
+        $block->setTotals($this->getTotals());
+        return $block;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Default.php b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Default.php
new file mode 100644
index 00000000000..3609cc34364
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Default.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Cart totals default renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Xmlconnect_Block_Cart_CartTotals_Default extends Mage_Checkout_Block_Total_Default
+{
+    /**
+     * Total id prefix
+     *
+     * @var string
+     */
+    protected $_totalIdPrefix = 'total_';
+
+    /**
+     * Add cart total to xml
+     *
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    protected function _toHtml()
+    {
+        if (!$this->getTotal()->getValue()) {
+            return;
+        }
+        /** @var $cartXmlObject Mage_XmlConnect_Model_Simplexml_Element */
+        $cartXmlObject = $this->getCartObject();
+        $currentTotal = $this->getTotal();
+
+        /** @var $xmlObj Mage_XmlConnect_Model_Simplexml_Element */
+        $xmlObj = $cartXmlObject->addCustomChild('total', null, array(
+            'id' => $this->getTotalIdPrefix() . $currentTotal->getCode()
+        ));
+        $value = Mage::helper('xmlconnect')->formatPriceForXml($currentTotal->getValue());
+        $formattedValue = $this->getQuote()->getStore()->formatPrice($value, false);
+
+        $xmlObj->addCustomChild('item', $value, array(
+            'id' => $currentTotal->getCode(),
+            'label' => $currentTotal->getTitle(),
+            'formatted_value' => $formattedValue
+        ));
+        return $xmlObj;
+    }
+
+    /**
+     * Set total id prefix
+     *
+     * @param string $totalIdPrefix
+     * @return Mage_Xmlconnect_Block_Cart_CartTotals_Default
+     */
+    public function setTotalIdPrefix($totalIdPrefix)
+    {
+        $this->_totalIdPrefix = $totalIdPrefix;
+        return $this;
+    }
+
+    /**
+     * Get total id prefix
+     *
+     * @return string
+     */
+    public function getTotalIdPrefix()
+    {
+        return $this->_totalIdPrefix;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Grandtotal.php b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Grandtotal.php
new file mode 100644
index 00000000000..5000cc57e29
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Grandtotal.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Cart totals grand total renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Xmlconnect_Block_Cart_CartTotals_Grandtotal extends Mage_Tax_Block_Checkout_Grandtotal
+{
+    /**
+     * Total id prefix
+     *
+     * @var string
+     */
+    protected $_totalIdPrefix = 'total_';
+
+    /**
+     * Add cart grand total to xml
+     *
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    protected function _toHtml()
+    {
+        $grandTotalValue = $this->getTotal()->getValue() ? $this->getTotal()->getValue(): 0;
+
+        /** @var $cartXmlObject Mage_XmlConnect_Model_Simplexml_Element */
+        $cartXmlObject = $this->getCartObject();
+        $grandTotal = $this->getTotal();
+        $code = $grandTotal->getCode();
+
+        /** @var $helper Mage_XmlConnect_Helper_Data */
+        $helper = Mage::helper('xmlconnect');
+
+        /** @var $xmlObj Mage_XmlConnect_Model_Simplexml_Element */
+        $xmlObj = $cartXmlObject->addCustomChild('total', null, array(
+            'id' => $this->getTotalIdPrefix() . $code
+        ));
+
+        if ($this->includeTax() && $this->getTotalExclTax() >= 0) {
+            $label = $this->__('Grand Total (Excl. Tax)');
+            $excludingTaxCode = $code . '_excl_tax';
+            $value = $this->getTotalExclTax();
+            $formattedValue = $this->getQuote()->getStore()->formatPrice($value);
+            $helper->addTotalItemToXmlObj($xmlObj, $excludingTaxCode, $label, $value, $formattedValue);
+
+            $label = $this->__('Grand Total (Incl. Tax)');
+            $includingTaxCode = $code . '_incl_tax';
+            $value = $grandTotalValue;
+            $formattedValue = $this->getQuote()->getStore()->formatPrice($value);
+            $helper->addTotalItemToXmlObj($xmlObj, $includingTaxCode, $label, $value, $formattedValue);
+        } else {
+            $label = $this->__('Grand Total');
+            $value = $grandTotalValue;
+            $formattedValue = $this->getQuote()->getStore()->formatPrice($value);
+            $helper->addTotalItemToXmlObj($xmlObj, $code, $label, $value, $formattedValue);
+        }
+        return $xmlObj;
+    }
+
+    /**
+     * Set total id prefix
+     *
+     * @param string $totalIdPrefix
+     * @return Mage_Xmlconnect_Block_Cart_CartTotals_Grandtotal
+     */
+    public function setTotalIdPrefix($totalIdPrefix)
+    {
+        $this->_totalIdPrefix = $totalIdPrefix;
+        return $this;
+    }
+
+    /**
+     * Get total id prefix
+     *
+     * @return string
+     */
+    public function getTotalIdPrefix()
+    {
+        return $this->_totalIdPrefix;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Nodes/Default.php b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Nodes/Default.php
new file mode 100644
index 00000000000..ef2a3e3babf
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Nodes/Default.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Cart totals default node renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Xmlconnect_Block_Cart_CartTotals_Nodes_Default extends Mage_Checkout_Block_Total_Default
+{
+    /**
+     * Add cart total node to xml
+     *
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    protected function _toHtml()
+    {
+        if (!$this->getTotal()->getValue()) {
+            return;
+        }
+        /** @var $cartXmlObject Mage_XmlConnect_Model_Simplexml_Element */
+        $cartXmlObject = $this->getCartObject();
+        $total = $this->getTotal();
+
+        /** @var $nodeXmlObj Mage_XmlConnect_Model_Simplexml_Element */
+        $nodeXmlObj = $cartXmlObject->addCustomChild($total->getCode());
+        $value = Mage::helper('xmlconnect')->formatPriceForXml($total->getValue());
+        $formattedValue = $this->getQuote()->getStore()->formatPrice($value, false);
+
+        $nodeXmlObj->addCustomChild('item', $value, array(
+            'id' => $total->getCode(),
+            'label' => $total->getTitle(),
+            'formatted_value' => $formattedValue
+        ));
+
+        return $nodeXmlObj;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Nodes/Giftcardaccount.php b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Nodes/Giftcardaccount.php
new file mode 100644
index 00000000000..f5ffa5aa474
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Nodes/Giftcardaccount.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Cart totals gift card renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Xmlconnect_Block_Cart_CartTotals_Nodes_Giftcardaccount extends Mage_Checkout_Block_Total_Default
+{
+    /**
+     * Add gift card balance to xml
+     *
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    protected function _toHtml()
+    {
+        if (!$this->getTotal()->getValue()) {
+            return;
+        }
+        /** @var $cartXmlObject Mage_XmlConnect_Model_Simplexml_Element */
+        $cartXmlObject = $this->getCartObject();
+        $cards = $this->getTotal()->getGiftCards();
+        if (!$cards) {
+            $cards = $this->getQuoteGiftCards();
+        }
+        $code = $this->getTotal()->getCode();
+
+        /** @var $giftCardsXmlObj Mage_XmlConnect_Model_Simplexml_Element */
+        $giftCardsXmlObj = $cartXmlObject->addCustomChild($code);
+
+        foreach ($cards as $cardCode) {
+            $giftCardValue = Mage::helper('xmlconnect')->formatPriceForXml($cardCode['a']);
+            $formattedValue = $this->getQuote()->getStore()->formatPrice($giftCardValue, false);
+            $giftCardsXmlObj->addCustomChild('item', '-' . $giftCardValue, array(
+                'id' => $code . '_' . $cardCode['i'],
+                'label' => $this->__('Gift Card (%s)', $cardCode['c']),
+                'formatted_value' => '-' . $formattedValue,
+                'code' => $cardCode['c']
+            ));
+        }
+        return $giftCardsXmlObj;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Shipping.php b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Shipping.php
new file mode 100644
index 00000000000..af659c3c5ee
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Shipping.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Cart totals shipping renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Xmlconnect_Block_Cart_CartTotals_Shipping extends Mage_Tax_Block_Checkout_Shipping
+{
+    /**
+     * Total id prefix
+     *
+     * @var string
+     */
+    protected $_totalIdPrefix = 'total_';
+
+    /**
+     * Add cart grand total to xml
+     *
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    protected function _toHtml()
+    {
+        if (!$this->getTotal()->getValue()) {
+            return;
+        }
+        /** @var $cartXmlObject Mage_XmlConnect_Model_Simplexml_Element */
+        $cartXmlObject = $this->getCartObject();
+        $shippingTotal = $this->getTotal();
+        $code = $shippingTotal->getCode();
+
+        /** @var $helper Mage_XmlConnect_Helper_Data */
+        $helper = Mage::helper('xmlconnect');
+
+        /** @var $xmlObj Mage_XmlConnect_Model_Simplexml_Element */
+        $xmlObj = $cartXmlObject->addCustomChild('total', null, array(
+            'id' => $this->getTotalIdPrefix() . $code
+        ));
+
+        if ($this->displayBoth()) {
+            $label = $this->getExcludeTaxLabel();
+            $excludingTaxCode = $code . '_excl_tax';
+            $value = $this->getShippingIncludeTax();
+            $formattedValue = $this->getQuote()->getStore()->formatPrice($value);
+            $helper->addTotalItemToXmlObj($xmlObj, $excludingTaxCode, $label, $value, $formattedValue);
+
+            $label = $this->getIncludeTaxLabel();
+            $includingTaxCode = $code . '_incl_tax';
+            $value = $this->getShippingIncludeTax();
+            $formattedValue = $this->getQuote()->getStore()->formatPrice($value);
+            $helper->addTotalItemToXmlObj($xmlObj, $includingTaxCode, $label, $value, $formattedValue);
+        } else {
+            if ($this->displayIncludeTax()) {
+                $label = $this->getIncludeTaxLabel();
+                $value = $this->getShippingIncludeTax();
+            } else {
+                $label = $this->getExcludeTaxLabel();
+                $value = $this->getShippingIncludeTax();
+            }
+            $formattedValue = $this->getQuote()->getStore()->formatPrice($value);
+            $helper->addTotalItemToXmlObj($xmlObj, $code, $label, $value, $formattedValue);
+        }
+        return $xmlObj;
+    }
+
+    /**
+     * Set total id prefix
+     *
+     * @param string $totalIdPrefix
+     * @return Mage_Xmlconnect_Block_Cart_CartTotals_Shipping
+     */
+    public function setTotalIdPrefix($totalIdPrefix)
+    {
+        $this->_totalIdPrefix = $totalIdPrefix;
+        return $this;
+    }
+
+    /**
+     * Get total id prefix
+     *
+     * @return string
+     */
+    public function getTotalIdPrefix()
+    {
+        return $this->_totalIdPrefix;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Subtotal.php b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Subtotal.php
new file mode 100644
index 00000000000..bcf1eced2b9
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/CartTotals/Subtotal.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Cart totals subtotal renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Xmlconnect_Block_Cart_CartTotals_Subtotal extends Mage_Tax_Block_Checkout_Subtotal
+{
+    /**
+     * Total id prefix
+     *
+     * @var string
+     */
+    protected $_totalIdPrefix = 'total_';
+
+    /**
+     * Add cart subtotal to xml
+     *
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    protected function _toHtml()
+    {
+        if (!$this->getTotal()->getValue()) {
+            return;
+        }
+        /** @var $cartXmlObject Mage_XmlConnect_Model_Simplexml_Element */
+        $cartXmlObject = $this->getCartObject();
+        $subtotal = $this->getTotal();
+        $code = $subtotal->getCode();
+
+        /** @var $helper Mage_XmlConnect_Helper_Data */
+        $helper = Mage::helper('xmlconnect');
+
+        /** @var $xmlObj Mage_XmlConnect_Model_Simplexml_Element */
+        $xmlObj = $cartXmlObject->addCustomChild('total', null, array(
+            'id' => $this->getTotalIdPrefix() . $code
+        ));
+
+        if ($this->displayBoth()) {
+            $label = $this->__('Subtotal (Excl. Tax)');
+            $excludingTaxCode = $code . '_excl_tax';
+            $value = $subtotal->getValueExclTax();
+            $formattedValue = $this->getQuote()->getStore()->formatPrice($value);
+            $helper->addTotalItemToXmlObj($xmlObj, $excludingTaxCode, $label, $value, $formattedValue);
+
+            $label = $this->__('Subtotal (Incl. Tax)');
+            $includingTaxCode = $code . '_incl_tax';
+            $value = $subtotal->getValueInclTax();
+            $formattedValue = $this->getQuote()->getStore()->formatPrice($value);
+            $helper->addTotalItemToXmlObj($xmlObj, $includingTaxCode, $label, $value, $formattedValue);
+        } else {
+            $label = $this->__('Subtotal');
+            $value = $subtotal->getValue();
+            $formattedValue = $this->getQuote()->getStore()->formatPrice($value);
+            $helper->addTotalItemToXmlObj($xmlObj, $code, $label, $value, $formattedValue);
+        }
+        return $xmlObj;
+    }
+
+    /**
+     * Set total id prefix
+     *
+     * @param string $totalIdPrefix
+     * @return Mage_Xmlconnect_Block_Cart_CartTotals_Subtotal
+     */
+    public function setTotalIdPrefix($totalIdPrefix)
+    {
+        $this->_totalIdPrefix = $totalIdPrefix;
+        return $this;
+    }
+
+    /**
+     * Get total id prefix
+     *
+     * @return string
+     */
+    public function getTotalIdPrefix()
+    {
+        return $this->_totalIdPrefix;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Crosssell.php b/app/code/core/Mage/XmlConnect/Block/Cart/Crosssell.php
index ea0e1c0215a..7d67f81522d 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart/Crosssell.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Crosssell.php
@@ -46,23 +46,23 @@ protected function _toHtml()
             $this->getLayout()->createBlock($blockRenderer, $blockName);
             $this->setItems($this->getLayout()->getBlock($blockName)->getItemCollection());
         }
-
+        /** @var $crossSellXmlObj Mage_XmlConnect_Model_Simplexml_Element */
         $crossSellXmlObj = Mage::getModel('xmlconnect/simplexml_element', '<crosssell></crosssell>');
         if (!$this->getItemCount()) {
             return $crossSellXmlObj->asNiceXml();
         }
 
+        $productSmallImageSize = Mage::getModel('xmlconnect/images')->getImageLimitParam('content/product_small');
+        /** @var $productImageHelper Mage_XmlConnect_Helper_Catalog_Product_Image */
+        $productImageHelper = $this->helper('xmlconnect/catalog_product_image');
         /** @var $product Mage_Catalog_Model_Product */
         foreach ($this->getItems() as $product) {
             $itemXmlObj = $crossSellXmlObj->addChild('item');
             $itemXmlObj->addChild('name', $crossSellXmlObj->escapeXml($product->getName()));
-            $icon = $this->helper('catalog/image')->init($product, 'thumbnail')
-                ->resize(Mage::helper('xmlconnect/image')->getImageSizeForContent('product_small'));
+            $icon = $productImageHelper->init($product, 'thumbnail')->resize($productSmallImageSize);
 
             $iconXml = $itemXmlObj->addChild('icon', $icon);
-
-            $file = Mage::helper('xmlconnect')->urlToPath($icon);
-            $iconXml->addAttribute('modification_time', filemtime($file));
+            $iconXml->addAttribute('modification_time', filemtime($icon->getNewFile()));
 
             $itemXmlObj->addChild('entity_id', $product->getId());
             $itemXmlObj->addChild('entity_type', $product->getTypeId());
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer.php b/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer.php
index a66085894db..e7df5dc81b8 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer.php
@@ -41,36 +41,238 @@ class Mage_XmlConnect_Block_Cart_Item_Renderer extends Mage_Checkout_Block_Cart_
      */
     public function addProductToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $reviewXmlObj)
     {
-        $_item = $this->getItem();
+        $item = $this->getItem();
         $productXmlObj = $reviewXmlObj->addCustomChild('item');
         $productXmlObj->addCustomChild('name', $this->escapeHtml($this->getProductName()));
 
-        if ($_options = $this->getOptionList()) {
+        if ($options = $this->getOptionList()) {
             $optionsXmlObj = $productXmlObj->addChild('options');
-            foreach ($_options as $_option) {
-                $_formattedOptionValue = $this->getFormatedOptionValue($_option);
+            foreach ($options as $option) {
+                $formattedOptionValue = $this->getFormatedOptionValue($option);
 
-                if (isset($_formattedOptionValue['full_view'])) {
-                    $value = $_formattedOptionValue['full_view'];
+                if (isset($formattedOptionValue['full_view'])) {
+                    $value = $formattedOptionValue['full_view'];
                 } else {
                     $value = null;
                 }
 
                 $optionsXmlObj->addCustomChild('option', $value, array(
-                    'label' => $this->escapeHtml($_option['label']),
-                    'value' => $_formattedOptionValue['value']
+                    'label' => $this->escapeHtml($option['label']),
+                    'value' => $formattedOptionValue['value']
                 ));
             }
         }
 
-        $this->_addPriceToXmlObj($productXmlObj);
-        $this->_addSubtotalToXmlObj($productXmlObj);
+        if (Mage::helper('xmlconnect')->checkApiVersion(Mage_XmlConnect_Helper_Data::DEVICE_API_V_23)) {
+            $priceListXmlObj = $productXmlObj->addCustomChild('price_list');
+            $this->_addPriceToXmlObj23($priceListXmlObj);
+            $this->_addSubtotalToXmlObj23($priceListXmlObj);
+        } else {
+            $this->_addPriceToXmlObj($productXmlObj);
+            $this->_addSubtotalToXmlObj($productXmlObj);
+        }
 
-        $productXmlObj->addCustomChild('qty', $_item->getQty());
+        $productXmlObj->addCustomChild('qty', $item->getQty());
+        $icon = $this->helper('xmlconnect/catalog_product_image')->init($this->getProduct(), 'thumbnail')
+            ->resize(Mage::getModel('xmlconnect/images')->getImageLimitParam('content/product_small'));
+        $iconXml = $productXmlObj->addChild('icon', $icon);
+        $iconXml->addAttribute('modification_time', filemtime($icon->getNewFile()));
 
         return $reviewXmlObj;
     }
 
+    /**
+     * Add product price info to xml object. API version 23
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $priceListXmlObj
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    protected function _addPriceToXmlObj23(Mage_XmlConnect_Model_Simplexml_Element $priceListXmlObj)
+    {
+        $item = $this->getItem();
+        $priceType = 'price';
+        $priceXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => $priceType));
+
+        if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()) {
+            if (Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales')
+                && $item->getWeeeTaxAppliedAmount()
+            ) {
+                $exclPrice = $item->getCalculationPrice() + $item->getWeeeTaxAppliedAmount()
+                    + $item->getWeeeTaxDisposition();
+            } else {
+                $exclPrice = $item->getCalculationPrice();
+            }
+            $exclPrice = $this->_formatPrice($exclPrice);
+            $priceXmlObj->addCustomChild('price', $exclPrice, array(
+                'id' => $priceType . '_excluding_tax',
+                'label' => $this->__('Excl. Tax'),
+                'formatted_value' => $priceXmlObj->escapeXml($exclPrice)
+            ));
+        }
+
+        if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()) {
+            $incl = $this->helper('checkout')->getPriceInclTax($item);
+
+            if (Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales')
+                && $item->getWeeeTaxAppliedAmount()
+            ) {
+                $inclPrice = $incl + $item->getWeeeTaxAppliedAmount();
+            } else {
+                $inclPrice = $incl - $item->getWeeeTaxDisposition();
+            }
+            $inclPrice = $this->_formatPrice($inclPrice);
+
+            $priceXmlObj->addCustomChild('price', $inclPrice, array(
+                'id' => $priceType . '_including_tax',
+                'label' => $this->__('Incl. Tax'),
+                'formatted_value' => $priceXmlObj->escapeXml($inclPrice)
+            ));
+        }
+
+        if (Mage::helper('weee')->getApplied($item)) {
+            $this->_addWeeeToXmlObj23($priceXmlObj);
+        }
+
+        return $priceListXmlObj;
+    }
+
+    /**
+     * Add product subtotal info to xml object. API version 23
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $priceListXmlObj
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    protected function _addSubtotalToXmlObj23(Mage_XmlConnect_Model_Simplexml_Element $priceListXmlObj)
+    {
+        $item = $this->getItem();
+        $priceType = 'subtotal';
+        $subtotalXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => $priceType));
+
+        if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()) {
+            if (Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales')
+                && $item->getWeeeTaxAppliedAmount()) {
+                $exclPrice = $item->getRowTotal() + $item->getWeeeTaxAppliedRowAmount()
+                    + $item->getWeeeTaxRowDisposition();
+            } else {
+                $exclPrice = $item->getRowTotal();
+            }
+            $exclPrice = $this->_formatPrice($exclPrice);
+
+            $subtotalXmlObj->addCustomChild('price', null, array(
+                'id' => $priceType . '_excluding_tax',
+                'label' => $this->__('Subtotal Excl. Tax'),
+                'formatted_value' => $subtotalXmlObj->escapeXml($exclPrice)
+            ));
+        }
+
+        if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()) {
+            $incl = $this->helper('checkout')->getSubtotalInclTax($item);
+
+            if (Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales')
+                && $item->getWeeeTaxAppliedAmount()
+            ) {
+                $inclPrice = $incl + $item->getWeeeTaxAppliedRowAmount();
+            } else {
+                $inclPrice = $incl - $item->getWeeeTaxRowDisposition();
+            }
+            $inclPrice = $this->_formatPrice($inclPrice);
+
+            $subtotalXmlObj->addCustomChild('price', null, array(
+                'id' => $priceType . '_including_tax',
+                'label' => $this->__('Subtotal Incl. Tax'),
+                'formatted_value' => $subtotalXmlObj->escapeXml($inclPrice)
+            ));
+        }
+
+        if (Mage::helper('weee')->getApplied($item)) {
+            $this->_addWeeeToXmlObj23($subtotalXmlObj, true);
+        }
+
+        return $priceListXmlObj;
+    }
+
+    /**
+     * Add weee tax product info to xml object API version 23
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $priceListXmlObj
+     * @param bool $subtotalFlag use true to get subtotal product info
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    protected function _addWeeeToXmlObj23($priceListXmlObj, $subtotalFlag = false)
+    {
+        $item = $this->getItem();
+        $weeeXmlObj = $priceListXmlObj->addCustomChild('price', null, array('id' => 'weee'));
+
+        if ($subtotalFlag) {
+            $incl = $this->helper('checkout')->getSubtotalInclTax($item);
+        } else {
+            $incl = $this->helper('checkout')->getPriceInclTax($item);
+        }
+
+        $typeOfDisplay2 = Mage::helper('weee')->typeOfDisplay($item, 2, 'sales');
+
+        if (Mage::helper('weee')->typeOfDisplay($item, 1, 'sales') && $item->getWeeeTaxAppliedAmount()) {
+            foreach (Mage::helper('weee')->getApplied($item) as $tax) {
+
+                if ($subtotalFlag) {
+                    $amount = $tax['row_amount'];
+                } else {
+                    $amount = $tax['amount'];
+                }
+
+                $weeeXmlObj->addCustomChild('item', $amount * 1, array(
+                    'id' => 'weee_tax', 'label' => $tax['title'], 'formatted_value' => $this->_formatPrice($amount)
+                ));
+            }
+        } elseif ($item->getWeeeTaxAppliedAmount()
+            && ($typeOfDisplay2 || Mage::helper('weee')->typeOfDisplay($item, 4, 'sales'))
+        ) {
+            foreach (Mage::helper('weee')->getApplied($item) as $tax) {
+                if ($subtotalFlag) {
+                    $amount = $tax['row_amount_incl_tax'];
+                } else {
+                    $amount = $tax['amount_incl_tax'];
+                }
+
+                $weeeXmlObj->addCustomChild('item', $amount * 1, array(
+                    'id' => 'weee_tax', 'label' => $tax['title'], 'formatted_value' => $this->_formatPrice($amount)
+                ));
+            }
+        }
+
+        if ($typeOfDisplay2 && $item->getWeeeTaxAppliedAmount()) {
+            if ($subtotalFlag) {
+                $totalExcl = $item->getRowTotal() + $item->getWeeeTaxAppliedRowAmount()
+                    + $item->getWeeeTaxRowDisposition();
+            } else {
+                $totalExcl = $item->getCalculationPrice() + $item->getWeeeTaxAppliedAmount()
+                    + $item->getWeeeTaxDisposition();
+            }
+
+            $weeeXmlObj->addCustomChild('item', $totalExcl * 1, array(
+                'id' => 'total_excluding_tax',
+                'label' => $this->__('Total'),
+                'formatted_value' => $priceListXmlObj->escapeXml($this->_formatPrice($totalExcl))
+            ));
+        }
+
+        if ($typeOfDisplay2 && $item->getWeeeTaxAppliedAmount()) {
+            if ($subtotalFlag) {
+                $totalIncl = $incl + $item->getWeeeTaxAppliedRowAmount();
+            } else {
+                $totalIncl = $incl + $item->getWeeeTaxAppliedAmount();
+            }
+
+            $weeeXmlObj->addCustomChild('item', $totalIncl * 1, array(
+                'id' => 'total_including_tax',
+                'label' => $this->__('Total incl. tax'),
+                'formatted_value' => $priceListXmlObj->escapeXml($this->_formatPrice($totalIncl))
+            ));
+        }
+
+        return $priceListXmlObj;
+    }
+
     /**
      * Add product subtotal info to xml object
      *
@@ -79,38 +281,38 @@ public function addProductToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $revi
      */
     protected function _addSubtotalToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $productXmlObj)
     {
-        $_item = $this->getItem();
+        $item = $this->getItem();
         $subtotalXmlObj = $productXmlObj->addCustomChild('subtotal');
 
         if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()) {
-            if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')
-                && $_item->getWeeeTaxAppliedAmount()
-            ) {
-                $exclPrice = $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount()
-                    + $_item->getWeeeTaxRowDisposition();
+            if (Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales')
+                && $item->getWeeeTaxAppliedAmount()) {
+                $exclPrice = $item->getRowTotal() + $item->getWeeeTaxAppliedRowAmount()
+                    + $item->getWeeeTaxRowDisposition();
             } else {
-                $exclPrice = $_item->getRowTotal();
+                $exclPrice = $item->getRowTotal();
             }
             $exclPrice = $this->_formatPrice($exclPrice);
+
             $subtotalXmlObj->addAttribute('excluding_tax', $subtotalXmlObj->escapeXml($exclPrice));
         }
 
         if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()) {
-            $_incl = $this->helper('checkout')->getSubtotalInclTax($_item);
+            $incl = $this->helper('checkout')->getSubtotalInclTax($item);
 
-            if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')
-                && $_item->getWeeeTaxAppliedAmount()
+            if (Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales')
+                && $item->getWeeeTaxAppliedAmount()
             ) {
-                $inclPrice = $_incl + $_item->getWeeeTaxAppliedRowAmount();
+                $inclPrice = $incl + $item->getWeeeTaxAppliedRowAmount();
             } else {
-                $inclPrice = $_incl - $_item->getWeeeTaxRowDisposition();
+                $inclPrice = $incl - $item->getWeeeTaxRowDisposition();
             }
             $inclPrice = $this->_formatPrice($inclPrice);
 
             $subtotalXmlObj->addAttribute('including_tax', $subtotalXmlObj->escapeXml($inclPrice));
         }
 
-        if (Mage::helper('weee')->getApplied($_item)) {
+        if (Mage::helper('weee')->getApplied($item)) {
             $this->_addWeeeToXmlObj($subtotalXmlObj, true);
         }
 
@@ -136,43 +338,38 @@ protected function _formatPrice($price)
      */
     protected function _addPriceToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $productXmlObj)
     {
-        $_item = $this->getItem();
+        $item = $this->getItem();
         $priceXmlObj = $productXmlObj->addCustomChild('price');
 
-        if ($this->helper('tax')->displayCartPriceExclTax()
-            || $this->helper('tax')->displayCartBothPrices()
-        ) {
-            if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')
-                && $_item->getWeeeTaxAppliedAmount()
+        if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()) {
+            if (Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales')
+                && $item->getWeeeTaxAppliedAmount()
             ) {
-                $exclPrice = $_item->getCalculationPrice() + $_item->getWeeeTaxAppliedAmount()
-                    + $_item->getWeeeTaxDisposition();
+                $exclPrice = $item->getCalculationPrice() + $item->getWeeeTaxAppliedAmount()
+                    + $item->getWeeeTaxDisposition();
             } else {
-                $exclPrice = $_item->getCalculationPrice();
+                $exclPrice = $item->getCalculationPrice();
             }
             $exclPrice = $this->_formatPrice($exclPrice);
-
             $priceXmlObj->addAttribute('excluding_tax', $priceXmlObj->escapeXml($exclPrice));
         }
 
-        if ($this->helper('tax')->displayCartPriceInclTax()
-            || $this->helper('tax')->displayCartBothPrices()
-        ) {
-            $_incl = $this->helper('checkout')->getPriceInclTax($_item);
+        if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()) {
+            $incl = $this->helper('checkout')->getPriceInclTax($item);
 
-            if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')
-                && $_item->getWeeeTaxAppliedAmount()
+            if (Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales')
+                && $item->getWeeeTaxAppliedAmount()
             ) {
-                $inclPrice = $_incl + $_item->getWeeeTaxAppliedAmount();
+                $inclPrice = $incl + $item->getWeeeTaxAppliedAmount();
             } else {
-                $inclPrice = $_incl - $_item->getWeeeTaxDisposition();
+                $inclPrice = $incl - $item->getWeeeTaxDisposition();
             }
             $inclPrice = $this->_formatPrice($inclPrice);
 
             $priceXmlObj->addAttribute('including_tax', $priceXmlObj->escapeXml($inclPrice));
         }
 
-        if (Mage::helper('weee')->getApplied($_item)) {
+        if (Mage::helper('weee')->getApplied($item)) {
             $this->_addWeeeToXmlObj($priceXmlObj);
         }
 
@@ -188,19 +385,19 @@ protected function _addPriceToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $pr
      */
     protected function _addWeeeToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $priceXmlObj, $subtotalFlag = false)
     {
-        $_item = $this->getItem();
+        $item = $this->getItem();
         $weeeXmlObj = $priceXmlObj->addCustomChild('weee');
 
         if ($subtotalFlag) {
-            $_incl = $this->helper('checkout')->getSubtotalInclTax($_item);
+            $incl = $this->helper('checkout')->getSubtotalInclTax($item);
         } else {
-            $_incl = $this->helper('checkout')->getPriceInclTax($_item);
+            $incl = $this->helper('checkout')->getPriceInclTax($item);
         }
 
-        $typeOfDisplay2 = Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales');
+        $typeOfDisplay2 = Mage::helper('weee')->typeOfDisplay($item, 2, 'sales');
 
-        if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()) {
-            foreach (Mage::helper('weee')->getApplied($_item) as $tax) {
+        if (Mage::helper('weee')->typeOfDisplay($item, 1, 'sales') && $item->getWeeeTaxAppliedAmount()) {
+            foreach (Mage::helper('weee')->getApplied($item) as $tax) {
 
                 if ($subtotalFlag) {
                     $amount = $tax['row_amount'];
@@ -209,14 +406,13 @@ protected function _addWeeeToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $pri
                 }
 
                 $weeeXmlObj->addCustomChild('item', null, array(
-                    'name'      => $tax['title'],
-                    'amount'    => $this->_formatPrice($amount)
+                    'name' => $tax['title'], 'amount' => $this->_formatPrice($amount)
                 ));
             }
-        } elseif ($_item->getWeeeTaxAppliedAmount()
-            && ($typeOfDisplay2 || Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales'))
+        } elseif ($item->getWeeeTaxAppliedAmount()
+            && ($typeOfDisplay2 || Mage::helper('weee')->typeOfDisplay($item, 4, 'sales'))
         ) {
-            foreach (Mage::helper('weee')->getApplied($_item) as $tax) {
+            foreach (Mage::helper('weee')->getApplied($item) as $tax) {
                 if ($subtotalFlag) {
                     $amount = $tax['row_amount_incl_tax'];
                 } else {
@@ -224,30 +420,29 @@ protected function _addWeeeToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $pri
                 }
 
                 $weeeXmlObj->addCustomChild('item', null, array(
-                    'name'      => $tax['title'],
-                    'amount'    => $this->_formatPrice($amount)
+                    'name' => $tax['title'], 'amount' => $this->_formatPrice($amount)
                 ));
             }
         }
 
-        if ($typeOfDisplay2 && $_item->getWeeeTaxAppliedAmount()) {
+        if ($typeOfDisplay2 && $item->getWeeeTaxAppliedAmount()) {
             if ($subtotalFlag) {
-                $totalExcl = $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount()
-                    + $_item->getWeeeTaxRowDisposition();
+                $totalExcl = $item->getRowTotal() + $item->getWeeeTaxAppliedRowAmount()
+                    + $item->getWeeeTaxRowDisposition();
             } else {
-                $totalExcl = $_item->getCalculationPrice() + $_item->getWeeeTaxAppliedAmount()
-                    + $_item->getWeeeTaxDisposition();
+                $totalExcl = $item->getCalculationPrice() + $item->getWeeeTaxAppliedAmount()
+                    + $item->getWeeeTaxDisposition();
             }
 
             $totalExcl = $this->_formatPrice($totalExcl);
             $priceXmlObj->addAttribute('total_excluding_tax', $priceXmlObj->escapeXml($totalExcl));
         }
 
-        if ($typeOfDisplay2 && $_item->getWeeeTaxAppliedAmount()) {
+        if ($typeOfDisplay2 && $item->getWeeeTaxAppliedAmount()) {
             if ($subtotalFlag) {
-                $totalIncl = $_incl + $_item->getWeeeTaxAppliedRowAmount();
+                $totalIncl = $incl + $item->getWeeeTaxAppliedRowAmount();
             } else {
-                $totalIncl = $_incl + $_item->getWeeeTaxAppliedAmount();
+                $totalIncl = $incl + $item->getWeeeTaxAppliedAmount();
             }
 
             $totalIncl = $this->_formatPrice($totalIncl);
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Items.php b/app/code/core/Mage/XmlConnect/Block/Cart/Items.php
new file mode 100644
index 00000000000..04154f4cb46
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Items.php
@@ -0,0 +1,254 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Shopping cart items renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Cart_Items extends Mage_Checkout_Block_Cart_Abstract
+{
+    /**
+     * Add product block to cart
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObject
+     * @param Mage_Sales_Model_Quote $quote
+     * @return null
+     */
+    public function addCartProductsToXmlObj($xmlObject, $quote)
+    {
+        $productSmallImageSize = Mage::getModel('xmlconnect/images')->getImageLimitParam('content/product_small');
+        $products = $xmlObject->addCustomChild('products');
+        /* @var $item Mage_Sales_Model_Quote_Item */
+        foreach ($this->getItems() as $item) {
+            $type = $item->getProductType();
+            $renderer = $this->getItemRenderer($type)->setItem($item);
+            /**
+             * General information
+             */
+            $itemXml = $products->addCustomChild('item', null, array('entity_id' => $item->getProduct()->getId()));
+            $itemXml->addCustomChild('entity_type', $type);
+            $itemXml->addCustomChild('item_id', $item->getId());
+            $itemXml->addCustomChild('name', $xmlObject->escapeXml($renderer->getProductName()));
+            $itemXml->addCustomChild('code', 'cart[' . $item->getId() . '][qty]');
+            $itemXml->addCustomChild('qty', $renderer->getQty());
+            $icon = $renderer->getProductThumbnail()->resize($productSmallImageSize);
+            $iconXml = $itemXml->addChild('icon', $icon);
+            $iconXml->addAttribute('modification_time', filemtime($icon->getNewFile()));
+
+            /**
+             * Price
+             */
+            $pricesXmlObj = $itemXml->addCustomChild('price_list');
+            $exclPrice = $inclPrice = 0;
+            if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()) {
+                if (Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales')
+                    && $item->getWeeeTaxAppliedAmount()
+                ) {
+                    $exclPrice = $item->getCalculationPrice() + $item->getWeeeTaxAppliedAmount()
+                        + $item->getWeeeTaxDisposition();
+                } else {
+                    $exclPrice = $item->getCalculationPrice();
+                }
+            }
+            if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()) {
+                $incl = $this->helper('checkout')->getPriceInclTax($item);
+                if (Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales')
+                    && $item->getWeeeTaxAppliedAmount()
+                ) {
+                    $inclPrice = $incl + $item->getWeeeTaxAppliedAmount();
+                } else {
+                    $inclPrice = $incl - $item->getWeeeTaxDisposition();
+                }
+            }
+            $exclPrice = Mage::helper('xmlconnect')->formatPriceForXml($exclPrice);
+            $paypalPrice = Mage::helper('xmlconnect')->formatPriceForXml($item->getCalculationPrice());
+            $formattedExclPrice = $quote->getStore()->formatPrice($exclPrice, false);
+            $inclPrice = Mage::helper('xmlconnect')->formatPriceForXml($inclPrice);
+            $formattedInclPrice = $quote->getStore()->formatPrice($inclPrice, false);
+
+            $priceXmlObj = $pricesXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+
+            if ($this->helper('tax')->displayCartBothPrices()) {
+                $priceXmlObj->addCustomChild('price', $exclPrice, array(
+                    'id' => 'excluding_tax',
+                    'label' => $this->__('Excl. Tax'),
+                    'formatted_value' => $formattedExclPrice
+                ));
+
+                $priceXmlObj->addCustomChild('price', $inclPrice, array(
+                    'id' => 'including_tax',
+                    'label' => $this->__('Incl. Tax'),
+                    'formatted_value' => $formattedInclPrice
+                ));
+            } else {
+                if ($this->helper('tax')->displayCartPriceExclTax()) {
+                    $priceXmlObj->addCustomChild('price', $exclPrice, array(
+                        'id' => 'regular',
+                        'label' => $this->__('Unit Price'),
+                        'formatted_value' => $formattedExclPrice
+                    ));
+                }
+                if ($this->helper('tax')->displayCartPriceInclTax()) {
+                    $priceXmlObj->addCustomChild('price', $inclPrice, array(
+                        'id' => 'regular',
+                        'label' => $this->__('Unit Price'),
+                        'formatted_value' => $formattedInclPrice
+                    ));
+                }
+            }
+
+            /**
+             * Info for paypal MEP if it's enabled
+             */
+            $appConfig = Mage::helper('xmlconnect')->getApplication()->loadConfiguration()->getRenderConf();
+            $isMepActive = $appConfig['paypal']['isActive'];
+
+            $paypalMepIsAvailable = Mage::getModel('xmlconnect/payment_method_paypal_mep')->isAvailable(null);
+            if ($paypalMepIsAvailable && $isMepActive) {
+                $paypalPriceXmlObj = $pricesXmlObj->addCustomChild('prices', null, array('id' => 'paypal'));
+
+                $paypalPriceXmlObj->addCustomChild('price', $paypalPrice, array(
+                    'id' => 'regular',
+                    'label' => $this->__('Unit Price'),
+                    'formatted_value' => $quote->getStore()->formatPrice($paypalPrice, false)
+                ));
+
+                $paypalSubtotalPrice = Mage::helper('xmlconnect')->formatPriceForXml($item->getRowTotal());
+                $paypalPriceXmlObj->addCustomChild('price', $paypalSubtotalPrice, array(
+                    'id' => 'subtotal',
+                    'label' => $this->__('Subtotal'),
+                    'formatted_value' => $quote->getStore()->formatPrice($paypalSubtotalPrice, false)
+                ));
+            }
+
+            /**
+             * Subtotal
+             */
+            $subtotalExclTax = $subtotalInclTax = 0;
+            if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()) {
+                if (Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales')
+                    && $item->getWeeeTaxAppliedAmount()
+                ) {
+                    $subtotalExclTax = $item->getRowTotal() + $item->getWeeeTaxAppliedRowAmount()
+                        + $item->getWeeeTaxRowDisposition();
+                } else {
+                     $subtotalExclTax = $item->getRowTotal();
+                }
+            }
+            if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()) {
+                $incl = $this->helper('checkout')->getSubtotalInclTax($item);
+                if (Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales')
+                    && $item->getWeeeTaxAppliedAmount()
+                ) {
+                    $subtotalInclTax = $incl + $item->getWeeeTaxAppliedRowAmount();
+                } else {
+                    $subtotalInclTax = $incl - $item->getWeeeTaxRowDisposition();
+                }
+            }
+
+            $subtotalExclTax = Mage::helper('xmlconnect')->formatPriceForXml($subtotalExclTax);
+            $formattedSubtotalExcl = $quote->getStore()->formatPrice($subtotalExclTax, false);
+
+            $subtotalInclTax = Mage::helper('xmlconnect')->formatPriceForXml($subtotalInclTax);
+            $formattedSubtotalIncl = $quote->getStore()->formatPrice($subtotalInclTax, false);
+
+            $priceXmlObj = $pricesXmlObj->addCustomChild('prices', null, array('id' => 'subtotal'));
+
+            if ($this->helper('tax')->displayCartBothPrices()) {
+                $priceXmlObj->addCustomChild('price', $subtotalExclTax, array(
+                    'id' => 'excluding_tax',
+                    'label' => $this->__('Subtotal Excl. Tax'),
+                    'formatted_value' => $formattedSubtotalExcl
+                ));
+
+                $priceXmlObj->addCustomChild('price', $subtotalInclTax, array(
+                    'id' => 'including_tax',
+                    'label' => $this->__('Subtotal Incl. Tax'),
+                    'formatted_value' => $formattedSubtotalIncl
+                ));
+            } else {
+                if ($this->helper('tax')->displayCartPriceExclTax()) {
+                    $priceXmlObj->addCustomChild('price', $subtotalExclTax, array(
+                        'id' => 'regular',
+                        'label' => $this->__('Subtotal'),
+                        'formatted_value' => $formattedSubtotalExcl
+                    ));
+                }
+                if ($this->helper('tax')->displayCartPriceInclTax()) {
+                    $priceXmlObj->addCustomChild('price', $subtotalInclTax, array(
+                        'id' => 'regular',
+                        'label' => $this->__('Subtotal'),
+                        'formatted_value' => $formattedSubtotalIncl
+                    ));
+                }
+            }
+
+            /**
+             * Options list
+             */
+            $options = $renderer->getOptionList();
+            if ($options) {
+                $itemOptionsXml = $itemXml->addCustomChild('options');
+                foreach ($options as $_option) {
+                    $formattedOptionValue = $renderer->getFormatedOptionValue($_option);
+                    $itemOptionsXml->addCustomChild('option', null, array(
+                        'label' => $xmlObject->xmlAttribute($_option['label']),
+                        'text' => $xmlObject->xmlAttribute($formattedOptionValue['value'])
+                    ));
+                }
+            }
+
+            /**
+             * Downloadable products
+             */
+            $links = $renderer->getLinks();
+            if ($links) {
+                $itemOptionsXml = $itemXml->addCustomChild('options', null, array(
+                    'label' => $renderer->getLinksTitle()
+                ));
+                foreach ($links as $link) {
+                    $itemOptionsXml->addCustomChild('option', null, array('label' => $link->getTitle()));
+                }
+            }
+
+            /**
+             * Item messages
+             */
+            $messages = $renderer->getMessages();
+            if ($messages) {
+                $itemMessagesXml = $itemXml->addCustomChild('messages');
+                foreach ($messages as $message) {
+                    $messageXml = $itemMessagesXml->addCustomChild('option');
+                    $messageXml->addCustomChild('type', $message['type']);
+                    $messageXml->addCustomChild('text', $xmlObject->escapeXml($message['text']));
+                }
+            }
+        }
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Details.php b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Details.php
index b2be761c90f..b40243c8ba6 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Details.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Details.php
@@ -42,8 +42,8 @@ class Mage_XmlConnect_Block_Cart_Paypal_Mecl_Details extends Mage_Paypal_Block_E
     public function addDetailsToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $reviewXmlObj)
     {
         $itemsXmlObj = $reviewXmlObj->addChild('ordered_items');
-        foreach ($this->getItems() as $_item) {
-            $this->getItemXml($_item, $itemsXmlObj);
+        foreach ($this->getItems() as $item) {
+            $this->getItemXml($item, $itemsXmlObj);
         }
 
         $reviewXmlObj->appendChild($this->getChild('totals')->setReturnObjectFlag(true)->_toHtml());
@@ -59,10 +59,8 @@ public function addDetailsToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $revi
      * @return Mage_XmlConnect_Model_Simplexml_Element
      */
     public function getItemXml(
-        Mage_Sales_Model_Quote_Item $item,
-        Mage_XmlConnect_Model_Simplexml_Element $reviewXmlObj
-    )
-    {
+        Mage_Sales_Model_Quote_Item $item, Mage_XmlConnect_Model_Simplexml_Element $reviewXmlObj
+    ) {
         $renderer = $this->getItemRenderer($item->getProductType())->setItem($item)->setQuote($this->getQuote());
         return $renderer->addProductToXmlObj($reviewXmlObj);
     }
@@ -78,9 +76,7 @@ public function getItemXml(
     public function addItemRender($productType, $blockType, $template)
     {
         $this->_itemRenders[$productType] = array(
-            'block' => $blockType,
-            'template' => $template,
-            'blockInstance' => null
+            'block' => $blockType, 'template' => $template, 'blockInstance' => null
         );
         return $this;
     }
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/OrderDetails.php b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/OrderDetails.php
new file mode 100644
index 00000000000..292ee2a7618
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/OrderDetails.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * PayPal MECL order details xml renderer
+ *
+ * @category    Mage
+ * @package     Mage_Xmlconnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Cart_Paypal_Mecl_OrderDetails extends Mage_Paypal_Block_Express_Review_Details
+{
+    /**
+     * Add cart details to XML object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $reviewXmlObj
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    public function addDetailsToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $reviewXmlObj)
+    {
+        $itemsXmlObj = $reviewXmlObj->addChild('ordered_items');
+        foreach ($this->getItems() as $item) {
+            $this->getItemXml($item, $itemsXmlObj);
+        }
+
+        $this->getChild('totals')->setCartXmlObject($reviewXmlObj)->_toHtml();
+
+        return $reviewXmlObj;
+    }
+
+    /**
+     * Get item row xml
+     *
+     * @param Mage_Sales_Model_Quote_Item $item
+     * @param Mage_XmlConnect_Model_Simplexml_Element $reviewXmlObj
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    public function getItemXml(
+        Mage_Sales_Model_Quote_Item $item, Mage_XmlConnect_Model_Simplexml_Element $reviewXmlObj
+    ) {
+        $renderer = $this->getItemRenderer($item->getProductType())->setItem($item)->setQuote($this->getQuote());
+        return $renderer->addProductToXmlObj($reviewXmlObj);
+    }
+
+    /**
+     * Add renderer for item product type
+     *
+     * @param string $productType
+     * @param string $blockType
+     * @param string $template
+     * @return Mage_Checkout_Block_Cart_Abstract
+     */
+    public function addItemRender($productType, $blockType, $template)
+    {
+        $this->_itemRenders[$productType] = array(
+            'block' => $blockType, 'template' => $template, 'blockInstance' => null
+        );
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Review.php b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Review.php
index 17547b1b261..74a329e5b1c 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Review.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Review.php
@@ -44,15 +44,14 @@ protected function _toHtml()
         $reviewXmlObj = Mage::getModel('xmlconnect/simplexml_element', '<mecl_cart_details></mecl_cart_details>');
 
         if ($this->getPaypalMessages()) {
-            $reviewXmlObj->addChild('paypal_message', implode(PHP_EOL, $this->getPaypalMessages()));
+            $reviewXmlObj->addChild('paypal_message', implode('\n', $this->getPaypalMessages()));
         }
 
         if ($this->getShippingAddress()) {
-            $reviewXmlObj->addCustomChild(
-                'shipping_address',
-                Mage::helper('xmlconnect')->trimLineBreaks($this->getShippingAddress()->format('text')),
-                array('label' => $this->__('Shipping Address'))
-            );
+            $shipping = Mage::helper('xmlconnect')->trimLineBreaks($this->getShippingAddress()->format('text'));
+            $reviewXmlObj->addCustomChild('shipping_address', $shipping, array(
+                'label' => $this->__('Shipping Address')
+            ));
         }
 
         if ($this->_quote->isVirtual()) {
@@ -78,17 +77,20 @@ protected function _toHtml()
         $reviewXmlObj->addCustomChild('payment_method', $this->escapeHtml($this->getPaymentMethodTitle()), array(
             'label' => $this->__('Payment Method')
         ));
-
-        $reviewXmlObj->addCustomChild(
-            'billing_address',
-            Mage::helper('xmlconnect')->trimLineBreaks($this->getBillingAddress()->format('text')),
-            array(
-                'label'         => $this->__('Billing Address'),
-                'payer_email'   => $this->__('Payer Email: %s', $this->getBillingAddress()->getEmail())
+        $billing = Mage::helper('xmlconnect')->trimLineBreaks($this->getBillingAddress()->format('text'));
+        $reviewXmlObj->addCustomChild('billing_address', $billing, array(
+            'label' => $this->__('Billing Address'),
+            'payer_email' => $this->__('Payer Email: %s', $this->getBillingAddress()->getEmail())
         ));
 
         $this->getChild('details')->addDetailsToXmlObj($reviewXmlObj);
 
+        $agreements = $this->getChildHtml('agreements');
+        if ($agreements) {
+            $agreementsXmlObj = Mage::getModel('xmlconnect/simplexml_element', $agreements);
+            $reviewXmlObj->appendChild($agreementsXmlObj);
+        }
+
         return $reviewXmlObj->asNiceXml();
     }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Shippingmethods.php b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Shippingmethods.php
index 2af5205d776..5d3260a8069 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Shippingmethods.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Shippingmethods.php
@@ -31,9 +31,30 @@
  * @package     Mage_Xmlconnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Cart_Paypal_Mecl_Shippingmethods
-    extends Mage_Paypal_Block_Express_Review
+class Mage_XmlConnect_Block_Cart_Paypal_Mecl_Shippingmethods extends Mage_Paypal_Block_Express_Review
 {
+    /**
+     * Add price details to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObj
+     * @param Mage_Sales_Model_Quote_Address_Rate $rate
+     * @return Mage_XmlConnect_Block_Cart_Paypal_Mecl_Shippingmethods
+     */
+    protected function _addPriceToXmlObj($xmlObj, $rate)
+    {
+        $price = $this->_getShippingPrice($rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax());
+        $incl = $this->_getShippingPrice($rate->getPrice(), true);
+        $renderedInclTax = '';
+        if (($incl != $price) && $this->helper('tax')->displayShippingBothPrices()) {
+            $inclTaxFormat = ' (%s %s)';
+            $renderedInclTax = sprintf($inclTaxFormat, Mage::helper('tax')->__('Incl. Tax'), $incl);
+        }
+        $price .= $renderedInclTax;
+        $xmlObj->addAttribute('price', $rate->getPrice() * 1);
+        $xmlObj->addAttribute('formatted_price', $xmlObj->escapeXml($price));
+        return $this;
+    }
+
     /**
      * Render PayPal MECL shipping method list xml
      *
@@ -43,45 +64,100 @@ protected function _toHtml()
     {
         /** @var $listXmlObj Mage_XmlConnect_Model_Simplexml_Element */
         $methodListXmlObj = Mage::getModel(
-            'xmlconnect/simplexml_element',
-            '<shipping_method_list></shipping_method_list>'
+            'xmlconnect/simplexml_element', '<shipping_method_list></shipping_method_list>'
         );
-
         $methodListXmlObj->addAttribute('label', $this->__('Shipping Method'));
 
-        if ($this->getCanEditShippingMethod() || !$this->getCurrentShippingRate()) {
-            $groups = $this->getShippingRateGroups();
-            if ($groups) {
-                $currentRate = $this->getCurrentShippingRate();
-                foreach ($groups as $code => $rates) {
-                    $rateXmlObj = $this->_addRatesToXmlObj($methodListXmlObj, $code);
-                    foreach ($rates as $rate) {
-                        $rateAttributes = array(
-                            'label' => strip_tags($this->renderShippingRateOption($rate)),
-                            'code' => $this->renderShippingRateValue($rate)
-                        );
-                        if ($currentRate === $rate) {
-                            $rateAttributes += array('selected' => 1);
+        if (Mage::helper('xmlconnect')->checkApiVersion(Mage_XmlConnect_Helper_Data::DEVICE_API_V_23)) {
+            if ($this->getCanEditShippingMethod() || !$this->getCurrentShippingRate()) {
+                $groups = $this->getShippingRateGroups();
+                if ($groups) {
+                    $currentRate = $this->getCurrentShippingRate();
+                    foreach ($groups as $code => $rates) {
+                        $rateListXmlObj = $this->_addRatesToXmlObj($methodListXmlObj, $code);
+                        foreach ($rates as $rate) {
+                            $rateAttributes = array(
+                                'label' => $rate->getMethodTitle(),
+                                'code' => $this->renderShippingRateValue($rate)
+                            );
+                            $rateXmlObj = $rateListXmlObj->addCustomChild('rate', null, $rateAttributes);
+                            if ($rate->getErrorMessage()) {
+                                $rateXmlObj->addChild('error_message', $rateXmlObj->escapeXml(
+                                    $rate->getErrorMessage()
+                                ));
+                            } else {
+                                $this->_addPriceToXmlObj($rateXmlObj, $rate);
+                            }
+                            if ($currentRate === $rate) {
+                                $rateXmlObj->addAttribute('selected', 1);
+                            }
                         }
-                        $rateXmlObj->addCustomChild('rate', null, $rateAttributes);
                     }
+                } else {
+                    $this->_addNoShippingMessage($methodListXmlObj);
                 }
             } else {
-                $message = $this->_quote->isVirtual() ? $this->__('No shipping method required.')
-                    : $this->__('Sorry, no quotes are available for this order at this time.');
-                $methodListXmlObj->addCustomChild('method', null, array('label' => $message));
+                $rateListXmlObj = $this->_addRatesToXmlObj($methodListXmlObj);
+                $rate = $this->getCurrentShippingRate();
+                $rateXmlObj = $rateListXmlObj->addCustomChild('rate', null, array(
+                    'label' => $rate->getMethodTitle(),
+                    'code' => $this->renderShippingRateValue($rate),
+                    'selected' => 1
+                ));
+                $this->_addPriceToXmlObj($rateXmlObj, $rate);
             }
         } else {
-            $rateXmlObj = $this->_addRatesToXmlObj($methodListXmlObj);
-            $rateXmlObj->addCustomChild('rate', null, array(
-                'label' => $this->renderShippingRateOption($this->getCurrentShippingRate()),
-                'selected' => 1
-            ));
+            if ($this->getCanEditShippingMethod() || !$this->getCurrentShippingRate()) {
+                $groups = $this->getShippingRateGroups();
+                if ($groups) {
+                    $currentRate = $this->getCurrentShippingRate();
+                    foreach ($groups as $code => $rates) {
+                        $rateListXmlObj = $this->_addRatesToXmlObj($methodListXmlObj, $code);
+                        foreach ($rates as $rate) {
+                            if ($rate->getErrorMessage()) {
+                                $title = $rate->getErrorMessage();
+                            } else {
+                                $title = $this->renderShippingRateOption($rate);
+                            }
+                            $rateAttributes = array(
+                                'label' => $rateListXmlObj->escapeXml($title),
+                                'code' => $this->renderShippingRateValue($rate)
+                            );
+                            if ($currentRate === $rate) {
+                                $rateAttributes += array('selected' => 1);
+                            }
+                            $rateListXmlObj->addCustomChild('rate', null, $rateAttributes);
+                        }
+                    }
+                } else {
+                    $this->_addNoShippingMessage($methodListXmlObj);
+                }
+            } else {
+                $rateXmlObj = $this->_addRatesToXmlObj($methodListXmlObj);
+                $rateXmlObj->addCustomChild('rate', null, array(
+                    'label' => $this->renderShippingRateOption($this->getCurrentShippingRate()),
+                    'selected' => 1
+                ));
+            }
         }
 
         return $methodListXmlObj->asNiceXml();
     }
 
+    /**
+     * Add message to describe that shipping is not required or not available
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $methodListXmlObj
+     * @return Mage_XmlConnect_Block_Cart_Paypal_Mecl_Shippingmethods
+     */
+    protected function _addNoShippingMessage($methodListXmlObj)
+    {
+        $message = $this->_quote->isVirtual() ? $this->__('No shipping method required.')
+            : $this->__('Sorry, no quotes are available for this order at this time.');
+        $methodListXmlObj->addCustomChild('method', null, array('label' => $message));
+        return $this;
+    }
+
     /**
      * Add cart details to XML object
      *
@@ -89,7 +165,7 @@ protected function _toHtml()
      * @param string $code
      * @return Mage_XmlConnect_Model_Simplexml_Element
      */
-    protected function _addRatesToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $methodListXmlObj, $code = '')
+    protected function _addRatesToXmlObj($methodListXmlObj, $code = '')
     {
         $attributes = $code ? array('label' => $this->getCarrierName($code)) : array();
         return $methodListXmlObj->addCustomChild('method', null, $attributes)->addCustomChild('rates');
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php
index a47933edde5..2baa29a0aae 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php
@@ -59,10 +59,7 @@ protected function _toHtml()
             switch ($code) {
                 case 'subtotal':
                     $subtotal = intval($total->getValueExclTax()) ? $total->getValueExclTax() : $total->getValue();
-                    $paypalTotals->addAttribute(
-                        $code,
-                        Mage::helper('xmlconnect')->formatPriceForXml($subtotal)
-                    );
+                    $paypalTotals->addAttribute($code, Mage::helper('xmlconnect')->formatPriceForXml($subtotal));
                     break;
                 case 'tax':
                     $paypalTotals->addAttribute(
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Totals.php b/app/code/core/Mage/XmlConnect/Block/Cart/Totals.php
index 8ae9270f5a9..e1cb565381f 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart/Totals.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Totals.php
@@ -58,10 +58,7 @@ protected function _toHtml()
                     if ($renderer->displayBoth()) {
                         $title = $this->__('Subtotal (Excl. Tax)');
                         $this->_addTotalDataToXmlObj(
-                            $totalsXmlObj,
-                            $code . '_excl_tax',
-                            $title,
-                            $total->getValueExclTax()
+                            $totalsXmlObj, $code . '_excl_tax', $title, $total->getValueExclTax()
                         );
 
                         $code  = $code . '_incl_tax';
@@ -103,12 +100,12 @@ protected function _toHtml()
                     }
                     continue 2;
                 case 'giftcardaccount':
-                    $_cards = $renderer->getTotal()->getGiftCards();
-                    if (!$_cards) {
-                        $_cards = $renderer->getQuoteGiftCards();
+                    $cards = $renderer->getTotal()->getGiftCards();
+                    if (!$cards) {
+                        $cards = $renderer->getQuoteGiftCards();
                     }
                     if ($renderer->getTotal()->getValue()) {
-                        foreach ($_cards as $cardCode) {
+                        foreach ($cards as $cardCode) {
                             $title = $this->__('Gift Card (%s)', $cardCode['c']);
                             $value = $cardCode['c'];
                             $totalXmlObj = $totalsXmlObj->addChild($code);
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog.php b/app/code/core/Mage/XmlConnect/Block/Catalog.php
index 1ab02e34a40..26266b1952c 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog.php
@@ -31,7 +31,7 @@
  * @package     Mage_Xmlconnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Catalog extends Mage_Core_Block_Template
+class Mage_XmlConnect_Block_Catalog extends Mage_Catalog_Block_Product_List_Toolbar
 {
     /**
      * Limit for product sorting fields to return
@@ -39,22 +39,48 @@ class Mage_XmlConnect_Block_Catalog extends Mage_Core_Block_Template
     const PRODUCT_SORT_FIELDS_NUMBER = 3;
 
     /**
-     * Prefix that used in specifing filters on request
+     * Prefix that used in specifying filters on request
+     *
+     * @deprecated renamed
      */
-    const REQUEST_FILTER_PARAM_REFIX = 'filter_';
+    const REQUEST_FILTER_PARAM_REFIX = self::REQUEST_FILTER_PARAM_PREFIX;
 
     /**
-     * Prefix that used in specifing sort order params on request
+     * Prefix that used in specifying filters on request
+     */
+    const REQUEST_FILTER_PARAM_PREFIX = 'filter_';
+
+    /**
+     * Prefix that used in specifying sort order params on request
+     *
+     * @deprecated renamed
      */
-    const REQUEST_SORT_ORDER_PARAM_REFIX = 'order_';
+    const REQUEST_SORT_ORDER_PARAM_REFIX = self::REQUEST_SORT_ORDER_PARAM_PREFIX;
+
+    /**
+     * Prefix that used in specifying sort order params on request
+     */
+    const REQUEST_SORT_ORDER_PARAM_PREFIX = 'order_';
 
     /**
      * Retrieve product sort fields as xml object
      *
+     * @deprecated method renamed
      * @return Mage_XmlConnect_Model_Simplexml_Element
      */
     public function getProductSortFeildsXmlObject()
     {
+        $this->getProductSortFieldsXmlObject();
+    }
+
+    /**
+     * Retrieve product sort fields as xml object
+     *
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    public function getProductSortFieldsXmlObject()
+    {
+        /** @var $ordersXmlObject Mage_XmlConnect_Model_Simplexml_Element */
         $ordersXmlObject    = Mage::getModel('xmlconnect/simplexml_element', '<orders></orders>');
         /* @var $category Mage_Catalog_Model_Category */
         $category           = Mage::getModel('catalog/category');
@@ -72,4 +98,32 @@ public function getProductSortFeildsXmlObject()
 
         return $ordersXmlObject;
     }
+
+    /**
+     * Retrieve catalog search product sort fields as xml object
+     *
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    public function getSearchProductSortFieldsXmlObject()
+    {
+        /** @var $ordersXmlObject Mage_XmlConnect_Model_Simplexml_Element */
+        $ordersXmlObject    = Mage::getModel('xmlconnect/simplexml_element', '<orders></orders>');
+        /* @var $category Mage_Catalog_Model_Category */
+        $category           = Mage::getModel('catalog/category');
+        $sortOptions        = $category->getAvailableSortByOptions();
+        $sortOptions        = array_slice($sortOptions, 0, self::PRODUCT_SORT_FIELDS_NUMBER);
+        unset($sortOptions['position']);
+        $sortOptions        = array_merge(array('relevance' => $this->__('Relevance')), $sortOptions);
+        $this->setAvailableOrders($sortOptions)->setDefaultDirection('desc')->setSortBy('relevance');
+
+        foreach($this->getAvailableOrders() as $key => $order) {
+            $item = $ordersXmlObject->addChild('item');
+            if ($this->isOrderCurrent($key)) {
+                $item->addAttribute('isDefault', 1);
+            }
+            $item->addChild('code', $key);
+            $item->addChild('name', $ordersXmlObject->escapeXml($order));
+        }
+        return $ordersXmlObject;
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Category.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Category.php
index ce7cc191888..5b33c7f65df 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Category.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Category.php
@@ -43,8 +43,9 @@ protected function _toHtml()
         /** @var $categoryXmlObj Mage_XmlConnect_Model_Simplexml_Element */
         $categoryXmlObj = Mage::getModel('xmlconnect/simplexml_element', '<category></category>');
         $categoryId     = $this->getRequest()->getParam('id', null);
-        if ($categoryId === null) {
-            $categoryId = Mage::app()->getStore()->getRootCategoryId();
+        $rootCategoryId = Mage::app()->getStore()->getRootCategoryId();
+        if (null === $categoryId) {
+            $categoryId = $rootCategoryId;
         }
 
         $productsXmlObj = $productListBlock = false;
@@ -73,10 +74,15 @@ protected function _toHtml()
         // subcategories are exists
         if (sizeof($categoryCollection)) {
             $itemsXmlObj = $categoryXmlObj->addChild('items');
+            $categoryImageSize = Mage::getModel('xmlconnect/images')->getImageLimitParam('content/category');
             foreach ($categoryCollection as $item) {
                 /** @var $item Mage_Catalog_Model_Category */
                 $item = Mage::getModel('catalog/category')->load($item->getId());
 
+                if ($categoryId == $rootCategoryId && !$item->getIncludeInMenu()) {
+                    continue;
+                }
+
                 $itemXmlObj = $itemsXmlObj->addChild('item');
                 $itemXmlObj->addChild('label', $categoryXmlObj->escapeXml($item->getName()));
                 $itemXmlObj->addChild('entity_id', $item->getId());
@@ -85,12 +91,10 @@ protected function _toHtml()
                     $itemXmlObj->addChild('parent_id', $item->getParentId());
                 }
                 $icon = Mage::helper('xmlconnect/catalog_category_image')->initialize($item, 'thumbnail')
-                    ->resize(Mage::helper('xmlconnect/image')->getImageSizeForContent('category'));
+                    ->resize($categoryImageSize);
 
                 $iconXml = $itemXmlObj->addChild('icon', $icon);
-
-                $file = Mage::helper('xmlconnect')->urlToPath($icon);
-                $iconXml->addAttribute('modification_time', filemtime($file));
+                $iconXml->addAttribute('modification_time', filemtime($icon->getNewFile()));
             }
         }
 
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Filters.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Filters.php
index 86a7c1e5150..4fd6dcf72d2 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Filters.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Filters.php
@@ -41,6 +41,7 @@ class Mage_XmlConnect_Block_Catalog_Filters extends Mage_XmlConnect_Block_Catalo
     protected function _toHtml()
     {
         $categoryId         = $this->getRequest()->getParam('category_id', null);
+        /** @var $categoryXmlObj Mage_XmlConnect_Model_Simplexml_Element */
         $categoryXmlObj     = Mage::getModel('xmlconnect/simplexml_element', '<category></category>');
         $filtersCollection  = Mage::getResourceModel('xmlconnect/filter_collection')->setCategoryId($categoryId);
 
@@ -61,7 +62,7 @@ protected function _toHtml()
                 $valueXmlObj->addChild('count', (int)$value->getProductsCount());
             }
         }
-        $categoryXmlObj->appendChild($this->getProductSortFeildsXmlObject());
+        $categoryXmlObj->appendChild($this->getProductSortFieldsXmlObject());
 
         return $categoryXmlObj->asNiceXml();
     }
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product.php
index cfb7e9cc57d..4454cfad0d0 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product.php
@@ -52,23 +52,24 @@ public function productToXmlObject(Mage_Catalog_Model_Product $product, $itemNod
             $description = Mage::helper('xmlconnect')->htmlize($item->xmlentities($product->getDescription()));
             $item->addChild('description', $description);
             $item->addChild('link', $product->getProductUrl());
+            /** @var $imageLimitsModel Mage_XmlConnect_Model_Images */
+            $imageLimitsModel = Mage::getModel('xmlconnect/images');
 
             if ($itemNodeName == 'item') {
-                $imageToResize = Mage::helper('xmlconnect/image')->getImageSizeForContent('product_small');
+                $imageToResize = $imageLimitsModel->getImageLimitParam('content/product_small');
                 $propertyToResizeName = 'small_image';
             } else {
-                $imageToResize = Mage::helper('xmlconnect/image')->getImageSizeForContent('product_big');
+                $imageToResize = $imageLimitsModel->getImageLimitParam('content/product_big');
                 $propertyToResizeName = 'image';
             }
 
-            $icon = clone Mage::helper('catalog/image')->init($product, $propertyToResizeName)->resize($imageToResize);
+            $icon = clone Mage::helper('xmlconnect/catalog_product_image')->init($product, $propertyToResizeName)
+                ->resize($imageToResize);
 
             $iconXml = $item->addChild('icon', $icon);
+            $iconXml->addAttribute('modification_time', filemtime($icon->getNewFile()));
 
-            $file = Mage::helper('xmlconnect')->urlToPath($icon);
-            $iconXml->addAttribute('modification_time', filemtime($file));
-
-            $item->addChild('in_stock', (int)$product->getIsInStock());
+            $item->addChild('in_stock', (int)$product->getStockItem()->getIsInStock());
             $item->addChild('is_salable', (int)$product->isSalable());
             /**
              * By default all products has gallery (because of collection not load gallery attribute)
@@ -87,8 +88,14 @@ public function productToXmlObject(Mage_Catalog_Model_Product $product, $itemNod
             }
             $item->addChild('has_options', (int)$product->getHasOptions());
 
-            if ($minSaleQty = $this->_getMinimalQty($product)) {
-                $item->addChild('min_sale_qty', (int) $minSaleQty);
+            $minSaleQty = null;
+            if ($product->hasPreconfiguredValues()) {
+                $minSaleQty = $product->getPreconfiguredValues()->getData('qty');
+            }
+            $minSaleQty = $minSaleQty ? $minSaleQty : $this->_getMinimalQty($product);
+
+            if ($minSaleQty) {
+                $item->addChild('min_sale_qty', (int)$minSaleQty);
             }
 
             if (!$product->getRatingSummary()) {
@@ -99,8 +106,7 @@ public function productToXmlObject(Mage_Catalog_Model_Product $product, $itemNod
             $item->addChild('reviews_count', $product->getRatingSummary()->getReviewsCount());
 
             if ($this->getChild('product_price')) {
-                $this->getChild('product_price')->setProduct($product)->setProductXmlObj($item)
-                    ->collectProductPrices();
+                $this->getChild('product_price')->setProduct($product)->setProductXmlObj($item)->collectProductPrices();
             }
 
             if ($this->getChild('additional_info')) {
@@ -136,24 +142,28 @@ protected function _getMinimalQty($product)
     protected function _toHtml()
     {
         /** @var $product Mage_Catalog_Model_Product */
-        $product = Mage::getModel('catalog/product')->setStoreId(Mage::app()->getStore()->getId())
-            ->load($this->getRequest()->getParam('id', 0));
-
-        if (!$product) {
-            Mage::throwException($this->__('Selected product is unavailable.'));
+        if ($this->getProduct()) {
+            $product = $this->getProduct();
         } else {
-            $this->setProduct($product);
-            $productXmlObj = $this->productToXmlObject($product, 'product');
-
-            $relatedProductsBlock = $this->getChild('related_products');
-            if ($relatedProductsBlock) {
-                $relatedXmlObj = $relatedProductsBlock->getRelatedProductsXmlObj();
-                $productXmlObj->appendChild($relatedXmlObj);
+            $product = Mage::getModel('catalog/product')->setStoreId(Mage::app()->getStore()->getId())
+                ->load($this->getRequest()->getParam('id', 0));
+            if (!$product) {
+                Mage::throwException($this->__('Selected product is unavailable.'));
+            } else {
+                $this->setProduct($product);
             }
         }
+        /** @var $productXmlObj Mage_XmlConnect_Model_Simplexml_Element */
+        $productXmlObj = $this->productToXmlObject($product, 'product');
+
+        /** @var $relatedProductsBlock Mage_XmlConnect_Block_Catalog_Product_Related */
+        $relatedProductsBlock = $this->getChild('related_products');
+        if ($relatedProductsBlock) {
+            $relatedXmlObj = $relatedProductsBlock->getRelatedProductsXmlObj();
+            $productXmlObj->appendChild($relatedXmlObj);
+        }
 
-        $productOptions = $this->getChild('xmlconnect.catalog.product.options')
-            ->getProductOptionsXmlObject($product);
+        $productOptions = $this->getChild('xmlconnect.catalog.product.options')->getProductOptionsXmlObject($product);
         if ($productOptions instanceof Mage_XmlConnect_Model_Simplexml_Element) {
             $productXmlObj->appendChild($productOptions);
         }
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Attributes.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Attributes.php
index f58be5d7128..a4b5a84a088 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Attributes.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Attributes.php
@@ -53,7 +53,7 @@ public function addAdditionalData(
                     /** @var $attrXmlObject Mage_XmlConnect_Model_Simplexml_Element */
                     $attrXmlObject = $attributesXmlObj->addChild('item');
                     $attrXmlObject->addCustomChild('label', $data['label']);
-                    $attrXmlObject->addCustomChild('value', $attribute);
+                    $attrXmlObject->addCustomChild('value', $attrXmlObject->escapeXml($attribute));
                 }
             }
         }
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Gallery.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Gallery.php
index 4222bbaa107..054afae4ba8 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Gallery.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Gallery.php
@@ -40,43 +40,42 @@ class Mage_XmlConnect_Block_Catalog_Product_Gallery extends Mage_XmlConnect_Bloc
      */
     protected function _toHtml()
     {
-        $productId = $this->getRequest()->getParam('id', null);
-        $product = Mage::getModel('catalog/product')->setStoreId(Mage::app()->getStore()->getId())->load($productId);
+        $product = Mage::getModel('catalog/product')->setStoreId(Mage::app()->getStore()->getId())
+            ->load($this->getProductId());
         $collection = $product->getMediaGalleryImages();
 
         $imagesNode = Mage::getModel('xmlconnect/simplexml_element', '<images></images>');
-        $helper = $this->helper('catalog/image');
+        $productImageHelper = $this->helper('xmlconnect/catalog_product_image');
 
+        /** @var $imageLimitsModel Mage_XmlConnect_Model_Images */
+        $imageLimitsModel = Mage::getModel('xmlconnect/images');
+        $gallerySmallImageSize = $imageLimitsModel->getImageLimitParam('content/product_gallery_small');
+        $galleryBigImageSize = $imageLimitsModel->getImageLimitParam('content/product_gallery_big');
         foreach ($collection as $item) {
             $imageNode = $imagesNode->addChild('image');
 
             /**
              * Big image
              */
-            $bigImage = $helper->init($product, 'image', $item->getFile())->constrainOnly(true)->keepFrame(false)
-                ->resize(Mage::helper('xmlconnect/image')->getImageSizeForContent('product_gallery_big'));
+            $bigImage = $productImageHelper->init($product, 'image', $item->getFile())->constrainOnly(true)
+                ->keepFrame(false)->resize($galleryBigImageSize);
 
             $fileNode = $imageNode->addChild('file');
             $fileNode->addAttribute('type', 'big');
             $fileNode->addAttribute('url', $bigImage);
-
-            $file = Mage::helper('xmlconnect')->urlToPath($bigImage);
-
             $fileNode->addAttribute('id', ($id = $item->getId()) ? (int) $id : 0);
-            $fileNode->addAttribute('modification_time', filemtime($file));
+            $fileNode->addAttribute('modification_time', filemtime($bigImage->getNewFile()));
 
             /**
              * Small image
              */
-            $smallImage = $helper->init($product, 'thumbnail', $item->getFile())->constrainOnly(true)->keepFrame(false)
-                ->resize(Mage::helper('xmlconnect/image')->getImageSizeForContent('product_gallery_small'));
+            $smallImage = $productImageHelper->init($product, 'thumbnail', $item->getFile())->constrainOnly(true)
+                ->keepFrame(false)->resize($gallerySmallImageSize);
 
             $fileNode = $imageNode->addChild('file');
             $fileNode->addAttribute('type', 'small');
             $fileNode->addAttribute('url', $smallImage);
-
-            $file = Mage::helper('xmlconnect')->urlToPath($smallImage);
-            $fileNode->addAttribute('modification_time', filemtime($file));
+            $fileNode->addAttribute('modification_time', filemtime($smallImage->getNewFile()));
         }
         return $imagesNode->asNiceXml();
     }
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice.php
new file mode 100644
index 00000000000..08feb24ebd7
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Item price xml renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Catalog_Product_ItemPrice extends Mage_XmlConnect_Block_Catalog
+{
+    /**
+     * Default product price renderer block factory name
+     *
+     * @var string
+     */
+    protected $_defaultPriceRenderer = 'xmlconnect/catalog_product_itemPrice_default';
+
+    /**
+     * Store supported product price xml renderers based on product types
+     *
+     * @var array
+     */
+    protected $_renderers = array();
+
+    /**
+     * Store already initialized renderers instances
+     *
+     * @var array
+     */
+    protected $_renderersInstances = array();
+
+    /**
+     * Add new product price renderer
+     *
+     * @param string $type
+     * @param string $renderer
+     * @return Mage_XmlConnect_Block_Catalog_Product_ItemPrice
+     */
+    public function addRenderer($type, $renderer)
+    {
+        if (!isset($this->_renderers[$type])) {
+            $this->_renderers[$type] = $renderer;
+        }
+        return $this;
+    }
+
+    /**
+     * Collect product prices to current xml object
+     */
+    public function collectProductPrices()
+    {
+        $product = $this->getProduct();
+        $xmlObject = $this->getProductXmlObj();
+
+        if ($product && $product->getId()) {
+            $type = $product->getTypeId();
+            if (isset($this->_renderers[$type])) {
+                $blockName = $this->_renderers[$type];
+            } else {
+                $blockName = $this->_defaultPriceRenderer;
+            }
+
+            $renderer = $this->getLayout()->getBlock($blockName);
+            if (!$renderer) {
+                $renderer = $this->getLayout()->createBlock($blockName);
+            }
+
+            if ($renderer) {
+                $renderer->collectProductPrices($product, $xmlObject);
+            }
+        }
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Bundle.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Bundle.php
new file mode 100644
index 00000000000..7ab733407b9
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Bundle.php
@@ -0,0 +1,426 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Bundle product price xml renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Catalog_Product_ItemPrice_Bundle extends Mage_Bundle_Block_Catalog_Product_Price
+{
+    /**
+     * Collect product prices to specified item xml object
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @param Mage_XmlConnect_Model_Simplexml_Element $item
+     */
+    public function collectProductPrices(
+        Mage_Catalog_Model_Product $product, Mage_XmlConnect_Model_Simplexml_Element $item
+    ) {
+        $this->setProduct($product)->setDisplayMinimalPrice(true)->setUseLinkForAsLowAs(false);
+
+        $priceListXmlObj = $item->addCustomChild('price_list');
+
+        /** @var $coreHelper Mage_Core_Helper_Data */
+        $coreHelper = $this->helper('core');
+        /** @var $weeeHelper Mage_Weee_Helper_Data */
+        $weeeHelper = $this->helper('weee');
+        /** @var $taxHelper Mage_Tax_Helper_Data */
+        $taxHelper  = $this->helper('tax');
+
+        $tierPrices = $this->_getTierPrices($product);
+
+        if (count($tierPrices) > 0) {
+            $tierPricesTextArray = array();
+            foreach ($tierPrices as $price) {
+                $discount = ' ' . ($price['price'] * 1) . '%';
+                $tierPricesTextArray[] = $this->__('Buy %1$s with %2$s discount each', $price['price_qty'], $discount);
+            }
+            $item->addCustomChild('price_tier', implode(PHP_EOL, $tierPricesTextArray));
+        }
+
+        list($minimalPrice, $maximalPrice) = $product->getPriceModel()->getPrices($product);
+
+        $weeeTaxAmount = 0;
+        $minimalPriceTax = $taxHelper->getPrice($product, $minimalPrice);
+        $minimalPriceInclTax = $taxHelper->getPrice($product, $minimalPrice, true);
+
+        if ($product->getPriceType() == 1) {
+            $weeeTaxAmount = $weeeHelper->getAmount($product);
+            if ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, array(0, 1, 4))) {
+                $minimalPriceTax += $weeeTaxAmount;
+                $minimalPriceInclTax += $weeeTaxAmount;
+            }
+            if ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 2)) {
+                $minimalPriceInclTax += $weeeTaxAmount;
+            }
+
+            if ($weeeHelper->typeOfDisplay($product, array(1, 2, 4))) {
+                $weeeTaxAttributes = $weeeHelper->getProductWeeeAttributesForDisplay($product);
+            }
+        }
+
+        if ($product->getPriceView()) {
+            if ($taxHelper->displayBothPrices()) {
+                $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+                $pricesXmlObj->addCustomChild('price', $minimalPriceTax, array(
+                    'id' => 'as_low_as_excluding_tax',
+                    'label' => $this->__('As Low Excl. Tax'),
+                    'formatted_value' => $coreHelper->currency($minimalPriceTax, true, false)
+                ));
+
+                if ($weeeTaxAmount && $product->getPriceType() == 1
+                    && $weeeHelper->typeOfDisplay($product, array(2, 1, 4))
+                ) {
+                    $priceWeeeXmlObj = $pricesXmlObj->addCustomChild('price', null, array('id' => 'weee'));
+
+                    foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                        if ($weeeHelper->typeOfDisplay($product, array(2, 4))) {
+                            $amount = $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount();
+                        } else {
+                            $amount = $weeeTaxAttribute->getAmount();
+                        }
+
+                        $priceWeeeXmlObj->addCustomChild('item', $amount, array(
+                            'id' => 'weee_tax',
+                            'label' => $weeeTaxAttribute->getName(),
+                            'formatted_value' => $coreHelper->currency($amount, true, false)
+                        ));
+                    }
+                }
+
+                $pricesXmlObj->addCustomChild('price', $minimalPriceInclTax, array(
+                    'id' => 'as_low_as_including_tax',
+                    'label' => $this->__('As Low Incl. Tax'),
+                    'formatted_value' => $coreHelper->currency($minimalPriceInclTax, true, false)
+                ));
+            } else {
+                $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+                $pricesXmlObj->addCustomChild('price', $minimalPriceTax, array(
+                    'id' => 'as_low_as',
+                    'label' => $this->__('As Low As'),
+                    'formatted_value' => $coreHelper->currency($minimalPriceTax, true, false)
+                ));
+
+                if ($weeeTaxAmount && $product->getPriceType() == 1
+                    && $weeeHelper->typeOfDisplay($product, array(2, 1, 4))
+                ) {
+                    $priceWeeeXmlObj = $pricesXmlObj->addCustomChild('price', null, array('id' => 'weee'));
+
+                    foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                        if ($weeeHelper->typeOfDisplay($product, array(2, 4))) {
+                            $amount = $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount();
+                        } else {
+                            $amount = $weeeTaxAttribute->getAmount();
+                        }
+
+                        $priceWeeeXmlObj->addCustomChild('item', $amount, array(
+                            'id' => 'weee_tax',
+                            'label' => $weeeTaxAttribute->getName(),
+                            'formatted_value' => $coreHelper->currency($amount, true, false)
+                        ));
+                    }
+                }
+
+                if ($weeeHelper->typeOfDisplay($product, 2) && $weeeTaxAmount) {
+                    $pricesXmlObj->addCustomChild('price', $minimalPriceInclTax, array(
+                        'id' => 'as_low_as_including_tax',
+                        'label' => $this->__('As Low Incl. Tax'),
+                        'formatted_value' => $coreHelper->currency($minimalPriceInclTax, true, false)
+                    ));
+                }
+            }
+        /**
+         * if ($product->getPriceView()) {
+         */
+        } else {
+            if ($minimalPrice <> $maximalPrice) {
+                if ($taxHelper->displayBothPrices()) {
+                    $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+                    $pricesXmlObj->addCustomChild('price', $minimalPriceTax, array(
+                        'id' => 'from_excluding_tax',
+                        'label' => $this->__('From Excl. Tax'),
+                        'formatted_value' => $coreHelper->currency($minimalPriceTax, true, false)
+                    ));
+
+                    if ($weeeTaxAmount && $product->getPriceType() == 1
+                        && $weeeHelper->typeOfDisplay($product, array(2, 1, 4))
+                    ) {
+                        $priceWeeeXmlObj = $pricesXmlObj->addCustomChild('price', null, array('id' => 'from_weee'));
+
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                            if ($weeeHelper->typeOfDisplay($product, array(2, 4))) {
+                                $amount = $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount();
+                            } else {
+                                $amount = $weeeTaxAttribute->getAmount();
+                            }
+
+                            $priceWeeeXmlObj->addCustomChild('item', $amount, array(
+                                'id' => 'weee_tax',
+                                'label' => $weeeTaxAttribute->getName(),
+                                'formatted_value' => $coreHelper->currency($amount, true, false)
+                            ));
+                        }
+                    }
+
+                    $pricesXmlObj->addCustomChild('price', $minimalPriceInclTax, array(
+                        'id' => 'from_including_tax',
+                        'label' => $this->__('From Incl. Tax'),
+                        'formatted_value' => $coreHelper->currency($minimalPriceInclTax, true, false)
+                    ));
+                } else {
+                    $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+                    $pricesXmlObj->addCustomChild('price', $minimalPriceTax, array(
+                        'id' => 'from',
+                        'label' => $this->__('From'),
+                        'formatted_value' => $coreHelper->currency($minimalPriceTax, true, false)
+                    ));
+
+                    if ($weeeTaxAmount && $product->getPriceType() == 1
+                        && $weeeHelper->typeOfDisplay($product, array(2, 1, 4))
+                    ) {
+                        $priceWeeeXmlObj = $pricesXmlObj->addCustomChild('price', null, array('id' => 'from_weee'));
+
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                            if ($weeeHelper->typeOfDisplay($product, array(2, 4))) {
+                                $amount = $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount();
+                            } else {
+                                $amount = $weeeTaxAttribute->getAmount();
+                            }
+
+                            $priceWeeeXmlObj->addCustomChild('item', $amount, array(
+                                'id' => 'weee_tax',
+                                'label' => $weeeTaxAttribute->getName(),
+                                'formatted_value' => $coreHelper->currency($amount, true, false)
+                            ));
+                        }
+                    }
+
+                    if ($weeeHelper->typeOfDisplay($product, 2) && $weeeTaxAmount) {
+                        $pricesXmlObj->addCustomChild('price', $minimalPriceInclTax, array(
+                            'id' => 'from_including_tax',
+                            'label' => $this->__('From Incl. Tax'),
+                            'formatted_value' => $coreHelper->currency($minimalPriceInclTax, true, false)
+                        ));
+                    }
+                }
+
+                $maximalPriceTax = Mage::helper('tax')->getPrice($product, $maximalPrice);
+                $maximalPriceInclTax = Mage::helper('tax')->getPrice($product, $maximalPrice, true);
+
+                if ($product->getPriceType() == 1) {
+                    if ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, array(0, 1, 4))) {
+                        $maximalPriceTax += $weeeTaxAmount;
+                        $maximalPriceInclTax += $weeeTaxAmount;
+                    }
+                    if ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 2)) {
+                        $maximalPriceInclTax += $weeeTaxAmount;
+                    }
+                }
+
+                if ($taxHelper->displayBothPrices()) {
+                    $pricesXmlObj->addCustomChild('price', $maximalPriceTax, array(
+                        'id' => 'to_excluding_tax',
+                        'label' => $this->__('To Excl. Tax'),
+                        'formatted_value' => $coreHelper->currency($maximalPriceTax, true, false)
+                    ));
+
+                    if ($weeeTaxAmount && $product->getPriceType() == 1
+                        && $weeeHelper->typeOfDisplay($product, array(2, 1, 4))
+                    ) {
+                        $priceWeeeXmlObj = $pricesXmlObj->addCustomChild('price', null, array('id' => 'weee'));
+
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                            if ($weeeHelper->typeOfDisplay($product, array(2, 4))) {
+                                $amount = $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount();
+                            } else {
+                                $amount = $weeeTaxAttribute->getAmount();
+                            }
+
+                            $priceWeeeXmlObj->addCustomChild('item', $amount, array(
+                                'id' => 'weee_tax',
+                                'label' => $weeeTaxAttribute->getName(),
+                                'formatted_value' => $coreHelper->currency($amount, true, false)
+                            ));
+                        }
+                    }
+
+                    $pricesXmlObj->addCustomChild('price', $maximalPriceInclTax, array(
+                        'id' => 'to_including_tax',
+                        'label' => $this->__('To Incl. Tax'),
+                        'formatted_value' => $coreHelper->currency($maximalPriceInclTax, true, false)
+                    ));
+                } else {
+                    $pricesXmlObj->addCustomChild('price', $maximalPriceTax, array(
+                        'id' => 'to',
+                        'label' => $this->__('To'),
+                        'formatted_value' => $coreHelper->currency($maximalPriceTax, true, false)
+                    ));
+
+                    if ($weeeTaxAmount && $product->getPriceType() == 1
+                        && $weeeHelper->typeOfDisplay($product, array(2, 1, 4))
+                    ) {
+                        $priceWeeeXmlObj = $pricesXmlObj->addCustomChild('price', null, array('id' => 'to_weee'));
+
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                            if ($weeeHelper->typeOfDisplay($product, array(2, 4))) {
+                                $amount = $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount();
+                            } else {
+                                $amount = $weeeTaxAttribute->getAmount();
+                            }
+
+                            $priceWeeeXmlObj->addCustomChild('item', $amount, array(
+                                'id' => 'weee_tax',
+                                'label' => $weeeTaxAttribute->getName(),
+                                'formatted_value' => $coreHelper->currency($amount, true, false)
+                            ));
+                        }
+                    }
+
+                    if ($weeeHelper->typeOfDisplay($product, 2) && $weeeTaxAmount) {
+                        $pricesXmlObj->addCustomChild('price', $maximalPriceInclTax, array(
+                            'id' => 'to_including_tax',
+                            'label' => $this->__('To Incl. Tax'),
+                            'formatted_value' => $coreHelper->currency($maximalPriceInclTax, true, false)
+                        ));
+                    }
+                }
+            /**
+             * if ($minimalPrice <> $maximalPrice) {
+             */
+            } else {
+                if ($taxHelper->displayBothPrices()) {
+                    $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+                    $pricesXmlObj->addCustomChild('price', $minimalPriceTax, array(
+                        'id' => 'excluding_tax',
+                        'label' => $this->__('Excl. Tax'),
+                        'formatted_value' => $coreHelper->currency($minimalPriceTax, true, false)
+                    ));
+
+                    if ($weeeTaxAmount && $product->getPriceType() == 1
+                        && $weeeHelper->typeOfDisplay($product, array(2, 1, 4))
+                    ) {
+                        $priceWeeeXmlObj = $item->addCustomChild('price', null, array('id' => 'weee'));
+
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                            if ($weeeHelper->typeOfDisplay($product, array(2, 4))) {
+                                $amount = $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount();
+                            } else {
+                                $amount = $weeeTaxAttribute->getAmount();
+                            }
+
+                            $priceWeeeXmlObj->addCustomChild('item', $amount, array(
+                                'id' => 'weee_tax',
+                                'label' => $weeeTaxAttribute->getName(),
+                                'formatted_value' => $coreHelper->currency($amount, true, false)
+                            ));
+                        }
+                    }
+
+                    $pricesXmlObj->addCustomChild('price', $minimalPriceInclTax, array(
+                        'id' => 'including_tax',
+                        'label' => $this->__('Incl. Tax'),
+                        'formatted_value' => $coreHelper->currency($minimalPriceInclTax, true, false)
+                    ));
+                } else {
+                    $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+                    $pricesXmlObj->addCustomChild('price', $minimalPriceTax, array(
+                        'id' => 'regular',
+                        'label' => $this->__('Regular'),
+                        'formatted_value' => $coreHelper->currency($minimalPriceTax, true, false)
+                    ));
+
+                    if ($weeeTaxAmount && $product->getPriceType() == 1
+                        && $weeeHelper->typeOfDisplay($product, array(2, 1, 4))
+                    ) {
+                        $priceWeeeXmlObj = $item->addCustomChild('price', null, array('id' => 'weee'));
+
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                            if ($weeeHelper->typeOfDisplay($product, array(2, 4))) {
+                                $amount = $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount();
+                            } else {
+                                $amount = $weeeTaxAttribute->getAmount();
+                            }
+
+                            $priceWeeeXmlObj->addCustomChild('item', $amount, array(
+                                'id' => 'weee_tax',
+                                'label' => $weeeTaxAttribute->getName(),
+                                'formatted_value' => $coreHelper->currency($amount, true, false)
+                            ));
+                        }
+                    }
+
+                    if ($weeeHelper->typeOfDisplay($product, 2) && $weeeTaxAmount) {
+                        $pricesXmlObj->addCustomChild('price', $minimalPriceInclTax, array(
+                            'id' => 'including_tax',
+                            'label' => $this->__('Incl. Tax'),
+                            'formatted_value' => $coreHelper->currency($minimalPriceInclTax, true, false)
+                        ));
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Get tier prices (formatted)
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @return array
+     */
+    protected function _getTierPrices($product)
+    {
+        if (null === $product) {
+            return array();
+        }
+        $prices  = $product->getFormatedTierPrice();
+
+        $res = array();
+        if (is_array($prices)) {
+            foreach ($prices as $price) {
+                $price['price_qty'] = $price['price_qty'] * 1;
+                $price['savePercent'] = ceil(100 - $price['price']);
+                $price['formated_price'] = Mage::app()->getStore()->formatPrice(
+                    Mage::app()->getStore()->convertPrice(
+                        Mage::helper('tax')->getPrice($product, $price['website_price'])
+                    ),
+                    false
+                );
+                $price['formated_price_incl_tax'] = Mage::app()->getStore()->formatPrice(
+                    Mage::app()->getStore()->convertPrice(
+                        Mage::helper('tax')->getPrice($product, $price['website_price'], true)
+                    ),
+                    false
+                );
+                $res[] = $price;
+            }
+        }
+
+        return $res;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Default.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Default.php
new file mode 100644
index 00000000000..6e4ce05c59d
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Default.php
@@ -0,0 +1,740 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Default product price xml renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Catalog_Product_ItemPrice_Default extends Mage_Catalog_Block_Product_Price
+{
+    /**
+     * Collect product prices to specified item xml object
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @param Mage_XmlConnect_Model_Simplexml_Element $item
+     */
+    public function collectProductPrices(
+        Mage_Catalog_Model_Product $product, Mage_XmlConnect_Model_Simplexml_Element $item
+    ) {
+        $this->setProduct($product)->setDisplayMinimalPrice(true)->setUseLinkForAsLowAs(false);
+
+        $priceListXmlObj = $item->addCustomChild('price_list');
+        $tierPrices = $this->_getTierPrices($product);
+        if (count($tierPrices) > 0) {
+            $tierPricesTextArray = $item->escapeXml(implode(
+                PHP_EOL, $this->_getTierPricesTextArray($tierPrices, $product)
+            ));
+            $item->addCustomChild('price_tier', $tierPricesTextArray);
+        }
+
+        /** @var $coreHelper Mage_Core_Helper_Data */
+        $coreHelper = $this->helper('core');
+        /** @var $weeeHelper Mage_Weee_Helper_Data */
+        $weeeHelper = $this->helper('weee');
+        /** @var $taxHelper Mage_Tax_Helper_Data */
+        $taxHelper  = $this->helper('tax');
+
+        $simplePricesTax = ($taxHelper->displayPriceIncludingTax() || $taxHelper->displayBothPrices());
+        $minimalPriceValue = $product->getMinimalPrice();
+        $minimalPrice = $taxHelper->getPrice($product, $minimalPriceValue, $simplePricesTax);
+
+        if (!$product->isGrouped()) {
+            $weeeTaxAmount = $weeeHelper->getAmountForDisplay($product);
+            if ($weeeHelper->typeOfDisplay($product, array(1, 2, 4))) {
+                $weeeTaxAmount = $weeeHelper->getAmount($product);
+                $weeeTaxAttributes = $weeeHelper->getProductWeeeAttributesForDisplay($product);
+            }
+
+            $price = $taxHelper->getPrice($product, $product->getPrice());
+            $regularPrice = $taxHelper->getPrice($product, $product->getPrice(), $simplePricesTax);
+            $finalPrice = $taxHelper->getPrice($product, $product->getFinalPrice());
+            $finalPriceInclTax = $taxHelper->getPrice($product, $product->getFinalPrice(), true);
+            $weeeHelper->getPriceDisplayType();
+            if ($finalPrice == $price) {
+                if ($taxHelper->displayBothPrices()) {
+                    /**
+                     * Including
+                     */
+                    if ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 0)) {
+                        $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+
+                        $exclTaxValue = $price + $weeeTaxAmount;
+                        $pricesXmlObj->addCustomChild('price', $exclTaxValue, array(
+                            'id' => 'excluding_tax',
+                            'label' => $this->__('Excl. Tax'),
+                            'formatted_value' => $coreHelper->currency($exclTaxValue, true, false)
+                        ));
+
+                        $inclTaxValue = $finalPriceInclTax + $weeeTaxAmount;
+                        $pricesXmlObj->addCustomChild('price', $inclTaxValue, array(
+                            'id' => 'including_tax',
+                            'label' => $this->__('Incl. Tax'),
+                            'formatted_value' => $coreHelper->currency($inclTaxValue, true, false)
+                        ));
+                    } elseif ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 1)) {
+                        /**
+                         * Including + Weee
+                         */
+                        $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+
+                        $exclTaxValue = $price + $weeeTaxAmount;
+                        $pricesXmlObj->addCustomChild('price', $exclTaxValue, array(
+                            'id' => 'excluding_tax',
+                            'label' => $this->__('Excl. Tax'),
+                            'formatted_value' => $coreHelper->currency($exclTaxValue, true, false)
+                        ));
+
+
+                        $inclTaxValue = $finalPriceInclTax + $weeeTaxAmount;
+                        $pricesXmlObj->addCustomChild('price', $inclTaxValue, array(
+                            'id' => 'including_tax',
+                            'label' => $this->__('Incl. Tax'),
+                            'formatted_value' => $coreHelper->currency($inclTaxValue, true, false)
+                        ));
+
+                        $priceWeeeXmlObj = $pricesXmlObj->addCustomChild('price', null, array('id' => 'weee'));
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                            $priceWeeeXmlObj->addCustomChild('item', $weeeTaxAttribute->getAmount() * 1, array(
+                                'id' => 'weee_tax',
+                                'label' => $weeeTaxAttribute->getName(),
+                                'formatted_value' => $coreHelper->currency($weeeTaxAttribute->getAmount(), true, false)
+                            ));
+                        }
+                    } elseif ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 4)) {
+                        /**
+                         * Including + Weee
+                         */
+                        $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+
+                        $exclTaxValue = $price + $weeeTaxAmount;
+                        $pricesXmlObj->addCustomChild('price', $exclTaxValue, array(
+                            'id' => 'excluding_tax',
+                            'label' => $this->__('Excl. Tax'),
+                            'formatted_value' => $coreHelper->currency($exclTaxValue, true, false)
+                        ));
+
+                        $inclTaxValue = $finalPriceInclTax + $weeeTaxAmount;
+                        $pricesXmlObj->addCustomChild('price', $inclTaxValue, array(
+                            'id' => 'including_tax',
+                            'label' => $this->__('Incl. Tax'),
+                            'formatted_value' => $coreHelper->currency($inclTaxValue, true, false)
+                        ));
+
+                        $priceWeeeXmlObj = $pricesXmlObj->addCustomChild('price', null, array('id' => 'weee'));
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                            $amount = $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount();
+                            $priceWeeeXmlObj->addCustomChild('item', $amount * 1, array(
+                                'id' => 'weee_tax',
+                                'label' => $weeeTaxAttribute->getName(),
+                                'formatted_value' => $coreHelper->currency($amount, true, false)
+                            ));
+                        }
+                    } elseif ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 2)) {
+                        /**
+                         * Excluding + Weee + Final
+                         */
+                        $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+
+                        $pricesXmlObj->addCustomChild('price', $price, array(
+                            'id' => 'excluding_tax',
+                            'label' => $this->__('Excl. Tax'),
+                            'formatted_value' => $coreHelper->currency($price, true, false)
+                        ));
+
+                        $priceWeeeXmlObj = $pricesXmlObj->addCustomChild('price', null, array('id' => 'weee'));
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                            $priceWeeeXmlObj->addCustomChild('item', $weeeTaxAttribute->getAmount() * 1, array(
+                                'id' => 'weee_tax',
+                                'label' => $weeeTaxAttribute->getName(),
+                                'formatted_value' => $coreHelper->currency($weeeTaxAttribute->getAmount(), true, false)
+                            ));
+                        }
+
+                        $inclTaxValue = $finalPriceInclTax + $weeeTaxAmount;
+                        $pricesXmlObj->addCustomChild('price', $inclTaxValue, array(
+                            'id' => 'including_tax',
+                            'label' => $this->__('Incl. Tax'),
+                            'formatted_value' => $coreHelper->currency($inclTaxValue, true, false)
+                        ));
+                    } else {
+                        $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+                        $pricesXmlObj->addCustomChild('price', $price, array(
+                            'id' => 'excluding_tax',
+                            'label' => $this->__('Excl. Tax'),
+                            'formatted_value' => $coreHelper->currency($price, true, false)
+                        ));
+
+                        $pricesXmlObj->addCustomChild('price', $finalPriceInclTax, array(
+                            'id' => 'including_tax',
+                            'label' => $this->__('Incl. Tax'),
+                            'formatted_value' => $coreHelper->currency($finalPriceInclTax, true, false)
+                        ));
+                    }
+                /**
+                 * if ($taxHelper->displayBothPrices()) {
+                 */
+                } else {
+                    /**
+                     * Including
+                     */
+                    if ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 0)) {
+                        $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+                        $pricesXmlObj->addCustomChild('price', $price + $weeeTaxAmount, array(
+                            'id' => 'regular',
+                            'label' => $this->__('Unit Price'),
+                            'formatted_value' => $coreHelper->currency($price + $weeeTaxAmount, true, false)
+                        ));
+                    } elseif ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 1)) {
+                        /**
+                         * Including + Weee
+                         */
+                        $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+                        $pricesXmlObj->addCustomChild('price', $price + $weeeTaxAmount, array(
+                            'id' => 'regular',
+                            'label' => $this->__('Unit Price'),
+                            'formatted_value' => $coreHelper->currency($price + $weeeTaxAmount, true, false)
+                        ));
+
+                        $priceWeeeXmlObj = $pricesXmlObj->addCustomChild('price', null, array('id' => 'weee'));
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                            $priceWeeeXmlObj->addCustomChild('item', $weeeTaxAttribute->getAmount() * 1, array(
+                                'id' => 'weee_tax',
+                                'label' => $weeeTaxAttribute->getName(),
+                                'formatted_value' => $coreHelper->currency($weeeTaxAttribute->getAmount(), true, false)
+                            ));
+                        }
+                    } elseif ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 4)) {
+                        /**
+                         * Including + Weee
+                         */
+                        $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+                        $pricesXmlObj->addCustomChild('price', $price + $weeeTaxAmount, array(
+                            'id' => 'regular',
+                            'label' => $this->__('Unit Price'),
+                            'formatted_value' => $coreHelper->currency($price + $weeeTaxAmount, true, false)
+                        ));
+
+                        $priceWeeeXmlObj = $pricesXmlObj->addCustomChild('price', null, array('id' => 'weee'));
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                            $amount = $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount();
+                            $priceWeeeXmlObj->addCustomChild('item', $amount * 1, array(
+                                'id' => 'weee_tax',
+                                'label' => $weeeTaxAttribute->getName(),
+                                'formatted_value' => $coreHelper->currency($amount, true, false)
+                            ));
+                        }
+                    } elseif ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 2)) {
+                        /**
+                         * Excluding + Weee + Final
+                         */
+                        $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+                        $pricesXmlObj->addCustomChild('price', $price, array(
+                            'id' => 'regular',
+                            'label' => $this->__('Unit Price'),
+                            'formatted_value' => $coreHelper->currency($price, true, false)
+                        ));
+
+                        $priceWeeeXmlObj = $pricesXmlObj->addCustomChild('price', null, array('id' => 'weee'));
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                            $priceWeeeXmlObj->addCustomChild('item', $weeeTaxAttribute->getAmount() * 1, array(
+                                'id' => 'weee_tax',
+                                'label' => $weeeTaxAttribute->getName(),
+                                'formatted_value' => $coreHelper->currency($weeeTaxAttribute->getAmount(), true, false)
+                            ));
+                        }
+
+                        $pricesXmlObj->addCustomChild('price', $price + $weeeTaxAmount, array(
+                            'id' => 'including_tax',
+                            'label' => $this->__('Incl. Tax'),
+                            'formatted_value' => $coreHelper->currency($price + $weeeTaxAmount, true, false)
+                        ));
+                    } else {
+                        $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+                        $pricesXmlObj->addCustomChild('price', $price, array(
+                            'id' => 'regular',
+                            'label' => $this->__('Unit Price'),
+                            'formatted_value' => $coreHelper->currency($price, true, false)
+                        ));
+                    }
+                }
+            /**
+             * if ($finalPrice == $price) {
+             */
+            } else {
+                $originalWeeeTaxAmount = $weeeHelper->getOriginalAmount($product);
+                /**
+                 * Including
+                 */
+                if ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 0)) {
+                    $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+
+                    $unitPrice = $regularPrice + $originalWeeeTaxAmount;
+                    $pricesXmlObj->addCustomChild('price', $unitPrice, array(
+                        'id' => 'regular',
+                        'label' => $this->__('Unit Price'),
+                        'formatted_value' => $coreHelper->currency($unitPrice, true, false)
+                    ));
+                    if ($taxHelper->displayBothPrices()) {
+                        $pricesXmlObj->addCustomChild('price', $finalPrice + $weeeTaxAmount, array(
+                            'id' => 'special_excluding_tax',
+                            'label' => $this->__('Special Excl. Tax'),
+                            'formatted_value' => $coreHelper->currency($finalPrice + $weeeTaxAmount, true, false)
+                        ));
+
+                        $specialIncludingTax = $finalPriceInclTax + $weeeTaxAmount;
+                        $pricesXmlObj->addCustomChild('price', $specialIncludingTax, array(
+                            'id' => 'special_including_tax',
+                            'label' => $this->__('Special Incl. Tax'),
+                            'formatted_value' => $coreHelper->currency($specialIncludingTax, true, false)
+                        ));
+                    } else {
+                        $pricesXmlObj->addCustomChild('price', $finalPrice + $weeeTaxAmount, array(
+                            'id' => 'special',
+                            'label' => $this->__('Special'),
+                            'formatted_value' => $coreHelper->currency($finalPrice + $weeeTaxAmount, true, false)
+                        ));
+                    }
+                } elseif ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 1)) {
+                    /**
+                     * Including + Weee
+                     */
+                    $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+
+                    $unitPrice = $regularPrice + $originalWeeeTaxAmount;
+                    $pricesXmlObj->addCustomChild('price', $unitPrice, array(
+                        'id' => 'regular',
+                        'label' => $this->__('Unit Price'),
+                        'formatted_value' => $coreHelper->currency($unitPrice, true, false)
+                    ));
+
+                    $pricesXmlObj->addCustomChild('price', $finalPrice + $weeeTaxAmount, array(
+                        'id' => 'special_excluding_tax',
+                        'label' => $this->__('Special Excl. Tax'),
+                        'formatted_value' => $coreHelper->currency($finalPrice + $weeeTaxAmount, true, false)
+                    ));
+
+                    $priceWeeeXmlObj = $pricesXmlObj->addCustomChild('prices', null, array('id' => 'weee'));
+                    foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                        $priceWeeeXmlObj->addCustomChild('item', $weeeTaxAttribute->getAmount() * 1, array(
+                            'id' => 'weee_tax',
+                            'label' => $weeeTaxAttribute->getName(),
+                            'formatted_value' => $coreHelper->currency($weeeTaxAttribute->getAmount(), true, false)
+                        ));
+                    }
+
+                    $pricesXmlObj->addCustomChild('price', $finalPriceInclTax + $weeeTaxAmount, array(
+                        'id' => 'special_including_tax',
+                        'label' => $this->__('Special Incl. Tax'),
+                        'formatted_value' => $coreHelper->currency($finalPriceInclTax + $weeeTaxAmount, true, false)
+                    ));
+                } elseif ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 4)) {
+                    /**
+                     * Including + Weee
+                     */
+                    $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+
+                    $unitPrice = $regularPrice + $originalWeeeTaxAmount;
+                    $pricesXmlObj->addCustomChild('price', $unitPrice, array(
+                        'id' => 'regular',
+                        'label' => $this->__('Unit Price'),
+                        'formatted_value' => $coreHelper->currency($unitPrice, true, false)
+                    ));
+
+                    $pricesXmlObj->addCustomChild('price', $finalPrice + $weeeTaxAmount, array(
+                        'id' => 'special_excluding_tax',
+                        'label' => $this->__('Special Excl. Tax'),
+                        'formatted_value' => $coreHelper->currency($finalPrice + $weeeTaxAmount, true, false)
+                    ));
+
+                    $priceWeeeXmlObj = $pricesXmlObj->addCustomChild('price', null, array('id' => 'weee'));
+                    foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                        $amount = $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount();
+                        $priceWeeeXmlObj->addCustomChild('item', $amount * 1, array(
+                            'id' => 'weee_tax',
+                            'label' => $weeeTaxAttribute->getName(),
+                            'formatted_value' => $coreHelper->currency($amount, true, false)
+                        ));
+                    }
+
+                    $pricesXmlObj->addCustomChild('price', $finalPriceInclTax + $weeeTaxAmount, array(
+                        'id' => 'special_including_tax',
+                        'label' => $this->__('Special Incl. Tax'),
+                        'formatted_value' => $coreHelper->currency($finalPriceInclTax + $weeeTaxAmount, true, false)
+                    ));
+                } elseif ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 2)) {
+                    /**
+                     * Excluding + Weee + Final
+                     */
+                    $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+                    $pricesXmlObj->addCustomChild('price', $regularPrice, array(
+                        'id' => 'regular',
+                        'label' => $this->__('Unit Price'),
+                        'formatted_value' => $coreHelper->currency($regularPrice, true, false)
+                    ));
+
+                    $pricesXmlObj->addCustomChild('price', $finalPrice, array(
+                        'id' => 'special_excluding_tax',
+                        'label' => $this->__('Special Excl. Tax'),
+                        'formatted_value' => $coreHelper->currency($finalPrice, true, false)
+                    ));
+
+                    $priceWeeeXmlObj = $pricesXmlObj->addCustomChild('price', null, array('id' => 'weee'));
+                    foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                        $priceWeeeXmlObj->addCustomChild('item', $weeeTaxAttribute->getAmount() * 1, array(
+                            'id' => 'weee_tax',
+                            'label' => $weeeTaxAttribute->getName(),
+                            'formatted_value' => $coreHelper->currency($weeeTaxAttribute->getAmount(), true, false)
+                        ));
+                    }
+
+                    $pricesXmlObj->addCustomChild('price', $finalPriceInclTax + $weeeTaxAmount, array(
+                        'id' => 'special_including_tax',
+                        'label' => $this->__('Special Incl. Tax'),
+                        'formatted_value' => $coreHelper->currency($finalPriceInclTax + $weeeTaxAmount, true, false)
+                    ));
+                } else {
+                    /**
+                     * Excluding
+                     */
+                    $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+                    $pricesXmlObj->addCustomChild('price', $regularPrice, array(
+                        'id' => 'regular',
+                        'label' => $this->__('Unit Price'),
+                        'formatted_value' => $coreHelper->currency($regularPrice, true, false)
+                    ));
+
+                    if ($taxHelper->displayBothPrices()) {
+                        $pricesXmlObj->addCustomChild('price', $finalPrice, array(
+                            'id' => 'special_excluding_tax',
+                            'label' => $this->__('Special Excl. Tax'),
+                            'formatted_value' => $coreHelper->currency($finalPrice, true, false)
+                        ));
+
+                        $pricesXmlObj->addCustomChild('price', $finalPriceInclTax, array(
+                            'id' => 'special_including_tax',
+                            'label' => $this->__('Special Incl. Tax'),
+                            'formatted_value' => $coreHelper->currency($finalPriceInclTax, true, false)
+                        ));
+                    } else {
+                        $pricesXmlObj->addCustomChild('price', $finalPrice, array(
+                            'id' => 'special',
+                            'label' => $this->__('Special'),
+                            'formatted_value' => $coreHelper->currency($finalPrice, true, false)
+                        ));
+                    }
+                }
+            }
+
+            if ($this->getDisplayMinimalPrice() && $minimalPriceValue
+                && $minimalPriceValue < $product->getFinalPrice()
+            ) {
+                $minimalPriceDisplayValue = $minimalPrice;
+
+                if ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, array(0, 1, 4))) {
+                    $minimalPriceDisplayValue = $minimalPrice + $weeeTaxAmount;
+                }
+
+                if (!$this->getUseLinkForAsLowAs()) {
+                    $pricesXmlObj->addCustomChild('price', $minimalPriceDisplayValue, array(
+                        'id' => 'as_low_as',
+                        'label' => $this->__('As Low As'),
+                        'formatted_value' => $coreHelper->currency($minimalPriceDisplayValue, true, false)
+                    ));
+                }
+            }
+        /**
+         * if (!$product->isGrouped()) {
+         */
+        } else {
+            $exclTax = $taxHelper->getPrice($product, $minimalPriceValue, null);
+            $inclTax = $taxHelper->getPrice($product, $minimalPriceValue, true);
+
+            if ($this->getDisplayMinimalPrice() && $minimalPriceValue) {
+                if ($taxHelper->displayBothPrices()) {
+                    $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+                    $pricesXmlObj->addCustomChild('price', $exclTax, array(
+                        'id' => 'starting_at_excluding_tax',
+                        'label' => $this->__('Starting At Excl. Tax'),
+                        'formatted_value' => $coreHelper->currency($exclTax, true, false)
+                    ));
+
+                    $pricesXmlObj->addCustomChild('price', $inclTax, array(
+                        'id' => 'starting_at_including_tax',
+                        'label' => $this->__('Starting At Incl. Tax'),
+                        'formatted_value' => $coreHelper->currency($inclTax, true, false)
+                    ));
+                } else {
+                    $showPrice = $inclTax;
+                    if (!$taxHelper->displayPriceIncludingTax()) {
+                        $showPrice = $exclTax;
+                    }
+
+                    $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+                    $pricesXmlObj->addCustomChild('price', $showPrice, array(
+                        'id' => 'starting_at',
+                        'label' => $this->__('Starting At'),
+                        'formatted_value' => $coreHelper->currency($showPrice, true, false)
+                    ));
+                }
+            }
+        }
+    }
+
+    /**
+     * Get tier prices (formatted)
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @return array
+     */
+    protected function _getTierPrices(Mage_Catalog_Model_Product $product)
+    {
+        if (null === $product) {
+            return array();
+        }
+        $prices  = $product->getFormatedTierPrice();
+
+        $res = array();
+        if (is_array($prices)) {
+            foreach ($prices as $price) {
+                $price['price_qty'] = $price['price_qty']*1;
+                if ($product->getPrice() != $product->getFinalPrice()) {
+                    if ($price['price'] < $product->getFinalPrice()) {
+                        $price['savePercent'] = ceil(100 - ((100 / $product->getFinalPrice()) * $price['price']));
+                        $price['formated_price'] = Mage::app()->getStore()->formatPrice(
+                            Mage::app()->getStore()->convertPrice(
+                                Mage::helper('tax')->getPrice($product, $price['website_price'])
+                            ),
+                            false
+                        );
+                        $price['formated_price_incl_tax'] = Mage::app()->getStore()->formatPrice(
+                            Mage::app()->getStore()->convertPrice(Mage::helper('tax')->getPrice(
+                                $product, $price['website_price'], true
+                            )),
+                            false
+                        );
+                        $res[] = $price;
+                    }
+                } else {
+                    if ($price['price'] < $product->getPrice()) {
+                        $price['savePercent'] = ceil(100 - ((100 / $product->getPrice()) * $price['price']));
+                        $price['formated_price'] = Mage::app()->getStore()->formatPrice(
+                            Mage::app()->getStore()->convertPrice(Mage::helper('tax')->getPrice(
+                                $product, $price['website_price']
+                            )),
+                            false
+                        );
+                        $price['formated_price_incl_tax'] = Mage::app()->getStore()->formatPrice(
+                            Mage::app()->getStore()->convertPrice(Mage::helper('tax')->getPrice(
+                                $product, $price['website_price'], true
+                            )),
+                            false
+                        );
+                        $res[] = $price;
+                    }
+                }
+            }
+        }
+
+        return $res;
+    }
+
+    /**
+     * Get tier prices (formatted) as array of strings
+     *
+     * @param array $tierPrices
+     * @param Mage_Catalog_Model_Product $product
+     * @return array
+     */
+    protected function _getTierPricesTextArray($tierPrices, $product)
+    {
+
+        $pricesArray = array();
+        if (Mage::helper('weee')->typeOfDisplay($product, array(1, 2, 4))) {
+            $weeeTaxAttributes = Mage::helper('weee')->getProductWeeeAttributesForDisplay($product);
+        }
+
+        if ($product->isGrouped()) {
+            $tierPrices = $this->getTierPrices($product);
+        }
+        Mage::helper('weee')->processTierPrices($product, $tierPrices);
+
+        foreach ($tierPrices as $price) {
+            $s = '';
+            if ($this->helper('tax')->displayBothPrices()) {
+                if (Mage::helper('weee')->typeOfDisplay($product, 0)) {
+                    $s .= $this->__('Buy %1$s for %2$s (%3$s incl. tax) each', $price['price_qty'], $price['formated_price_incl_weee_only'], $price['formated_price_incl_weee']);
+                } else if (Mage::helper('weee')->typeOfDisplay($product, 1)) {
+                    $s .= $this->__('Buy %1$s for %2$s', $price['price_qty'], $price['formated_price_incl_weee_only']);
+                    if ($weeeTaxAttributes) {
+                        $s .= ' (' . $this->__('%1$s incl tax.', $price['formated_price_incl_weee']);
+                        $separator = ' + ';
+                        foreach ($weeeTaxAttributes as $attribute) {
+                            $s .= $separator . $attribute->getName() . ': ';
+                            $s .= Mage::helper('core')->currency($attribute->getAmount());
+                        }
+                        $s .= ')';
+                    }
+                    $s .= ' ' . $this->__('each');
+                } else if (Mage::helper('weee')->typeOfDisplay($product, 4)) {
+                    $s .= $this->__('Buy %1$s for %2$s', $price['price_qty'], $price['formated_price_incl_weee_only']);
+                    if ($weeeTaxAttributes) {
+                        $s .= ' (' . $this->__('%1$s incl tax.', $price['formated_price_incl_weee']);
+                        $separator = ' + ';
+                        foreach ($weeeTaxAttributes as $attribute) {
+                            $s .= $separator . $attribute->getName() . ': ';
+                            $s .= Mage::helper('core')->currency(
+                                $attribute->getAmount() + $attribute->getTaxAmount()
+                            );
+                        }
+                        $s .= ')';
+                    }
+                    $s .= ' ' . $this->__('each');
+                } else if (Mage::helper('weee')->typeOfDisplay($product, 2)) {
+                    $s .= $this->__('Buy %1$s for %2$s', $price['price_qty'], $price['formated_price']);
+                    if ($weeeTaxAttributes) {
+                        $s .= ' (';
+                        foreach ($weeeTaxAttributes as $attribute) {
+                            $s .= $attribute->getName() . ': ';
+                            $s .= Mage::helper('core')->currency($attribute->getAmount());
+                        }
+                        $s .= ' ' . $this->__('Total incl. Tax: %1$s', $price['formated_price_incl_weee']) . ')';
+                    }
+                    $s .= ' ' . $this->__('each');
+                } else {
+                    $s .= $this->__('Buy %1$s for %2$s (%3$s incl. tax) each', $price['price_qty'], $price['formated_price'], $price['formated_price_incl_tax']);
+                }
+            } else {
+                if ($this->helper('tax')->displayPriceIncludingTax()) {
+                    if (Mage::helper('weee')->typeOfDisplay($product, 0)) {
+                        $s .= $this->__('Buy %1$s for %2$s each', $price['price_qty'], $price['formated_price_incl_weee']);
+                    } else if (Mage::helper('weee')->typeOfDisplay($product, 1)) {
+                        $s .= $this->__('Buy %1$s for %2$s', $price['price_qty'], $price['formated_price_incl_weee']);
+                        if ($weeeTaxAttributes) {
+                            $s .= ' (';
+                            $separator = '';
+                            foreach ($weeeTaxAttributes as $attribute) {
+                                $s .= $separator . $attribute->getName() . ': ';
+                                $s .= Mage::helper('core')->currency($attribute->getAmount());
+                                $separator = ' + ';
+                            }
+                            $s .= ')';
+                        }
+                        $s .= ' ' . $this->__('each');
+                    } else if (Mage::helper('weee')->typeOfDisplay($product, 4)) {
+                        $s .= $this->__('Buy %1$s for %2$s', $price['price_qty'], $price['formated_price_incl_weee']);
+                        if ($weeeTaxAttributes) {
+                            $s .= ' (';
+                            $separator = '';
+                            foreach ($weeeTaxAttributes as $attribute) {
+                                $s .= $separator . $attribute->getName() . ': ';
+                                $s .= Mage::helper('core')->currency(
+                                    $attribute->getAmount() + $attribute->getTaxAmount()
+                                );
+                                $separator = ' + ';
+                            }
+                            $s .= ')';
+                        }
+                        $s .= ' ' . $this->__('each');
+                    } else if (Mage::helper('weee')->typeOfDisplay($product, 2)) {
+                        $s .= $this->__('Buy %1$s for %2$s', $price['price_qty'], $price['formated_price_incl_tax']);
+                        if ($weeeTaxAttributes) {
+                            $s .= ' (';
+                            foreach ($weeeTaxAttributes as $attribute) {
+                                $s .= $attribute->getName() . ': ';
+                                $s .= Mage::helper('core')->currency($attribute->getAmount());
+                            }
+                            $s .=  ' ' . $this->__('Total incl. Tax: %1$s', $price['formated_price_incl_weee']) . ')';
+                        }
+                        $s .= ' ' . $this->__('each');
+                    } else {
+                        $s .= $this->__('Buy %1$s for %2$s each', $price['price_qty'], $price['formated_price_incl_tax']);
+                    }
+                } else {
+                    if (Mage::helper('weee')->typeOfDisplay($product, 0)) {
+                        $s .= $this->__('Buy %1$s for %2$s each', $price['price_qty'], $price['formated_price_incl_weee_only']);
+                    } else if (Mage::helper('weee')->typeOfDisplay($product, 1)) {
+                        $s .= $this->__('Buy %1$s for %2$s', $price['price_qty'], $price['formated_price_incl_weee_only']);
+                        if ($weeeTaxAttributes) {
+                            $s .= ' (';
+                            $separator = '';
+                            foreach ($weeeTaxAttributes as $attribute) {
+                                $s .= $separator . $attribute->getName() . ': ';
+                                $s .= Mage::helper('core')->currency($attribute->getAmount());
+                                $separator = ' + ';
+                            }
+                            $s .= ')';
+                        }
+                        $s .= ' ' . $this->__('each');
+                    } else if (Mage::helper('weee')->typeOfDisplay($product, 4)) {
+                        $s .= $this->__('Buy %1$s for %2$s', $price['price_qty'], $price['formated_price_incl_weee_only']);
+                        if ($weeeTaxAttributes) {
+                            $s .= ' (';
+                            $separator = '';
+                            foreach ($weeeTaxAttributes as $attribute) {
+                                $s .= $separator . $attribute->getName() . ': ';
+                                $s .= Mage::helper('core')->currency(
+                                    $attribute->getAmount() + $attribute->getTaxAmount()
+                                );
+                                $separator = ' + ';
+                            }
+                            $s .= ')';
+                        }
+                        $s .= ' ' . $this->__('each');
+                    } else if (Mage::helper('weee')->typeOfDisplay($product, 2)) {
+                        $s .= $this->__('Buy %1$s for %2$s', $price['price_qty'], $price['formated_price']);
+                        if ($weeeTaxAttributes) {
+                            $s .= ' (';
+                            foreach ($weeeTaxAttributes as $attribute) {
+                                $s .= $attribute->getName() . ': ';
+                                $s .= Mage::helper('core')->currency($attribute->getAmount());
+                            }
+                            $s .= ' ' . $this->__('Total incl. Tax: %1$s', $price['formated_price_incl_weee_only']) . ')';
+                        }
+                        $s .= ' ' . $this->__('each');
+                    } else {
+                        $s .= $this->__('Buy %1$s for %2$s each', $price['price_qty'], $price['formated_price']);
+                    }
+                }
+            }
+            if (!$product->isGrouped()) {
+                $condition1 = ($product->getPrice() == $product->getFinalPrice()
+                    && $product->getPrice() > $price['price']);
+
+                $condition2 = ($product->getPrice() != $product->getFinalPrice()
+                    && $product->getFinalPrice() > $price['price']);
+
+                if ($condition1 || $condition2) {
+                    $s .= ' ' . $this->__('and') . ' ' . $this->__('save') . ' ' . $price['savePercent'] . '%';
+                }
+            }
+            $pricesArray[] = $s;
+        }
+        return $pricesArray;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Giftcard.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Giftcard.php
new file mode 100644
index 00000000000..5ee5ea548c2
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/ItemPrice/Giftcard.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Gift card product price xml renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Catalog_Product_ItemPrice_Giftcard extends Mage_Bundle_Block_Catalog_Product_Price
+{
+    /**
+     * Return minimal amount for Gift card product using price model
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @return float
+     */
+    public function getMinAmount($product = null)
+    {
+        if (is_null($product)) {
+            $product = $this->getProduct();
+        }
+        return $product->getPriceModel()->getMinAmount($product);
+    }
+
+    /**
+     * Return maximal amount for Gift card product using price model
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @return float
+     */
+    public function getMaxAmount($product = null)
+    {
+        if (is_null($product)) {
+            $product = $this->getProduct();
+        }
+        return $product->getPriceModel()->getMaxAmount($product);
+    }
+
+    /**
+     * Collect product prices to specified item xml object
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @param Mage_XmlConnect_Model_Simplexml_Element $item
+     * @return null
+     */
+    public function collectProductPrices(Mage_Catalog_Model_Product $product,
+        Mage_XmlConnect_Model_Simplexml_Element $item)
+    {
+        $this->setProduct($product);
+
+        if ($product->getCanShowPrice() !== false) {
+            $priceListXmlObj = $item->addCustomChild('price_list');
+
+            $min = $this->getMinAmount();
+            $max = $this->getMaxAmount();
+            if ($min && $max && $min == $max) {
+                $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+                $pricesXmlObj->addCustomChild('price', $min, array(
+                    'id' => 'regular',
+                    'label' => $this->__('Regular'),
+                    'formatted_value' => Mage::helper('core')->currency($min, true, false)
+                ));
+            } elseif ($min && $min != 0) {
+                $pricesXmlObj = $priceListXmlObj->addCustomChild('prices', null, array('id' => 'price'));
+                $pricesXmlObj->addCustomChild('price', $min, array(
+                    'id' => 'regular',
+                    'label' => $this->__('From'),
+                    'formatted_value' => Mage::helper('core')->currency($min, true, false)
+                ));
+            }
+        }
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/List.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/List.php
index cf41a14f0a5..223b6b91802 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/List.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/List.php
@@ -41,7 +41,7 @@ class Mage_XmlConnect_Block_Catalog_Product_List extends Mage_XmlConnect_Block_C
     protected $_productCollection = null;
 
     /**
-     * Store collected layered navigation filters whike applying them
+     * Store collected layered navigation filters while applying them
      *
      * @var array
      */
@@ -110,7 +110,7 @@ protected function _getProductCollection()
 
                     $filterModel->setLayer($layer)->setAttributeModel($attributeItem);
 
-                    $filterParam = parent::REQUEST_FILTER_PARAM_REFIX . $attributeCode;
+                    $filterParam = parent::REQUEST_FILTER_PARAM_PREFIX . $attributeCode;
                     /**
                      * Set new request var
                      */
@@ -125,7 +125,7 @@ protected function _getProductCollection()
                  * Separately apply and save category filter
                  */
                 list($categoryFilter, $categoryFilterBlock) = $this->helper('xmlconnect')->getFilterByKey('category');
-                $filterParam = parent::REQUEST_FILTER_PARAM_REFIX . $categoryFilter->getRequestVar();
+                $filterParam = parent::REQUEST_FILTER_PARAM_PREFIX . $categoryFilter->getRequestVar();
                 $categoryFilter->setLayer($layer)->setRequestVar($filterParam)
                     ->apply($this->getRequest(), $categoryFilterBlock);
                 $filters[] = $categoryFilter;
@@ -172,18 +172,26 @@ protected function _prepareCollection($collection)
         /**
          * Apply sort params
          */
-        $reguest = $this->getRequest();
-        foreach ($reguest->getParams() as $key => $value) {
-            if (0 === strpos($key, parent::REQUEST_SORT_ORDER_PARAM_REFIX)) {
-                $key = str_replace(parent::REQUEST_SORT_ORDER_PARAM_REFIX, '', $key);
+        $request = $this->getRequest();
+        $isOrderValueExist = false;
+        foreach ($request->getParams() as $key => $value) {
+            if (0 === strpos($key, parent::REQUEST_SORT_ORDER_PARAM_PREFIX)) {
+                $key = str_replace(parent::REQUEST_SORT_ORDER_PARAM_PREFIX, '', $key);
                 if ($value != 'desc') {
                     $value = 'asc';
                 }
-                $collection->addAttributeToSort($key, $value);
+                if ($key == 'relevance') {
+                    $collection->getSelect()->order("relevance {$value}");
+                } else {
+                    $collection->addAttributeToSort($key, $value);
+                }
+                $isOrderValueExist = true;
             }
         }
+        if (!$isOrderValueExist && ($collection instanceof Mage_CatalogSearch_Model_Resource_Fulltext_Collection)) {
+            $collection->getSelect()->order("relevance desc");
+        }
         $collection->addAttributeToSelect(array('image', 'name', 'description'));
-
         return $this;
     }
 
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options.php
index aa90b448fae..5cb2447240c 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options.php
@@ -33,9 +33,13 @@
  */
 class Mage_XmlConnect_Block_Catalog_Product_Options extends Mage_XmlConnect_Block_Catalog
 {
+     /**#@+
+     * Option input type
+     */
     const OPTION_TYPE_SELECT    = 'select';
     const OPTION_TYPE_CHECKBOX  = 'checkbox';
     const OPTION_TYPE_TEXT      = 'text';
+    /**#@-*/
 
     /**
      * Store supported product options xml renderers based on product types
@@ -70,6 +74,11 @@ public function getProductCustomOptionsXmlObject(Mage_Catalog_Model_Product $pro
         $xmlModel = Mage::getModel('xmlconnect/simplexml_element', '<product></product>');
         $optionsNode = $xmlModel->addChild('options');
 
+        if ($product->hasPreconfiguredValues()) {
+            $preConfiguredValues = $product->getPreconfiguredValues();
+            $optionData = $preConfiguredValues->getData('options');
+        }
+
         if (!$product->getId()) {
             return $xmlModel;
         }
@@ -101,10 +110,12 @@ public function getProductCustomOptionsXmlObject(Mage_Catalog_Model_Product $pro
                 $formattedPrice = Mage::app()->getStore($product->getStoreId())->formatPrice($price, false);
                 $optionNode->addAttribute('formated_price', $formattedPrice);
             }
+            $optionId = $option->getOptionId();
             if ($type == self::OPTION_TYPE_CHECKBOX || $type == self::OPTION_TYPE_SELECT) {
                 foreach ($option->getValues() as $value) {
+                    $code = $value->getId();
                     $valueNode = $optionNode->addChild('value');
-                    $valueNode->addAttribute('code', $value->getId());
+                    $valueNode->addAttribute('code', $code);
                     $valueNode->addAttribute('label', $xmlModel->escapeXml($value->getTitle()));
 
                     if ($value->getPrice() != 0) {
@@ -113,6 +124,15 @@ public function getProductCustomOptionsXmlObject(Mage_Catalog_Model_Product $pro
                         $formattedPrice = $this->_formatPriceString($price, $product);
                         $valueNode->addAttribute('formated_price', $formattedPrice);
                     }
+                    if ($product->hasPreconfiguredValues()) {
+                        $this->_setCartSelectedValue($valueNode, $type, $this->_getPreconfiguredOption(
+                            $optionData, $optionId, $code
+                        ));
+                    }
+                }
+            } else {
+                if ($product->hasPreconfiguredValues() && array_key_exists($option->getOptionId(), $optionData)) {
+                    $this->_setCartSelectedValue($optionNode, $type, $optionData[$optionId]);
                 }
             }
         }
@@ -203,6 +223,7 @@ protected function _toHtml()
         }
 
         if ($product->getId()) {
+            Mage::register('product', $product);
             $type = $product->getTypeId();
             if (isset($this->_renderers[$type])) {
                 $renderer = $this->getLayout()->createBlock($this->_renderers[$type]);
@@ -213,4 +234,66 @@ protected function _toHtml()
         }
         return '<?xml version="1.0" encoding="UTF-8"?><options/>';
     }
+
+    /**
+     * Retrieve option type name by specified option real type name
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlItem
+     * @param string $type
+     * @param int|null $value
+     * @return Mage_XmlConnect_Block_Catalog_Product_Options
+     */
+    protected function _setCartSelectedValue($xmlItem, $type, $value = null)
+    {
+        if (empty($value)) {
+            return $this;
+        }
+
+        switch ($type) {
+            case Mage_Catalog_Model_Product_Option::OPTION_TYPE_DROP_DOWN:
+            case Mage_Catalog_Model_Product_Option::OPTION_TYPE_RADIO:
+            case Mage_Catalog_Model_Product_Option::OPTION_TYPE_MULTIPLE:
+            case Mage_Catalog_Model_Product_Option::OPTION_GROUP_SELECT:
+                $xmlItem->addAttribute('selected', 1);
+                break;
+            case Mage_Catalog_Model_Product_Option::OPTION_TYPE_CHECKBOX:
+                $xmlItem->addAttribute('value', 1);
+                break;
+            case Mage_Catalog_Model_Product_Option::OPTION_TYPE_FIELD:
+            case Mage_Catalog_Model_Product_Option::OPTION_TYPE_AREA:
+            case Mage_Catalog_Model_Product_Option::OPTION_TYPE_FILE:
+            case Mage_Catalog_Model_Product_Option::OPTION_TYPE_DATE:
+            case Mage_Catalog_Model_Product_Option::OPTION_TYPE_TIME:
+            case Mage_Catalog_Model_Product_Option::OPTION_TYPE_DATE_TIME:
+            default:
+                $xmlItem->addAttribute('value', $value);
+                break;
+        }
+        return $this;
+    }
+
+    /**
+     * Get preConfigured option value
+     *
+     * @param array $optionsData
+     * @param int $optionId
+     * @param int $valueId
+     * @return int|null
+     */
+    protected function _getPreconfiguredOption($optionsData, $optionId, $valueId)
+    {
+        $optionValue = $optionsData[$optionId];
+        if (is_array($optionValue)) {
+            if (in_array($valueId, $optionValue)) {
+                return $valueId;
+            }
+        }
+        if ($valueId == $optionValue) {
+            return $valueId;
+        }
+
+        return null;
+    }
 }
+
+
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Bundle.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Bundle.php
index 96626b9510e..516cd488e3e 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Bundle.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Bundle.php
@@ -49,6 +49,10 @@ public function getProductOptionsXml(Mage_Catalog_Model_Product $product, $isObj
             return $isObject ? $xmlModel : $xmlModel->asNiceXml();
         }
 
+        if ($product->hasPreconfiguredValues()) {
+            $optionData = $product->getPreconfiguredValues()->getData('bundle_option');
+        }
+
         /**
          * Bundle options
          */
@@ -62,8 +66,9 @@ public function getProductOptionsXml(Mage_Catalog_Model_Product $product, $isObj
             return $isObject ? $xmlModel : $xmlModel->asNiceXml();
         }
 
-        foreach ($bundleOptions as $_option) {
-            $selections = $_option->getSelections();
+        foreach ($bundleOptions as $option) {
+            $selections = $option->getSelections();
+            $optionId = $option->getOptionId();
             if (empty($selections)) {
                 continue;
             }
@@ -71,37 +76,43 @@ public function getProductOptionsXml(Mage_Catalog_Model_Product $product, $isObj
             $optionNode = $optionsXmlObj->addChild('option');
 
             $type = parent::OPTION_TYPE_SELECT;
-            if ($_option->isMultiSelection()) {
+            if ($option->isMultiSelection()) {
                 $type = parent::OPTION_TYPE_CHECKBOX;
             }
-            $code = 'bundle_option[' . $_option->getId() . ']';
+            $code = 'bundle_option[' . $option->getId() . ']';
             if ($type == parent::OPTION_TYPE_CHECKBOX) {
                 $code .= '[]';
             }
             $optionNode->addAttribute('code', $code);
             $optionNode->addAttribute('type', $type);
-            $optionNode->addAttribute('label', $optionsXmlObj->escapeXml($_option->getTitle()));
-            if ($_option->getRequired()) {
+            $optionNode->addAttribute('label', $optionsXmlObj->escapeXml($option->getTitle()));
+            if ($option->getRequired()) {
                 $optionNode->addAttribute('is_required', 1);
             }
 
-            foreach ($selections as $_selection) {
-                if (!$_selection->isSaleable()) {
+            foreach ($selections as $selection) {
+                if (!$selection->isSaleable()) {
                     continue;
                 }
-                $_qty = !($_selection->getSelectionQty() * 1) ? '1' : $_selection->getSelectionQty() * 1;
+                $qty = null;
+                if ($product->hasPreconfiguredValues()) {
+                    $qty = $product->getPreconfiguredValues()->getData("bundle_option_qty/{$optionId}");
+                }
+                if (null === $qty) {
+                    $qty = !($selection->getSelectionQty() * 1) ? '1' : $selection->getSelectionQty() * 1;
+                }
 
                 $valueNode = $optionNode->addChild('value');
-                $valueNode->addAttribute('code', $_selection->getSelectionId());
-                $valueNode->addAttribute('label', $optionsXmlObj->escapeXml($_selection->getName()));
-                if (!$_option->isMultiSelection()) {
-                    if ($_selection->getSelectionCanChangeQty()) {
+                $valueNode->addAttribute('code', $selection->getSelectionId());
+                $valueNode->addAttribute('label', $optionsXmlObj->escapeXml($selection->getName()));
+                if (!$option->isMultiSelection()) {
+                    if ($selection->getSelectionCanChangeQty()) {
                         $valueNode->addAttribute('is_qty_editable', 1);
                     }
                 }
-                $valueNode->addAttribute('qty', $_qty);
+                $valueNode->addAttribute('qty', $qty);
 
-                $price = $product->getPriceModel()->getSelectionPreFinalPrice($product, $_selection);
+                $price = $product->getPriceModel()->getSelectionPreFinalPrice($product, $selection);
                 $price = Mage::helper('xmlconnect')->formatPriceForXml($price);
                 if ((float)$price != 0.00) {
                     $valueNode->addAttribute('price', Mage::helper('xmlconnect')->formatPriceForXml(
@@ -109,9 +120,14 @@ public function getProductOptionsXml(Mage_Catalog_Model_Product $product, $isObj
                     ));
                     $valueNode->addAttribute('formated_price', $this->_formatPriceString($price, $product));
                 }
+
+                if ($product->hasPreconfiguredValues()) {
+                    $this->_setCartSelectedValue($valueNode, $type, $this->_getPreconfiguredOption(
+                        $optionData, $optionId, $selection->getSelectionId()
+                    ));
+                }
             }
         }
-
         return $isObject ? $xmlModel : $xmlModel->asNiceXml();
     }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Configurable.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Configurable.php
index a7e6424b2d2..ad6b749474c 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Configurable.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Configurable.php
@@ -42,6 +42,10 @@ class Mage_XmlConnect_Block_Catalog_Product_Options_Configurable extends Mage_Xm
      */
     public function getProductOptionsXml(Mage_Catalog_Model_Product $product, $isObject = false)
     {
+        if ($product->hasPreconfiguredValues()) {
+            $optionData = $product->getPreconfiguredValues()->getData('super_attribute');
+        }
+
         $xmlModel = $this->getProductCustomOptionsXmlObject($product);
         $optionsXmlObj = $xmlModel->options;
         $options = array();
@@ -53,28 +57,28 @@ public function getProductOptionsXml(Mage_Catalog_Model_Product $product, $isObj
         /**
          * Configurable attributes
          */
-        $_attributes = $product->getTypeInstance(true)->getConfigurableAttributes($product);
-        if (!sizeof($_attributes)) {
+        $productAttributes = $product->getTypeInstance(true)->getConfigurableAttributes($product);
+        if (!sizeof($productAttributes)) {
             return $isObject ? $xmlModel : $xmlModel->asNiceXml();
         }
 
-        $_allowProducts = array();
-        $_allProducts = $product->getTypeInstance(true)->getUsedProducts(null, $product);
-        foreach ($_allProducts as $_product) {
-            if ($_product->isSaleable()) {
-                $_allowProducts[] = $_product;
+        $allowProducts = array();
+        $allProducts = $product->getTypeInstance(true)->getUsedProducts(null, $product);
+        foreach ($allProducts as $productItem) {
+            if ($productItem->isSaleable()) {
+                $allowProducts[] = $productItem;
             }
         }
 
         /**
          * Allowed products options
          */
-        foreach ($_allowProducts as $_item) {
-            $_productId  = $_item->getId();
+        foreach ($allowProducts as $item) {
+            $productId  = $item->getId();
 
-            foreach ($_attributes as $attribute) {
+            foreach ($productAttributes as $attribute) {
                 $productAttribute = $attribute->getProductAttribute();
-                $attributeValue = $_item->getData($productAttribute->getAttributeCode());
+                $attributeValue = $item->getData($productAttribute->getAttributeCode());
                 if (!isset($options[$productAttribute->getId()])) {
                     $options[$productAttribute->getId()] = array();
                 }
@@ -82,11 +86,11 @@ public function getProductOptionsXml(Mage_Catalog_Model_Product $product, $isObj
                 if (!isset($options[$productAttribute->getId()][$attributeValue])) {
                     $options[$productAttribute->getId()][$attributeValue] = array();
                 }
-                $options[$productAttribute->getId()][$attributeValue][] = $_productId;
+                $options[$productAttribute->getId()][$attributeValue][] = $productId;
             }
         }
 
-        foreach ($_attributes as $attribute) {
+        foreach ($productAttributes as $attribute) {
             $productAttribute = $attribute->getProductAttribute();
             $attributeId = $productAttribute->getId();
             $info = array(
@@ -125,8 +129,8 @@ public function getProductOptionsXml(Mage_Catalog_Model_Product $product, $isObj
 
         $isFirst = true;
 
-        $_attributes = $attributes;
-        reset($_attributes);
+        $productAttributes = $attributes;
+        reset($productAttributes);
         foreach ($attributes as $id => $attribute) {
             $optionNode = $optionsXmlObj->addChild('option');
             $optionNode->addAttribute('code', 'super_attribute[' . $id . ']');
@@ -142,8 +146,13 @@ public function getProductOptionsXml(Mage_Catalog_Model_Product $product, $isObj
                         $valueNode->addAttribute('price', $option['price']);
                         $valueNode->addAttribute('formated_price', $option['formated_price']);
                     }
-                    if (sizeof($_attributes) > 1) {
-                        $this->_prepareRecursivelyRelatedValues($valueNode, $_attributes, $option['products'], 1);
+                    if (sizeof($productAttributes) > 1) {
+                        $this->_prepareRecursivelyRelatedValues($valueNode, $productAttributes, $option['products'], 1);
+                    }
+                    if ($product->hasPreconfiguredValues()) {
+                        $this->_setCartSelectedValue($valueNode, 'select', $this->_getPreconfiguredOption(
+                            $optionData, $id, $option['id']
+                        ));
                     }
                 }
                 $isFirst = false;
@@ -185,21 +194,21 @@ protected function _prepareRecursivelyRelatedValues(&$valueNode, $attributes, $p
                 $relatedNode->addAttribute('to', 'super_attribute[' . $attrId . ']');
             }
 
-            $_valueNode = $relatedNode->addChild('value');
-            $_valueNode->addAttribute('code', $option['id']);
-            $_valueNode->addAttribute('label', $_valueNode->escapeXml($option['label']));
+            $nodeValue = $relatedNode->addChild('value');
+            $nodeValue->addAttribute('code', $option['id']);
+            $nodeValue->addAttribute('label', $nodeValue->escapeXml($option['label']));
             if ((float)$option['price'] != 0.00) {
-                $_valueNode->addAttribute('price', $option['price']);
-                $_valueNode->addAttribute('formated_price', $option['formated_price']);
+                $nodeValue->addAttribute('price', $option['price']);
+                $nodeValue->addAttribute('formated_price', $option['formated_price']);
             }
 
             /**
              * Recursive relation adding
              */
-            $_attrClone = $attributes;
-            if (next($_attrClone) != false) {
-                reset($_attrClone);
-                $this->_prepareRecursivelyRelatedValues($_valueNode, $_attrClone, $intersect, $cycle + 1);
+            $attrClone = $attributes;
+            if (next($attrClone) != false) {
+                reset($attrClone);
+                $this->_prepareRecursivelyRelatedValues($nodeValue, $attrClone, $intersect, $cycle + 1);
             }
         }
     }
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Downloadable.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Downloadable.php
new file mode 100644
index 00000000000..e430bace485
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Downloadable.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Downloadable product options xml renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Catalog_Product_Options_Downloadable extends Mage_XmlConnect_Block_Catalog_Product_Options
+{
+    /**
+     * Generate downloadable product options xml
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @param bool $isObject
+     * @return string | Mage_XmlConnect_Model_Simplexml_Element
+     */
+    public function getProductOptionsXml(Mage_Catalog_Model_Product $product, $isObject = false)
+    {
+        /** set current product object */
+        $this->setProduct($product);
+
+        /** @var $xmlModel Mage_XmlConnect_Model_Simplexml_Element */
+        $xmlModel = $this->getProductCustomOptionsXmlObject($product);
+
+        /** @var $linksBlock Mage_Downloadable_Block_Catalog_Product_Links */
+        $linksBlock = $this->getLayout()->addBlock('downloadable/catalog_product_links', 'product_links');
+
+        if (!$product->isSalable() || !$linksBlock->hasLinks()) {
+            return $isObject ? $xmlModel : $xmlModel->asNiceXml();
+        }
+
+        /** @var $optionsXmlObj Mage_XmlConnect_Model_Simplexml_Element */
+        $optionsXmlObj = $xmlModel->options;
+
+        /** @var $samplesBlock Mage_Downloadable_Block_Catalog_Product_Samples */
+        $samplesBlock = $this->getLayout()->addBlock('downloadable/catalog_product_samples', 'product_samples');
+
+        if ($samplesBlock->hasSamples()) {
+            $samplesXmlObj = $optionsXmlObj->addCustomChild('samples', null, array(
+                'label' => $samplesBlock->getSamplesTitle()
+            ));
+            $samples = $samplesBlock->getSamples();
+            foreach ($samples as $sample) {
+                $samplesXmlObj->addCustomChild('item', null, array(
+                    'label' => $sample->getTitle(),
+                    'url' => $samplesBlock->getSampleUrl($sample)
+                ));
+            }
+        }
+
+        $linksOptions = array('label' => $linksBlock->getLinksTitle());
+        $selectionRequired = $linksBlock->getLinkSelectionRequired();
+        if ($selectionRequired) {
+            $linksOptions += array('code' => 'links[]');
+        }
+        $linksXmlObj = $optionsXmlObj->addCustomChild('links', null, $linksOptions);
+        $links = $linksBlock->getLinks();
+        foreach ($links as $link) {
+            $linkOptions = array('label' => $link->getTitle());
+
+            if ($selectionRequired) {
+                $linkOptions += array('value' => $link->getId());
+                $price = strip_tags($linksBlock->getFormattedLinkPrice($link));
+                if ($price) {
+                    $linkOptions += array('formatted_price' => $price);
+                }
+            }
+
+            if ($product->hasPreconfiguredValues()) {
+                $optionData = $product->getPreconfiguredValues()->getData('links');
+            }
+            $isSelected = isset($optionData) ? in_array($link->getId(), $optionData) : false;
+
+            if ($linksBlock->getLinkCheckedValue($link) || $isSelected) {
+                $linkOptions += array('selected' => '1');
+            }
+
+            if ($link->getSampleFile() || $link->getSampleUrl()) {
+                $linkOptions += array('sample_url' => $linksBlock->getLinkSamlpeUrl($link));
+            }
+
+            $linksXmlObj->addCustomChild('item', null, $linkOptions);
+        }
+
+        return $isObject ? $xmlModel : $xmlModel->asNiceXml();
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Giftcard.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Giftcard.php
index 9d9013d3a4c..9dbe3841f71 100755
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Giftcard.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Giftcard.php
@@ -160,7 +160,6 @@ public function getProductOptionsXml(Mage_Catalog_Model_Product $product, $isObj
         /**
          * Render fixed amounts options
          */
-
         /** @var $fixedAmountsNode Mage_XmlConnect_Model_Simplexml_Element */
         $fixedAmountsNode = $optionsXmlObj->addChild('fixed_amounts');
         if ($this->isAmountAvailable($product)) {
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Grouped.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Grouped.php
index 6c5569254ef..267920ca70d 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Grouped.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Grouped.php
@@ -38,7 +38,7 @@ class Mage_XmlConnect_Block_Catalog_Product_Options_Grouped extends Mage_XmlConn
      *
      * @param Mage_Catalog_Model_Product $product
      * @param bool $isObject
-     * @return string | Mage_XmlConnect_Model_Simplexml_Element
+     * @return string|Mage_XmlConnect_Model_Simplexml_Element
      */
     public function getProductOptionsXml(Mage_Catalog_Model_Product $product, $isObject = false)
     {
@@ -55,30 +55,30 @@ public function getProductOptionsXml(Mage_Catalog_Model_Product $product, $isObj
         /**
          * Grouped (associated) products
          */
-        $_associatedProducts = $product->getTypeInstance(true)->getAssociatedProducts($product);
-        if (!sizeof($_associatedProducts)) {
+        $associatedProducts = $product->getTypeInstance(true)->getAssociatedProducts($product);
+        if (!sizeof($associatedProducts)) {
             return $isObject ? $xmlModel : $xmlModel->asNiceXml();
         }
 
-        foreach ($_associatedProducts as $_item) {
-            if (!$_item->isSaleable()) {
+        foreach ($associatedProducts as $item) {
+            if (!$item->isSaleable()) {
                 continue;
             }
             $optionNode = $optionsNode->addChild('option');
 
-            $optionNode->addAttribute('code', 'super_group[' . $_item->getId() . ']');
+            $optionNode->addAttribute('code', 'super_group[' . $item->getId() . ']');
             $optionNode->addAttribute('type', 'product');
-            $optionNode->addAttribute('label', $xmlModel->escapeXml($_item->getName()));
+            $optionNode->addAttribute('label', $xmlModel->escapeXml($item->getName()));
             $optionNode->addAttribute('is_qty_editable', 1);
-            $optionNode->addAttribute('qty', $_item->getQty()*1);
+            $optionNode->addAttribute('qty', $item->getQty()*1);
 
             /**
              * Process product price
              */
-            if ($_item->getPrice() != $_item->getFinalPrice()) {
-                $productPrice = $_item->getFinalPrice();
+            if ($item->getPrice() != $item->getFinalPrice()) {
+                $productPrice = $item->getFinalPrice();
             } else {
-                $productPrice = $_item->getPrice();
+                $productPrice = $item->getPrice();
             }
 
             if ($productPrice != 0) {
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Bundle.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Bundle.php
index 648c85c60dc..228dcea6ac4 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Bundle.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Bundle.php
@@ -39,109 +39,107 @@ class Mage_XmlConnect_Block_Catalog_Product_Price_Bundle extends Mage_Bundle_Blo
      * @param Mage_Catalog_Model_Product $product
      * @param Mage_XmlConnect_Model_Simplexml_Element $item
      */
-    public function collectProductPrices(
-        Mage_Catalog_Model_Product $product, Mage_XmlConnect_Model_Simplexml_Element $item
-    ) {
-        $this->setProduct($product)->setDisplayMinimalPrice(true) ->setUseLinkForAsLowAs(false);
+    public function collectProductPrices(Mage_Catalog_Model_Product $product,
+        Mage_XmlConnect_Model_Simplexml_Element $item)
+    {
+        $this->setProduct($product)->setDisplayMinimalPrice(true)->setUseLinkForAsLowAs(false);
 
         $priceXmlObj = $item->addChild('price');
 
-        /** @var $_coreHelper Mage_Core_Helper_Data */
-        $_coreHelper = $this->helper('core');
-        /** @var $_weeeHelper Mage_Weee_Helper_Data */
-        $_weeeHelper = $this->helper('weee');
-        /** @var $_taxHelper Mage_Tax_Helper_Data */
-        $_taxHelper  = $this->helper('tax');
+        /** @var $coreHelper Mage_Core_Helper_Data */
+        $coreHelper = $this->helper('core');
+        /** @var $weeeHelper Mage_Weee_Helper_Data */
+        $weeeHelper = $this->helper('weee');
+        /** @var $taxHelper Mage_Tax_Helper_Data */
+        $taxHelper  = $this->helper('tax');
 
-        $_tierPrices = $this->_getTierPrices($product);
+        $tierPrices = $this->_getTierPrices($product);
 
-        if (count($_tierPrices) > 0) {
+        if (count($tierPrices) > 0) {
             $tierPricesTextArray = array();
-            foreach ($_tierPrices as $_price) {
-                $discount = ' ' . ($_price['price'] * 1) . '%';
-                $tierPricesTextArray[] = $this->__('Buy %1$s with %2$s discount each', $_price['price_qty'], $discount);
+            foreach ($tierPrices as $price) {
+                $discount = ' ' . ($price['price'] * 1) . '%';
+                $tierPricesTextArray[] = $this->__('Buy %1$s with %2$s discount each', $price['price_qty'], $discount);
             }
             $item->addChild('price_tier', implode(PHP_EOL, $tierPricesTextArray));
         }
 
-        list($_minimalPrice, $_maximalPrice) = $product->getPriceModel()->getPrices($product);
+        list($minimalPrice, $maximalPrice) = $product->getPriceModel()->getPrices($product);
 
-        $_weeeTaxAmount = 0;
-        $_minimalPriceTax = $_taxHelper->getPrice($product, $_minimalPrice);
-        $_minimalPriceInclTax = $_taxHelper->getPrice($product, $_minimalPrice, true);
+        $weeeTaxAmount = 0;
+        $minimalPriceTax = $taxHelper->getPrice($product, $minimalPrice);
+        $minimalPriceInclTax = $taxHelper->getPrice($product, $minimalPrice, true);
 
         if ($product->getPriceType() == 1) {
-            $_weeeTaxAmount = $_weeeHelper->getAmount($product);
-            if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($product, array(0, 1, 4))) {
-                $_minimalPriceTax += $_weeeTaxAmount;
-                $_minimalPriceInclTax += $_weeeTaxAmount;
+            $weeeTaxAmount = $weeeHelper->getAmount($product);
+            if ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, array(0, 1, 4))) {
+                $minimalPriceTax += $weeeTaxAmount;
+                $minimalPriceInclTax += $weeeTaxAmount;
             }
-            if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($product, 2)) {
-                $_minimalPriceInclTax += $_weeeTaxAmount;
+            if ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 2)) {
+                $minimalPriceInclTax += $weeeTaxAmount;
             }
 
-            if ($_weeeHelper->typeOfDisplay($product, array(1, 2, 4))) {
-                $_weeeTaxAttributes = $_weeeHelper->getProductWeeeAttributesForDisplay($product);
+            if ($weeeHelper->typeOfDisplay($product, array(1, 2, 4))) {
+                $weeeTaxAttributes = $weeeHelper->getProductWeeeAttributesForDisplay($product);
             }
         }
 
         if ($product->getPriceView()) {
-            if ($_taxHelper->displayBothPrices()) {
+            if ($taxHelper->displayBothPrices()) {
                 $priceXmlObj->addAttribute(
-                    'as_low_as_excluding_tax', $_coreHelper->currency($_minimalPriceTax, true, false)
+                    'as_low_as_excluding_tax', $coreHelper->currency($minimalPriceTax, true, false)
                 );
-                if ($_weeeTaxAmount && $product->getPriceType() == 1
-                    && $_weeeHelper->typeOfDisplay($product, array(2, 1, 4))
+                if ($weeeTaxAmount && $product->getPriceType() == 1
+                    && $weeeHelper->typeOfDisplay($product, array(2, 1, 4))
                 ) {
                     $weeeXmlObj = $priceXmlObj->addChild('weee');
-                    $_weeeSeparator = ' + ';
-                    $weeeXmlObj->addAttribute('separator', $_weeeSeparator);
-                    foreach ($_weeeTaxAttributes as $_weeeTaxAttribute) {
-                        if ($_weeeHelper->typeOfDisplay($product, array(2, 4))) {
-                            $amount = $_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount();
+                    $weeeSeparator = ' + ';
+                    $weeeXmlObj->addAttribute('separator', $weeeSeparator);
+                    foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                        if ($weeeHelper->typeOfDisplay($product, array(2, 4))) {
+                            $amount = $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount();
                         } else {
-                            $amount = $_weeeTaxAttribute->getAmount();
+                            $amount = $weeeTaxAttribute->getAmount();
                         }
                         $weeeItemXmlObj = $weeeXmlObj->addChild('item');
                         $weeeItemXmlObj->addAttribute(
-                            'name', $weeeItemXmlObj->escapeXml($_weeeTaxAttribute->getName())
-                        );
-                        $weeeItemXmlObj->addAttribute(
-                            'amount', $_coreHelper->currency($amount, true, false)
+                            'name', $weeeItemXmlObj->escapeXml($weeeTaxAttribute->getName())
                         );
+                        $weeeItemXmlObj->addAttribute('amount', $coreHelper->currency($amount, true, false));
                     }
                 }
                 $priceXmlObj->addAttribute(
-                    'as_low_as_including_tax', $_coreHelper->currency($_minimalPriceInclTax, true, false)
+                    'as_low_as_including_tax', $coreHelper->currency($minimalPriceInclTax, true, false)
                 );
             } else {
                 $priceXmlObj->addAttribute(
-                    'as_low_as', $_coreHelper->currency($_minimalPriceTax, true, false)
+                    'as_low_as', $coreHelper->currency($minimalPriceTax, true, false)
                 );
-                if ($_weeeTaxAmount && $product->getPriceType() == 1
-                    && $_weeeHelper->typeOfDisplay($product, array(2, 1, 4))
+                if ($weeeTaxAmount && $product->getPriceType() == 1
+                    && $weeeHelper->typeOfDisplay($product, array(2, 1, 4))
                 ) {
                     $weeeXmlObj = $priceXmlObj->addChild('weee');
-                    $_weeeSeparator = ' + ';
-                    $weeeXmlObj->addAttribute('separator', $_weeeSeparator);
-                    foreach ($_weeeTaxAttributes as $_weeeTaxAttribute) {
-                        if ($_weeeHelper->typeOfDisplay($product, array(2, 4))) {
-                            $amount = $_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount();
+                    $weeeSeparator = ' + ';
+                    $weeeXmlObj->addAttribute('separator', $weeeSeparator);
+                    foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                        if ($weeeHelper->typeOfDisplay($product, array(2, 4))) {
+                            $amount = $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount();
                         } else {
-                            $amount = $_weeeTaxAttribute->getAmount();
+                            $amount = $weeeTaxAttribute->getAmount();
                         }
                         $weeeItemXmlObj = $weeeXmlObj->addChild('item');
                         $weeeItemXmlObj->addAttribute(
-                            'name', $weeeItemXmlObj->escapeXml($_weeeTaxAttribute->getName())
+                            'name', $weeeItemXmlObj->escapeXml($weeeTaxAttribute->getName())
                         );
                         $weeeItemXmlObj->addAttribute(
-                            'amount', $_coreHelper->currency($amount, true, false)
+                            'amount', $coreHelper->currency($amount, true, false)
                         );
                     }
                 }
-                if ($_weeeHelper->typeOfDisplay($product, 2) && $_weeeTaxAmount) {
+                if ($weeeHelper->typeOfDisplay($product, 2) && $weeeTaxAmount) {
                     $priceXmlObj->addAttribute(
-                        'as_low_as_including_tax', $_coreHelper->currency($_minimalPriceInclTax, true, false)
+                        'as_low_as_including_tax', $coreHelper->currency($minimalPriceInclTax, true, false)
                     );
                 }
             }
@@ -149,195 +147,179 @@ public function collectProductPrices(
          * if ($product->getPriceView()) {
          */
         } else {
-            if ($_minimalPrice <> $_maximalPrice) {
-                if ($_taxHelper->displayBothPrices()) {
+            if ($minimalPrice <> $maximalPrice) {
+                if ($taxHelper->displayBothPrices()) {
                     $priceXmlObj->addAttribute(
-                        'from_excluding_tax', $_coreHelper->currency($_minimalPriceTax, true, false)
+                        'from_excluding_tax', $coreHelper->currency($minimalPriceTax, true, false)
                     );
-                    if ($_weeeTaxAmount && $product->getPriceType() == 1
-                        && $_weeeHelper->typeOfDisplay($product, array(2, 1, 4))
+                    if ($weeeTaxAmount && $product->getPriceType() == 1
+                        && $weeeHelper->typeOfDisplay($product, array(2, 1, 4))
                     ) {
                         $weeeXmlObj = $priceXmlObj->addChild('from_weee');
-                        $_weeeSeparator = ' + ';
-                        $weeeXmlObj->addAttribute('separator', $_weeeSeparator);
-                        foreach ($_weeeTaxAttributes as $_weeeTaxAttribute) {
-                            if ($_weeeHelper->typeOfDisplay($product, array(2, 4))) {
-                                $amount = $_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount();
+                        $weeeSeparator = ' + ';
+                        $weeeXmlObj->addAttribute('separator', $weeeSeparator);
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                            if ($weeeHelper->typeOfDisplay($product, array(2, 4))) {
+                                $amount = $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount();
                             } else {
-                                $amount = $_weeeTaxAttribute->getAmount();
+                                $amount = $weeeTaxAttribute->getAmount();
                             }
                             $weeeItemXmlObj = $weeeXmlObj->addChild('item');
                             $weeeItemXmlObj->addAttribute(
-                                'name', $weeeItemXmlObj->escapeXml($_weeeTaxAttribute->getName())
-                            );
-                            $weeeItemXmlObj->addAttribute(
-                                'amount', $_coreHelper->currency($amount, true, false)
+                                'name', $weeeItemXmlObj->escapeXml($weeeTaxAttribute->getName())
                             );
+                            $weeeItemXmlObj->addAttribute('amount', $coreHelper->currency($amount, true, false));
                         }
                     }
                     $priceXmlObj->addAttribute(
-                        'from_including_tax', $_coreHelper->currency($_minimalPriceInclTax, true, false)
+                        'from_including_tax', $coreHelper->currency($minimalPriceInclTax, true, false)
                     );
                 } else {
-                    $priceXmlObj->addAttribute('from', $_coreHelper->currency($_minimalPriceTax, true, false));
-                    if ($_weeeTaxAmount && $product->getPriceType() == 1
-                        && $_weeeHelper->typeOfDisplay($product, array(2, 1, 4))
+                    $priceXmlObj->addAttribute('from', $coreHelper->currency($minimalPriceTax, true, false));
+                    if ($weeeTaxAmount && $product->getPriceType() == 1
+                        && $weeeHelper->typeOfDisplay($product, array(2, 1, 4))
                     ) {
                         $weeeXmlObj = $priceXmlObj->addChild('from_weee');
-                        $_weeeSeparator = ' + ';
-                        $weeeXmlObj->addAttribute('separator', $_weeeSeparator);
-                        foreach ($_weeeTaxAttributes as $_weeeTaxAttribute) {
-                            if ($_weeeHelper->typeOfDisplay($product, array(2, 4))) {
-                                $amount = $_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount();
+                        $weeeSeparator = ' + ';
+                        $weeeXmlObj->addAttribute('separator', $weeeSeparator);
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                            if ($weeeHelper->typeOfDisplay($product, array(2, 4))) {
+                                $amount = $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount();
                             } else {
-                                $amount = $_weeeTaxAttribute->getAmount();
+                                $amount = $weeeTaxAttribute->getAmount();
                             }
                             $weeeItemXmlObj = $weeeXmlObj->addChild('item');
                             $weeeItemXmlObj->addAttribute(
-                                'name', $weeeItemXmlObj->escapeXml($_weeeTaxAttribute->getName())
+                                'name', $weeeItemXmlObj->escapeXml($weeeTaxAttribute->getName())
                             );
-                            $weeeItemXmlObj->addAttribute('amount', $_coreHelper->currency($amount, true, false));
+                            $weeeItemXmlObj->addAttribute('amount', $coreHelper->currency($amount, true, false));
                         }
                     }
-                    if ($_weeeHelper->typeOfDisplay($product, 2) && $_weeeTaxAmount) {
+                    if ($weeeHelper->typeOfDisplay($product, 2) && $weeeTaxAmount) {
                         $priceXmlObj->addAttribute(
-                            'from_including_tax', $_coreHelper->currency($_minimalPriceInclTax, true, false)
+                            'from_including_tax', $coreHelper->currency($minimalPriceInclTax, true, false)
                         );
                     }
                 }
 
-                $_maximalPriceTax = Mage::helper('tax')->getPrice($product, $_maximalPrice);
-                $_maximalPriceInclTax = Mage::helper('tax')->getPrice($product, $_maximalPrice, true);
+                $maximalPriceTax = Mage::helper('tax')->getPrice($product, $maximalPrice);
+                $maximalPriceInclTax = Mage::helper('tax')->getPrice($product, $maximalPrice, true);
 
                 if ($product->getPriceType() == 1) {
-                    if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($product, array(0, 1, 4))) {
-                        $_maximalPriceTax += $_weeeTaxAmount;
-                        $_maximalPriceInclTax += $_weeeTaxAmount;
+                    if ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, array(0, 1, 4))) {
+                        $maximalPriceTax += $weeeTaxAmount;
+                        $maximalPriceInclTax += $weeeTaxAmount;
                     }
-                    if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($product, 2)) {
-                        $_maximalPriceInclTax += $_weeeTaxAmount;
+                    if ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 2)) {
+                        $maximalPriceInclTax += $weeeTaxAmount;
                     }
                 }
 
-                if ($_taxHelper->displayBothPrices()) {
+                if ($taxHelper->displayBothPrices()) {
                     $priceXmlObj->addAttribute(
-                        'to_excluding_tax', $_coreHelper->currency($_maximalPriceTax, true, false)
+                        'to_excluding_tax', $coreHelper->currency($maximalPriceTax, true, false)
                     );
-                    if ($_weeeTaxAmount && $product->getPriceType() == 1
-                        && $_weeeHelper->typeOfDisplay($product, array(2, 1, 4))
+                    if ($weeeTaxAmount && $product->getPriceType() == 1
+                        && $weeeHelper->typeOfDisplay($product, array(2, 1, 4))
                     ) {
                         $weeeXmlObj = $priceXmlObj->addChild('to_weee');
-                        $_weeeSeparator = ' + ';
-                        $weeeXmlObj->addAttribute('separator', $_weeeSeparator);
-                        foreach ($_weeeTaxAttributes as $_weeeTaxAttribute) {
-                            if ($_weeeHelper->typeOfDisplay($product, array(2, 4))) {
-                                $amount = $_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount();
+                        $weeeSeparator = ' + ';
+                        $weeeXmlObj->addAttribute('separator', $weeeSeparator);
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                            if ($weeeHelper->typeOfDisplay($product, array(2, 4))) {
+                                $amount = $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount();
                             } else {
-                                $amount = $_weeeTaxAttribute->getAmount();
+                                $amount = $weeeTaxAttribute->getAmount();
                             }
                             $weeeItemXmlObj = $weeeXmlObj->addChild('item');
                             $weeeItemXmlObj->addAttribute(
-                                'name', $weeeItemXmlObj->escapeXml($_weeeTaxAttribute->getName())
-                            );
-                            $weeeItemXmlObj->addAttribute(
-                                'amount', $_coreHelper->currency($amount, true, false)
+                                'name', $weeeItemXmlObj->escapeXml($weeeTaxAttribute->getName())
                             );
+                            $weeeItemXmlObj->addAttribute('amount', $coreHelper->currency($amount, true, false));
                         }
                     }
                     $priceXmlObj->addAttribute(
-                        'to_including_tax', $_coreHelper->currency($_maximalPriceInclTax, true, false)
+                        'to_including_tax', $coreHelper->currency($maximalPriceInclTax, true, false)
                     );
                 } else {
-                    $priceXmlObj->addAttribute(
-                        'to', $_coreHelper->currency($_maximalPriceTax, true, false)
-                    );
-                    if ($_weeeTaxAmount && $product->getPriceType() == 1
-                        && $_weeeHelper->typeOfDisplay($product, array(2, 1, 4))
+                    $priceXmlObj->addAttribute('to', $coreHelper->currency($maximalPriceTax, true, false));
+                    if ($weeeTaxAmount && $product->getPriceType() == 1
+                        && $weeeHelper->typeOfDisplay($product, array(2, 1, 4))
                     ) {
                         $weeeXmlObj = $priceXmlObj->addChild('to_weee');
-                        $_weeeSeparator = ' + ';
-                        $weeeXmlObj->addAttribute('separator', $_weeeSeparator);
-                        foreach ($_weeeTaxAttributes as $_weeeTaxAttribute) {
-                            if ($_weeeHelper->typeOfDisplay($product, array(2, 4))) {
-                                $amount = $_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount();
+                        $weeeSeparator = ' + ';
+                        $weeeXmlObj->addAttribute('separator', $weeeSeparator);
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                            if ($weeeHelper->typeOfDisplay($product, array(2, 4))) {
+                                $amount = $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount();
                             } else {
-                                $amount = $_weeeTaxAttribute->getAmount();
+                                $amount = $weeeTaxAttribute->getAmount();
                             }
                             $weeeItemXmlObj = $weeeXmlObj->addChild('item');
                             $weeeItemXmlObj->addAttribute(
-                                'name', $weeeItemXmlObj->escapeXml($_weeeTaxAttribute->getName())
-                            );
-                            $weeeItemXmlObj->addAttribute(
-                                'amount', $_coreHelper->currency($amount, true, false)
+                                'name', $weeeItemXmlObj->escapeXml($weeeTaxAttribute->getName())
                             );
+                            $weeeItemXmlObj->addAttribute('amount', $coreHelper->currency($amount, true, false));
                         }
                     }
-                    if ($_weeeHelper->typeOfDisplay($product, 2) && $_weeeTaxAmount) {
+                    if ($weeeHelper->typeOfDisplay($product, 2) && $weeeTaxAmount) {
                         $priceXmlObj->addAttribute(
-                            'to_including_tax', $_coreHelper->currency($_maximalPriceInclTax, true, false)
+                            'to_including_tax', $coreHelper->currency($maximalPriceInclTax, true, false)
                         );
                     }
                 }
             /**
-             * if ($_minimalPrice <> $_maximalPrice) {
+             * if ($minimalPrice <> $maximalPrice) {
              */
             } else {
-                if ($_taxHelper->displayBothPrices()) {
-                    $priceXmlObj->addAttribute(
-                        'excluding_tax', $_coreHelper->currency($_minimalPriceTax, true, false)
-                    );
-                    if ($_weeeTaxAmount && $product->getPriceType() == 1
-                        && $_weeeHelper->typeOfDisplay($product, array(2, 1, 4))
+                if ($taxHelper->displayBothPrices()) {
+                    $priceXmlObj->addAttribute('excluding_tax', $coreHelper->currency($minimalPriceTax, true, false));
+                    if ($weeeTaxAmount && $product->getPriceType() == 1
+                        && $weeeHelper->typeOfDisplay($product, array(2, 1, 4))
                     ) {
                         $weeeXmlObj = $priceXmlObj->addChild('weee');
-                        $_weeeSeparator = ' + ';
-                        $weeeXmlObj->addAttribute('separator', $_weeeSeparator);
-                        foreach ($_weeeTaxAttributes as $_weeeTaxAttribute) {
-                            if ($_weeeHelper->typeOfDisplay($product, array(2, 4))) {
-                                $amount = $_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount();
+                        $weeeSeparator = ' + ';
+                        $weeeXmlObj->addAttribute('separator', $weeeSeparator);
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                            if ($weeeHelper->typeOfDisplay($product, array(2, 4))) {
+                                $amount = $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount();
                             } else {
-                                $amount = $_weeeTaxAttribute->getAmount();
+                                $amount = $weeeTaxAttribute->getAmount();
                             }
                             $weeeItemXmlObj = $weeeXmlObj->addChild('item');
                             $weeeItemXmlObj->addAttribute(
-                                'name', $weeeItemXmlObj->escapeXml($_weeeTaxAttribute->getName())
-                            );
-                            $weeeItemXmlObj->addAttribute(
-                                'amount', $_coreHelper->currency($amount, true, false)
+                                'name', $weeeItemXmlObj->escapeXml($weeeTaxAttribute->getName())
                             );
+                            $weeeItemXmlObj->addAttribute('amount', $coreHelper->currency($amount, true, false));
                         }
                     }
                     $priceXmlObj->addAttribute(
-                        'including_tax', $_coreHelper->currency($_minimalPriceInclTax, true, false)
+                        'including_tax',$coreHelper->currency($minimalPriceInclTax, true, false)
                     );
                 } else {
-                    $priceXmlObj->addAttribute(
-                        'regular', $_coreHelper->currency($_minimalPriceTax, true, false)
-                    );
-                    if ($_weeeTaxAmount && $product->getPriceType() == 1
-                        && $_weeeHelper->typeOfDisplay($product, array(2, 1, 4))
+                    $priceXmlObj->addAttribute('regular', $coreHelper->currency($minimalPriceTax, true, false));
+                    if ($weeeTaxAmount && $product->getPriceType() == 1
+                        && $weeeHelper->typeOfDisplay($product, array(2, 1, 4))
                     ) {
                         $weeeXmlObj = $priceXmlObj->addChild('weee');
-                        $_weeeSeparator = ' + ';
-                        $weeeXmlObj->addAttribute('separator', $_weeeSeparator);
-                        foreach ($_weeeTaxAttributes as $_weeeTaxAttribute) {
-                            if ($_weeeHelper->typeOfDisplay($product, array(2, 4))) {
-                                $amount = $_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount();
+                        $weeeSeparator = ' + ';
+                        $weeeXmlObj->addAttribute('separator', $weeeSeparator);
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
+                            if ($weeeHelper->typeOfDisplay($product, array(2, 4))) {
+                                $amount = $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount();
                             } else {
-                                $amount = $_weeeTaxAttribute->getAmount();
+                                $amount = $weeeTaxAttribute->getAmount();
                             }
                             $weeeItemXmlObj = $weeeXmlObj->addChild('item');
                             $weeeItemXmlObj->addAttribute(
-                                'name', $weeeItemXmlObj->escapeXml($_weeeTaxAttribute->getName())
-                            );
-                            $weeeItemXmlObj->addAttribute(
-                                'amount', $_coreHelper->currency($amount, true, false)
+                                'name', $weeeItemXmlObj->escapeXml($weeeTaxAttribute->getName())
                             );
+                            $weeeItemXmlObj->addAttribute('amount', $coreHelper->currency($amount, true, false));
                         }
                     }
-                    if ($_weeeHelper->typeOfDisplay($product, 2) && $_weeeTaxAmount) {
+                    if ($weeeHelper->typeOfDisplay($product, 2) && $weeeTaxAmount) {
                         $priceXmlObj->addAttribute(
-                            'including_tax', $_coreHelper->currency($_minimalPriceInclTax, true, false)
+                            'including_tax', $coreHelper->currency($minimalPriceInclTax, true, false)
                         );
                     }
                 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Default.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Default.php
index 484840c7805..1a10f2b5271 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Default.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Default.php
@@ -39,322 +39,321 @@ class Mage_XmlConnect_Block_Catalog_Product_Price_Default extends Mage_Catalog_B
      * @param Mage_Catalog_Model_Product $product
      * @param Mage_XmlConnect_Model_Simplexml_Element $item
      */
-    public function collectProductPrices(
-        Mage_Catalog_Model_Product $product, Mage_XmlConnect_Model_Simplexml_Element $item
-    ) {
+    public function collectProductPrices(Mage_Catalog_Model_Product $product,
+        Mage_XmlConnect_Model_Simplexml_Element $item)
+    {
         $this->setProduct($product)->setDisplayMinimalPrice(true)->setUseLinkForAsLowAs(false);
 
         $priceXmlObj = $item->addChild('price');
-        $_tierPrices = $this->_getTierPrices($product);
-        if (count($_tierPrices) > 0) {
-            $tierPricesTextArray = $this->_getTierPricesTextArray($_tierPrices, $product);
-            $item->addChild('price_tier', implode(PHP_EOL, $tierPricesTextArray));
+        $tierPrices = $this->_getTierPrices($product);
+        if (count($tierPrices) > 0) {
+            $tierPricesTextArray = $item->escapeXml(implode(
+                PHP_EOL, $this->_getTierPricesTextArray($tierPrices, $product)
+            ));
+            $item->addCustomChild('price_tier', $tierPricesTextArray);
         }
 
-        /** @var $_coreHelper Mage_Core_Helper_Data */
-        $_coreHelper = $this->helper('core');
-        /** @var $_weeeHelper Mage_Weee_Helper_Data */
-        $_weeeHelper = $this->helper('weee');
-        /** @var $_taxHelper Mage_Tax_Helper_Data */
-        $_taxHelper  = $this->helper('tax');
+        /** @var $coreHelper Mage_Core_Helper_Data */
+        $coreHelper = $this->helper('core');
+        /** @var $weeeHelper Mage_Weee_Helper_Data */
+        $weeeHelper = $this->helper('weee');
+        /** @var $taxHelper Mage_Tax_Helper_Data */
+        $taxHelper  = $this->helper('tax');
 
-        $_simplePricesTax = ($_taxHelper->displayPriceIncludingTax() || $_taxHelper->displayBothPrices());
-        $_minimalPriceValue = $product->getMinimalPrice();
-        $_minimalPrice = $_taxHelper->getPrice($product, $_minimalPriceValue, $_simplePricesTax);
+        $simplePricesTax = ($taxHelper->displayPriceIncludingTax() || $taxHelper->displayBothPrices());
+        $minimalPriceValue = $product->getMinimalPrice();
+        $minimalPrice = $taxHelper->getPrice($product, $minimalPriceValue, $simplePricesTax);
 
         if (!$product->isGrouped()) {
-            $_weeeTaxAmount = $_weeeHelper->getAmountForDisplay($product);
-            if ($_weeeHelper->typeOfDisplay($product, array(1, 2, 4))) {
-                $_weeeTaxAmount = $_weeeHelper->getAmount($product);
-                $_weeeTaxAttributes = $_weeeHelper->getProductWeeeAttributesForDisplay($product);
+            $weeeTaxAmount = $weeeHelper->getAmountForDisplay($product);
+            if ($weeeHelper->typeOfDisplay($product, array(1, 2, 4))) {
+                $weeeTaxAmount = $weeeHelper->getAmount($product);
+                $weeeTaxAttributes = $weeeHelper->getProductWeeeAttributesForDisplay($product);
             }
 
-            $_price = $_taxHelper->getPrice($product, $product->getPrice());
-            $_regularPrice = $_taxHelper->getPrice($product, $product->getPrice(), $_simplePricesTax);
-            $_finalPrice = $_taxHelper->getPrice($product, $product->getFinalPrice());
-            $_finalPriceInclTax = $_taxHelper->getPrice($product, $product->getFinalPrice(), true);
-            $_weeeHelper->getPriceDisplayType();
-            if ($_finalPrice == $_price) {
-                if ($_taxHelper->displayBothPrices()) {
+            $price = $taxHelper->getPrice($product, $product->getPrice());
+            $regularPrice = $taxHelper->getPrice($product, $product->getPrice(), $simplePricesTax);
+            $finalPrice = $taxHelper->getPrice($product, $product->getFinalPrice());
+            $finalPriceInclTax = $taxHelper->getPrice($product, $product->getFinalPrice(), true);
+            $weeeHelper->getPriceDisplayType();
+            if ($finalPrice == $price) {
+                if ($taxHelper->displayBothPrices()) {
                     /**
                      * Including
                      */
-                    if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($product, 0)) {
+                    if ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 0)) {
                         $priceXmlObj->addAttribute(
-                            'excluding_tax', $_coreHelper->currency($_price + $_weeeTaxAmount, true, false)
+                            'excluding_tax', $coreHelper->currency($price + $weeeTaxAmount, true, false)
                         );
                         $priceXmlObj->addAttribute(
-                            'including_tax', $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmount, true, false)
+                            'including_tax', $coreHelper->currency($finalPriceInclTax + $weeeTaxAmount, true, false)
                         );
-                    } elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($product, 1)) {
+                    } elseif ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 1)) {
                         /**
                          * Including + Weee
                          */
                         $priceXmlObj->addAttribute(
-                            'excluding_tax', $_coreHelper->currency($_price + $_weeeTaxAmount, true, false)
+                            'excluding_tax', $coreHelper->currency($price + $weeeTaxAmount, true, false)
                         );
                         $priceXmlObj->addAttribute(
-                            'including_tax', $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmount, true, false)
+                            'including_tax', $coreHelper->currency($finalPriceInclTax + $weeeTaxAmount, true, false)
                         );
                         $weeeXmlObj = $priceXmlObj->addChild('weee');
-                        $_weeeSeparator = ' + ';
-                        $weeeXmlObj->addAttribute('separator', $_weeeSeparator);
-                        foreach ($_weeeTaxAttributes as $_weeeTaxAttribute) {
+                        $weeeSeparator = ' + ';
+                        $weeeXmlObj->addAttribute('separator', $weeeSeparator);
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
                             $weeeItemXmlObj = $weeeXmlObj->addChild('item');
                             $weeeItemXmlObj->addAttribute(
-                                'name', $weeeItemXmlObj->escapeXml($_weeeTaxAttribute->getName())
+                                'name', $weeeItemXmlObj->escapeXml($weeeTaxAttribute->getName())
                             );
                             $weeeItemXmlObj->addAttribute(
-                                'amount', $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, false)
+                                'amount', $coreHelper->currency($weeeTaxAttribute->getAmount(), true, false)
                             );
                         }
-                    } elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($product, 4)) {
+                    } elseif ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 4)) {
                         /**
                          * Including + Weee
                          */
                         $priceXmlObj->addAttribute(
-                            'excluding_tax', $_coreHelper->currency($_price + $_weeeTaxAmount, true, false)
+                            'excluding_tax', $coreHelper->currency($price + $weeeTaxAmount, true, false)
                         );
                         $priceXmlObj->addAttribute(
-                            'including_tax', $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmount, true, false)
+                            'including_tax', $coreHelper->currency($finalPriceInclTax + $weeeTaxAmount, true, false)
                         );
                         $weeeXmlObj = $priceXmlObj->addChild('weee');
-                        $_weeeSeparator = ' + ';
-                        $weeeXmlObj->addAttribute('separator', $_weeeSeparator);
-                        foreach ($_weeeTaxAttributes as $_weeeTaxAttribute) {
+                        $weeeSeparator = ' + ';
+                        $weeeXmlObj->addAttribute('separator', $weeeSeparator);
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
                             $weeeItemXmlObj = $weeeXmlObj->addChild('item');
                             $weeeItemXmlObj->addAttribute(
-                                'name', $weeeItemXmlObj->escapeXml($_weeeTaxAttribute->getName())
+                                'name', $weeeItemXmlObj->escapeXml($weeeTaxAttribute->getName())
                             );
-                            $weeeItemXmlObj->addAttribute('amount', $_coreHelper->currency(
-                                $_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, false
+                            $weeeItemXmlObj->addAttribute('amount', $coreHelper->currency(
+                                $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount(), true, false
                             ));
                         }
-                    } elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($product, 2)) {
+                    } elseif ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 2)) {
                         /**
                          * Excluding + Weee + Final
                          */
-                        $priceXmlObj->addAttribute('excluding_tax', $_coreHelper->currency($_price, true, false));
+                        $priceXmlObj->addAttribute('excluding_tax', $coreHelper->currency($price, true, false));
                         $weeeXmlObj = $priceXmlObj->addChild('weee');
-                        foreach ($_weeeTaxAttributes as $_weeeTaxAttribute) {
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
                             $weeeItemXmlObj = $weeeXmlObj->addChild('item');
                             $weeeItemXmlObj->addAttribute(
-                                'name', $weeeItemXmlObj->escapeXml($_weeeTaxAttribute->getName())
+                                'name', $weeeItemXmlObj->escapeXml($weeeTaxAttribute->getName())
                             );
                             $weeeItemXmlObj->addAttribute(
-                                'amount', $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, false)
+                                'amount', $coreHelper->currency($weeeTaxAttribute->getAmount(), true, false)
                             );
                         }
-                        $priceXmlObj->addAttribute('including_tax', $_coreHelper->currency(
-                            $_finalPriceInclTax + $_weeeTaxAmount, true, false
+                        $priceXmlObj->addAttribute('including_tax', $coreHelper->currency(
+                            $finalPriceInclTax + $weeeTaxAmount, true, false
                         ));
                     } else {
-                        $priceXmlObj->addAttribute('excluding_tax', $_coreHelper->currency($_price, true, false));
+                        $priceXmlObj->addAttribute('excluding_tax', $coreHelper->currency($price, true, false));
                         $priceXmlObj->addAttribute(
-                            'including_tax', $_coreHelper->currency($_finalPriceInclTax, true, false)
+                            'including_tax', $coreHelper->currency($finalPriceInclTax, true, false)
                         );
                     }
                 /**
-                 * if ($_taxHelper->displayBothPrices()) {
+                 * if ($taxHelper->displayBothPrices()) {
                  */
                 } else {
                     /**
                      * Including
                      */
-                    if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($product, 0)) {
-                        $priceXmlObj->addAttribute('regular', $_coreHelper->currency(
-                            $_price + $_weeeTaxAmount, true, false
+                    if ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 0)) {
+                        $priceXmlObj->addAttribute('regular', $coreHelper->currency(
+                            $price + $weeeTaxAmount, true, false
                         ));
-                    } elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($product, 1)) {
+                    } elseif ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 1)) {
                         /**
                          * Including + Weee
                          */
-                        $priceXmlObj->addAttribute('regular', $_coreHelper->currency(
-                            $_price + $_weeeTaxAmount, true, false
+                        $priceXmlObj->addAttribute('regular', $coreHelper->currency(
+                            $price + $weeeTaxAmount, true, false
                         ));
                         $weeeXmlObj = $priceXmlObj->addChild('weee');
-                        $_weeeSeparator = ' + ';
-                        $weeeXmlObj->addAttribute('separator', $_weeeSeparator);
-                        foreach ($_weeeTaxAttributes as $_weeeTaxAttribute) {
+                        $weeeSeparator = ' + ';
+                        $weeeXmlObj->addAttribute('separator', $weeeSeparator);
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
                             $weeeItemXmlObj = $weeeXmlObj->addChild('item');
                             $weeeItemXmlObj->addAttribute(
-                                'name', $weeeItemXmlObj->escapeXml($_weeeTaxAttribute->getName())
+                                'name', $weeeItemXmlObj->escapeXml($weeeTaxAttribute->getName())
                             );
                             $weeeItemXmlObj->addAttribute(
-                                'amount', $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, false)
+                                'amount', $coreHelper->currency($weeeTaxAttribute->getAmount(), true, false)
                             );
                         }
-                    } elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($product, 4)) {
+                    } elseif ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 4)) {
                     /**
                      * Including + Weee
                      */
-                        $priceXmlObj->addAttribute('regular', $_coreHelper->currency(
-                            $_price + $_weeeTaxAmount, true, false
+                        $priceXmlObj->addAttribute('regular', $coreHelper->currency(
+                            $price + $weeeTaxAmount, true, false
                         ));
                         $weeeXmlObj = $priceXmlObj->addChild('weee');
-                        $_weeeSeparator = ' + ';
-                        $weeeXmlObj->addAttribute('separator', $_weeeSeparator);
-                        foreach ($_weeeTaxAttributes as $_weeeTaxAttribute) {
+                        $weeeSeparator = ' + ';
+                        $weeeXmlObj->addAttribute('separator', $weeeSeparator);
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
                             $weeeItemXmlObj = $weeeXmlObj->addChild('item');
                             $weeeItemXmlObj->addAttribute(
-                                'name', $weeeItemXmlObj->escapeXml($_weeeTaxAttribute->getName())
+                                'name', $weeeItemXmlObj->escapeXml($weeeTaxAttribute->getName())
                             );
-                            $weeeItemXmlObj->addAttribute('amount', $_coreHelper->currency(
-                                $_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, false
+                            $weeeItemXmlObj->addAttribute('amount', $coreHelper->currency(
+                                $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount(), true, false
                             ));
                         }
-                    } elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($product, 2)) {
+                    } elseif ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 2)) {
                         /**
                          * Excluding + Weee + Final
                          */
-                        $priceXmlObj->addAttribute(
-                            'regular', $_coreHelper->currency($_price, true, false)
-                        );
+                        $priceXmlObj->addAttribute('regular', $coreHelper->currency($price, true, false));
                         $weeeXmlObj = $priceXmlObj->addChild('weee');
-                        foreach ($_weeeTaxAttributes as $_weeeTaxAttribute) {
+                        foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
                             $weeeItemXmlObj = $weeeXmlObj->addChild('item');
                             $weeeItemXmlObj->addAttribute(
-                                'name', $weeeItemXmlObj->escapeXml($_weeeTaxAttribute->getName())
+                                'name', $weeeItemXmlObj->escapeXml($weeeTaxAttribute->getName())
                             );
                             $weeeItemXmlObj->addAttribute(
-                                'amount', $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, false)
+                                'amount', $coreHelper->currency($weeeTaxAttribute->getAmount(), true, false)
                             );
                         }
                         $priceXmlObj->addAttribute(
-                            'including_tax', $_coreHelper->currency($_price + $_weeeTaxAmount, true, false)
+                            'including_tax', $coreHelper->currency($price + $weeeTaxAmount, true, false)
                         );
                     } else {
-                         $priceXmlObj->addAttribute('regular', $_coreHelper->currency($_price, true, false));
+                         $priceXmlObj->addAttribute('regular', $coreHelper->currency($price, true, false));
                     }
                 }
             /**
-             * if ($_finalPrice == $_price) {
+             * if ($finalPrice == $price) {
              */
             } else {
-                $_originalWeeeTaxAmount = $_weeeHelper->getOriginalAmount($product);
+                $originalWeeeTaxAmount = $weeeHelper->getOriginalAmount($product);
                 /**
                  * Including
                  */
-                if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($product, 0)) {
-                    $priceXmlObj->addAttribute('regular', $_coreHelper->currency(
-                        $_regularPrice + $_originalWeeeTaxAmount, true, false
+                if ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 0)) {
+                    $priceXmlObj->addAttribute('regular', $coreHelper->currency(
+                        $regularPrice + $originalWeeeTaxAmount, true, false
                     ));
-                    if ($_taxHelper->displayBothPrices()) {
-                        $priceXmlObj->addAttribute('special_excluding_tax', $_coreHelper->currency(
-                            $_finalPrice + $_weeeTaxAmount, true, false
+                    if ($taxHelper->displayBothPrices()) {
+                        $priceXmlObj->addAttribute('special_excluding_tax', $coreHelper->currency(
+                            $finalPrice + $weeeTaxAmount, true, false
                         ));
-                        $priceXmlObj->addAttribute('special_including_tax', $_coreHelper->currency(
-                            $_finalPriceInclTax + $_weeeTaxAmount, true, false
+                        $priceXmlObj->addAttribute('special_including_tax', $coreHelper->currency(
+                            $finalPriceInclTax + $weeeTaxAmount, true, false
                         ));
                     } else {
-                        $priceXmlObj->addAttribute('special', $_coreHelper->currency(
-                            $_finalPrice + $_weeeTaxAmount, true, false
+                        $priceXmlObj->addAttribute('special', $coreHelper->currency(
+                            $finalPrice + $weeeTaxAmount, true, false
                         ));
                     }
-                } elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($product, 1)) {
+                } elseif ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 1)) {
                     /**
                      * Including + Weee
                      */
-                    $priceXmlObj->addAttribute('regular', $_coreHelper->currency(
-                        $_regularPrice + $_originalWeeeTaxAmount, true, false
+                    $priceXmlObj->addAttribute('regular', $coreHelper->currency(
+                        $regularPrice + $originalWeeeTaxAmount, true, false
                     ));
-                    $priceXmlObj->addAttribute('special_excluding_tax', $_coreHelper->currency(
-                        $_finalPrice + $_weeeTaxAmount, true, false
+                    $priceXmlObj->addAttribute('special_excluding_tax', $coreHelper->currency(
+                        $finalPrice + $weeeTaxAmount, true, false
                     ));
                     $weeeXmlObj = $priceXmlObj->addChild('weee');
-                    $_weeeSeparator = ' + ';
-                    $weeeXmlObj->addAttribute('separator', $_weeeSeparator);
-                    foreach ($_weeeTaxAttributes as $_weeeTaxAttribute) {
+                    $weeeSeparator = ' + ';
+                    $weeeXmlObj->addAttribute('separator', $weeeSeparator);
+                    foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
                         $weeeItemXmlObj = $weeeXmlObj->addChild('item');
                         $weeeItemXmlObj->addAttribute(
-                            'name', $weeeItemXmlObj->escapeXml($_weeeTaxAttribute->getName())
+                            'name', $weeeItemXmlObj->escapeXml($weeeTaxAttribute->getName())
                         );
-                        $weeeItemXmlObj->addAttribute('amount', $_coreHelper->currency(
-                            $_weeeTaxAttribute->getAmount(), true, false
+                        $weeeItemXmlObj->addAttribute('amount', $coreHelper->currency(
+                            $weeeTaxAttribute->getAmount(), true, false
                         ));
                     }
-                    $priceXmlObj->addAttribute('special_including_tax', $_coreHelper->currency(
-                        $_finalPriceInclTax + $_weeeTaxAmount, true, false
+                    $priceXmlObj->addAttribute('special_including_tax', $coreHelper->currency(
+                        $finalPriceInclTax + $weeeTaxAmount, true, false
                     ));
-                } elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($product, 4)) {
+                } elseif ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 4)) {
                     /**
                      * Including + Weee
                      */
-                    $priceXmlObj->addAttribute('regular', $_coreHelper->currency(
-                        $_regularPrice + $_originalWeeeTaxAmount, true, false
+                    $priceXmlObj->addAttribute('regular', $coreHelper->currency(
+                        $regularPrice + $originalWeeeTaxAmount, true, false
                     ));
-                    $priceXmlObj->addAttribute('special_excluding_tax', $_coreHelper->currency(
-                        $_finalPrice + $_weeeTaxAmount, true, false
+                    $priceXmlObj->addAttribute('special_excluding_tax', $coreHelper->currency(
+                        $finalPrice + $weeeTaxAmount, true, false
                     ));
                     $weeeXmlObj = $priceXmlObj->addChild('weee');
-                    $_weeeSeparator = ' + ';
-                    $weeeXmlObj->addAttribute('separator', $_weeeSeparator);
-                    foreach ($_weeeTaxAttributes as $_weeeTaxAttribute) {
+                    $weeeSeparator = ' + ';
+                    $weeeXmlObj->addAttribute('separator', $weeeSeparator);
+                    foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
                         $weeeItemXmlObj = $weeeXmlObj->addChild('item');
                         $weeeItemXmlObj->addAttribute(
-                            'name', $weeeItemXmlObj->escapeXml($_weeeTaxAttribute->getName())
+                            'name', $weeeItemXmlObj->escapeXml($weeeTaxAttribute->getName())
                         );
-                        $weeeItemXmlObj->addAttribute('amount', $_coreHelper->currency(
-                            $_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, false
+                        $weeeItemXmlObj->addAttribute('amount', $coreHelper->currency(
+                            $weeeTaxAttribute->getAmount() + $weeeTaxAttribute->getTaxAmount(), true, false
                         ));
                     }
-                    $priceXmlObj->addAttribute('special_including_tax', $_coreHelper->currency(
-                        $_finalPriceInclTax + $_weeeTaxAmount, true, false
+                    $priceXmlObj->addAttribute('special_including_tax', $coreHelper->currency(
+                        $finalPriceInclTax + $weeeTaxAmount, true, false
                     ));
-                } elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($product, 2)) {
+                } elseif ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, 2)) {
                     /**
                      * Excluding + Weee + Final
                      */
-                    $priceXmlObj->addAttribute('regular', $_coreHelper->currency($_regularPrice, true, false));
+                    $priceXmlObj->addAttribute('regular', $coreHelper->currency($regularPrice, true, false));
                     $priceXmlObj->addAttribute(
-                        'special_excluding_tax', $_coreHelper->currency($_finalPrice, true, false)
+                        'special_excluding_tax', $coreHelper->currency($finalPrice, true, false)
                     );
                     $weeeXmlObj = $priceXmlObj->addChild('weee');
-                    foreach ($_weeeTaxAttributes as $_weeeTaxAttribute) {
+                    foreach ($weeeTaxAttributes as $weeeTaxAttribute) {
                         $weeeItemXmlObj = $weeeXmlObj->addChild('item');
                         $weeeItemXmlObj->addAttribute(
-                            'name', $weeeItemXmlObj->escapeXml($_weeeTaxAttribute->getName())
+                            'name', $weeeItemXmlObj->escapeXml($weeeTaxAttribute->getName())
                         );
-                        $weeeItemXmlObj->addAttribute('amount', $_coreHelper->currency(
-                            $_weeeTaxAttribute->getAmount(), true, false
+                        $weeeItemXmlObj->addAttribute('amount', $coreHelper->currency(
+                            $weeeTaxAttribute->getAmount(), true, false
                         ));
                     }
-                    $priceXmlObj->addAttribute('special_including_tax', $_coreHelper->currency(
-                        $_finalPriceInclTax + $_weeeTaxAmount, true, false
+                    $priceXmlObj->addAttribute('special_including_tax', $coreHelper->currency(
+                        $finalPriceInclTax + $weeeTaxAmount, true, false
                     ));
                 } else {
                     /**
                      * Excluding
                      */
-                    $priceXmlObj->addAttribute('regular', $_coreHelper->currency($_regularPrice, true, false));
-                    if ($_taxHelper->displayBothPrices()) {
+                    $priceXmlObj->addAttribute('regular', $coreHelper->currency($regularPrice, true, false));
+                    if ($taxHelper->displayBothPrices()) {
                         $priceXmlObj->addAttribute(
-                            'special_excluding_tax', $_coreHelper->currency($_finalPrice, true, false)
+                            'special_excluding_tax', $coreHelper->currency($finalPrice, true, false)
                         );
                         $priceXmlObj->addAttribute(
-                            'special_including_tax', $_coreHelper->currency($_finalPriceInclTax, true, false)
+                            'special_including_tax', $coreHelper->currency($finalPriceInclTax, true, false)
                         );
                     } else {
                         $priceXmlObj->addAttribute(
-                            'special', $_coreHelper->currency($_finalPrice, true, false)
+                            'special', $coreHelper->currency($finalPrice, true, false)
                         );
                     }
                 }
             }
 
-            if ($this->getDisplayMinimalPrice()
-                && $_minimalPriceValue
-                && $_minimalPriceValue < $product->getFinalPrice()
+            if ($this->getDisplayMinimalPrice() && $minimalPriceValue
+                && $minimalPriceValue < $product->getFinalPrice()
             ) {
-                $_minimalPriceDisplayValue = $_minimalPrice;
+                $minimalPriceDisplayValue = $minimalPrice;
 
-                if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($product, array(0, 1, 4))) {
-                    $_minimalPriceDisplayValue = $_minimalPrice + $_weeeTaxAmount;
+                if ($weeeTaxAmount && $weeeHelper->typeOfDisplay($product, array(0, 1, 4))) {
+                    $minimalPriceDisplayValue = $minimalPrice + $weeeTaxAmount;
                 }
 
                 if (!$this->getUseLinkForAsLowAs()) {
-                    $priceXmlObj->addAttribute('as_low_as', $_coreHelper->currency(
-                        $_minimalPriceDisplayValue, true, false
+                    $priceXmlObj->addAttribute('as_low_as', $coreHelper->currency(
+                        $minimalPriceDisplayValue, true, false
                     ));
                 }
             }
@@ -362,23 +361,23 @@ public function collectProductPrices(
          * if (!$product->isGrouped()) {
          */
         } else {
-            $_exclTax = $_taxHelper->getPrice($product, $_minimalPriceValue, null);
-            $_inclTax = $_taxHelper->getPrice($product, $_minimalPriceValue, true);
+            $exclTax = $taxHelper->getPrice($product, $minimalPriceValue, null);
+            $inclTax = $taxHelper->getPrice($product, $minimalPriceValue, true);
 
-            if ($this->getDisplayMinimalPrice() && $_minimalPriceValue) {
-                if ($_taxHelper->displayBothPrices()) {
-                    $priceXmlObj->addAttribute('starting_at_excluding_tax', $_coreHelper->currency(
-                        $_exclTax, true, false
+            if ($this->getDisplayMinimalPrice() && $minimalPriceValue) {
+                if ($taxHelper->displayBothPrices()) {
+                    $priceXmlObj->addAttribute('starting_at_excluding_tax', $coreHelper->currency(
+                        $exclTax, true, false
                     ));
-                    $priceXmlObj->addAttribute('starting_at_including_tax', $_coreHelper->currency(
-                        $_inclTax, true, false
+                    $priceXmlObj->addAttribute('starting_at_including_tax', $coreHelper->currency(
+                        $inclTax, true, false
                     ));
                 } else {
-                    $_showPrice = $_inclTax;
-                    if (!$_taxHelper->displayPriceIncludingTax()) {
-                        $_showPrice = $_exclTax;
+                    $showPrice = $inclTax;
+                    if (!$taxHelper->displayPriceIncludingTax()) {
+                        $showPrice = $exclTax;
                     }
-                    $priceXmlObj->addAttribute('starting_at', $_coreHelper->currency($_showPrice, true, false));
+                    $priceXmlObj->addAttribute('starting_at', $coreHelper->currency($showPrice, true, false));
                 }
             }
         }
@@ -411,9 +410,9 @@ protected function _getTierPrices(Mage_Catalog_Model_Product $product)
                             false
                         );
                         $price['formated_price_incl_tax'] = Mage::app()->getStore()->formatPrice(
-                            Mage::app()->getStore()->convertPrice(
-                                Mage::helper('tax')->getPrice($product, $price['website_price'], true)
-                            ),
+                            Mage::app()->getStore()->convertPrice(Mage::helper('tax')->getPrice(
+                                $product, $price['website_price'], true
+                            )),
                             false
                         );
                         $res[] = $price;
@@ -422,15 +421,15 @@ protected function _getTierPrices(Mage_Catalog_Model_Product $product)
                     if ($price['price'] < $product->getPrice()) {
                         $price['savePercent'] = ceil(100 - ((100 / $product->getPrice()) * $price['price']));
                         $price['formated_price'] = Mage::app()->getStore()->formatPrice(
-                            Mage::app()->getStore()->convertPrice(
-                                Mage::helper('tax')->getPrice($product, $price['website_price'])
-                            ),
+                            Mage::app()->getStore()->convertPrice(Mage::helper('tax')->getPrice(
+                                $product, $price['website_price']
+                            )),
                             false
                         );
                         $price['formated_price_incl_tax'] = Mage::app()->getStore()->formatPrice(
-                            Mage::app()->getStore()->convertPrice(
-                                Mage::helper('tax')->getPrice($product, $price['website_price'], true)
-                            ),
+                            Mage::app()->getStore()->convertPrice(Mage::helper('tax')->getPrice(
+                                $product, $price['website_price'], true
+                            )),
                             false
                         );
                         $res[] = $price;
@@ -444,170 +443,169 @@ protected function _getTierPrices(Mage_Catalog_Model_Product $product)
     /**
      * Get tier prices (formatted) as array of strings
      *
-     * @param array $_tierPrices
-     * @param Mage_Catalog_Model_Product $_product
-     *
+     * @param array $tierPrices
+     * @param Mage_Catalog_Model_Product $product
      * @return array
      */
-    protected function _getTierPricesTextArray($_tierPrices, $_product)
+    protected function _getTierPricesTextArray($tierPrices, $product)
     {
         $pricesArray = array();
-        if (Mage::helper('weee')->typeOfDisplay($_product, array(1, 2, 4))) {
-            $_weeeTaxAttributes = Mage::helper('weee')->getProductWeeeAttributesForDisplay($_product);
+        if (Mage::helper('weee')->typeOfDisplay($product, array(1, 2, 4))) {
+            $weeeTaxAttributes = Mage::helper('weee')->getProductWeeeAttributesForDisplay($product);
         }
 
-        if ($_product->isGrouped()) {
-            $_tierPrices = $this->getTierPrices($_product);
+        if ($product->isGrouped()) {
+            $tierPrices = $this->getTierPrices($product);
         }
-        Mage::helper('weee')->processTierPrices($_product, $_tierPrices);
+        Mage::helper('weee')->processTierPrices($product, $tierPrices);
 
-        foreach ($_tierPrices as $_price) {
+        foreach ($tierPrices as $price) {
             $s = '';
             if ($this->helper('tax')->displayBothPrices()) {
-                if (Mage::helper('weee')->typeOfDisplay($_product, 0)) {
-                    $s .= $this->__('Buy %1$s for %2$s (%3$s incl. tax) each', $_price['price_qty'], $_price['formated_price_incl_weee_only'], $_price['formated_price_incl_weee']);
-                } else if (Mage::helper('weee')->typeOfDisplay($_product, 1)) {
-                    $s .= $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee_only']);
-                    if ($_weeeTaxAttributes) {
-                        $s .= '(' . $this->__('%1$s incl tax.', $_price['formated_price_incl_weee']);
+                if (Mage::helper('weee')->typeOfDisplay($product, 0)) {
+                    $s .= $this->__('Buy %1$s for %2$s (%3$s incl. tax) each', $price['price_qty'], $price['formated_price_incl_weee_only'], $price['formated_price_incl_weee']);
+                } else if (Mage::helper('weee')->typeOfDisplay($product, 1)) {
+                    $s .= $this->__('Buy %1$s for %2$s', $price['price_qty'], $price['formated_price_incl_weee_only']);
+                    if ($weeeTaxAttributes) {
+                        $s .= ' (' . $this->__('%1$s incl tax.', $price['formated_price_incl_weee']);
                         $separator = ' + ';
-                        foreach ($_weeeTaxAttributes as $_attribute) {
-                            $s .= $separator . $_attribute->getName() . ': ';
-                            $s .= Mage::helper('core')->currency($_attribute->getAmount());
+                        foreach ($weeeTaxAttributes as $attribute) {
+                            $s .= $separator . $attribute->getName() . ': ';
+                            $s .= Mage::helper('core')->currency($attribute->getAmount());
                         }
                         $s .= ')';
                     }
-                    $s .= $this->__('each');
-                } else if (Mage::helper('weee')->typeOfDisplay($_product, 4)) {
-                    $s .= $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee_only']);
-                    if ($_weeeTaxAttributes) {
-                        $s .= '(' . $this->__('%1$s incl tax.', $_price['formated_price_incl_weee']);
+                    $s .= ' ' . $this->__('each');
+                } else if (Mage::helper('weee')->typeOfDisplay($product, 4)) {
+                    $s .= $this->__('Buy %1$s for %2$s', $price['price_qty'], $price['formated_price_incl_weee_only']);
+                    if ($weeeTaxAttributes) {
+                        $s .= ' (' . $this->__('%1$s incl tax.', $price['formated_price_incl_weee']);
                         $separator = ' + ';
-                        foreach ($_weeeTaxAttributes as $_attribute) {
-                            $s .= $separator . $_attribute->getName() . ': ';
+                        foreach ($weeeTaxAttributes as $attribute) {
+                            $s .= $separator . $attribute->getName() . ': ';
                             $s .= Mage::helper('core')->currency(
-                                $_attribute->getAmount() + $_attribute->getTaxAmount()
+                                $attribute->getAmount() + $attribute->getTaxAmount()
                             );
                         }
                         $s .= ')';
                     }
-                    $s .= $this->__('each');
-                } else if (Mage::helper('weee')->typeOfDisplay($_product, 2)) {
-                    $s .= $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price']);
-                    if ($_weeeTaxAttributes) {
-                        $s .= '(';
-                        foreach ($_weeeTaxAttributes as $_attribute) {
-                            $s .= $_attribute->getName() . ': ';
-                            $s .= Mage::helper('core')->currency($_attribute->getAmount());
+                    $s .= ' ' . $this->__('each');
+                } else if (Mage::helper('weee')->typeOfDisplay($product, 2)) {
+                    $s .= $this->__('Buy %1$s for %2$s', $price['price_qty'], $price['formated_price']);
+                    if ($weeeTaxAttributes) {
+                        $s .= ' (';
+                        foreach ($weeeTaxAttributes as $attribute) {
+                            $s .= $attribute->getName() . ': ';
+                            $s .= Mage::helper('core')->currency($attribute->getAmount());
                         }
-                        $s .= $this->__('Total incl. Tax: %1$s', $_price['formated_price_incl_weee']) . ')';
+                        $s .= ' ' . $this->__('Total incl. Tax: %1$s', $price['formated_price_incl_weee']) . ')';
                     }
-                    $s .= $this->__('each');
+                    $s .= ' ' . $this->__('each');
                 } else {
-                    $s .= $this->__('Buy %1$s for %2$s (%3$s incl. tax) each', $_price['price_qty'], $_price['formated_price'], $_price['formated_price_incl_tax']);
+                    $s .= $this->__('Buy %1$s for %2$s (%3$s incl. tax) each', $price['price_qty'], $price['formated_price'], $price['formated_price_incl_tax']);
                 }
             } else {
                 if ($this->helper('tax')->displayPriceIncludingTax()) {
-                    if (Mage::helper('weee')->typeOfDisplay($_product, 0)) {
-                        $s .= $this->__('Buy %1$s for %2$s each', $_price['price_qty'], $_price['formated_price_incl_weee']);
-                    } else if (Mage::helper('weee')->typeOfDisplay($_product, 1)) {
-                        $s .= $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee']);
-                        if ($_weeeTaxAttributes) {
-                            $s .= '(';
+                    if (Mage::helper('weee')->typeOfDisplay($product, 0)) {
+                        $s .= $this->__('Buy %1$s for %2$s each', $price['price_qty'], $price['formated_price_incl_weee']);
+                    } else if (Mage::helper('weee')->typeOfDisplay($product, 1)) {
+                        $s .= $this->__('Buy %1$s for %2$s', $price['price_qty'], $price['formated_price_incl_weee']);
+                        if ($weeeTaxAttributes) {
+                            $s .= ' (';
                             $separator = '';
-                            foreach ($_weeeTaxAttributes as $_attribute) {
-                                $s .= $separator . $_attribute->getName() . ': ';
-                                $s .= Mage::helper('core')->currency($_attribute->getAmount());
+                            foreach ($weeeTaxAttributes as $attribute) {
+                                $s .= $separator . $attribute->getName() . ': ';
+                                $s .= Mage::helper('core')->currency($attribute->getAmount());
                                 $separator = ' + ';
                             }
                             $s .= ')';
                         }
-                        $s .= $this->__('each');
-                    } else if (Mage::helper('weee')->typeOfDisplay($_product, 4)) {
-                        $s .= $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee']);
-                        if ($_weeeTaxAttributes) {
-                            $s .= '(';
+                        $s .= ' ' . $this->__('each');
+                    } else if (Mage::helper('weee')->typeOfDisplay($product, 4)) {
+                        $s .= $this->__('Buy %1$s for %2$s', $price['price_qty'], $price['formated_price_incl_weee']);
+                        if ($weeeTaxAttributes) {
+                            $s .= ' (';
                             $separator = '';
-                            foreach ($_weeeTaxAttributes as $_attribute) {
-                                $s .= $separator . $_attribute->getName() . ': ';
+                            foreach ($weeeTaxAttributes as $attribute) {
+                                $s .= $separator . $attribute->getName() . ': ';
                                 $s .= Mage::helper('core')->currency(
-                                    $_attribute->getAmount() + $_attribute->getTaxAmount()
+                                    $attribute->getAmount() + $attribute->getTaxAmount()
                                 );
                                 $separator = ' + ';
                             }
                             $s .= ')';
                         }
-                        $s .= $this->__('each');
-                    } else if (Mage::helper('weee')->typeOfDisplay($_product, 2)) {
-                        $s .= $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_tax']);
-                        if ($_weeeTaxAttributes) {
-                            $s .= '(';
-                            foreach ($_weeeTaxAttributes as $_attribute) {
-                                $s .= $_attribute->getName() . ': ';
-                                $s .= Mage::helper('core')->currency($_attribute->getAmount());
+                        $s .= ' ' . $this->__('each');
+                    } else if (Mage::helper('weee')->typeOfDisplay($product, 2)) {
+                        $s .= $this->__('Buy %1$s for %2$s', $price['price_qty'], $price['formated_price_incl_tax']);
+                        if ($weeeTaxAttributes) {
+                            $s .= ' (';
+                            foreach ($weeeTaxAttributes as $attribute) {
+                                $s .= $attribute->getName() . ': ';
+                                $s .= Mage::helper('core')->currency($attribute->getAmount());
                             }
-                            $s .= $this->__('Total incl. Tax: %1$s', $_price['formated_price_incl_weee']) . ')';
+                            $s .=  ' ' . $this->__('Total incl. Tax: %1$s', $price['formated_price_incl_weee']) . ')';
                         }
-                        $s .= $this->__('each');
+                        $s .= ' ' . $this->__('each');
                     } else {
-                        $s .= $this->__('Buy %1$s for %2$s each', $_price['price_qty'], $_price['formated_price_incl_tax']);
+                        $s .= $this->__('Buy %1$s for %2$s each', $price['price_qty'], $price['formated_price_incl_tax']);
                     }
                 } else {
-                    if (Mage::helper('weee')->typeOfDisplay($_product, 0)) {
-                        $s .= $this->__('Buy %1$s for %2$s each', $_price['price_qty'], $_price['formated_price_incl_weee_only']);
-                    } else if (Mage::helper('weee')->typeOfDisplay($_product, 1)) {
-                        $s .= $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee_only']);
-                        if ($_weeeTaxAttributes) {
-                            $s .= '(';
+                    if (Mage::helper('weee')->typeOfDisplay($product, 0)) {
+                        $s .= $this->__('Buy %1$s for %2$s each', $price['price_qty'], $price['formated_price_incl_weee_only']);
+                    } else if (Mage::helper('weee')->typeOfDisplay($product, 1)) {
+                        $s .= $this->__('Buy %1$s for %2$s', $price['price_qty'], $price['formated_price_incl_weee_only']);
+                        if ($weeeTaxAttributes) {
+                            $s .= ' (';
                             $separator = '';
-                            foreach ($_weeeTaxAttributes as $_attribute) {
-                                $s .= $separator . $_attribute->getName() . ': ';
-                                $s .= Mage::helper('core')->currency($_attribute->getAmount());
+                            foreach ($weeeTaxAttributes as $attribute) {
+                                $s .= $separator . $attribute->getName() . ': ';
+                                $s .= Mage::helper('core')->currency($attribute->getAmount());
                                 $separator = ' + ';
                             }
                             $s .= ')';
                         }
-                        $s .= $this->__('each');
-                    } else if (Mage::helper('weee')->typeOfDisplay($_product, 4)) {
-                        $s .= $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee_only']);
-                        if ($_weeeTaxAttributes) {
-                            $s .= '(';
+                        $s .= ' ' . $this->__('each');
+                    } else if (Mage::helper('weee')->typeOfDisplay($product, 4)) {
+                        $s .= $this->__('Buy %1$s for %2$s', $price['price_qty'], $price['formated_price_incl_weee_only']);
+                        if ($weeeTaxAttributes) {
+                            $s .= ' (';
                             $separator = '';
-                            foreach ($_weeeTaxAttributes as $_attribute) {
-                                $s .= $separator . $_attribute->getName() . ': ';
+                            foreach ($weeeTaxAttributes as $attribute) {
+                                $s .= $separator . $attribute->getName() . ': ';
                                 $s .= Mage::helper('core')->currency(
-                                    $_attribute->getAmount() + $_attribute->getTaxAmount()
+                                    $attribute->getAmount() + $attribute->getTaxAmount()
                                 );
                                 $separator = ' + ';
                             }
                             $s .= ')';
                         }
-                        $s .= $this->__('each');
-                    } else if (Mage::helper('weee')->typeOfDisplay($_product, 2)) {
-                        $s .= $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price']);
-                        if ($_weeeTaxAttributes) {
-                            $s .= '(';
-                            foreach ($_weeeTaxAttributes as $_attribute) {
-                                $s .= $_attribute->getName() . ': ';
-                                $s .= Mage::helper('core')->currency($_attribute->getAmount());
+                        $s .= ' ' . $this->__('each');
+                    } else if (Mage::helper('weee')->typeOfDisplay($product, 2)) {
+                        $s .= $this->__('Buy %1$s for %2$s', $price['price_qty'], $price['formated_price']);
+                        if ($weeeTaxAttributes) {
+                            $s .= ' (';
+                            foreach ($weeeTaxAttributes as $attribute) {
+                                $s .= $attribute->getName() . ': ';
+                                $s .= Mage::helper('core')->currency($attribute->getAmount());
                             }
-                            $s .= $this->__('Total incl. Tax: %1$s', $_price['formated_price_incl_weee_only']) . ')';
+                            $s .= ' ' . $this->__('Total incl. Tax: %1$s', $price['formated_price_incl_weee_only']) . ')';
                         }
-                        $s .= $this->__('each');
+                        $s .= ' ' . $this->__('each');
                     } else {
-                        $s .= $this->__('Buy %1$s for %2$s each', $_price['price_qty'], $_price['formated_price']);
+                        $s .= $this->__('Buy %1$s for %2$s each', $price['price_qty'], $price['formated_price']);
                     }
                 }
             }
-            if (!$_product->isGrouped()) {
-                $condition1 = ($_product->getPrice() == $_product->getFinalPrice()
-                    && $_product->getPrice() > $_price['price']);
+            if (!$product->isGrouped()) {
+                $condition1 = ($product->getPrice() == $product->getFinalPrice()
+                    && $product->getPrice() > $price['price']);
 
-                $condition2 = ($_product->getPrice() != $_product->getFinalPrice()
-                    && $_product->getFinalPrice() > $_price['price']);
+                $condition2 = ($product->getPrice() != $product->getFinalPrice()
+                    && $product->getFinalPrice() > $price['price']);
 
                 if ($condition1 || $condition2) {
-                    $s .= ' ' . $this->__('and') . ' ' . $this->__('save') . ' ' . $_price['savePercent'] . '%';
+                    $s .= ' ' . $this->__('and') . ' ' . $this->__('save') . ' ' . $price['savePercent'] . '%';
                 }
             }
             $pricesArray[] = $s;
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Giftcard.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Giftcard.php
index d36c4e807bc..94421593bbd 100755
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Giftcard.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Giftcard.php
@@ -25,7 +25,7 @@
  */
 
 /**
- * Giftcard product price xml renderer
+ * Gift card product price xml renderer
  *
  * @category    Mage
  * @package     Mage_XmlConnect
@@ -68,21 +68,22 @@ public function getMaxAmount($product = null)
      * @param Mage_XmlConnect_Model_Simplexml_Element $item
      */
     public function collectProductPrices(
-        Mage_Catalog_Model_Product $product,
-        Mage_XmlConnect_Model_Simplexml_Element $item
+        Mage_Catalog_Model_Product $product, Mage_XmlConnect_Model_Simplexml_Element $item
     ) {
         $this->setProduct($product);
 
         if ($product->getCanShowPrice() !== false) {
             $priceXmlObj = $item->addChild('price');
 
-            if (($_min = $this->getMinAmount()) && ($_max = $this->getMaxAmount()) && ($_min == $_max)) {
-                $priceXmlObj->addAttribute('regular', Mage::helper('core')->currency($_min, true, false));
-            } elseif (($_min = $this->getMinAmount()) && $_min != 0) {
+            $min = $this->getMinAmount();
+            $max = $this->getMaxAmount();
+            if ($min && $max && $min == $max) {
+                $priceXmlObj->addAttribute('regular', Mage::helper('core')->currency($min, true, false));
+            } else if ($min && $min != 0) {
                 $priceXmlObj->addAttribute(
                     'regular',
                     Mage::helper('enterprise_giftcard')->__('From') . ': '
-                        . Mage::helper('core')->currency($_min, true, false)
+                        . Mage::helper('core')->currency($min, true, false)
                 );
             }
         }
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Related.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Related.php
index 4886320b954..058474064cc 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Related.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Related.php
@@ -47,7 +47,7 @@ public function getRelatedProductsXmlObj()
         $productObj = $this->getParentBlock()->getProduct();
 
         if (is_object(Mage::getConfig()->getNode('modules/Enterprise_TargetRule'))) {
-            Mage::register('product', $productObj);
+            Mage::register('product', $productObj, true);
 
             $productBlock = $this->getLayout()->addBlock(
                 'enterprise_targetrule/catalog_product_list_related', 'relatedProducts'
@@ -111,7 +111,7 @@ protected function _toHtml()
      */
     protected function _getProductCollection()
     {
-        if (is_null($this->_productCollection)) {
+        if ($this->_productCollection === null) {
             $collection = $this->getParentBlock()->getProduct()->getRelatedProductCollection();
             Mage::getSingleton('catalog/layer')->prepareProductCollection($collection);
             /**
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review.php
index b80996181c4..9f19fa99d25 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review.php
@@ -48,6 +48,7 @@ class Mage_XmlConnect_Block_Catalog_Product_Review extends Mage_XmlConnect_Block
     public function reviewToXmlObject(Mage_Review_Model_Review $review, $itemNodeName = 'item')
     {
         $rating = 0;
+        /** @var $item Mage_XmlConnect_Model_Simplexml_Element */
         $item = Mage::getModel('xmlconnect/simplexml_element', '<' . $itemNodeName . '></' . $itemNodeName . '>');
         if ($review->getId()) {
             $item->addChild('review_id', $review->getId());
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Search.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Search.php
index 1c8873e942b..e023f3b0a50 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Search.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Search.php
@@ -35,7 +35,7 @@ class Mage_XmlConnect_Block_Catalog_Search extends Mage_XmlConnect_Block_Catalog
 {
     /**
      * Search results xml renderer
-     * XML also contains filters that can be apply (accorfingly already applyed filters
+     * XML also contains filters that can be apply (accordingly already applied filters
      * and search query) and sort fields
      *
      * @return string
@@ -79,8 +79,8 @@ protected function _toHtml()
         $showFiltersAndOrders = (bool) count($productsXmlObj);
         $requestParams = $this->getRequest()->getParams();
         foreach ($requestParams as $key => $value) {
-            if (0 === strpos($key, parent::REQUEST_SORT_ORDER_PARAM_REFIX)
-                || 0 === strpos($key, parent::REQUEST_FILTER_PARAM_REFIX)
+            if (0 === strpos($key, parent::REQUEST_SORT_ORDER_PARAM_PREFIX)
+                || 0 === strpos($key, parent::REQUEST_FILTER_PARAM_PREFIX)
             ) {
                 $showFiltersAndOrders = false;
                 break;
@@ -118,7 +118,7 @@ protected function _toHtml()
          * Sort fields
          */
         if ($showFiltersAndOrders) {
-            $searchXmlObject->appendChild($this->getProductSortFeildsXmlObject());
+            $searchXmlObject->appendChild($this->getSearchProductSortFieldsXmlObject());
         }
 
         return $searchXmlObject->asNiceXml();
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Search/Suggest.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Search/Suggest.php
index 01fe87f0912..02e4895818a 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Search/Suggest.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Search/Suggest.php
@@ -45,6 +45,7 @@ class Mage_XmlConnect_Block_Catalog_Search_Suggest extends Mage_CatalogSearch_Bl
      */
     protected function _toHtml()
     {
+        /** @var $suggestXmlObj Mage_XmlConnect_Model_Simplexml_Element */
         $suggestXmlObj = Mage::getModel('xmlconnect/simplexml_element', '<suggestions></suggestions>');
 
         if (!$this->getRequest()->getParam(Mage_CatalogSearch_Helper_Data::QUERY_VAR_NAME, false)) {
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Billing.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Billing.php
index cf5804faf2a..35020add2ee 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Billing.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Billing.php
@@ -40,6 +40,7 @@ class Mage_XmlConnect_Block_Checkout_Address_Billing extends Mage_Checkout_Block
      */
     protected function _toHtml()
     {
+        /** @var $billingXmlObj Mage_XmlConnect_Model_Simplexml_Element */
         $billingXmlObj = Mage::getModel('xmlconnect/simplexml_element', '<billing></billing>');
 
         $addressId = $this->getAddress()->getId();
@@ -54,9 +55,7 @@ protected function _toHtml()
                 $item->addAttribute('selected', 1);
             }
             $this->getChild('address_list')->prepareAddressData($address, $item);
-            $item->addChild(
-                'address_line', $billingXmlObj->escapeXml($address->format('oneline'))
-            );
+            $item->addChild('address_line', $billingXmlObj->escapeXml($address->format('oneline')));
         }
 
         return $billingXmlObj->asNiceXml();
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Form.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Form.php
index 096ce88da97..c761887ab5a 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Form.php
@@ -31,7 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Checkout_Address_Form extends Mage_Core_Block_Template
+class Mage_XmlConnect_Block_Checkout_Address_Form extends Mage_Core_Block_Abstract
 {
     /**
      * Render customer address form xml
@@ -40,134 +40,82 @@ class Mage_XmlConnect_Block_Checkout_Address_Form extends Mage_Core_Block_Templa
      */
     protected function _toHtml()
     {
-        /** @var $xmlModel Mage_XmlConnect_Model_Simplexml_Element */
-        $xmlModel = Mage::getModel('xmlconnect/simplexml_element', '<form></form>');
-        $xmlModel->addAttribute('name', 'address_form');
-        $xmlModel->addAttribute('method', 'post');
-
-        $addressType = $this->getType();
-        if (!$addressType) {
-            $addressType = 'billing';
-        }
+        $addressType = $this->getType() ? $this->getType() : 'billing';
 
-        $isAllowedGuestCheckout = Mage::getSingleton('checkout/session')->getQuote()->isAllowedGuestCheckout();
+        $action = Mage::helper('xmlconnect')->getActionUrl('xmlconnect/checkout/savebillingaddress');
 
-        $countries = $this->_getCountryOptions();
+        /** @var Mage_XmlConnect_Model_Simplexml_Form $fromXmlObj */
+        $fromXmlObj = Mage::getModel('xmlconnect/simplexml_form', array(
+            'xml_id' => 'address_form', 'action' => $action, 'use_container' => true
+        ))->setFieldNameSuffix($addressType);
 
-        $xmlModel->addField($addressType . '[firstname]', 'text', array(
-            'label'     => $this->__('First Name'),
-            'required'  => 'true',
-            'value'     => ''
-        ));
+        $isAllowedGuestCheckout = Mage::getSingleton('checkout/session')->getQuote()->isAllowedGuestCheckout();
 
-        $xmlModel->addField($addressType . '[lastname]', 'text', array(
-            'label'     => $this->__('Last Name'),
-            'required'  => 'true',
-            'value'     => ''
+        $fromXmlObj->addField('firstname', 'text', array(
+            'name' => 'firstname', 'label' => $this->__('First Name'), 'required' => 'true'
         ));
 
-        $xmlModel->addField($addressType . '[company]', 'text', array(
-            'label'     => $this->__('Company'),
-            'required'  => 'true',
-            'value'     => ''
+        $fromXmlObj->addField('lastname', 'text', array(
+            'name' => 'lastname', 'label' => $this->__('Last Name'), 'required' => 'true'
         ));
 
+        $fromXmlObj->addField('company', 'text', array('name' => 'company', 'label' => $this->__('Company')));
+
         if ($isAllowedGuestCheckout && !Mage::getSingleton('customer/session')->isLoggedIn()
             && $addressType == 'billing'
         ) {
-            $emailField = $xmlModel->addField($addressType . '[email]', 'text', array(
-                'label'     => $this->__('Email Address'),
-                'required'  => 'true',
-                'value'     => ''
-            ));
-            $emailValidator = $emailField->addChild('validators')->addChild('validator');
-            $emailValidator->addAttribute('type', 'email');
-            $emailValidator->addAttribute('message', $this->__('Wrong email format'));
+            $fromXmlObj->addField('email', 'text', array(
+                'name' => 'email', 'label' => $this->__('Email Address'), 'required' => 'true'
+            ))->addValidator()->addRule(array('type' => 'email', 'message' => 'Wrong email format'));
         }
 
-        $xmlModel->addField($addressType . '[street][]', 'text', array(
-            'label'     => $this->__('Address'),
-            'required'  => 'true',
-            'value'     => ''
+        $fromXmlObj->addField('street', 'text', array(
+            'name' => 'street[]', 'label' => $this->__('Address'), 'required' => 'true'
         ));
 
-        $xmlModel->addField($addressType . '[street][]', 'text', array(
-             'label'     => $this->__('Address 2'),
-             'value'     => ''
-        ));
+        $fromXmlObj->addField('street_2', 'text', array('name' => 'street[]', 'label' => $this->__('Address 2')));
 
-        $xmlModel->addField($addressType . '[city]', 'text', array(
-            'label'     => $this->__('City'),
-            'required'  => 'true',
-            'value'     => ''
+        $fromXmlObj->addField('city', 'text', array(
+            'name' => 'city', 'label' => $this->__('City'), 'required' => 'true'
         ));
 
-        $countryOptionsXml = $xmlModel->addField($addressType . '[country_id]', 'select', array(
-            'label'     => $this->__('Country'),
-            'required'  => 'true',
-            'value'     => ''
-        ))->addChild('values');
-
-        foreach ($countries as $data) {
-            $regions = array();
+        $fromXmlObj->addField('country_id', 'countryListSelect', array(
+            'name' => 'country_id', 'label' => $this->__('Country'), 'required' => 'true', 'old_format' => true
+        ));
 
-            if ($data['value']) {
-                $regions = $this->_getRegionOptions($data['value']);
-            }
+        $fromXmlObj->addField('region', 'text', array('name' => 'region', 'label' => $this->__('State/Province')));
 
-            $regionStr = (!empty($regions) ? 'region_id' : 'region');
-
-            $countryXml = $countryOptionsXml->addCustomChild('item', null, array('relation' => $regionStr));
-            $countryXml->addCustomChild('label', (string)$data['label']);
-            $countryXml->addCustomChild('value', (string)$data['value']);
-            if (!empty($regions)) {
-                $regionXml = $countryXml->addChild('regions');
-                foreach ($regions as $_data) {
-                    $regionItemXml = $regionXml->addChild('region_item');
-                    $regionItemXml->addCustomChild('label', (string)$_data['label']);
-                    $regionItemXml->addCustomChild('value', (string)$_data['value']);
-                }
-            }
-        }
-
-        $xmlModel->addField($addressType . '[region]', 'text', array(
-            'label' => $this->__('State/Province'),
-            'value' => ''
+        $fromXmlObj->addField('region_id', 'select', array(
+            'name' => 'region_id', 'label' => $this->__('State/Province'), 'required' => 'true'
         ));
 
-        $xmlModel->addField($addressType . '[region_id]', 'select', array(
-            'label'     => $this->__('State/Province'),
-            'required'  => 'true',
-            'value'     => ''
+        $fromXmlObj->addField('postcode', 'text', array(
+            'name' => 'postcode', 'label' => $this->__('Zip/Postal Code'), 'required' => 'true'
         ));
 
-        $xmlModel->addField($addressType . '[postcode]', 'text', array(
-            'label'     => $this->__('Zip/Postal Code'),
-            'required'  => 'true',
-            'value'     => ''
+        $fromXmlObj->addField('telephone', 'text', array(
+            'name' => 'telephone', 'label' => $this->__('Telephone'), 'required' => 'true'
         ));
 
-        $xmlModel->addField($addressType . '[telephone]', 'text', array(
-            'label'     => $this->__('Telephone'),
-            'required'  => 'true',
-            'value'     => ''
-        ));
+        $fromXmlObj->addField('fax', 'text', array('name' => 'fax', 'label' => $this->__('Fax')));
 
-        $xmlModel->addField($addressType . '[fax]', 'text', array(
-            'label' => $this->__('Fax'),
-            'value' => ''
+        $fromXmlObj->addField('save_in_address_book', 'checkbox', array(
+            'name' => 'save_in_address_book','label' => $this->__('Save in address book')
         ));
 
-        $xmlModel->addField($addressType . '[save_in_address_book]', 'checkbox', array(
-            'label' => $this->__('Save in address book'),
-        ));
+        // Add custom address attributes
+        Mage::helper('xmlconnect/customer_form_renderer')
+            ->setAttributesBlockName('customer_form_billing_address_user_defined_attributes')
+            ->setFormCode('customer_register_address')->setBlockEntity(Mage::getModel('customer/address'))
+            ->addCustomAttributes($fromXmlObj, $this->getLayout(), $addressType);
 
-        return $xmlModel->asNiceXml();
+        return $fromXmlObj->getXml();
     }
 
     /**
      * Retrieve regions by country
      *
+     * @deprecated will delete in the next version
      * @param string $countryId
      * @return array
      */
@@ -191,6 +139,7 @@ protected function _getRegionOptions($countryId)
     /**
      * Retrieve countries
      *
+     * @deprecated will delete in the next version
      * @return array
      */
     protected function _getCountryOptions()
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Shipping.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Shipping.php
index 97b4d52f3e2..d8ed7375b3d 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Shipping.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Shipping.php
@@ -40,6 +40,7 @@ class Mage_XmlConnect_Block_Checkout_Address_Shipping extends Mage_Checkout_Bloc
      */
     protected function _toHtml()
     {
+        /** @var $shippingXmlObj Mage_XmlConnect_Model_Simplexml_Element */
         $shippingXmlObj = Mage::getModel('xmlconnect/simplexml_element', '<shipping></shipping>');
 
         $addressId = $this->getAddress()->getId();
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Agreements.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Agreements.php
index 78be124d63b..cc28113fffd 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Agreements.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Agreements.php
@@ -49,7 +49,7 @@ protected function _toHtml()
                 if (!$agreement->getIsHtml()) {
                     $content = nl2br($agreementsXmlObj->escapeXml($content));
                 } else {
-                    $agreementsXmlObj->xmlentities($content);
+                    $content = $agreementsXmlObj->xmlentities($content);
                 }
                 $agreementText = $agreementsXmlObj->escapeXml($agreement->getCheckboxText());
                 $itemXmlObj->addChild('label', $agreementText);
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer.php
new file mode 100644
index 00000000000..eeef5aac8a3
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Shopping cart item render block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Xmlconnect_Block_Checkout_Cart_Item_Renderer extends Mage_Checkout_Block_Cart_Item_Renderer
+{
+    /**
+     * Get product thumbnail image
+     *
+     * @return Mage_XmlConnect_Helper_Catalog_Product_Image
+     */
+    public function getProductThumbnail()
+    {
+        if (!is_null($this->_productThumbnail)) {
+            return $this->_productThumbnail;
+        }
+        return $this->helper('xmlconnect/catalog_product_image')->init($this->getProduct(), 'thumbnail');
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Bundle.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Bundle.php
new file mode 100644
index 00000000000..505ea909889
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Bundle.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Shopping cart bundle item render block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Xmlconnect_Block_Checkout_Cart_Item_Renderer_Bundle
+    extends Mage_Bundle_Block_Checkout_Cart_Item_Renderer
+{
+    /**
+     * Get product thumbnail image
+     *
+     * @return Mage_XmlConnect_Helper_Catalog_Product_Image
+     */
+    public function getProductThumbnail()
+    {
+        if (!is_null($this->_productThumbnail)) {
+            return $this->_productThumbnail;
+        }
+        return $this->helper('xmlconnect/catalog_product_image')->init($this->getProduct(), 'thumbnail');
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Configurable.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Configurable.php
new file mode 100644
index 00000000000..0a4c4c31e9a
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Configurable.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Shopping cart configurable item render block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Xmlconnect_Block_Checkout_Cart_Item_Renderer_Configurable
+    extends Mage_Checkout_Block_Cart_Item_Renderer_Configurable
+{
+    /**
+     * Get product thumbnail image
+     *
+     * @return Mage_XmlConnect_Helper_Catalog_Product_Image
+     */
+    public function getProductThumbnail()
+    {
+        $product = $this->getChildProduct();
+        if (!$product || !$product->getData('thumbnail')
+            || ($product->getData('thumbnail') == 'no_selection')
+            || (Mage::getStoreConfig(self::CONFIGURABLE_PRODUCT_IMAGE) == self::USE_PARENT_IMAGE)
+        ) {
+            $product = $this->getProduct();
+        }
+        return $this->helper('xmlconnect/catalog_product_image')->init($product, 'thumbnail');
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Downloadable.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Downloadable.php
new file mode 100644
index 00000000000..82283fa3539
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Downloadable.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Shopping cart downloadable item render block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Xmlconnect_Block_Checkout_Cart_Item_Renderer_Downloadable
+    extends Mage_Downloadable_Block_Checkout_Cart_Item_Renderer
+{
+    /**
+     * Get product thumbnail image
+     *
+     * @return Mage_XmlConnect_Helper_Catalog_Product_Image
+     */
+    public function getProductThumbnail()
+    {
+        if (!is_null($this->_productThumbnail)) {
+            return $this->_productThumbnail;
+        }
+        return $this->helper('xmlconnect/catalog_product_image')->init($this->getProduct(), 'thumbnail');
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Giftcard.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Giftcard.php
new file mode 100644
index 00000000000..0380b57fba3
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Giftcard.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Shopping cart giftcard item render block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Xmlconnect_Block_Checkout_Cart_Item_Renderer_Giftcard
+    extends Enterprise_GiftCard_Block_Checkout_Cart_Item_Renderer
+{
+    /**
+     * Get product thumbnail image
+     *
+     * @return Mage_XmlConnect_Helper_Catalog_Product_Image
+     */
+    public function getProductThumbnail()
+    {
+        if (!is_null($this->_productThumbnail)) {
+            return $this->_productThumbnail;
+        }
+        return $this->helper('xmlconnect/catalog_product_image')->init($this->getProduct(), 'thumbnail');
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Grouped.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Grouped.php
new file mode 100644
index 00000000000..8c7b37ca2e5
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Cart/Item/Renderer/Grouped.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Shopping cart grouped item render block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Xmlconnect_Block_Checkout_Cart_Item_Renderer_Grouped extends Mage_Checkout_Block_Cart_Item_Renderer_Grouped
+{
+    /**
+     * Get product thumbnail image
+     *
+     * @return Mage_XmlConnect_Helper_Catalog_Product_Image
+     */
+    public function getProductThumbnail()
+    {
+        $product = $this->getProduct();
+        if (!$product->getData('thumbnail')
+            ||($product->getData('thumbnail') == 'no_selection')
+            || (Mage::getStoreConfig(self::GROUPED_PRODUCT_IMAGE) == self::USE_PARENT_IMAGE)
+        ) {
+            $product = $this->getGroupedProduct();
+        }
+        return $this->helper('xmlconnect/catalog_product_image')->init($product, 'thumbnail');
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address.php
new file mode 100644
index 00000000000..e06e184ed2e
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Customer saved addresses renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Checkout_Onepage_Address extends Mage_Core_Block_Abstract
+{
+    /**
+     * Save address action
+     */
+    const SAVE_ADDRESS_ACTION = 'xmlconnect/checkout/saveaddressinfo';
+
+    /**
+     * Render customer address form and saved addresses list
+     *
+     * @return string
+     */
+    protected function _toHtml()
+    {
+        /** @var $xmlObj Mage_XmlConnect_Model_Simplexml_Element */
+        $xmlObj = Mage::getModel('xmlconnect/simplexml_element', '<address_massaction></address_massaction>');
+
+        // Address saved list render
+        $listChild = $xmlObj->addCustomChild('address_list');
+        $this->getChild('address_list')->setXmlObj($listChild)->toHtml();
+
+        // Address form render
+        $formChild = $xmlObj->addCustomChild('form_list', null, array(
+            'id' => 'checkout_addresses', 'action' => self::SAVE_ADDRESS_ACTION
+        ));
+
+        $formBlock = $this->getChild('address_form');
+        $isGuest = Mage::getSingleton('customer/session')->isLoggedIn() ? false : true;
+
+        $billingFormXml = $formBlock->setType('billing')->setIsGuest($isGuest)->toHtml();
+        $shippingFormXml = $formBlock->setType('shipping')->setIsGuest(false)->toHtml();
+        $formChild->appendChild($billingFormXml)->appendChild($shippingFormXml);
+
+        return $xmlObj->asNiceXml();
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address/Form.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address/Form.php
new file mode 100644
index 00000000000..a557c24b659
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address/Form.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * One page address form renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Checkout_Onepage_Address_Form extends Mage_Core_Block_Abstract
+{
+    /**
+     * Render customer address form
+     *
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    protected  function _toHtml()
+    {
+        $addressType = $this->getType() ? $this->getType() : 'billing';
+        $isGuest = $this->getIsGuest();
+
+        /** @var $formXmlObj Mage_XmlConnect_Model_Simplexml_Form */
+        $formXmlObj = Mage::getModel('xmlconnect/simplexml_form', array(
+            'xml_id' => $addressType, 'action' => '', 'use_container' => true
+        ))->setFieldNameSuffix($addressType);
+
+        /** @var $formFieldset Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset */
+        $formFieldset = $formXmlObj->addFieldset($addressType);
+
+        $formFieldset->addField('firstname', 'text', array(
+            'name' => 'firstname', 'label' => $this->__('First Name'), 'required' => '1'
+        ));
+
+        $formFieldset->addField('lastname', 'text', array(
+            'name' => 'lastname', 'label' => $this->__('Last Name'), 'required' => '1'
+        ));
+
+        $formFieldset->addField('company', 'text', array(
+            'name' => 'company', 'label' => $this->__('Company'), 'required' => '1'
+        ));
+
+        if ($isGuest) {
+            $emailField = $formFieldset->addField('email', 'text', array(
+                'name' => 'email', 'label' => $this->__('Email Address'), 'required' => '1'
+            ));
+            $emailValidator = $emailField->addValidator();
+            $emailValidator->addRule(array('type' => 'email'));
+        }
+
+        $formFieldset->addField('street', 'text', array(
+            'name' => 'street[]',
+            'label' => $this->__('Address'),
+            'required' => '1',
+        ));
+
+        $formFieldset->addField('street_2', 'text', array(
+            'name' => 'street[]', 'label' => $this->__('Address 2')
+        ));
+
+        $formFieldset->addField('city', 'text', array(
+            'name' => 'city', 'label' => $this->__('City'), 'required' => '1'
+        ));
+
+        $formFieldset->addField('country_id', 'countryListSelect', array(
+            'name' => 'country_id', 'label' => $this->__('Country'), 'required' => '1',
+        ));
+
+        $formFieldset->addField('postcode', 'text', array(
+            'name' => 'postcode', 'label' => $this->__('Zip/Postal Code'), 'required' => '1'
+        ));
+
+        $formFieldset->addField('telephone', 'text', array(
+            'name' => 'telephone', 'label' => $this->__('Telephone'), 'required' => '1'
+        ));
+
+        $formFieldset->addField('fax', 'text', array('name' => 'fax', 'label' => $this->__('Fax')));
+
+        // Add custom address attributes
+        Mage::helper('xmlconnect/customer_form_renderer')->setAttributesBlockName('customer_address')
+            ->setFormCode('customer_register_address')->setBlockEntity(Mage::getModel('sales/quote_address'))
+            ->setBlockEntityType('customer_address')
+            ->addCustomAttributes($formFieldset, $this->getLayout(), $addressType);
+
+        $formFieldset->addField('save_in_address_book', 'checkbox', array(
+            'name' => 'save_in_address_book', 'label' => $this->__('Save in address book')
+        ));
+
+        return $formXmlObj->toXmlObject();
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address/List.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address/List.php
new file mode 100644
index 00000000000..6afdc6a205c
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Address/List.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Customer saved addresses renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Checkout_Onepage_Address_List extends Mage_Checkout_Block_Onepage_Abstract
+{
+    /**
+     * Render customer address list xml
+     *
+     * @return Mage_XmlConnect_Block_Checkout_Onepage_Address_List
+     */
+    protected function _toHtml()
+    {
+        /** @var $listChild Mage_XmlConnect_Model_Simplexml_Element */
+        $listChild = $this->getXmlObj();
+
+        $billingAddress = $this->getCustomer()->getPrimaryBillingAddress();
+        $shippingAddress = $this->getCustomer()->getPrimaryShippingAddress();
+
+        foreach ($this->getCustomer()->getAddresses() as $address) {
+            $childOptions = array();
+            if ($billingAddress && ($billingAddress->getEntityId() == $address->getEntityId())) {
+                $childOptions['default_billing'] = 1;
+            }
+            if ($shippingAddress && ($shippingAddress->getEntityId() == $address->getEntityId())) {
+                $childOptions['default_shipping'] = 1;
+            }
+            $addressItem = $listChild->addCustomChild('item', null, $childOptions);
+            $this->_prepareAddressData($address, $addressItem);
+        }
+        return $this;
+    }
+
+    /**
+     * Collect address data to xml node
+     * Remove objects from data array and escape data values
+     *
+     * @param Mage_Customer_Model_Address $address
+     * @param Mage_XmlConnect_Model_Simplexml_Element $item
+     * @return Mage_XmlConnect_Block_Checkout_Onepage_Address_List
+     */
+    protected function _prepareAddressData(
+        Mage_Customer_Model_Address $address, Mage_XmlConnect_Model_Simplexml_Element $item
+    ) {
+        $attributes = Mage::helper('customer/address')->getAttributes();
+        $data = array('entity_id' => $address->getId());
+
+        foreach ($attributes as $attribute) {
+            /* @var $attribute Mage_Customer_Model_Attribute */
+            if (!$attribute->getIsVisible()) {
+                continue;
+            }
+            if ($attribute->getAttributeCode() == 'country_id') {
+                $data['country'] = $address->getCountryModel()->getName();
+                $data['country_id'] = $address->getCountryId();
+            } else if ($attribute->getAttributeCode() == 'region') {
+                $data['region'] = $address->getRegion();
+            } else {
+                $dataModel = Mage_Customer_Model_Attribute_Data::factory($attribute, $address);
+                $attributeValue     = $dataModel->outputValue(
+                    Mage_Customer_Model_Attribute_Data::OUTPUT_FORMAT_ONELINE
+                );
+                if ($attribute->getFrontendInput() == 'multiline') {
+                    $values = $dataModel->outputValue(Mage_Customer_Model_Attribute_Data::OUTPUT_FORMAT_ARRAY);
+                    // explode lines
+                    foreach ($values as $attributeIndex => $attributeVal) {
+                        $key = sprintf('%s%d', $attribute->getAttributeCode(), $attributeIndex + 1);
+                        $data[$key] = $attributeVal;
+                    }
+                }
+                $data[$attribute->getAttributeCode()] = $attributeValue;
+            }
+        }
+
+        foreach ($data as $key => $value) {
+            if (empty($value)) {
+                continue;
+            }
+            $item->addCustomChild($key, $value);
+        }
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Review.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Review.php
new file mode 100644
index 00000000000..1df267831ef
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Onepage/Review.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * One page checkout order review xml renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Checkout_Onepage_Review extends Mage_Checkout_Block_Cart_Abstract
+{
+    /**
+     * Order review xml renderer
+     *
+     * @return string
+     */
+    protected function _toHtml()
+    {
+        /** @var $xmlObject Mage_XmlConnect_Model_Simplexml_Element */
+        $xmlObject = Mage::getModel('xmlconnect/simplexml_element', '<order></order>');
+        $quote = $this->getQuote();
+
+        $this->getChild('items')->addCartProductsToXmlObj($xmlObject, $quote);
+
+        /**
+         * Cart Totals
+         */
+        $this->getChild('totals')->setCartXmlObject($xmlObject)->toHtml();
+
+        /**
+         * Agreements
+         */
+        $agreements = $this->getChildHtml('agreements');
+        if ($agreements) {
+            $agreementsXmlObj = Mage::getModel('xmlconnect/simplexml_element', $agreements);
+            $xmlObject->appendChild($agreementsXmlObj);
+        }
+        return $xmlObject->asNiceXml();
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review/Info.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review/Info.php
index 58edca8f9cc..953f7db8c60 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review/Info.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review/Info.php
@@ -42,6 +42,7 @@ protected function _toHtml()
     {
         $itemsXmlObj = Mage::getModel('xmlconnect/simplexml_element', '<products></products>');
         $quote = Mage::getSingleton('checkout/session')->getQuote();
+        $productSmallImageSize = Mage::getModel('xmlconnect/images')->getImageLimitParam('content/product_small');
 
         /* @var $item Mage_Sales_Model_Quote_Item */
         foreach ($this->getItems() as $item) {
@@ -57,14 +58,10 @@ protected function _toHtml()
             $itemXml->addChild('item_id', $item->getId());
             $itemXml->addChild('name', $itemsXmlObj->escapeXml($renderer->getProductName()));
             $itemXml->addChild('qty', $renderer->getQty());
-            $icon = $renderer->getProductThumbnail()->resize(
-                Mage::helper('xmlconnect/image')->getImageSizeForContent('product_small')
-            );
+            $icon = $renderer->getProductThumbnail()->resize($productSmallImageSize);
 
             $iconXml = $itemXml->addChild('icon', $icon);
-
-            $file = Mage::helper('xmlconnect')->urlToPath($icon);
-            $iconXml->addAttribute('modification_time', filemtime($file));
+            $iconXml->addAttribute('modification_time', filemtime($icon->getNewFile()));
 
             /**
              * Price
@@ -81,12 +78,12 @@ protected function _toHtml()
             }
 
             if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()) {
-                $_incl = $this->helper('checkout')->getPriceInclTax($item);
+                $incl = $this->helper('checkout')->getPriceInclTax($item);
                 $typeOfDisplay = Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales');
                 if ($typeOfDisplay && $item->getWeeeTaxAppliedAmount()) {
-                    $inclPrice = $_incl + $item->getWeeeTaxAppliedAmount();
+                    $inclPrice = $incl + $item->getWeeeTaxAppliedAmount();
                 } else {
-                    $inclPrice = $_incl - $item->getWeeeTaxDisposition();
+                    $inclPrice = $incl - $item->getWeeeTaxDisposition();
                 }
             }
 
@@ -130,13 +127,13 @@ protected function _toHtml()
                 }
             }
             if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()) {
-                $_incl = $this->helper('checkout')->getSubtotalInclTax($item);
+                $incl = $this->helper('checkout')->getSubtotalInclTax($item);
                 if (Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales')
                     && $item->getWeeeTaxAppliedAmount()
                 ) {
-                    $inclPrice = $_incl + $item->getWeeeTaxAppliedRowAmount();
+                    $inclPrice = $incl + $item->getWeeeTaxAppliedRowAmount();
                 } else {
-                    $inclPrice = $_incl - $item->getWeeeTaxRowDisposition();
+                    $inclPrice = $incl - $item->getWeeeTaxRowDisposition();
                 }
             }
 
@@ -169,18 +166,31 @@ protected function _toHtml()
             /**
              * Options list
              */
-            $_options = $renderer->getOptionList();
-            if ($_options) {
+            $options = $renderer->getOptionList();
+            if ($options) {
                 $itemOptionsXml = $itemXml->addChild('options');
-                foreach ($_options as $_option) {
-                    $_formattedOptionValue = $renderer->getFormatedOptionValue($_option);
+                foreach ($options as $option) {
+                    $formattedOptionValue = $renderer->getFormatedOptionValue($option);
                     $optionXml = $itemOptionsXml->addChild('option');
-                    $labelValue = $itemsXmlObj->escapeXml($_option['label']);
+                    $labelValue = $itemsXmlObj->escapeXml($option['label']);
                     $optionXml->addAttribute('label', $labelValue);
-                    $textValue = $itemsXmlObj->escapeXml($_formattedOptionValue['value']);
+                    $textValue = $itemsXmlObj->escapeXml($formattedOptionValue['value']);
                     $optionXml->addAttribute('text', $textValue);
                 }
             }
+
+            /**
+             * Downloadable product options
+             */
+            $links = $renderer->getLinks();
+            if ($links) {
+                $itemOptionsXml = $itemXml->addCustomChild('options', null, array(
+                    'label' => $renderer->getLinksTitle()
+                ));
+                foreach ($links as $link) {
+                    $itemOptionsXml->addCustomChild('option', null, array('label' => $link->getTitle()));
+                }
+            }
         }
 
         return $itemsXmlObj->asNiceXml();
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Ccsave.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Ccsave.php
index 384a15d165d..c1eb35514df 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Ccsave.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Ccsave.php
@@ -80,8 +80,8 @@ public function addPaymentFormToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $
 
         $ccTypes = $helper->getArrayAsXmlItemValues($this->getCcAvailableTypes(), $this->getInfoData('cc_type'));
 
-        $_ccMonthArray = $this->getCcMonths();
-        $ccMonths = $helper->getArrayAsXmlItemValues($_ccMonthArray, $this->getInfoData('cc_exp_month'));
+        $ccMonthArray = $this->getCcMonths();
+        $ccMonths = $helper->getArrayAsXmlItemValues($ccMonthArray, $this->getInfoData('cc_exp_month'));
 
         $ccYears = $helper->getArrayAsXmlItemValues($this->getCcYears(), $this->getInfoData('cc_exp_year'));
 
@@ -100,7 +100,7 @@ public function addPaymentFormToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $
         $solo = '';
         if ($this->hasSsCardType()) {
             $ssCcMonths = $helper->getArrayAsXmlItemValues(
-                $_ccMonthArray, $this->getInfoData('cc_ss_start_month')
+                $ccMonthArray, $this->getInfoData('cc_ss_start_month')
             );
             $ssCcYears = $helper->getArrayAsXmlItemValues(
                 $this->getSsStartYears(), $this->getInfoData('cc_ss_start_year')
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Ccsave.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Ccsave.php
index e0a006bd767..09ee8efe25b 100755
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Ccsave.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Ccsave.php
@@ -44,8 +44,8 @@ public function addPaymentInfoToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $
         $orderItemXmlObj->addAttribute('type', $this->getMethod()->getCode());
         $orderItemXmlObj->addAttribute('title', $orderItemXmlObj->xmlAttribute($this->getMethod()->getTitle()));
 
-        if ($_specificInfo = $this->getSpecificInformation()) {
-            foreach ($_specificInfo as $label => $value) {
+        if ($specificInfo = $this->getSpecificInformation()) {
+            foreach ($specificInfo as $label => $value) {
                 $orderItemXmlObj->addCustomChild('item', implode($this->getValueAsArray($value, true), '\n'), array(
                     'label' => $label
                 ));
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Checkmo.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Checkmo.php
index 11a060457e8..0ecea008362 100755
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Checkmo.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Checkmo.php
@@ -42,9 +42,7 @@ class Mage_XmlConnect_Block_Checkout_Payment_Method_Info_Checkmo extends Mage_Pa
     public function addPaymentInfoToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $orderItemXmlObj)
     {
         $orderItemXmlObj->addAttribute('type', $this->getMethod()->getCode());
-        $orderItemXmlObj->addAttribute(
-            'title', $orderItemXmlObj->xmlAttribute($this->getMethod()->getTitle())
-        );
+        $orderItemXmlObj->addAttribute('title', $orderItemXmlObj->xmlAttribute($this->getMethod()->getTitle()));
 
         if ($this->getInfo()->getAdditionalData()) {
             if ($this->getPayableTo()) {
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Abstract.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Abstract.php
index 2017fa0b267..2f282cd34b4 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Abstract.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Abstract.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-abstract class Mage_XmlConnect_Block_Checkout_Payment_Method_Info_Paypal_Abstract
-    extends Mage_Paypal_Block_Payment_Info
+abstract class Mage_XmlConnect_Block_Checkout_Payment_Method_Info_Paypal_Abstract extends Mage_Paypal_Block_Payment_Info
 {
     /**
      * Add CC Save Payment info to order XML object
@@ -43,12 +42,10 @@ abstract class Mage_XmlConnect_Block_Checkout_Payment_Method_Info_Paypal_Abstrac
     public function addPaymentInfoToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $orderItemXmlObj)
     {
         $orderItemXmlObj->addAttribute('type', $this->getMethod()->getCode());
-        $orderItemXmlObj->addAttribute(
-            'title', $orderItemXmlObj->xmlAttribute($this->getMethod()->getTitle())
-        );
+        $orderItemXmlObj->addAttribute('title', $orderItemXmlObj->xmlAttribute($this->getMethod()->getTitle()));
 
-        if ($_specificInfo = $this->getSpecificInformation()) {
-            foreach ($_specificInfo as $label => $value) {
+        if ($specificInfo = $this->getSpecificInformation()) {
+            foreach ($specificInfo as $label => $value) {
                 $orderItemXmlObj->addCustomChild('item', implode($this->getValueAsArray($value, true), '\n'), array(
                     'label' => $label
                 ));
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Verisign.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Verisign.php
index 1626d14502f..8bdbf35b7b6 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Verisign.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Verisign.php
@@ -42,12 +42,10 @@ class Mage_XmlConnect_Block_Checkout_Payment_Method_Info_Pbridge_Verisign extend
     public function addPaymentInfoToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $orderItemXmlObj)
     {
         $orderItemXmlObj->addAttribute('type', $this->getMethod()->getCode());
-        $orderItemXmlObj->addAttribute(
-            'title', $orderItemXmlObj->xmlAttribute($this->getMethod()->getTitle())
-        );
+        $orderItemXmlObj->addAttribute('title', $orderItemXmlObj->xmlAttribute($this->getMethod()->getTitle()));
 
-        if ($_specificInfo = $this->getSpecificInformation()) {
-            foreach ($_specificInfo as $label => $value) {
+        if ($specificInfo = $this->getSpecificInformation()) {
+            foreach ($specificInfo as $label => $value) {
                 $orderItemXmlObj->addCustomChild('item', implode($this->getValueAsArray($value, true), '\n'), array(
                     'label' => $label
                 ));
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php
index 3e858469137..f75d07a0f99 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php
@@ -41,7 +41,7 @@ class Mage_XmlConnect_Block_Checkout_Payment_Method_List extends Mage_Payment_Bl
     protected $_methodArray = array(
         'payment_ccsave'            => 'Mage_Payment_Model_Method_Cc',
         'payment_checkmo'           => 'Mage_Payment_Model_Method_Checkmo',
-        'payment_purchaseorder'     => 'Mage_Payment_Model_Method_Purchaseorder',
+        'payment_purchaseorder'     => 'Mage_Payment_Model_Method_Purchaseorder'
     );
 
     /**
@@ -79,29 +79,6 @@ public function getQuote()
         return Mage::getSingleton('checkout/session')->getQuote();
     }
 
-    /**
-     * Add customer balance details to XML object
-     *
-     * @param Mage_XmlConnect_Model_Simplexml_Element $methodsXmlObj
-     */
-    public function addCustomerBalanceToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $methodsXmlObj)
-    {
-        /** @var $customerBalanceBlock Enterprise_CustomerBalance_Block_Checkout_Onepage_Payment_Additional */
-        $customerBalanceBlock = $this->getLayout()
-            ->addBlock('enterprise_customerbalance/checkout_onepage_payment_additional', 'customer_balance');
-        $storeCreditFlag = (int) Mage::getStoreConfig(Enterprise_CustomerBalance_Helper_Data::XML_PATH_ENABLED);
-        if ($storeCreditFlag && $customerBalanceBlock->isDisplayContainer()) {
-            $balance = $this->getQuote()->getStore()->formatPrice($customerBalanceBlock->getBalance(), false);
-            $methodsXmlObj->addCustomChild('customer_balance', null, array(
-                'post_name' => 'payment[use_customer_balance]',
-                'code'      => 1,
-                'label'     => $this->__('Use Store Credit (%s available)', $balance),
-                'is_cover_a_quote' => intval($customerBalanceBlock->isFullyPaidAfterApplication()),
-                'selected'  => intval($customerBalanceBlock->isCustomerBalanceUsed())
-            ));
-        }
-    }
-
     /**
      * Add gift card details to XML object
      *
@@ -119,15 +96,6 @@ public function addGiftcardToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $met
 
             $methodsXmlObj->addCustomChild('information', null, array('label' => $amount, 'disabled' => '1'));
 
-            if ($this->_isPaymentRequired()) {
-                $methodsXmlObj->addCustomChild('method', null, array(
-                    'post_name' => 'payment[method]',
-                    'code' => 'free',
-                    'label' => $this->__('No Payment Information Required'),
-                    'selected' => '1',
-                    'disabled' => '1'
-                ));
-            }
             $this->setIsUsedGiftCard(true);
         }
     }
@@ -175,24 +143,109 @@ protected function _getPaymentMethodArray()
      * Render payment methods xml
      *
      * @return string
-     * @throw Mage_Core_Exception
      */
     protected function _toHtml()
     {
         /** @var $methodsXmlObj Mage_XmlConnect_Model_Simplexml_Element */
         $methodsXmlObj = Mage::getModel('xmlconnect/simplexml_element', '<payment_methods></payment_methods>');
 
+        if ($this->_addGiftCard($methodsXmlObj)) {
+            return $methodsXmlObj->asNiceXml();
+        }
+
+        $this->addCustomerBalanceToXmlObj($methodsXmlObj)->_buildPaymentMethods($methodsXmlObj);
+        return $methodsXmlObj->asNiceXml();
+    }
+
+    /**
+     * Add free payment method xml to payment method list
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $methodsXmlObj
+     * @return Mage_XmlConnect_Block_Checkout_Payment_Method_List
+     */
+    protected function _addFreePaymentToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $methodsXmlObj)
+    {
+        $methodsXmlObj->addCustomChild('method', null, array(
+            'id' => 'free',
+            'code' => 'free',
+            'post_name' => 'payment[method]',
+            'label' => $this->__('No Payment Information Required'),
+            'selected' => '1',
+            'disabled' => '1'
+        ));
+        return $this;
+    }
+
+    /**
+     * Check and prepare payment method model
+     *
+     * @param mixed $method
+     * @return bool
+     */
+    protected function _canUseMethod($method)
+    {
+        if (!($method instanceof Mage_Payment_Model_Method_Abstract) || !$method->canUseCheckout()
+            || !$method->isAvailable($this->getQuote())
+        ) {
+            return false;
+        }
+        return parent::_canUseMethod($method);
+    }
+
+    /**
+     * Add gift card info to xml and check is covered a quote
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $methodsXmlObj
+     * @return bool
+     */
+    protected function _addGiftCard(Mage_XmlConnect_Model_Simplexml_Element $methodsXmlObj)
+    {
         if (is_object(Mage::getConfig()->getNode('modules/Enterprise_GiftCardAccount'))) {
             $this->addGiftcardToXmlObj($methodsXmlObj);
             if ($this->getIsUsedGiftCard() && $this->_isPaymentRequired()) {
-                return $methodsXmlObj->asNiceXml();
+                $this->_addFreePaymentToXmlObj($methodsXmlObj);
+                return true;
             }
         }
+        return false;
+    }
 
+    /**
+     * Add customer balance details to XML object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $methodsXmlObj
+     * @return Mage_XmlConnect_Block_Checkout_Payment_Method_List
+     */
+    public function addCustomerBalanceToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $methodsXmlObj)
+    {
         if (is_object(Mage::getConfig()->getNode('modules/Enterprise_CustomerBalance'))) {
-            $this->addCustomerBalanceToXmlObj($methodsXmlObj);
+            /** @var $customerBalanceBlock Enterprise_CustomerBalance_Block_Checkout_Onepage_Payment_Additional */
+            $customerBalanceBlock = $this->getLayout()
+                ->addBlock('enterprise_customerbalance/checkout_onepage_payment_additional', 'customer_balance');
+            $storeCreditFlag = (int) Mage::getStoreConfig(Enterprise_CustomerBalance_Helper_Data::XML_PATH_ENABLED);
+            if ($storeCreditFlag && $customerBalanceBlock->isDisplayContainer()) {
+                $balance = $this->getQuote()->getStore()->formatPrice($customerBalanceBlock->getBalance(), false);
+                $methodsXmlObj->addCustomChild('customer_balance', null, array(
+                    'post_name' => 'payment[use_customer_balance]',
+                    'code'      => 1,
+                    'label'     => $this->__('Use Store Credit (%s available)', $balance),
+                    'is_cover_a_quote' => intval($customerBalanceBlock->isFullyPaidAfterApplication()),
+                    'selected'  => intval($customerBalanceBlock->isCustomerBalanceUsed())
+                ));
+            }
         }
+        return $this;
+    }
 
+    /**
+     * Add payment methods info to xml object
+     *
+     * @throw Mage_Core_Exception
+     * @param Mage_XmlConnect_Model_Simplexml_Element $methodsXmlObj
+     * @return Mage_XmlConnect_Block_Checkout_Payment_Method_List
+     */
+    protected function _buildPaymentMethods(Mage_XmlConnect_Model_Simplexml_Element $methodsXmlObj)
+    {
         $methodArray = $this->_getPaymentMethodArray();
         $usedMethods = $sortedAvailableMethodCodes = $usedCodes = array();
 
@@ -203,6 +256,17 @@ protected function _toHtml()
             Mage::app()->getStore(), $this->getQuote()
         );
 
+        $total = $this->getQuote()->getGrandTotal();
+        foreach ($allAvailableMethods as $key => $method) {
+            if ($this->_canUseMethod($method) && ($total != 0 || $method->getCode() == 'free'
+                || ($this->getQuote()->hasRecurringItems() && $method->canManageRecurringProfiles()))
+            ) {
+                $this->_assignMethod($method);
+            } else {
+                unset($allAvailableMethods[$key]);
+            }
+        }
+
         /**
          * Get sorted codes of available methods
          */
@@ -223,7 +287,6 @@ protected function _toHtml()
                 if (!$block) {
                     continue;
                 }
-
                 $method = $block->getMethod();
                 if (!$this->_canUseMethod($method) || in_array($method->getCode(), $usedCodes)) {
                     continue;
@@ -282,36 +345,32 @@ protected function _toHtml()
                 $renderer->setData('method', $method);
             }
 
-            $methodItemXmlObj = $methodsXmlObj->addChild('method');
-            $methodItemXmlObj->addAttribute('post_name', 'payment[method]');
-            $methodItemXmlObj->addAttribute('code', $method->getCode());
-            $methodItemXmlObj->addAttribute('label', $methodsXmlObj->escapeXml($method->getTitle()));
+            $options = array(
+                'id' => $method->getCode(),
+                'code' => $method->getCode(),
+                'post_name' => 'payment[method]',
+                'label' => $methodsXmlObj->escapeXml($method->getTitle()),
+            );
+
             if ($this->getQuote()->getPayment()->getMethod() == $method->getCode()) {
-                $methodItemXmlObj->addAttribute('selected', 1);
+                $options['selected'] = 1;
             }
+
+            $methodItemXmlObj = $methodsXmlObj->addCustomChild('method', null, $options);
             $renderer->addPaymentFormToXmlObj($methodItemXmlObj);
         }
-        if (!count($usedMethods)) {
-            Mage::throwException($this->__('Sorry, no payment options are available for this order at this time.'));
+
+        if (count($allAvailableMethods) == 1 && isset($sortedAvailableMethodCodes[0])
+            && $sortedAvailableMethodCodes[0] == 'free') {
+            if ($this->_isPaymentRequired()) {
+                $this->_addFreePaymentToXmlObj($methodsXmlObj);
+            }
         }
-        return $methodsXmlObj->asNiceXml();
-    }
 
-    /**
-     * Check and prepare payment method model
-     *
-     * @param mixed $method
-     * @return bool
-     */
-    protected function _canUseMethod($method)
-    {
-        if (!($method instanceof Mage_Payment_Model_Method_Abstract)
-            || !$method->canUseCheckout()
-            || !$method->isAvailable($this->getQuote())
-        ) {
-            return false;
+        if (!count($allAvailableMethods)) {
+            Mage::throwException($this->__('Your order cannot be completed at this time as there is no payment methods available for it.'));
         }
-        return parent::_canUseMethod($method);
+        return $this;
     }
 
     /**
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/ListApi23.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/ListApi23.php
new file mode 100644
index 00000000000..1757a99e4fc
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/ListApi23.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * One page checkout payment methods xml renderer. API version 23
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Checkout_Payment_Method_ListApi23 extends Mage_XmlConnect_Block_Checkout_Payment_Method_List
+{
+    /**
+     * Method list xml object
+     *
+     * @var Mage_XmlConnect_Model_Simplexml_Element
+     */
+    protected $_methodList;
+
+    /**
+     * Add gift card info to xml and check is covered a quote. API version 23
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $methodsXmlObj
+     * @return bool
+     */
+    protected function _addGiftCard(Mage_XmlConnect_Model_Simplexml_Element $methodsXmlObj) {
+        if (is_object(Mage::getConfig()->getNode('modules/Enterprise_GiftCardAccount'))) {
+            $this->addGiftCardToXmlObj($methodsXmlObj);
+            if ($this->getIsUsedGiftCard() && $this->_isPaymentRequired()) {
+                $this->_addFreePaymentToXmlObj($this->getMethodList($methodsXmlObj));
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Add gift card details to XML object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $methodsXmlObj
+     * @return null
+     */
+    public function addGiftCardToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $methodsXmlObj)
+    {
+        $giftCardInfoBlock = $this->getLayout()->addBlock(
+            'enterprise_giftcardaccount/checkout_onepage_payment_additional', 'giftcard_info'
+        );
+
+        if (intval($giftCardInfoBlock->getAppliedGiftCardAmount())) {
+            $amount = $this->getQuote()->getStore()->formatPrice($giftCardInfoBlock->getAppliedGiftCardAmount(), false);
+            $amount = $this->__('Gift Card amount applied to order: %s', $amount);
+            $methodsXmlObj->addCustomChild('information', null, array('label' => $amount));
+            $this->setIsUsedGiftCard(true);
+        }
+    }
+
+    /**
+     * Add customer balance details to XML object. API version 23
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $methodsXmlObj
+     * @return Mage_XmlConnect_Block_Checkout_Payment_Method_ListApi23
+     */
+    public function addCustomerBalanceToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $methodsXmlObj)
+    {
+        $methodsXmlObj = $this->getMethodList($methodsXmlObj);
+        if (is_object(Mage::getConfig()->getNode('modules/Enterprise_CustomerBalance'))) {
+            /** @var $customerBalanceBlock Enterprise_CustomerBalance_Block_Checkout_Onepage_Payment_Additional */
+            $customerBalanceBlock = $this->getLayout()
+                ->addBlock('enterprise_customerbalance/checkout_onepage_payment_additional', 'customer_balance');
+            $storeCreditFlag = (int) Mage::getStoreConfig(Enterprise_CustomerBalance_Helper_Data::XML_PATH_ENABLED);
+            if ($storeCreditFlag && $customerBalanceBlock->isDisplayContainer()) {
+                $balance = $this->getQuote()->getStore()->formatPrice($customerBalanceBlock->getBalance(), false);
+                $methodsXmlObj->addCustomChild('method', null, array(
+                    'id'        => 'customer_balance',
+                    'post_name' => 'payment[use_customer_balance]',
+                    'code'      => 1,
+                    'label'     => $this->__('Use Store Credit (%s available)', $balance),
+                    'is_cover_a_quote' => intval($customerBalanceBlock->isFullyPaidAfterApplication()),
+                    'selected'  => intval($customerBalanceBlock->isCustomerBalanceUsed())
+                ));
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Get method list object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $methodsXmlObj
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    public function getMethodList($methodsXmlObj)
+    {
+        if (null === $this->_methodList) {
+            $this->_methodList = $methodsXmlObj->addCustomChild('method_list');
+        }
+        return $this->_methodList;
+    }
+
+    /**
+     * Add payment methods info to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $methodsXmlObj
+     * @return Mage_XmlConnect_Block_Checkout_Payment_Method_List
+     */
+    protected function _buildPaymentMethods(Mage_XmlConnect_Model_Simplexml_Element $methodsXmlObj)
+    {
+        return parent::_buildPaymentMethods($this->getMethodList($methodsXmlObj));
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Payflow.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Payflow.php
index a3b108d4c6b..b92f3817031 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Payflow.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Payflow.php
@@ -75,29 +75,29 @@ public function addPaymentFormToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $
         $formXmlObj->addAttribute('name', 'payment_form_' . $method->getCode());
         $formXmlObj->addAttribute('method', 'post');
 
-        $_ccType = $this->getInfoData('cc_type');
+        $ccType = $this->getInfoData('cc_type');
         $ccTypes = '';
 
-        foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName) {
-            if (!$_typeCode) {
+        foreach ($this->getCcAvailableTypes() as $typeCode => $_typeName) {
+            if (!$typeCode) {
                 continue;
             }
             $ccTypes .= '
-            <item' . ($_typeCode == $_ccType ? ' selected="1"' : '') . '>
+            <item' . ($typeCode == $ccType ? ' selected="1"' : '') . '>
                 <label>' . $_typeName . '</label>
-                <value>' . $_typeCode . '</value>
+                <value>' . $typeCode . '</value>
             </item>';
         }
 
         $ccMonthes = '';
 
-        $_ccExpMonth = $this->getInfoData('cc_exp_month');
+        $ccExpMonth = $this->getInfoData('cc_exp_month');
         foreach ($this->getCcMonths() as $k => $v) {
             if (!$k) {
                 continue;
             }
             $ccMonthes .= '
-            <item' . ($k == $_ccExpMonth ? ' selected="1"' : '') . '>
+            <item' . ($k == $ccExpMonth ? ' selected="1"' : '') . '>
                 <label>' . $v . '</label>
                 <value>' . ($k ? $k : '') . '</value>
             </item>';
@@ -105,13 +105,13 @@ public function addPaymentFormToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $
 
         $ccYears = '';
 
-        $_ccExpYear = $this->getInfoData('cc_exp_year');
+        $ccExpYear = $this->getInfoData('cc_exp_year');
         foreach ($this->getCcYears() as $k => $v) {
             if (!$k) {
                 continue;
             }
             $ccYears .= '
-            <item' . ($k == $_ccExpYear ? ' selected="1"' : '') . '>
+            <item' . ($k == $ccExpYear ? ' selected="1"' : '') . '>
                 <label>' . $v . '</label>
                 <value>' . ($k ? $k : '') . '</value>
             </item>';
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Pbridge/Result.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Pbridge/Result.php
index 929f2b49b93..f30e0acaa64 100755
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Pbridge/Result.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Pbridge/Result.php
@@ -31,7 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Checkout_Pbridge_Result extends Mage_Core_Block_Template
+class Mage_XmlConnect_Block_Checkout_Pbridge_Result extends Mage_Core_Block_Abstract
 {
     /**
      * Return url for redirect with params of Payment Bridge incoming data
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Shipping/Method/Available.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Shipping/Method/Available.php
index 36266d6015c..09df7e947c3 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Shipping/Method/Available.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Shipping/Method/Available.php
@@ -43,33 +43,34 @@ protected function _toHtml()
     {
         /** @var $methodsXmlObj Mage_XmlConnect_Model_Simplexml_Element */
         $methodsXmlObj = Mage::getModel('xmlconnect/simplexml_element', '<shipping_methods></shipping_methods>');
-        $_shippingRateGroups = $this->getShippingRates();
-        if ($_shippingRateGroups) {
+        $shippingRateGroups = $this->getShippingRates();
+        if ($shippingRateGroups) {
             $store = $this->getQuote()->getStore();
-            $_sole = count($_shippingRateGroups) == 1;
-            foreach ($_shippingRateGroups as $code => $_rates) {
+            $sole = count($shippingRateGroups) == 1;
+            foreach ($shippingRateGroups as $code => $rates) {
                 $methodXmlObj = $methodsXmlObj->addChild('method');
                 $methodXmlObj->addAttribute('label', $methodsXmlObj->escapeXml($this->getCarrierName($code)));
                 $ratesXmlObj = $methodXmlObj->addChild('rates');
 
-                $_sole = $_sole && count($_rates) == 1;
-                foreach ($_rates as $_rate) {
-                    $rateXmlObj = $ratesXmlObj->addChild('rate');
-                    $rateXmlObj->addAttribute('label', $methodsXmlObj->escapeXml($_rate->getMethodTitle()));
-                    $rateXmlObj->addAttribute('code', $_rate->getCode());
-                    if ($_rate->getErrorMessage()) {
-                        $rateXmlObj->addChild('error_message', $methodsXmlObj->escapeXml($_rate->getErrorMessage()));
+                $sole = $sole && count($rates) == 1;
+                foreach ($rates as $rate) {
+                    $rateOptions = array();
+                    $rateOptions['label'] = $rate->getMethodTitle();
+                    $rateOptions['code'] = $rate->getCode();
+                    if ($rate->getErrorMessage()) {
+                        $rateXmlObj = $ratesXmlObj->addCustomChild('rate', null, $rateOptions);
+                        $rateXmlObj->addChild('error_message', $methodsXmlObj->escapeXml($rate->getErrorMessage()));
                     } else {
                         $price = Mage::helper('tax')->getShippingPrice(
-                            $_rate->getPrice(),
+                            $rate->getPrice(),
                             Mage::helper('tax')->displayShippingPriceIncludingTax(),
                             $this->getAddress()
                         );
-                        $formattedPrice = $store->convertPrice($price, true, false);
-                        $rateXmlObj->addAttribute('price', Mage::helper('xmlconnect')->formatPriceForXml(
+                        $rateOptions['price'] = Mage::helper('xmlconnect')->formatPriceForXml(
                             $store->convertPrice($price, false, false)
-                        ));
-                        $rateXmlObj->addAttribute('formated_price', $formattedPrice);
+                        );
+                        $rateOptions['formated_price'] = $store->convertPrice($price, true, false);
+                        $ratesXmlObj->addCustomChild('rate', null, $rateOptions);
                     }
                 }
             }
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Shipping/Method/AvailableList.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Shipping/Method/AvailableList.php
new file mode 100644
index 00000000000..f049f80b856
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Shipping/Method/AvailableList.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * One page checkout shipping methods xml renderer. API version 23
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Checkout_Shipping_Method_AvailableList
+    extends Mage_Checkout_Block_Onepage_Shipping_Method_Available
+{
+    /**
+     * Render shipping methods xml
+     *
+     * @return string
+     */
+    protected function _toHtml()
+    {
+        /** @var $methodsXmlObj Mage_XmlConnect_Model_Simplexml_Element */
+        $methodsXmlObj = Mage::getModel('xmlconnect/simplexml_element', '<shipping_methods></shipping_methods>');
+        $shippingRateGroups = $this->getShippingRates();
+        if ($shippingRateGroups) {
+            $store = $this->getQuote()->getStore();
+            $sole = count($shippingRateGroups) == 1;
+            foreach ($shippingRateGroups as $code => $rates) {
+                $methodXmlObj = $methodsXmlObj->addChild('method');
+                $methodXmlObj->addAttribute('label', $methodsXmlObj->escapeXml($this->getCarrierName($code)));
+                $ratesXmlObj = $methodXmlObj->addChild('rates');
+
+                $sole = $sole && count($rates) == 1;
+                foreach ($rates as $rate) {
+                    $rateOptions = array();
+                    $rateOptions['label'] = $rate->getMethodTitle();
+                    $rateOptions['code'] = $rate->getCode();
+                    if ($rate->getErrorMessage()) {
+                        $rateXmlObj = $ratesXmlObj->addCustomChild('rate', null, $rateOptions);
+                        $rateXmlObj->addChild('error_message', $methodsXmlObj->escapeXml($rate->getErrorMessage()));
+                    } else {
+                        $price = Mage::helper('tax')->getShippingPrice(
+                            $rate->getPrice(),
+                            Mage::helper('tax')->displayShippingPriceIncludingTax(),
+                            $this->getAddress()
+                        );
+                        $rateOptions['price'] = Mage::helper('xmlconnect')->formatPriceForXml(
+                            $store->convertPrice($price, false, false)
+                        );
+                        $rateOptions['formatted_price'] = $store->convertPrice($price, true, false);
+                        $ratesXmlObj->addCustomChild('rate', null, $rateOptions);
+                    }
+                }
+            }
+        } else {
+            Mage::throwException($this->__('Shipping to this address is not possible.'));
+        }
+        return $methodsXmlObj->asNiceXml();
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Configuration.php b/app/code/core/Mage/XmlConnect/Block/Configuration.php
index f8cb2101e63..8609bd0ef6f 100644
--- a/app/code/core/Mage/XmlConnect/Block/Configuration.php
+++ b/app/code/core/Mage/XmlConnect/Block/Configuration.php
@@ -31,7 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Configuration extends Mage_Core_Block_Template
+class Mage_XmlConnect_Block_Configuration extends Mage_Core_Block_Abstract
 {
     /**
      * Current application model
@@ -61,40 +61,40 @@ protected function _beforeToHtml()
      * Recursively build XML configuration tree
      *
      * @param Mage_XmlConnect_Model_Simplexml_Element $section
-     * @param array $subtree
-     * @return Mage_XmlConnect_Model_Simplexml_Element
+     * @param array $subTree
+     * @return Mage_XmlConnect_Block_Configuration
      */
-    protected function _buildRecursive($section, $subtree)
+    protected function _buildRecursive($section, $subTree)
     {
-        Mage::helper('xmlconnect')->getDeviceHelper()->checkRequiredConfigFields($subtree);
+        Mage::helper('xmlconnect')->getDeviceHelper()->checkRequiredConfigFields($subTree);
 
-        foreach ($subtree as $key => $value) {
+        foreach ($subTree as $key => $value) {
             if (is_array($value)) {
                 if ($key == 'fonts') {
-                    $subsection = $section->addChild('fonts');
-                    foreach ($value as $label=>$v) {
-                        if (empty($v['name']) || empty($v['size']) || empty($v['color'])) {
+                    $subSection = $section->addChild('fonts');
+                    foreach ($value as $label => $val) {
+                        if (empty($val['name']) || empty($val['size']) || empty($val['color'])) {
                             continue;
                         }
-                        $font = $subsection->addChild('font');
+                        $font = $subSection->addChild('font');
                         $font->addAttribute('label', $label);
-                        $font->addAttribute('name', $v['name']);
-                        $font->addAttribute('size', $v['size']);
-                        $font->addAttribute('color', $v['color']);
+                        $font->addAttribute('name', $val['name']);
+                        $font->addAttribute('size', $val['size']);
+                        $font->addAttribute('color', $val['color']);
                     }
                 } elseif ($key == 'pages') {
-                    $subsection = $section->addChild('content');
+                    $subSection = $section->addChild('content');
                     foreach ($value as $page) {
-                        $this->_buildRecursive($subsection->addChild('page'), $page);
+                        $this->_buildRecursive($subSection->addChild('page'), $page);
                     }
                 } else {
-                    $subsection = $section->addChild($key);
-                    $this->_buildRecursive($subsection, $value);
+                    $subSection = $section->addChild($key);
+                    $this->_buildRecursive($subSection, $value);
                 }
             } elseif ($value instanceof Mage_XmlConnect_Model_Tabs) {
                 foreach ($value->getRenderTabs() as $tab) {
-                    $subsection = $section->addChild('tab');
-                    $this->_buildRecursive($subsection, $tab);
+                    $subSection = $section->addChild('tab');
+                    $this->_buildRecursive($subSection, $tab);
                 }
             } else {
                 $value = (string)$value;
@@ -103,6 +103,7 @@ protected function _buildRecursive($section, $subtree)
                 }
             }
         }
+        return $this;
     }
 
     /**
@@ -112,8 +113,26 @@ protected function _buildRecursive($section, $subtree)
      */
     protected function _toHtml()
     {
+        /** @var $xml Mage_XmlConnect_Model_Simplexml_Element */
         $xml = Mage::getModel('xmlconnect/simplexml_element', '<configuration></configuration>');
-        $this->_buildRecursive($xml, Mage::helper('xmlconnect')->excludeXmlConfigKeys($this->_app->getRenderConf()));
+        $this->_buildRecursive($xml, Mage::helper('xmlconnect')->excludeXmlConfigKeys($this->_app->getRenderConf()))
+            ->_addLocalization($xml);
         return $xml->asNiceXml();
     }
+
+    /**
+     * Add localization data to xml object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xml
+     * @return Mage_XmlConnect_Block_Configuration
+     */
+    protected function _addLocalization(Mage_XmlConnect_Model_Simplexml_Element $xml)
+    {
+        /** @var $translateHelper Mage_XmlConnect_Helper_Translate */
+        $translateHelper = Mage::helper('xmlconnect/translate');
+        $xml->addCustomChild('localization', Mage::helper('xmlconnect')->getActionUrl('xmlconnect/localization'), array(
+            'hash' => $translateHelper->getHash()
+        ));
+        return $this;
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Address/Form.php b/app/code/core/Mage/XmlConnect/Block/Customer/Address/Form.php
index 8ece7b9e8d0..3d00ac68717 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Address/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Address/Form.php
@@ -40,35 +40,6 @@ class Mage_XmlConnect_Block_Customer_Address_Form extends Mage_Customer_Block_Ad
      */
     protected $_nameWidgetBlock;
 
-    /**
-     * Enterprise customer field renderer list as type => renderer block
-     *
-     * Original block relations:
-     * - 'text'      => 'enterprise_customer/form_renderer_text',
-     * - 'textarea'  => 'enterprise_customer/form_renderer_textarea',
-     * - 'multiline' => 'enterprise_customer/form_renderer_multiline',
-     * - 'date'      => 'enterprise_customer/form_renderer_date',
-     * - 'select'    => 'enterprise_customer/form_renderer_select',
-     * - 'multiselect' => 'enterprise_customer/form_renderer_multiselect',
-     * - 'boolean'   => 'enterprise_customer/form_renderer_boolean',
-     * - 'file'      => 'enterprise_customer/form_renderer_file'
-     * - 'image'     => 'enterprise_customer/form_renderer_image'
-     *
-     * @see customer.xml layout customer_form_template_handle node
-     * @var array
-     */
-    protected $_customerFiledRenderer = array(
-        'text'      => 'xmlconnect/customer_form_renderer_text',
-        'textarea'  => 'xmlconnect/customer_form_renderer_textarea',
-        'multiline' => 'xmlconnect/customer_form_renderer_multiline',
-        'date'      => 'xmlconnect/customer_form_renderer_date',
-        'select'    => 'xmlconnect/customer_form_renderer_select',
-        'multiselect' => 'xmlconnect/customer_form_renderer_multiselect',
-        'boolean'   => 'xmlconnect/customer_form_renderer_boolean',
-        'file'      => 'xmlconnect/customer_form_renderer_file',
-        'image'     => 'xmlconnect/customer_form_renderer_image'
-    );
-
     /**
      * Render customer address form xml
      *
@@ -77,7 +48,6 @@ class Mage_XmlConnect_Block_Customer_Address_Form extends Mage_Customer_Block_Ad
     protected function _toHtml()
     {
         $address  = $this->getAddress();
-
         /**
          * Init address object and save its data to variables
          */
@@ -85,8 +55,10 @@ protected function _toHtml()
         $billingChecked = $shippingChecked = false;
 
         if ($addressId && $address && $address->getId()) {
-            $defaultBillingAddressId = Mage::getSingleton('customer/session')->getCustomer()->getDefaultBilling();
-            $defaultShippingAddressId = Mage::getSingleton('customer/session')->getCustomer()->getDefaultShipping();
+            /** @var $customerSession Mage_Customer_Model_Session */
+            $customerSession = Mage::getSingleton('customer/session');
+            $defaultBillingAddressId = $customerSession->getCustomer()->getDefaultBilling();
+            $defaultShippingAddressId = $customerSession->getCustomer()->getDefaultShipping();
 
             $billingChecked = (int)$addressId == $defaultBillingAddressId;
             $shippingChecked = (int)$addressId == $defaultShippingAddressId;
@@ -107,9 +79,7 @@ protected function _toHtml()
 
         /** @var Mage_XmlConnect_Model_Simplexml_Form $fromXmlObj */
         $fromXmlObj = Mage::getModel('xmlconnect/simplexml_form', array(
-            'xml_id' => 'address_form',
-            'action' => $action,
-            'use_container' => true
+            'xml_id' => 'address_form', 'action' => $action, 'use_container' => true
         ));
 
         $contactInfoFieldset = $fromXmlObj->addFieldset('contact_info', array(
@@ -124,7 +94,7 @@ protected function _toHtml()
         ));
         $contactInfoFieldset->addField('telephone', 'text', array(
             'label' => $this->__('Telephone'),
-            'required' => 'true',
+            'required' => $this->getNewCountryList() ? '1' : 'true',
             'value' => isset($telephone) ? $telephone : ''
         ));
         $contactInfoFieldset->addField('fax', 'text', array(
@@ -132,23 +102,24 @@ protected function _toHtml()
             'value' => isset($fax) ? $fax : ''
         ));
 
-        $addressFieldset = $fromXmlObj->addFieldset('address_info', array('legend' => $this->__('Address')))
-            ->setCustomAttributes(array('legend'));
+        $addressFieldset = $fromXmlObj->addFieldset('address_info', array(
+            'legend' => $this->__('Address')
+        ))->setCustomAttributes(array('legend'));
 
         $addressFieldset->addField('street', 'text', array(
             'name' => 'street[]',
             'label' => $this->__('Street Address'),
-            'required' => 'true',
+            'required' => $this->getNewCountryList() ? '1' : 'true',
             'value' => isset($street1) ? $street1 : ''
         ));
         $addressFieldset->addField('street_2', 'text', array(
             'name' => 'street[]',
-            'label' => $this->__('Street Address %s', 2),
+            'label' => $this->__('Street Address 2'),
             'value' => isset($street2) ? $street2 : ''
         ));
         $addressFieldset->addField('city', 'text', array(
             'label' => $this->__('City'),
-            'required' => 'true',
+            'required' => $this->getNewCountryList() ? '1' : 'true',
             'value' => isset($city) ? $city : ''
         ));
 
@@ -157,26 +128,28 @@ protected function _toHtml()
         $region     = isset($region)    ? $region       : null;
 
         $addressFieldset->addField('country_id', 'countryListSelect', array(
-            'label'     => $this->__('Country'),
-            'required'  => 'true',
-            'value'     => array(
+            'label' => $this->__('Country'),
+            'required' => $this->getNewCountryList() ? '1' : 'true',
+            'value' => array(
                 'country_id'    => $countryId,
                 'region_id'     => $regionId,
                 'region'        => $region
             ),
-            'old_format' => true
-        ));
-        $addressFieldset->addField('region', 'text', array(
-            'label' => $this->__('State/Province'),
-            'value' => isset($region) ? $region : ''
-        ));
-        $addressFieldset->addField('region_id', 'select', array(
-            'label' => $this->__('State/Province'),
-            'required' => 'true',
+            'old_format' => !$this->getNewCountryList()
         ));
+        if (!$this->getNewCountryList()) {
+            $addressFieldset->addField('region', 'text', array(
+                'label' => $this->__('State/Province'),
+                'value' => isset($region) ? $region : ''
+            ));
+            $addressFieldset->addField('region_id', 'select', array(
+                'label' => $this->__('State/Province'),
+                'required' => $this->getNewCountryList() ? '1' : 'true'
+            ));
+        }
         $addressFieldset->addField('postcode', 'text', array(
             'label' => $this->__('Zip/Postal Code'),
-            'required' => 'true',
+            'required' => $this->getNewCountryList() ? '1' : 'true',
             'value' => isset($postcode) ? $postcode : ''
         ));
         $addressFieldset->addField('default_billing', 'checkbox', array(
@@ -189,7 +162,10 @@ protected function _toHtml()
             'value' => $shippingChecked ? $shippingChecked : 0
         ));
 
-        $this->_addCustomAddressAttributes($addressFieldset);
+        /** Get custom attributes */
+        Mage::helper('xmlconnect/customer_form_renderer')->setAttributesBlockName('customer_address_attr')
+            ->setFormCode('customer_address_edit')->setBlockEntity($this->getAddress())
+            ->addCustomAttributes($addressFieldset, $this->getLayout());
 
         return $fromXmlObj->getXml();
     }
@@ -204,10 +180,8 @@ protected function _addCustomerContactInfo(
         Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $contactInfoFieldset
     ) {
         if (is_object(Mage::getConfig()->getNode('modules/Enterprise_Customer'))) {
-            $this->setNameWidgetBlock(
-                $this->getLayout()->createBlock('customer/widget_name')->setObject(
-                    $this->getAddress()->getFirstname() ? $this->getAddress() : $this->getCustomer()
-            ));
+            $this->setNameWidgetBlock($this->getLayout()->createBlock('customer/widget_name')
+                ->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getCustomer()));
 
             if ($this->getNameWidgetBlock()->showPrefix()) {
                 $this->_addPrefix($contactInfoFieldset);
@@ -250,12 +224,12 @@ protected function _addPrefix(Mage_XmlConnect_Model_Simplexml_Form_Element_Field
 
         if ($this->getNameWidgetBlock()->getPrefixOptions() === false) {
             $contactInfoFieldset->addField($this->getNameWidgetBlock()->getFieldId('prefix'), 'text', array(
-                'label' => $this->__('Prefix'),
+                'label' => $this->getNameWidgetBlock()->__('Prefix'),
                 'name' => $this->getNameWidgetBlock()->getFieldName('prefix')
             ) + $attributes);
         } else {
             $contactInfoFieldset->addField($this->getNameWidgetBlock()->getFieldId('prefix'), 'select', array(
-                'label' => $this->__('Prefix'),
+                'label' => $this->getNameWidgetBlock()->__('Prefix'),
                 'name' => $this->getNameWidgetBlock()->getFieldName('prefix'),
                 'options' => $this->getNameWidgetBlock()->getPrefixOptions()
             ) + $attributes);
@@ -269,9 +243,7 @@ protected function _addPrefix(Mage_XmlConnect_Model_Simplexml_Form_Element_Field
      * @param Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $contactInfoFieldset
      * @return Mage_XmlConnect_Block_Customer_Address_Form
      */
-    protected function _addSuffix(
-        Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $contactInfoFieldset
-    )
+    protected function _addSuffix(Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $contactInfoFieldset)
     {
         $attributes = array();
         $attributes += $contactInfoFieldset->checkAttribute(
@@ -284,12 +256,12 @@ protected function _addSuffix(
 
         if ($this->getNameWidgetBlock()->getSuffixOptions() === false) {
             $contactInfoFieldset->addField($this->getNameWidgetBlock()->getFieldId('suffix'), 'text', array(
-                'label' => $this->__('Suffix'),
+                'label' => $this->getNameWidgetBlock()->__('Suffix'),
                 'name' => $this->getNameWidgetBlock()->getFieldName('suffix')
             ) + $attributes);
         } else {
             $contactInfoFieldset->addField($this->getNameWidgetBlock()->getFieldId('suffix'), 'select', array(
-                'label' => $this->__('Suffix'),
+                'label' => $this->getNameWidgetBlock()->__('Suffix'),
                 'name' => $this->getNameWidgetBlock()->getFieldName('suffix'),
                 'options' => $this->getNameWidgetBlock()->getSuffixOptions()
             ) + $attributes);
@@ -303,21 +275,17 @@ protected function _addSuffix(
      * @param Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $contactInfoFieldset
      * @return Mage_XmlConnect_Block_Customer_Address_Form
      */
-    protected function _addMiddleName(
-        Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $contactInfoFieldset
-    )
+    protected function _addMiddleName(Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $contactInfoFieldset)
     {
         $attributes = array();
         $attributes += $contactInfoFieldset->checkAttribute(
-            'value',
-            $this->getNameWidgetBlock()->getObject()->getMiddlename()
+            'value', $this->getNameWidgetBlock()->getObject()->getMiddlename()
         );
 
         $contactInfoFieldset->addField($this->getNameWidgetBlock()->getFieldId('middlename'), 'text', array(
-            'label' => $this->__('M.I.'),
+            'label' => $this->getNameWidgetBlock()->__('M.I.'),
             'name' => $this->getNameWidgetBlock()->getFieldName('middlename')
         ) + $attributes);
-
         return $this;
     }
 
@@ -327,9 +295,8 @@ protected function _addMiddleName(
      * @param Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $contactInfoFieldset
      * @return Mage_XmlConnect_Block_Customer_Address_Form
      */
-    protected function _addFirstName(
-        Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $contactInfoFieldset
-    ) {
+    protected function _addFirstName(Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $contactInfoFieldset)
+    {
         $firstName  = $this->getAddress()->getFirstname();
         $contactInfoFieldset->addField('firstname', 'text', array(
             'label' => $this->__('First Name'),
@@ -345,9 +312,8 @@ protected function _addFirstName(
      * @param Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $contactInfoFieldset
      * @return Mage_XmlConnect_Block_Customer_Address_Form
      */
-    protected function _addLastName(
-        Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $contactInfoFieldset
-    ) {
+    protected function _addLastName(Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $contactInfoFieldset)
+    {
         $lastName   = $this->getAddress()->getLastname();
         $contactInfoFieldset->addField('lastname', 'text', array(
             'label' => $this->__('Last Name'),
@@ -360,6 +326,7 @@ protected function _addLastName(
     /**
      * Add custom customer attributes
      *
+     * @deprecated will delete in the next version
      * @param Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $addressFieldset
      * @return Mage_XmlConnect_Block_Customer_Address_Form
      */
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Address/List.php b/app/code/core/Mage/XmlConnect/Block/Customer/Address/List.php
index 5300ba2c93e..9a8b41f581c 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Address/List.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Address/List.php
@@ -31,7 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Customer_Address_List extends Mage_Core_Block_Template
+class Mage_XmlConnect_Block_Customer_Address_List extends Mage_Core_Block_Abstract
 {
     /**
      * Render customer address list xml
@@ -43,10 +43,10 @@ protected function _toHtml()
         $addressXmlObj          = Mage::getModel('xmlconnect/simplexml_element', '<address></address>');
         $customer               = Mage::getSingleton('customer/session')->getCustomer();
 
-        $_billingAddssesId      = $customer->getDefaultBilling();
-        $_shippingAddssesId     = $customer->getDefaultShipping();
-        $billingAddress         = $customer->getAddressById($_billingAddssesId);
-        $shippingAddress        = $customer->getAddressById($_shippingAddssesId);
+        $billingAddssesId      = $customer->getDefaultBilling();
+        $shippingAddssesId     = $customer->getDefaultShipping();
+        $billingAddress         = $customer->getAddressById($billingAddssesId);
+        $shippingAddress        = $customer->getAddressById($shippingAddssesId);
 
         if ($billingAddress && $billingAddress->getId()) {
             $item = $addressXmlObj->addChild('item');
@@ -60,13 +60,13 @@ protected function _toHtml()
             $item->addAttribute('default_shipping', 1);
             $this->prepareAddressData($shippingAddress, $item);
         }
-        $_additionalAddresses = $customer->getAdditionalAddresses();
-        if ($_additionalAddresses) {
-            foreach ($_additionalAddresses as $_address) {
+        $additionalAddresses = $customer->getAdditionalAddresses();
+        if ($additionalAddresses) {
+            foreach ($additionalAddresses as $address) {
                 $item = $addressXmlObj->addChild('item');
                 $item->addAttribute('label', $this->__('Additional Address'));
                 $item->addAttribute('additional', 1);
-                $this->prepareAddressData($_address, $item);
+                $this->prepareAddressData($address, $item);
             }
         }
 
@@ -81,9 +81,9 @@ protected function _toHtml()
      * @param Mage_XmlConnect_Model_Simplexml_Element $item
      * @return array
      */
-    public function prepareAddressData(
-        Mage_Customer_Model_Address $address, Mage_XmlConnect_Model_Simplexml_Element $item
-    ) {
+    public function prepareAddressData(Mage_Customer_Model_Address $address,
+        Mage_XmlConnect_Model_Simplexml_Element $item)
+    {
         if (!$address) {
             return array();
         }
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Downloads.php b/app/code/core/Mage/XmlConnect/Block/Customer/Downloads.php
new file mode 100644
index 00000000000..091e486c49d
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Downloads.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Customer Downloadable Products list xml renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Customer_Downloads extends Mage_Downloadable_Block_Customer_Products_List
+{
+    /**
+     * Render downloadable products list xml
+     *
+     * @return string
+     */
+    protected function _toHtml()
+    {
+        $items = $this->getItems();
+
+        if (count($items)) {
+            /** @var $xmlModel Mage_XmlConnect_Model_Simplexml_Element */
+            $xmlModel = Mage::getModel('xmlconnect/simplexml_element', '<downloads></downloads>');
+
+            foreach ($items as $item) {
+                $itemXmlObj = $xmlModel->addCustomChild('item');
+                $itemXmlObj->addCustomChild('title', $item->getPurchased()->getProductName());
+                $itemXmlObj->addCustomChild('link', $this->getDownloadUrl($item), array(
+                    'label' => $item->getLinkTitle()
+                ));
+                $itemXmlObj->addCustomChild('status', Mage::helper('downloadable')->__(ucfirst($item->getStatus())));
+                $itemXmlObj->addCustomChild('downloads_limit', $this->getRemainingDownloads($item));
+                $itemXmlObj->addCustomChild('date', $this->formatDate($item->getPurchased()->getCreatedAt()));
+                $itemXmlObj->addCustomChild('order_id', $item->getPurchased()->getOrderId());
+                $itemXmlObj->addCustomChild('real_order_id', $item->getPurchased()->getOrderIncrementId());
+            }
+        } else {
+            Mage::throwException(
+                Mage::helper('downloadable')->__('You have not purchased any downloadable products yet.')
+            );
+        }
+
+        return $xmlModel->asNiceXml();
+    }
+
+    /**
+     * Return url to download link
+     *
+     * @param Mage_Downloadable_Model_Link_Purchased_Item $item
+     * @return string
+     */
+    public function getDownloadUrl($item)
+    {
+        return $this->getUrl('downloadable/download/link', array('id' => $item->getLinkHash(), '_secure' => true));
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form.php
index a5515a5436f..fb2bb41f99f 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form.php
@@ -31,7 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Customer_Form extends Mage_Core_Block_Template
+class Mage_XmlConnect_Block_Customer_Form extends Mage_Core_Block_Abstract
 {
     /**
      * Render customer form xml
@@ -40,57 +40,160 @@ class Mage_XmlConnect_Block_Customer_Form extends Mage_Core_Block_Template
      */
     protected function _toHtml()
     {
-        $editFlag = (int)$this->getRequest()->getParam('edit');
-        $customer  = $this->getCustomer();
-        /** @var $xmlModel Mage_XmlConnect_Model_Simplexml_Element */
-        $xmlModel  = Mage::getModel('xmlconnect/simplexml_element', '<node></node>');
-        //Enterprise_Customer
-        if ($editFlag == 1 && $customer && $customer->getId()) {
-            $firstname = $xmlModel->escapeXml($customer->getFirstname());
-            $lastname  = $xmlModel->escapeXml($customer->getLastname());
-            $email     = $xmlModel->escapeXml($customer->getEmail());
+        $this->_setCustomerFields();
+        $this->_prepareFormData();
+
+        $action = Mage::helper('xmlconnect')->getActionUrl($this->getFormAction());
+
+        /** @var Mage_XmlConnect_Model_Simplexml_Form $fromXmlObj */
+        $fromXmlObj = Mage::getModel('xmlconnect/simplexml_form', array(
+            'xml_id' => 'account_form',
+            'action' => $action,
+            'use_container' => true
+        ));
+
+        $customerFieldset = $fromXmlObj->addFieldset('account_info', array(
+            'legend' => $this->__('Account Information')
+        ))->setCustomAttributes(array('legend'));
+
+        if ($this->getIsCheckoutRegistrationPage()) {
+            $customerFieldset->addField('checkout_page_registration', 'text', array(
+                'label' => $this->__('Checkout Page Registration'),
+                'value' => true,
+                'visible' => 0
+            ));
+        }
+
+        $this->_addCustomerData($customerFieldset);
+
+        /** Add custom attributes for customer */
+        Mage::helper('xmlconnect/customer_form_renderer')->setAttributesBlockName($this->getAttributesBlockName())
+            ->setFormCode($this->getCustomerFormCode())->setBlockEntity($this->getCustomer())
+            ->addCustomAttributes($customerFieldset, $this->getLayout());
+
+        if ($this->getIsEditPage()) {
+            $customerFieldset->addField('change_password', 'checkbox', array('label' => $this->__('Change Password')));
+
+            $customerPasswordFieldset = $fromXmlObj->addFieldset('password_edit', array(
+                'legend' => $this->__('Change Password')
+            ))->setCustomAttributes(array('legend'));
+
+            $this->_addPasswordFields($customerPasswordFieldset);
         } else {
-            $firstname = $lastname = $email = '';
+            $this->_addPasswordFields($customerFieldset);
         }
 
-        if ($editFlag) {
-            $passwordManageXml = '
-                   <field name="change_password" type="checkbox" label="' . $xmlModel->escapeXml($this->__('Change Password')) . '"/>
-                </fieldset>
-                <fieldset>
-                    <field name="current_password" type="password" label="' . $xmlModel->escapeXml($this->__('Current Password')) . '"/>
-                    <field name="password" type="password" label="' . $xmlModel->escapeXml($this->__('New Password')) . '"/>
-                    <field name="confirmation" type="password" label="' . $xmlModel->escapeXml($this->__('Confirm New Password')) . '">
-                        <validators>
-                            <validator type="confirmation" message="' . $xmlModel->escapeXml($this->__('Regular and confirmation passwords must be equal')) . '">password</validator>
-                        </validators>
-                    </field>
-                </fieldset>';
+        return $fromXmlObj->getXml();
+    }
+
+    /**
+     * Set customers fields for edit form
+     *
+     * @return Mage_XmlConnect_Block_Customer_Form
+     */
+    protected function _setCustomerFields()
+    {
+        $customer = $this->getCustomer();
+        if ($this->getIsEditPage() && $customer && $customer->getId()) {
+            $this->setFirstname($customer->getFirstname());
+            $this->setLastname($customer->getLastname());
+            $this->setEmail($customer->getEmail());
+        }
+        return $this;
+    }
+
+    /**
+     * Set form data
+     *
+     * @return Mage_XmlConnect_Block_Customer_Form
+     */
+    protected function _prepareFormData()
+    {
+        if ($this->getIsEditPage()) {
+            $this->setFormAction('xmlconnect/customer/edit');
+            $this->setPasswordLabel($this->__('New Password'));
+            $this->setConfirmLabel($this->__('Confirm New Password'));
         } else {
-            $passwordManageXml = '
-                    <field name="password" type="password" label="' . $xmlModel->escapeXml($this->__('Password')) . '" required="true"/>
-                    <field name="confirmation" type="password" label="' . $xmlModel->escapeXml($this->__('Confirm Password')) . '" required="true">
-                        <validators>
-                            <validator type="confirmation" message="' . $xmlModel->escapeXml($this->__('Regular and confirmation passwords must be equal')) . '">password</validator>
-                        </validators>
-                    </field>
-                </fieldset>';
+            $this->setFormAction('xmlconnect/customer/save');
+            $this->setPasswordLabel($this->__('Password'));
+            $this->setConfirmLabel($this->__('Confirm Password'));
+            $this->setIsPasswordRequired(true);
         }
 
-        $xml = <<<EOT
-<form name="account_form" method="post">
-    <fieldset>
-        <field name="firstname" type="text" label="{$xmlModel->escapeXml($this->__('First Name'))}" required="true" value="$firstname" />
-        <field name="lastname" type="text" label="{$xmlModel->escapeXml($this->__('Last Name'))}" required="true" value="$lastname" />
-        <field name="email" type="text" label="{$xmlModel->escapeXml($this->__('Email'))}" required="true" value="$email">
-            <validators>
-                <validator type="email" message="{$xmlModel->escapeXml($this->__('Wrong email format'))}"/>
-            </validators>
-        </field>
-        $passwordManageXml
-</form>
-EOT;
-
-        return $xml;
+        return $this;
+    }
+
+
+    /**
+     * Add customer fields - first name, last name and email
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $customerFieldset
+     * @return Mage_XmlConnect_Block_Customer_Form
+     */
+    protected function _addCustomerData(Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $customerFieldset)
+    {
+        $customerFieldset->addField('firstname', 'text', array(
+            'label' => $this->__('First Name'),
+            'required' => 'true',
+            'value' => $this->getFirstname()
+        ));
+        $customerFieldset->addField('lastname', 'text', array(
+            'label' => $this->__('Last Name'),
+            'required' => 'true',
+            'value' => $this->getLastname()
+        ));
+        $customerFieldset->addField('email', 'text', array(
+            'label' => $this->__('Email'), 'required' => 'true', 'value' => $this->getEmail()
+        ))->addValidator()->addRule(array('type' => 'email', 'message' => $this->__('Wrong email format')));
+
+        return $this;
+    }
+
+    /**
+     * Add password fields
+     *
+     * Add to form current password, password and password confirmation fields
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $formFieldset
+     * @return Mage_XmlConnect_Block_Customer_Form
+     */
+    protected function _addPasswordFields(Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $formFieldset)
+    {
+        /**
+         * Return password confirmation validator in old format
+         */
+        if ($this->getIsEditPage()) {
+            $formFieldset->addField('current_password', 'password', array(
+                'label' => $this->__('Current Password'),
+                'required' => 'true'
+            ));
+        }
+        $formFieldset->addField('password', 'password', array(
+            'label' => $this->getPasswordLabel()
+        ) + $this->_getRequiredParam());
+
+        $field = $formFieldset->addField('confirmation', 'password', array(
+            'label' => $this->getConfirmLabel()
+        ) + $this->_getRequiredParam())->addValidator();
+
+        $field->getXmlObject()->addCustomChild('validator', 'password', array(
+            'type' => 'confirmation',
+            'message' => $this->__('Regular and confirmation passwords must be equal')
+        ));
+
+        return $this;
+    }
+
+    /**
+     * Get is password required param
+     *
+     * @return array
+     */
+    protected function _getRequiredParam()
+    {
+        if ($this->getIsPasswordRequired()) {
+            return array('required' => 'true');
+        }
+        return array();
     }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Date.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Date.php
index 9ef0f906442..67cc1edcc67 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Date.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Date.php
@@ -48,20 +48,20 @@ class Mage_XmlConnect_Block_Customer_Form_Renderer_Date extends Enterprise_Custo
     protected function _prepareValues()
     {
         return array('day' => array(
-            'id' => $this->getHtmlId('day'),
-            'title' => $this->__('Day'),
-            'label' => $this->__('DD'),
-            'value' => $this->getDay()
-        ), 'month' => array(
-            'id' => $this->getHtmlId('month'),
-            'title' => $this->__('Month'),
-            'label' => $this->__('MM'),
-            'value' => $this->getMonth()
-        ), 'year' => array(
-            'id' => $this->getHtmlId('year'),
-            'title' => $this->__('Year'),
-            'label' => $this->__('YYYY'),
-            'value' => $this->getYear()
+                'id' => $this->getHtmlId('day'),
+                'title' => $this->__('Day'),
+                'label' => $this->__('DD'),
+                'value' => $this->getDay()
+            ), 'month' => array(
+                'id' => $this->getHtmlId('month'),
+                'title' => $this->__('Month'),
+                'label' => $this->__('MM'),
+                'value' => $this->getMonth()
+            ), 'year' => array(
+                'id' => $this->getHtmlId('year'),
+                'title' => $this->__('Year'),
+                'label' => $this->__('YYYY'),
+                'value' => $this->getYear()
         ));
     }
 
@@ -82,7 +82,9 @@ public function addFieldToXmlObj(Mage_XmlConnect_Model_Simplexml_Form_Element_Fi
 
         $attributes += Mage::helper('xmlconnect/customer_form_renderer')
             ->addTitleAndRequiredAttr($fieldsetXmlObj, $this);
+
         $fieldXmlObj = $fieldsetXmlObj->addField($this->getHtmlId('full'), $this->_filedType, $attributes);
+
         $validateRules = $this->getAttributeObject()->getValidateRules();
 
         if (!empty($validateRules)) {
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Text.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Text.php
index e7c7fd3947a..66889a7ea9c 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Text.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Text.php
@@ -49,15 +49,16 @@ class Mage_XmlConnect_Block_Customer_Form_Renderer_Text extends Enterprise_Custo
     public function addFieldToXmlObj(Mage_XmlConnect_Model_Simplexml_Form_Element_Fieldset $fieldsetXmlObj)
     {
         $attributes = array(
-            'label' => $this->getLabel(), 'name' => $this->getFieldName(), 'value' => $this->getEscapedValue()
+            'label' => $this->getLabel(),
+            'name'  => $this->getFieldName(),
+            'value' => $this->getEscapedValue()
         );
 
         $attributes += Mage::helper('xmlconnect/customer_form_renderer')
             ->addTitleAndRequiredAttr($fieldsetXmlObj, $this);
 
-        $fieldXmlObj = $fieldsetXmlObj->addField($this->getHtmlId(), $this->_filedType, $attributes);
-
-        $validateRules = $this->getAttributeObject()->getValidateRules();
+        $fieldXmlObj    = $fieldsetXmlObj->addField($this->getHtmlId(), $this->_filedType, $attributes);
+        $validateRules  = $this->getAttributeObject()->getValidateRules();
 
         if (!empty($validateRules)) {
             $validatorXmlObj = $fieldXmlObj->addValidator();
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Details.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Details.php
index 194fa95a7e0..d65056069a9 100755
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Details.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Details.php
@@ -71,12 +71,13 @@ protected function _toHtml()
              'label' => $this->__('Order #%s - %s', $order->getRealOrderId(), $order->getStatusLabel()),
              'order_date' => $this->__('Order Date: %s', $orderDate)
         ));
+
+        $billing  = Mage::helper('xmlconnect')->trimLineBreaks($order->getBillingAddress()->format('text'));
+        $orderXmlObj->addCustomChild('billing_address', $billing);
+
         if (!$order->getIsVirtual()) {
             $shipping = Mage::helper('xmlconnect')->trimLineBreaks($order->getShippingAddress()->format('text'));
-            $billing  = Mage::helper('xmlconnect')->trimLineBreaks($order->getBillingAddress()->format('text'));
-
             $orderXmlObj->addCustomChild('shipping_address', $shipping);
-            $orderXmlObj->addCustomChild('billing_address', $billing);
 
             if ($order->getShippingDescription()) {
                 $shippingMethodDescription = $order->getShippingDescription();
@@ -88,12 +89,12 @@ protected function _toHtml()
 
         $this->_addPaymentMethodInfoToXmlObj($orderXmlObj);
 
-        $itemsBlock = $this->getLayout()->getBlock('xmlconnect.customer.order.items');
+        $itemsBlock = $this->getLayout()->getBlock('order.items');
         if ($itemsBlock) {
             /** @var $itemsBlock Mage_XmlConnect_Block_Customer_Order_Items */
             $itemsBlock->setItems($order->getItemsCollection());
             $itemsBlock->addItemsToXmlObject($orderXmlObj);
-            $totalsBlock = $this->getLayout()->getBlock('xmlconnect.customer.order.totals');
+            $totalsBlock = $this->getLayout()->getBlock('order.totals');
             if ($totalsBlock) {
                 $totalsBlock->setOrder($order);
                 $totalsBlock->addTotalsToXmlObject($orderXmlObj);
@@ -141,9 +142,9 @@ protected function _addPaymentMethodInfoToXmlObj(Mage_XmlConnect_Model_Simplexml
             if (!empty($specificInfo)) {
                 foreach ($specificInfo as $label => $value) {
                     if ($value) {
-                        $paymentNode->addCustomChild('item', implode($this->getValueAsArray($value, true), '\n'),
-                            array('label' => $label)
-                        );
+                        $paymentNode->addCustomChild('item',implode($this->getValueAsArray($value, true), '\n'), array(
+                            'label' => $label
+                        ));
                     }
                 }
             }
@@ -176,10 +177,6 @@ protected function _getOrder()
      */
     protected function _formatAddress($address)
     {
-        return preg_replace(
-            array('@\r@', '@\n+@'),
-            array('', '\n'),
-            $address
-        );
+        return preg_replace(array('@\r@', '@\n+@'), array('', '\n'), $address);
     }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Bundle.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Bundle.php
index 7cc1b2c33a3..7b407473370 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Bundle.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Bundle.php
@@ -42,10 +42,14 @@ class Mage_XmlConnect_Block_Customer_Order_Item_Renderer_Bundle extends Mage_Bun
      */
     public function addItemToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $orderItemXmlObj)
     {
+        if ($this->getNewApi()) {
+            $this->addItemToXmlObjectApi23($orderItemXmlObj);
+            return;
+        }
         /** @var $parentItem Mage_Sales_Model_Order_Item */
         $parentItem     = $this->getItem();
         $items          = array_merge(array($parentItem), $parentItem->getChildrenItems());
-        $_prevOptionId  = '';
+        $prevOptionId   = '';
 
         /** @var $weeeHelper Mage_Weee_Helper_Data */
         $weeeHelper = $this->helper('weee');
@@ -73,7 +77,7 @@ public function addItemToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $orde
             Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_1  => $typeOfDisplay1,
             Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_2  => $typeOfDisplay2,
             Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_4  => $typeOfDisplay4,
-            Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_14 => $typeOfDisplay014,
+            Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_14 => $typeOfDisplay014
         ));
         $this->setWeeeTaxes($weeeHelper->getApplied($parentItem));
 
@@ -92,9 +96,9 @@ public function addItemToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $orde
 
             if ($isOption) {
                 $attributes = $this->getSelectionAttributes($item);
-                if ($_prevOptionId != $attributes['option_id']) {
+                if ($prevOptionId != $attributes['option_id']) {
                     $objectXml->addAttribute('label', $objectXml->xmlAttribute($attributes['option_label']));
-                    $_prevOptionId = $attributes['option_id'];
+                    $prevOptionId = $attributes['option_id'];
                 }
             }
 
@@ -117,10 +121,7 @@ public function addItemToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $orde
                 // Price excluding tax
                 if ($taxHelper->displaySalesBothPrices() || $taxHelper->displaySalesPriceExclTax()) {
                     Mage::helper('xmlconnect/customer_order')->addPriceAndSubtotalToXml(
-                        $this,
-                        $parentItem,
-                        $priceXml,
-                        $subtotalXml
+                        $this, $parentItem, $priceXml, $subtotalXml
                     );
                 }
 
@@ -134,9 +135,7 @@ public function addItemToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $orde
 
             // set quantities
             /** @var $qtyXml Mage_XmlConnect_Model_Simplexml_Element */
-            if (($isOption && $this->isChildCalculated())
-                || (!$isOption && !$this->isChildCalculated())
-            ) {
+            if (($isOption && $this->isChildCalculated()) || (!$isOption && !$this->isChildCalculated())) {
                 $qtyXml = $objectXml->addChild('qty');
                 if ($item->getQtyOrdered() > 0) {
                     $qtyXml->addCustomChild('value', $item->getQtyOrdered() * 1, array(
@@ -173,6 +172,138 @@ public function addItemToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $orde
         Mage::helper('xmlconnect/customer_order')->addItemOptionsToXml($this, $itemXml);
     }
 
+    /**
+     * Add item to XML object. Api version 23
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $orderItemXmlObj
+     * @return null
+     */
+    public function addItemToXmlObjectApi23(Mage_XmlConnect_Model_Simplexml_Element $orderItemXmlObj)
+    {
+        /** @var $parentItem Mage_Sales_Model_Order_Item */
+        $parentItem     = $this->getItem();
+        $items          = array_merge(array($parentItem), $parentItem->getChildrenItems());
+        $prevOptionId   = '';
+
+        /** @var $weeeHelper Mage_Weee_Helper_Data */
+        $weeeHelper = $this->helper('weee');
+        /** @var $taxHelper Mage_Tax_Helper_Data */
+        $taxHelper  = $this->helper('tax');
+
+        /** @var $itemXml Mage_XmlConnect_Model_Simplexml_Element */
+        $itemXml    = $orderItemXmlObj->addChild('item');
+        /** @var $optionsXml Mage_XmlConnect_Model_Simplexml_Element */
+        $optionsXml = $itemXml->addChild('related_products');
+
+        $this->setWeeeTaxAppliedAmount($parentItem->getWeeeTaxAppliedAmount());
+        $this->setWeeeTaxDisposition($parentItem->getWeeeTaxDisposition());
+
+        $typeOfDisplay1 = $weeeHelper->typeOfDisplay($parentItem, 1, 'sales')
+            && $this->getWeeeTaxAppliedAmount();
+        $typeOfDisplay2 = $weeeHelper->typeOfDisplay($parentItem, 2, 'sales')
+            && $this->getWeeeTaxAppliedAmount();
+        $typeOfDisplay4 = $weeeHelper->typeOfDisplay($parentItem, 4, 'sales')
+            && $this->getWeeeTaxAppliedAmount();
+        $typeOfDisplay014 = $weeeHelper->typeOfDisplay($parentItem, array(0, 1, 4), 'sales')
+            && $this->getWeeeTaxAppliedAmount();
+
+        $this->setTypesOfDisplay(array(
+            Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_1  => $typeOfDisplay1,
+            Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_2  => $typeOfDisplay2,
+            Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_4  => $typeOfDisplay4,
+            Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_14 => $typeOfDisplay014
+        ));
+        $this->setWeeeTaxes($weeeHelper->getApplied($parentItem));
+
+        /** @var $item Mage_Sales_Model_Order_Item */
+        foreach ($items as $item) {
+            $isOption = $item->getParentItem() ? true : false;
+
+            /** @var $objectXml Mage_XmlConnect_Model_Simplexml_Element */
+            if ($isOption) {
+                $objectXml = $optionsXml->addChild('item');
+            } else {
+                $objectXml = $itemXml;
+            }
+            $objectXml->addAttribute('product_id', $item->getProductId());
+            $objectXml->addCustomChild('entity_type', $item->getProductType());
+
+            if ($isOption) {
+                $attributes = $this->getSelectionAttributes($item);
+                if ($prevOptionId != $attributes['option_id']) {
+                    $objectXml->addAttribute('label', $objectXml->xmlAttribute($attributes['option_label']));
+                    $prevOptionId = $attributes['option_id'];
+                }
+            }
+
+            $objectXml->addCustomChild('sku', Mage::helper('core/string')->splitInjection($item->getSku()));
+
+            if ($isOption) {
+                $name = $this->getValueHtml($item);
+            } else {
+                $name = $item->getName();
+            }
+            $objectXml->addCustomChild('name', $name);
+
+            // set prices exactly for the Bundle product, but not for related products
+            if (!$isOption) {
+                $priceXml = $itemXml->addCustomChild('price_list');
+                $priceInfoXml = $priceXml->addCustomChild('prices', null, array('id' => 'price'));
+                $subtotalInfoXml = $priceXml->addCustomChild('prices', null, array('id' => 'subtotal'));
+                // Price excluding tax
+                if ($taxHelper->displaySalesBothPrices() || $taxHelper->displaySalesPriceExclTax()) {
+                    Mage::helper('xmlconnect/customer_order')->addPriceAndSubtotalToXmlApi23(
+                        $this, $parentItem, $priceInfoXml, $subtotalInfoXml
+                    );
+                }
+
+                // Price including tax
+                if ($taxHelper->displaySalesBothPrices() || $taxHelper->displaySalesPriceInclTax()) {
+                    Mage::helper('xmlconnect/customer_order')->addPriceAndSubtotalToXmlApi23(
+                        $this, $parentItem, $priceInfoXml, $subtotalInfoXml, true
+                    );
+                }
+            }
+
+            // set quantities
+            /** @var $qtyXml Mage_XmlConnect_Model_Simplexml_Element */
+            if (($isOption && $this->isChildCalculated()) || (!$isOption && !$this->isChildCalculated())) {
+                $qtyXml = $objectXml->addChild('quantity');
+                if ($item->getQtyOrdered() > 0) {
+                    $qtyXml->addCustomChild('value', $item->getQtyOrdered() * 1, array(
+                        'label' => Mage::helper('sales')->__('Ordered')
+                    ));
+                }
+                if ($item->getQtyShipped() > 0 && !$this->isShipmentSeparately()) {
+                    $qtyXml->addCustomChild('value', $item->getQtyShipped() * 1, array(
+                        'label' => Mage::helper('sales')->__('Shipped')
+                    ));
+                }
+                if ($item->getQtyCanceled() > 0) {
+                    $qtyXml->addCustomChild('value', $item->getQtyCanceled() * 1, array(
+                        'label' => Mage::helper('sales')->__('Canceled')
+                    ));
+                }
+                if ($item->getQtyRefunded() > 0) {
+                    $qtyXml->addCustomChild('value', $item->getQtyRefunded() * 1, array(
+                        'label' => Mage::helper('sales')->__('Refunded')
+                    ));
+                }
+            } elseif ($item->getQtyShipped() > 0 && $isOption && $this->isShipmentSeparately()) {
+                $qtyXml = $objectXml->addChild('quantity');
+                $qtyXml->addCustomChild('value', $item->getQtyShipped() * 1, array(
+                    'label' => Mage::helper('sales')->__('Shipped')
+                ));
+            }
+        }
+
+        if ($parentItem->getDescription()) {
+            $itemXml->addCustomChild('description', $parentItem->getDescription());
+        }
+
+        Mage::helper('xmlconnect/customer_order')->addItemOptionsToXml($this, $itemXml);
+    }
+
     /**
      * Prepare option data for output
      *
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Default.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Default.php
index 1e78f86e3d3..bd7f1788c39 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Default.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Default.php
@@ -42,6 +42,10 @@ class Mage_XmlConnect_Block_Customer_Order_Item_Renderer_Default extends Mage_Sa
      */
     public function addItemToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $orderItemXmlObj)
     {
+        if ($this->getNewApi()) {
+            $this->addItemToXmlObjectApi23($orderItemXmlObj);
+            return;
+        }
         /** @var $item Mage_Sales_Model_Order_Item */
         $item = $this->getItem();
 
@@ -109,4 +113,73 @@ public function addItemToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $orde
             );
         }
     }
+
+    /**
+     * Add item to XML object. Api version 23
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $orderItemXmlObj
+     * @return null
+     */
+    public function addItemToXmlObjectApi23(Mage_XmlConnect_Model_Simplexml_Element $orderItemXmlObj)
+    {
+        /** @var $item Mage_Sales_Model_Order_Item */
+        $item = $this->getItem();
+
+        /** @var $itemXml Mage_XmlConnect_Model_Simplexml_Element */
+        $itemXml = $orderItemXmlObj->addCustomChild('item', null, array(
+            'product_id' => $item->getProductId()
+        ));
+        $itemXml->addCustomChild('name', $item->getName());
+
+        /** @var $weeeHelper Mage_Weee_Helper_Data */
+        $weeeHelper = $this->helper('weee');
+        /** @var $taxHelper Mage_Tax_Helper_Data */
+        $taxHelper  = $this->helper('tax');
+
+        Mage::helper('xmlconnect/customer_order')->addItemOptionsToXml($this, $itemXml);
+
+        $itemXml->addCustomChild('entity_type', $item->getProductType());
+        $itemXml->addCustomChild('description', $item->getDescription());
+        $itemXml->addCustomChild('sku', Mage::helper('core/string')->splitInjection($this->getSku()));
+
+        $this->setWeeeTaxAppliedAmount($item->getWeeeTaxAppliedAmount());
+        $this->setWeeeTaxDisposition($item->getWeeeTaxDisposition());
+
+        $typeOfDisplay1 = $weeeHelper->typeOfDisplay($item, 1, 'sales')
+            && $this->getWeeeTaxAppliedAmount();
+        $typeOfDisplay2 = $weeeHelper->typeOfDisplay($item, 2, 'sales')
+            && $this->getWeeeTaxAppliedAmount();
+        $typeOfDisplay4 = $weeeHelper->typeOfDisplay($item, 4, 'sales')
+            && $this->getWeeeTaxAppliedAmount();
+        $typeOfDisplay014 = $weeeHelper->typeOfDisplay($item, array(0, 1, 4), 'sales')
+            && $this->getWeeeTaxAppliedAmount();
+
+        $this->setTypesOfDisplay(array(
+            Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_1   => $typeOfDisplay1,
+            Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_2   => $typeOfDisplay2,
+            Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_4   => $typeOfDisplay4,
+            Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_14  => $typeOfDisplay014,
+        ));
+        $this->setWeeeTaxes($weeeHelper->getApplied($item));
+
+        // Quantity: Ordered, Shipped, Cancelled, Refunded
+        Mage::helper('xmlconnect/customer_order')->addQuantityToXml($this, $itemXml->addChild('quantity'), $item);
+
+        $priceXml = $itemXml->addCustomChild('price_list');
+        $priceInfoXml = $priceXml->addCustomChild('prices', null, array('id' => 'price'));
+        $subtotalInfoXml = $priceXml->addCustomChild('prices', null, array('id' => 'subtotal'));
+        // Price & subtotal - excluding tax
+        if ($taxHelper->displaySalesBothPrices() || $taxHelper->displaySalesPriceExclTax()) {
+            Mage::helper('xmlconnect/customer_order')->addPriceAndSubtotalToXmlApi23(
+                $this, $item, $priceInfoXml, $subtotalInfoXml
+            );
+        }
+
+        // Price & subtotal - including tax
+        if ($taxHelper->displaySalesBothPrices() || $taxHelper->displaySalesPriceInclTax()) {
+            Mage::helper('xmlconnect/customer_order')->addPriceAndSubtotalToXmlApi23(
+                $this, $item, $priceInfoXml, $subtotalInfoXml, true
+            );
+        }
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Downloadable.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Downloadable.php
index a89d77f3135..d2571603833 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Downloadable.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Downloadable.php
@@ -43,6 +43,10 @@ class Mage_XmlConnect_Block_Customer_Order_Item_Renderer_Downloadable
      */
     public function addItemToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $orderItemXmlObj)
     {
+        if ($this->getNewApi()) {
+            $this->addItemToXmlObjectApi23($orderItemXmlObj);
+            return;
+        }
         /** @var $item Mage_Sales_Model_Order_Item */
         $item = $this->getItem();
 
@@ -59,12 +63,6 @@ public function addItemToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $orde
 
         Mage::helper('xmlconnect/customer_order')->addItemOptionsToXml($this, $itemXml);
 
-        $addtInfoBlock = $this->getProductAdditionalInformationBlock();
-        if ($addtInfoBlock) {
-            // TODO: find how to set additional info block
-            // $addtInfoBlock->setItem($item)->toHtml();
-        }
-
         $links = $this->getLinks();
         if ($links) {
             $linksXml = $itemXml->addCustomChild('links', null, array('label' => $this->getLinksTitle()));
@@ -102,18 +100,13 @@ public function addItemToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $orde
             Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_1   => $typeOfDisplay1,
             Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_2   => $typeOfDisplay2,
             Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_4   => $typeOfDisplay4,
-            Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_14  => $typeOfDisplay014,
+            Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_14  => $typeOfDisplay014
         ));
         $this->setWeeeTaxes($weeeHelper->getApplied($item));
 
         // Price & subtotal - excluding tax
         if ($taxHelper->displaySalesBothPrices() || $taxHelper->displaySalesPriceExclTax()) {
-            Mage::helper('xmlconnect/customer_order')->addPriceAndSubtotalToXml(
-                $this,
-                $item,
-                $priceXml,
-                $subtotalXml
-            );
+            Mage::helper('xmlconnect/customer_order')->addPriceAndSubtotalToXml($this, $item, $priceXml, $subtotalXml);
         }
 
         // Price & subtotal - including tax
@@ -123,4 +116,82 @@ public function addItemToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $orde
             );
         }
     }
+
+    /**
+     * Add item to XML object. Api version 23
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $orderItemXmlObj
+     * @return null
+     */
+    public function addItemToXmlObjectApi23(Mage_XmlConnect_Model_Simplexml_Element $orderItemXmlObj)
+    {
+        /** @var $item Mage_Sales_Model_Order_Item */
+        $item = $this->getItem();
+
+        /** @var $itemXml Mage_XmlConnect_Model_Simplexml_Element */
+        $itemXml = $orderItemXmlObj->addCustomChild('item', null, array(
+            'product_id' => $item->getProductId()
+        ));
+        $itemXml->addCustomChild('name', $item->getName());
+
+        /** @var $weeeHelper Mage_Weee_Helper_Data */
+        $weeeHelper = $this->helper('weee');
+        /** @var $taxHelper Mage_Tax_Helper_Data */
+        $taxHelper  = $this->helper('tax');
+
+        Mage::helper('xmlconnect/customer_order')->addItemOptionsToXml($this, $itemXml);
+
+        $links = $this->getLinks();
+        if ($links) {
+            $linksXml = $itemXml->addCustomChild('links', null, array('label' => $this->getLinksTitle()));
+            foreach ($links->getPurchasedItems() as $link) {
+                $linksXml->addCustomChild('link', $link->getLinkTitle());
+            }
+        }
+
+        $itemXml->addCustomChild('entity_type', $item->getProductType());
+        $itemXml->addCustomChild('description', $item->getDescription());
+        $itemXml->addCustomChild('sku', Mage::helper('core/string')->splitInjection($this->getSku()));
+
+        // Quantity: Ordered, Shipped, Cancelled, Refunded
+        Mage::helper('xmlconnect/customer_order')->addQuantityToXml($this, $itemXml->addChild('quantity'), $item);
+
+        $this->setWeeeTaxAppliedAmount($item->getWeeeTaxAppliedAmount());
+        $this->setWeeeTaxDisposition($item->getWeeeTaxDisposition());
+
+        $typeOfDisplay1 = $weeeHelper->typeOfDisplay($item, 1, 'sales')
+            && $this->getWeeeTaxAppliedAmount();
+        $typeOfDisplay2 = $weeeHelper->typeOfDisplay($item, 2, 'sales')
+            && $this->getWeeeTaxAppliedAmount();
+        $typeOfDisplay4 = $weeeHelper->typeOfDisplay($item, 4, 'sales')
+            && $this->getWeeeTaxAppliedAmount();
+        $typeOfDisplay014 = $weeeHelper->typeOfDisplay($item, array(0, 1, 4), 'sales')
+            && $this->getWeeeTaxAppliedAmount();
+
+        $this->setTypesOfDisplay(array(
+            Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_1   => $typeOfDisplay1,
+            Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_2   => $typeOfDisplay2,
+            Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_4   => $typeOfDisplay4,
+            Mage_XmlConnect_Helper_Customer_Order::PRICE_DISPLAY_TYPE_14  => $typeOfDisplay014
+        ));
+        $this->setWeeeTaxes($weeeHelper->getApplied($item));
+
+        $priceXml = $itemXml->addCustomChild('price_list');
+        $priceInfoXml = $priceXml->addCustomChild('prices', null, array('id' => 'price'));
+        $subtotalInfoXml = $priceXml->addCustomChild('prices', null, array('id' => 'subtotal'));
+
+        // Price & subtotal - excluding tax
+        if ($taxHelper->displaySalesBothPrices() || $taxHelper->displaySalesPriceExclTax()) {
+            Mage::helper('xmlconnect/customer_order')->addPriceAndSubtotalToXmlApi23(
+                $this, $item, $priceInfoXml, $subtotalInfoXml
+            );
+        }
+
+        // Price & subtotal - including tax
+        if ($taxHelper->displaySalesBothPrices() || $taxHelper->displaySalesPriceInclTax()) {
+            Mage::helper('xmlconnect/customer_order')->addPriceAndSubtotalToXmlApi23(
+                $this, $item, $priceInfoXml,$subtotalInfoXml, true
+            );
+        }
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Giftcard.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Giftcard.php
index 826f9171823..0d2ca7134e9 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Giftcard.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Giftcard.php
@@ -72,8 +72,8 @@ public function addItemToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $orde
         $item = $this->getOrderItem();
         $item->setProductOptions(array('additional_options' => $this->getItemOptions()));
 
-        $defaultRenderer = $this->getLayout()->getBlock('xmlconnect.customer.order.items')->getItemRenderer(null);
-        $defaultRenderer->setItem($item);
+        $defaultRenderer = $this->getLayout()->getBlock('order.items')->getItemRenderer(null);
+        $defaultRenderer->setItem($item)->setNewApi($this->getNewApi());
         $defaultRenderer->addItemToXmlObject($orderItemXmlObj);
     }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Grouped.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Grouped.php
index 44e974503de..a013370de30 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Grouped.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Grouped.php
@@ -47,14 +47,16 @@ class Mage_XmlConnect_Block_Customer_Order_Item_Renderer_Grouped extends Mage_Sa
      */
     public function addItemToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $orderItemXmlObj)
     {
-        if (!($item = $this->getItem()->getOrderItem())) {
+        $item = $this->getItem()->getOrderItem();
+        if (!$item) {
             $item = $this->getItem();
         }
-        if (!($productType = $item->getRealProductType())) {
+        $productType = $item->getRealProductType();
+        if (!$productType) {
             $productType = self::DEFAULT_PRODUCT_TYPE;
         }
         $renderer = $this->getRenderedBlock()->getItemRenderer($productType);
-        $renderer->setItem($this->getItem());
+        $renderer->setItem($this->getItem())->setNewApi($this->getNewApi());
         $renderer->addItemToXmlObject($orderItemXmlObj);
     }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Items.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Items.php
index 6be03c18cd6..509a6abe50d 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Items.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Items.php
@@ -71,7 +71,6 @@ public function getItemRenderer($type)
     public function addItemsToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $orderXmlObj)
     {
         $itemsXml = $orderXmlObj->addChild('ordered_items');
-
         foreach ($this->getItems() as $item) {
             if ($item->getParentItem()) {
                 // if Item is option of grouped product - do not render it
@@ -84,7 +83,7 @@ public function addItemsToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $ord
             if ($type == 'giftcard' && !is_object(Mage::getConfig()->getNode('modules/Enterprise_GiftCard'))) {
                 continue;
             }
-            $renderer = $this->getItemRenderer($type)->setItem($item);
+            $renderer = $this->getItemRenderer($type)->setNewApi($this->getNewApi())->setItem($item);
             if (method_exists($renderer, 'addItemToXmlObject')) {
                 $renderer->addItemToXmlObject($itemsXml);
             }
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/List.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/List.php
index 96254f18908..64106722d12 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/List.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/List.php
@@ -31,7 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Customer_Order_List extends Mage_Core_Block_Template
+class Mage_XmlConnect_Block_Customer_Order_List extends Mage_Core_Block_Abstract
 {
     /**
      * Orders count limit
@@ -45,32 +45,45 @@ class Mage_XmlConnect_Block_Customer_Order_List extends Mage_Core_Block_Template
      */
     protected function _toHtml()
     {
+        /** @var $ordersXmlObj Mage_XmlConnect_Model_Simplexml_Element */
         $ordersXmlObj = Mage::getModel('xmlconnect/simplexml_element', '<orders></orders>');
 
+        /** @var $orders Mage_Sales_Model_Resource_Order_Collection */
         $orders = Mage::getResourceModel('sales/order_collection')->addFieldToSelect('*')->addFieldToFilter(
             'customer_id', Mage::getSingleton('customer/session')->getCustomer()->getId()
-        )
-        ->addFieldToFilter(
-            'state', array('in' => Mage::getSingleton('sales/order_config')->getVisibleOnFrontStates())
-        )
-        ->setOrder('created_at', 'desc');
+        )->addFieldToFilter('state', array(
+            'in' => Mage::getSingleton('sales/order_config')->getVisibleOnFrontStates()
+        ))->setOrder('created_at', 'desc');
 
-        $orders->getSelect()->limit(self::ORDERS_LIST_LIMIT, 0);
+        /** @var $request Mage_Core_Controller_Request_Http */
+        $request = $this->getRequest();
+        /**
+         * Apply offset and count
+         */
+        $count = abs((int)$request->getParam('count', 0));
+        $count = $count ? $count : self::ORDERS_LIST_LIMIT;
+        $offset = abs((int)$request->getParam('offset', 0));
+
+
+        $ordersXmlObj->addAttribute('orders_count', $ordersXmlObj->escapeXml($orders->count()));
+        $ordersXmlObj->addAttribute('offset', $ordersXmlObj->escapeXml($offset));
+
+        $orders->clear()->getSelect()->limit($count, $offset);
         $orders->load();
 
-        if (sizeof($orders->getItems())) {
-            foreach ($orders as $_order) {
+        if ($orders->count()) {
+            foreach ($orders as $order) {
                 $item = $ordersXmlObj->addChild('item');
-                $item->addChild('entity_id', $_order->getId());
-                $item->addChild('number', $_order->getRealOrderId());
-                $item->addChild('date', $this->formatDate($_order->getCreatedAtStoreDate()));
-                if ($_order->getShippingAddress()) {
-                    $item->addChild('ship_to', $ordersXmlObj->escapeXml($_order->getShippingAddress()->getName()));
+                $item->addChild('entity_id', $order->getId());
+                $item->addChild('number', $order->getRealOrderId());
+                $item->addChild('date', $this->formatDate($order->getCreatedAtStoreDate()));
+                if ($order->getShippingAddress()) {
+                    $item->addChild('ship_to', $ordersXmlObj->escapeXml($order->getShippingAddress()->getName()));
                 }
-                $item->addChild('total', $_order->getOrderCurrency()->formatPrecision(
-                    $_order->getGrandTotal(), 2, array(), false, false
+                $item->addChild('total', $order->getOrderCurrency()->formatPrecision(
+                    $order->getGrandTotal(), 2, array(), false, false
                 ));
-                $item->addChild('status', $_order->getStatusLabel());
+                $item->addChild('status', $order->getStatusLabel());
             }
         }
         return $ordersXmlObj->asNiceXml();
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals.php
index 1cdbaf15ecf..70a99d43694 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals.php
@@ -61,8 +61,7 @@ public function addTotalsToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $or
                 'action'    => array(
                     'method'    => 'setAfterTotal',
                     'value'     => 'grand_total'
-                )
-            ),
+            )),
             'giftwrapping'  => array(
                 'module'    => 'Enterprise_GiftWrapping',
                 'block'     => 'enterprise_giftwrapping/sales_totals'
@@ -71,11 +70,10 @@ public function addTotalsToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $or
                 'module'    => 'Enterprise_GiftCardAccount',
                 'block'     => 'xmlconnect/customer_order_totals_giftcards',
                 'template'  => 'giftcardaccount/order/giftcards.phtml'
-            ),
-        );
+        ));
 
         foreach ($enterpriseBlocks as $name => $block) {
-            // create blocks only for Enterprise/Pro modules which is in system
+            // create blocks only for Enterprise/Pro modules which are in system
             if (is_object(Mage::getConfig()->getNode('modules/' . $block['module']))) {
                 $blockInstance = $this->getLayout()->createBlock($block['block'], $name);
                 $this->setChild($name, $blockInstance);
@@ -87,11 +85,16 @@ public function addTotalsToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $or
         }
 
         $this->_beforeToHtml();
+        $totalsXml = $orderXmlObj->addCustomChild('totals');
+
+        if ($this->getNewApi()) {
+            $this->_prepareTotalsApi23($totalsXml);
+            return;
+        }
 
-        $totalsXml = $orderXmlObj->addChild('totals');
         foreach ($this->getTotals() as $total) {
             if ($total->getValue()) {
-                $total->setValue(strip_tags($total->getValue()));
+                $total->setValue($totalsXml->escapeXml($total->getValue()));
             }
             if ($total->getBlockName()) {
                 $block = $this->getLayout()->getBlock($total->getBlockName());
@@ -108,6 +111,34 @@ public function addTotalsToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $or
         }
     }
 
+    /**
+     * Prepare totals using for response api version 23
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $totalsXml
+     * @return null
+     */
+    protected function _prepareTotalsApi23(Mage_XmlConnect_Model_Simplexml_Element $totalsXml)
+    {
+        $totalsXml = $totalsXml->addCustomChild('total', null, array('id' => 'totals_full_list'));
+        foreach ($this->getTotals() as $total) {
+            if ($total->getValue()) {
+                $total->setValue($totalsXml->escapeXml($total->getValue()));
+            }
+            if ($total->getBlockName()) {
+                $block = $this->getLayout()->getBlock($total->getBlockName());
+                if (is_object($block)) {
+                    if (method_exists($block, 'addToXmlObject')) {
+                        $block->setTotal($total)->setNewApi($this->getNewApi())->addToXmlObject($totalsXml);
+                    } else {
+                        $this->_addTotalToXmlApi23($total, $totalsXml);
+                    }
+                }
+            } else {
+                $this->_addTotalToXmlApi23($total, $totalsXml);
+            }
+        }
+    }
+
     /**
      * Add total to totals XML
      *
@@ -115,15 +146,34 @@ public function addTotalsToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $or
      * @param Mage_XmlConnect_Model_Simplexml_Element $totalsXml
      * @return null
      */
-    private function _addTotalToXml($total, Mage_XmlConnect_Model_Simplexml_Element $totalsXml)
+    protected function _addTotalToXml($total, Mage_XmlConnect_Model_Simplexml_Element $totalsXml)
     {
         if ($total instanceof Varien_Object && $total->getCode() && $total->getLabel() && $total->hasData('value')) {
-            $totalsXml->addCustomChild(preg_replace('@[\W]+@', '_', trim($total->getCode())),
-                $this->_formatPrice($total), array('label' => strip_tags($total->getLabel()))
+            $totalsXml->addCustomChild(
+                preg_replace('@[\W]+@', '_', trim($total->getCode())),
+                $this->_formatPrice($total),
+                array('label' => $totalsXml->escapeXml($total->getLabel()))
             );
         }
     }
 
+    /**
+     * Add total to totals XML. Api version 23.
+     *
+     * @param Varien_Object $total
+     * @param Mage_XmlConnect_Model_Simplexml_Element $totalsXml
+     * @return null
+     */
+    protected function _addTotalToXmlApi23($total, Mage_XmlConnect_Model_Simplexml_Element $totalsXml)
+    {
+        if ($total instanceof Varien_Object && $total->getCode() && $total->getLabel() && $total->hasData('value')) {
+            $totalsXml->addCustomChild('item', $this->_formatPrice($total), array(
+                 'id' => preg_replace('@[\W]+@', '_', trim($total->getCode())),
+                 'label' => $totalsXml->escapeXml($total->getLabel()),
+            ));
+        }
+    }
+
     /**
      * Format price using order currency
      *
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance.php
index 21440b57854..2b702be9f47 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance.php
@@ -42,14 +42,38 @@ class Mage_XmlConnect_Block_Customer_Order_Totals_Customerbalance
      */
     public function addToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $totalsXml)
     {
+        if ($this->getNewApi()) {
+            $this->addToXmlObjectApi23($totalsXml);
+            return;
+        }
+
         $balance = $this->getSource()->getCustomerBalanceAmount();
         if ($balance) {
-            $totalsXml->addCustomChild($this->getTotal()->getCode(), '-' . $this->_formatPrice($balance),
+            $totalsXml->addCustomChild(
+                $this->getTotal()->getCode(),
+                '-' . $this->_formatPrice($balance),
                 array('label' => Mage::helper('enterprise_giftcardaccount')->__('Store Credit'))
             );
         }
     }
 
+    /**
+     * Add order total rendered to XML object. Api version 23
+     *
+     * @param $totalsXml Mage_XmlConnect_Model_Simplexml_Element
+     * @return null
+     */
+    public function addToXmlObjectApi23(Mage_XmlConnect_Model_Simplexml_Element $totalsXml)
+    {
+        $balance = $this->getSource()->getCustomerBalanceAmount();
+        if ($balance) {
+            $totalsXml->addCustomChild('item', '-' . $this->_formatPrice($balance), array(
+                'id' => $this->getTotal()->getCode(),
+                'label' => Mage::helper('enterprise_giftcardaccount')->__('Store Credit')
+            ));
+        }
+    }
+
     /**
      * Format price using order currency
      *
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance/Refunded.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance/Refunded.php
index 0d0e2dd414c..7d798b76001 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance/Refunded.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance/Refunded.php
@@ -41,12 +41,34 @@ class Mage_XmlConnect_Block_Customer_Order_Totals_Customerbalance_Refunded
      * @return null
      */
     public function addToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $totalsXml)
+    {
+        if ($this->getNewApi()) {
+            $this->addToXmlObjectApi23($totalsXml);
+            return;
+        }
+
+        $balance = $this->getSource()->getCustomerBalanceTotalRefunded();
+        if ($balance) {
+            $totalsXml->addCustomChild($this->getTotal()->getCode(), $this->_formatPrice($balance), array(
+                'label' => Mage::helper('enterprise_giftcardaccount')->__('Refunded to Store Credit')
+            ));
+        }
+    }
+
+    /**
+     * Add order total rendered to XML object. Api version 23
+     *
+     * @param $totalsXml Mage_XmlConnect_Model_Simplexml_Element
+     * @return null
+     */
+    public function addToXmlObjectApi23(Mage_XmlConnect_Model_Simplexml_Element $totalsXml)
     {
         $balance = $this->getSource()->getCustomerBalanceTotalRefunded();
         if ($balance) {
-            $totalsXml->addCustomChild($this->getTotal()->getCode(), $this->_formatPrice($balance),
-                array('label' => Mage::helper('enterprise_giftcardaccount')->__('Refunded to Store Credit'))
-            );
+            $totalsXml->addCustomChild('item', $this->_formatPrice($balance), array(
+                'id' => $this->getTotal()->getCode(),
+                'label' => Mage::helper('enterprise_giftcardaccount')->__('Refunded to Store Credit')
+            ));
         }
     }
 
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Giftcards.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Giftcards.php
index b66db805bb2..e6316211073 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Giftcards.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Giftcards.php
@@ -42,20 +42,54 @@ class Mage_XmlConnect_Block_Customer_Order_Totals_Giftcards
      */
     public function addToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $totalsXml)
     {
-        $cards  = $this->getGiftCards();
+        if ($this->getNewApi()) {
+            $this->addToXmlObjectApi23($totalsXml);
+            return;
+        }
+
+        $cards = $this->getGiftCards();
         if ($cards) {
             foreach ($cards as $card) {
                 $label = Mage::helper('enterprise_giftcardaccount')->__('Gift Card (%s)', $card->getCode());
-                $totalsXml->addCustomChild($this->getTotal()->getCode(), '-' . $this->_formatPrice($card->getAmount()),
+                $totalsXml->addCustomChild(
+                    $this->getTotal()->getCode(),
+                    '-' . $this->_formatPrice($card->getAmount()),
                     array('label' => $label)
                 );
             }
         } else {
             $cardsAmount = $this->getSource()->getGiftCardsAmount();
             if ($cardsAmount > 0) {
-                $totalsXml->addCustomChild($this->getTotal()->getCode(), '-' . $this->_formatPrice($cardsAmount),
-                    array('label' => Mage::helper('enterprise_giftcardaccount')->__('Gift Card'))
-                );
+                $totalsXml->addCustomChild($this->getTotal()->getCode(), '-' . $this->_formatPrice($cardsAmount), array(
+                    'label' => Mage::helper('enterprise_giftcardaccount')->__('Gift Card')
+                ));
+            }
+        }
+    }
+
+    /**
+     * Add order total rendered to XML object. Api version 23
+     *
+     * @param $totalsXml Mage_XmlConnect_Model_Simplexml_Element
+     * @return null
+     */
+    public function addToXmlObjectApi23(Mage_XmlConnect_Model_Simplexml_Element $totalsXml)
+    {
+        $cards = $this->getGiftCards();
+        if ($cards) {
+            foreach ($cards as $card) {
+                $label = Mage::helper('enterprise_giftcardaccount')->__('Gift Card (%s)', $card->getCode());
+                $totalsXml->addCustomChild('item', '-' . $this->_formatPrice($card->getAmount()), array(
+                    'id' => $this->getTotal()->getCode(),
+                    'label' => $label
+                ));
+            }
+        } else {
+            $cardsAmount = $this->getSource()->getGiftCardsAmount();
+            if ($cardsAmount > 0) {
+                $totalsXml->addCustomChild($this->getTotal()->getCode(), '-' . $this->_formatPrice($cardsAmount), array(
+                    'label' => Mage::helper('enterprise_giftcardaccount')->__('Gift Card')
+                ));
             }
         }
     }
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Tax.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Tax.php
index 220f5a34a23..e2070625851 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Tax.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Tax.php
@@ -41,6 +41,11 @@ class Mage_XmlConnect_Block_Customer_Order_Totals_Tax extends Mage_Tax_Block_Sal
      */
     public function addToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $totalsXmlObj)
     {
+        if ($this->getNewApi()) {
+            $this->addToXmlObjectApi23($totalsXmlObj);
+            return;
+        }
+
         /** @var $taxesXmlObj Mage_XmlConnect_Model_Simplexml_Element */
         $taxesXmlObj = $totalsXmlObj->addChild('tax');
 
@@ -66,9 +71,45 @@ public function addToXmlObject(Mage_XmlConnect_Model_Simplexml_Element $totalsXm
             }
         }
 
-        $taxesXmlObj->addCustomChild(
-            'summary', $this->_formatPrice($this->getSource()->getTaxAmount()), array('label' => $this->__('Tax'))
-        );
+        $taxesXmlObj->addCustomChild('summary', $this->_formatPrice($this->getSource()->getTaxAmount()), array(
+            'label' => $this->__('Tax')
+        ));
+    }
+
+    /**
+     * Add order taxes rendered to XML object. Api version 23
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $totalsXmlObj
+     * @return null
+     */
+    public function addToXmlObjectApi23(Mage_XmlConnect_Model_Simplexml_Element $totalsXmlObj)
+    {
+        $fullInfo = $this->getOrder()->getFullTaxInfo();
+
+        if ($this->displayFullSummary() && !empty($fullInfo)) {
+            foreach ((array)$fullInfo as $info) {
+                if (isset($info['hidden']) && $info['hidden']) {
+                    continue;
+                }
+                $i = 0;
+                foreach ((array)$info['rates'] as $rate) {
+                    if (isset($info['amount'])) {
+                        $config = array('id' => 'tax_rate_' . $i, 'label' => $rate['title']);
+                        if (!is_null($rate['percent'])) {
+                            $config['percent'] = sprintf('(%0.2f%%)', $rate['percent']);
+                        }
+                        $totalsXmlObj->addCustomChild(
+                            'item', is_null($rate['percent']) ? '' : $this->_formatPrice($info['amount']), $config
+                        );
+                        ++$i;
+                    }
+                }
+            }
+        }
+
+        $totalsXmlObj->addCustomChild('item', $this->_formatPrice($this->getSource()->getTaxAmount()), array(
+            'id' => 'tax_summary', 'label' => $this->__('Tax')
+        ));
     }
 
     /**
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Storecredit.php b/app/code/core/Mage/XmlConnect/Block/Customer/Storecredit.php
index 6a614464656..123afbb4078 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Storecredit.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Storecredit.php
@@ -31,7 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Customer_Storecredit extends Mage_Core_Block_Template
+class Mage_XmlConnect_Block_Customer_Storecredit extends Mage_Core_Block_Abstract
 {
     /**
      * Render customer store credits xml
diff --git a/app/code/core/Mage/XmlConnect/Block/Home.php b/app/code/core/Mage/XmlConnect/Block/Home.php
index e6f12eb49c9..5f1a1914004 100644
--- a/app/code/core/Mage/XmlConnect/Block/Home.php
+++ b/app/code/core/Mage/XmlConnect/Block/Home.php
@@ -68,16 +68,18 @@ protected function _toHtml()
         foreach ($categoryCollection as $item) {
             /** @var $item Mage_Catalog_Model_Category */
             $item = Mage::getModel('catalog/category')->load($item->getId());
+            if (!$item->getIncludeInMenu()) {
+                continue;
+            }
             $itemXmlObj = $itemsXmlObj->addChild('item');
             $itemXmlObj->addChild('label', $homeXmlObj->escapeXml($item->getName()));
             $itemXmlObj->addChild('entity_id', $item->getId());
             $itemXmlObj->addChild('content_type', $item->hasChildren() ? 'categories' : 'products');
             $icon = Mage::helper('xmlconnect/catalog_category_image')->initialize($item, 'thumbnail')
-                ->resize(Mage::helper('xmlconnect/image')->getImageSizeForContent('category'));
+                ->resize(Mage::getModel('xmlconnect/images')->getImageLimitParam('content/category'));
 
             $iconXml = $itemXmlObj->addChild('icon', $icon);
-            $file = Mage::helper('xmlconnect')->urlToPath($icon);
-            $iconXml->addAttribute('modification_time', filemtime($file));
+            $iconXml->addAttribute('modification_time', filemtime($icon->getNewFile()));
         }
         $homeXmlObj->addChild('home_banner', '/current/media/catalog/category/banner_home.png');
 
diff --git a/app/code/core/Mage/XmlConnect/Block/Homebanners.php b/app/code/core/Mage/XmlConnect/Block/Homebanners.php
new file mode 100644
index 00000000000..b3d18a983eb
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Homebanners.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Home banners list renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Homebanners extends Mage_Core_Block_Abstract
+{
+    /**
+     * List of images separated by device those have to be shown on home banners page
+     *
+     * @return array
+     */
+    private function getBannerTypeArray()
+    {
+        return array(
+            Mage_XmlConnect_Helper_Data::DEVICE_TYPE_ANDROID => array(
+                Mage_XmlConnect_Model_Device_Android::IMAGE_TYPE_PORTRAIT_BANNER
+            ),
+            Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE => array(
+                Mage_XmlConnect_Model_Device_Iphone::IMAGE_TYPE_PORTRAIT_BANNER,
+            ),
+            Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPAD => array(
+                Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_LANDSCAPE_BANNER,
+                Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_PORTRAIT_BANNER,
+        ));
+    }
+
+    /**
+     * Render home banners list xml
+     *
+     * @return string
+     */
+    protected function _toHtml()
+    {
+        /** @var $homeBannersXmlObj Mage_XmlConnect_Model_Simplexml_Element */
+        $homeBannersXmlObj = Mage::getModel('xmlconnect/simplexml_element', '<home_banners></home_banners>');
+
+        /** @var $deviceHelper Mage_XmlConnect_Helper_Data */
+        $deviceHelper = Mage::helper('xmlconnect');
+        /** @var $imagesModel Mage_XmlConnect_Model_Images */
+        $imagesModel = Mage::getModel('xmlconnect/images');
+
+        $bannerTypeCollection = $this->getBannerTypeArray();
+        $deviceType = $deviceHelper->getDeviceType();
+        foreach ($bannerTypeCollection[$deviceType] as $bannerType) {
+
+            $bannerImageCollection = $imagesModel->getDeviceImagesByType($bannerType);
+
+            foreach ($bannerImageCollection as $bannerImage) {
+                $itemXmlObj = $homeBannersXmlObj->addCustomChild('item', null, array(
+                    'entity_id' => $bannerImage['image_id'],
+                    'type' => $bannerType
+                ));
+
+                $originalFile = Mage_XmlConnect_Model_Images::getBasePath($bannerImage['image_file']);
+                $bannerUrl = $imagesModel->getScreenSizeImageUrlByType($bannerImage['image_file'], $bannerType);
+
+                $itemXmlObj->addCustomChild('image', $bannerUrl, array(
+                    'modification_time' => filemtime($originalFile)
+                ));
+                $this->_addImageAction($itemXmlObj, $bannerImage['image_id']);
+            }
+        }
+
+        return $homeBannersXmlObj->asNiceXml();
+    }
+
+    /**
+     * Add action info to xml
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $imageXml
+     * @param int $imageId
+     * @return Mage_XmlConnect_Block_Homebanners
+     */
+    protected function _addImageAction(Mage_XmlConnect_Model_Simplexml_Element $imageXml, $imageId)
+    {
+        $imageActionData = Mage::helper('xmlconnect')->getApplication()->getImageActionModel()
+            ->getImageActionData($imageId);
+
+        if (empty($imageActionData)) {
+            return $this;
+        }
+
+        switch ($imageActionData['action_type']) {
+            case Mage_XmlConnect_Model_ImageAction::ACTION_TYPE_CMS:
+                $page = Mage::getModel('cms/page')->setStoreId(Mage::app()->getStore()->getId())
+                    ->load($imageActionData['entity_action'], 'identifier');
+                if ($page->getId()) {
+                    $actionXml = $imageXml->addCustomChild('action', null, array(
+                        'type' => $imageActionData['action_type']
+                    ));
+                    $actionXml->addCustomChild('attribute', $imageActionData['entity_action'], array(
+                        'name' => 'id',
+                    ));
+                    $actionXml->addCustomChild('attribute', $page->getTitle(), array(
+                        'name' => 'title'
+                    ));
+                }
+                break;
+            case Mage_XmlConnect_Model_ImageAction::ACTION_TYPE_PRODUCT:
+                $product = Mage::getModel('catalog/product')->load($imageActionData['entity_action']);
+                if ($product->getId()) {
+                    $actionXml = $imageXml->addCustomChild('action', null, array(
+                        'type' => $imageActionData['action_type']
+                    ));
+                    $actionXml->addCustomChild('attribute', $imageActionData['entity_action'], array(
+                        'name' => 'id',
+                    ));
+                }
+                break;
+            case Mage_XmlConnect_Model_ImageAction::ACTION_TYPE_CATEGORY:
+                $category = Mage::getModel('catalog/category')->load($imageActionData['entity_action']);
+                if ($category->getEntityId()) {
+                    $actionXml = $imageXml->addCustomChild('action', null, array(
+                        'type' => $imageActionData['action_type']
+                    ));
+                    $actionXml->addCustomChild('attribute', $imageActionData['entity_action'], array(
+                        'name' => 'id',
+                    ));
+                }
+                break;
+            default:
+                Mage::throwException($this->__('Action type doesn\'t recognized.'));
+                break;
+        }
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Localization.php b/app/code/core/Mage/XmlConnect/Block/Localization.php
new file mode 100644
index 00000000000..488c958332e
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Localization.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Localization list renderer
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Localization extends Mage_Core_Block_Abstract
+{
+    /**
+     * Render home category list xml
+     *
+     * @return string
+     */
+    protected function _toHtml()
+    {
+        /** @var $l10nXmlObj Mage_XmlConnect_Model_Simplexml_Element */
+        $l10nXmlObj = Mage::getModel('xmlconnect/simplexml_element', '<localization></localization>');
+
+        /** @var $translateHelper Mage_XmlConnect_Helper_Translate */
+        $translateHelper = Mage::helper('xmlconnect/translate');
+
+        foreach ($translateHelper->getLocalizationArray() as $key => $string) {
+            $l10nXmlObj->addCustomChild($key, $string);
+        }
+
+        return $l10nXmlObj->asNiceXml();
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Review/Form.php b/app/code/core/Mage/XmlConnect/Block/Review/Form.php
index 9a5b5609e06..6b62dc07c1c 100644
--- a/app/code/core/Mage/XmlConnect/Block/Review/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Review/Form.php
@@ -31,7 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Review_Form extends Mage_Core_Block_Template
+class Mage_XmlConnect_Block_Review_Form extends Mage_Core_Block_Abstract
 {
     /**
      * Collection of ratings
@@ -68,6 +68,7 @@ protected function _toHtml()
                     'label'     => $rating->getRatingCode(),
                     'required'  => 'true'
                 ));
+
                 foreach ($rating->getOptions() as $option) {
                     $ratingField->addCustomChild('value', $option->getId());
                 }
diff --git a/app/code/core/Mage/XmlConnect/Block/ShoppingCart.php b/app/code/core/Mage/XmlConnect/Block/ShoppingCart.php
new file mode 100644
index 00000000000..ffa7a241219
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/ShoppingCart.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Shopping cart xml renderer
+ *
+ * @category    Mage
+ * @package     Mage_Xmlconnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_ShoppingCart extends Mage_Checkout_Block_Cart_Abstract
+{
+    /**
+     * Render shopping cart xml
+     *
+     * @return string
+     */
+    protected function _toHtml()
+    {
+        /** @var $xmlObject Mage_XmlConnect_Model_Simplexml_Element */
+        $xmlObject = Mage::getModel('xmlconnect/simplexml_element', '<cart></cart>');
+        $cartMessages = $this->getMessages();
+        $quote = $this->getQuote();
+
+        $this->_cartSummary($xmlObject, $quote);
+        /**
+         * Cart items
+         */
+        $this->getChild('items')->addCartProductsToXmlObj($xmlObject, $quote);
+
+        /**
+         * Cart messages
+         */
+        if ($cartMessages) {
+            $messagesXml = $xmlObject->addCustomChild('messages');
+            foreach ($cartMessages as $status => $messages) {
+                foreach ($messages as $message) {
+                    $messageXml = $messagesXml->addCustomChild('message');
+                    $messageXml->addCustomChild('status', $status);
+                    $messageXml->addCustomChild('text', strip_tags($message));
+                }
+            }
+        }
+
+        /**
+         * Cross Sell Products
+         */
+        if (count($this->getItems())) {
+            $crossellXml = $this->getChildHtml('crosssell');
+            $crossSellXmlObj = Mage::getModel('xmlconnect/simplexml_element', $crossellXml);
+            $xmlObject->appendChild($crossSellXmlObj);
+        }
+
+        /**
+         * Cart Totals
+         */
+        $this->getChild('totals')->setCartXmlObject($xmlObject)->toHtml();
+
+        return $xmlObject->asNiceXml();
+    }
+
+    /**
+     * Add summary block to cart
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObject
+     * @param Mage_Sales_Model_Quote $quote
+     * @return Mage_XmlConnect_Block_Cart
+     */
+    protected function _cartSummary($xmlObject, $quote)
+    {
+        $cartSummary = $xmlObject->addCustomChild('summary');
+
+        $cartSummary->addCustomChild(
+            'item', (int)$this->helper('checkout/cart')->getIsVirtualQuote(), array('label' => 'virtual')
+        );
+        $cartSummary->addCustomChild(
+            'item', (int)$this->helper('checkout/cart')->getSummaryCount(), array('label' => 'total_qty')
+        );
+
+        if (strlen($quote->getCouponCode())) {
+            $cartSummary->addCustomChild('item', 1, array('label' => 'has_coupon_code'));
+        }
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Wishlist.php b/app/code/core/Mage/XmlConnect/Block/Wishlist.php
index 766844312f3..5103f2342a3 100644
--- a/app/code/core/Mage/XmlConnect/Block/Wishlist.php
+++ b/app/code/core/Mage/XmlConnect/Block/Wishlist.php
@@ -59,6 +59,9 @@ protected function _toHtml()
         $wishlistXmlObj->addAttribute('items_count', $this->getWishlistItemsCount());
         $wishlistXmlObj->addAttribute('has_more_items', $hasMoreItems);
 
+        $productSmallImageSize = Mage::getModel('xmlconnect/images')->getImageLimitParam('content/product_small');
+        /** @var $categoryImageHelper Mage_XmlConnect_Helper_Catalog_Product_Image */
+        $categoryImageHelper = $this->helper('xmlconnect/catalog_product_image');
         if ($this->hasWishlistItems()) {
             /**
              * @var Mage_Wishlist_Model_Mysql4_Product_Collection
@@ -82,13 +85,11 @@ protected function _toHtml()
                 }
                 $itemXmlObj->addChild('has_options', (int)$item->getProduct()->getHasOptions());
 
-                $icon = $this->helper('catalog/image')->init($item->getProduct(), 'small_image')
-                    ->resize(Mage::helper('xmlconnect/image')->getImageSizeForContent('product_small'));
+                $icon = $categoryImageHelper->init($item->getProduct(), 'small_image')
+                    ->resize($productSmallImageSize);
 
                 $iconXml = $itemXmlObj->addChild('icon', $icon);
-
-                $file = Mage::helper('xmlconnect')->urlToPath($icon);
-                $iconXml->addAttribute('modification_time', filemtime($file));
+                $iconXml->addAttribute('modification_time', filemtime($icon->getNewFile()));
 
                 $description = $wishlistXmlObj->escapeXml($item->getDescription());
                 $itemXmlObj->addChild('description', $description);
diff --git a/app/code/core/Mage/XmlConnect/Controller/Action.php b/app/code/core/Mage/XmlConnect/Controller/Action.php
index f70c6372a4e..47180ac44f6 100644
--- a/app/code/core/Mage/XmlConnect/Controller/Action.php
+++ b/app/code/core/Mage/XmlConnect/Controller/Action.php
@@ -77,9 +77,7 @@ public function preDispatch()
         $screenSizeCookieName = Mage_XmlConnect_Model_Application::APP_SCREEN_SIZE_NAME;
         $screenSize = isset($_COOKIE[$screenSizeCookieName]) ? (string) $_COOKIE[$screenSizeCookieName] : '';
         if (!$appCode) {
-            $this->_message(
-                Mage::helper('xmlconnect')->__('Specified invalid app code.'), self::MESSAGE_STATUS_ERROR
-            );
+            $this->_message(Mage::helper('xmlconnect')->__('Specified invalid app code.'), self::MESSAGE_STATUS_ERROR);
             $this->setFlag('', self::FLAG_NO_DISPATCH, true);
             return;
         }
@@ -99,15 +97,11 @@ public function preDispatch()
         $appModel = Mage::getModel('xmlconnect/application')->loadByCode($appCode);
         $appModel->setScreenSize($screenSize);
         if ($appModel && $appModel->getId()) {
-            Mage::app()->setCurrentStore(
-                Mage::app()->getStore($appModel->getStoreId())->getCode()
-            );
+            Mage::app()->setCurrentStore(Mage::app()->getStore($appModel->getStoreId())->getCode());
             Mage::getSingleton('core/locale')->emulate($appModel->getStoreId());
-            Mage::register('current_app', $appModel);
+            Mage::register('current_app', $appModel, true);
         } else {
-            $this->_message(
-                Mage::helper('xmlconnect')->__('Specified invalid app code.'), self::MESSAGE_STATUS_ERROR
-            );
+            $this->_message(Mage::helper('xmlconnect')->__('Specified invalid app code.'), self::MESSAGE_STATUS_ERROR);
             $this->setFlag('', self::FLAG_NO_DISPATCH, true);
             return;
         }
@@ -122,7 +116,7 @@ public function postDispatch()
     {
         parent::postDispatch();
         $body = $this->getResponse()->getBody();
-        if (empty($body)) {
+        if (empty($body) && !$this->getFlag('forwarded')) {
             $this->_message(
                 Mage::helper('xmlconnect')->__('An error occurred while processing your request.'),
                 self::MESSAGE_STATUS_ERROR
@@ -151,4 +145,35 @@ protected function _message($text, $status, $children = array())
 
         $this->getResponse()->setBody($message->asNiceXml());
     }
+
+    /**
+     * Throw control to different action (control and module if was specified).
+     *
+     * @param string $action
+     * @param string|null $controller
+     * @param string|null $module
+     * @param array|null $params
+     * @return null
+     */
+    protected function _forward($action, $controller = null, $module = null, array $params = null)
+    {
+        $this->setFlag('', 'forwarded', true);
+        return parent::_forward($action, $controller, $module, $params);
+    }
+
+    /**
+     * Check api version and forward if equal
+     *
+     * @param string $action
+     * @param string $apiVersion
+     * @return bool
+     */
+    protected function _checkApiForward($action, $apiVersion)
+    {
+        if (Mage::helper('xmlconnect')->checkApiVersion($apiVersion)) {
+            $this->_forward($action);
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Controller/AdminAction.php b/app/code/core/Mage/XmlConnect/Controller/AdminAction.php
new file mode 100644
index 00000000000..0c75ea125c7
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Controller/AdminAction.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect admin application controller abstract
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+abstract class Mage_XmlConnect_Controller_AdminAction extends Mage_Adminhtml_Controller_Action
+{
+    /**
+     * Admin application device type cookie
+     */
+    const DEVICE_TYPE_COOKIE_NAME = 'device_type';
+
+    /**
+     * Controller pre-dispatch method
+     *
+     * @return Mage_XmlConnect_Controller_AdminAction
+     */
+    public function preDispatch()
+    {
+        Mage::getSingleton('adminhtml/url')->turnOffSecretKey();
+        // override admin store design settings via stores section
+        Mage::getDesign()->setArea($this->_currentArea)
+            ->setPackageName((string)Mage::getConfig()->getNode('stores/admin/design/package/name'))
+            ->setTheme((string)Mage::getConfig()->getNode('stores/admin/design/theme/default'));
+        foreach (array('layout', 'template', 'skin', 'locale') as $type) {
+            $value = (string)Mage::getConfig()->getNode("stores/admin/design/theme/{$type}");
+            if ($value) {
+                Mage::getDesign()->setTheme($type, $value);
+            }
+        }
+
+        $this->getLayout()->setArea($this->_currentArea);
+
+        Mage::dispatchEvent('adminhtml_controller_action_predispatch_start', array());
+        Mage_Core_Controller_Varien_Action::preDispatch();
+
+        if ($this->getRequest()->isDispatched() && $this->getRequest()->getActionName() !== 'denied'
+            && !$this->_isAllowed()
+        ) {
+            $this->_forward('denied');
+            $this->setFlag('', self::FLAG_NO_DISPATCH, true);
+            return $this;
+        }
+
+        if (is_null(Mage::getSingleton('adminhtml/session')->getLocale())) {
+            Mage::getSingleton('adminhtml/session')->setLocale(Mage::app()->getLocale()->getLocaleCode());
+        }
+
+        $this->getResponse()->setHeader('Content-type', 'text/xml; charset=UTF-8');
+        if ($this->_isCheckCookieRequired()) {
+            $this->_checkCookie();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Check device cookies
+     *
+     * @return null
+     */
+    public function _checkCookie()
+    {
+        $AdminDeviceCookie  = self::DEVICE_TYPE_COOKIE_NAME;
+        $currentDevice      = isset($_COOKIE[$AdminDeviceCookie]) ? (string) $_COOKIE[$AdminDeviceCookie] : '';
+        if (!array_key_exists($currentDevice, Mage_XmlConnect_Helper_Data::getSupportedDevices())) {
+            $this->_message(
+                Mage_XmlConnect_Model_Simplexml_Message_Error::ERROR_CLIENT_SP_CONFIG_RELOAD_REQUIRED,
+                $this->__('Device type doesn\'t recognized.')
+            );
+            $this->setFlag('', self::FLAG_NO_DISPATCH, true);
+            return;
+        }
+        $screenSizeCookieName = Mage_XmlConnect_Model_Application::APP_SCREEN_SIZE_NAME;
+        $screenSize = isset($_COOKIE[$screenSizeCookieName]) ? (string) $_COOKIE[$screenSizeCookieName] : '';
+        if (!$screenSize) {
+            $deviceClassName = 'Mage_XmlConnect_Model_Device_' . ucfirst($currentDevice);
+            $_COOKIE[$screenSizeCookieName] = constant($deviceClassName . '::SCREEN_SIZE_DEFAULT');
+        }
+    }
+
+    /**
+     * Is check cookie required flag
+     *
+     * @return bool
+     */
+    protected function _isCheckCookieRequired()
+    {
+        return true;
+    }
+
+    /**
+     * Validate response body
+     *
+     * @return null
+     */
+    public function postDispatch()
+    {
+        parent::postDispatch();
+        $body = $this->getResponse()->getBody();
+        if (empty($body)) {
+            $this->_message(
+                Mage_XmlConnect_Model_Simplexml_Message_Error::ERROR_SERVER_SP_DEFAULT,
+                $this->__('An error occurred while processing your request.')
+            );
+        }
+    }
+
+    /**
+     * Access denied action
+     *
+     * @return Mage_XmlConnect_Controller_AdminAction|null
+     */
+    public function deniedAction()
+    {
+        $this->getResponse()->setHeader('HTTP/1.1','403 Forbidden');
+        if (Mage::getSingleton('xmlconnect/configuration')->isActiveAdminApp()) {
+            $this->_message(Mage_XmlConnect_Model_Simplexml_Message_Error::ERROR_USER_SP_ACCESS_FORBIDDEN);
+        } else {
+            $this->_message(
+                Mage_XmlConnect_Model_Simplexml_Message_Error::ERROR_USER_SP_ACCESS_FORBIDDEN,
+                $this->__('Admin application has not been enabled')
+            );
+        }
+        return $this;
+    }
+
+    /**
+     * Generate message xml and set it to response body
+     *
+     * @param string $messageCode
+     * @param string $messageText
+     * @param array $children
+     * @return null
+     */
+    protected function _message($messageCode, $messageText = null, $children = array())
+    {
+        /** @var $messageXmlObj Mage_XmlConnect_Model_Simplexml_Message */
+        $messageXmlObj = Mage::getModel('xmlconnect/simplexml_message', $messageCode);
+        $messageXmlObj->setMessageText($messageText)->setChildren($children);
+        $this->getResponse()->setBody($messageXmlObj);
+    }
+
+    /**
+     * Check the permission to run it
+     *
+     * @return boolean
+     */
+    protected function _isAllowed()
+    {
+        return Mage::getSingleton('admin/session')->isAllowed('xmlconnect/admin_connect')
+               && Mage::getSingleton('xmlconnect/configuration')->isActiveAdminApp();
+    }
+
+    /**
+     * Allowed controller actions w/o authorization
+     *
+     * @return array
+     */
+    public function getAllowedControllerActions()
+    {
+        return array('connect_user' => array('loginform', 'login', 'logout', 'denied'));
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Helper/AdminApplication.php b/app/code/core/Mage/XmlConnect/Helper/AdminApplication.php
new file mode 100644
index 00000000000..18480c9859d
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Helper/AdminApplication.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect device helper for Android
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Helper_AdminApplication extends Mage_Core_Helper_Abstract
+{
+    /**
+     * All store views param for a store switcher
+     */
+    const ALL_STORE_VIEWS = 'all_store_views';
+
+    /**
+     * Store id list
+     *
+     * @var array
+     */
+    protected $_storeIdList;
+
+    /**
+     * View id list
+     *
+     * @var array
+     */
+    protected $_viewIdList;
+
+    /**
+     * Get store list ids
+     *
+     * @throws Mage_Core_Exception
+     * @param bool $storeList
+     * @return array
+     */
+    public function getSwitcherList($storeList = false)
+    {
+        $result = array(null);
+        $storeSwitcher = Mage::registry('store_switcher');
+
+        if (null === $storeSwitcher) {
+            Mage::throwException($this->__('Store switcher hasn\'t been defined'));
+        }
+
+        if (empty($storeSwitcher)) {
+            return $result;
+        }
+
+        if ($storeList) {
+            return array_merge($result, $this->_getStoreIdList($storeSwitcher));
+        } else {
+            return array_merge($result, $this->_getViewIdList($storeSwitcher));
+        }
+    }
+
+    /**
+     * Get store id list
+     *
+     * @param array $storeSwitcher
+     * @return array
+     */
+    protected function _getStoreIdList($storeSwitcher)
+    {
+        if (null === $this->_storeIdList) {
+            $this->_storeIdList = array();
+            foreach ($storeSwitcher as $params) {
+                if (empty($params['store_list'])) {
+                    continue;
+                }
+                $storeIds = array_keys($params['store_list']);
+                foreach ($storeIds as $storeId) {
+                    $this->_storeIdList[] = $storeId;
+                }
+            }
+            sort($this->_storeIdList);
+        }
+        return $this->_storeIdList;
+    }
+
+    /**
+     * Get view id list
+     *
+     * @param array $storeSwitcher
+     * @return array
+     */
+    protected function _getViewIdList($storeSwitcher)
+    {
+        if (null === $this->_viewIdList) {
+            $this->_viewIdList = array();
+            foreach ($storeSwitcher as $params) {
+                if (empty($params['store_list'])) {
+                    continue;
+                }
+                foreach ($params['store_list'] as $storeData) {
+                    if (empty($storeData['view_list'])) {
+                        continue;
+                    }
+                    $viewIds = array_keys($storeData['view_list']);
+                    foreach ($viewIds as $viewId) {
+                        $this->_viewIdList[] = $viewId;
+                    }
+                }
+            }
+            sort($this->_viewIdList);
+        }
+        return $this->_viewIdList;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Helper/Adminhtml/Dashboard/Order.php b/app/code/core/Mage/XmlConnect/Helper/Adminhtml/Dashboard/Order.php
new file mode 100644
index 00000000000..f728282baef
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Helper/Adminhtml/Dashboard/Order.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Dashboard order graph helper
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Helper_Adminhtml_Dashboard_Order extends Mage_Adminhtml_Helper_Dashboard_Order
+{
+    /**
+     * Re-init product collection
+     *
+     * @return null
+     */
+    public function initCollection()
+    {
+        $this->_collection = Mage::getResourceModel('reports/order_collection')
+            ->prepareSummary($this->getParam('period'), 0, 0, (bool)$this->getParam('store'));
+
+        if ($this->getParam('store')) {
+            $this->_collection->addFieldToFilter('store_id', $this->getParam('store'));
+        } elseif (!$this->_collection->isLive()) {
+            $this->_collection->addFieldToFilter('store_id', array(
+                'eq' => Mage::app()->getStore(Mage_Core_Model_Store::ADMIN_CODE)->getId()
+            ));
+        }
+        $this->_collection->load();
+    }
+
+    /**
+     * Prepare price to display
+     *
+     * @param null|string $price
+     * @param null|string $storeId
+     * @return string
+     */
+    public function preparePrice($price, $storeId)
+    {
+        $baseCurrencyCode = (string)Mage::app()->getStore($storeId)->getBaseCurrencyCode();
+        return Mage::app()->getLocale()->currency($baseCurrencyCode)->toCurrency($price);
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Helper/Android.php b/app/code/core/Mage/XmlConnect/Helper/Android.php
index bac53177fa6..aa402e33884 100755
--- a/app/code/core/Mage/XmlConnect/Helper/Android.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Android.php
@@ -31,7 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Helper_Android extends Mage_Core_Helper_Abstract
+class Mage_XmlConnect_Helper_Android extends Mage_XmlConnect_Helper_Device_Abstract
 {
     /**
      * Submission title length
@@ -44,12 +44,14 @@ class Mage_XmlConnect_Helper_Android extends Mage_Core_Helper_Abstract
     const SUBMISSION_DESCRIPTION_LENGTH = 4000;
 
     /**
-     * Android preview banner widht
+     * Android preview banner width
+     * @deprecated
      */
     const PREVIEW_BANNER_WIDTH = 320;
 
     /**
      * Android preview banner image height
+     * @deprecated
      */
     const PREVIEW_BANNER_HEIGHT = 258;
 
@@ -65,14 +67,26 @@ class Mage_XmlConnect_Helper_Android extends Mage_Core_Helper_Abstract
 
     /**
      * Country renderer for submission
+     *
+     * @deprecated
      */
     const SUBMISSION_COUNTRY_RENDERER = 'androidmarket';
 
     /**
      * Country columns for submission
+     *
+     * @deprecated
      */
     const SUBMISSION_COUNTRY_COLUMNS = 2;
 
+    /**
+     * Submission columns count
+     *
+     * @var int
+     */
+    protected $_countryColumnsCount = 2;
+
+
     /**
      * Submit images that are stored in "params" field of history table
      *
@@ -81,14 +95,14 @@ class Mage_XmlConnect_Helper_Android extends Mage_Core_Helper_Abstract
     protected $_imageIds = array('icon', 'android_loader_image', 'android_logo', 'big_logo');
 
     /**
-     * Country field renderer
+     * Country renderer block
      *
-     * @var Mage_XmlConnect_Block_Adminhtml_Mobile_Submission_Renderer_Country_Androidmarket
+     * @var string
      */
-    protected $_countryRenderer = null;
+    protected $_countryRendererBlock = 'xmlconnect/adminhtml_mobile_submission_renderer_country_androidmarket';
 
     /**
-     * List of coutries that allowed in Ituens by Apple Store
+     * List of countries that allowed in Androidmarket by Google
      *
      * array(
      *      'country name' => 'country id at directory model'
@@ -129,13 +143,25 @@ class Mage_XmlConnect_Helper_Android extends Mage_Core_Helper_Abstract
     );
 
     /**
-     * Get submit images that are required for application submit
+     * Default images list
      *
      * @return array
      */
-    public function getSubmitImages()
+    public function getImagesTypesList()
     {
-        return $this->_imageIds;
+        return array(
+            Mage_XmlConnect_Model_Device_Android::IMAGE_TYPE_ICON => array(
+                'count' => Mage_XmlConnect_Model_Device_Android::IMAGE_TYPE_ICON_COUNT,
+                'label' => $this->__('Logo in Header'),
+                'sortable' => false,
+                'sizeTip' => $this->__('Recommended size %spx x %spx.', 35, 35)
+            ),
+            Mage_XmlConnect_Model_Device_Android::IMAGE_TYPE_PORTRAIT_BANNER => array(
+                'count' => Mage_XmlConnect_Model_Device_Android::IMAGE_TYPE_BANNER_COUNT,
+                'label' => $this->__('Banners on Home Screen'),
+                'sortable' => true,
+                'sizeTip' => $this->__('Recommended size %spx x %spx.', 320, 258) . $this->__('Note: Image size affects the performance of your app.') . $this->__('Keep your image size below %s KB for optimal performance.', 50)
+        ));
     }
 
     /**
@@ -480,25 +506,7 @@ public function getFontList()
             array(
                 'value' => 'STHeitiK-Light',
                 'label' => 'STHeitiK-Light',
-            ),
-        );
-    }
-
-    /**
-     * List of allowed font sizes for Android application
-     *
-     * @return array
-     */
-    public function getFontSizes()
-    {
-        $result = array();
-        for ($i = 6; $i < 32; $i++) {
-            $result[] = array(
-                'value' => $i,
-                'label' => $i . ' pt',
-            );
-        }
-        return $result;
+        ));
     }
 
     /**
@@ -576,6 +584,7 @@ public function validateSubmit($params)
     /**
      * Check config for valid values
      *
+     * @deprecated we don't use it since 1.11.1.0
      * @param array $native
      * @return array
      */
@@ -595,21 +604,6 @@ public function validateConfig($native)
         return $errors;
     }
 
-    /**
-     * Get renderer for submission country
-     *
-     * @return Mage_XmlConnect_Block_Adminhtml_Mobile_Submission_Renderer_Country_Androidmarket
-     */
-    public function getCountryRenderer()
-    {
-        if (empty($this->_countryRenderer)) {
-            $renderer = 'xmlconnect/adminhtml_mobile_submission_renderer_country_'
-                . self::SUBMISSION_COUNTRY_RENDERER;
-            $this->_countryRenderer = Mage::app()->getLayout()->createBlock($renderer);
-        }
-        return $this->_countryRenderer;
-    }
-
     /**
      * Get label for submission country
      *
@@ -620,16 +614,6 @@ public function getCountryLabel()
         return Mage::helper('xmlconnect')->__('Locations');
     }
 
-    /**
-     * Get columns for submission country
-     *
-     * @return int
-     */
-    public function getCountryColumns()
-    {
-        return self::SUBMISSION_COUNTRY_COLUMNS;
-    }
-
     /**
      * Get placement of Country Names for submission country
      *
@@ -647,12 +631,14 @@ public function isCountryNamePlaceLeft()
      */
     public function getCountryClass()
     {
-        return self::SUBMISSION_COUNTRY_RENDERER;
+        return 'androidmarket';
     }
 
     /**
      * Get list of countries that allowed by Magento Inc. for Android
      *
+     * @deprecated
+     * @see $this->getAllowedCountriesArray()
      * @return array
      */
     public function getAndroidMarketCountriesArray()
@@ -665,6 +651,7 @@ public function getAndroidMarketCountriesArray()
      *
      * We set empty value for image field if file was missed in some reason
      *
+     * @deprecated will delete in the next version
      * @param array $data
      * @return array
      */
@@ -689,6 +676,7 @@ public function checkImages(array $data)
     /**
      * Check required fields of a config for a front-end
      *
+     * @deprecated will delete in the next version
      * @throws Mage_Core_Exception
      * @param array $data
      * @return null
@@ -707,14 +695,4 @@ public function checkRequiredConfigFields($data)
             Mage::throwException(Mage::helper('xmlconnect')->__('Banner on Home Screen image missing.'));
         }
     }
-
-    /**
-     * Check the notifications are allowed for current type of application
-     *
-     * @return bool
-     */
-    public function isNotificationsAllowed()
-    {
-        return true;
-    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Helper/Catalog/Category/Image.php b/app/code/core/Mage/XmlConnect/Helper/Catalog/Category/Image.php
index 8084df39828..f3f48a0c5b7 100644
--- a/app/code/core/Mage/XmlConnect/Helper/Catalog/Category/Image.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Catalog/Category/Image.php
@@ -27,6 +27,9 @@
 /**
  * Catalog image helper
  *
+ * Helper used to display thumbnail image for category
+ * Prepare category image for cache and resize for mobile devices
+ *
  * @category    Mage
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
@@ -40,7 +43,6 @@ class Mage_XmlConnect_Helper_Catalog_Category_Image extends Mage_Catalog_Helper_
      * @param string $attributeName
      * @param string $imageFile
      * @return Mage_XmlConnect_Helper_Catalog_Category_Image
-     *
      */
     public function init(Mage_Catalog_Model_Product $product, $attributeName, $imageFile = null)
     {
@@ -81,13 +83,65 @@ public function initialize(Mage_Catalog_Model_Abstract $category, $attributeName
             /*
              * add for work original size
              */
-            $this->_getModel()->setBaseFile(
-                $this->getProduct()->getData($this->_getModel()->getDestinationSubdir())
-            );
+            $this->_getModel()->setBaseFile($this->getProduct()->getData($this->_getModel()->getDestinationSubdir()));
         }
         return $this;
     }
 
+    /**
+     * Re-write parent to handle an exception if any
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        try {
+            if ($this->getImageFile()) {
+                $this->_getModel()->setBaseFile($this->getImageFile());
+            } else {
+                $this->_getModel()->setBaseFile(
+                    $this->getProduct()->getData($this->_getModel()->getDestinationSubdir())
+                );
+            }
+
+            if ($this->_getModel()->isCached()) {
+                return $this->_getModel()->getUrl();
+            } else {
+                if ($this->_scheduleRotate) {
+                    $this->_getModel()->rotate($this->getAngle());
+                }
+
+                if ($this->_scheduleResize) {
+                    $this->_getModel()->resize();
+                }
+
+                if ($this->getWatermark()) {
+                    $this->_getModel()->setWatermark($this->getWatermark());
+                }
+
+                $url = $this->_getModel()->saveFile()->getUrl();
+            }
+        } catch(Exception $e) {
+            Mage::logException($e);
+            $url = Mage::getDesign()->getSkinUrl($this->getPlaceholder());
+            $params = array('_package' => Mage_Core_Model_Design_Package::DEFAULT_PACKAGE,
+                '_theme' => Mage_Core_Model_Design_Package::DEFAULT_THEME);
+            $filePath = Mage::getDesign()->getSkinBaseDir($params) . DS . str_replace('/', DS, $this->getPlaceholder());
+            $this->_getModel()->setNewFile($filePath);
+        }
+        return $url;
+    }
+
+    /**
+     * Get new file path
+     *
+     * @return string
+     */
+    public function getNewFile()
+    {
+        return $this->_getModel()->getNewFile();
+    }
+
     /**
      * Return placeholder image file path
      *
diff --git a/app/code/core/Mage/XmlConnect/Helper/Catalog/Product/Image.php b/app/code/core/Mage/XmlConnect/Helper/Catalog/Product/Image.php
new file mode 100644
index 00000000000..47e9d827540
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Helper/Catalog/Product/Image.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Product image helper
+ * Helper used to get path to new modified product image
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Helper_Catalog_Product_Image extends Mage_Catalog_Helper_Image
+{
+    /**
+     * Get new file path
+     *
+     * @return string
+     */
+    public function getNewFile()
+    {
+        return $this->_getModel()->getNewFile();
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Helper/Customer/Form/Renderer.php b/app/code/core/Mage/XmlConnect/Helper/Customer/Form/Renderer.php
index ca3dd410957..79367176e04 100644
--- a/app/code/core/Mage/XmlConnect/Helper/Customer/Form/Renderer.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Customer/Form/Renderer.php
@@ -33,6 +33,162 @@
  */
 class Mage_XmlConnect_Helper_Customer_Form_Renderer extends Mage_Core_Helper_Abstract
 {
+    /**
+     * Attributes block name
+     *
+     * @var string
+     */
+    protected $_attributesBlockName;
+
+    /**
+     * Form code
+     *
+     * @var string
+     */
+    protected $_formCode;
+
+    /**
+     * Set block entity
+     *
+     * @var object
+     */
+    protected $_blockEntity;
+
+    /**
+     * Block entity type
+     *
+     * @var null|string
+     */
+    protected $_blockEntityType;
+
+    /**
+     * Enterprise field renderer list as type => renderer block
+     *
+     * Original block relations:
+     * - 'text'      => 'enterprise_customer/form_renderer_text',
+     * - 'textarea'  => 'enterprise_customer/form_renderer_textarea',
+     * - 'multiline' => 'enterprise_customer/form_renderer_multiline',
+     * - 'date'      => 'enterprise_customer/form_renderer_date',
+     * - 'select'    => 'enterprise_customer/form_renderer_select',
+     * - 'multiselect' => 'enterprise_customer/form_renderer_multiselect',
+     * - 'boolean'   => 'enterprise_customer/form_renderer_boolean',
+     * - 'file'     => 'enterprise_customer/form_renderer_file'
+     * - 'image'     => 'enterprise_customer/form_renderer_image'
+     *
+     * @see customer.xml layout customer_form_template_handle node
+     * @var array
+     */
+    protected $_customerFiledRenderer = array(
+        'text' => 'xmlconnect/customer_form_renderer_text',
+        'textarea' => 'xmlconnect/customer_form_renderer_textarea',
+        'multiline' => 'xmlconnect/customer_form_renderer_multiline',
+        'date' => 'xmlconnect/customer_form_renderer_date',
+        'select' => 'xmlconnect/customer_form_renderer_select',
+        'multiselect' => 'xmlconnect/customer_form_renderer_multiselect',
+        'boolean' => 'xmlconnect/customer_form_renderer_boolean',
+        'file' => 'xmlconnect/customer_form_renderer_file',
+        'image' => 'xmlconnect/customer_form_renderer_image'
+    );
+
+    /**
+     * Add custom attributes
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Form_Abstract $fieldset
+     * @param Mage_Core_Model_Layout $layout
+     * @return Mage_XmlConnect_Helper_Customer_Form_Renderer
+     */
+    public function addCustomAttributes(Mage_XmlConnect_Model_Simplexml_Form_Abstract $fieldset, $layout)
+    {
+        if (is_object(Mage::getConfig()->getNode('modules/Enterprise_Customer'))) {
+            $attrBlock = $layout->addBlock('enterprise_customer/form', $this->getAttributesBlockName());
+            $attrBlock->setFormCode($this->getFormCode());
+            $attrBlock->setEntity($this->getBlockEntity());
+            if ($this->getBlockEntityType()) {
+                $attrBlock->setEntityType($this->getBlockEntityType());
+            }
+            foreach ($this->_customerFiledRenderer as $type => $rendererBlock) {
+                $attrBlock->addRenderer($type, $rendererBlock, '');
+            }
+            if ($attrBlock->hasUserDefinedAttributes()) {
+                foreach ($attrBlock->getUserDefinedAttributes() as $attribute) {
+                    $type = $attribute->getFrontendInput();
+                    $block = $attrBlock->getRenderer($type);
+                    if ($block) {
+                        $block->setAttributeObject($attribute)->setEntity($attrBlock->getEntity())
+                            ->addFieldToXmlObj($fieldset);
+                    }
+                }
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Set attributes block name
+     *
+     * @param string $attributesBlockName
+     * @return Mage_XmlConnect_Helper_Form
+     */
+    public function setAttributesBlockName($attributesBlockName)
+    {
+        $this->_attributesBlockName = $attributesBlockName;
+        return $this;
+    }
+
+    /**
+     * Get attributes block name
+     *
+     * @return string
+     */
+    public function getAttributesBlockName()
+    {
+        return $this->_attributesBlockName;
+    }
+
+    /**
+     * Set form code
+     *
+     * @param string $customerFormCode
+     * @return Mage_XmlConnect_Helper_Form
+     */
+    public function setFormCode($customerFormCode)
+    {
+        $this->_formCode = $customerFormCode;
+        return $this;
+    }
+
+    /**
+     * Get form code
+     *
+     * @return string
+     */
+    public function getFormCode()
+    {
+        return $this->_formCode;
+    }
+
+    /**
+     * Set block entity
+     *
+     * @param object $blockEntity
+     * @return Mage_XmlConnect_Helper_Form
+     */
+    public function setBlockEntity($blockEntity)
+    {
+        $this->_blockEntity = $blockEntity;
+        return $this;
+    }
+
+    /**
+     * Get block entity
+     *
+     * @return object
+     */
+    public function getBlockEntity()
+    {
+        return $this->_blockEntity;
+    }
+
     /**
      * Get title and required attributes for a field
      *
@@ -55,4 +211,26 @@ public function addTitleAndRequiredAttr(Mage_XmlConnect_Model_Simplexml_Form_Abs
 
         return $attributes;
     }
+
+    /**
+     * Set block entity type
+     *
+     * @param string $setBlockEntity
+     * @return Mage_XmlConnect_Helper_Customer_Form_Renderer
+     */
+    public function setBlockEntityType($setBlockEntity)
+    {
+        $this->_blockEntityType = $setBlockEntity;
+        return $this;
+    }
+
+    /**
+     * Get block entity type
+     *
+     * @return null|string
+     */
+    public function getBlockEntityType()
+    {
+        return $this->_blockEntityType;
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Helper/Customer/Order.php b/app/code/core/Mage/XmlConnect/Helper/Customer/Order.php
index a854e3aa613..9693933cae1 100644
--- a/app/code/core/Mage/XmlConnect/Helper/Customer/Order.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Customer/Order.php
@@ -35,6 +35,7 @@ class Mage_XmlConnect_Helper_Customer_Order extends Mage_Core_Helper_Abstract
 {
     /**#@+
      * Price display type
+     *
      * @see Mage_Weee_Helper_Data::typeOfDisplay(...);
      */
     const PRICE_DISPLAY_TYPE_1 = 1;
@@ -43,6 +44,16 @@ class Mage_XmlConnect_Helper_Customer_Order extends Mage_Core_Helper_Abstract
     const PRICE_DISPLAY_TYPE_14 = 14;
     /**#@-*/
 
+    /**
+     * Including tax id
+     */
+    const INCLUDING_TAX_ID = 'including_tax';
+
+    /**
+     * Excluding tax id
+     */
+    const EXCLUDING_TAX_ID = 'excluding_tax';
+
     /**
      * Add Weee taxes child to the XML
      *
@@ -55,14 +66,14 @@ class Mage_XmlConnect_Helper_Customer_Order extends Mage_Core_Helper_Abstract
      */
     public function addPriceAndSubtotalToXml(Mage_Core_Block_Template $renderer, Mage_Sales_Model_Order_Item $item,
         Mage_XmlConnect_Model_Simplexml_Element $priceXml, Mage_XmlConnect_Model_Simplexml_Element $subtotalXml,
-        $isIncludeTax = false
-    ) {
+        $isIncludeTax = false)
+    {
         $weeeParams = array();
 
         $typesOfDisplay = $renderer->getTypesOfDisplay();
         if ($isIncludeTax) {
-            $nodeName = 'including_tax';
-            $nodeLabel = Mage::helper('tax')->__('Incl. Tax');
+            $nodeName = self::INCLUDING_TAX_ID;
+            $nodeLabel = $this->__('Incl. Tax');
 
             $inclPrice      = $renderer->helper('checkout')->getPriceInclTax($item);
             $inclSubtotal   = $renderer->helper('checkout')->getSubtotalInclTax($item);
@@ -76,8 +87,8 @@ public function addPriceAndSubtotalToXml(Mage_Core_Block_Template $renderer, Mag
             }
             $weeeParams['include'] = $inclPrice;
         } else {
-            $nodeName = 'excluding_tax';
-            $nodeLabel = Mage::helper('tax')->__('Excl. Tax');
+            $nodeName = self::EXCLUDING_TAX_ID;
+            $nodeLabel = $this->__('Excl. Tax');
 
             if ($typesOfDisplay[self::PRICE_DISPLAY_TYPE_14]) {
                 $price = $item->getPrice() + $renderer->getWeeeTaxAppliedAmount()
@@ -90,9 +101,8 @@ public function addPriceAndSubtotalToXml(Mage_Core_Block_Template $renderer, Mag
             }
         }
 
-        $configNode = array(
-            'value' => $this->formatPrice($renderer, $price)
-        );
+        $configNode = array('value' => $this->formatPrice($renderer, $price));
+
         if ($renderer->helper('tax')->displaySalesBothPrices()) {
             $configNode['label'] = $nodeLabel;
         }
@@ -104,11 +114,88 @@ public function addPriceAndSubtotalToXml(Mage_Core_Block_Template $renderer, Mag
         $configNode['value']        = $this->formatPrice($renderer, $subtotal);
         $weeeParams['include']      = $isIncludeTax ? $inclSubtotal : null;
         $weeeParams['is_subtotal']  = true;
+
         $this->addWeeeTaxesToPriceXml(
             $renderer, $item, $subtotalXml->addCustomChild($nodeName, null, $configNode), $weeeParams
         );
     }
 
+    /**
+     * Add Weee taxes child to the XML. Api version 23
+     *
+     * @param Mage_Core_Block_Template $renderer Product renderer
+     * @param Mage_Sales_Model_Order_Item $item
+     * @param Mage_XmlConnect_Model_Simplexml_Element $priceXml
+     * @param Mage_XmlConnect_Model_Simplexml_Element $subtotalXml
+     * @param bool $isIncludeTax
+     * @return null
+     */
+    public function addPriceAndSubtotalToXmlApi23(Mage_Core_Block_Template $renderer, Mage_Sales_Model_Order_Item $item,
+        Mage_XmlConnect_Model_Simplexml_Element $priceXml,
+        Mage_XmlConnect_Model_Simplexml_Element $subtotalXml,
+        $isIncludeTax = false
+    ) {
+        $weeeParams = array();
+
+        $typesOfDisplay = $renderer->getTypesOfDisplay();
+        if ($isIncludeTax) {
+            $nodeId = self::INCLUDING_TAX_ID;
+            $nodeLabel = $this->__('Incl. Tax');
+
+            $inclPrice      = $renderer->helper('checkout')->getPriceInclTax($item);
+            $inclSubtotal   = $renderer->helper('checkout')->getSubtotalInclTax($item);
+
+            if ($typesOfDisplay[self::PRICE_DISPLAY_TYPE_14]) {
+                $price      = $inclPrice + $renderer->getWeeeTaxAppliedAmount();
+                $subtotal   = $inclSubtotal + $item->getWeeeTaxAppliedRowAmount();
+            } else {
+                $price      = $inclPrice - $renderer->getWeeeTaxDisposition();
+                $subtotal   = $inclSubtotal - $item->getWeeeTaxRowDisposition();
+            }
+            $weeeParams['include'] = $inclPrice;
+        } else {
+            $nodeId = self::EXCLUDING_TAX_ID;
+            $nodeLabel = $this->__('Excl. Tax');
+
+            if ($typesOfDisplay[self::PRICE_DISPLAY_TYPE_14]) {
+                $price = $item->getPrice() + $renderer->getWeeeTaxAppliedAmount()
+                    + $renderer->getWeeeTaxDisposition();
+                $subtotal = $item->getRowTotal() + $item->getWeeeTaxAppliedRowAmount()
+                    + $item->getWeeeTaxRowDisposition();
+            } else {
+                $price = $item->getPrice();
+                $subtotal = $item->getRowTotal();
+            }
+        }
+
+        $configNode = array('id' => $nodeId);
+        $priceValue = $this->formatPrice($renderer, $price);
+
+        if ($renderer->helper('tax')->displaySalesBothPrices()) {
+            $configNode['label'] = $nodeLabel;
+        }
+
+        $priceConfig = $configNode;
+        $idPrefix = 'price_';
+        $priceConfig['id'] = $idPrefix . $priceConfig['id'];
+        $priceConfig['formatted_price'] = $priceValue;
+        $price = Mage::helper('xmlconnect')->formatPriceForXml($price);
+        $priceXml->addCustomChild('price', $price, $priceConfig);
+        $this->addWeeeTaxesToPriceXmlApi23($renderer, $item, $priceXml, $weeeParams, $idPrefix, $isIncludeTax);
+
+        $priceValue                 = $this->formatPrice($renderer, $subtotal);
+        $weeeParams['include']      = $isIncludeTax ? $inclSubtotal : null;
+        $weeeParams['is_subtotal']  = true;
+
+        $subtotalConfig = $configNode;
+        $idPrefix = 'subtotal_';
+        $subtotalConfig['id'] = $idPrefix . $subtotalConfig['id'];
+        $subtotalConfig['formatted_price'] = $priceValue;
+        $subtotal = Mage::helper('xmlconnect')->formatPriceForXml($subtotal);
+        $subtotalXml->addCustomChild('price', $subtotal, $subtotalConfig);
+        $this->addWeeeTaxesToPriceXmlApi23($renderer, $item, $subtotalXml, $weeeParams, $idPrefix, $isIncludeTax);
+    }
+
     /**
      * Add Product options to XML
      *
@@ -121,20 +208,22 @@ public function addItemOptionsToXml(Mage_Core_Block_Template $renderer,
     ) {
         $options = $renderer->getItemOptions();
         if (!empty($options)) {
-            $optionsXml = $itemXml->addChild('options');
+            $optionsXml = $itemXml->addCustomChild('options');
 
             foreach ($options as $option) {
                 $value = false;
-                $formatedOptionValue = $renderer->getFormatedOptionValue($option);
-                if (isset($formatedOptionValue['full_view']) && isset($formatedOptionValue['value'])) {
-                    $value = $formatedOptionValue['value'];
+                $formattedOptionValue = $renderer->getFormatedOptionValue($option);
+                if (isset($formattedOptionValue['full_view']) && isset($formattedOptionValue['value'])) {
+                    $value = $formattedOptionValue['value'];
                 } elseif (isset($option['print_value'])) {
                     $value = $option['print_value'];
                 } elseif (isset($option['value'])) {
                     $value = $option['value'];
                 }
                 if ($value) {
-                    $optionsXml->addCustomChild('option', strip_tags($value), array('label' => $option['label']));
+                    $optionsXml->addCustomChild('option', $optionsXml->escapeXml($value), array(
+                        'label' => $option['label']
+                    ));
                 }
             }
         }
@@ -165,21 +254,21 @@ public function addWeeeTaxesToPriceXml(Mage_Core_Block_Template $renderer, Mage_
         if ($typesOfDisplay[self::PRICE_DISPLAY_TYPE_1]) {
             $weeeXml = $parentXml->addChild('weee');
             foreach ($weeTaxes as $tax) {
-                $weeeXml->addCustomChild('tax', $this->formatPrice($renderer, $tax[$row . 'amount']),
-                    array('label' => $tax['title'])
-                );
+                $weeeXml->addCustomChild('tax', $this->formatPrice($renderer, $tax[$row . 'amount']), array(
+                    'label' => $tax['title']
+                ));
             }
         } elseif ($typesOfDisplay[self::PRICE_DISPLAY_TYPE_2] || $typesOfDisplay[self::PRICE_DISPLAY_TYPE_4]) {
             $weeeXml = $parentXml->addChild('weee');
             foreach ($weeTaxes as $tax) {
-                $weeeXml->addCustomChild('tax', $this->formatPrice($renderer, $tax[$row . 'amount_incl_tax']),
-                    array('label' => $tax['title'])
-                );
+                $weeeXml->addCustomChild('tax', $this->formatPrice($renderer, $tax[$row . 'amount_incl_tax']), array(
+                    'label' => $tax['title']
+                ));
             }
         }
 
         if ($typesOfDisplay[self::PRICE_DISPLAY_TYPE_2]) {
-            if (!is_null($params['include'])) {
+            if (!empty($params['include'])) {
                 // including tax
                 if (isset($params['is_subtotal'])) {
                     $total = $params['include'] + $item->getWeeeTaxAppliedRowAmount();
@@ -188,7 +277,7 @@ public function addWeeeTaxesToPriceXml(Mage_Core_Block_Template $renderer, Mage_
                 }
             } else {
                 // excluding tax
-                if ($params['is_subtotal']) {
+                if (isset($params['is_subtotal'])) {
                     $total = $item->getRowTotal() + $item->getWeeeTaxAppliedRowAmount()
                         + $item->getWeeeTaxRowDisposition();
                 } else {
@@ -200,11 +289,84 @@ public function addWeeeTaxesToPriceXml(Mage_Core_Block_Template $renderer, Mage_
             if (!isset($weeeXml)) {
                 $weeeXml = $parentXml->addChild('weee');
             }
-            $weeeXml->addCustomChild(
-                'total',
-                $this->formatPrice($renderer, $total),
-                array('label' => $renderer->helper('weee')->__('Total'))
-            );
+
+            $weeeXml->addCustomChild('total', $this->formatPrice($renderer, $total), array(
+                'label' => $renderer->helper('weee')->__('Total')
+            ));
+        }
+    }
+
+    /**
+     * Add Weee taxes child to the XML. Api version 23
+     *
+     * @param Mage_Core_Block_Template $renderer Product renderer
+     * @param Mage_Sales_Model_Order_Item $item
+     * @param Mage_XmlConnect_Model_Simplexml_Element $parentXml
+     * @param array $params Params for Weee taxes: 'include' - Price including tax, 'is_subtotal' - Flag of subtotal
+     * @param string $idPrefix
+     * @param bool $isIncludeTax
+     * @return null
+     */
+    public function addWeeeTaxesToPriceXmlApi23(Mage_Core_Block_Template $renderer, Mage_Sales_Model_Order_Item $item,
+        Mage_XmlConnect_Model_Simplexml_Element $parentXml, $params = array(), $idPrefix, $isIncludeTax
+    ) {
+        $weeTaxes = $renderer->getWeeeTaxes();
+        if (empty($weeTaxes)) {
+            return;
+        }
+
+        $typesOfDisplay = $renderer->getTypesOfDisplay();
+
+        $row = isset($params['is_subtotal']) && $params['is_subtotal'] ? 'row_' : '';
+
+        if ($isIncludeTax) {
+            $weeeXml = $parentXml->addCustomChild('price', null, array('id' => 'weee'));
+            /** @var $weeeXml Mage_XmlConnect_Model_Simplexml_Element */
+            if ($typesOfDisplay[self::PRICE_DISPLAY_TYPE_1]) {
+                foreach ($weeTaxes as $tax) {
+                    $taxAmount = Mage::helper('xmlconnect')->formatPriceForXml($tax[$row . 'amount']);
+                    $weeeXml->addCustomChild('item', $taxAmount, array(
+                        'label' => $tax['title'],
+                        'formatted_price' => $this->formatPrice($renderer, $tax[$row . 'amount'])
+                    ));
+                }
+            } elseif ($typesOfDisplay[self::PRICE_DISPLAY_TYPE_2] || $typesOfDisplay[self::PRICE_DISPLAY_TYPE_4]) {
+                foreach ($weeTaxes as $tax) {
+                    $taxAmount = Mage::helper('xmlconnect')->formatPriceForXml($tax[$row . 'amount_incl_tax']);
+                    $weeeXml->addCustomChild('item', $taxAmount, array(
+                        'label' => $tax['title'],
+                        'formatted_price' => $this->formatPrice($renderer, $tax[$row . 'amount_incl_tax'])
+                    ));
+                }
+            }
+        }
+
+        if ($typesOfDisplay[self::PRICE_DISPLAY_TYPE_2]) {
+            if (!empty($params['include'])) {
+                // including tax
+                if (isset($params['is_subtotal'])) {
+                    $total = $params['include'] + $item->getWeeeTaxAppliedRowAmount();
+                } else {
+                    $total = $params['include'] + $renderer->getWeeeTaxAppliedAmount();
+                }
+            } else {
+                // excluding tax
+                if (isset($params['is_subtotal'])) {
+                    $total = $item->getRowTotal() + $item->getWeeeTaxAppliedRowAmount()
+                        + $item->getWeeeTaxRowDisposition();
+                } else {
+                    $total = $item->getPrice() + $renderer->getWeeeTaxAppliedAmount()
+                        + $renderer->getWeeeTaxDisposition();
+                }
+            }
+
+            $totalNodeId = $idPrefix . 'fpt_total_' . ($isIncludeTax ? self::INCLUDING_TAX_ID : self::EXCLUDING_TAX_ID);
+            $parentXml->addCustomChild('price', Mage::helper('xmlconnect')->formatPriceForXml($total), array(
+                'id'    => $totalNodeId,
+                'label' => $isIncludeTax ? $renderer->helper('weee')->__('Total incl. tax')
+                    : $renderer->helper('weee')->__('Total excl. tax'),
+                'formatted_price' => $this->formatPrice($renderer, $total)
+            ));
         }
     }
 
@@ -221,19 +383,19 @@ public function addQuantityToXml(Mage_Core_Block_Template $renderer,
     ) {
         $qty = 1 * $item->getQtyOrdered();
         if ($qty > 0) {
-            $quantityXml->addCustomChild('value', $qty, array('label' => Mage::helper('xmlconnect')->__('Ordered')));
+            $quantityXml->addCustomChild('value', $qty, array('label' => $this->__('Ordered')));
         }
         $qty = 1 * $item->getQtyShipped();
         if ($qty > 0) {
-            $quantityXml->addCustomChild('value', $qty, array('label' => Mage::helper('xmlconnect')->__('Shipped')));
+            $quantityXml->addCustomChild('value', $qty, array('label' => $this->__('Shipped')));
         }
         $qty = 1 * $item->getQtyCanceled();
         if ($qty > 0) {
-            $quantityXml->addCustomChild('value', $qty, array('label' => Mage::helper('xmlconnect')->__('Canceled')));
+            $quantityXml->addCustomChild('value', $qty, array('label' => $this->__('Canceled')));
         }
         $qty = 1 * $item->getQtyRefunded();
         if ($qty > 0) {
-            $quantityXml->addCustomChild('value', $qty, array('label' => Mage::helper('xmlconnect')->__('Refunded')));
+            $quantityXml->addCustomChild('value', $qty, array('label' => $this->__('Refunded')));
         }
     }
 
diff --git a/app/code/core/Mage/XmlConnect/Helper/Data.php b/app/code/core/Mage/XmlConnect/Helper/Data.php
index e910c5e01e6..30998f9013c 100644
--- a/app/code/core/Mage/XmlConnect/Helper/Data.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Data.php
@@ -33,6 +33,16 @@
  */
 class Mage_XmlConnect_Helper_Data extends Mage_Core_Helper_Abstract
 {
+    /**
+     * Thumbnail image width
+     */
+    const THUMBNAIL_IMAGE_WIDTH = 160;
+
+    /**
+     * Thumbnail image height
+     */
+    const THUMBNAIL_IMAGE_HEIGHT = 115;
+
     /**
      * Push title length
      */
@@ -43,11 +53,6 @@ class Mage_XmlConnect_Helper_Data extends Mage_Core_Helper_Abstract
      */
     const MESSAGE_TITLE_LENGTH = 255;
 
-    /**
-     * Curl default timeout
-     */
-    const CURLOPT_DEFAULT_TIMEOUT = 60;
-
     /**
      * List of the keys for xml config that have to be excluded form application config
      *
@@ -109,6 +114,16 @@ class Mage_XmlConnect_Helper_Data extends Mage_Core_Helper_Abstract
      */
     const SOCIAL_NETWORK_LINKEDIN = 'linkedin';
 
+    /**
+     * Api changes for version 23
+     */
+    const DEVICE_API_V_23 = '23';
+
+    /**
+     * API version request param
+     */
+    const API_VERSION_REQUEST_PARAM = 'api_version';
+
     /**
      * Get device preview model
      *
@@ -196,6 +211,16 @@ public function getApplication()
         return $model;
     }
 
+    /**
+     * Get application id from model in registry
+     *
+     * @return int
+     */
+    public function getApplicationId()
+    {
+        return $this->getApplication()->getId();
+    }
+
     /**
      * Create array with filter model and filter block by key
      *
@@ -248,15 +273,14 @@ public function getCountryOptionsArray($isItunes = false)
     {
         Varien_Profiler::start('TEST: ' . __METHOD__);
         $deviceType = $this->getDeviceType();
+        $deviceCountries = $this->getDeviceHelper()->getAllowedCountriesArray();
         switch ($deviceType) {
             case self::DEVICE_TYPE_IPHONE:
             case self::DEVICE_TYPE_IPAD:
                 $cacheKey = 'XMLCONNECT_COUNTRY_ITUNES_SELECT_STORE_' . Mage::app()->getStore()->getCode();
-                $deviceCountries = $this->getDeviceHelper()->getItunesCountriesArray();
                 break;
             case self::DEVICE_TYPE_ANDROID:
                 $cacheKey = 'XMLCONNECT_COUNTRY_ANDROID_SELECT_STORE_' . Mage::app()->getStore()->getCode();
-                $deviceCountries = $this->getDeviceHelper()->getAndroidMarketCountriesArray();
                 break;
             default:
                 Mage::throwException(
@@ -625,13 +649,17 @@ public function sendBroadcastMessage(Mage_XmlConnect_Model_Queue $queue)
         }
 
         try {
-            $applicationId = Mage::getModel('xmlconnect/template')->load($queue->getTemplateId())->getApplicationId();
             /** @var $app Mage_XmlConnect_Model_Application */
-            $app = Mage::getModel('xmlconnect/application')->load($applicationId);
-
+            $templateModel = Mage::getModel('xmlconnect/template')->load($queue->getTemplateId());
+            if (!$templateModel->getId()) {
+                Mage::throwException(
+                    Mage::helper('xmlconnect')->__('Can\'t load template with id "%s"', $templateModel->getId())
+                );
+            }
+            $app = Mage::getModel('xmlconnect/application')->load($templateModel->getApplicationId());
             if (!$app->getId()) {
                 Mage::throwException(
-                    Mage::helper('xmlconnect')->__('Can\'t load application with id "%s"', $applicationId)
+                    Mage::helper('xmlconnect')->__('Can\'t load application with id "%s"', $templateModel->getApplicationId())
                 );
             }
 
@@ -641,6 +669,7 @@ public function sendBroadcastMessage(Mage_XmlConnect_Model_Queue $queue)
             }
 
             $sendType = $queue->getData('type');
+
             switch ($sendType) {
                 case Mage_XmlConnect_Model_Queue::MESSAGE_TYPE_AIRMAIL:
                     $configPath = 'xmlconnect/' . Mage_XmlConnect_Model_Queue::MESSAGE_TYPE_AIRMAIL . '/broadcast_url';
@@ -654,19 +683,30 @@ public function sendBroadcastMessage(Mage_XmlConnect_Model_Queue $queue)
                     break;
             }
 
-            $curl = new Varien_Http_Adapter_Curl();
-            $curl->setConfig($this->_getCurlConfig($app->getUserpwd()));
+            $curlHandler = curl_init(Mage::getStoreConfig($configPath));
 
-            $urbanUrl = Mage::getStoreConfig($configPath);
-            $curl->write(
-                Zend_Http_Client::POST, $urbanUrl, HTTP_REQUEST_HTTP_VER_1_1, $this->getHttpHeaders(), $params
-            );
+            $httpHeaders = $this->getHttpHeaders();
 
-            if ($curl->read() && $curl->getInfo(CURLINFO_HTTP_CODE) == 200) {
+            curl_setopt($curlHandler, CURLOPT_POST, 1);
+            curl_setopt($curlHandler, CURLOPT_HTTPHEADER, $httpHeaders);
+            curl_setopt($curlHandler, CURLOPT_POSTFIELDS, $params);
+            curl_setopt($curlHandler, CURLOPT_RETURNTRANSFER, 1);
+            curl_setopt($curlHandler, CURLOPT_USERPWD, $app->getUserpwd());
+            curl_setopt($curlHandler, CURLOPT_TIMEOUT, 60);
+
+            // Execute the request.
+            $result = curl_exec($curlHandler);
+            $succeeded  = curl_errno($curlHandler) == 0;
+            $responseCode = curl_getinfo($curlHandler, CURLINFO_HTTP_CODE);
+            // close cURL resource, and free up system resources
+            curl_close($curlHandler);
+
+            if ($succeeded && $responseCode == 200) {
                 $queue->setStatus(Mage_XmlConnect_Model_Queue::STATUS_COMPLETED);
+            } else {
+                Mage::log($result);
+                $queue->setStatus(Mage_XmlConnect_Model_Queue::STATUS_CANCELED);
             }
-            $curl->close();
-
             $queue->setIsSent(true);
             $queue->save();
             return;
@@ -686,18 +726,6 @@ public function getHttpHeaders()
         return array('Content-Type: application/json');
     }
 
-    /**
-     * Get urban airship curl request configuration
-     *
-     * @param string $userPwd
-     * @param int $timeout
-     * @return array
-     */
-    protected function _getCurlConfig($userPwd, $timeout = self::CURLOPT_DEFAULT_TIMEOUT)
-    {
-        return array ('timeout' => $timeout, 'userpwd' => $userPwd);
-    }
-
     /**
      * Remove from array the unnecessary parameters by given keys
      *
@@ -813,6 +841,7 @@ public function _injectFieldToArray(&$target, $fieldPath, $fieldValue, $delimite
     /**
      * Convert Url link to file path for images
      *
+     * @deprecated will remove in new release
      * @param string $icon
      * @return string
      */
@@ -881,4 +910,70 @@ public function trimLineBreaks($string)
     {
         return preg_replace(array('@\r@', '@\n+@'), array('', PHP_EOL), $string);
     }
+
+    /**
+     * Add item to total node
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObj
+     * @param string $code
+     * @param string $label
+     * @param float $value
+     * @param string $formattedValue
+     * @return Mage_XmlConnect_Helper_Data
+     */
+    public function addTotalItemToXmlObj($xmlObj, $code, $label, $value, $formattedValue)
+    {
+        $xmlObj->addCustomChild('item', Mage::helper('xmlconnect')->formatPriceForXml($value), array(
+            'id' => $code,
+            'label' => $label,
+            'formatted_value' => $formattedValue
+        ));
+        return $this;
+    }
+
+    /**
+     * Check if current api version equal to device api version
+     *
+     * @param string $apiVersion
+     * @param string $operator
+     * @return bool
+     */
+    public function checkApiVersion($apiVersion, $operator = '>=')
+    {
+        if (version_compare($this->getApiVersion(), $apiVersion, $operator) === true) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Get api version param
+     *
+     * @return string
+     */
+    public function getApiVersion()
+    {
+        return Mage::app()->getRequest()->getParam(self::API_VERSION_REQUEST_PARAM, false);
+    }
+
+    /**
+     * Check is localization has been changed
+     *
+     * @return bool
+     */
+    public function isChangeLocalization()
+    {
+        /** @var $translateHelper Mage_XmlConnect_Helper_Translate */
+        $translateHelper = Mage::helper('xmlconnect/translate');
+        $localizationHash = $translateHelper->getHash();
+
+        /** @var $configuration Mage_XmlConnect_Model_Configuration */
+        $configuration = Mage::getSingleton('xmlconnect/configuration');
+        if ($configuration->getPreviousLocalizationHash() !== $localizationHash) {
+            $configuration->setPreviousLocalizationHash($localizationHash);
+            $configuration->getApplicationModel()->updateAllAppsUpdatedAtParameter();
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Helper/Device/Abstract.php b/app/code/core/Mage/XmlConnect/Helper/Device/Abstract.php
new file mode 100644
index 00000000000..d18a6eafe2f
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Helper/Device/Abstract.php
@@ -0,0 +1,309 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+/**
+ * XmlConnect device helper abstract
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+abstract class Mage_XmlConnect_Helper_Device_Abstract extends Mage_Core_Helper_Abstract
+{
+    /**
+     * Country renderer block
+     *
+     * @var string
+     */
+    protected $_countryRendererBlock = 'xmlconnect/adminhtml_mobile_submission_renderer_country_istore';
+
+    /**
+     * Country field renderer
+     *
+     * @var Mage_Adminhtml_Block_Widget_Form_Renderer_Fieldset_Element
+     */
+    protected $_countryRenderer;
+
+    /**
+     * Submission columns count
+     *
+     * @var int
+     */
+    protected $_countryColumnsCount = 4;
+
+    /**
+     * List of coutries that allowed in Ituens by Apple Store
+     *
+     * array(
+     *      'country name' => 'country id at directory model'
+     * )
+     *
+     * @var array
+     */
+    protected $_allowedCountries = array(
+        'Argentina'     => 'AR',
+        'Armenia'       => 'AM',
+        'Australia'     => 'AU',
+        'Austria'       => 'AT',
+        'Belgium'       => 'BE',
+        'Botswana'      => 'BW',
+        'Brazil'        => 'BR',
+        'Bulgaria'      => 'BG',
+        'Canada'        => 'CA',
+        'Chile'         => 'CL',
+        'China'         => 'CN',
+        'Colombia'      => 'CO',
+        'Costa Rica'    => 'CR',
+        'Croatia'       => 'HR',
+        'Czech Republic' => 'CZ',
+        'Denmark'       => 'DK',
+        'Dominican Republic' => 'DO',
+        'Ecuador'       => 'EC',
+        'Egypt'         => 'EG',
+        'El Salvador'   => 'SV',
+        'Estonia'       => 'EE',
+        'Finland'       => 'FI',
+        'France'        => 'FR',
+        'Germany'       => 'DE',
+        'Greece'        => 'GR',
+        'Guatemala'     => 'GT',
+        'Honduras'      => 'HN',
+        'Hong Kong SAR China' => 'HK',
+        'Hungary'       => 'HU',
+        'India'         => 'IN',
+        'Indonesia'     => 'ID',
+        'Ireland'       => 'IE',
+        'Israel'        => 'IL',
+        'Italy'         => 'IT',
+        'Jamaica'       => 'JM',
+        'Japan'         => 'JP',
+        'Jordan'        => 'JO',
+        'Kazakstan'     => 'KZ',
+        'Kenya'         => 'KE',
+        'South Korea'   => 'KR',
+        'Kuwait'        => 'KW',
+        'Latvia'        => 'LV',
+        'Lebanon'       => 'LB',
+        'Lithuania'     => 'LT',
+        'Luxembourg'    => 'LU',
+        'Macau SAR China' => 'MO',
+        'Macedonia'     => 'MK',
+        'Madagascar'    => 'MG',
+        'Malaysia'      => 'MY',
+        'Mali'          => 'ML',
+        'Malta'         => 'MT',
+        'Mauritius'     => 'MU',
+        'Mexico'        => 'MX',
+        'Moldova'       => 'MD',
+        'Netherlands'   => 'NL',
+        'New Zealand'   => 'NZ',
+        'Nicaragua'     => 'NI',
+        'Niger'         => 'NE',
+        'Norway'        => 'NO',
+        'Pakistan'      => 'PK',
+        'Panama'        => 'PA',
+        'Paraguay'      => 'PY',
+        'Peru'          => 'PE',
+        'Philippines'   => 'PH',
+        'Poland'        => 'PL',
+        'Portugal'      => 'PT',
+        'Qatar'         => 'QA',
+        'Romania'       => 'RO',
+        'Russia'        => 'RU',
+        'Saudi Arabia'  => 'SA',
+        'Senegal'       => 'SN',
+        'Singapore'     => 'SG',
+        'Slovakia'      => 'SK',
+        'Slovenia'      => 'SI',
+        'South Africa'  => 'ZA',
+        'Spain'         => 'ES',
+        'Sri Lanka'     => 'LK',
+        'Sweden'        => 'SE',
+        'Switzerland'   => 'CH',
+        'Taiwan'        => 'TW',
+        'Thailand'      => 'TH',
+        'Tunisia'       => 'TN',
+        'Turkey'        => 'TR',
+        'Uganda'        => 'UG',
+        'United Arab Emirates' => 'AE',
+        'United Kingdom' => 'GB',
+        'United States' => 'US',
+        'Uruguay'       => 'UY',
+        'Venezuela'     => 'VE',
+        'Vietnam'       => 'VN',
+    );
+
+    /**
+     * Get submit images that are required for application submit
+     *
+     * @return array
+     */
+    public function getSubmitImages()
+    {
+        return $this->_imageIds;
+    }
+
+    /**
+     * Default images list
+     *
+     * @return array
+     */
+    abstract function getImagesTypesList();
+
+    /**
+     * Get default application tabs
+     *
+     * @return array
+     */
+    abstract function getDefaultDesignTabs();
+
+    /**
+     * Default application configuration: font and color
+     *
+     * @return array
+     */
+    abstract function getDefaultConfiguration();
+
+    /**
+     * List of allowed fonts for application
+     *
+     * @return array
+     */
+    abstract function getFontList();
+
+    /**
+     * List of allowed font sizes for application
+     *
+     * @return array
+     */
+    public function getFontSizes()
+    {
+        $result = array();
+        for ($i = 6; $i < 32; $i++) {
+            $result[] = array(
+                'value' => $i,
+                'label' => $i . ' pt',
+            );
+        }
+        return $result;
+    }
+
+    /**
+     * Get list of countries that allowed by Magento Inc. for iOS
+     *
+     *
+     * @return array
+     */
+    public function getAllowedCountriesArray()
+    {
+        return $this->_allowedCountries;
+    }
+
+    /**
+     * Validate submit application data
+     *
+     * @param array $params
+     * @return array
+     */
+    abstract function validateSubmit($params);
+
+    /**
+     * Get renderer for submission country
+     *
+     * @return Mage_Adminhtml_Block_Widget_Form_Renderer_Fieldset_Element
+     */
+    public function getCountryRenderer()
+    {
+        if (empty($this->_countryRenderer)) {
+            $this->_countryRenderer = Mage::app()->getLayout()->createBlock($this->_countryRendererBlock);
+        }
+        return $this->_countryRenderer;
+    }
+
+    /**
+     * Get label for submission country
+     *
+     * @return string
+     */
+    public function getCountryLabel()
+    {
+        return Mage::helper('xmlconnect')->__('App Stores');
+    }
+
+    /**
+     * Get count of columns for submission country
+     *
+     * @return int
+     */
+    public function getCountryColumns()
+    {
+        return $this->_countryColumnsCount;
+    }
+
+    /**
+     * Get placement of Country Names for submission country
+     *
+     * @return bool
+     */
+    public function isCountryNamePlaceLeft()
+    {
+        return true;
+    }
+
+    /**
+     * Get class name for submission country
+     *
+     * @return string
+     */
+    public function getCountryClass()
+    {
+        return 'istore stripy';
+    }
+
+    /**
+     * Check the notifications are allowed for current type of application
+     *
+     * @return bool
+     */
+    public function isNotificationsAllowed()
+    {
+        return true;
+    }
+
+    /**
+     * Get image count for image type
+     *
+     * @param string $imageType
+     * @return int
+     */
+    public function getImageCount($imageType)
+    {
+        $imagesTypesList = $this->getImagesTypesList();
+        if (!array_key_exists($imageType, $imagesTypesList)) {
+            Mage::throwException(Mage::helper('xmlconnect')->__('Image type doesn\'t recognized: "%s".', $imageType));
+        }
+        return !empty($imagesTypesList[$imageType]['count']) ? $imagesTypesList[$imageType]['count'] : 0;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Helper/Image.php b/app/code/core/Mage/XmlConnect/Helper/Image.php
index c644782063f..850067509f5 100644
--- a/app/code/core/Mage/XmlConnect/Helper/Image.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Image.php
@@ -35,12 +35,15 @@ class Mage_XmlConnect_Helper_Image extends Mage_Core_Helper_Abstract
 {
     /**
      * Xml connect glue
+     *
+     * @deprecated will delete in the next version
      */
-    const XMLCONNECT_GLUE = '_';
+    const XMLCONNECT_GLUE = Mage_XmlConnect_Model_ImageLimits::SCREEN_SIZE_UPDATE_TYPE_GLUE;
 
     /**
      * Image limits for content
      *
+     * @deprecated will delete in the next version
      * @var array|null
      */
     protected $_content = null;
@@ -48,6 +51,7 @@ class Mage_XmlConnect_Helper_Image extends Mage_Core_Helper_Abstract
     /**
      * Image limits for interface
      *
+     * @deprecated will delete in the next version
      * @var array|null
      */
     protected $_interface = null;
@@ -55,6 +59,7 @@ class Mage_XmlConnect_Helper_Image extends Mage_Core_Helper_Abstract
     /**
      * Array of interface image paths in xmlConfig
      *
+     * @deprecated will delete in the next version
      * @var array
      */
     protected $_interfacePath = array();
@@ -62,6 +67,7 @@ class Mage_XmlConnect_Helper_Image extends Mage_Core_Helper_Abstract
     /**
      * Image limits array
      *
+     * @deprecated will delete in the next version
      * @var array
      */
     protected $_imageLimits = array();
@@ -69,6 +75,7 @@ class Mage_XmlConnect_Helper_Image extends Mage_Core_Helper_Abstract
     /**
      * Images paths in the config
      *
+     * @deprecated will delete in the next version
      * @var array|null
      */
     protected $_confPaths = null;
@@ -77,8 +84,9 @@ class Mage_XmlConnect_Helper_Image extends Mage_Core_Helper_Abstract
      * Process uploaded file
      * setup file names to the configuration
      *
+     * @deprecated will delete in the next version
      * @param string $field
-     * @retun string
+     * @return string
      */
     public function handleUpload($field)
     {
@@ -116,16 +124,18 @@ public function handleUpload($field)
     /**
      * Return current screen_size parameter
      *
+     * @deprecated will delete in the next version
      * @return string
      */
     protected function _getScreenSize()
     {
-        return Mage::helper('xmlconnect')->getApplication()->getScreenSize();
+        return $this->filterScreenSize(Mage::helper('xmlconnect')->getApplication()->getScreenSize());
     }
 
     /**
      * Return correct system filename for current screenSize
      *
+     * @deprecated will delete in the next version
      * @throws Mage_Core_Exception
      * @param string $fieldPath
      * @param string $fileName
@@ -149,8 +159,8 @@ protected function _getResizedFilename($fieldPath, $fileName, $default = false)
         if (!file_exists($originalSizeFileName)) {
             $oldFileName = $this->getOldUploadDir() . DS . $fileName;
             if (file_exists($oldFileName)) {
-                if (!(copy($oldFileName, $originalSizeFileName)
-                    && (is_readable($customSizeFileName) || chmod($customSizeFileName, 0644))
+                if (!(copy($oldFileName, $originalSizeFileName) && (is_readable($customSizeFileName)
+                    || chmod($customSizeFileName, 0644))
                 )) {
                     Mage::throwException(
                         Mage::helper('xmlconnect')->__('Error while processing file "%s".', $fileName)
@@ -178,6 +188,7 @@ protected function _getResizedFilename($fieldPath, $fileName, $default = false)
     /**
      * Resize uploaded file
      *
+     * @deprecated will delete in the next version
      * @param string $fieldPath
      * @param string $file
      * @return null
@@ -228,6 +239,7 @@ protected function _handleResize($fieldPath, $file)
     /**
      * Convert uploaded file to PNG
      *
+     * @deprecated will delete in the next version
      * @param string $field
      */
     protected function _forcedConvertPng($field)
@@ -283,6 +295,7 @@ public function getSkinImagesUrl($name = null)
     /**
      * Return CustomSizeDirPrefix
      *
+     * @deprecated will delete in the next version
      * @return string
      */
     public function getCustomSizeDirPrefix()
@@ -293,6 +306,8 @@ public function getCustomSizeDirPrefix()
     /**
      * Return FileDefaultSizeSuffixAsUrl
      *
+     * @todo get rid of this method
+     * @deprecated will delete in the next version
      * @param string $fileName
      * @return string
      */
@@ -304,22 +319,21 @@ public function getFileDefaultSizeSuffixAsUrl($fileName)
     /**
      * Return getFileCustomDirSuffixAsUrl
      *
+     * @deprecated will delete in the next version
      * @param string $confPath
      * @param string $fileName
      * @return string
      */
     public function getFileCustomDirSuffixAsUrl($confPath, $fileName)
     {
-        return 'custom'
-            . '/'
-            . $this->_getScreenSize()
-            . '/'
+        return 'custom' . '/' . $this->_getScreenSize() . '/'
             . basename($this->_getResizedFilename($confPath, $fileName));
     }
 
     /**
      * Return correct size for given $imageName and device screen_size
      *
+     * @deprecated will delete in the next version
      * @param string $imageName
      * @return int
      */
@@ -340,6 +354,7 @@ public function getImageSizeForContent($imageName)
     /**
      * Return setting for interface images (image size limits)
      *
+     * @deprecated will delete in the next version
      * @return array
      */
     public function getInterfaceImageLimits()
@@ -354,6 +369,7 @@ public function getInterfaceImageLimits()
     /**
      * Return correct size for given $imageName and device screen_size
      *
+     * @deprecated will delete in the next version
      * @param string $imagePath
      * @return int
      */
@@ -385,11 +401,11 @@ public function getMediaPath($path = '')
         $path = trim($path);
         $result = Mage::getBaseDir('media') . DS . 'xmlconnect';
 
-        if (!empty($path)) {
-            if (strpos($path, DS) === 0) {
-                $path = substr($path, 1);
+        if ($path) {
+            if (strpos($path, DS) !== 0) {
+                $path = DS . $path;
             }
-            $result .= DS . $path;
+            $result .= $path;
         }
         return $result;
     }
@@ -405,11 +421,11 @@ public function getMediaUrl($image = '')
         $image = trim($image);
         $result = Mage::getBaseUrl('media') . 'xmlconnect';
 
-        if (!empty($image)) {
-            if (strpos($image, '/') === 0) {
-                $image = substr($image, 1);
+        if ($image) {
+            if (strpos($image, '/') !== 0) {
+                $image = '/' . $image;
             }
-            $result .= '/' . $image;
+            $result .= $image;
         }
         return $result;
     }
@@ -437,7 +453,8 @@ public function getDefaultDesignSuffixAsUrl($image = '')
     }
 
     /**
-     * Retrieve thumbnail image url
+     * Retrieve custom size image url
+     *
      *
      * @param string $imageUrl
      * @param int $width
@@ -450,8 +467,8 @@ public function getCustomSizeImageUrl($imageUrl, $width = 100, $height = 100)
         $customDir = $this->getMediaPath('custom' . DS . $screenSize);
         $this->_verifyDirExist($customDir);
         $imageUrl = explode('/', $imageUrl);
-        $file = $imageUrl[count($imageUrl)-1];
-        $filePath = $this->getDefaultSizeUploadDir() . DS . $file;
+        $file = array_pop($imageUrl);
+        $filePath = Mage_XmlConnect_Model_Images::getBasePath() . DS . $file;
         if (!file_exists($customDir . DS . $file)) {
             $image = new Varien_Image($filePath);
             $widthOriginal = $image->getOriginalWidth();
@@ -481,6 +498,7 @@ public function getCustomSizeImageUrl($imageUrl, $width = 100, $height = 100)
     /**
      * Ensure correct $screenSize value
      *
+     * @deprecated will delete in the next version
      * @param string $screenSize
      * @return string
      */
@@ -518,6 +536,7 @@ public function filterScreenSize($screenSize)
     /**
      * Return correct size array for given device screen_size(320x480/640x960_a)
      *
+     * @deprecated will delete in the next version
      * @param string $screenSize
      * @return array
      */
@@ -614,6 +633,7 @@ public function getImageLimits($screenSize = Mage_XmlConnect_Model_Application::
     /**
      * Return reference to the $path in $array
      *
+     * @deprecated will delete in the next version
      * @param array &$array
      * @param string $path
      * @return mixed reference
@@ -627,8 +647,7 @@ public function &findPath(&$array, $path)
                 if (is_array($target) && isset($target[$node])) {
                     $target =& $target[$node];
                 } else {
-                    $targetNull = null;
-                    return $targetNull;
+                    return null;
                 }
             }
         }
@@ -638,6 +657,7 @@ public function &findPath(&$array, $path)
     /**
      * Multiply given $item by $value if non array
      *
+     * @deprecated will delete in the next version
      * @param mixed $item (argument to change)
      * @param mixed $key (used with array_walk_recursive function as a key of given array)
      * @param string $value (contains float)
@@ -669,6 +689,7 @@ protected function _verifyDirExist($dir)
     /**
      * Return customSizeUploadDir path
      *
+     * @deprecated will delete in the next version
      * @param string $screenSize
      * @return string
      */
@@ -683,6 +704,7 @@ public function getCustomSizeUploadDir($screenSize)
     /**
      * Return originalSizeUploadDir path
      *
+     * @deprecated will delete in the next version
      * @return string
      */
     public function getOriginalSizeUploadDir()
@@ -695,6 +717,7 @@ public function getOriginalSizeUploadDir()
     /**
      * Return oldUpload dir path  (media/xmlconnect)
      *
+     * @deprecated from 1.6.1.0
      * @return string
      */
     public function getOldUploadDir()
@@ -707,6 +730,7 @@ public function getOldUploadDir()
     /**
      * Return default size upload dir path
      *
+     * @deprecated will delete in the next version
      * @return string
      */
     public function getDefaultSizeUploadDir()
@@ -717,6 +741,7 @@ public function getDefaultSizeUploadDir()
     /**
      * Return array for interface images paths in the config
      *
+     * @deprecated will delete in the next version
      * @return array
      */
     public function getInterfaceImagesPathsConf()
@@ -739,6 +764,7 @@ public function getInterfaceImagesPathsConf()
      * - default interface image path for specified $imagePath
      * - array of image paths
      *
+     * @deprecated will delete in the next version
      * @param string $imagePath
      * @return array|string
      */
@@ -768,6 +794,7 @@ public function getInterfaceImagesPaths($imagePath = null)
     /**
      * Check image and get full file path
      *
+     * @deprecated will delete in the next version
      * @param string &$icon
      * @return bool
      */
diff --git a/app/code/core/Mage/XmlConnect/Helper/Ipad.php b/app/code/core/Mage/XmlConnect/Helper/Ipad.php
index 546591d6251..0c0a5e3bd58 100755
--- a/app/code/core/Mage/XmlConnect/Helper/Ipad.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Ipad.php
@@ -31,7 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Helper_Ipad extends Mage_Core_Helper_Abstract
+class Mage_XmlConnect_Helper_Ipad extends Mage_XmlConnect_Helper_Device_Abstract
 {
     /**
      * Submission title length
@@ -44,52 +44,62 @@ class Mage_XmlConnect_Helper_Ipad extends Mage_Core_Helper_Abstract
     const SUBMISSION_DESCRIPTION_LENGTH = 500;
 
     /**
-     * Ipad landscape orientation identificator
+     * Ipad landscape orientation identifier
+     * @deprecated
      */
     const ORIENTATION_LANDSCAPE = 'landscape';
 
     /**
-     * Ipad portrait orientation identificator
+     * Ipad portrait orientation identifier
+     * @deprecated
      */
     const ORIENTATION_PORTRAIT = 'portrait';
 
     /**
-     * Ipad portrait preview banner widht
+     * Ipad portrait preview banner width
+     * @deprecated
      */
     const PREVIEW_PORTRAIT_BANNER_WIDTH = 350;
 
     /**
      * Ipad portrait preview banner image height
+     * @deprecated
      */
     const PREVIEW_PORTRAIT_BANNER_HEIGHT = 135;
 
     /**
-     * Ipad landscape preview banner widht
+     * Ipad landscape preview banner width
+     * @deprecated
      */
     const PREVIEW_LANDSCAPE_BANNER_WIDTH = 467;
 
     /**
      * Ipad landscape preview banner image height
+     * @deprecated
      */
     const PREVIEW_LANDSCAPE_BANNER_HEIGHT = 157;
 
     /**
-     * Ipad landscape orientation preview image widht
+     * Ipad landscape orientation preview image width
+     * @deprecated
      */
     const PREVIEW_LANDSCAPE_BACKGROUND_WIDTH = 467;
 
     /**
      * Ipad landscape orientation preview image height
+     * @deprecated
      */
     const PREVIEW_LANDSCAPE_BACKGROUND_HEIGHT = 321;
 
     /**
-     * Ipad portrait orientation preview image widht
+     * Ipad portrait orientation preview image width
+     * @deprecated
      */
     const PREVIEW_PORTRAIT_BACKGROUND_WIDTH = 350;
 
     /**
      * Ipad portrait orientation preview image height
+     * @deprecated
      */
     const PREVIEW_PORTRAIT_BACKGROUND_HEIGHT = 438;
 
@@ -102,23 +112,6 @@ class Mage_XmlConnect_Helper_Ipad extends Mage_Core_Helper_Abstract
         'icon', 'ipad_loader_portrait_image', 'ipad_loader_landscape_image', 'ipad_logo', 'big_logo'
     );
 
-    /**
-     * Country field renderer
-     *
-     * @var Mage_XmlConnect_Block_Adminhtml_Mobile_Submission_Renderer_Country_Istore
-     */
-    protected $_countryRenderer = null;
-
-    /**
-     * Get submit images that are required for application submit
-     *
-     * @return array
-     */
-    public function getSubmitImages()
-    {
-        return $this->_imageIds;
-    }
-
     /**
      * Get default application tabs
      *
@@ -153,6 +146,46 @@ public function getDefaultDesignTabs()
         return $this->_tabs;
     }
 
+    /**
+     * Default images list
+     *
+     * @return array
+     */
+     public function getImagesTypesList()
+     {
+         return array(
+             Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_ICON => array(
+                 'count' => Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_ICON_COUNT,
+                 'label' => $this->__('Logo in Header'),
+                 'sortable' => false,
+                 'sizeTip' => $this->__('Recommended size %spx x %spx.', 35, 35)
+             ),
+             Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_PORTRAIT_BACKGROUND => array(
+                 'count' => Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_BACKGROUND_COUNT,
+                 'label' => $this->__('Portrait app Background'),
+                 'sortable' => false,
+                 'sizeTip' => $this->__('Recommended size %spx x %spx.', 768, 960) . $this->__('Note: Image size affects the performance of your app.')
+             ),
+             Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_LANDSCAPE_BACKGROUND => array(
+                 'count' => Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_BACKGROUND_COUNT,
+                 'label' => $this->__('Landscape app Background'),
+                 'sortable' => false,
+                 'sizeTip' => $this->__('Recommended size %spx x %spx.', 1024, 704) . $this->__('Note: Image size affects the performance of your app.')
+             ),
+             Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_PORTRAIT_BANNER => array(
+                 'count' => Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_BANNER_COUNT,
+                 'label' => $this->__('Portrait banners on Home Screen'),
+                 'sortable' => true,
+                 'sizeTip' => $this->__('Recommended size %spx x %spx.', 768, 294) . $this->__('Note: Image size affects the performance of your app.')
+             ),
+             Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_LANDSCAPE_BANNER => array(
+                 'count' => Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_BANNER_COUNT,
+                 'label' => $this->__('Landscape banners on Home Screen'),
+                 'sortable' => true,
+                 'sizeTip' => $this->__('Recommended size %spx x %spx.', 1024, 344) . $this->__('Note: Image size affects the performance of your app.')
+         ));
+     }
+
     /**
      * Default application configuration
      *
@@ -224,10 +257,7 @@ public function getDefaultConfiguration()
                          'name' => 'HelveticaNeue',
                          'size' => '12',
                          'color' => '#222222',
-                     ),
-                 ),
-             ),
-         );
+         ))));
      }
 
     /**
@@ -445,36 +475,21 @@ public function getFontList()
             array(
                 'value' => 'STHeitiK-Light',
                 'label' => 'STHeitiK-Light',
-            ),
-        );
+        ));
     }
 
-    /**
-     * List of allowed font sizes for iPad application
-     *
-     * @return array
-     */
-    public function getFontSizes()
-    {
-        $result = array();
-        for ($i = 6; $i < 32; $i++) {
-            $result[] = array(
-                'value' => $i,
-                'label' => $i . ' pt',
-            );
-        }
-        return $result;
-    }
 
     /**
      * Get list of countries that allowed in Itunes by Apple Store for Ipad
      * (we get info from Iphone helper)
      *
+     * @deprecated
+     * @see $this->getAllowedCountriesArray()
      * @return array
      */
     public function getItunesCountriesArray()
     {
-        return Mage::helper('xmlconnect/iphone')->getItunesCountriesArray();
+        return $this->_allowedCountries;
     }
 
     /**
@@ -551,6 +566,7 @@ public function validateSubmit($params)
     /**
      * Check config for valid values
      *
+     * @deprecated we don't use it since 1.11.1.0
      * @param array $native
      * @return array
      */
@@ -584,66 +600,12 @@ public function validateConfig($native)
         return $errors;
     }
 
-    /**
-     * Get renderer for submission country
-     *
-     * @return Mage_XmlConnect_Block_Adminhtml_Mobile_Submission_Renderer_Country_Istore
-     */
-    public function getCountryRenderer()
-    {
-        if (empty($this->_countryRenderer)) {
-            $renderer = 'xmlconnect/adminhtml_mobile_submission_renderer_country_'
-                . Mage_XmlConnect_Helper_Iphone::SUBMISSION_COUNTRY_RENDERER;
-            $this->_countryRenderer = Mage::app()->getLayout()->createBlock($renderer);
-        }
-        return $this->_countryRenderer;
-    }
-
-    /**
-     * Get label for submission country
-     *
-     * @return string
-     */
-    public function getCountryLabel()
-    {
-        return Mage::helper('xmlconnect')->__('App Stores');
-    }
-
-    /**
-     * Get columns for submission country
-     *
-     * @return int
-     */
-    public function getCountryColumns()
-    {
-        return Mage_XmlConnect_Helper_Iphone::SUBMISSION_COUNTRY_COLUMNS;
-    }
-
-    /**
-     * Get placement of Country Names for submission country
-     *
-     * @return bool
-     */
-    public function isCountryNamePlaceLeft()
-    {
-        return true;
-    }
-
-    /**
-     * Get class name for submission country
-     *
-     * @return string
-     */
-    public function getCountryClass()
-    {
-        return Mage_XmlConnect_Helper_Iphone::SUBMISSION_COUNTRY_RENDERER . ' stripy';
-    }
-
     /**
      * Check image fields
      *
      * We set empty value for image field if file was missed in some reason
      *
+     * @deprecated will delete in the next version
      * @param array $data
      * @return array
      */
@@ -688,6 +650,7 @@ public function checkImages(array $data)
     /**
      * Check required fields of a config for a front-end
      *
+     * @deprecated will delete in the next version
      * @throws Mage_Core_Exception
      * @param array $data
      * @return null
@@ -728,14 +691,4 @@ public function checkRequiredConfigFields($data)
             );
         }
     }
-
-    /**
-     * Check the notifications are allowed for current type of application
-     *
-     * @return bool
-     */
-    public function isNotificationsAllowed()
-    {
-        return true;
-    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Helper/Iphone.php b/app/code/core/Mage/XmlConnect/Helper/Iphone.php
index d41dd0b0ef9..bf8b89c6c16 100644
--- a/app/code/core/Mage/XmlConnect/Helper/Iphone.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Iphone.php
@@ -31,7 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Helper_Iphone extends Mage_Core_Helper_Abstract
+class Mage_XmlConnect_Helper_Iphone extends Mage_XmlConnect_Helper_Device_Abstract
 {
     /**
      * Submission title length
@@ -45,11 +45,14 @@ class Mage_XmlConnect_Helper_Iphone extends Mage_Core_Helper_Abstract
 
     /**
      * Country renderer for submission page
+     *
+     * @deprecated
      */
     const SUBMISSION_COUNTRY_RENDERER = 'istore';
 
     /**
      * Country columns for submission page
+     * @deprecated
      */
     const SUBMISSION_COUNTRY_COLUMNS = 4;
 
@@ -62,125 +65,6 @@ class Mage_XmlConnect_Helper_Iphone extends Mage_Core_Helper_Abstract
         'icon', 'loader_image', 'loader_image_i4', 'logo', 'logo_i4', 'big_logo', 'big_logo_i4'
     );
 
-    /**
-     * List of coutries that allowed in Ituens by Apple Store
-     *
-     * array(
-     *      'country name' => 'country id at directory model'
-     * )
-     *
-     * @var array
-     */
-    protected $_allowedCountries = array(
-        'Argentina'     => 'AR',
-        'Armenia'       => 'AM',
-        'Australia'     => 'AU',
-        'Austria'       => 'AT',
-        'Belgium'       => 'BE',
-        'Botswana'      => 'BW',
-        'Brazil'        => 'BR',
-        'Bulgaria'      => 'BG',
-        'Canada'        => 'CA',
-        'Chile'         => 'CL',
-        'China'         => 'CN',
-        'Colombia'      => 'CO',
-        'Costa Rica'    => 'CR',
-        'Croatia'       => 'HR',
-        'Czech Republic' => 'CZ',
-        'Denmark'       => 'DK',
-        'Dominican Republic' => 'DO',
-        'Ecuador'       => 'EC',
-        'Egypt'         => 'EG',
-        'El Salvador'   => 'SV',
-        'Estonia'       => 'EE',
-        'Finland'       => 'FI',
-        'France'        => 'FR',
-        'Germany'       => 'DE',
-        'Greece'        => 'GR',
-        'Guatemala'     => 'GT',
-        'Honduras'      => 'HN',
-        'Hong Kong SAR China' => 'HK',
-        'Hungary'       => 'HU',
-        'India'         => 'IN',
-        'Indonesia'     => 'ID',
-        'Ireland'       => 'IE',
-        'Israel'        => 'IL',
-        'Italy'         => 'IT',
-        'Jamaica'       => 'JM',
-        'Japan'         => 'JP',
-        'Jordan'        => 'JO',
-        'Kazakstan'     => 'KZ',
-        'Kenya'         => 'KE',
-        'South Korea'   => 'KR',
-        'Kuwait'        => 'KW',
-        'Latvia'        => 'LV',
-        'Lebanon'       => 'LB',
-        'Lithuania'     => 'LT',
-        'Luxembourg'    => 'LU',
-        'Macau SAR China' => 'MO',
-        'Macedonia'     => 'MK',
-        'Madagascar'    => 'MG',
-        'Malaysia'      => 'MY',
-        'Mali'          => 'ML',
-        'Malta'         => 'MT',
-        'Mauritius'     => 'MU',
-        'Mexico'        => 'MX',
-        'Moldova'       => 'MD',
-        'Netherlands'   => 'NL',
-        'New Zealand'   => 'NZ',
-        'Nicaragua'     => 'NI',
-        'Niger'         => 'NE',
-        'Norway'        => 'NO',
-        'Pakistan'      => 'PK',
-        'Panama'        => 'PA',
-        'Paraguay'      => 'PY',
-        'Peru'          => 'PE',
-        'Philippines'   => 'PH',
-        'Poland'        => 'PL',
-        'Portugal'      => 'PT',
-        'Qatar'         => 'QA',
-        'Romania'       => 'RO',
-        'Russia'        => 'RU',
-        'Saudi Arabia'  => 'SA',
-        'Senegal'       => 'SN',
-        'Singapore'     => 'SG',
-        'Slovakia'      => 'SK',
-        'Slovenia'      => 'SI',
-        'South Africa'  => 'ZA',
-        'Spain'         => 'ES',
-        'Sri Lanka'     => 'LK',
-        'Sweden'        => 'SE',
-        'Switzerland'   => 'CH',
-        'Taiwan'        => 'TW',
-        'Thailand'      => 'TH',
-        'Tunisia'       => 'TN',
-        'Turkey'        => 'TR',
-        'Uganda'        => 'UG',
-        'United Arab Emirates' => 'AE',
-        'United Kingdom' => 'GB',
-        'United States' => 'US',
-        'Uruguay'       => 'UY',
-        'Venezuela'     => 'VE',
-        'Vietnam'       => 'VN',
-    );
-
-    /**
-     * Country field renderer
-     *
-     * @var Mage_XmlConnect_Block_Adminhtml_Mobile_Submission_Renderer_Country_Istore
-     */
-    protected $_countryRenderer = null;
-
-    /**
-     * Get submit images that are required for application submit
-     *
-     * @return array
-     */
-    public function getSubmitImages()
-    {
-        return $this->_imageIds;
-    }
-
     /**
      * Get default application tabs
      *
@@ -230,6 +114,34 @@ public function getDefaultDesignTabs()
         return $this->_tabs;
     }
 
+    /**
+     * Default images list
+     *
+     * @return array
+     */
+     public function getImagesTypesList()
+     {
+         return array(
+             Mage_XmlConnect_Model_Device_Iphone::IMAGE_TYPE_ICON => array(
+                 'count' => Mage_XmlConnect_Model_Device_Iphone::IMAGE_TYPE_ICON_COUNT,
+                 'label' => $this->__('Logo in Header'),
+                 'sortable' => false,
+                 'sizeTip' => $this->__('Recommended size %spx x %spx.', 35, 35)
+             ),
+             Mage_XmlConnect_Model_Device_Iphone::IMAGE_TYPE_PORTRAIT_BACKGROUND => array(
+                 'count' => Mage_XmlConnect_Model_Device_Iphone::IMAGE_TYPE_BACKGROUND_COUNT,
+                 'label' => $this->__('App Background'),
+                 'sortable' => false,
+                 'sizeTip' => $this->__('Recommended size %spx x %spx.', 320, 367) . $this->__('Note: Image size affects the performance of your app.') . $this->__('Keep your image size below %s KB for optimal performance.', 75)
+             ),
+             Mage_XmlConnect_Model_Device_Iphone::IMAGE_TYPE_PORTRAIT_BANNER => array(
+                 'count' => Mage_XmlConnect_Model_Device_Iphone::IMAGE_TYPE_BANNER_COUNT,
+                 'label' => $this->__('Banners on Home Screen'),
+                 'sortable' => true,
+                 'sizeTip' => $this->__('Recommended size %spx x %spx.', 320, 230) . $this->__('Note: Image size affects the performance of your app.') . $this->__('Keep your image size below %s KB for optimal performance.', 50)
+         ));
+     }
+
     /**
      * Default application configuration
      *
@@ -522,30 +434,15 @@ public function getFontList()
             array(
                 'value' => 'STHeitiK-Light',
                 'label' => 'STHeitiK-Light',
-            ),
-        );
-    }
-
-    /**
-     * List of allowed font sizes for iPhone application
-     *
-     * @return array
-     */
-    public function getFontSizes()
-    {
-        $result = array();
-        for ($i = 6; $i < 32; $i++) {
-            $result[] = array(
-                'value' => $i,
-                'label' => $i . ' pt',
-            );
-        }
-        return $result;
+        ));
     }
 
     /**
      * Get list of countries that allowed in Itunes by Apple Store for Iphone
+     * (we get info from Iphone helper)
      *
+     * @deprecated
+     * @see $this->getAllowedCountriesArray()
      * @return array
      */
     public function getItunesCountriesArray()
@@ -628,6 +525,7 @@ public function validateSubmit($params)
     /**
      * Check config for valid values
      *
+     * @deprecated we don't use it since 1.11.1.0
      * @param array $native
      * @return array
      */
@@ -652,66 +550,12 @@ public function validateConfig($native)
         return $errors;
     }
 
-    /**
-     * Get renderer for submission country
-     *
-     * @return Mage_XmlConnect_Block_Adminhtml_Mobile_Submission_Renderer_Country_Istore
-     */
-    public function getCountryRenderer()
-    {
-        if (empty($this->_countryRenderer)) {
-            $renderer = 'xmlconnect/adminhtml_mobile_submission_renderer_country_'
-                . self::SUBMISSION_COUNTRY_RENDERER;
-            $this->_countryRenderer = Mage::app()->getLayout()->createBlock($renderer);
-        }
-        return $this->_countryRenderer;
-    }
-
-    /**
-     * Get label for submission country
-     *
-     * @return string
-     */
-    public function getCountryLabel()
-    {
-        return Mage::helper('xmlconnect')->__('App Stores');
-    }
-
-    /**
-     * Get columns for submission country
-     *
-     * @return int
-     */
-    public function getCountryColumns()
-    {
-        return self::SUBMISSION_COUNTRY_COLUMNS;
-    }
-
-    /**
-     * Get placement of Country Names for submission country
-     *
-     * @return bool
-     */
-    public function isCountryNamePlaceLeft()
-    {
-        return true;
-    }
-
-    /**
-     * Get class name for submission country
-     *
-     * @return string
-     */
-    public function getCountryClass()
-    {
-        return self::SUBMISSION_COUNTRY_RENDERER . ' stripy';
-    }
-
     /**
      * Check image fields
      *
      * We set empty value for image field if file was missed in some reason
      *
+     * @deprecated will delete in the next version
      * @param array $data
      * @return array
      */
@@ -744,6 +588,7 @@ public function checkImages(array $data)
     /**
      * Check required fields of a config for a front-end
      *
+     * @deprecated will delete in the next version
      * @throws Mage_Core_Exception
      * @param array $data
      * @return null
@@ -764,14 +609,4 @@ public function checkRequiredConfigFields($data)
             Mage::throwException(Mage::helper('xmlconnect')->__('App Background image missing.'));
         }
     }
-
-    /**
-     * Check the notifications are allowed for current type of application
-     *
-     * @return bool
-     */
-    public function isNotificationsAllowed()
-    {
-        return true;
-    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Helper/OfflineCatalog.php b/app/code/core/Mage/XmlConnect/Helper/OfflineCatalog.php
new file mode 100644
index 00000000000..b5dbf745940
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Helper/OfflineCatalog.php
@@ -0,0 +1,307 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect offline catalog helper
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Helper_OfflineCatalog extends Mage_Core_Helper_Abstract
+{
+    /**
+     * Result folder
+     */
+    const RESULT_FOLDER = 'offline_catalog';
+
+    /**
+     * Map file
+     */
+    const MAP_FILE = '_storage.dict';
+
+    /**
+     * Export url
+     */
+    const EXPORT_URL = 'xmlconnect/offlineCatalog/index/key/';
+
+    /**
+     * Varien file IO
+     *
+     * @var null|Varien_Io_File
+     */
+    protected $_fileIo;
+
+    /**
+     * Xml object
+     *
+     * @var null|Mage_XmlConnect_Model_Simplexml_Element
+     */
+    protected $_xmlObject;
+
+    /**
+     * Layout model
+     *
+     * @var null|Mage_Core_Model_Layout
+     */
+    protected $_layout;
+
+    /**
+     * Result dir
+     *
+     * @var null|string
+     */
+    protected $_resultDir;
+
+    /**
+     * Application model
+     *
+     * @var null|Mage_XmlConnect_Model_Application
+     */
+    protected $_appModel;
+
+    /**
+     * Prepare result directory
+     *
+     * @return Mage_XmlConnect_Helper_OfflineCatalog
+     */
+    public function prepareResultDirectory()
+    {
+        $fileModel = $this->_getFileIo();
+        $resultDir = $this->_getResultDir();
+        $fileModel->rmdirRecursive($resultDir);
+        $fileModel->mkdir($resultDir);
+        return $this;
+    }
+
+    /**
+     * Get file IO
+     *
+     * @return Varien_Io_File
+     */
+    protected function _getFileIo()
+    {
+        if ($this->_fileIo === null) {
+            $this->_fileIo = new Varien_Io_File();
+        }
+        return $this->_fileIo;
+    }
+
+    /**
+     * Get handles
+     *
+     * @return array
+     */
+    protected function _getHandles()
+    {
+        return array('xmlconnect_configuration_index', 'xmlconnect_catalog_categorydetails',
+            'xmlconnect_catalog_productview', 'xmlconnect_homebanners_index', 'xmlconnect_index_index',
+            'xmlconnect_catalog_productgallery', 'xmlconnect_catalog_productreviews'
+        );
+    }
+
+    /**
+     * Add offline catalog data
+     *
+     * @param string $urlPath
+     * @param string $output
+     * @return Mage_XmlConnect_Helper_OfflineCatalog
+     */
+    public function addOfflineCatalogData($urlPath, $output)
+    {
+        $xmlObj = $this->_getXmlObject();
+        $fileName = uniqid() . '-' . sha1($output) . '.cache';
+
+        $this->saveCacheFile($fileName, $output);
+        $xmlObj->addCustomChild('key', $urlPath);
+        $xmlObj->addCustomChild('string', $fileName);
+        return $this;
+    }
+
+    /**
+     * Save cache file
+     *
+     * @param string $fileName
+     * @param string $output
+     * @return Mage_XmlConnect_Helper_OfflineCatalog
+     */
+    public function saveCacheFile($fileName, $output)
+    {
+        $filePath = $this->_getResultDir() . DS . $fileName;
+        $this->_getFileIo()->open(array('path' => $this->_getResultDir()));
+        $this->_getFileIo()->write($filePath, $output);
+        return $this;
+    }
+
+    /**
+     * Get result directory path
+     *
+     * @return string
+     */
+    protected function _getResultDir()
+    {
+        if ($this->_resultDir === null) {
+            $this->_resultDir = Mage::getBaseDir('var') . DS . self::RESULT_FOLDER;
+        }
+        return $this->_resultDir;
+    }
+
+    /**
+     * Get xml object
+     *
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    protected function _getXmlObject()
+    {
+        if ($this->_xmlObject === null) {
+            $this->_xmlObject = Mage::getModel('xmlconnect/simplexml_element', '<dict></dict>');
+        }
+        return $this->_xmlObject;
+    }
+
+    /**
+     * Get block
+     *
+     * @param string $blockName
+     * @return Mage_Core_Block_Abstract
+     */
+    public function getBlock($blockName)
+    {
+        /** @var $layout Mage_Core_Model_Layouts */
+        $this->_prepareLayout();
+        $this->_layout->getUpdate()->load($this->_getHandles());
+        $this->_layout->generateXml()->generateBlocks();
+        $block = $this->_layout->getBlock($blockName);
+        $this->unsetLayout();
+        return $block;
+    }
+
+    /**
+     * Prepare layout
+     *
+     * @return Mage_XmlConnect_Helper_OfflineCatalog
+     */
+    protected function _prepareLayout()
+    {
+        $this->_layout = Mage::getModel('core/layout');
+        return $this;
+    }
+
+    /**
+     * Unset layout
+     *
+     * Only for PHP 5 >= 5.3.0
+     *
+     * @return Mage_XmlConnect_Helper_OfflineCatalog
+     */
+    protected function unsetLayout()
+    {
+        /** @TODO Add support for previous PHP version */
+        unset($this->_layout);
+        gc_collect_cycles();
+        return $this;
+    }
+
+    /**
+     * Get current device model
+     *
+     * @return Mage_XmlConnect_Model_Application|null
+     */
+    public function getCurrentDeviceModel()
+    {
+        return $this->_appModel;
+    }
+
+    /**
+     * Set current device model
+     *
+     * @param string $key
+     * @return bool
+     */
+    public function setCurrentDeviceModel($key)
+    {
+        $appCode = $this->base64UrlDecode($key);
+        $appModel = Mage::getModel('xmlConnect/application')->loadByCode($appCode);
+        if (!$appModel->getId()) {
+            return false;
+        }
+        Mage::register('current_app', $appModel);
+        $this->_appModel = $appModel;
+        return true;
+    }
+
+    /**
+     * Base64 url encode
+     *
+     * @param string $data
+     * @return string
+     */
+    public function base64UrlEncode($data)
+    {
+        /** @var $decryptHelper Mage_Core_Helper_Data */
+        $decryptHelper = Mage::helper('core/data');
+        return strtr($decryptHelper->encrypt($data), '+/=', '-_,');
+    }
+
+    /**
+     * Base64 url dencode
+     *
+     * @param string $data
+     * @return string
+     */
+    public function base64UrlDecode($data)
+    {
+        /** @var $decryptHelper Mage_Core_Helper_Data */
+        $decryptHelper = Mage::helper('core/data');
+        return $decryptHelper->decrypt(strtr($data, '-_,', '+/='));
+    }
+
+    /**
+     * Render xml object
+     *
+     * @return Mage_XmlConnect_Helper_OfflineCatalog
+     */
+    public function renderXmlObject()
+    {
+        /** @var $result Mage_XmlConnect_Model_Simplexml_Element */
+        $result = Mage::getModel('xmlconnect/simplexml_element', '<plist  version="1.0"></plist>');
+        $result->appendChild($this->_getXmlObject())->asNiceXml($this->_getResultDir() . DS . self::MAP_FILE);
+        return $this;
+    }
+
+    /**
+     * Get export url
+     *
+     * @return string
+     */
+    public function getExportUrl()
+    {
+        $app = Mage::helper('xmlconnect')->getApplication();
+        $secretKey = array('key' => $this->base64UrlEncode($app->getCode()));
+        $storeUrl = Mage::getModel('core/store')->load($app->getStoreId())->getUrl(self::EXPORT_URL, $secretKey);
+        return $storeUrl;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Helper/Theme.php b/app/code/core/Mage/XmlConnect/Helper/Theme.php
index 9d6bf66ec18..0e92a36e94d 100644
--- a/app/code/core/Mage/XmlConnect/Helper/Theme.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Theme.php
@@ -171,15 +171,16 @@ public function getThemesSelector($themeId = '')
     public function getAllThemes($flushCache = false)
     {
         if (!$this->_themeArray || $flushCache) {
-            $saveLibxmlErrors   = libxml_use_internal_errors(true);
-            $this->_themeArray  = array();
-            $themeDir = $this->getMediaThemePath();
-            $ioFile = new Varien_Io_File();
-            $ioFile->checkAndCreateFolder($themeDir);
-            $ioFile->open(array('path' => $themeDir));
             try {
+                $saveLibxmlErrors   = libxml_use_internal_errors(true);
+                $this->_themeArray  = array();
+                $themeDir = $this->getMediaThemePath();
+
+                $ioFile = new Varien_Io_File();
+                $ioFile->checkAndCreateFolder($themeDir);
+                $ioFile->open(array('path' => $themeDir));
                 $fileList = $ioFile->ls(Varien_Io_File::GREP_FILES);
-                if (!count($fileList)) {
+                if (!count($fileList) || !$this->_checkDefaultThemes($fileList)) {
                     $this->resetTheme();
                     $this->getAllThemes(true);
                 }
@@ -199,6 +200,46 @@ public function getAllThemes($flushCache = false)
         return $this->_themeArray;
     }
 
+    /**
+     * Check are default themes files present in media folder or not
+     *
+     * @param array $fileList
+     * @return bool
+     */
+    protected function _checkDefaultThemes($fileList)
+    {
+        $cacheKey = 'MAGENTO_MOBILE_DEFAULT_THEMES_CACHE_KEY';
+        $cache = Mage::app()->loadCache($cacheKey);
+        if (Mage::app()->useCache('config') && $cache) {
+            $defaultFiles = unserialize($cache);
+        } else {
+            $ioFile = new Varien_Io_File();
+            $ioFile->open(array('path' => $this->_getDefaultThemePath()));
+            $fileDefaultList = $ioFile->ls(Varien_Io_File::GREP_FILES);
+            $defaultFiles = array();
+            foreach ($fileDefaultList as $defaultFileData) {
+                if ('xml' != $defaultFileData['filetype']) {
+                    continue;
+                }
+                $defaultFiles[] = $defaultFileData['text'];
+            }
+            if (Mage::app()->useCache('config')) {
+                Mage::app()->saveCache(serialize($defaultFiles), $cacheKey, array('config'));
+            }
+        }
+
+        if (empty($defaultFiles)) {
+            Mage::throwException($this->__('Default themes are missed.'));
+        }
+        $matches = 0;
+        foreach ($fileList as $fileData) {
+            if (in_array($fileData['text'], $defaultFiles)) {
+                ++$matches;
+            }
+        }
+        return $matches == count($defaultFiles);
+    }
+
     /**
      * Reads default theme directory
      *
diff --git a/app/code/core/Mage/XmlConnect/Helper/Translate.php b/app/code/core/Mage/XmlConnect/Helper/Translate.php
new file mode 100644
index 00000000000..748dd5f6ec0
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Helper/Translate.php
@@ -0,0 +1,514 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect application localization helper
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Helper_Translate extends Mage_Core_Helper_Abstract
+{
+    /**
+     * Hash of localization
+     *
+     * @var string
+     */
+    protected $_hash;
+
+    /**
+     * Get hash localization
+     *
+     * @return string
+     */
+    public function getHash()
+    {
+        if (!$this->_hash) {
+            $this->_hash = sha1(serialize($this->getLocalizationArray()));
+        }
+        return $this->_hash;
+    }
+
+    /**
+     * Get application localization strings array
+     *
+     * @return array
+     */
+    public function getLocalizationArray()
+    {
+        return array(
+            'About' => $this->__('About'),
+            'Account' => $this->__('Account'),
+            'AccountInfo' => $this->__('Account Information'),
+            'AccountMyDownloadableProducts' => $this->__('My Downloadable Products'),
+            'AccountMyDownloadableProductsDate' => $this->__('Date'),
+            'AccountMyDownloadableProductsOpen' => $this->__('Open'),
+            'AccountMyDownloadableProductsOrder' => $this->__('Order'),
+            'AccountMyDownloadableProductsRemainingDownloads' => $this->__('Remaining downloads'),
+            'AccountMyDownloadableProductsStatus' => $this->__('Status'),
+            'AccountSettings' => $this->__('Account Settings'),
+            'AccountSettingsCancel' => $this->__('Home'),
+            'Add' => $this->__('Add'),
+            'AddAddressFromContacts' => $this->__('Add Address from Contacts'),
+            'AddBillingAddressText' => $this->__('Add a billing address'),
+            'AddCustomText' => $this->__('Add Custom'),
+            'AddFilterTitle' => $this->__('Filter'),
+            'AddNewAddress' => $this->__('Add New Address'),
+            'AddNewEntry' => $this->__('Add'),
+            'AddShippingAddressText' => $this->__('Add a shipping address'),
+            'AddToCart' => $this->__('Add to Cart'),
+            'AddToCartTitle' => $this->__('Add to Cart'),
+            'AddToWishlistTitle' => $this->__('Add to Wishlist'),
+            'AddingProductToCartProgressTitle' => $this->__('Adding Product to Cart...'),
+            'AddingProductToWishListProgressTitle' => $this->__('Adding Product to WishList...'),
+            'AdditionalInfo' => $this->__('Additional Info'),
+            'AddressBook' => $this->__('Address Book'),
+            'AddressBookIsEmpty' => $this->__('Address book is empty'),
+            'AddressBookUpdatedMessage' => $this->__('Address Book Updated'),
+            'AddressInfo' => $this->__('Address Info'),
+            'AgreementsButtonTitle' => $this->__('Read the Terms and Conditions'),
+            'AgreementsCheckboxTitle' => $this->__('I agree to the Terms and Conditions'),
+            'AgreementsDescription' => $this->__('You must read and agree to the Terms and Conditions before placing your order.'),
+            'AllImages' => $this->__('All Images'),
+            'AlsoLikeLbl' => $this->__('You may also like'),
+            'Amount' => $this->__('Amount'),
+            'AmountIn' => $this->__('Amount in %@'),
+            'Amounts' => $this->__('Amounts'),
+            'AppIdNotActivated' => $this->__('The application is currently inactive.\nPlease try again later.'),
+            'ApplicationCode' => $this->__('App code'),
+            'AppliedFiltersLabel' => $this->__('FILTERS APPLIED'),
+            'Apply' => $this->__('Apply'),
+            'ApplyingCouponProgressTitle' => $this->__('Applying Coupon Code'),
+            'ApplyingGiftCartProgressTitle' => $this->__('Applying Gift Card %@'),
+            'AsGuestText' => $this->__('as Guest'),
+            'AsLowAsExcludingTaxLabel' => $this->__('As low as excl. tax'),
+            'AsLowAsIncludingTaxLabel' => $this->__('As low as incl. tax'),
+            'AsLowAsLabel' => $this->__('As low as'),
+            'AuthenticationToSocialClientFailedAlertMessage' => $this->__('Authentication to %@ did failed...'),
+            'AverageRating' => $this->__('Average Rating'),
+            'Back' => $this->__('Back'),
+            'BackFromInfo' => $this->__('Back'),
+            'BiggerThanMaxMessage' => $this->__('The value should not be greater than %.2f!'),
+            'BillingAddressTitle' => $this->__('Billing address'),
+            'BillingCheckout' => $this->__('Billing'),
+            'BundleProductsSectionTitle' => $this->__('Bundle Products'),
+            'BuyMoreAndSave' => $this->__('Buy More & Save'),
+            'Cancel' => $this->__('Cancel'),
+            'CancelButtonTitle' => $this->__('Cancel'),
+            'CancelingPayPalMECLProgressTitle' => $this->__('Canceling PayPal ...'),
+            'Cart' => $this->__('Shopping Cart'),
+            'CartBtn' => $this->__('Cart'),
+            'CartIsEmpty' => $this->__('The cart is empty'),
+            'CartRegisteredMessage' => $this->__('Offline cart stored on server'),
+            'CartRegisteredTitle' => $this->__(''),
+            'CartRegistrationFailedMessage' => $this->__('Storage of offline cart on server failed. Please retry later'),
+            'CartRegistrationFailedTitle' => $this->__('Error'),
+            'CartUpdatedMessageTitle' => $this->__('Cart Updated'),
+            'CheckGiftCardLabel' => $this->__('Check Gift Card'),
+            'CheckingCartProgressTitle' => $this->__('Checking Gift Card %@'),
+            'CheckoutAsGuestButtonTitle' => $this->__('Checkout as Guest'),
+            'CheckoutButtonFullTitle' => $this->__('Proceed to Checkout'),
+            'CheckoutButtonTitle' => $this->__('Checkout'),
+            'CheckoutInitializationProgressTitle' => $this->__('Checkout initialization...'),
+            'CheckoutInitializedText' => $this->__('Checkout initialized!'),
+            'CheckoutTitle' => $this->__('Checkout'),
+            'ChooseAmount' => $this->__('Choose amount'),
+            'City' => $this->__('City'),
+            'Clear' => $this->__('Clear'),
+            'Close' => $this->__('Close'),
+            'CommitCartChangesAlertText' => $this->__('You have uncommitted actions. Commit?'),
+            'CommittingUpdatesProgressTitle' => $this->__('Commiting updates...'),
+            'ConfigurationLoadingError' => $this->__('There is an error in loading an app\'s configuration'),
+            'ConfigureTitle' => $this->__('Select Options'),
+            'Connecting' => $this->__('Connecting'),
+            'ConnectionErrorMessage' => $this->__('Connection Error\nWe\'re sorry. The app is experiencing connection problems. The app requires a network connection to operate.'),
+            'ConnectionLostMessage' => $this->__('Connection Error\nWe\'re sorry. The app is experiencing connection problems. The app requires a network connection to operate.'),
+            'ContactsAreEmpty' => $this->__('ContactsAreEmpty'),
+            'Continue' => $this->__('Continue'),
+            'Copyright' => $this->__('Copyright: Magento (c) 2010'),
+            'Country' => $this->__('Country'),
+            'CountrySelect' => $this->__('Countries'),
+            'CreateAccount' => $this->__('Create an Account'),
+            'CreateAccountButtonTitle' => $this->__('Create Account'),
+            'CreateAccountLabel' => $this->__('Create Account'),
+            'CreateAccountSectionHeader' => $this->__('New to Our Store?'),
+            'CreateAnAccountLabel' => $this->__('Create an Account'),
+            'CrossSellsText' => $this->__('Cross Sells'),
+            'CrossellTitle' => $this->__('You may also like'),
+            'CustomAmount' => $this->__('Custom amount'),
+            'DateText' => $this->__('Date'),
+            'DateTitle' => $this->__('Date:'),
+            'Delete' => $this->__('Delete'),
+            'DeleteItemMessage' => $this->__('Are you sure you want to remove this item?'),
+            'DeleteRecordButtonTitle' => $this->__('Delete'),
+            'Description' => $this->__('Description'),
+            'DiscountButtonTitle' => $this->__('Apply'),
+            'DiscountLabel' => $this->__('Discount:'),
+            'DiscountTextFieldPlaceholder' => $this->__('Enter discount code if any'),
+            'DiscoutnButtonTitle' => $this->__('Apply'),
+            'DoneTitle' => $this->__('Done'),
+            'DownloadableProductLinkSample' => $this->__('Sample'),
+            'DownloadableProductsUpdatedMessage' => $this->__('Downloadable Products Updated'),
+            'DownloadsLimitTitle' => $this->__('Downloads limit:'),
+            'Edit' => $this->__('Edit'),
+            'EditAccountButtonTitle' => $this->__('Save'),
+            'EditAddressBookRecord' => $this->__('Edit Address'),
+            'EditFilterTitle' => $this->__('Edit filter'),
+            'EditMailList' => $this->__('Edit Mail List'),
+            'EditNote' => $this->__('Edit note'),
+            'Email' => $this->__('E-mail'),
+            'EmailCopyLabel' => $this->__('Cc:'),
+            'EmailCountMaxExceed' => $this->__('Too many recipients have been set.  Max amount of recipients is:'),
+            'EmailLabel' => $this->__('To:'),
+            'EmailThemeLabel' => $this->__('Subject:'),
+            'EmptyCategoryMessage' => $this->__('Sorry, there are no items in this category.'),
+            'EmptyDiscount' => $this->__('Enter discount code first.'),
+            'EmptyDiscountCodeAlertMessage' => $this->__('Discount code is empty'),
+            'EmptyEmails' => $this->__('Please enter at least one email recipient'),
+            'EmptyGalleryMessage' => $this->__('This product has no images.'),
+            'EmptyGiftCardValueMessage' => $this->__('Please, specify gift card amount!'),
+            'EmptyMyDownloadableViewMessage' => $this->__('List of downloadable products is empty'),
+            'EmptyStoreCreditHistoryMessage' => $this->__('There is no store credit history!'),
+            'EmptyViewMessage' => $this->__('There are no items here'),
+            'EmptyWishlistViewMessage' => $this->__('Wishlist is empty.'),
+            'EnterEmailText' => $this->__('Enter e-mail'),
+            'EnterGiftCardPromo' => $this->__('Enter giftcard promo code here'),
+            'EnterNameText' => $this->__('Enter Name'),
+            'EnterText' => $this->__('Enter text'),
+            'Error' => $this->__('Error'),
+            'ErrorEmailMessage1' => $this->__('Email is not specified'),
+            'ErrorEmailMessage2' => $this->__('Email is not correct'),
+            'ErrorLoadingConfigurationFormat' => $this->__('Error Loading Configuration Format'),
+            'ErrorPasswordMessage1' => $this->__('Password is not specified'),
+            'ErrorRetrievingData' => $this->__('There is an error in retrieving the data. Please try again later'),
+            'ExcludingTaxLabel' => $this->__(''),
+            'Facebook' => $this->__('Facebook'),
+            'FacebookPostFailedMessage' => $this->__('Facebook post failed...'),
+            'FacebookPostSuccess' => $this->__('Successfully posted to Facebook'),
+            'FieldRequiredToBeFilledDialogMessage' => $this->__('The %s field should be filled.'),
+            'Filters' => $this->__('Filters'),
+            'FixedAmounts' => $this->__('Fixed amounts'),
+            'ForgotPassword' => $this->__('Forgot Password'),
+            'ForgotPasswordButtonTitle' => $this->__('Forgot Password?'),
+            'ForgotPasswordSectionHeader' => $this->__('Forgot your password?'),
+            'Form' => $this->__('Form'),
+            'FormCellTitle' => $this->__('Form'),
+            'FromExcludingTaxLabel' => $this->__('From excl. tax'),
+            'FromIncludingTaxLabel' => $this->__('From incl. tax'),
+            'FullDescription' => $this->__('Full Description'),
+            'FunctionalityIsDisabledInOfflineModeAlertMessage' => $this->__('This functionality disabled in offline mode'),
+            'Gallery' => $this->__('Gallery'),
+            'GetMoreElements' => $this->__('Load more items'),
+            'GettingMoreElements' => $this->__('Loading more items...'),
+            'GiftCardCodeCheck' => $this->__('Check'),
+            'GiftCardCodeRedeem' => $this->__('Redeem'),
+            'GiftCardPromo' => $this->__('Giftcard promo code'),
+            'GiftCartRedeemedMessageText' => $this->__('Check Gift Card Promo Redeemed'),
+            'Giftcards' => $this->__('Enter the gift card code'),
+            'GuestLogInMessage' => $this->__('Checkout as Guest or Register'),
+            'Home' => $this->__('Home'),
+            'IAgree' => $this->__('I Agree'),
+            'InStock' => $this->__('In Stock'),
+            'IncludingTaxLabel' => $this->__('Incl. tax'),
+            'IncorrectDecimalValueDialogMessage' => $this->__('You have entered an incorrect decimal value in the custom amount field. Provide a valid value.'),
+            'InitializationPayPalMECLFailedMessage' => $this->__('Initialization of the PayPal checkout failed!'),
+            'InitializationPayPalMECLProgressTitle' => $this->__('Initialization PayPal ...'),
+            'InvalidEmailDialogMessage' => $this->__('Email address you provided is not valid. Please provide a valid one.'),
+            'InvalidResponse' => $this->__('The server responded with invalid data.'),
+            'Item' => $this->__('Item'),
+            'ItemOptionsSectionTitle' => $this->__('Item Options'),
+            'LastOrders' => $this->__('My Orders'),
+            'LastUpdatePullDownText' => $this->__('Last update: %@'),
+            'LessThatMinMessage' => $this->__('The value should not be less than %.2f!'),
+            'LindedIn' => $this->__('LindedIn'),
+            'LinkTitle' => $this->__('Link:'),
+            'LinkedIn' => $this->__('LinkedIn'),
+            'LinkedInAuthorization' => $this->__('LinkedIn Authorization'),
+            'LinkedInAutorization' => $this->__('LinkedIn Autorization'),
+            'LinkedInPostSuccess' => $this->__('Successfully posted to Linkedin'),
+            'LinkedInTitle' => $this->__('LinkedIn'),
+            'LinkedinPostFailedMessage' => $this->__('Linkedin post failed...'),
+            'LoadingAccountFormProgressTitle' => $this->__('Loading Account Form...'),
+            'LoadingAddressBookProgressTitle' => $this->__('Loading Address Book...'),
+            'LoadingAddressFormProgressTitle' => $this->__('Loading Address Form...'),
+            'LoadingCMSPageProgtessTitle' => $this->__('Loading CMS page ...'),
+            'LoadingCartProgressTitle' => $this->__('Loading Cart...'),
+            'LoadingCategoryProgressTitle' => $this->__('Loading category ...'),
+            'LoadingDownloadableProductsProgressTitle' => $this->__('Loading My Downloadable Products...'),
+            'LoadingGalleryProgressTitle' => $this->__('Loading Gallery...'),
+            'LoadingLoginFormProgressTitle' => $this->__('Loading Login Form...'),
+            'LoadingMoreItems' => $this->__(''),
+            'LoadingOrderDetailsProgressTitle' => $this->__('Loading Order Details'),
+            'LoadingOrdersListProgressTitle' => $this->__('Loading Orders List...'),
+            'LoadingProductOptionsProgressTitle' => $this->__('Loading Product Options...'),
+            'LoadingProductProgressTitle' => $this->__('Loading product ...'),
+            'LoadingProductsProgressTitle' => $this->__('Loading Products...'),
+            'LoadingProgressTitle' => $this->__('Loading %@...'),
+            'LoadingRegistrationFormProgressTitle' => $this->__('Loading Registration Form...'),
+            'LoadingRestorePasswordFormProgressTitle' => $this->__('Loading Restore Password Form...'),
+            'LoadingShippindPayPalMECLProgressTitle' => $this->__('Loading shipping methods ...'),
+            'LoadingStoreCreditProgressTitle' => $this->__('Loading Store Credit...'),
+            'LoadingText' => $this->__('Loading...'),
+            'LoadingWishListProgressTitle' => $this->__('Loading WishList...'),
+            'LoadingWriteReviewFormProgressTitle' => $this->__('Loading Write Review Form...'),
+            'LogIn' => $this->__('Log In'),
+            'LogInButtonTitle' => $this->__('Log into Account'),
+            'LogInEmailLabel' => $this->__('Email'),
+            'LogInMessage' => $this->__('You must login first'),
+            'LogInMessageTitle' => $this->__('LogInMessageTitle'),
+            'LogInPasswordLabel' => $this->__('Password'),
+            'LogInSectionHeader' => $this->__('Log into your account'),
+            'LogOut' => $this->__('Log Out'),
+            'LogOutButtonTitle' => $this->__('Log out Account'),
+            'MailToText' => $this->__('To:'),
+            'MaxLengthMessage' => $this->__('The max length of the field "%@" is %d!'),
+            'Maximum' => $this->__('Maximum: %.2f'),
+            'MergeButtonTitle' => $this->__('Merge'),
+            'MessageText' => $this->__('Message'),
+            'MessageTwitterTooLong' => $this->__('Message too long, please use 140 symbols'),
+            'Minimize' => $this->__('Minimize'),
+            'Minimum' => $this->__('Minimum: %.2f'),
+            'MoreInfo' => $this->__('More Info'),
+            'MyAccount' => $this->__('My Account'),
+            'NameText' => $this->__('Name'),
+            'NewAddressBookRecord' => $this->__('Add New Address'),
+            'No' => $this->__('No'),
+            'NoInternetConnectionAlertTitle' => $this->__('No internet connection. Retry later ...'),
+            'NoLastOrders' => $this->__('You have placed no orders.'),
+            'NoProductsFoundAlertTitle' => $this->__('No products found. Please retry with other term'),
+            'NoProductsMatchingSelection' => $this->__(''),
+            'NoSupportForOrderDetails' => $this->__('Currently, the system does not support the viewing of the order detail.'),
+            'NotCorrectField' => $this->__('%@ is not correct'),
+            'NotEmail' => $this->__('The following email(s) are either mistyped or have incorrect format. Check them and try again:\n'),
+            'NotLoggedInAlertMessage' => $this->__('You are not logged in'),
+            'NotZeroCustomValueDialogMessage' => $this->__('The custom amount value should be higher than 0.'),
+            'NothingSelected' => $this->__('At least one option should be selected'),
+            'Notice' => $this->__('Notice'),
+            'OK' => $this->__('OK'),
+            'OpenAmountPriceBoundariesText' => $this->__('Minimum %@, maximum %@'),
+            'Options' => $this->__('Options'),
+            'OptionsTitle' => $this->__('Options'),
+            'OrderCanceledAlertMessage' => $this->__('You canceled your order. Touch "Pay with PayPal" to try again.'),
+            'OrderCanceledPayPalMECLMessage' => $this->__('Order canceled'),
+            'OrderDetailsUpdatedMessage' => $this->__('Order Details Updated'),
+            'OrderFailedAlertMessage' => $this->__('Your order failed. Touch "Pay with PayPal" to try again.'),
+            'OrderFailedMessage' => $this->__('Order failed'),
+            'OrderHeader' => $this->__('Order #'),
+            'OrderIDTitle' => $this->__('Order ID:'),
+            'OrderInfoTitle' => $this->__('Order Info'),
+            'OrderListUpdatedMessage' => $this->__('Order List Updated'),
+            'OrderNumberText' => $this->__('Order Number'),
+            'OrderReviewCheckout' => $this->__('Order Review'),
+            'OrderReviewScreenTitle' => $this->__('Order Review'),
+            'OrderedItemsText' => $this->__('Ordered Items'),
+            'OtherAmount' => $this->__('Other amount'),
+            'OutOfStock' => $this->__('Out of Stock'),
+            'ParsingError' => $this->__('Error while reading remote data'),
+            'PasswordLength' => $this->__('The minimum password length is 6'),
+            'PayPalCheckout' => $this->__('PayPal Checkout'),
+            'PayPalText' => $this->__('PayPal'),
+            'PaymentBridgeServiceErrorMessage' => $this->__('Unknown Payment Bridge Error'),
+            'PaymentMethodSectionTitle' => $this->__('Payment Method'),
+            'PaymentMethodSelectionWarning' => $this->__('Please select payment method to cover a quote'),
+            'PaymentMethodTitle' => $this->__('Payment method'),
+            'PaymentMethodsCheckout' => $this->__('Payment Information'),
+            'PlaceOrder' => $this->__('Place Order'),
+            'PlacingOrderProgressTitle' => $this->__('Placing order ...'),
+            'PostToLinkedIn' => $this->__('Share on LinkedIn'),
+            'PostToTwitter' => $this->__('Share on Twitter'),
+            'PostToWallProduct' => $this->__('Post this product to your wall'),
+            'PostingEmailProgressTitle' => $this->__('Posting to e-mails'),
+            'Price' => $this->__('Price'),
+            'PriceExcludingTax' => $this->__('Price excluding tax'),
+            'PriceIncludingTax' => $this->__('Price including tax'),
+            'Product' => $this->__('Product'),
+            'ProductAddedAlertMessage' => $this->__('Product succesfully added to cart'),
+            'ProductAddedAlertTitle' => $this->__('Product added'),
+            'ProductAddedToCartLabelTitle' => $this->__('Product Added to Cart'),
+            'ProductAddedToWishlistLabelTitle' => $this->__('Product Added to Wishlist'),
+            'ProductGalleryUpdatedMessage' => $this->__('Product Gallery Updated'),
+            'ProductOptionsUpdatedMessage' => $this->__('Product Options Updated'),
+            'ProductOutOfStockAlertMessage' => $this->__('Product is out of stock'),
+            'ProductOutOfStockAlertTitle' => $this->__(''),
+            'ProductPaymentCompleteLabelTitle' => $this->__('Success'),
+            'ProductPaymentCompleteleLabelTitle' => $this->__('Success'),
+            'ProductRemovedFromWishlistLabelTitle' => $this->__('Product Removed From Wishlist'),
+            'ProductReviewsUpdatedMessage' => $this->__('Product Reviews Updated'),
+            'ProductUpdatedMessage' => $this->__('Product Updated'),
+            'ProductsText' => $this->__('Products'),
+            'PullDownToUpdatePullDownText' => $this->__('Pull Down To Update..'),
+            'Qty' => $this->__('Qty'),
+            'Quantity' => $this->__('Quantity'),
+            'QuantityTitle' => $this->__('Qty:'),
+            'RatingReviewsNone' => $this->__('No Ratings'),
+            'RatingReviewsTitle' => $this->__('Ratings and Reviews'),
+            'RecoverPasswordButtonTitle' => $this->__('Recover'),
+            'RedemingGiftCartProgressTitle' => $this->__('Redeeming Gift Card %@'),
+            'RegionFieldLabel' => $this->__('State/Province'),
+            'RegionSelect' => $this->__('Regions'),
+            'RegisterText' => $this->__('Register'),
+            'RegisteringOfflineCartProgressTitle' => $this->__('Registering cart ...'),
+            'RegisteringUserProgressTitle' => $this->__('Registering user ...'),
+            'RegularLabel' => $this->__('Regular'),
+            'RegularPriceLabel' => $this->__('Unit Price:'),
+            'RelatedProductLabel' => $this->__('You may also like'),
+            'ReleaseToUpdatePullDownText' => $this->__('Release To Update...'),
+            'RemoveFromWishlistTitle' => $this->__('Remove'),
+            'RemoveGiftCardLabel' => $this->__('Remove'),
+            'RemoveText' => $this->__('Remove'),
+            'RemovingAddressProgressTitle' => $this->__('Remove Address...'),
+            'RemovingCouponProgressTitle' => $this->__('Removing Coupon...'),
+            'RemovingGiftCartProgressTitle' => $this->__('Removing Gift Card...'),
+            'RemovingProductFromWishListProgressTitle' => $this->__('Removing Product from WishList...'),
+            'RemovingProgressTitle' => $this->__('Removing %@...'),
+            'RemovingStoreCreditProgressTitle' => $this->__('Removing Store Credit...'),
+            'RequiredFieldMessage' => $this->__('field is required'),
+            'RequiredFieldTitle' => $this->__('required'),
+            'RequiredLabel' => $this->__('* - field is required'),
+            'Revert' => $this->__('Revert'),
+            'RevertDiscountButtonTitle' => $this->__('Revert Discount'),
+            'SamplesButtonTitle' => $this->__('Samples'),
+            'Save' => $this->__('Save'),
+            'SavingAddressProgressTitle' => $this->__('Saving Address...'),
+            'SavingChangesProgressTitle' => $this->__('Saving changes ...'),
+            'SavingMethodsProgressTitle' => $this->__('Saving shipping methods ...'),
+            'SavingShippingAddressProgressTitle' => $this->__('Saving shipping address ...'),
+            'Search' => $this->__('Search'),
+            'SearchUpdatedMessage' => $this->__('Search Updated'),
+            'SearchingProgressTitle' => $this->__('Searching for %@...'),
+            'SeeAllText' => $this->__('See all'),
+            'SelectA' => $this->__('Select a'),
+            'SelectBillingAddressTitle' => $this->__('Select a Billing Address'),
+            'SelectBillingMethodTitle' => $this->__('Select a Billing Address'),
+            'SelectBillingMethodTitleNoAddress' => $this->__(''),
+            'SelectBoxFormat' => $this->__('Select %@'),
+            'SelectFromAddressBook' => $this->__('Select from Address Book'),
+            'SelectLinks' => $this->__('Select Links'),
+            'SelectOptions' => $this->__('Select Options'),
+            'SelectPaymentMethod' => $this->__('Select Payment Method'),
+            'SelectShippingAddressTitle' => $this->__('Select a Shipping Address'),
+            'SelectShippingMethod' => $this->__('Select shipping method'),
+            'SelectShippingMethodTitle' => $this->__('Select a Shipping Address'),
+            'Send' => $this->__('Send'),
+            'SendEmail' => $this->__('Send'),
+            'SendEmailTitle' => $this->__('Tell a Friend'),
+            'SendTitle' => $this->__('Send'),
+            'SendingEmailFailedMessage' => $this->__('Sending e-mail failed...'),
+            'SetEmailMessage' => $this->__('Please set email'),
+            'SettedText' => $this->__('Set'),
+            'ShakeToResetFilters' => $this->__('Shake device to reset the filter'),
+            'Share' => $this->__('Share'),
+            'ShareTitle' => $this->__('Share'),
+            'ShippingAddressTitle' => $this->__('Shipping address'),
+            'ShippingCheckout' => $this->__('Shipping'),
+            'ShippingMethodTitle' => $this->__('Shipping method'),
+            'ShippingMethodsCheckout' => $this->__('Ship method'),
+            'Shop' => $this->__('Shop'),
+            'ShopAll' => $this->__('Shop All'),
+            'ShopUpdatedMessageTitle' => $this->__('Shop Updated'),
+            'ShorteningUrlClientSideError' => $this->__('The shortening service returned status code %d indicating a client side error.'),
+            'ShorteningUrlError' => $this->__('Error during shortening url'),
+            'ShorteningUrlServerSideError' => $this->__('The shortening service returned status code %d indicating a server side error.'),
+            'ShowPasswordLabelTitle' => $this->__('Show Password'),
+            'SignIn' => $this->__('Sign In'),
+            'SignOutProgressTitle' => $this->__('Signing Out ...'),
+            'SigningInProgressTitle' => $this->__('Signing In...'),
+            'Sku' => $this->__('Product SKU'),
+            'SortByLabel' => $this->__('SORT BY:'),
+            'SpecialExcludingTaxLabel' => $this->__('Special'),
+            'SpecialIncludingTaxLabel' => $this->__('Incl. tax'),
+            'SpecifyPaymentMethod' => $this->__('Please specify payment method'),
+            'SpecifyShippingMethod' => $this->__('Please specify shipping method'),
+            'StandardCheckout' => $this->__('Standard Checkout'),
+            'StartingAtExcludingTaxLabel' => $this->__('Starting at excl. tax'),
+            'StartingAtIncludingTaxLabel' => $this->__('Starting at incl. tax'),
+            'StatusText' => $this->__('Status'),
+            'StoreCredit' => $this->__('Store credit'),
+            'StoreCreditBalanceHeader' => $this->__('Balance'),
+            'StoreCreditInfoUpdatedMessage' => $this->__('Store Credit Info Updated'),
+            'StrAddress' => $this->__('Address'),
+            'SubmitReview' => $this->__('Submit Review'),
+            'SubmittingReviewProgressTitle' => $this->__('Submitting Review...'),
+            'Subtotal' => $this->__('Subtotal'),
+            'SubtotalExcludingTax' => $this->__('Subtotal excluding tax'),
+            'SubtotalExcludingTaxLabel' => $this->__('Subtotal:'),
+            'SubtotalIncludingTax' => $this->__('Subtotal including tax'),
+            'SubtotalIncludingTaxLabel' => $this->__('Subtotal incl. tax:'),
+            'SubtotalRegularPriceLabel' => $this->__('Subtotal:'),
+            'SuccessOrderID' => $this->__('Order ID'),
+            'SwipeToRevealOptions' => $this->__('Swipe a product to reveal more options'),
+            'Telephone' => $this->__('Telephone'),
+            'TellAFriendButtonTitle' => $this->__('Tell a Friend'),
+            'TellAFriendTitle' => $this->__('Tell a Friend'),
+            'TermsAndConditions' => $this->__('Terms And Conditions'),
+            'ThereAreNoItemsInYourCart' => $this->__('There are no items in your cart'),
+            'ThereIsNoAddressesForThisContact' => $this->__('There is no addresses for this contact'),
+            'ToExcludingTaxLabel' => $this->__('To excl. tax'),
+            'ToHighCustomValueDialogMessage' => $this->__('The custom amount value should not be higher than %s.'),
+            'ToIncludingTaxLabel' => $this->__('To incl. tax'),
+            'ToLowCustomValueDialogMessage' => $this->__('The custom amount value should not be lower than %s.'),
+            'TooBigValueMessage' => $this->__('The value is too big!'),
+            'TooLongTextDialogMessage' => $this->__('The length of the text in the %s field is too big. Please shorten the text.'),
+            'TotalsText' => $this->__('Totals'),
+            'TouchAndHoldToDeleteProduct' => $this->__('Touch and hold a product to delete from shopping cart'),
+            'TouchAndHoldToRevealOptions' => $this->__('Touch and hold a product to reveal more options'),
+            'TryAgain' => $this->__('Try Again'),
+            'Twitter' => $this->__('Twitter'),
+            'TwitterAuthorization' => $this->__('Twitter Authorization'),
+            'TwitterAutorization' => $this->__('Twitter Autorization'),
+            'TwitterPostFailedMessage' => $this->__('Twitter post failed...'),
+            'TwitterPostSuccess' => $this->__('Your tweet has been sent. Thanks for sharing this product on Twitter'),
+            'TypeTitle' => $this->__('Type'),
+            'URLOrCodeNotSet' => $this->__('Either remote URL or application code was not set. Please make sure you filled all the values and try again.'),
+            'UnknownException' => $this->__('Unknown error ocured. Please retry later'),
+            'UpdateCommentErrorMessage' => $this->__('Update Comment Error'),
+            'UpdatingCartProgressTitle' => $this->__('Updating Cart...'),
+            'UpdatingPullDownText' => $this->__('Updating ...'),
+            'UseBillingAddress' => $this->__('Use Billing Address'),
+            'UseBillingAddressForShipping' => $this->__('Use billing address for shipping'),
+            'Version' => $this->__('Version'),
+            'ViewCartButtonTitle' => $this->__('View Cart'),
+            'ViewDetailsTitle' => $this->__('View Details'),
+            'ViewGalleryTitle' => $this->__('View Gallery'),
+            'ViewWishlistButtonTitle' => $this->__('View Wishlist'),
+            'WaitTitle' => $this->__('Please wait...'),
+            'WebStoreAvailableOnly' => $this->__('Product only available on the website.'),
+            'WebsiteRestrictionEnabledMessage' => $this->__('Website is offline'),
+            'WishListUpdatedMessage' => $this->__('WishList Updated'),
+            'Wishlist' => $this->__('My Wishlist'),
+            'WishlistPopupTitle' => $this->__('Add To Wishlist'),
+            'WriteAReview' => $this->__('Write a review'),
+            'WriteReviewTitle' => $this->__('Write a Review'),
+            'WrongEmailFormat' => $this->__('Wrong email format'),
+            'XMLConnectURL' => $this->__('URL'),
+            'Yes' => $this->__('Yes'),
+            'iPhoneAddressBookNavigationBarTitle' => $this->__('Address Book'),
+            'labelPayWithCheckoutTitle' => $this->__('OR, Pay with Standard Checkout'),
+            'qtyLabelTitle' => $this->__('Quantity:')
+        );
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Adminhtml/Search/Catalog.php b/app/code/core/Mage/XmlConnect/Model/Adminhtml/Search/Catalog.php
new file mode 100644
index 00000000000..1a3b5c4e5a8
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Adminhtml/Search/Catalog.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Search Catalog Model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_Adminhtml_Search_Catalog extends Varien_Object
+{
+    /**
+     * Load search results
+     *
+     * @return Mage_XmlConnect_Model_Adminhtml_Search_Catalog
+     */
+    public function load()
+    {
+        $arr = array();
+
+        if (!$this->hasStart() || !$this->hasLimit() || !$this->hasQuery()) {
+            $this->setResults($arr);
+            return $this;
+        }
+
+        $collection = Mage::helper('catalogsearch')->getQuery()->getSearchCollection()
+            ->addAttributeToSelect('product_id')->addAttributeToSelect('name')->addAttributeToSelect('description')
+            ->addAttributeToSelect('image')->addSearchFilter($this->getQuery())->setCurPage($this->getStart())
+            ->setPageSize($this->getLimit())->load();
+
+        foreach ($collection as $product) {
+            $description = Mage::helper('core')->stripTags($product->getDescription());
+            $arr[] = array(
+                'id'            => 'product/1/' . $product->getId(),
+                'item_id'       => $product->getId(),
+                'type'          => Mage_XmlConnect_Model_ImageAction::ACTION_TYPE_PRODUCT,
+                'label'         => Mage::helper('adminhtml')->__('Product'),
+                'name'          => $product->getName(),
+                'image'         => $product->getImage(),
+                'description'   => Mage::helper('core/string')->substr($description, 0, 30),
+                'url' => Mage::helper('adminhtml')->getUrl('*/catalog_product/edit', array('id' => $product->getId())),
+            );
+        }
+        $this->setResults($arr);
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Adminhtml/Search/Category.php b/app/code/core/Mage/XmlConnect/Model/Adminhtml/Search/Category.php
new file mode 100644
index 00000000000..313e3aa47d1
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Adminhtml/Search/Category.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Search Category Model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_Adminhtml_Search_Category extends Varien_Object
+{
+    /**
+     * Load search results
+     *
+     * @return Mage_XmlConnect_Model_Adminhtml_Search_Category
+     */
+    public function load()
+    {
+        $arr = array();
+
+        if (!$this->hasStart() || !$this->hasLimit() || !$this->hasQuery()) {
+            $this->setResults($arr);
+            return $this;
+        }
+        /** @var $collection Mage_XmlConnect_Model_Resource_CategorySearch_Collection */
+        $collection = Mage::getResourceModel('xmlconnect/categorySearch_collection');
+        $collection->addAttributeToSelect('name')->addAttributeToSelect('description')
+            ->addSearchFilter($this->getQuery())->setCurPage($this->getStart())->setPageSize($this->getLimit())->load();
+
+        foreach ($collection as $category) {
+            $description = Mage::helper('core')->stripTags($category->getDescription());
+            $arr[] = array(
+                'id'          => 'category/1' . $category->getEntityId(),
+                'item_id'     => $category->getId(),
+                'type'        => Mage_XmlConnect_Model_ImageAction::ACTION_TYPE_CATEGORY,
+                'label'       => Mage::helper('adminhtml')->__('Category'),
+                'name'        => $category->getName(),
+                'image'       => null,
+                'description' => Mage::helper('core/string')->substr($description, 0, 30),
+                'url'         => Mage::helper('adminhtml')->getUrl('*/catalog_category/index'),
+            );
+        }
+        $this->setResults($arr);
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Adminhtml/System/Config/Backend/Currency/Default.php b/app/code/core/Mage/XmlConnect/Model/Adminhtml/System/Config/Backend/Currency/Default.php
index 87fe1183356..063f0c1731d 100644
--- a/app/code/core/Mage/XmlConnect/Model/Adminhtml/System/Config/Backend/Currency/Default.php
+++ b/app/code/core/Mage/XmlConnect/Model/Adminhtml/System/Config/Backend/Currency/Default.php
@@ -37,7 +37,7 @@ class Mage_XmlConnect_Model_Adminhtml_System_Config_Backend_Currency_Default
     /**
      * Update all applications "updated at" parameter with current date
      *
-     * @return this
+     * @return Mage_XmlConnect_Model_Adminhtml_System_Config_Backend_Currency_Default
      */
     protected function _afterSave()
     {
diff --git a/app/code/core/Mage/XmlConnect/Model/Application.php b/app/code/core/Mage/XmlConnect/Model/Application.php
index 969c3276191..87d5283f7c9 100644
--- a/app/code/core/Mage/XmlConnect/Model/Application.php
+++ b/app/code/core/Mage/XmlConnect/Model/Application.php
@@ -65,6 +65,8 @@ class Mage_XmlConnect_Model_Application extends Mage_Core_Model_Abstract
 
     /**
      * Device screen size name
+     *
+     * @deprecated will delete in the next version
      */
     const APP_SCREEN_SIZE_DEFAULT   = '320x480';
 
@@ -245,14 +247,38 @@ class Mage_XmlConnect_Model_Application extends Mage_Core_Model_Abstract
      */
     const DEPRECATED_CONFIG_FLAG                    = 'deprecated';
 
+    /**
+     * Pages config flag value
+     */
+    const STATIC_PAGE_CATEGORY                      = 'pages';
+
     /**
      * Delete on update paths for config data
      *
      * @var array
      */
-    protected $_deleteOnUpdateConfig    = array(
-        self::DEPRECATED_CONFIG_FLAG => 'native/pages'
-    );
+    protected $_deleteOnUpdateConfig = array(self::STATIC_PAGE_CATEGORY => 'staticpage');
+
+    /**
+     * Current device model
+     *
+     * @var Mage_XmlConnect_Model_Device_Abstract
+     */
+    protected $_deviceModel;
+
+    /**
+     * Image limits model
+     *
+     * @var Mage_XmlConnect_Model_ImageLimits
+     */
+    protected $_imageLimitsModel;
+
+    /**
+     * Image action model
+     *
+     * @var Mage_XmlConnect_Model_ImageAction
+     */
+    protected $_imageActionModel;
 
     /**
      * Initialize application
@@ -285,21 +311,20 @@ public function getIsSubmitted()
     public function getFormData()
     {
         $data = $this->getData();
-        $data = Mage::helper('xmlconnect')->getDeviceHelper()->checkImages($data);
         return $this->_flatArray($data);
     }
 
     /**
      * Load data (flat array) for Varien_Data_Form
      *
-     * @param array $subtree
+     * @param array $subTree
      * @param string $prefix
      * @return array
      */
-    protected function _flatArray($subtree, $prefix=null)
+    protected function _flatArray($subTree, $prefix=null)
     {
         $result = array();
-        foreach ($subtree as $key => $value) {
+        foreach ($subTree as $key => $value) {
             if (is_null($prefix)) {
                 $name = $key;
             } else {
@@ -428,26 +453,7 @@ public function getRenderConf()
             }
         }
 
-        /** @var $helperImage Mage_XmlConnect_Helper_Image */
-        $helperImage = Mage::helper('xmlconnect/image');
-        $paths = $helperImage->getInterfaceImagesPathsConf();
-
-        foreach ($paths as $confPath => $dataPath) {
-            $imageNodeValue =& $helperImage->findPath($result, $dataPath);
-
-            if (!$helperImage->checkAndGetImagePath($imageNodeValue)) {
-                /**
-                 * We set empty string to get default image if original was missing in some reason
-                 */
-                $imageNodeValue = '';
-            } else {
-                /**
-                 * Creating file ending (some_inner/some_dir/filename.png) For url
-                 */
-                $imageNodeValue = $helperImage->getFileCustomDirSuffixAsUrl($confPath, $imageNodeValue);
-            }
-        }
-        $result = $this->_absPath($result);
+        Mage::getModel('xmlconnect/images')->loadOldImageNodes($result);
 
         /**
          * General configuration
@@ -457,60 +463,59 @@ public function getRenderConf()
         $result['general']['currencyCode'] = Mage::app()->getStore($this->getStoreId())->getDefaultCurrencyCode();
         $result['general']['secureBaseUrl'] = $this->getSecureBaseUrl();
 
-        $maxRecipients  = 0;
-        $allowGuest     = 0;
+        $allowGuest = $maxRecipients = 0;
         if (Mage::getStoreConfig(Mage_Sendfriend_Helper_Data::XML_PATH_ENABLED)) {
-            $maxRecipients = Mage::getStoreConfig(Mage_Sendfriend_Helper_Data::XML_PATH_MAX_RECIPIENTS);
+            $maxRecipients = (int)Mage::getStoreConfig(Mage_Sendfriend_Helper_Data::XML_PATH_MAX_RECIPIENTS);
+            $maxRecipients = $maxRecipients > 0 ? $maxRecipients: 1;
             $allowGuest = Mage::getStoreConfig(Mage_Sendfriend_Helper_Data::XML_PATH_ALLOW_FOR_GUEST);
         }
         $result['general']['emailToFriendMaxRecepients'] = $maxRecipients;
         $result['general']['emailAllowGuest'] = $allowGuest;
-        $result['general']['primaryStoreLang'] = Mage::app()
-            ->getStore($this->getStoreId())->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_LOCALE);
+        $result['general']['primaryStoreLang'] = Mage::app()->getStore($this->getStoreId())
+            ->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_LOCALE);
         $result['general']['magentoVersion'] = Mage::getVersion();
-        $result['general']['copyright'] = Mage::getStoreConfig(
-            self::XML_PATH_DESIGN_FOOTER_COPYRIGHT, $this->getStoreId()
+        $result['general']['copyright'] = Mage::helper('core')->stripTags(
+            Mage::getStoreConfig(self::XML_PATH_DESIGN_FOOTER_COPYRIGHT, $this->getStoreId())
         );
         $result['general']['xmlconnectVersion'] = Mage::getConfig()->getNode(self::XML_PATH_MODULE_VERSION);
 
-        $result['general']['isAllowedGuestCheckout'] = (int)Mage::getSingleton('checkout/session')
-            ->getQuote()->isAllowedGuestCheckout();
+        $result['general']['isAllowedGuestCheckout'] = (int)Mage::getSingleton('checkout/session')->getQuote()
+            ->isAllowedGuestCheckout();
 
         /**
          * Check is guest can post product reviews
          */
-        if (Mage::helper('review')->getIsGuestAllowToWrite()) {
-            $result['general']['isAllowedGuestReview'] = '1';
-        } else {
-            $result['general']['isAllowedGuestReview'] = '0';
-        }
+        $result['general']['isAllowedGuestReview'] = Mage::helper('review')->getIsGuestAllowToWrite() ? '1' : '0';
 
         /**
         * Check is wishlist enabled in a config
         */
-        if (Mage::getStoreConfigFlag('wishlist/general/active')) {
-            $result['general']['wishlistEnable'] = '1';
-        } else {
-            $result['general']['wishlistEnable'] = '0';
-        }
+        $result['general']['wishlistEnable'] = Mage::getStoreConfigFlag('wishlist/general/active') ? '1' : '0';
 
         /**
          * "Use Secure URLs in Frontend" flag
          */
         $result['general']['useSecureURLInFrontend'] = $this->getUseSecureURLInFrontend();
 
+        /**
+         * Set flag is allowed guest checkout if quote contain downloadable product(s)
+         */
+        if ($this->isGuestBuyDownloadableProduct()) {
+            $result['general']['isAllowedGuestCheckoutForDownloadableProducts'] = '0';
+        } else {
+            $result['general']['isAllowedGuestCheckoutForDownloadableProducts'] = '1';
+        }
+
         /**
          * Is enabled Store credit functionality
          */
+        $isStoreCreditEnable = $canShowHistoryFlag = 0;
         if (is_object(Mage::getConfig()->getNode('modules/Enterprise_CustomerBalance'))) {
             $storeCreditFlag = Mage::getStoreConfig(Enterprise_CustomerBalance_Helper_Data::XML_PATH_ENABLED);
             $isStoreCreditEnable = (int)$storeCreditFlag;
-            $canShowHistoryFlag = (int) Mage::getStoreConfigFlag(
-                'customer/enterprise_customerbalance/show_history'
-            );
-        } else {
-            $isStoreCreditEnable = $canShowHistoryFlag = 0;
+            $canShowHistoryFlag = (int)Mage::getStoreConfigFlag('customer/enterprise_customerbalance/show_history');
         }
+
         $result['general']['isStoreCreditEnabled'] = $isStoreCreditEnable;
         $result['general']['isStoreCreditHistoryEnabled'] = $canShowHistoryFlag;
 
@@ -536,6 +541,15 @@ public function getRenderConf()
 
         $paypalMeclIsAvailable = Mage::getModel('xmlconnect/payment_method_paypal_mecl')->isAvailable(null);
 
+        /**
+         * Pages configuration
+         */
+        $pages = Mage::getSingleton('xmlconnect/configuration')->getDeviceStaticPages();
+
+        if (!empty($pages)) {
+            $result['pages'] = $pages;
+        }
+
         /**
          * PayPal Mobile Express Library Checkout
          */
@@ -564,6 +578,18 @@ public function getSecureBaseUrl()
         return Mage::getStoreConfig(self::XML_PATH_SECURE_BASE_LINK_URL, $this->getStoreId());
     }
 
+    /**
+     * Check is allowed guest checkout if quote contain downloadable product(s)
+     *
+     * @return bool
+     */
+    public function isGuestBuyDownloadableProduct()
+    {
+        return (bool)Mage::getStoreConfigFlag(
+            Mage_Downloadable_Model_Observer::XML_PATH_DISABLE_GUEST_CHECKOUT, $this->getStoreId()
+        );
+    }
+
     /**
      * Is forced front secure url
      *
@@ -582,21 +608,20 @@ public function getUseSecureURLInFrontend()
     public function getScreenSize()
     {
         if (!isset($this->_data['screen_size'])) {
-            $this->_data['screen_size'] = self::APP_SCREEN_SIZE_DEFAULT;
+            $this->_data['screen_size'] = $this->getDeviceModel()->getDefaultScreenSize();
         }
         return $this->_data['screen_size'];
     }
 
     /**
-     * Setter
-     * for current screen_size parameter
+     * Setter for current screen_size parameter
      *
      * @param string $screenSize
-     * @return this
+     * @return Mage_XmlConnect_Model_Application
      */
     public function setScreenSize($screenSize)
     {
-        $this->_data['screen_size'] = Mage::helper('xmlconnect/image')->filterScreenSize((string) $screenSize);
+        $this->_data['screen_size'] = $screenSize;
         return $this;
     }
 
@@ -616,21 +641,21 @@ public function getEnabledTabsArray()
     /**
      * Change URLs to absolute
      *
-     * @param array $subtree
+     * @param array $subTree
      * @return array
      */
-    protected function _absPath($subtree)
+    protected function _absPath($subTree)
     {
-        foreach ($subtree as $key => $value) {
+        foreach ($subTree as $key => $value) {
             if (!empty($value)) {
                 if (is_array($value)) {
-                    $subtree[$key] = $this->_absPath($value);
+                    $subTree[$key] = $this->_absPath($value);
                 } elseif (strtolower(substr($key, -4)) == 'icon' || strtolower(substr($key, -5)) == 'image') {
-                    $subtree[$key] = Mage::getBaseUrl('media') . 'xmlconnect/' . $value;
+                    $subTree[$key] = Mage::getBaseUrl('media') . 'xmlconnect/' . $value;
                 }
             }
         }
-        return $subtree;
+        return $subTree;
     }
 
     /**
@@ -640,8 +665,8 @@ protected function _absPath($subtree)
      */
     public function getPages()
     {
-        if (isset($this->_data['conf']['native']['pages'])) {
-            return $this->_data['conf']['native']['pages'];
+        if (isset($this->_data['conf']['pages'])) {
+            return $this->_data['conf']['pages'];
         }
         return array();
     }
@@ -656,6 +681,17 @@ public function getConfigModel()
         return $this->_configModel;
     }
 
+    /**
+     * Set last updated datetime string
+     *
+     * @return Mage_XmlConnect_Model_Application
+     */
+    protected function _renewUpdatedAtTime()
+    {
+        $this->setUpdatedAt(Mage::getSingleton('core/date')->gmtDate());
+        return $this;
+    }
+
     /**
      * Processing object before save data
      *
@@ -663,7 +699,7 @@ public function getConfigModel()
      */
     protected function _beforeSave()
     {
-        $this->setUpdatedAt(Mage::getSingleton('core/date')->gmtDate());
+        $this->_renewUpdatedAtTime();
         return $this;
     }
 
@@ -761,7 +797,6 @@ protected function _loadConfigData()
             'application_id' => $this->getId(),
             'category' => 'payment'
         ))->toOptionArray();
-
         $this->setData('config_data', $configuration);
         return $this;
     }
@@ -788,6 +823,7 @@ private function _loadDeprecatedConfig()
      * Convert old config data array
      *
      * @deprecated  Serialized config storage has been removed
+     * @throws Mage_Core_Exception
      * @param  $config
      * @return array
      */
@@ -797,9 +833,7 @@ protected function _convertConfig($config)
         foreach ($config as $values) {
             foreach ($values as $path => $value) {
                 if (preg_match('@[^\w\/]@', $path)) {
-                    Mage::throwException(
-                        Mage::helper('xmlconnect')->__('Unsupported character in path: "%s"', $path)
-                    );
+                    Mage::throwException(Mage::helper('xmlconnect')->__('Unsupported character in path: "%s"', $path));
                 }
                 $keyArray = explode('/', $path);
                 $keys = '$result["' . implode('"]["', $keyArray) . '"]';
@@ -865,9 +899,7 @@ public function getImages()
     {
         $images = array();
         $params = $this->getLastParams();
-        $deviceImages = Mage::helper('xmlconnect')
-            ->getDeviceHelper()
-            ->getSubmitImages();
+        $deviceImages = Mage::helper('xmlconnect')->getDeviceHelper()->getSubmitImages();
 
         foreach ($deviceImages as $id) {
             $path = $this->getData('conf/submit/'.$id);
@@ -963,9 +995,9 @@ public function validateSubmit($params)
      */
     protected function _validateConf()
     {
-        $conf   = $this->getConf();
-        $native = isset($conf['native']) && is_array($conf['native']) ? $conf['native'] : false;
-        $errors = Mage::helper('xmlconnect')->getDeviceHelper($this)->validateConfig($native);
+        $config   = $this->getConf();
+        $native = isset($config['native']) && is_array($config['native']) ? $config['native'] : false;
+        $errors = array();
 
         foreach ($this->_socialNetValidationArray as $networkKey) {
             if (isset($native['socialNetworking'][$networkKey]['isActive'])
@@ -1098,7 +1130,7 @@ public function getActivationKey()
      */
     public function updateAllAppsUpdatedAtParameter()
     {
-        $this->_getResource()->updateAllAppsUpdatedAtParameter();
+        $this->_renewUpdatedAtTime()->_getResource()->updateUpdatedAtParameter($this);
         return $this;
     }
 
@@ -1184,4 +1216,90 @@ public function setDeleteOnUpdateConfig(array $pathsToDelete)
         $this->_deleteOnUpdateConfig = array_merge($this->_deleteOnUpdateConfig, $pathsToDelete);
         return $this;
     }
+
+    /**
+     * Get current device model
+     *
+     * @return Mage_XmlConnect_Model_Device_Abstract
+     */
+    public function getDeviceModel()
+    {
+        if (null === $this->_deviceModel) {
+            $this->setDeviceModel();
+        }
+        return $this->_deviceModel;
+    }
+
+    /**
+     * Set current device model
+     *
+     * @throws Mage_Core_Exception
+     * @param Mage_XmlConnect_Model_Device_Abstract|null $deviceModel
+     * @return Mage_XmlConnect_Model_Application
+     */
+    public function setDeviceModel($deviceModel = null)
+    {
+        if ($deviceModel instanceof Mage_XmlConnect_Model_Device_Abstract) {
+            $this->_deviceModel = $deviceModel;
+        } elseif ($this->getType()) {
+            $this->_deviceModel = Mage::getModel('xmlconnect/device_' . $this->getType(), $this);
+        } else {
+            Mage::throwException(Mage::helper('xmlconnect')->__('Device doesn\'t recognized'));
+        }
+        return $this;
+    }
+
+    /**
+     * Get current image limit model
+     *
+     * @return Mage_XmlConnect_Model_ImageLimits
+     */
+    public function getImageLimitsModel()
+    {
+        if ($this->_imageLimitsModel === null) {
+            $this->setImageLimitsModel();
+        }
+        return $this->_imageLimitsModel;
+    }
+
+    /**
+     * Set current image limit model
+     *
+     * @param null|Mage_XmlConnect_Model_ImageLimits $imageLimitsModel
+     * @return Mage_XmlConnect_Model_Application
+     */
+    public function setImageLimitsModel($imageLimitsModel = null)
+    {
+        if (null === $imageLimitsModel) {
+            $this->_imageLimitsModel = Mage::getModel('xmlconnect/imageLimits', $this);
+        } else {
+            $this->_imageLimitsModel = $imageLimitsModel;
+        }
+        return $this;
+    }
+
+    /**
+     * Get image action model
+     *
+     * @return Mage_XmlConnect_Model_ImageAction
+     */
+    public function getImageActionModel()
+    {
+        if (null === $this->_imageActionModel) {
+            $this->_imageActionModel = Mage::getModel('xmlconnect/imageAction', $this);
+        }
+        return $this->_imageActionModel;
+    }
+
+    /**
+     * Set image action model
+     *
+     * @param Mage_XmlConnect_Model_ImageAction $imageActionModel
+     * @return Mage_XmlConnect_Model_Application
+     */
+    public function setImageActionModel($imageActionModel)
+    {
+        $this->_imageActionModel = $imageActionModel;
+        return $this;
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Model/Catalog/Category/Image.php b/app/code/core/Mage/XmlConnect/Model/Catalog/Category/Image.php
index 52766753e03..4e0db947b3d 100644
--- a/app/code/core/Mage/XmlConnect/Model/Catalog/Category/Image.php
+++ b/app/code/core/Mage/XmlConnect/Model/Catalog/Category/Image.php
@@ -34,7 +34,7 @@
 class Mage_XmlConnect_Model_Catalog_Category_Image extends Mage_Catalog_Model_Product_Image
 {
     /**
-     * Set filenames for base file and new file
+     * Set file names for base file and new file
      *
      * @param string $file
      * @return Mage_Catalog_Model_Product_Image
@@ -76,8 +76,9 @@ public function setBaseFile($file)
                 } else {
                     $baseDir = Mage::getDesign()->getSkinBaseDir(array('_theme' => 'default'));
                     if (!file_exists($baseDir . $file)) {
-                        $baseDir = Mage::getDesign()
-                            ->getSkinBaseDir(array('_theme' => 'default', '_package' => 'base'));
+                        $baseDir = Mage::getDesign()->getSkinBaseDir(
+                            array('_theme' => 'default', '_package' => 'base')
+                        );
                     }
                 }
             }
@@ -93,18 +94,22 @@ public function setBaseFile($file)
         $this->_baseFile = $baseFile;
 
         // build new filename (most important params)
-        $path = array(Mage::getSingleton('xmlconnect/catalog_category_media_config')->getBaseMediaPath(), 'cache',
-            Mage::app()->getStore()->getId(), $path[] = $this->getDestinationSubdir()
-        );
+        $path = array(Mage::getSingleton('xmlconnect/catalog_category_media_config')->getBaseMediaPath(),
+            'cache', Mage::app()->getStore()->getId(), $path[] = $this->getDestinationSubdir());
+
         if ((!empty($this->_width)) || (!empty($this->_height))) {
             $path[] = "{$this->_width}x{$this->_height}";
         }
 
         // add misk params as a hash
-        $miscParams = array(($this->_keepAspectRatio  ? '' : 'non') . 'proportional',
-            ($this->_keepFrame ? '' : 'no') . 'frame', ($this->_keepTransparency ? '' : 'no') . 'transparency',
-            ($this->_constrainOnly ? 'do' : 'not')  . 'constrainonly', $this->_rgbToString($this->_backgroundColor),
-            'angle' . $this->_angle, 'quality' . $this->_quality
+        $miscParams = array(
+            ($this->_keepAspectRatio  ? '' : 'non') . 'proportional',
+            ($this->_keepFrame        ? '' : 'no')  . 'frame',
+            ($this->_keepTransparency ? '' : 'no')  . 'transparency',
+            ($this->_constrainOnly ? 'do' : 'not')  . 'constrainonly',
+            $this->_rgbToString($this->_backgroundColor),
+            'angle' . $this->_angle,
+            'quality' . $this->_quality
         );
 
         // if has watermark add watermark params to hash
@@ -124,11 +129,23 @@ public function setBaseFile($file)
         return $this;
     }
 
+    /**
+     * Set new file
+     *
+     * @param string $filePath
+     * @return Mage_XmlConnect_Model_Catalog_Category_Image
+     */
+    public function setNewFile($filePath)
+    {
+        $this->_newFile = $filePath;
+        return $this;
+    }
+
     /**
      * Get relative watermark file path
      * or false if file not found
      *
-     * @return string | bool
+     * @return string|bool
      */
     protected function _getWatermarkFilePath()
     {
diff --git a/app/code/core/Mage/XmlConnect/Model/ConfigData.php b/app/code/core/Mage/XmlConnect/Model/ConfigData.php
index 8e9a73a093a..4b035a4004c 100644
--- a/app/code/core/Mage/XmlConnect/Model/ConfigData.php
+++ b/app/code/core/Mage/XmlConnect/Model/ConfigData.php
@@ -73,8 +73,8 @@ protected function _construct()
      * Create an array: application id with a prefix as key and
      * configuration data as value
      *
-     * @param  $applicationId
-     * @param  $configData
+     * @param int $applicationId
+     * @param array $configData
      * @return array
      */
     protected function _assignConfig($applicationId, $configData)
@@ -91,7 +91,7 @@ protected function _assignConfig($applicationId, $configData)
      * - array('config/path/param' => 'value')
      * if key doesn't have a separator category will be set as default
      *
-     * @param  $configuration posted data array
+     * @param array $configuration posted data array
      * @return array configuration data array
      */
     protected function _prepareData($configuration)
@@ -112,7 +112,7 @@ protected function _prepareData($configuration)
     /**
      * Prepare and set configuration data
      *
-     * @param  $applicationId
+     * @param int $applicationId
      * @param array $configData
      * @param bool $replace
      * @return Mage_XmlConnect_Model_ConfigData
@@ -132,10 +132,10 @@ public function setConfigData($applicationId, array $configData, $replace = true
     /**
      * Get configuration data
      *
-     * @param bool $applicationId
+     * @param int $applicationId
      * @return array
      */
-    public function getConfigData($applicationId = false)
+    public function getConfigData($applicationId = 0)
     {
         if ($applicationId && isset($this->_configuration[self::CONFIG_PREFIX . $applicationId])) {
             return $this->_configuration[self::CONFIG_PREFIX . $applicationId];
@@ -163,7 +163,7 @@ public function initSaveConfig()
     /**
      * Save configuration data by given params
      *
-     * @param  $applicationId
+     * @param int $applicationId
      * @param array $configData
      * @param string $category
      * @return Mage_XmlConnect_Model_ConfigData
@@ -202,14 +202,126 @@ public function setDeleteOnUpdate(array $pathsToDelete)
     }
 
     /**
-     * @param  $applicationId
+     * Delete group of records those have to be deleted with update process
+     *
+     * @param int $applicationId
      * @return Mage_XmlConnect_Model_ConfigData
      */
     protected function _deleteOnUpdate($applicationId)
     {
         foreach ($this->_deleteOnUpdate as $category => $path) {
-            $this->getResource()->deleteConfig($applicationId, $category, $path);
+            $this->deleteConfig($applicationId, $category, $path, true);
         }
         return $this;
     }
+
+    /**
+     * Delete config record
+     *
+     * @param int $applicationId
+     * @param string $category
+     * @param string $path
+     * @param bool $pathLike
+     * @return Mage_XmlConnect_Model_ConfigData
+     */
+    public function deleteConfig($applicationId, $category = '', $path = '', $pathLike = false)
+    {
+        $this->getResource()->deleteConfig($applicationId, $category, $path, $pathLike);
+        return $this;
+    }
+
+    /**
+     * Load Configuration data by filter params
+     *
+     * @param int $applicationId
+     * @param string $category
+     * @param string $path
+     * @param bool $pathLike
+     * @return array
+     */
+    public function loadApplicationData($applicationId, $category = '', $path = '', $pathLike = true)
+    {
+        /** @var $collection Mage_XmlConnect_Model_Resource_ConfigData_Collection */
+        $collection = $this->getCollection();
+        $collection->addApplicationIdFilter($applicationId);
+
+        if ($category) {
+            $collection->addCategoryFilter($category);
+        }
+
+        if ($path) {
+            $collection->addPathFilter($path, $pathLike);
+        }
+
+        return $collection->toOptionArray();
+    }
+
+    /**
+     * Load configuration node value
+     *
+     * @param int $applicationId
+     * @param string $category
+     * @param string $path
+     * @return mixed
+     */
+    public function loadScalarValue($applicationId, $category, $path)
+    {
+        /** @var $collection Mage_XmlConnect_Model_Resource_ConfigData_Collection */
+        $collection = $this->getCollection();
+        $collection->addApplicationIdFilter($applicationId);
+
+        if ($category) {
+            $collection->addCategoryFilter($category);
+        }
+
+        if ($path) {
+            $collection->addPathFilter($path, false);
+        }
+
+        return ($result = $collection->fetchItem()) ? $result->getValue() : null;
+    }
+
+    /**
+     * Update old pages records in database
+     * For data upgrade usage only
+     *
+     * @see data upgrade file: mysql4-data-upgrade-1.6.0.0-1.6.0.0.1.php
+     * @param array $records
+     * @return null
+     */
+    public function pagesUpgradeOldConfig($records)
+    {
+        $newConfig = array();
+        /** @var $applicationModel Mage_XmlConnect_Model_Application */
+        $applicationModel = Mage::getModel('xmlconnect/application');
+        $deprecatedFlag = Mage_XmlConnect_Model_Application::DEPRECATED_CONFIG_FLAG;
+
+        foreach ($records as $applicationId) {
+            /** @var $applicationModel Mage_XmlConnect_Model_Application */
+            $applicationModel->load($applicationId);
+            $configData = $this->loadApplicationData($applicationId);
+
+            foreach ($configData[$deprecatedFlag] as $deprecatedConfigKey => $deprecatedConfigValue) {
+                $pagesConfigPath = 'native/pages/';
+                if (strpos($deprecatedConfigKey, $pagesConfigPath) !== false) {
+                    $pagePath = substr($deprecatedConfigKey, strlen($pagesConfigPath));
+                    list($id, $type) = explode('/', $pagePath);
+                    $newConfig[$id][$type] = $deprecatedConfigValue;
+
+                    $this->deleteConfig($applicationId, $deprecatedFlag, $deprecatedConfigKey);
+                }
+            }
+
+            foreach ($newConfig as $id => $page) {
+                if (empty($page['label']) || empty($page['id'])) {
+                    continue;
+                }
+                $path = 'staticpage/' . $id;
+
+                $this->getResource()->saveConfig(
+                    $applicationId, Mage_XmlConnect_Model_Application::STATIC_PAGE_CATEGORY, $path, serialize($page)
+                );
+            }
+        }
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Model/Configuration.php b/app/code/core/Mage/XmlConnect/Model/Configuration.php
new file mode 100644
index 00000000000..29d1c2dd691
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Configuration.php
@@ -0,0 +1,271 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Application configuration model
+ *
+ * @category    Mage
+ * @package     Mage_Xmlconnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_Configuration extends Mage_Core_Model_Abstract
+{
+    /**
+     * Admin application config flag for is active param
+     */
+    const CONFIG_PATH_AA_SETTINGS = 'xmlconnect/admin_app/settings';
+
+    /**
+     * Core config data collection
+     *
+     * @var Mage_Core_Model_Resource_Config_Data_Collection
+     */
+    protected $_configDataCollection;
+
+    /**
+     * XmlConnect data collection
+     *
+     * @var Mage_XmlConnect_Model_Resource_ConfigData_Collection
+     */
+    protected $_configConnectDataCollection;
+
+    /**
+     * Core config model
+     *
+     * @var Mage_Core_Model_Config
+     */
+    protected $_configDataModel;
+
+    /**
+     * Admin application settings
+     *
+     * @var array
+     */
+    protected $_adminApplicationSettings;
+
+    /**
+     * Application model
+     *
+     * @var Mage_XmlConnect_Model_Application
+     */
+    protected $_applicationModel;
+
+    /**
+     * Get is active admin application flag
+     *
+     * @return bool
+     */
+    public function isActiveAdminApp()
+    {
+        $isActiveSetting = $this->_getAdminApplicationSettings(
+            Mage_XmlConnect_Model_Configuration::CONFIG_PATH_AA_SETTINGS . '/is_active'
+        );
+        return $isActiveSetting ? (bool)$isActiveSetting['value'] : false;
+    }
+
+    /**
+     * Save is active admin application param
+     *
+     * @param int $isActive
+     * @return Mage_XmlConnect_Model_Configuration
+     */
+    public function saveIsActiveAdminApp($isActive)
+    {
+        $this->_getConfigDataModel()->saveConfig(
+            Mage_XmlConnect_Model_Configuration::CONFIG_PATH_AA_SETTINGS . '/is_active', (int)$isActive
+        );
+        return $this;
+    }
+
+    /**
+     * Get admin application settings data
+     *
+     * @param null|string $path to config node
+     * @return array
+     */
+    protected function _getAdminApplicationSettings($path = null)
+    {
+        if (null === $this->_adminApplicationSettings) {
+            $adminApplicationSettings = $this->_getConfigDataCollection()
+                    ->addPathFilter(self::CONFIG_PATH_AA_SETTINGS)
+                    ->getData();
+
+            foreach ($adminApplicationSettings as $setting) {
+                $this->_adminApplicationSettings[$setting['path']] = $setting;
+            }
+        }
+
+        if ($path !== null && isset($this->_adminApplicationSettings[$path])) {
+            return $this->_adminApplicationSettings[$path];
+        } else {
+            return $this->_adminApplicationSettings;
+        }
+    }
+
+    /**
+     * Get core config data collection
+     *
+     * @return Mage_Core_Model_Resource_Config_Data_Collection
+     */
+    protected function _getConfigDataCollection()
+    {
+        if (null === $this->_configDataCollection) {
+            $this->_configDataCollection = Mage::getModel('core/resource_config_data_collection');
+        } else {
+            $this->_configDataCollection->clear()->getSelect()->reset();
+        }
+        return $this->_configDataCollection;
+    }
+
+    /**
+     * Get core config data model
+     *
+     * @return Mage_Core_Model_Config
+     */
+    protected function _getConfigDataModel()
+    {
+        if (null === $this->_configDataModel) {
+            $this->_configDataModel = Mage::getModel('core/config');
+        }
+        return $this->_configDataModel;
+    }
+
+    /**
+     * Get device static pages
+     *
+     * @return array
+     */
+    public function getDeviceStaticPages()
+    {
+        return $this->_getConfigDataByCategory(Mage_XmlConnect_Model_Application::STATIC_PAGE_CATEGORY, true);
+    }
+
+    /**
+     * Get previous localization hash from storage
+     *
+     * @return string|null
+     */
+    public function getPreviousLocalizationHash()
+    {
+        $localizationHashSetting = $this->_getAdminApplicationSettings(
+            Mage_XmlConnect_Model_Configuration::CONFIG_PATH_AA_SETTINGS . '/localization_hash'
+        );
+        return $localizationHashSetting ? $localizationHashSetting['value'] : null;
+
+    }
+
+    /**
+     * Save localization hash in configuration storage
+     *
+     * @param string $hash
+     * @return Mage_XmlConnect_Model_Configuration
+     */
+    public function setPreviousLocalizationHash($hash)
+    {
+        $this->_getConfigDataModel()->saveConfig(
+            Mage_XmlConnect_Model_Configuration::CONFIG_PATH_AA_SETTINGS . '/localization_hash', $hash
+        );
+        return $this;
+    }
+
+    /**
+     * Get xmlconnect saved config data by category
+     *
+     * @param string $category
+     * @param bool $unSerialize
+     * @return array
+     */
+    protected function _getConfigDataByCategory($category = null, $unSerialize = false)
+    {
+        $configuration = $this->_getConnectConfigDataCollection()->addArrayFilter(array(
+            'application_id' => $this->getApplicationModel()->getId(),
+            'category' => $category,
+        ))->toOptionArray();
+        if (!empty($configuration)) {
+            return $this->_formatConfigData($configuration[$category], $unSerialize, $category);
+        } else {
+            return array();
+        }
+    }
+
+    /**
+     * Format config data
+     *
+     * @param array $configuration
+     * @param bool $unSerialize
+     * @return array
+     */
+    protected function _formatConfigData($configuration, $unSerialize = false)
+    {
+        $result = array();
+        foreach ($configuration as $node => $values) {
+            if ($unSerialize) {
+                $values = unserialize($values);
+            }
+            $result[$node] = $values;
+        }
+        return $result;
+    }
+
+    /**
+     * Get xmlconnect config data collection
+     *
+     * @return Mage_Core_Model_Resource_Config_Data_Collection
+     */
+    protected function _getConnectConfigDataCollection()
+    {
+        if (null === $this->_configConnectDataCollection) {
+            $this->_configConnectDataCollection = Mage::getModel('xmlconnect/resource_configData_collection');
+        } else {
+            $this->_configConnectDataCollection->clear()->getSelect()->reset(Zend_Db_Select::WHERE);
+        }
+        return $this->_configConnectDataCollection;
+    }
+
+    /**
+     * Get application model
+     *
+     * @return Mage_XmlConnect_Model_Application
+     */
+    public function getApplicationModel()
+    {
+        if (null === $this->_applicationModel) {
+            $this->setApplicationModel();
+        }
+        return $this->_applicationModel;
+    }
+
+    /**
+     * Set application model
+     *
+     * @return Mage_XmlConnect_Model_Configuration
+     */
+    public function setApplicationModel()
+    {
+        $this->_applicationModel = Mage::helper('xmlconnect')->getApplication();
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Device/Abstract.php b/app/code/core/Mage/XmlConnect/Model/Device/Abstract.php
new file mode 100644
index 00000000000..48a2100122e
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Device/Abstract.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect Abstract device model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+abstract class Mage_XmlConnect_Model_Device_Abstract extends Mage_Core_Model_Abstract
+{
+    /**
+     * Icon image type
+     */
+    const IMAGE_TYPE_ICON = 'icon';
+
+    /**
+     * Icon image type count
+     */
+    const IMAGE_TYPE_ICON_COUNT = 1;
+
+    /**
+     * Banner image type count
+     */
+    const IMAGE_TYPE_BANNER_COUNT = 5;
+
+    /**
+     * Background image count
+     */
+    const IMAGE_TYPE_BACKGROUND_COUNT = 1;
+
+    /**
+     * Application model
+     *
+     * @var Mage_XmlConnect_Model_Application
+     */
+    protected $_applicationModel;
+
+    /**
+     * Image size configuration that is the same for all devices
+     *
+     * @var array
+     */
+    protected $_defaultSizeConfiguration = array(
+        'content' => array(
+            'product_small'         => 70,
+            'product_big'           => 130,
+            'category'              => 80,
+            'product_gallery_small' => 40
+        ),
+        'tabBar' => array(
+            'home' => array('icon' => array('width' => 35, 'height' => 35)),
+            'shop' => array('icon' => array('width' => 35, 'height' => 35)),
+            'search' => array('icon' => array('width' => 35, 'height' => 35)),
+            'cart' => array('icon' => array('width' => 35, 'height' => 35)),
+            'more' => array('icon' => array('width' => 35, 'height' => 35))
+        )
+    );
+
+    /**
+     * Initialize model
+     *
+     * @param null|Mage_XmlConnect_Model_Application $applicationModel
+     */
+    public function __construct($applicationModel = null)
+    {
+        $this->_setApplicationModel($applicationModel);
+    }
+
+    /**
+     * Return image size configuration for device
+     *
+     * @return array
+     */
+    abstract protected function _getImageSizeConfiguration();
+
+    /**
+     * Get application model
+     *
+     * @return Mage_XmlConnect_Model_Application
+     */
+    protected function _getApplicationModel()
+    {
+        if (null !== $this->_applicationModel) {
+            $this->setApplicationModel(Mage::helper('xmlconnect')->getApplication());
+        }
+        return $this->_applicationModel;
+    }
+
+    /**
+     * Set application model
+     *
+     * @param null|Mage_XmlConnect_Model_Application $applicationModel
+     * @return Mage_XmlConnect_Model_Device_Abstract
+     */
+    protected function _setApplicationModel($applicationModel = null)
+    {
+        if ($applicationModel instanceof Mage_XmlConnect_Model_Application) {
+            $this->_applicationModel = $applicationModel;
+        } else {
+            $this->_applicationModel = Mage::helper('xmlconnect')->getApplication();
+        }
+        return $this;
+    }
+
+    /**
+     * Return default configuration
+     *
+     * @return array
+     */
+    protected function _getDefaultSizeConfiguration()
+    {
+        return $this->_defaultSizeConfiguration;
+    }
+
+    /**
+     * Get image size configuration for current device
+     *
+     * @return array
+     */
+    public function getImageSizeConfig()
+    {
+        if (function_exists('array_replace_recursive')) {
+            return array_replace_recursive($this->_getDefaultSizeConfiguration(), $this->_getImageSizeConfiguration());
+        } else {
+            return $this->_arrayReplaceRecursive(
+                $this->_getDefaultSizeConfiguration(), $this->_getImageSizeConfiguration()
+            );
+        }
+    }
+
+    /**
+     * Replaces elements from passed arrays into the first array recursively
+     * Analog of array_replace_recursive()
+     *
+     * @param array $base
+     * @param array $replacements
+     * @return array
+     */
+    protected function _arrayReplaceRecursive(array $base, array $replacements)
+    {
+        foreach ($replacements as $key => $value) {
+            if (!isset($base[$key]) || (isset($base[$key]) && !is_array($base[$key]))) {
+                $base[$key] = array();
+            }
+
+            // overwrite the value in the base array
+            if (is_array($value)) {
+                $value = $this->_arrayReplaceRecursive($base[$key], $value);
+            }
+            $base[$key] = $value;
+        }
+        return $base;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Device/Android.php b/app/code/core/Mage/XmlConnect/Model/Device/Android.php
new file mode 100644
index 00000000000..2f7d39b609e
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Device/Android.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect Android device model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_Device_Android extends Mage_XmlConnect_Model_Device_Abstract
+{
+    /**
+     * Banner image type
+     */
+    const IMAGE_TYPE_PORTRAIT_BANNER = 'android_portrait_banner';
+
+    /**
+     * Android default screen size
+     */
+    const SCREEN_SIZE_DEFAULT   = '480x800';
+
+    /**
+     * Android default scale used for calculation rate
+     */
+    const DEFAULT_SCALE = 480;
+
+    /**
+     * Android preview banner width
+     */
+    const PREVIEW_BANNER_WIDTH = 320;
+
+    /**
+     * Android preview banner image height
+     */
+    const PREVIEW_BANNER_HEIGHT = 258;
+
+    /**
+     * Device specific image size configuration
+     *
+     * @var array
+     */
+    protected $_imageSizeConfiguration = array(
+        self::IMAGE_TYPE_ICON => array('width' => 53, 'height' => 53),
+        self::IMAGE_TYPE_PORTRAIT_BANNER => array('width' => 480, 'height' => 387),
+        'content' => array('product_gallery_big' => 840),
+    );
+
+    /**
+     * Initialize model
+     *
+     * @param null|Mage_XmlConnect_Model_Application $applicationModel
+     */
+    public function __construct($applicationModel = null)
+    {
+        parent::__construct($applicationModel);
+    }
+
+    /**
+     * Get Android default screen size
+     *
+     * @return string
+     */
+    public function getDefaultScreenSize()
+    {
+        return self::SCREEN_SIZE_DEFAULT;
+    }
+
+    /**
+     * Get Android default scale
+     *
+     * @return int
+     */
+    public function getDefaultScaleValue()
+    {
+        return self::DEFAULT_SCALE;
+    }
+
+    /**
+     * Return image size configuration for device
+     *
+     * @return array
+     */
+    protected function _getImageSizeConfiguration()
+    {
+        return $this->_imageSizeConfiguration;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Device/Ipad.php b/app/code/core/Mage/XmlConnect/Model/Device/Ipad.php
new file mode 100644
index 00000000000..361c66c1be6
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Device/Ipad.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect iPad device model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_Device_Ipad extends Mage_XmlConnect_Model_Device_Abstract
+{
+    /**
+     * Portrait banner image type
+     */
+    const IMAGE_TYPE_PORTRAIT_BANNER = 'ipad_portrait_banner';
+
+    /**
+     * Landscape banner image type
+     */
+    const IMAGE_TYPE_LANDSCAPE_BANNER = 'ipad_landscape_banner';
+
+    /**
+     * Portrait background image type
+     */
+    const IMAGE_TYPE_PORTRAIT_BACKGROUND = 'ipad_portrait_background';
+
+    /**
+     * Landscape background image type
+     */
+    const IMAGE_TYPE_LANDSCAPE_BACKGROUND = 'ipad_landscape_background';
+
+    /**
+     * Ipad landscape orientation identificator
+     */
+    const ORIENTATION_LANDSCAPE = 'landscape';
+
+    /**
+     * Ipad portrait orientation identificator
+     */
+    const ORIENTATION_PORTRAIT = 'portrait';
+
+    /**
+     * Ipad portrait preview banner widht
+     */
+    const PREVIEW_PORTRAIT_BANNER_WIDTH = 350;
+
+    /**
+     * Ipad portrait preview banner image height
+     */
+    const PREVIEW_PORTRAIT_BANNER_HEIGHT = 135;
+
+    /**
+     * Ipad landscape preview banner width
+     */
+    const PREVIEW_LANDSCAPE_BANNER_WIDTH = 467;
+
+    /**
+     * Ipad landscape preview banner image height
+     */
+    const PREVIEW_LANDSCAPE_BANNER_HEIGHT = 157;
+
+    /**
+     * Ipad landscape orientation preview image width
+     */
+    const PREVIEW_LANDSCAPE_BACKGROUND_WIDTH = 467;
+
+    /**
+     * Ipad landscape orientation preview image height
+     */
+    const PREVIEW_LANDSCAPE_BACKGROUND_HEIGHT = 321;
+
+    /**
+     * Ipad portrait orientation preview image width
+     */
+    const PREVIEW_PORTRAIT_BACKGROUND_WIDTH = 350;
+
+    /**
+     * Ipad portrait orientation preview image height
+     */
+    const PREVIEW_PORTRAIT_BACKGROUND_HEIGHT = 438;
+
+    /**
+     * Ipad default scale used for calculation rate
+     */
+    const DEFAULT_SCALE = 768;
+
+    /**
+     * Ipad default screen size
+     */
+    const SCREEN_SIZE_DEFAULT   = '768x1024';
+
+    /**
+     * Device specific image size configuration
+     *
+     * @var array
+     */
+    protected $_imageSizeConfiguration = array(
+        self::IMAGE_TYPE_ICON => array('width' => 35, 'height' => 35),
+        self::IMAGE_TYPE_PORTRAIT_BANNER => array('width' => 768, 'height' => 294),
+        self::IMAGE_TYPE_LANDSCAPE_BANNER => array('width' => 1024, 'height' => 344),
+        self::IMAGE_TYPE_PORTRAIT_BACKGROUND => array('width' => 768, 'height' => 960),
+        self::IMAGE_TYPE_LANDSCAPE_BACKGROUND => array('width' => 1024, 'height' => 704),
+        'content' => array(
+            'product_small' => 210,
+            'product_big' => 400,
+            'category' => 243,
+            'product_gallery_big' => 1288,
+        ),
+    );
+
+    /**
+     * Initialize model
+     *
+     * @param null|Mage_XmlConnect_Model_Application $applicationModel
+     */
+    public function __construct($applicationModel = null)
+    {
+        parent::__construct($applicationModel);
+    }
+
+    /**
+     * Get iPad default screen size
+     *
+     * @return string
+     */
+    public function getDefaultScreenSize()
+    {
+        return self::SCREEN_SIZE_DEFAULT;
+    }
+
+    /**
+     * Get iPad default scale
+     *
+     * @return int
+     */
+    public function getDefaultScaleValue()
+    {
+        return self::DEFAULT_SCALE;
+    }
+
+    /**
+     * Return image size configuration for device
+     *
+     * @return array
+     */
+    protected function _getImageSizeConfiguration()
+    {
+        return $this->_imageSizeConfiguration;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Device/Iphone.php b/app/code/core/Mage/XmlConnect/Model/Device/Iphone.php
new file mode 100644
index 00000000000..7842d8c3393
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Device/Iphone.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect iPhone device model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_Device_Iphone extends Mage_XmlConnect_Model_Device_Abstract
+{
+    /**
+     * Portrait banner image type
+     */
+    const IMAGE_TYPE_PORTRAIT_BANNER = 'iphone_portrait_banner';
+
+    /**
+     * Portrait background image type
+     */
+    const IMAGE_TYPE_PORTRAIT_BACKGROUND = 'iphone_portrait_background';
+
+    /**
+     * iPhone default scale used for calculation rate
+     */
+    const DEFAULT_SCALE = 320;
+
+    /**
+     * iPhone default screen size
+     */
+    const SCREEN_SIZE_DEFAULT   = '320x480';
+
+    /**
+     * Portrait preview banner width
+     */
+    const PREVIEW_PORTRAIT_BANNER_WIDTH = '320';
+
+    /**
+     * Portrait preview banner height
+     */
+    const PREVIEW_PORTRAIT_BANNER_HEIGHT = '230';
+
+    /**
+     * Device specific image size configuration
+     *
+     * @var array
+     */
+    protected $_imageSizeConfiguration = array(
+        self::IMAGE_TYPE_ICON => array('width' => 35, 'height' => 35),
+        self::IMAGE_TYPE_PORTRAIT_BANNER => array('width' => 320, 'height' => 230),
+        self::IMAGE_TYPE_PORTRAIT_BACKGROUND => array('width' => 320, 'height' => 367),
+        'content' => array('product_gallery_big' => 560),
+    );
+
+    /**
+     * Initialize model
+     *
+     * @param null|Mage_XmlConnect_Model_Application $applicationModel
+     */
+    public function __construct($applicationModel = null)
+    {
+        parent::__construct($applicationModel);
+    }
+
+    /**
+     * Get iPhone default screen size
+     *
+     * @return string
+     */
+    public function getDefaultScreenSize()
+    {
+        return self::SCREEN_SIZE_DEFAULT;
+    }
+
+    /**
+     * Get iPhone default scale
+     *
+     * @return int
+     */
+    public function getDefaultScaleValue()
+    {
+        return self::DEFAULT_SCALE;
+    }
+
+    /**
+     * Return image size configuration for device
+     *
+     * @return array
+     */
+    protected function _getImageSizeConfiguration()
+    {
+        return $this->_imageSizeConfiguration;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/ImageAction.php b/app/code/core/Mage/XmlConnect/Model/ImageAction.php
new file mode 100644
index 00000000000..48e14126281
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/ImageAction.php
@@ -0,0 +1,321 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect Images model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_ImageAction extends Mage_Core_Model_Abstract
+{
+
+    /**
+     * Default image action configuration category
+     */
+    const IMAGE_ACTION_CATEGORY_DEFAULT = 'image_action';
+
+    /**
+     * CMS action type
+     */
+    const ACTION_TYPE_CMS = 'cms';
+
+    /**
+     * Product action type
+     */
+    const ACTION_TYPE_PRODUCT = 'product';
+
+    /**
+     * Category action type
+     */
+    const ACTION_TYPE_CATEGORY = 'category';
+
+    /**
+     * Image action types
+     *
+     * @var array
+     */
+    protected $_imageActionTypes = array(self::ACTION_TYPE_CMS, self::ACTION_TYPE_PRODUCT, self::ACTION_TYPE_CATEGORY);
+
+    /**
+     * Required image action fields separated by action type
+     *
+     * @var array
+     */
+    protected $_requiredImageActionFields = array(
+        self::ACTION_TYPE_CMS => array('action_type','image_id', 'entity_action', 'entity_name'),
+        self::ACTION_TYPE_PRODUCT => array('action_type', 'image_id', 'entity_action', 'entity_name'),
+        self::ACTION_TYPE_CATEGORY => array('action_type', 'image_id', 'entity_action', 'entity_name')
+    );
+
+    /**
+     * Image action config path template
+     *
+     * @var string
+     */
+    protected $_imageActionConfigPathTemplate = 'image_id/%d/app_id/%d';
+
+    /**
+     * Image action data to save
+     *
+     * @var array
+     */
+    protected $_currentImageActionData;
+
+    /**
+     * Application model
+     *
+     * @var Mage_XmlConnect_Model_Application
+     */
+    protected $_applicationModel;
+
+    /**
+     * Initialize model
+     *
+     * @param null|Mage_XmlConnect_Model_Application $applicationModel
+     */
+    public function __construct($applicationModel = null)
+    {
+        $this->_setApplicationModel($applicationModel);
+    }
+
+    /**
+     * Set application model
+     *
+     * @param Mage_XmlConnect_Model_Application $applicationModel
+     * @return Mage_XmlConnect_Model_Device_Abstract
+     */
+    protected function _setApplicationModel($applicationModel = null)
+    {
+        if ($applicationModel instanceof Mage_XmlConnect_Model_Application) {
+            $this->_applicationModel = $applicationModel;
+        } else {
+            $this->_applicationModel = Mage::helper('xmlconnect')->getApplication();
+        }
+        return $this;
+    }
+
+    /**
+     * Get application model
+     *
+     * @return Mage_XmlConnect_Model_Application
+     */
+    protected function _getApplicationModel()
+    {
+        if (null === $this->_applicationModel) {
+            $this->setApplicationModel(Mage::helper('xmlconnect')->getApplication());
+        }
+        return $this->_applicationModel;
+    }
+
+
+    /**
+     * Save image action info
+     *
+     * @param array $imageData
+     * @param string $category
+     * @return Mage_XmlConnect_Model_Device_Abstract
+     */
+    public function saveImageAction($imageData, $category = self::IMAGE_ACTION_CATEGORY_DEFAULT)
+    {
+        $this->_setCurrentImageActionData(null)->_validateImagePrepareActionData($imageData);
+        $actionData = $this->getCurrentImageActionData();
+        $configPath = $this->_createImageActionConfigPath($actionData['image_id']);
+        $this->_getApplicationModel()->getConfigModel()->saveConfig($this->_getApplicationModel()->getId(),
+            array($configPath => serialize($actionData)), $category);
+        return $this;
+    }
+
+    /**
+     * Validate image action by action type and prepare data for save
+     *
+     * @throws Mage_Core_Exception
+     * @param array $imageData
+     * @return bool
+     */
+    protected  function _validateImagePrepareActionData($imageData)
+    {
+        if (isset($imageData['action_type']) && in_array($imageData['action_type'], $this->_imageActionTypes)) {
+            if ($imageData['action_type'] == self::ACTION_TYPE_CMS) {
+                $imageData['entity_name'] = Mage::getModel('cms/page')->load($imageData['entity_action'])->getTitle();
+            }
+            $result = array();
+            foreach ($this->_requiredImageActionFields[$imageData['action_type']] as $requiredField) {
+                if (empty($imageData[$requiredField])) {
+                    Mage::throwException(Mage::helper('xmlconnect')->__('%s fields is required', $requiredField));
+                }
+                $result[$requiredField] = $imageData[$requiredField];
+            }
+            $this->_setCurrentImageActionData($result);
+            return true;
+        } else {
+            Mage::throwException(Mage::helper('xmlconnect')->__('Action type does\'t recognized'));
+            return false;
+        }
+    }
+
+    /**
+     * Create image action config path
+     *
+     * @param int $imageId
+     * @return string
+     */
+    protected function _createImageActionConfigPath($imageId)
+    {
+        return sprintf($this->_imageActionConfigPathTemplate, $imageId, $this->_getApplicationModel()->getId());
+    }
+
+    /**
+     * Set image action data
+     *
+     * @param mixed $data
+     * @return Mage_XmlConnect_Model_Device_Abstract
+     */
+    protected function _setCurrentImageActionData($data)
+    {
+        $this->_currentImageActionData = $data;
+        return $this;
+    }
+
+    /**
+     * Action data for currently saved image
+     *
+     * @return array
+     */
+    public function getCurrentImageActionData()
+    {
+        return $this->_currentImageActionData;
+    }
+
+    /**
+     * Get image action data
+     *
+     * @param int $imageId
+     * @return mixed
+     */
+    public function getImageActionData($imageId)
+    {
+        $imageActionConfigData = $this->_getApplicationModel()->getConfigModel()->loadScalarValue(
+            $this->_getApplicationModel()->getId(),
+            self::IMAGE_ACTION_CATEGORY_DEFAULT,
+            $this->_createImageActionConfigPath($imageId)
+        );
+        $imageActionData = $imageActionConfigData ? unserialize($imageActionConfigData) : $imageActionConfigData;
+        return $this->_checkImageActionData($imageActionData);
+    }
+
+    /**
+     * Check image action data
+     *
+     * @throws Mage_Core_Exception
+     * @param array $imageActionData
+     * @return mixed
+     */
+    protected function _checkImageActionData($imageActionData)
+    {
+        if (empty($imageActionData)) {
+            return;
+        }
+        $storeId = Mage::app()->getStore()->getId();
+        switch ($imageActionData['action_type']) {
+            case self::ACTION_TYPE_CMS:
+                $page = Mage::getModel('cms/page')->setStoreId($storeId)
+                    ->load($imageActionData['entity_action'], 'identifier');
+                if (!$page->getId() && $storeId == Mage_Core_Model_App::ADMIN_STORE_ID) {
+                    $this->deleteAction($imageActionData['image_id']);
+                    return;
+                } elseif ($page->getId()) {
+                    $imageActionData['entity_name'] = $page->getTitle();
+                }
+            break;
+            case self::ACTION_TYPE_CATEGORY:
+                $category = Mage::getModel('catalog/category')->load($imageActionData['entity_action']);
+                if (!$category->getId()) {
+                    $this->deleteAction($imageActionData['image_id']);
+                    return;
+                } elseif ($category->getIsActive() == 0 && Mage_Core_Model_App::ADMIN_STORE_ID != $storeId) {
+                    return;
+                } else {
+                    $imageActionData['entity_name'] = $category->getName();
+                }
+            break;
+            case self::ACTION_TYPE_PRODUCT:
+                $product = Mage::getModel('catalog/product')->load($imageActionData['entity_action']);
+                if (!$product->getId()) {
+                    $this->deleteAction($imageActionData['image_id']);
+                    return;
+                } elseif ($product->getStatus() == Mage_Catalog_Model_Product_Status::STATUS_DISABLED
+                    && Mage_Core_Model_App::ADMIN_STORE_ID != $storeId
+                ) {
+                    return;
+                } else {
+                    $imageActionData['entity_name'] = $product->getName();
+                }
+            break;
+            default:
+                Mage::throwException($this->__('Action type doesn\'t recognized.'));
+                break;
+        }
+        return $imageActionData;
+    }
+
+    /**
+     * Delete Image action
+     *
+     * @param int $imageId
+     * @return Mage_XmlConnect_Model_ImageAction
+     */
+    public function deleteAction($imageId)
+    {
+        $this->_getApplicationModel()->getConfigModel()->deleteConfig($this->_getApplicationModel()->getId(),
+            self::IMAGE_ACTION_CATEGORY_DEFAULT, $this->_createImageActionConfigPath($imageId));
+        return $this;
+    }
+
+    /**
+     * Save images new order
+     *
+     * @param array $imagesOrderData
+     * @param string $type
+     * @return Mage_XmlConnect_Model_ImageAction
+     */
+    public function saveImageOrder($imagesOrderData, $type)
+    {
+        if (empty($imagesOrderData)) {
+            return $this;
+        }
+        /** @var $imagesModel Mage_XmlConnect_Model_Images */
+        $imagesModel = Mage::getModel('xmlconnect/images');
+        foreach ($imagesOrderData as $imageId => $imageOrder) {
+            $imagesModel->load($imageId);
+            if ($imagesModel->getImageId()) {
+                $imagesModel->setOrder($imageOrder)->save();
+            }
+        }
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/ImageLimits.php b/app/code/core/Mage/XmlConnect/Model/ImageLimits.php
new file mode 100644
index 00000000000..1d4af7b0ce9
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/ImageLimits.php
@@ -0,0 +1,366 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect Image Limits model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_ImageLimits extends Mage_Core_Model_Abstract
+{
+    /**
+     * Screen size update type glue
+     */
+    const SCREEN_SIZE_UPDATE_TYPE_GLUE = '_';
+
+    /**
+     * Screen size glue
+     */
+    const SCREEN_SIZE_GLUE = 'x';
+
+    /**
+     * Maximum allowed screen sizes
+     */
+    const MAX_ALLOWED_SCREEN_SIZES = 2560;
+
+    /**
+     * Current screen size
+     *
+     * @var string
+     */
+    protected $_screenSize;
+
+    /**
+     * Current screen rate
+     *
+     * @var float
+     */
+    protected $_screenRate;
+
+    /**
+     * Update type
+     *
+     * @var string
+     */
+    protected $_updateType;
+
+    /**
+     * Screen size image limits array
+     *
+     * @var array
+     */
+    protected $_imageLimits = array();
+
+    /**
+     * Screen size config update model
+     *
+     * @var Mage_XmlConnect_Model_ImageLimits_Abstract
+     */
+    protected $_sizeModel;
+
+    /**
+     * Application model
+     *
+     * @var Mage_XmlConnect_Model_Application
+     */
+    protected $_applicationModel;
+
+    /**
+     * Initialize model
+     *
+     * @param null|Mage_XmlConnect_Model_Application $applicationModel
+     */
+    public function __construct($applicationModel = null)
+    {
+        parent::_construct();
+        $this->_setApplicationModel($applicationModel)->_setScreenSize()->_initSizeModel();
+    }
+
+    /**
+     * Set application model
+     *
+     * @param Mage_XmlConnect_Model_Application $applicationModel
+     * @return Mage_XmlConnect_Model_Device_Abstract
+     */
+    protected function _setApplicationModel($applicationModel = null)
+    {
+        if ($applicationModel instanceof Mage_XmlConnect_Model_Application) {
+            $this->_applicationModel = $applicationModel;
+        } else {
+            $this->_applicationModel = Mage::helper('xmlconnect')->getApplication();
+        }
+        return $this;
+    }
+
+    /**
+     * Get application model
+     *
+     * @return Mage_XmlConnect_Model_Application
+     */
+    protected function _getApplicationModel()
+    {
+        if (null === $this->_applicationModel) {
+            $this->setApplicationModel(Mage::helper('xmlconnect')->getApplication());
+        }
+        return $this->_applicationModel;
+    }
+
+    /**
+     * Do steps to set current screen size and image limits configuration
+     *
+     * @param string $screenSize
+     * @return Mage_XmlConnect_Model_ImageLimits
+     */
+    protected function _doUpdateConfig($screenSize = '')
+    {
+        $this->_setScreenSize($screenSize)->_initSizeModel()->_afterCalculate();
+        return $this;
+    }
+
+    /**
+     * Set screen current screen siz
+     *
+     * @param string $screenSize
+     * @return Mage_XmlConnect_Model_ImageLimits
+     */
+    protected function _setScreenSize($screenSize = '')
+    {
+        /** @var $applicationModel Mage_XmlConnect_Model_Application */
+        $applicationModel = Mage::helper('xmlconnect')->getApplication();
+        if (!$screenSize) {
+            $screenSize = $applicationModel->getScreenSize();
+        }
+
+        if (isset($this->_imageLimits[$screenSize])) {
+            return $this;
+        }
+
+        $screenSizeExplodeArray = explode(self::SCREEN_SIZE_UPDATE_TYPE_GLUE, $screenSize);
+        switch (count($screenSizeExplodeArray)) {
+            case 2:
+                $this->_updateType = $screenSizeExplodeArray[1];
+            case 1:
+                $this->_screenSize = $screenSizeExplodeArray[0];
+                break;
+            default:
+                $this->_screenSize = $applicationModel->getScreenSize();
+                break;
+        }
+        $this->_checkMaximumAllowedSize();
+        return $this;
+    }
+
+    /**
+     * Check maximum allowed screen size for devices
+     *
+     * @throws Mage_Core_Exception
+     * @return Mage_XmlConnect_Model_ImageLimits
+     */
+    protected function _checkMaximumAllowedSize()
+    {
+        $screenSizeArray = explode(self::SCREEN_SIZE_GLUE, $this->_screenSize);
+        if (count($screenSizeArray) != 2 || $screenSizeArray[0] > self::MAX_ALLOWED_SCREEN_SIZES
+            || $screenSizeArray[1] > self::MAX_ALLOWED_SCREEN_SIZES
+        ) {
+            Mage::throwException(Mage::helper('xmlconnect')->__('Screen resolution is not supported'));
+        }
+        return $this;
+    }
+
+    /**
+     * Init image limit configuration model
+     *
+     * @throws Mage_Core_Exception
+     * @return Mage_XmlConnect_Model_ImageLimits
+     */
+    protected function _initSizeModel()
+    {
+        $defaultScreenSize = $this->_getApplicationModel()->getDeviceModel()->getDefaultScreenSize();
+
+        if ($this->_screenSize && $this->_screenSize != $defaultScreenSize) {
+            if (!$this->getSizeModel()) {
+                $modelClass = Mage::getConfig()->getModelClassName('xmlconnect/imageLimits_' . $this->_screenSize);
+                if (class_exists($modelClass, false) || mageFindClassFile($modelClass)) {
+                    $sizeModel = Mage::getModel('xmlconnect/imageLimits_' . $this->_screenSize, $this->_updateType);
+                    $this->setSizeModel($sizeModel);
+                }
+            }
+            $this->_calculateImageLimits()->_afterCalculate();
+        } else {
+            $this->_setScreenSize($defaultScreenSize)->_setDefaultSizeModel();
+        }
+        return $this;
+    }
+
+    /**
+     * Set default image size model
+     *
+     * @return Mage_XmlConnect_Model_ImageLimits
+     */
+    protected function _setDefaultSizeModel()
+    {
+        $defaultSizeModel = $this->_getApplicationModel()->getDeviceModel();
+        $this->_imageLimits[$this->_screenSize] = $defaultSizeModel->getImageSizeConfig();
+        return $this;
+    }
+
+    /**
+     * After calculate image limits screen size update
+     *
+     * @return Mage_XmlConnect_Model_ImageLimits
+     */
+    protected  function _afterCalculate()
+    {
+        if (isset($this->_imageLimits[$this->_screenSize])) {
+            return $this;
+        }
+        $this->_imageLimits[$this->_screenSize] = $this->getSizeModel()->getScreenSizeConfig();
+        return $this;
+    }
+
+    /**
+     * Calculate image limits for current screen size
+     *
+     * @return Mage_XmlConnect_Model_ImageLimits
+     */
+    protected  function _calculateImageLimits()
+    {
+        $defaultSizeModel = $this->_getApplicationModel()->getDeviceModel();
+        $sizeModel = $this->getSizeModel();
+
+        $updatedConfiguration = $this->_calculateImageRate()->_updateConfigByRate(
+            $defaultSizeModel->getImageSizeConfig()
+        );
+
+        if (!$sizeModel) {
+            $this->_imageLimits[$this->_screenSize] = $updatedConfiguration;
+        } else {
+            $sizeModel->setConfig($updatedConfiguration);
+        }
+        return $this;
+    }
+
+    /**
+     * Calculate image rate
+     *
+     * @return Mage_XmlConnect_Model_ImageLimits
+     */
+    protected function _calculateImageRate()
+    {
+        $defaultScaleValue = $this->_getApplicationModel()->getDeviceModel()->getDefaultScaleValue();
+
+        list($width, $height) = explode(self::SCREEN_SIZE_GLUE, $this->_screenSize);
+        // Calculate rate for current resolution
+        $this->_screenRate = min($width, $height) / $defaultScaleValue;
+
+        return $this;
+    }
+
+    /**
+     * Update image limits based on device default screen size
+     *
+     * @param array $defaultValues
+     * @return array
+     */
+    protected function _updateConfigByRate($defaultValues)
+    {
+        foreach ($defaultValues as $key => $value) {
+            if (is_array($value)) {
+                $defaultValues[$key] = $this->_updateConfigByRate($value);
+            } else {
+                $defaultValues[$key] = round($value * $this->_screenRate);
+            }
+        }
+        return $defaultValues;
+    }
+
+    /**
+     * Get screen size config update model
+     *
+     * @return Mage_XmlConnect_Model_ImageLimits_Abstract
+     */
+    public function getSizeModel()
+    {
+        return $this->_sizeModel;
+    }
+
+    /**
+     * Set screen size config update model
+     *
+     * @param object $sizeModel
+     * @return Mage_XmlConnect_Model_ImageLimits
+     */
+    public function setSizeModel($sizeModel)
+    {
+        $this->_sizeModel = $sizeModel;
+        return $this;
+    }
+
+    /**
+     * Get image limits config
+     *
+     * @return array
+     */
+    public function getImageLimits()
+    {
+        return $this->_imageLimits;
+    }
+
+    /**
+     * Set image limits config
+     *
+     * @param array $imageLimits
+     * @return Mage_XmlConnect_Model_ImageLimits
+     */
+    public function setImageLimits($imageLimits)
+    {
+        $this->_imageLimits = $imageLimits;
+        return $this;
+    }
+
+    /**
+     * Get image limits by type
+     *
+     * @param string $key
+     * @param null|string $index
+     * @param string $screenSize
+     * @return mixed
+     */
+    public function getImageLimitsByType($key = '', $index = null, $screenSize = '')
+    {
+        if ($screenSize && !isset($this->_imageLimits[$screenSize])) {
+            $this->_doUpdateConfig($screenSize);
+        }
+
+        $this->setData($this->_imageLimits[$this->_screenSize]);
+        $result = $this->getData($key, $index);
+        $this->unsetData();
+
+        return $result;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/ImageLimits/Abstract.php b/app/code/core/Mage/XmlConnect/Model/ImageLimits/Abstract.php
new file mode 100644
index 00000000000..b49392072c0
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/ImageLimits/Abstract.php
@@ -0,0 +1,295 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect Abstract Image Limit model for screen size resolution config
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+abstract class Mage_XmlConnect_Model_ImageLimits_Abstract extends Mage_Core_Model_Abstract
+{
+    /**
+     * Default update type
+     *
+     * @var array
+     */
+    protected $_defaultUpdateType = array();
+
+    /**
+     * Current update params (based on a current screen size)
+     *
+     * @var array
+     */
+    protected $_currentUpdate = array();
+
+    /**
+     * Current configuration
+     *
+     * @var array
+     */
+    protected $_configuration = array();
+
+    /**
+     * Config updated flag
+     *
+     * @var bool
+     */
+    protected $_configUpdatedFlag = false;
+
+    /**
+     * Initialize resource model
+     *
+     * @param string $updateType
+     */
+    public function __construct($updateType)
+    {
+        $this->_setCurrentUpdate($updateType)->_setDefaultConfig();
+    }
+
+    /**
+     * Set default configuration params for current device
+     *
+     * @return Mage_XmlConnect_Model_ImageLimits_Abstract
+     */
+    protected function _setDefaultConfig()
+    {
+        $deviceModel = Mage::helper('xmlconnect')->getApplication()->getDeviceModel();
+        $this->_configuration = $deviceModel->getImageSizeConfig();
+        return $this;
+    }
+
+    /**
+     * Set configuration for current device
+     *
+     * @param array $data
+     * @return Mage_XmlConnect_Model_ImageLimits_Abstract
+     */
+    public function setConfig($data)
+    {
+        $this->_configuration = $data;
+        return $this;
+    }
+
+    /**
+     * Set update type
+     *
+     * @param string $updateType
+     * @return Mage_XmlConnect_Model_ImageLimits_Abstract
+     */
+    protected function _setCurrentUpdate($updateType)
+    {
+        if (isset($this->{'_' . $updateType . 'UpdateType'})) {
+            $this->_currentUpdate = $this->{'_' . $updateType . 'UpdateType'};
+        } else {
+            $this->_currentUpdate = $this->_defaultUpdateType;
+        }
+        return $this;
+    }
+
+    /**
+     * Get config for current screen size
+     *
+     * @return array
+     */
+    public function getScreenSizeConfig()
+    {
+        if (!$this->_isConfigUpdated()) {
+            $this->_doUpdateConfig();
+            $this->_configUpdatedFlag = true;
+        }
+        return $this->_configuration;
+    }
+
+    /**
+     * Update config for current screen size
+     *
+     * @return array
+     */
+    protected function _doUpdateConfig()
+    {
+        if (!$this->_currentUpdate) {
+            return $this->_configuration;
+        }
+
+        foreach ($this->_currentUpdate as $function => $params) {
+            $this->_doFunctionUpdate($function, $params);
+        }
+
+        return $this->_configuration;
+    }
+
+    /**
+     * Update config using custom update function
+     *
+     * @param string $function
+     * @param array $params
+     * @return Mage_XmlConnect_Model_ImageLimits_Abstract
+     */
+    protected function _doFunctionUpdate($function, $params)
+    {
+        foreach ($params as $param) {
+            $data = $param['data'];
+            $path = $param['path'];
+
+            $target =& $this->findPath($this->_configuration, $path);
+            switch ($function) {
+                case 'zoom':
+                    if (is_array($target)) {
+                        array_walk_recursive($target, array($this, '_zoom'), $data);
+                    } else {
+                        $this->_zoom($target, null, $data);
+                    }
+                    break;
+                case 'update':
+                    $this->_update($target, $data);
+                    break;
+                case 'insert':
+                    $this->_insert($target, $data, false);
+                    break;
+                case 'insert_force':
+                    $this->_insert($target, $data);
+                    break;
+                case 'delete':
+                    $this->_delete($target, $data);
+                    break;
+                default:
+                    break;
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Get config updated flag state
+     *
+     * @return bool
+     */
+    protected function _isConfigUpdated()
+    {
+        return $this->_configUpdatedFlag;
+    }
+
+    /**
+     * Return reference to the $path in $array
+     *
+     * @param array &$array
+     * @param string $path
+     * @return mixed reference
+     */
+    public function &findPath(&$array, $path)
+    {
+        $target =& $array;
+        if ($path !== '/') {
+            $pathArray = explode('/', $path);
+            foreach ($pathArray as $node) {
+                if (is_array($target) && isset($target[$node])) {
+                    $target =& $target[$node];
+                } else {
+                    return null;
+                }
+            }
+        }
+        return $target;
+    }
+
+    /**
+     * Insert value(s) in array
+     *
+     * @param mixed &$target old value(s)
+     * @param mixed $data new value(s)
+     * @param bool $force
+     * @return null
+     */
+    protected function _insert(&$target, $data, $force = true)
+    {
+        if (is_array($target) && is_array($data)) {
+            foreach ($data as $key => $val) {
+                if (!$force && isset($target[$key])) {
+                    continue;
+                }
+                $target[$key] = $val;
+            }
+        }
+    }
+
+    /**
+     * Update array value(s) by reference
+     *
+     * @param mixed &$target old value(s)
+     * @param mixed $data new value(s)
+     * @return null
+     */
+    protected function _update(&$target, $data)
+    {
+        if (is_array($target) && is_array($data)) {
+                $data = array_intersect_key($data, $target);
+                foreach ($data as $key => $val) {
+                    $target[$key] = $val;
+                }
+        } elseif (is_array($target)) {
+            foreach ($target as $key => $val) {
+                $target[$key] = $data;
+            }
+        } elseif ($target) {
+            $target = $data;
+        }
+    }
+
+    /**
+     * Delete given key(s) from array
+     *
+     * @param array &$item
+     * @param string|array $value items to delete
+     * @return null
+     */
+    protected function _delete(&$item, $value)
+    {
+        if (is_array($value)) {
+            foreach ($value as $keyToDelete) {
+                unset($item[$keyToDelete]);
+            }
+            return;
+        }
+        unset($item[$value]);
+    }
+
+    /**
+     * Multiply given $item by $value if it's a string
+     *
+     * @param mixed &$item (argument to change)
+     * @param mixed $key (used with array_walk_recursive function as a key of given array)
+     * @param string $value (contains float)
+     * @return null
+     */
+    protected function _zoom(&$item, $key, $value)
+    {
+        if (is_scalar($item)) {
+            $item = (int) round($item * $value);
+        }
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Images.php b/app/code/core/Mage/XmlConnect/Model/Images.php
new file mode 100644
index 00000000000..b2c77a3f8bb
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Images.php
@@ -0,0 +1,551 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect Images model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_Images extends Mage_Core_Model_Abstract
+{
+    /**
+     * Array of required submit data
+     *
+     * @var array
+     */
+    protected $_requiredSubmitData = array('application_id', 'image_type', 'order');
+
+    /**
+     * Initialize resource model
+     */
+    protected function _construct()
+    {
+        $this->_init('xmlconnect/images');
+        parent::_construct();
+    }
+
+    /**
+     * Delete item and repair order of images
+     *
+     * @return Mage_XmlConnect_Model_Images
+     */
+    public function deleteAndRepairOrder()
+    {
+        Mage::helper('xmlconnect')->getApplication()->getImageActionModel()->deleteAction($this->getId());
+        $this->delete()->_deleteImageFiles($this->getImageFile())->getResource()->repairOrder($this);
+        return $this;
+    }
+
+    /**
+     * Delete image action
+     *
+     * @return Mage_XmlConnect_Model_Images
+     */
+    public function deleteImageAction()
+    {
+        Mage::helper('xmlconnect')->getApplication()->getImageActionModel()->deleteAction($this->getId());
+        return $this;
+    }
+
+    /**
+     * Remove all image files
+     *
+     * @param string $imageFile
+     * @param bool $deleteOriginal
+     * @return Mage_XmlConnect_Model_Images
+     */
+    protected function _deleteImageFiles($imageFile, $deleteOriginal = true)
+    {
+        $convertedImageFile = $this->_convertFileExtensionToPng($imageFile);
+        $ioAdapter = new Varien_Io_File();
+        $baseImageDir = Mage::helper('xmlconnect/image')->getMediaPath('custom');
+        if (is_dir($baseImageDir)) {
+            $dirArray = array_diff(scandir($baseImageDir), array('.', '..'));
+            foreach ($dirArray as $item) {
+                if (!is_dir($baseImageDir . DS . $item)) {
+                    continue;
+                }
+                $ioAdapter->rm($baseImageDir . DS . $item . DS . basename($convertedImageFile));
+            }
+        }
+        if ($deleteOriginal) {
+            $ioAdapter->rm(self::getBasePath() . DS . basename($imageFile));
+        }
+        return $this;
+    }
+
+    /**
+     * Check image type
+     *
+     * @param string $type
+     * @return Mage_XmlConnect_Model_Images
+     */
+    public function checkType($type = '')
+    {
+        if ($type) {
+            $this->setImageType($type);
+        }
+
+        if (!$this->getImageType()) {
+            Mage::throwException(Mage::helper('xmlconnect')->__('Image type is required.'));
+        }
+        return $this;
+    }
+
+    /**
+     * Get image count for image type
+     *
+     * @param string $type
+     * @return int
+     */
+    public function getImageCount($type = '')
+    {
+        if (!$type) {
+            $type = $this->getImageType();
+        }
+        return Mage::helper('xmlconnect')->getDeviceHelper()->getImageCount($type);
+    }
+
+    /**
+     * Check is application record exists
+     *
+     * @param int $appId
+     * @return Mage_XmlConnect_Model_Images
+     */
+    public function checkApplication($appId = 0)
+    {
+        if (!$appId) {
+            $appId = $this->getApplicationId();
+        }
+
+        $appModel = Mage::getModel('xmlconnect/application')->load($appId);
+        if (!$appModel->getId()) {
+            Mage::throwException(Mage::helper('xmlconnect')->__('Application doesn\'t exist.'));
+        }
+        return $this;
+    }
+
+    /**
+     * Validate submit data
+     *
+     * @param array $data
+     * @return Mage_XmlConnect_Model_Images
+     */
+    public function validateAndSetSubmitData($data)
+    {
+        foreach ($this->_requiredSubmitData as $submitValue) {
+            if (empty($data[$submitValue])) {
+                Mage::throwException(Mage::helper('xmlconnect')->__('Image %s is required.', $submitValue));
+            } else {
+                $this->setData($submitValue, $data[$submitValue]);
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Retrieve Base files path
+     *
+     * @param string $filePath
+     * @return string
+     */
+    public static function getBasePath($filePath = '')
+    {
+        if ($filePath && strpos($filePath, DS) !== 0) {
+            $filePath = DS . $filePath;
+        }
+        return Mage::getBaseDir('media') . DS . 'xmlconnect' . DS . 'original' . $filePath;
+    }
+
+    /**
+     * Get original image url
+     *
+     * @param string $image
+     * @return string
+     */
+    public function getImageUrl($image = '')
+    {
+        if ($image && strpos($image, '/') !== 0) {
+            $image = '/' . $image;
+        }
+
+        return Mage::getBaseUrl('media') . 'xmlconnect/original' . $image;
+    }
+
+    /**
+     * Get device image array by type
+     *
+     * @param string $type
+     * @param int $limit
+     * @param int $offset
+     * @return array
+     */
+    public function getDeviceImagesByType($type, $limit = null, $offset = null)
+    {
+        if (!$this->getApplicationId()) {
+            $this->setApplicationId(Mage::helper('xmlconnect')->getApplicationId());
+        }
+        return $this->getCollection()->addApplicationToFilter($this->getApplicationId())->addImageTypeToFilter($type)
+            ->setPositionOrder()->setLimit($limit, $offset)->getData();
+    }
+
+    /**
+     * Get device image by type
+     *
+     * @param string $type
+     * @return array|bool
+     */
+    public function getImageItemByType($type)
+    {
+        if (!$this->getApplicationId()) {
+            $this->setApplicationId(Mage::helper('xmlconnect')->getApplicationId());
+        }
+        return $this->getCollection()->addApplicationToFilter($this->getApplicationId())->addImageTypeToFilter($type)
+            ->setPositionOrder()->fetchItem();
+    }
+
+    /**
+     * Check is image exists in original folder
+     *
+     * @param string $imagePath
+     * @return bool
+     */
+    protected  function _checkImageExists($imagePath)
+    {
+        $image = new Varien_Io_File();
+        return $image->fileExists(self::getBasePath() . $imagePath);
+    }
+
+    /**
+     * Retrieve custom size image url
+     *
+     * @param string $imageFile
+     * @param int $width
+     * @param int $height
+     * @return string|bool
+     */
+    public function getCustomSizeImageUrl($imageFile, $width = 100, $height = 100)
+    {
+        /** @var $imageHelper Mage_XmlConnect_Helper_Image */
+        $imageHelper = Mage::helper('xmlconnect/image');
+        $screenSize = $width . 'x' . $height;
+        $customDir = $imageHelper->getMediaPath('custom' . DS . $screenSize);
+        $ioFile = new Varien_Io_File();
+        $ioFile->checkAndCreateFolder($customDir);
+        $filePath = self::getBasePath() . DS . $imageFile;
+        $isImagePng = true;
+
+        if (!$ioFile->fileExists($filePath)) {
+            return false;
+        }
+
+        $originalImageType = $this->_getImageType($filePath);
+        if ($originalImageType !== IMAGETYPE_PNG) {
+            $imageFile = $this->_convertFileExtensionToPng($imageFile);
+            $isImagePng = false;
+        }
+
+        $customSizeFile = $customDir . DS . $imageFile;
+        if (!file_exists($customSizeFile)) {
+            if (!$isImagePng) {
+                $filePath = $this->_forcedConvertPng($filePath, $customSizeFile, $originalImageType);
+            }
+
+            $image = new Varien_Image($filePath);
+            $widthOriginal = $image->getOriginalWidth();
+            $heightOriginal = $image->getOriginalHeight();
+
+            if ($width != $widthOriginal) {
+                $widthOriginal = $width;
+            }
+
+            if ($height != $heightOriginal) {
+                $heightOriginal = $height;
+            }
+
+            if (($widthOriginal != $image->getOriginalWidth()) || ($heightOriginal != $image->getOriginalHeight()) ) {
+                $image->keepTransparency(true);
+                $image->keepFrame(true);
+                $image->keepAspectRatio(true);
+                $image->backgroundColor(array(0, 0, 0));
+                $image->resize($widthOriginal, $heightOriginal);
+                $image->save($customDir, basename($imageFile));
+            } else {
+                $ioFile->cp($filePath, $customSizeFile);
+            }
+        }
+        return $imageHelper->getMediaUrl("custom/{$screenSize}/" . basename($imageFile));
+    }
+
+    /**
+     * Save image data
+     *
+     * @param int $applicationId
+     * @param string $imageFile
+     * @param string $imageType
+     * @param int $order
+     * @return Mage_XmlConnect_Model_Images
+     */
+    public function saveImage($applicationId, $imageFile, $imageType, $order)
+    {
+        $this->getResource()->saveImage($applicationId, $imageFile, $imageType, $order);
+        return $this;
+    }
+
+    /**
+     * Add image node to the config
+     * Used for backward compatibility only
+     *
+     * @param array $config
+     * @return Mage_XmlConnect_Model_Images
+     */
+    public function loadOldImageNodes(&$config)
+    {
+        $iconImageFile = $this->getImageItemByType(Mage_XmlConnect_Model_Device_Abstract::IMAGE_TYPE_ICON);
+
+        if (is_object($iconImageFile) && $iconImageFile->getImageFile()) {
+            $iconImageType = Mage_XmlConnect_Model_Device_Abstract::IMAGE_TYPE_ICON;
+            $config['navigationBar']['icon'] = $this->getCustomSizeImageUrl(
+                $iconImageFile->getImageFile(),
+                $this->getImageLimitParam($iconImageType, 'width'),
+                $this->getImageLimitParam($iconImageType, 'height')
+            );
+        }
+
+        $imageArray = $this->_getOldConfigImageNodeArray();
+        $imageArray = $imageArray[Mage::helper('xmlconnect')->getDeviceType()];
+        foreach ($imageArray as $node => $imageType) {
+            $imageFile = $this->getImageItemByType($imageType);
+            if (!is_object($imageFile) || !$imageFile->getImageFile()) {
+                continue;
+            }
+            $config['body'][$node] = $this->getCustomSizeImageUrl(
+                $imageFile->getImageFile(),
+                $this->getImageLimitParam($imageType, 'width'),
+                $this->getImageLimitParam($imageType, 'height')
+            );
+        }
+        return $this;
+    }
+
+    /**
+     * Get image url for current screen size
+     *
+     * @param $imageFile
+     * @param $imageType
+     * @return bool|string
+     */
+    public function getScreenSizeImageUrlByType($imageFile, $imageType)
+    {
+        if (is_numeric($this->getImageLimitParam($imageType))) {
+            $width = $height = $this->getImageLimitParam($imageType);
+        } else {
+            $width = $this->getImageLimitParam($imageType, 'width');
+            $height = $this->getImageLimitParam($imageType, 'height');
+        }
+        if (!is_numeric($width) || !is_numeric($height)) {
+            Mage::throwException(Mage::helper('xmlconnect')->__('Image limits don\'t recognized for "%s" image type', $imageType));
+        }
+
+        return $this->getCustomSizeImageUrl($imageFile, $width, $height);
+    }
+
+    /**
+     * Get image limit param value
+     *
+     * @param string $imageType
+     * @param string|null $key
+     * @param string $screenSize
+     * @return mixed
+     */
+    public function getImageLimitParam($imageType = '', $key = null, $screenSize = '')
+    {
+        return $this->getImageLimitsModel()->getImageLimitsByType($imageType, $key, $screenSize);
+    }
+
+    /**
+     * Get Image Limits model
+     *
+     * @return Mage_XmlConnect_Model_ImageLimits
+     */
+    public function getImageLimitsModel()
+    {
+        return Mage::helper('xmlconnect')->getApplication()->getImageLimitsModel();
+    }
+
+    /**
+     * Get old config image node for devices
+     *
+     * @return array
+     */
+    protected function _getOldConfigImageNodeArray()
+    {
+        // array as old config node => new image type (separated by device types)
+        return array(
+            Mage_XmlConnect_Helper_Data::DEVICE_TYPE_ANDROID => array(
+                'bannerAndroidImage' => Mage_XmlConnect_Model_Device_Android::IMAGE_TYPE_PORTRAIT_BANNER
+            ),
+            Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE => array(
+                'bannerImage' => Mage_XmlConnect_Model_Device_Iphone::IMAGE_TYPE_PORTRAIT_BANNER,
+                'backgroundImage' => Mage_XmlConnect_Model_Device_Iphone::IMAGE_TYPE_PORTRAIT_BACKGROUND
+            ),
+            Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPAD => array(
+                'bannerIpadLandscapeImage' => Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_LANDSCAPE_BANNER,
+                'bannerIpadImage' => Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_PORTRAIT_BANNER,
+                'backgroundIpadLandscapeImage' => Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_LANDSCAPE_BACKGROUND,
+                'backgroundIpadPortraitImage' => Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_PORTRAIT_BACKGROUND
+            )
+        );
+    }
+
+    /**
+     * Update old image records in database
+     * For data upgrade usage only
+     *
+     * @see data upgrade file: mysql4-data-upgrade-1.6.0.0-1.6.0.0.1.php
+     * @param array $records
+     * @return null
+     */
+    public function dataUpgradeOldConfig($records)
+    {
+        // array as old config node => new image type (separated by device types)
+        $oldConfigPathByDeviceType = $this->_getOldConfigImageNodeArray();
+
+        /** @var $applicationModel Mage_XmlConnect_Model_Application */
+        $applicationModel = Mage::getModel('xmlconnect/application');
+
+        /** @var $configModel Mage_XmlConnect_Model_ConfigData */
+        $configModel = $applicationModel->getConfigModel();
+        $deprecatedFlag = Mage_XmlConnect_Model_Application::DEPRECATED_CONFIG_FLAG;
+
+        foreach ($records as $application_id) {
+            /** @var $applicationModel Mage_XmlConnect_Model_Application */
+            $applicationModel->load($application_id);
+            $configPathList = $oldConfigPathByDeviceType[$applicationModel->getType()];
+            $configData = $configModel->loadApplicationData($application_id);
+
+            // old icon config path
+            $iconConfigPath = 'native/navigationBar/icon';
+            if (!empty($configData[$deprecatedFlag][$iconConfigPath])) {
+                // Add icon to image table
+                $iconFile = basename($configData[$deprecatedFlag][$iconConfigPath]);
+                $this->saveImage(
+                    $application_id, $iconFile, Mage_XmlConnect_Model_Device_Abstract::IMAGE_TYPE_ICON, 1
+                );
+
+                // delete old icon record from config_data table
+                $configModel->deleteConfig($application_id, $deprecatedFlag, $iconConfigPath);
+
+                // delete all icon files from file system
+                $this->_deleteImageFiles($iconFile, false);
+            }
+
+            $i = 0;
+            // old config path prefix native/body/
+            $configPrefix = 'native/body/';
+            foreach ($configPathList as $configPath => $imageType) {
+                if (empty($configData[$deprecatedFlag][$configPrefix . $configPath])) {
+                    continue;
+                }
+                $fileName = basename($configData[$deprecatedFlag][$configPrefix . $configPath]);
+                // add new record to image table
+                $this->saveImage($application_id, $fileName, $imageType, ++$i);
+
+                // delete all image files from file system
+                $this->_deleteImageFiles($fileName, false);
+
+                // remove old record from config_data table
+                $configModel->deleteConfig($application_id, $deprecatedFlag, $configPrefix . $configPath);
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Convert uploaded file to PNG
+     *
+     * @param string $originalFile
+     * @param string $destinationFile
+     * @param int|null $originalImageType
+     * @return string
+     */
+    protected function _forcedConvertPng($originalFile, $destinationFile, $originalImageType = null)
+    {
+        switch ($originalImageType) {
+            case IMAGETYPE_GIF:
+                $img = imagecreatefromgif($originalFile);
+                imagealphablending($img, false);
+                imagesavealpha($img, true);
+                break;
+            case IMAGETYPE_JPEG:
+                $img = imagecreatefromjpeg($originalFile);
+                break;
+            case IMAGETYPE_WBMP:
+                $img = imagecreatefromwbmp($originalFile);
+                break;
+            case IMAGETYPE_XBM:
+                $img = imagecreatefromxbm($originalFile);
+                break;
+            default:
+                return '';
+        }
+        imagepng($img, $destinationFile);
+        imagedestroy($img);
+
+        return $destinationFile;
+    }
+
+    /**
+     * Convert image file extension to PNG
+     *
+     * @param string $fileName
+     * @return string
+     */
+    protected function _convertFileExtensionToPng($fileName)
+    {
+        $dotPosition = strrpos($fileName, '.');
+        if ($dotPosition !== false) {
+            $fileName = substr($fileName, 0 , $dotPosition);
+        }
+        $fileName .= '.png';
+
+        return $fileName;
+    }
+
+    /**
+     * Get image type
+     *
+     * @param string $filePath
+     * @return int
+     */
+    protected function _getImageType($filePath)
+    {
+        list(,, $originalImageType) = getimagesize($filePath);
+        return $originalImageType;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Observer.php b/app/code/core/Mage/XmlConnect/Model/Observer.php
index 09f50d799ef..752cf669e60 100644
--- a/app/code/core/Mage/XmlConnect/Model/Observer.php
+++ b/app/code/core/Mage/XmlConnect/Model/Observer.php
@@ -40,6 +40,7 @@ class Mage_XmlConnect_Model_Observer
      */
     protected $_appDependOnConfigFieldPathes = array(
         Mage_XmlConnect_Model_Application::XML_PATH_PAYPAL_BUSINESS_ACCOUNT,
+        Mage_Checkout_Helper_Data::XML_PATH_GUEST_CHECKOUT,
         'sendfriend/email/max_recipients',
         'sendfriend/email/allow_guest',
         'general/locale/code',
@@ -57,7 +58,11 @@ class Mage_XmlConnect_Model_Observer
      */
     public function restrictWebsite($observer)
     {
-        if (Mage::app()->getRequest()->getModuleName() == 'xmlconnect') {
+        $controller = $observer->getEvent()->getController();
+        if ($controller instanceof Mage_XmlConnect_Controller_AdminAction
+            || $controller instanceof Mage_XmlConnect_Controller_Action
+            || Mage::app()->getRequest()->getModuleName() == 'xmlconnect'
+        ) {
             $observer->getEvent()->getResult()->setShouldProceed(false);
         }
     }
@@ -85,15 +90,18 @@ public function changeUpdatedAtParamOnConfigSave($observer)
      */
     public function sendMessageImmediately($observer)
     {
+        /** @var $message Mage_XmlConnect_Model_Queue */
         $message = $observer->getEvent()->getData('queueMessage');
-        if ($message instanceof Mage_XmlConnect_Model_Queue && (strtolower($message->getExecTime()) == 'null'
-            || !$message->getExecTime())
-        ) {
+        $execTime = strtotime($message->getExecTime());
+        $isPastTime = false;
+        if (false !== $execTime) {
+            $isPastTime = strtotime(Mage::getSingleton('core/date')->gmtDate()) - strtotime($message->getExecTime());
+        }
+        if ($isPastTime === false || $isPastTime > 0) {
             $message->setExecTime(Mage::getSingleton('core/date')->gmtDate());
             Mage::helper('xmlconnect')->sendBroadcastMessage($message);
             return true;
         }
-
         return false;
     }
 
@@ -105,14 +113,76 @@ public function sendMessageImmediately($observer)
     public function scheduledSend()
     {
         $countOfQueue = Mage::getStoreConfig(Mage_XmlConnect_Model_Queue::XML_PATH_CRON_MESSAGES_COUNT);
-
         $collection = Mage::getModel('xmlconnect/queue')->getCollection()->addOnlyForSendingFilter()
             ->setPageSize($countOfQueue)->setCurPage(1)->load();
-
         foreach ($collection as $message) {
             if ($message->getId()) {
                 Mage::helper('xmlconnect')->sendBroadcastMessage($message);
             }
         }
     }
+
+    /**
+     * Clear category images cache
+     *
+     * @return null
+     */
+    public function clearCategoryImagesCache()
+    {
+        Mage::getModel('xmlconnect/catalog_category_image')->clearCache();
+    }
+
+    /**
+     * Handle xmlconnect admin actions
+     *
+     * @param Varien_Event_Observer $event
+     * @return null
+     */
+    public function actionFrontPreDispatchXmlAdmin($event)
+    {
+        /** @var $request Mage_Core_Controller_Request_Http */
+        $request = Mage::app()->getRequest();
+        if (true === $this->_checkAdminController($request, $event->getControllerAction())) {
+            $request->setParam('forwarded', true)->setDispatched(true);
+        }
+    }
+
+    /**
+     * Forward unauthorized users for xmlconnect admin actions
+     *
+     * @param Varien_Event_Observer $event
+     * @return null
+     */
+    public function actionPreDispatchXmlAdmin($event)
+    {
+        /** @var $request Mage_Core_Controller_Request_Http */
+        $request = Mage::app()->getRequest();
+        if (false === $this->_checkAdminController($request, $event->getControllerAction())
+            && !Mage::getSingleton('admin/session')->isLoggedIn()
+        ) {
+            $request->setParam('forwarded', true)->setRouteName('adminhtml')->setControllerName('connect_user')
+                ->setActionName('loginform')->setDispatched(false);
+        }
+    }
+
+    /**
+     * Check is controller action is allowed w/o authorization
+     *
+     * @param Mage_Core_Controller_Request_Http $request
+     * @param Mage_XmlConnect_Controller_AdminAction $controllerAction
+     * @return bool|null
+     */
+    protected function _checkAdminController($request, $controllerAction)
+    {
+        if ($controllerAction instanceof Mage_XmlConnect_Controller_AdminAction) {
+            foreach ($controllerAction->getAllowedControllerActions() as $controller => $allowedActions) {
+                if ($request->getControllerName() == $controller
+                    && in_array(strtolower($request->getActionName()), $allowedActions)
+                ) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog.php
new file mode 100644
index 00000000000..5098cb2dd4b
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect offline catalog model
+ *
+ * @category    Mage
+ * @package     Mage_Xmlconnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_OfflineCatalog
+{
+    /**
+     * Category type
+     */
+    const CATEGORY_TYPE = 'category';
+
+    /**
+     * Product type
+     */
+    const PRODUCT_TYPE = 'product';
+
+    /**
+     * Home banners type
+     */
+    const HOMEBANNERS_TYPE = 'homebanners';
+
+    /**
+     * Home page type
+     */
+    const HOME_TYPE = 'home';
+
+    /**
+     * Config type
+     */
+    const CONFIG_TYPE = 'config';
+
+    /**
+     * Run export by type
+     *
+     * @param string $type
+     * @return Mage_XmlConnect_Model_OfflineCatalog
+     */
+    protected function _runExport($type)
+    {
+        $exportModel = $this->_getExportModel($type);
+        if (null !== $exportModel) {
+            $exportModel->exportData();
+        }
+        return $this;
+    }
+
+    /**
+     * Export offline catalog data
+     *
+     * @return Mage_XmlConnect_Model_OfflineCatalog
+     */
+    public function exportData()
+    {
+        Mage::helper('xmlconnect/offlineCatalog')->prepareResultDirectory();
+        $this->_runExport(self::CATEGORY_TYPE)->_runExport(self::PRODUCT_TYPE)->_runExport(self::HOMEBANNERS_TYPE)
+            ->_runExport(self::HOME_TYPE)->_runExport(self::CONFIG_TYPE);
+        return $this;
+    }
+
+    /**
+     * Get export model by type
+     *
+     * @param string $type
+     * @return Mage_Core_Model_Abstract|null
+     */
+    protected function _getExportModel($type)
+    {
+        switch ($type) {
+            case self::CATEGORY_TYPE:
+                return Mage::getModel('xmlconnect/offlineCatalog_category');
+                break;
+            case self::PRODUCT_TYPE:
+                return Mage::getModel('xmlconnect/offlineCatalog_product');
+                break;
+            case self::HOMEBANNERS_TYPE:
+                return Mage::getModel('xmlconnect/offlineCatalog_homebanners');
+                break;
+            case self::HOME_TYPE:
+                return Mage::getModel('xmlconnect/offlineCatalog_home');
+                break;
+            case self::CONFIG_TYPE:
+                return Mage::getModel('xmlconnect/offlineCatalog_config');
+                break;
+            default:
+                return null;
+        }
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Abstract.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Abstract.php
new file mode 100644
index 00000000000..a9751a72a36
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Abstract.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Xmlconnect offline catalog abstract model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+abstract class Mage_XmlConnect_Model_OfflineCatalog_Abstract extends Mage_Core_Model_Abstract
+{
+    /**
+     * Return layout block
+     *
+     * @abstract
+     * @param Mage_XmlConnect_Helper_OfflineCatalog $exportHelper
+     * @return Mage_Core_Block_Abstract
+     */
+    abstract public function getLayoutBlock($exportHelper);
+
+    /**
+     * Return action url
+     *
+     * @abstract
+     * @return string
+     */
+    abstract protected function _getActionUrl();
+
+    /**
+     * Export offline catalog data
+     *
+     * @return Mage_XmlConnect_Model_OfflineCatalog_Home
+     */
+    public function exportData()
+    {
+        /** @var $exportHelper Mage_XmlConnect_Helper_OfflineCatalog */
+        $exportHelper = Mage::helper('xmlconnect/offlineCatalog');
+        $currentBlock = $this->getLayoutBlock($exportHelper);
+        $exportHelper->addOfflineCatalogData($this->_getActionUrl(), $currentBlock->toHtml());
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category.php
new file mode 100644
index 00000000000..fa836dcf05d
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Xmlconnect offline catalog category model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_OfflineCatalog_Category extends Mage_XmlConnect_Block_Catalog_Category
+{
+    /**
+     * Category url
+     */
+    const URL_CATEGORY_DETAILS = 'xmlconnect/catalog/category/id/%1$s/';
+
+    /**
+     * Product count in category
+     */
+    const PRODUCT_IN_CATEGORY = 10;
+
+    /**
+     * Request controller
+     *
+     * @var null|Mage_Core_Controller_Request_Http
+     */
+    protected $_request;
+
+    /**
+     * @var array
+     */
+    protected $_productIds = array();
+
+    /**
+     * Initialize category model
+     */
+    protected function _construct()
+    {
+        $this->setCategoryModel(Mage::getModel('xmlconnect/offlineCatalog_category_category'));
+        $this->setIndexCategoryModel(Mage::getModel('xmlconnect/offlineCatalog_category_indexCategory'));
+        $this->_request = Mage::app()->getRequest();
+        parent::_construct();
+    }
+
+    /**
+     * Get request
+     *
+     * @return Mage_Core_Controller_Request_Http
+     */
+    protected function _getRequest()
+    {
+        if (null === $this->_request) {
+            $this->_request = Mage::app()->getRequest();
+        }
+        return $this->_request;
+    }
+
+    /**
+     * Export category data
+     *
+     * @return Mage_XmlConnect_Model_OfflineCatalog_Category
+     */
+    public function exportData()
+    {
+        $this->_getRequest()->setParam('id', null)->setParam('count', self::PRODUCT_IN_CATEGORY);
+        $this->getIndexCategoryModel()->exportData();
+        /** @var $helper Mage_Catalog_Helper_Category */
+        $helper = Mage::helper('catalog/category');
+        foreach ($helper->getStoreCategories() as $category) {
+            if (!$category->getIsActive()) {
+                continue;
+            }
+            $this->_exportCategory($category);
+        }
+        return $this;
+    }
+
+    /**
+     * Export category data
+     *
+     * @param Mage_Catalog_Model_Category $category
+     * @return Mage_XmlConnect_Model_OfflineCatalog_Category
+     */
+    protected function _exportCategory($category)
+    {
+        /** @var $exportHelper Mage_XmlConnect_Helper_OfflineCatalog */
+        $exportHelper  = Mage::helper('xmlconnect/offlineCatalog');
+        $this->_getRequest()->setParam('app_code', $exportHelper->getCurrentDeviceModel()->getCode());
+
+        $categoryId = $category->getId();
+        $this->getCategoryModel()->setCategoryId($categoryId);
+        $this->_getRequest()->setParam('id', $categoryId);
+        $this->getCategoryModel()->exportData();
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category/Category.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category/Category.php
new file mode 100644
index 00000000000..7bd3fe69be0
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category/Category.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Xmlconnect offline catalog category model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_OfflineCatalog_Category_Category extends Mage_XmlConnect_Model_OfflineCatalog_Abstract
+{
+    /**
+     * Category url
+     */
+    const CATEGORY_URL = 'xmlconnect/catalog/category/id/%1$s/';
+
+    /**
+     * Return category block
+     *
+     * @param Mage_XmlConnect_Helper_OfflineCatalog $exportHelper
+     * @return Mage_Core_Block_Abstract
+     */
+    public function getLayoutBlock($exportHelper)
+    {
+        return $exportHelper->getBlock('xmlconnect.catalog.category');
+    }
+
+    /**
+     * Return category url
+     *
+     * @return string
+     */
+    protected function _getActionUrl()
+    {
+        return sprintf(Mage::getBaseUrl() . self::CATEGORY_URL, $this->getCategoryId());
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category/IndexCategory.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category/IndexCategory.php
new file mode 100644
index 00000000000..cd8c2955aac
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Category/IndexCategory.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Xmlconnect offline catalog index category model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_OfflineCatalog_Category_IndexCategory extends Mage_XmlConnect_Model_OfflineCatalog_Abstract
+{
+    /**
+     * Index category url
+     */
+    const CATEGORY_INDEX_URL = 'xmlconnect/catalog/category/';
+
+    /**
+     * Return category block
+     *
+     * @param Mage_XmlConnect_Helper_OfflineCatalog $exportHelper
+     * @return Mage_Core_Block_Abstract
+     */
+    public function getLayoutBlock($exportHelper)
+    {
+        return $exportHelper->getBlock('xmlconnect.catalog.category');
+    }
+
+    /**
+     * Return index category url
+     *
+     * @return string
+     */
+    protected function _getActionUrl()
+    {
+        return Mage::getBaseUrl() . self::CATEGORY_INDEX_URL;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Config.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Config.php
new file mode 100644
index 00000000000..9045a05fa18
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Config.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Xmlconnect offline catalog config model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_OfflineCatalog_Config extends Mage_XmlConnect_Model_OfflineCatalog_Abstract
+{
+    /**
+     * Config url
+     */
+    const CONFIG_URL = 'Configuration';
+
+    /**
+     * Export config data
+     *
+     * @return Mage_XmlConnect_Model_OfflineCatalog_Config
+     */
+    public function exportData()
+    {
+        /** @var $exportHelper Mage_XmlConnect_Helper_OfflineCatalog */
+        $exportHelper = Mage::helper('xmlconnect/offlineCatalog');
+        Mage::app()->getRequest()->setParam('app_code', $exportHelper->getCurrentDeviceModel()->getCode());
+        $exportHelper->addOfflineCatalogData(
+            $this->_getActionUrl(), $this->getLayoutBlock($exportHelper)->toHtml()
+        );
+        return $this;
+    }
+
+    /**
+     * Return config block
+     *
+     * @param Mage_XmlConnect_Helper_OfflineCatalog $exportHelper
+     * @return Mage_Core_Block_Abstract
+     */
+    public function getLayoutBlock($exportHelper)
+    {
+        return $exportHelper->getBlock('xmlconnect.configuration');
+    }
+
+    /**
+     * Return action url
+     *
+     * @return string
+     */
+    protected function _getActionUrl()
+    {
+        return self::CONFIG_URL;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Home.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Home.php
new file mode 100644
index 00000000000..3a802fe36f1
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Home.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Xmlconnect offline catalog home model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_OfflineCatalog_Home extends Mage_XmlConnect_Model_OfflineCatalog_Abstract
+{
+    /**
+     * Home url
+     */
+    const HOME_URL = 'xmlconnect/index/index/';
+
+    /**
+     * Return home block
+     *
+     * @param Mage_XmlConnect_Helper_OfflineCatalog $exportHelper
+     * @return Mage_Core_Block_Abstract
+     */
+    public function getLayoutBlock($exportHelper)
+    {
+        return $exportHelper->getBlock('xmlconnect.home');
+    }
+
+    /**
+     * Return home url
+     *
+     * @return string
+     */
+    protected function _getActionUrl()
+    {
+        return Mage::getBaseUrl() . self::HOME_URL;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Homebanners.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Homebanners.php
new file mode 100644
index 00000000000..10530f10bd8
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Homebanners.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Xmlconnect offline catalog homebanners model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_OfflineCatalog_Homebanners extends Mage_XmlConnect_Model_OfflineCatalog_Abstract
+{
+    /**
+     * Home banners url
+     */
+    const HOMEBANNES_URL = 'xmlconnect/homebanners';
+
+    /**
+     * Return home banners block
+     *
+     * @param Mage_XmlConnect_Helper_OfflineCatalog $exportHelper
+     * @return Mage_Core_Block_Abstract
+     */
+    public function getLayoutBlock($exportHelper)
+    {
+        return $exportHelper->getBlock('xmlconnect.homebanners');
+    }
+
+    /**
+     * Return home banners url
+     *
+     * @return string
+     */
+    protected function _getActionUrl()
+    {
+        return Mage::getBaseUrl() . self::HOMEBANNES_URL;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product.php
new file mode 100644
index 00000000000..12c082f9cc7
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Xmlconnect offline catalog product model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_OfflineCatalog_Product extends Mage_XmlConnect_Block_Catalog_Product_List
+{
+    /**
+     * Type product
+     */
+    const TYPE_PRODUCT = 'product';
+
+    /**
+     * Type review
+     */
+    const TYPE_REVIEW = 'review';
+
+    /**
+     * Type gallery
+     */
+    const TYPE_GALLERY = 'gallery';
+
+    /**
+     * Export product data
+     *
+     * @return Mage_XmlConnect_Model_OfflineCatalog_Product
+     */
+    public function exportData()
+    {
+        /** @var $helper Mage_Catalog_Helper_Category */
+        $helper = Mage::helper('catalog/category');
+        Mage::app()->getRequest()->setParam(
+            'count', Mage_XmlConnect_Model_OfflineCatalog_Category::PRODUCT_IN_CATEGORY
+        );
+        foreach ($helper->getStoreCategories() as $category) {
+            if (!$category->getIsActive()) {
+                continue;
+            }
+            $this->_exportProductCollection($category);
+        }
+    }
+
+    /**
+     * Export product collection
+     *
+     * @param Varien_Data_Tree_Node $category
+     */
+    protected function _exportProductCollection($category)
+    {
+        $categoryModel = Mage::getModel('catalog/category')->load($category->getId());
+        $this->setCategory($categoryModel)->setLayer(Mage::getSingleton('catalog/layer'));
+        foreach ($this->_getProductCollection() as $product) {
+            $product->load($product->getEntityId());
+            Mage::app()->getRequest()->setParam('id', $product->getId());
+            $this->_getExportModel(self::TYPE_PRODUCT)->setProduct($product)->exportData();
+            $this->_getExportModel(self::TYPE_GALLERY)->setProduct($product)->exportData();
+            $this->_getExportModel(self::TYPE_REVIEW)->setProduct($product)->exportData();
+        }
+    }
+
+    /**
+     * Get export model by type
+     *
+     * @param string $type
+     * @return Mage_Core_Model_Abstract|null
+     */
+    protected function _getExportModel($type)
+    {
+        switch ($type) {
+            case self::TYPE_PRODUCT:
+                return Mage::getSingleton('xmlconnect/offlineCatalog_product_product');
+                break;
+            case self::TYPE_GALLERY:
+                return Mage::getSingleton('xmlconnect/offlineCatalog_product_gallery');
+                break;
+            case self::TYPE_REVIEW:
+                return Mage::getSingleton('xmlconnect/offlineCatalog_product_review');
+                break;
+            default:
+                return null;
+        }
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Gallery.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Gallery.php
new file mode 100644
index 00000000000..5a1a8f4c1ef
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Gallery.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Xmlconnect offline catalog gallery model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_OfflineCatalog_Product_Gallery extends Mage_XmlConnect_Model_OfflineCatalog_Abstract
+{
+    /**
+     * Gallery url
+     */
+    const GALLERY_URL = 'xmlconnect/catalog/productgallery/id/%1$s/';
+
+    /**
+     * Return gallery block
+     *
+     * @param Mage_XmlConnect_Helper_OfflineCatalog $exportHelper
+     * @return Mage_Core_Block_Abstract
+     */
+    public function getLayoutBlock($exportHelper)
+    {
+        return $exportHelper->getBlock('xmlconnect.catalog.product.gallery');
+    }
+
+    /**
+     * Return gallery url
+     *
+     * @return string
+     */
+    protected function _getActionUrl()
+    {
+        return sprintf(Mage::getBaseUrl() . self::GALLERY_URL, $this->getProduct()->getId());
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Product.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Product.php
new file mode 100644
index 00000000000..e7f38586495
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Product.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Xmlconnect offline catalog product model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_OfflineCatalog_Product_Product extends Mage_XmlConnect_Model_OfflineCatalog_Abstract
+{
+    /**
+     * Product url
+     */
+    const PRODUCT_URL = 'xmlconnect/catalog/product/id/%1$s/';
+
+    /**
+     * Return product block
+     *
+     * @param Mage_XmlConnect_Helper_OfflineCatalog $exportHelper
+     * @return Mage_Core_Block_Abstract
+     */
+    public function getLayoutBlock($exportHelper)
+    {
+        return $exportHelper->getBlock('xmlconnect.catalog.product');
+    }
+
+    /**
+     * Return product url
+     *
+     * @return string
+     */
+    protected function _getActionUrl()
+    {
+        return sprintf(Mage::getBaseUrl() . self::PRODUCT_URL, $this->getProduct()->getId());
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Review.php b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Review.php
new file mode 100644
index 00000000000..d5a405afd25
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/OfflineCatalog/Product/Review.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Xmlconnect offline catalog review model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_OfflineCatalog_Product_Review extends Mage_XmlConnect_Model_OfflineCatalog_Abstract
+{
+    /**
+     * Review url
+     */
+    const REVIEW_URL = 'xmlconnect/catalog/productreviews/id/%1$s/';
+
+    /**
+     * Return review block
+     *
+     * @param Mage_XmlConnect_Helper_OfflineCatalog $exportHelper
+     * @return Mage_Core_Block_Abstract
+     */
+    public function getLayoutBlock($exportHelper)
+    {
+        return $exportHelper->getBlock('xmlconnect.catalog.product.reviews');
+    }
+
+    /**
+     * Return review url
+     *
+     * @return mixed
+     */
+    protected function _getActionUrl()
+    {
+        return sprintf(Mage::getBaseUrl() . self::REVIEW_URL, $this->getProduct()->getId());
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Config.php b/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Config.php
index 9088db2f0c0..f7734ab82ae 100644
--- a/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Config.php
+++ b/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Config.php
@@ -48,4 +48,25 @@ public function getExpressCheckoutStartUrl($token)
     {
         return $this->getPaypalUrl(array('cmd' => '_express-checkout-mobile', 'token' => $token));
     }
+
+    /**
+     * Map any supported payment method into a config path by specified field name
+     *
+     * @param string $fieldName
+     * @return string|null
+     */
+    protected function _getSpecificConfigPath($fieldName)
+    {
+        $path = $this->_mapExpressFieldset($fieldName);
+
+        if ($path === null) {
+            $path = $this->_mapWppFieldset($fieldName);
+        }
+
+        if ($path === null) {
+            $path = parent::_getSpecificConfigPath($fieldName);
+        }
+
+        return $path;
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Mecl.php b/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Mecl.php
index eb9419e9b5e..f9d56ab4987 100644
--- a/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Mecl.php
+++ b/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Mecl.php
@@ -66,6 +66,13 @@ class Mage_XmlConnect_Model_Payment_Method_Paypal_Mecl extends Mage_Paypal_Model
      */
     protected $_canManageRecurringProfiles = false;
 
+    /**
+     * PayPal Website Payments Pro model
+     *
+     * @var string
+     */
+    protected $_proType = 'xmlconnect/payment_method_paypal_pro';
+
     /**
      * Check whether payment method can be used
      *
diff --git a/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Pro.php b/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Pro.php
new file mode 100644
index 00000000000..c8df8bb9489
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Pro.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * PayPal Website Payments Pro implementation for payment method instances
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_Payment_Method_Paypal_Pro extends Mage_Paypal_Model_Pro
+{
+    /**
+     * Config mode type
+     *
+     * @var string
+     */
+    protected $_configType = 'xmlconnect/payment_method_paypal_config';
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Paypal/Mecl/Checkout.php b/app/code/core/Mage/XmlConnect/Model/Paypal/Mecl/Checkout.php
index ef4cc78dde4..884f4e2b4a1 100644
--- a/app/code/core/Mage/XmlConnect/Model/Paypal/Mecl/Checkout.php
+++ b/app/code/core/Mage/XmlConnect/Model/Paypal/Mecl/Checkout.php
@@ -39,4 +39,28 @@ class Mage_XmlConnect_Model_Paypal_Mecl_Checkout extends Mage_Paypal_Model_Expre
      * @var string
      */
     protected $_methodType = Mage_XmlConnect_Model_Payment_Method_Paypal_Config::METHOD_WPP_MECL;
+
+    /**
+     * Set sandbox flag and get api
+     *
+     * @return Mage_Paypal_Model_Api_Nvp
+     */
+    protected function _getApi()
+    {
+        $this->_setSandboxFlag();
+        return parent::_getApi();
+    }
+
+    /**
+     * Set sandbox flag
+     *
+     * @return Mage_XmlConnect_Model_Paypal_Mecl_Checkout
+     */
+    protected function _setSandboxFlag()
+    {
+        $this->_config->sandboxFlag = Mage::helper('payment')
+            ->getMethodInstance(Mage_XmlConnect_Model_Payment_Method_Paypal_Config::METHOD_WPP_EXPRESS)
+            ->getConfigData('sandbox_flag');
+        return $this;
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Model/Preview/Abstract.php b/app/code/core/Mage/XmlConnect/Model/Preview/Abstract.php
index 4e5ca26cc44..b50c2406067 100755
--- a/app/code/core/Mage/XmlConnect/Model/Preview/Abstract.php
+++ b/app/code/core/Mage/XmlConnect/Model/Preview/Abstract.php
@@ -33,6 +33,13 @@
  */
 abstract class Mage_XmlConnect_Model_Preview_Abstract extends Varien_Object
 {
+    /**
+     * XmlConnect image model
+     *
+     * @var Mage_XmlConnect_Model_Images
+     */
+    protected $_imageModel;
+
     /**
      * Current active tab according preview action
      *
@@ -205,12 +212,19 @@ public function getConfigFontInfo($path)
      */
     public function getLogoUrl()
     {
-        $configPath = 'conf/navigationBar/icon';
-        if ($this->getData($configPath)) {
-            return $this->getData($configPath);
-        } else {
-            return $this->getPreviewImagesUrl('smallIcon.png');
+        $imageArray = $this->_getDeviceImageByType('icon');
+        $iconImage = false;
+        if (count($imageArray)) {
+            $iconImage = $this->getImageModel()->getCustomSizeImageUrl(
+                $imageArray[0]['image_file'], 35, 35
+            );
+        }
+
+        if (!$iconImage) {
+            $iconImage = $this->getPreviewImagesUrl('smallIcon.png');
         }
+
+        return $iconImage;
     }
 
     /**
@@ -263,4 +277,42 @@ public function getCategoryItemTintColor()
         }
         return $this->_categoryItemTintColor;
     }
+
+    /**
+     * Get device image by type
+     *
+     * @param string $type
+     * @param int $limit
+     * @param int $offset
+     * @return array
+     */
+    protected function _getDeviceImageByType($type, $limit = 1, $offset = 0)
+    {
+        return $this->getImageModel()->getDeviceImagesByType($type, $limit, $offset);
+    }
+
+    /**
+     * Get XmlConnect Image Model
+     *
+     * @return Mage_XmlConnect_Model_Images
+     */
+    public function getImageModel()
+    {
+        if ($this->_imageModel === null) {
+            $this->setImageModel(Mage::getModel('xmlconnect/images'));
+        }
+        return $this->_imageModel;
+    }
+
+    /**
+     * Set XmlConnect image model
+     *
+     * @param Mage_XmlConnect_Model_Images $imageModel
+     * @return Mage_XmlConnect_Model_Preview_Abstract
+     */
+    public function setImageModel($imageModel)
+    {
+        $this->_imageModel = $imageModel;
+        return $this;
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Model/Preview/Android.php b/app/code/core/Mage/XmlConnect/Model/Preview/Android.php
index 29adb132442..9d49bbd493d 100755
--- a/app/code/core/Mage/XmlConnect/Model/Preview/Android.php
+++ b/app/code/core/Mage/XmlConnect/Model/Preview/Android.php
@@ -69,13 +69,20 @@ public function getOrientation()
      */
     public function getBannerImage()
     {
-        $configPath = 'conf/body/bannerAndroidImage';
-        if ($this->getData($configPath)) {
-            $bannerImage = $this->getData($configPath);
-        } else {
-            $bannerImage = $this->getPreviewImagesUrl('android/bg_logo.png');
+        $result = array();
+        $bannerImages = $this->getImageModel()
+            ->getDeviceImagesByType(Mage_XmlConnect_Model_Device_Android::IMAGE_TYPE_PORTRAIT_BANNER);
+        if (!empty($bannerImages)) {
+            $width  = Mage_XmlConnect_Model_Device_Android::PREVIEW_BANNER_WIDTH;
+            $height = Mage_XmlConnect_Model_Device_Android::PREVIEW_BANNER_HEIGHT;
+            foreach ($bannerImages as $banner) {
+                if (!isset($banner['image_file'])) {
+                    continue;
+                }
+                $result[] = $this->getImageModel()->getCustomSizeImageUrl($banner['image_file'], $width, $height);
+            }
         }
-        return $bannerImage;
+        return $result;
     }
 
     /**
diff --git a/app/code/core/Mage/XmlConnect/Model/Preview/Ipad.php b/app/code/core/Mage/XmlConnect/Model/Preview/Ipad.php
index b571015abdc..be7729397cb 100755
--- a/app/code/core/Mage/XmlConnect/Model/Preview/Ipad.php
+++ b/app/code/core/Mage/XmlConnect/Model/Preview/Ipad.php
@@ -69,34 +69,42 @@ public function getOrientation()
      */
     public function getBannerImage()
     {
-        $orientation = $this->getOrientation();
-        switch ($orientation) {
-            case Mage_XmlConnect_Helper_Ipad::ORIENTATION_LANDSCAPE:
-                $configPath = 'conf/body/bannerIpadLandscapeImage';
-                $imageUrlOrig = $this->getData($configPath);
-                if ($imageUrlOrig) {
-                    $width  = Mage_XmlConnect_Helper_Ipad::PREVIEW_LANDSCAPE_BANNER_WIDTH;
-                    $height = Mage_XmlConnect_Helper_Ipad::PREVIEW_LANDSCAPE_BANNER_HEIGHT;
-                    $bannerImage = Mage::helper('xmlconnect/image')
-                        ->getCustomSizeImageUrl($imageUrlOrig, $width, $height);
-                } else {
-                    $bannerImage = $this->getPreviewImagesUrl('ipad/banner_image_l.png');
+        $result = array();
+        switch ($this->getOrientation()) {
+            case Mage_XmlConnect_Model_Device_Ipad::ORIENTATION_LANDSCAPE:
+                $bannerImages = $this->getImageModel()
+                    ->getDeviceImagesByType(Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_LANDSCAPE_BANNER);
+                if (!empty($bannerImages)) {
+                    $width  = Mage_XmlConnect_Model_Device_Ipad::PREVIEW_LANDSCAPE_BANNER_WIDTH;
+                    $height = Mage_XmlConnect_Model_Device_Ipad::PREVIEW_LANDSCAPE_BANNER_HEIGHT;
+                    foreach ($bannerImages as $banner) {
+                        if (!isset($banner['image_file'])) {
+                            continue;
+                        }
+                        $result[] = $this->getImageModel()->getCustomSizeImageUrl(
+                            $banner['image_file'], $width, $height
+                        );
+                    }
                 }
                 break;
-            case Mage_XmlConnect_Helper_Ipad::ORIENTATION_PORTRAIT:
-                $configPath = 'conf/body/bannerIpadImage';
-                $imageUrlOrig = $this->getData($configPath);
-                if ($imageUrlOrig) {
-                    $width  = Mage_XmlConnect_Helper_Ipad::PREVIEW_PORTRAIT_BANNER_WIDTH;
-                    $height = Mage_XmlConnect_Helper_Ipad::PREVIEW_PORTRAIT_BANNER_HEIGHT;
-                    $bannerImage = Mage::helper('xmlconnect/image')
-                        ->getCustomSizeImageUrl($imageUrlOrig, $width, $height);
-                } else {
-                    $bannerImage = $this->getPreviewImagesUrl('ipad/banner_image.png');
+            case Mage_XmlConnect_Model_Device_Ipad::ORIENTATION_PORTRAIT:
+                $bannerImages = $this->getImageModel()
+                    ->getDeviceImagesByType(Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_PORTRAIT_BANNER);
+                if (!empty($bannerImages)) {
+                    $width  = Mage_XmlConnect_Model_Device_Ipad::PREVIEW_PORTRAIT_BANNER_WIDTH;
+                    $height = Mage_XmlConnect_Model_Device_Ipad::PREVIEW_PORTRAIT_BANNER_HEIGHT;
+                    foreach ($bannerImages as $banner) {
+                        if (!isset($banner['image_file'])) {
+                            continue;
+                        }
+                        $result[] = $this->getImageModel()->getCustomSizeImageUrl(
+                            $banner['image_file'], $width, $height
+                        );
+                    }
                 }
                 break;
         }
-        return $bannerImage;
+        return $result;
     }
 
     /**
@@ -107,37 +115,34 @@ public function getBannerImage()
      */
     public function getBackgroundImage()
     {
-        $orientation = $this->getOrientation();
-        $backgroundImage = '';
-        /** @var $helperImage Mage_XmlConnect_Helper_Image */
-        $helperImage = Mage::helper('xmlconnect/image');
-
-        switch ($orientation) {
-            case Mage_XmlConnect_Helper_Ipad::ORIENTATION_LANDSCAPE:
-                $configPath = 'conf/body/backgroundIpadLandscapeImage';
-                $imageUrlOrig = $this->getData($configPath);
-                if ($imageUrlOrig) {
-                    $width = Mage_XmlConnect_Helper_Ipad::PREVIEW_LANDSCAPE_BACKGROUND_WIDTH;
-                    $height = Mage_XmlConnect_Helper_Ipad::PREVIEW_LANDSCAPE_BACKGROUND_HEIGHT;
-                    $backgroundImage = $helperImage->getCustomSizeImageUrl($imageUrlOrig, $width, $height);
+        switch ($this->getOrientation()) {
+            case Mage_XmlConnect_Model_Device_Ipad::ORIENTATION_LANDSCAPE:
+                $backgroundImage = $this->getImageModel()
+                    ->getImageItemByType(Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_LANDSCAPE_BACKGROUND);
+                if (is_object($backgroundImage) && $backgroundImage->getImageFile()) {
+                    $width = Mage_XmlConnect_Model_Device_Ipad::PREVIEW_LANDSCAPE_BACKGROUND_WIDTH;
+                    $height = Mage_XmlConnect_Model_Device_Ipad::PREVIEW_LANDSCAPE_BACKGROUND_HEIGHT;
+                    $backgroundImage = $this->getImageModel()
+                        ->getCustomSizeImageUrl($backgroundImage->getImageFile(), $width, $height);
                 } else {
                     $backgroundImage = $this->getPreviewImagesUrl('ipad/background_home_landscape.jpg');
                 }
                 break;
-            case Mage_XmlConnect_Helper_Ipad::ORIENTATION_PORTRAIT:
-                $configPath = 'conf/body/backgroundIpadPortraitImage';
-                $imageUrlOrig = $this->getData($configPath);
-                if ($imageUrlOrig) {
-                    $width = Mage_XmlConnect_Helper_Ipad::PREVIEW_PORTRAIT_BACKGROUND_WIDTH;
-                    $height = Mage_XmlConnect_Helper_Ipad::PREVIEW_PORTRAIT_BACKGROUND_HEIGHT;
-                    $backgroundImage = $helperImage->getCustomSizeImageUrl($imageUrlOrig, $width, $height);
+            case Mage_XmlConnect_Model_Device_Ipad::ORIENTATION_PORTRAIT:
+                $backgroundImage = $this->getImageModel()
+                    ->getImageItemByType(Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_PORTRAIT_BACKGROUND);
+                if (is_object($backgroundImage) && $backgroundImage->getImageFile()) {
+                    $width = Mage_XmlConnect_Model_Device_Ipad::PREVIEW_PORTRAIT_BACKGROUND_WIDTH;
+                    $height = Mage_XmlConnect_Model_Device_Ipad::PREVIEW_PORTRAIT_BACKGROUND_HEIGHT;
+                    $backgroundImage = $this->getImageModel()
+                        ->getCustomSizeImageUrl($backgroundImage->getImageFile(), $width, $height);
                 } else {
                     $backgroundImage = $this->getPreviewImagesUrl('ipad/background_portrait.jpg');
                 }
                 break;
             default:
                 Mage::throwException(
-                    Mage::helper('xmlconnect')->__('Wrong Ipad background image orientation has been specified: "%s".', $orientation)
+                    Mage::helper('xmlconnect')->__('Wrong Ipad background image orientation has been specified: "%s".', $this->getOrientation())
                 );
                 break;
         }
diff --git a/app/code/core/Mage/XmlConnect/Model/Preview/Iphone.php b/app/code/core/Mage/XmlConnect/Model/Preview/Iphone.php
index ecb427aad0d..ec462af9c71 100755
--- a/app/code/core/Mage/XmlConnect/Model/Preview/Iphone.php
+++ b/app/code/core/Mage/XmlConnect/Model/Preview/Iphone.php
@@ -41,13 +41,22 @@ class Mage_XmlConnect_Model_Preview_Iphone extends Mage_XmlConnect_Model_Preview
      */
     public function getBannerImage()
     {
-        $configPath = 'conf/body/bannerImage';
-        if ($this->getData($configPath)) {
-            $bannerImage = $this->getData($configPath);
+        $result = array();
+        $bannerImages = $this->getImageModel()
+            ->getDeviceImagesByType(Mage_XmlConnect_Model_Device_Iphone::IMAGE_TYPE_PORTRAIT_BANNER);
+        if (!empty($bannerImages)) {
+            $width  = Mage_XmlConnect_Model_Device_Iphone::PREVIEW_PORTRAIT_BANNER_WIDTH;
+            $height = Mage_XmlConnect_Model_Device_Iphone::PREVIEW_PORTRAIT_BANNER_HEIGHT;
+            foreach ($bannerImages as $banner) {
+                if (!isset($banner['image_file'])) {
+                    continue;
+                }
+                $result[] = $this->getImageModel()->getCustomSizeImageUrl($banner['image_file'], $width, $height);
+            }
         } else {
-            $bannerImage = $this->getPreviewImagesUrl('banner.png');
+            $result[] = $this->getPreviewImagesUrl('banner.png');
         }
-        return $bannerImage;
+        return $result;
     }
 
     /**
diff --git a/app/code/core/Mage/XmlConnect/Model/Queue.php b/app/code/core/Mage/XmlConnect/Model/Queue.php
index b6d109c8758..2206daf69f5 100755
--- a/app/code/core/Mage/XmlConnect/Model/Queue.php
+++ b/app/code/core/Mage/XmlConnect/Model/Queue.php
@@ -79,7 +79,14 @@ class Mage_XmlConnect_Model_Queue extends Mage_Core_Model_Template
      *
      * @var null|string
      */
-    protected $_appType = null;
+    protected $_appType;
+
+    /**
+     * Application code
+     *
+     * @var string
+     */
+    protected $_appCode;
 
     /**
      * Initialize queue message
@@ -102,8 +109,14 @@ public function load($id, $field = null)
     {
         parent::load($id, $field);
 
+        if (!$this->getTemplateId() && Mage::app()->getRequest()->getParam('template_id', false)) {
+            $this->setTemplateId(Mage::app()->getRequest()->getParam('template_id'));
+        }
+
         if ($this->getTemplateId()) {
-            $this->setName(Mage::getModel('xmlconnect/template')->load($this->getTemplateId())->getName());
+            $template = Mage::getModel('xmlconnect/template')->load($this->getTemplateId());
+            $this->setName($template->getName());
+            $this->setApplicationId($template->getApplicationId());
         }
         return $this;
     }
@@ -296,4 +309,20 @@ public function save()
         }
         return parent::save();
     }
+
+    /**
+     * Get application code
+     *
+     * @return string
+     */
+    public function getAppCode()
+    {
+        if (null === $this->_appCode) {
+            if ($this->getApplicationId()) {
+                $application = Mage::getModel('xmlconnect/application')->load($this->getApplicationId());
+                $this->_appCode = $application->getCode();
+            }
+        }
+        return $this->_appCode;
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Application.php b/app/code/core/Mage/XmlConnect/Model/Resource/Application.php
index 845cb39f4f3..3a73aef08df 100755
--- a/app/code/core/Mage/XmlConnect/Model/Resource/Application.php
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/Application.php
@@ -111,11 +111,27 @@ public function getExistingStoreDeviceType()
     /**
      * Update all applications "updated at" parameter with current date
      *
+     * @deprecated will remove in new release
      * @return Mage_XmlConnect_Model_Resource_Application
      */
     public function updateAllAppsUpdatedAtParameter()
     {
-        $this->_getWriteAdapter()->update($this->getMainTable(), array('updated_at' => date('Y-m-d H:i:s')));
+        $this->_getWriteAdapter()->update(
+            $this->getMainTable(),
+            array('updated_at' => date('Y-m-d H:i:s'))
+        );
+        return $this;
+    }
+
+    /**
+     * Update all applications "updated at" parameter with current date
+     *
+     * @param Mage_XmlConnect_Model_Application $model
+     * @return Mage_XmlConnect_Model_Resource_Application
+     */
+    public function updateUpdatedAtParameter($model)
+    {
+        $this->_getWriteAdapter()->update($this->getMainTable(), array('updated_at' => $model->getUpdatedAt()));
         return $this;
     }
 }
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/CategorySearch/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/CategorySearch/Collection.php
new file mode 100644
index 00000000000..fbe6a90148b
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/CategorySearch/Collection.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Category search collection
+ *
+ * @category   Mage
+ * @package    Mage_XmlConnect
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_Resource_CategorySearch_Collection extends Mage_Catalog_Model_Resource_Category_Collection
+{
+    /**
+     * Filter for category collection
+     *
+     * @var array
+     */
+    protected $_collectionFilter = array();
+
+    /**
+     * Add search query filter
+     *
+     * @param string $query
+     * @return Mage_XmlConnect_Model_Resource_CategorySearch_Collection
+     */
+    public function addSearchFilter($query)
+    {
+        $this->_addNameFilter($query)->_addDescriptionFilter($query)
+            ->_addUrlKeyFilter($query)->addFieldToFilter($this->getCollectionFilter());
+
+        return $this;
+    }
+
+    /**
+     * Add name filter
+     *
+     * @param string $query
+     * @return Mage_XmlConnect_Model_Resource_CategorySearch_Collection
+     */
+    protected function _addNameFilter($query)
+    {
+        $collectionFilter = $this->getCollectionFilter();
+        $collectionFilter[] = array('attribute' => 'name', 'like' => $query . '%');
+        $this->setCollectionFilter($collectionFilter);
+        return $this;
+    }
+
+    /**
+     * Add description filter
+     *
+     * @param string $query
+     * @return Mage_XmlConnect_Model_Resource_CategorySearch_Collection
+     */
+    protected function _addDescriptionFilter($query)
+    {
+        $collectionFilter = $this->getCollectionFilter();
+        $collectionFilter[] = array('attribute' => 'description', 'like' => $query . '%');
+        $this->setCollectionFilter($collectionFilter);
+        return $this;
+    }
+
+    /**
+     * Add url key filter
+     *
+     * @param string $query
+     * @return Mage_XmlConnect_Model_Resource_CategorySearch_Collection
+     */
+    protected function _addUrlKeyFilter($query)
+    {
+        $collectionFilter = $this->getCollectionFilter();
+        $collectionFilter[] = array('attribute' => 'url_key', 'like' => $query . '%');
+        $this->setCollectionFilter($collectionFilter);
+        return $this;
+    }
+
+    /**
+     * Set collection filter
+     *
+     * @param array $collectionFilter
+     * @return Mage_XmlConnect_Model_Resource_CategorySearch_Collection
+     */
+    public function setCollectionFilter($collectionFilter)
+    {
+        $this->_collectionFilter = $collectionFilter;
+        return $this;
+    }
+
+    /**
+     * Get collection filter
+     *
+     * @return array
+     */
+    public function getCollectionFilter()
+    {
+        return $this->_collectionFilter;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Cms/Page/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/Cms/Page/Collection.php
index c81b2066291..2f2c38de432 100755
--- a/app/code/core/Mage/XmlConnect/Model/Resource/Cms/Page/Collection.php
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/Cms/Page/Collection.php
@@ -41,6 +41,9 @@ class Mage_XmlConnect_Model_Resource_Cms_Page_Collection extends Mage_Cms_Model_
      */
     public function toOptionIdArray()
     {
+        $model = $app = Mage::helper('xmlconnect')->getApplication();
+        $this->addStoreFilter($model->getStoreId());
+
         $res = array();
         $existingIdentifiers = array();
         foreach ($this as $item) {
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData.php b/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData.php
index f6a2399ee64..1fc8b1293c4 100644
--- a/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData.php
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData.php
@@ -69,12 +69,12 @@ public function saveConfig($applicationId, $category, $path, $value)
      * Delete config value
      *
      * @param int $applicationId
-     * @param bool $category
-     * @param bool $path
+     * @param string $category
+     * @param string $path
      * @param bool $pathLike
      * @return Mage_XmlConnect_Model_Mysql4_ConfigData
      */
-    public function deleteConfig($applicationId, $category = false, $path = false, $pathLike = true)
+    public function deleteConfig($applicationId, $category = '', $path = '', $pathLike = true)
     {
         try {
             $this->_getWriteAdapter()->beginTransaction();
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData/Collection.php
index 1f729b4627c..44f61c1e1fe 100644
--- a/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData/Collection.php
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData/Collection.php
@@ -125,9 +125,7 @@ public function addArrayFilter(array $array)
      * return items array
      * array(
      *      application_id => array(
-     *          category => array(
-     *              path
-     *          )
+     *          category => array(path)
      *      )
      * )
      *
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Filter/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/Filter/Collection.php
index ede671350c9..83209a27fab 100755
--- a/app/code/core/Mage/XmlConnect/Model/Resource/Filter/Collection.php
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/Filter/Collection.php
@@ -65,7 +65,6 @@ public function load($printQuery = false, $logQuery = false)
             }
             if ($layer->getCurrentCategory()->getIsAnchor()) {
                 foreach ($layer->getFilterableAttributes() as $attributeItem) {
-                    $filterModelName = 'catalog/layer_filter_attribute';
                     switch ($attributeItem->getAttributeCode()) {
                         case 'price':
                             $filterModelName = 'catalog/layer_filter_price';
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Images.php b/app/code/core/Mage/XmlConnect/Model/Resource/Images.php
new file mode 100644
index 00000000000..a79546eb414
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/Images.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect Images resource model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_Resource_Images extends Mage_Core_Model_Resource_Db_Abstract
+{
+    /**
+     * Initialize connection and define resource
+     *
+     */
+    protected function _construct()
+    {
+        $this->_init('xmlconnect/images', 'image_id');
+    }
+
+    /**
+     * Repair image order for application by type
+     *
+     * @param Mage_Core_Model_Abstract $image
+     * @return Mage_XmlConnect_Model_Resource_Images
+     */
+    public function repairOrder(Mage_Core_Model_Abstract $image)
+    {
+        $bind = array(':application_id' => (int)$image->getApplicationId(), ':image_type' => $image->getImageType());
+
+        $select = $this->_getWriteAdapter()->select()->from($this->getMainTable(), array('image_id'))
+            ->where('application_id=:application_id AND image_type=:image_type')
+            ->order('order', Varien_Data_Collection::SORT_ORDER_ASC);
+
+        $result = $this->_getWriteAdapter()->fetchCol($select, $bind);
+        $imageModel = Mage::getModel('xmlconnect/images');
+        $i = 0;
+        foreach ($result as $image_id) {
+            $imageModel->load($image_id)->setOrder(++$i)->save();
+        }
+        return $this;
+    }
+
+    /**
+     * Save image data
+     *
+     * @param int $applicationId
+     * @param string $imageFile
+     * @param string $imageType
+     * @param string $order
+     * @return Mage_XmlConnect_Model_Resource_Images
+     */
+    public function saveImage($applicationId, $imageFile, $imageType, $order)
+    {
+        $newData = array(
+            'application_id' => $applicationId,
+            'image_file'    => $imageFile,
+            'image_type'    => $imageType,
+            'order'     => $order
+        );
+
+        $this->_getWriteAdapter()->insert($this->getMainTable(), $newData);
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Images/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/Images/Collection.php
new file mode 100644
index 00000000000..aac28a2256c
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/Images/Collection.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect Images resource collection
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Xmlconnect_Model_Resource_Images_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
+{
+    /**
+     * Init resource model
+     */
+    protected function _construct()
+    {
+        $this->_init('xmlconnect/images');
+    }
+
+    /**
+     * Add application filter
+     *
+     * @param integer $appId
+     * @return Mage_Xmlconnect_Model_Images_Collection
+     */
+    public function addApplicationToFilter($appId)
+    {
+        $this->addFieldToFilter('application_id', $appId);
+        return $this;
+    }
+
+    /**
+     * Add image type filter
+     *
+     * @param integer $type
+     * @return Mage_Xmlconnect_Model_Images_Collection
+     */
+    public function addImageTypeToFilter($type)
+    {
+        $this->addFieldToFilter('image_type', $type);
+        return $this;
+    }
+
+    /**
+     * Set Order by position
+     *
+     * @return Mage_Xmlconnect_Model_Images_Collection
+     */
+    public function setPositionOrder()
+    {
+        $this->setOrder('main_table.order', self::SORT_ORDER_ASC);
+        return $this;
+    }
+
+    /**
+     * Sets a limit count and offset to the query.
+     *
+     * @param int $count OPTIONAL The number of rows to return.
+     * @param int $offset OPTIONAL Start returning after this many rows.
+     * @return Mage_Xmlconnect_Model_Resource_Images_Collection
+     */
+    public function setLimit($count = null, $offset = null)
+    {
+        $this->getSelect()->limit($count, $offset);
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Element.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Element.php
index 83605ace3fb..95e86f33055 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Element.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Element.php
@@ -42,7 +42,7 @@ class Mage_XmlConnect_Model_Simplexml_Element extends Varien_Simplexml_Element
     public function appendChild($source)
     {
         if (sizeof($source->children())) {
-            $name  = $source->getName();
+            $name = $source->getName();
             $child = $this->addChild($name);
         } else {
             $child = $this->addChild($source->getName(), $this->xmlentities($source));
@@ -97,7 +97,7 @@ public function escapeXml($data, $stripTags = true, $allowedTags = null)
      *
      * @param string $value
      * @param bool $stripTags
-     * @return string|this
+     * @return string|Mage_XmlConnect_Model_Simplexml_Element|null
      */
     public function xmlAttribute($value = null, $stripTags = true)
     {
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form.php
index 1cc3f0c2bb1..f7ce0c9808f 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form.php
@@ -352,7 +352,8 @@ public function getFieldContainerIdPrefix()
     public function toXmlObject()
     {
         $xmlObj = $this->getXmlObject();
-        if ($useContainer = $this->getUseContainer()) {
+        $useContainer = $this->getUseContainer();
+        if ($useContainer) {
             $this->_addRequiredAttributes($xmlObj);
             foreach ($this->getAttributes() as $key => $val) {
                 $xmlObj->addAttribute($key, $xmlObj->xmlAttribute($val));
@@ -385,4 +386,27 @@ public function getXml()
         }
         Mage::throwException(Mage::helper('xmlconnect')->__('Container is not defined.'));
     }
+
+    /**
+     * Add suffix to form element name
+     *
+     * @param string $name
+     * @param string  $suffix
+     * @return string
+     */
+    public function addSuffixToName($name, $suffix)
+    {
+        if (!$name) {
+            return $suffix;
+        }
+        $vars = explode('[', $name);
+        $newName = $suffix;
+        foreach ($vars as $index => $value) {
+            $newName .= '[' . $value;
+            if ($index == 0) {
+                $newName .= ']';
+            }
+        }
+        return $newName;
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Abstract.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Abstract.php
index 9400d1f63cd..0c8e0adc5dd 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Abstract.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Abstract.php
@@ -386,7 +386,7 @@ protected  function _addRequiredAttributes(Mage_XmlConnect_Model_Simplexml_Eleme
 
         foreach ($this->getRequiredXmlAttributes() as $attribute => $defValue) {
             $data = $this->getData($this->_underscore($attribute));
-            if ($data) {
+            if (null !== $data) {
                 $xmlObj->addAttribute($attribute, $xmlObj->xmlAttribute($data));
             } elseif(null !== $defValue){
                 $xmlObj->addAttribute($attribute, $xmlObj->xmlAttribute($defValue));
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Abstract.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Abstract.php
index c7be7c237a9..3af92a40762 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Abstract.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Abstract.php
@@ -118,6 +118,9 @@ public function getForm()
      */
     public function getXmlId()
     {
+        if (!$this->getForm()) {
+            return parent::getXmlId();
+        }
         return $this->getForm()->getXmlIdPrefix() . $this->getData('xml_id') . $this->getForm()->getXmlIdSuffix();
     }
 
@@ -129,7 +132,11 @@ public function getXmlId()
     public function getName()
     {
         $name = $this->getData('name');
-        if ($suffix = $this->getForm()->getFieldNameSuffix()) {
+        $suffix = null;
+        if ($this->getForm()) {
+            $suffix = $this->getForm()->getFieldNameSuffix();
+        }
+        if ($name && $suffix) {
             $name = $this->getForm()->addSuffixToName($name, $suffix);
         }
         return $name;
@@ -213,7 +220,6 @@ public function getElementXml()
         }
 
         $this->addAfterXmlElementToObj($xmlObj);
-
         return $xmlObj;
     }
 
@@ -291,7 +297,7 @@ public function getDefaultXml()
      */
     public function getXml()
     {
-        return $this->toXmlObject->asNiceXml();
+        return $this->toXmlObject()->asNiceXml();
     }
 
     /**
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/CountryListSelect.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/CountryListSelect.php
index 735ea487b07..58b212bec95 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/CountryListSelect.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/CountryListSelect.php
@@ -61,9 +61,10 @@ protected function _setValues()
         $value = $this->getValue();
 
         foreach ($this->_countryListValues as $param) {
-            if (isset($value[$param])) {
-                $this->setData($param, $value[$param]);
+            if (!isset($value[$param])) {
+                continue;
             }
+            $this->setData($param, $value[$param]);
         }
 
         return $this;
@@ -96,9 +97,9 @@ protected function _addOldStandardValue(Mage_XmlConnect_Model_Simplexml_Element
                     $selectedCountry = array('selected' => 1);
                 }
 
-                $item = $valuesXmlObj->addCustomChild('item', null,
-                    array('relation' => $relationType) + $selectedCountry
-                );
+                $item = $valuesXmlObj->addCustomChild('item', null, array(
+                    'relation' => $relationType
+                ) + $selectedCountry);
 
                 $item->addCustomChild('label', (string)$data['label']);
                 $item->addCustomChild('value', $data['value']);
@@ -132,6 +133,7 @@ protected function _addOldStandardValue(Mage_XmlConnect_Model_Simplexml_Element
     protected function _addValue(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
     {
         $this->_setValues();
+        $form = $this->getForm();
 
         if ($this->getOldFormat()) {
             $this->_addOldStandardValue($xmlObj);
@@ -147,20 +149,28 @@ protected function _addValue(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
             $values = $xmlObj->addCustomChild('values');
             foreach ($countries as $data) {
                 $regions = array();
-
+                $countryValueAttribute = '';
                 if ($data['value']) {
                     $regions = $this->_getRegionOptions($data['value']);
                 }
 
                 if (is_array($regions) && !empty($regions)) {
                     $relationType = 'region_id';
+                    $countryValueAttribute = $data['value'];
                 } else {
                     $relationType = 'region';
                 }
 
-                $item = $values->addCustomChild('item', null, array(
-                    'relation' => $relationType, 'label' => (string)$data['label'], 'value' => $data['value']
-                ));
+                $countryData = array(
+                    'relation'  => $relationType,
+                    'label'     => (string)$data['label']
+                );
+
+                if ($countryValueAttribute) {
+                    $countryData['value'] = $countryValueAttribute;
+                }
+
+                $item = $values->addCustomChild('item', $data['value'], $countryData);
 
                 if ($relationType !== 'region') {
 
@@ -169,24 +179,41 @@ protected function _addValue(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
                         $selectedRegion = array('value' => $this->getRegionId());
                     }
 
+                    $suffix = $form->getFieldNameSuffix();
+                    $regionFieldName = 'region_id';
+                    if ($suffix) {
+                        $regionFieldName = $form->addSuffixToName($regionFieldName, $suffix);
+                    }
+
                     $regionsXmlObj = $item->addCustomChild('field', null, array(
-                        'id' => 'region_list_' . $data['value'], 'name' => 'region_id',
-                        'label' => Mage::helper('xmlconnect')->__('State/Province'), 'type' => 'select',
-                        'required' => 1
-                    ) + $selectedRegion);
+                            'id'    => 'region_id_' . $data['value'],
+                            'name'  => $regionFieldName,
+                            'label' => Mage::helper('xmlconnect')->__('State/Province'),
+                            'type'  => 'select',
+                            'required' => 1
+                        ) + $selectedRegion
+                    );
 
                     $regionValues = $regionsXmlObj->addCustomChild('values');
 
                     foreach ($regions as $regionData) {
-                        $regionValues->addCustomChild('item', null, array(
-                            'label' => (string)$regionData['label'], 'value' => (string)$regionData['value']
+                        // Skip "Please select" item
+                        if ($regionData['value'] == 0) {
+                            continue;
+                        }
+                        $regionValues->addCustomChild('item', (string)$regionData['value'], array(
+                            'label' => (string)$regionData['label']
                         ));
                     }
                 } elseif ($this->getCountryId() == $data['value']) {
+                    $item->addAttribute('value', $data['value']);
                     $item->addCustomChild('field', null, array(
-                        'id' => 'region_' . $data['value'], 'name' => 'region',
-                        'label' => Mage::helper('xmlconnect')->__('State/Province'), 'type' => 'text',
-                        'value' => $this->getRegion(), 'required' => 1
+                        'id'    => 'region_' . $data['value'],
+                        'name'  => 'region',
+                        'label' => Mage::helper('xmlconnect')->__('State/Province'),
+                        'type'  => 'text',
+                        'value' => $this->getRegion(),
+                        'required' => 1
                     ));
                 }
             }
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Custom.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Custom.php
new file mode 100644
index 00000000000..ee7d7843929
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Custom.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Xmlconnect form custom element
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_Simplexml_Form_Element_Custom extends Mage_XmlConnect_Model_Simplexml_Form_Element_Abstract
+{
+    /**
+     * Init custom element
+     *
+     * @param array $attributes
+     */
+    public function __construct($attributes = array())
+    {
+        parent::__construct($attributes);
+        $this->setType('custom');
+    }
+
+    /**
+     * Add required attributes to validator rule
+     *
+     * @throws Mage_Core_Exception
+     * @param Mage_XmlConnect_Model_Simplexml_Element $xmlObj
+     * @return Mage_XmlConnect_Model_Simplexml_Form_Element_Custom
+     */
+    protected  function _addRequiredAttributes(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
+    {
+        $this->_addId($xmlObj);
+
+        foreach ($this->getRequiredXmlAttributes() as $attribute => $defValue) {
+            $data = $this->getData($this->_underscore($attribute));
+
+            if (null !== $data) {
+                $xmlObj->addAttribute($attribute, $xmlObj->xmlAttribute($data));
+            } elseif(null !== $defValue){
+                $xmlObj->addAttribute($attribute, $xmlObj->xmlAttribute($defValue));
+            } else {
+                Mage::throwException(Mage::helper('xmlconnect')->__('%s attribute is required.', $attribute));
+            }
+        }
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Date.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Date.php
index 27797d28439..b839376c5be 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Date.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Date.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Model_Simplexml_Form_Element_Date
-    extends Mage_XmlConnect_Model_Simplexml_Form_Element_Abstract
+class Mage_XmlConnect_Model_Simplexml_Form_Element_Date extends Mage_XmlConnect_Model_Simplexml_Form_Element_Abstract
 {
     /**
      * Init multiline element
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Email.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Email.php
index 6b00f4b2efb..436f836e94e 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Email.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Email.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Model_Simplexml_Form_Element_Email
-    extends Mage_XmlConnect_Model_Simplexml_Form_Element_Abstract
+class Mage_XmlConnect_Model_Simplexml_Form_Element_Email extends Mage_XmlConnect_Model_Simplexml_Form_Element_Abstract
 {
     /**
      * Init email element
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Fieldset.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Fieldset.php
index 865f50d00b9..b6b0abf1548 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Fieldset.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Fieldset.php
@@ -86,9 +86,11 @@ public function getElementXml()
         foreach ($this->getAttributes() as $key => $val) {
             $xmlObj->addAttribute($key, $xmlObj->xmlAttribute($val));
         }
+
         foreach ($this->getChildrenXml(false) as $element) {
             $xmlObj->appendChild($element);
         }
+
         foreach ($this->getChildrenXml(true) as $fieldset) {
             $xmlObj->appendChild($fieldset);
         }
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/File.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/File.php
index d58c73f06b2..ba4c5cf4676 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/File.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/File.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Model_Simplexml_Form_Element_File
-    extends Mage_XmlConnect_Model_Simplexml_Form_Element_Abstract
+class Mage_XmlConnect_Model_Simplexml_Form_Element_File extends Mage_XmlConnect_Model_Simplexml_Form_Element_Abstract
 {
     /**
      * Init text element
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Image.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Image.php
index 3203054ec19..6a8b153b5ac 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Image.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Image.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Model_Simplexml_Form_Element_Image
-    extends Mage_XmlConnect_Model_Simplexml_Form_Element_File
+class Mage_XmlConnect_Model_Simplexml_Form_Element_Image extends Mage_XmlConnect_Model_Simplexml_Form_Element_File
 {
     /**
      * Init text element
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiline.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiline.php
index 51bc8af7666..16060ced71d 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiline.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiline.php
@@ -71,10 +71,7 @@ public function __construct($attributes = array())
      */
     public function getRequiredXmlAttributes()
     {
-        return array(
-            'label' => null,
-            'type' => null
-        );
+        return array('label' => null, 'type' => null);
     }
 
     /**
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiselect.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiselect.php
index 2dbc66dad8f..8ff1a925355 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiselect.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiselect.php
@@ -60,7 +60,6 @@ protected function _addValue(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
 
         $valuesXmlObj = $xmlObj->addCustomChild('values');
         foreach ($this->getOptions() as $option) {
-
             if (empty($option['value'])) {
                 continue;
             }
@@ -70,10 +69,7 @@ protected function _addValue(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
                 $selected = array('selected' => 1);
             }
 
-            $valuesXmlObj->addCustomChild('item', null, array(
-                'label' => $option['label'],
-                'value' => $option['value']
-            ) + $selected);
+            $valuesXmlObj->addCustomChild('item', $option['value'], array('label' => $option['label']) + $selected);
         }
 
         return $this;
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Password.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Password.php
new file mode 100644
index 00000000000..8b9d2d241b0
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Password.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Xmlconnect form password element
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_Simplexml_Form_Element_Password
+    extends Mage_XmlConnect_Model_Simplexml_Form_Element_Abstract
+{
+    /**
+     * Init password element
+     *
+     * @param array $attributes
+     */
+    public function __construct($attributes = array())
+    {
+        parent::__construct($attributes);
+        $this->setType('password');
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Select.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Select.php
index ac5c798b3f5..073a611705b 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Select.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Select.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Model_Simplexml_Form_Element_Select
-    extends Mage_XmlConnect_Model_Simplexml_Form_Element_Abstract
+class Mage_XmlConnect_Model_Simplexml_Form_Element_Select extends Mage_XmlConnect_Model_Simplexml_Form_Element_Abstract
 {
     /**
      * Init text element
@@ -55,10 +54,7 @@ protected function _addValue(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
     {
         $value = $this->getEscapedValue();
         if ($value !== null) {
-            $xmlObj->addAttribute(
-                'value',
-                $xmlObj->xmlAttribute($value)
-            );
+            $xmlObj->addAttribute('value', $xmlObj->xmlAttribute($value));
         }
         $this->_addOptions($xmlObj);
 
@@ -76,15 +72,10 @@ protected function _addOptions(Mage_XmlConnect_Model_Simplexml_Element $xmlObj)
         if ($this->getOptions() && is_array($this->getOptions())) {
             $valuesXmlObj = $xmlObj->addCustomChild('values');
             foreach ($this->getOptions() as $option) {
-
-                if (!isset($option['value']) || $option['value'] == '') {
+                if (empty($option['value'])) {
                     continue;
                 }
-
-                $valuesXmlObj->addCustomChild('item', null, array(
-                    'label' => $option['label'],
-                    'value' => $option['value']
-                ));
+                $valuesXmlObj->addCustomChild('item', $option['value'], array('label' => $option['label']));
             }
         }
     }
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Text.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Text.php
index 38d96a3c736..80870ff074b 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Text.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Text.php
@@ -31,8 +31,7 @@
  * @package     Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Model_Simplexml_Form_Element_Text
-    extends Mage_XmlConnect_Model_Simplexml_Form_Element_Abstract
+class Mage_XmlConnect_Model_Simplexml_Form_Element_Text extends Mage_XmlConnect_Model_Simplexml_Form_Element_Abstract
 {
     /**
      * Init text element
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Message.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Message.php
new file mode 100644
index 00000000000..2e1221a528c
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Message.php
@@ -0,0 +1,267 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect simple message class
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_Simplexml_Message extends Varien_Object
+{
+    /**
+     * Message status `error`
+     */
+    const MESSAGE_STATUS_ERROR      = 'error';
+
+    /**
+     * Message status `warning`
+     */
+    const MESSAGE_STATUS_WARNING    = 'warning';
+
+    /**
+     * Message status `success`
+     */
+    const MESSAGE_STATUS_SUCCESS    = 'success';
+
+    /**
+     * Error message decorator
+     *
+     * @var Mage_XmlConnect_Model_Simplexml_Message_Abstract
+     */
+    protected $_messageRenderer;
+
+    /**
+     * Message status
+     *
+     * @var string
+     */
+    protected $_messageStatus;
+
+    /**
+     * Message code
+     *
+     * @var string
+     */
+    protected $_messageCode;
+
+    /**
+     * Message text
+     *
+     * @var string|null
+     */
+    protected $_messageText;
+
+    /**
+     * Children message params
+     *
+     * @var array
+     */
+    protected $_children = array();
+
+    /**
+     * Flag error in processing the message
+     *
+     * @var bool
+     */
+    protected $_flagError = false;
+
+    /**
+     * Init simple xml message
+     *
+     * @param string $messageCode
+     */
+    public function __construct($messageCode)
+    {
+        $this->setMessageCode($messageCode)->_setMessageStatus();
+
+        switch ($this->getMessageStatus()) {
+            case self::MESSAGE_STATUS_SUCCESS:
+            case self::MESSAGE_STATUS_WARNING:
+                $renderer = self::MESSAGE_STATUS_SUCCESS;
+                break;
+            case self::MESSAGE_STATUS_ERROR:
+                $renderer = self::MESSAGE_STATUS_ERROR;
+                break;
+            default:
+                $this->setMessageCode(Mage_XmlConnect_Model_Simplexml_Message_Error::ERROR_SERVER_SP_DEFAULT)
+                    ->setMessageText(Mage::helper('xmlconnect')->__('Message type doesn\'t recognized'))
+                    ->_setMessageStatus()->_setFlagError(true);
+                $renderer = self::MESSAGE_STATUS_ERROR;
+                break;
+        }
+        $this->_setMessageRenderer(Mage::getModel('xmlconnect/simplexml_message_' . $renderer, $this));
+    }
+
+    /**
+     * Get message type
+     *
+     * @return Mage_XmlConnect_Model_Simplexml_Message
+     */
+    protected function _setMessageStatus()
+    {
+        list($messageType) = explode('_', $this->_messageCode);
+        $this->_messageStatus = $messageType;
+        return $this;
+    }
+
+    /**
+     * Get message status
+     *
+     * @return string
+     */
+    public function getMessageStatus()
+    {
+        return $this->_messageStatus;
+    }
+
+    /**
+     * Get message text
+     *
+     * @return string|null
+     */
+    public function getMessageText()
+    {
+        return $this->_messageText;
+    }
+
+    /**
+     * set message text
+     *
+     * @param string $text
+     * @return Mage_XmlConnect_Model_Simplexml_Message
+     */
+    public function setMessageText($text)
+    {
+        if (!$this->_getFlagError()) {
+            $this->_messageText = $text;
+        }
+        return $this;
+    }
+
+    /**
+     * Get message code
+     *
+     * @return string
+     */
+    public function getMessageCode()
+    {
+        return $this->_messageCode;
+    }
+
+    /**
+     * Set message code
+     *
+     * @param string $messageCode
+     * @return Mage_XmlConnect_Model_Simplexml_Message
+     */
+    public function setMessageCode($messageCode)
+    {
+        if (!$this->_getFlagError()) {
+            $this->_messageCode = $messageCode;
+        }
+        return $this;
+    }
+
+    /**
+     * Convert object attributes to string
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->_getMessageRenderer()->getMessage();
+    }
+
+    /**
+     * Set children message params
+     *
+     * @param array $children
+     * @return Mage_XmlConnect_Model_Simplexml_Message
+     */
+    public function setChildren($children)
+    {
+        if (!$this->_getFlagError()) {
+            $this->_children = $children;
+        }
+        return $this;
+    }
+
+    /**
+     * Set children message params
+     *
+     * @return array
+     */
+    public function getChildren()
+    {
+        return $this->_children;
+    }
+
+    /**
+     * Get message renderer
+     *
+     * @return Mage_XmlConnect_Model_Simplexml_Message_Abstract
+     */
+    protected function _getMessageRenderer()
+    {
+        return $this->_messageRenderer;
+    }
+
+    /**
+     * Set message renderer
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Message_Abstract $messageRenderer
+     * @return Mage_XmlConnect_Model_Simplexml_Message
+     */
+    protected function _setMessageRenderer($messageRenderer)
+    {
+        $this->_messageRenderer = $messageRenderer;
+        return $this;
+    }
+
+    /**
+     * Get flag error in processing
+     *
+     * @return boolean
+     */
+    public function _getFlagError()
+    {
+        return $this->_flagError;
+    }
+
+    /**
+     * Set flag error in processing
+     *
+     * @param boolean $flagError
+     * @return Mage_XmlConnect_Model_Simplexml_Message
+     */
+    public function _setFlagError($flagError)
+    {
+        $this->_flagError = $flagError;
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Abstract.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Abstract.php
new file mode 100644
index 00000000000..5cd3fbcead1
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Abstract.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect message abstract class
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+abstract class Mage_XmlConnect_Model_Simplexml_Message_Abstract extends Varien_Object
+{
+    /**
+     * Simple Xml object
+     *
+     * @var Mage_XmlConnect_Model_Simplexml
+     */
+    protected $_xmlObject;
+
+    /**
+     * Message model
+     *
+     * @var Mage_XmlConnect_Model_Simplexml_Message
+     */
+    protected $_messageModel;
+
+    /**
+     * Init simple xml message
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Message $messageModel
+     */
+    public function __construct($messageModel)
+    {
+        $this->_xmlObject = Mage::getModel('xmlconnect/simplexml_element', '<message></message>');
+        $this->_messageModel = $messageModel;
+    }
+
+    /**
+     * Get message xml
+     *
+     * @abstract
+     * @return string
+     */
+    abstract public function getMessage();
+
+    /**
+     * Get simple xml message object
+     *
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    protected function _getXmlObject()
+    {
+        return $this->_xmlObject;
+    }
+
+    /**
+     * Get message code
+     *
+     * @return string
+     */
+    protected function _getMessageCode()
+    {
+        return $this->_messageModel->getMessageCode();
+    }
+
+    /**
+     * Set message code
+     *
+     * @param string $messageCode
+     * @return Mage_XmlConnect_Model_Simplexml_Message_Abstract
+     */
+    protected function _setMessageCode($messageCode)
+    {
+        $this->_messageModel->setMessageCode($messageCode);
+        return $this;
+    }
+
+    /**
+     * Get message text
+     *
+     * @return null|string
+     */
+    protected function _getMessageText()
+    {
+        return $this->_messageModel->getMessageText();
+    }
+
+    /**
+     * Set message text
+     *
+     * @param string $text
+     * @return Mage_XmlConnect_Model_Simplexml_Message_Abstract
+     */
+    protected function _setMessageText($text)
+    {
+        $this->_messageModel->setMessageText($text);
+        return $this;
+    }
+
+    /**
+     * Get message status
+     *
+     * @return string
+     */
+    protected function _getMessageStatus()
+    {
+        return $this->_messageModel->getMessageStatus();
+    }
+
+    /**
+     * Get message children
+     *
+     * @return array
+     */
+    protected function _getChildren()
+    {
+        return $this->_messageModel->getChildren();
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Error.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Error.php
new file mode 100644
index 00000000000..2601b7970d8
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Error.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect error message class
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_Simplexml_Message_Error extends Mage_XmlConnect_Model_Simplexml_Message_Abstract
+{
+    /**
+     * User space default error type
+     */
+    const ERROR_USER_SPACE_DEFAULT = 'error_1000';
+
+    /**
+     * User space account confirmation required
+     */
+    const ERROR_USER_SP_ACCOUNT_CONFIRMATION = 'error_1001';
+
+    /**
+     * User data validation error
+     */
+    const ERROR_USER_SP_DATA_VALIDATION = 'error_1002';
+
+    /**
+     * User data validation error
+     */
+    const ERROR_USER_SP_ACCESS_FORBIDDEN = 'error_1003';
+
+    /**
+     * Client space error default
+     */
+    const ERROR_CLIENT_SP_DEFAULT = 'error_2000';
+
+    /**
+     * User session is expired
+     */
+    const ERROR_CLIENT_SP_SESSION_EXPIRED = 'error_2001';
+
+    /**
+     * Configuration reload required
+     */
+    const ERROR_CLIENT_SP_CONFIG_RELOAD_REQUIRED = 'error_2002';
+
+    /**
+     * Server space default error type
+     */
+    const ERROR_SERVER_SP_DEFAULT = 'error_3000';
+
+    /**
+     * Undefined error type
+     */
+    const ERROR_UNDEFINED = 'error_0';
+
+    /**
+     * Get custom error message list
+     *
+     * @return array
+     */
+    protected function _getCustomMessageList()
+    {
+        return array(
+            self::ERROR_CLIENT_SP_SESSION_EXPIRED => Mage::helper('xmlconnect')->__('User session is expired'),
+            self::ERROR_USER_SP_ACCESS_FORBIDDEN => Mage::helper('xmlconnect')->__('Access forbidden')
+        );
+    }
+
+    /**
+     * Get message xml
+     *
+     * @return string
+     */
+    public function getMessage()
+    {
+        $this->_getXmlObject()->addCustomChild('status', $this->_getMessageStatus());
+        if (!$this->_getMessageText()) {
+            $this->_setMessageText($this->_getCustomMessageByCode());
+        }
+        $this->_getXmlObject()->addCustomChild('text', $this->_getMessageText());
+        $this->_getXmlObject()->addCustomChild('error_level', substr($this->_getMessageCode(), 6));
+        return $this->_getXmlObject()->asNiceXml();
+    }
+
+    /**
+     * Get custom message by error code
+     *
+     * @return string
+     */
+    protected  function _getCustomMessageByCode()
+    {
+        $messages = $this->_getCustomMessageList();
+        if (!array_key_exists($this->_getMessageCode(), $messages)){
+            $this->_setMessageCode(self::ERROR_SERVER_SP_DEFAULT);
+            return Mage::helper('xmlconnect')->__('Error message text is missed.');
+        } else {
+            return $messages[$this->_getMessageCode()];
+        }
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Success.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Success.php
new file mode 100644
index 00000000000..77732d275c7
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Message/Success.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect success message class
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_Simplexml_Message_Success extends Mage_XmlConnect_Model_Simplexml_Message_Abstract
+{
+    /**
+     * Get message xml
+     *
+     * @return string
+     */
+    public function getMessage()
+    {
+        $this->_getXmlObject()->addCustomChild('status', $this->_getMessageStatus());
+        if (!$this->_getMessageText()) {
+            $this->_setMessageText(Mage::helper('xmlconnect')->__('Message text is missed.'));
+        }
+        $this->_getXmlObject()->addCustomChild('text', $this->_getMessageText());
+        if ($this->_getChildren()) {
+            $extDataXmlObj = $this->_getXmlObject()->addCustomChild('extended_data');
+            foreach($this->_getChildren() as $key => $val) {
+                $extDataXmlObj->addCustomChild('item', $val, array('name' => $key));
+            }
+        }
+        return $this->_getXmlObject()->asNiceXml();
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Theme.php b/app/code/core/Mage/XmlConnect/Model/Theme.php
index d7ed1a226b4..0a0d483250c 100644
--- a/app/code/core/Mage/XmlConnect/Model/Theme.php
+++ b/app/code/core/Mage/XmlConnect/Model/Theme.php
@@ -233,14 +233,14 @@ public function getFormData()
     /**
      * Load data (flat array) for Varien_Data_Form
      *
-     * @param array $subtree
+     * @param array $subTree
      * @param string $prefix
      * @return array
      */
-    protected function _flatArray($subtree, $prefix = null)
+    protected function _flatArray($subTree, $prefix = null)
     {
         $result = array();
-        foreach ($subtree as $key => $value) {
+        foreach ($subTree as $key => $value) {
             if (is_null($prefix)) {
                 $name = $key;
             } else {
@@ -296,7 +296,7 @@ protected function _validateFormInput($data, $xml = null)
      */
     protected function _buildRecursive($parent, $data)
     {
-        foreach ($data as $key=>$value) {
+        foreach ($data as $key => $value) {
             if (is_array($value)) {
                 $this->_buildRecursive($parent->addChild($key), $value);
             } else {
@@ -308,12 +308,13 @@ protected function _buildRecursive($parent, $data)
     /**
      * Import data into theme form $data array, and save XML to file
      *
+     * @throws Mage_Core_Exception
      * @param array $data
      * @return null
      */
     public function importAndSaveData($data)
     {
-        $xml = new SimpleXMLElement('<theme>'.$this->_xml->manifest->asXML().'</theme>');
+        $xml = new SimpleXMLElement('<theme>' . $this->_xml->manifest->asXML() . '</theme>');
         $this->_buildRecursive($xml->addChild('configuration'), $this->_validateFormInput($data));
         clearstatcache();
         if (is_writeable($this->_file)) {
diff --git a/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Admin/ApplicationController.php b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Admin/ApplicationController.php
new file mode 100644
index 00000000000..2b68821e51c
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Admin/ApplicationController.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect Adminhtml mobile controller
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Adminhtml_Admin_ApplicationController extends Mage_Adminhtml_Controller_Action
+{
+    /**
+     * Admin application settings action
+     */
+    public function indexAction()
+    {
+        try {
+            $isActive = $this->getRequest()->getParam('is_active', false);
+            if (false !== $isActive) {
+                Mage::getSingleton('xmlconnect/configuration')->saveIsActiveAdminApp($isActive);
+                $this->_getSession()->addSuccess($this->__('Configuration data have been saved'));
+            }
+            $this->loadLayout();
+            $this->_setActiveMenu('xmlconnect/mobile_admin_app');
+            $this->renderLayout();
+        } catch (Mage_Core_Exception $e) {
+            $this->_getSession()->addError($e->getMessage());
+            $this->_redirect('*/*/');
+        } catch (Exception $e) {
+            Mage::logException($e);
+            $this->_getSession()->addException($e, $this->__('Can\'t load admin application settings.'));
+            $this->_redirect('*/*/');
+        }
+    }
+
+    /**
+     * Check the permission to run it
+     *
+     * @return boolean
+     */
+    protected function _isAllowed()
+    {
+        return Mage::getSingleton('admin/session')->isAllowed('xmlconnect/admin_connect');
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/ConfigController.php b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/ConfigController.php
new file mode 100644
index 00000000000..a963d218c5f
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/ConfigController.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect Adminhtml mobile configuration controller
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Adminhtml_Connect_ConfigController extends Mage_XmlConnect_Controller_AdminAction
+{
+    /**
+     * Configuration action
+     */
+    public function indexAction()
+    {
+        try {
+            if (!$this->_initCookies()) {
+                return;
+            }
+            $this->loadLayout(false);
+            $this->renderLayout();
+        } catch (Mage_Core_Exception $e) {
+            Mage::logException($e);
+            $this->_message(Mage_XmlConnect_Model_Simplexml_Message_Error::ERROR_USER_SPACE_DEFAULT, $e->getMessage());
+        } catch (Exception $e) {
+            Mage::logException($e);
+            $this->_message(
+                Mage_XmlConnect_Model_Simplexml_Message_Error::ERROR_SERVER_SP_DEFAULT,
+                $this->__('An error occurred while loading configuration.')
+            );
+        }
+    }
+
+    /**
+     * Localization action
+     */
+    public function localizationAction()
+    {
+        try {
+            $this->loadLayout(false);
+            $this->renderLayout();
+        } catch (Mage_Core_Exception $e) {
+            Mage::logException($e);
+            $this->_message(Mage_XmlConnect_Model_Simplexml_Message_Error::ERROR_USER_SPACE_DEFAULT, $e->getMessage());
+        } catch (Exception $e) {
+            Mage::logException($e);
+            $this->_message(
+                Mage_XmlConnect_Model_Simplexml_Message_Error::ERROR_SERVER_SP_DEFAULT,
+                $this->__('An error occurred while loading localization.')
+            );
+        }
+    }
+
+    /**
+     * Set admin application cookies
+     *
+     * Set application cookies: application code and device screen size.
+     *
+     * @return bool
+     */
+    protected function _initCookies()
+    {
+        $cookieToSetArray = array(
+            array(
+                'cookieName'    => self::DEVICE_TYPE_COOKIE_NAME,
+                'paramName'     => self::DEVICE_TYPE_COOKIE_NAME,
+            ),
+            array(
+                'cookieName'    => Mage_XmlConnect_Model_Application::APP_SCREEN_SIZE_NAME,
+                'paramName'     => Mage_XmlConnect_Model_Application::APP_SCREEN_SIZE_NAME,
+        ));
+
+        $cookieExpireOffset = 3600 * 24 * 30;
+        foreach ($cookieToSetArray as $item) {
+            if ($this->getRequest()->getParam($item['paramName'], false)) {
+                Mage::getSingleton('core/cookie')->set(
+                    $item['cookieName'],
+                    $this->getRequest()->getParam($item['paramName']),
+                    $cookieExpireOffset, '/', null, null, true
+                );
+            } else {
+                $this->_message(
+                    Mage_XmlConnect_Model_Simplexml_Message_Error::ERROR_CLIENT_SP_DEFAULT,
+                    $this->__('Request param %s is missed', $item['paramName'])
+                );
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Is check cookie required flag
+     *
+     * @return bool
+     */
+    protected function _isCheckCookieRequired()
+    {
+        return false;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/DashboardController.php b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/DashboardController.php
new file mode 100644
index 00000000000..43b80118df9
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/DashboardController.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect Adminhtml mobile dashboard controller
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Adminhtml_Connect_DashboardController extends Mage_XmlConnect_Controller_AdminAction
+{
+    /**
+     * Dashboard index action
+     */
+    public function indexAction()
+    {
+        try {
+            $this->loadLayout(false);
+            $this->renderLayout();
+        } catch (Mage_Core_Exception $e) {
+            Mage::logException($e);
+            $this->_message(Mage_XmlConnect_Model_Simplexml_Message_Error::ERROR_USER_SPACE_DEFAULT, $e->getMessage());
+        } catch (Exception $e) {
+            Mage::logException($e);
+            $this->_message(
+                Mage_XmlConnect_Model_Simplexml_Message_Error::ERROR_SERVER_SP_DEFAULT,
+                $this->__('An error occurred while loading configuration.')
+            );
+        }
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/UserController.php b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/UserController.php
new file mode 100644
index 00000000000..ed203ffa337
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/Connect/UserController.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect Adminhtml mobile user controller
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Adminhtml_Connect_UserController extends Mage_XmlConnect_Controller_AdminAction
+{
+    /**
+     * Get admin user session
+     *
+     * @return Mage_Admin_Model_Session
+     */
+    protected function _getSession()
+    {
+        return Mage::getSingleton('admin/session');
+    }
+
+    /**
+     * Login form action
+     */
+    public function loginFormAction()
+    {
+        try {
+            $result = $this->loadLayout(false)->getLayout()
+                ->addBlock('xmlconnect/adminhtml_connect_loginform', 'login_form')->toHtml();
+            $this->getResponse()->setBody($result);
+        } catch (Mage_Core_Exception $e) {
+            Mage::logException($e);
+            $this->_message(Mage_XmlConnect_Model_Simplexml_Message_Error::ERROR_USER_SPACE_DEFAULT, $e->getMessage());
+        } catch (Exception $e) {
+            Mage::logException($e);
+            $this->_message(
+                Mage_XmlConnect_Model_Simplexml_Message_Error::ERROR_SERVER_SP_DEFAULT,
+                $this->__('An error occurred while loading login form.')
+            );
+        }
+    }
+
+    /**
+     * User login action
+     */
+    public function loginAction()
+    {
+        try {
+            $session = $this->_getSession();
+            $request = $this->getRequest();
+
+            if ($session->isLoggedIn()) {
+                $this->_message(
+                    Mage_XmlConnect_Model_Simplexml_Message::MESSAGE_STATUS_SUCCESS,
+                    $this->__('Authentication complete.')
+                );
+                return;
+            }
+
+            $postLogin = $request->getPost('login_info');
+            $request->setPost('login_info', null);
+            if ($postLogin) {
+                $username = isset($postLogin['username']) ? $postLogin['username'] : '';
+                $password = isset($postLogin['password']) ? $postLogin['password'] : '';
+                $user = $session->login($username, $password);
+                $request->setPost('login', null);
+                if ($user && $session->isLoggedIn()) {
+                    $this->_message(
+                        Mage_XmlConnect_Model_Simplexml_Message::MESSAGE_STATUS_SUCCESS,
+                        $this->__('Authentication complete.')
+                    );
+                    return;
+                } else {
+                    $this->_message(
+                        Mage_XmlConnect_Model_Simplexml_Message_Error::ERROR_USER_SPACE_DEFAULT,
+                        $this->__('Invalid login or password.')
+                    );
+                    return;
+                }
+            }
+            $this->_message(
+                Mage_XmlConnect_Model_Simplexml_Message_Error::ERROR_CLIENT_SP_DEFAULT,
+                $this->__('Post data is empty.')
+            );
+        } catch (Mage_Core_Exception $e) {
+            $this->_message(Mage_XmlConnect_Model_Simplexml_Message_Error::ERROR_USER_SPACE_DEFAULT, $e->getMessage());
+        } catch (Exception $e) {
+            Mage::logException($e);
+            $this->_message(
+                Mage_XmlConnect_Model_Simplexml_Message_Error::ERROR_SERVER_SP_DEFAULT,
+                $this->__('An error occurred while loading login form.')
+            );
+        }
+    }
+
+    /**
+     * User logout action
+     */
+    public function logoutAction()
+    {
+        try {
+            $this->_getSession()->unsetAll();
+            $this->_getSession()->getCookie()->delete($this->_getSession()->getSessionName());
+            $this->_message(
+                Mage_XmlConnect_Model_Simplexml_Message::MESSAGE_STATUS_SUCCESS,
+                Mage::helper('adminhtml')->__('You have logged out.')
+            );
+        } catch (Mage_Core_Exception $e) {
+            $this->_message(Mage_XmlConnect_Model_Simplexml_Message_Error::ERROR_USER_SPACE_DEFAULT, $e->getMessage());
+        } catch (Exception $e) {
+            Mage::logException($e);
+            $this->_message(
+                Mage_XmlConnect_Model_Simplexml_Message_Error::ERROR_SERVER_SP_DEFAULT,
+                $this->__('An error occurred while loading login form.')
+            );
+        }
+    }
+
+    /**
+     * Check the permission to run actions
+     *
+     * @return boolean
+     */
+    protected function _isAllowed()
+    {
+        if (!Mage::getSingleton('xmlconnect/configuration')->isActiveAdminApp()) {
+            $this->_forward('denied');
+        }
+        return true;
+    }
+
+    /**
+     * Is check cookie required flag
+     *
+     * @return bool
+     */
+    protected function _isCheckCookieRequired()
+    {
+        return false;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php
index f054be13cbf..e80dc611db8 100644
--- a/app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php
@@ -37,10 +37,10 @@ class Mage_XmlConnect_Adminhtml_MobileController extends Mage_Adminhtml_Controll
      * Initialize application
      *
      * @param string $paramName
-     * @param bool|string $type
+     * @param bool|string $deviceType
      * @return Mage_XmlConnect_Model_Application
      */
-    protected function _initApp($paramName = 'application_id', $type = false)
+    protected function _initApp($paramName = 'application_id', $deviceType = false)
     {
         $id = (int) $this->getRequest()->getParam($paramName);
         $app = Mage::getModel('xmlconnect/application');
@@ -50,7 +50,7 @@ protected function _initApp($paramName = 'application_id', $type = false)
                 $app->loadConfiguration();
             }
         } else {
-            $app->setType($type);
+            $app->setType($deviceType);
             Mage::register('current_app', $app);
             $app->loadDefaultConfiguration();
             Mage::unregister('current_app');
@@ -62,6 +62,7 @@ protected function _initApp($paramName = 'application_id', $type = false)
     /**
      * Restore data from session $_POST and $_FILES (processed)
      *
+     * @todo remove this method from controller
      * @param array $data
      * @return array|null
      */
@@ -195,6 +196,7 @@ public function editAction()
         } catch (Mage_Core_Exception $e) {
             $this->_getSession()->addError($e->getMessage());
             $redirectBack = true;
+            Mage::logException($e);
         } catch (Exception $e) {
             $this->_getSession()->addError($this->__('Unable to load application form.'));
             $redirectBack = true;
@@ -226,8 +228,10 @@ public function submissionPostAction()
             if (!empty($newAppData)) {
                 $app->setData(Mage::helper('xmlconnect')->arrayMergeRecursive($app->getData(), $newAppData));
             }
+
             $params = $app->prepareSubmitParams($data);
             $errors = $app->validateSubmit($params);
+
             if ($errors !== true) {
                 foreach ($errors as $err) {
                     $this->_getSession()->addError($err);
@@ -238,10 +242,14 @@ public function submissionPostAction()
                 $this->_processPostRequest();
                 $history = Mage::getModel('xmlconnect/history');
                 $history->setData(array(
-                    'params' => $params, 'application_id' => $app->getId(),
-                    'created_at' => Mage::getModel('core/date')->date(), 'store_id' => $app->getStoreId(),
-                    'title' => isset($params['title']) ? $params['title'] : '', 'name' => $app->getName(),
-                    'code' => $app->getCode(), 'activation_key' => isset($params['resubmission_activation_key'])
+                    'params' => $params,
+                    'application_id' => $app->getId(),
+                    'created_at' => Mage::getModel('core/date')->date(),
+                    'store_id' => $app->getStoreId(),
+                    'title' => isset($params['title']) ? $params['title'] : '',
+                    'name' => $app->getName(),
+                    'code' => $app->getCode(),
+                    'activation_key' => isset($params['resubmission_activation_key'])
                         ? $params['resubmission_activation_key'] : $params['key'],
                 ));
                 $history->save();
@@ -299,7 +307,7 @@ protected function _filterFormDataForSession($data)
      * Clear session data
      * Used after successful save/submit action
      *
-     * @return this
+     * @return Mage_XmlConnect_Adminhtml_MobileController
      */
     protected function _clearSessionData()
     {
@@ -322,24 +330,26 @@ protected function _processPostRequest()
             $params = $app->getSubmitParams();
 
             $appConnectorUrl = Mage::getStoreConfig('xmlconnect/mobile_application/magentocommerce_url');
-
-            $curl = new Varien_Http_Adapter_Curl();
-            $verifyPeerValue = Mage::getStoreConfig('xmlconnect/mobile_application/curl_ssl_verifypeer');
-            $curl->setConfig(array(
-                'timeout' => Mage_XmlConnect_Helper_Data::CURLOPT_DEFAULT_TIMEOUT,
-                'verifypeer' => $verifyPeerValue, 'verifyhost' => 2, 'header' => false
-            ));
-
-            $mCommerceUrl = $appConnectorUrl . $params['key'];
-            $curl->write(Zend_Http_Client::POST, $mCommerceUrl, CURL_HTTP_VERSION_1_1, array(), $params);
-
-            $result = $curl->read();
-            if(false === $result) {
-                Mage::log('Curl error: ' . $curl->getError());
-                $curl->close();
-                Mage::throwException($this->__('Request internal error.'));
+            $curlHandler = curl_init($appConnectorUrl . $params['key']);
+
+            // set URL and other appropriate options
+            curl_setopt($curlHandler, CURLOPT_POST, 1);
+            curl_setopt($curlHandler, CURLOPT_POSTFIELDS, $params);
+            curl_setopt($curlHandler, CURLOPT_SSL_VERIFYHOST, 2);
+            curl_setopt($curlHandler, CURLOPT_RETURNTRANSFER, 1);
+            curl_setopt($curlHandler, CURLOPT_SSL_VERIFYPEER, 0);
+            curl_setopt($curlHandler, CURLOPT_TIMEOUT, 60);
+
+            // Execute the request.
+            $result = curl_exec($curlHandler);
+
+            if (curl_exec($curlHandler) === false) {
+                Mage::log('Curl error: ' . curl_error($curlHandler));
+                Mage::log(curl_getinfo($curlHandler));
             }
-            $curl->close();
+
+            // close cURL resource, and free up system resources
+            curl_close($curlHandler);
 
             // Assert that we received an expected message in reponse.
             $resultArray = json_decode($result, true);
@@ -353,7 +363,14 @@ protected function _processPostRequest()
                 if (is_array($message)) {
                     $message = implode(' ,', $message);
                 }
-                Mage::throwException($this->__('Submit App failure. %s', $message));
+
+                if (isset($params['resubmission_activation_key'])) {
+                    $message = $this->__('Resubmit App failure. %s', $message);
+                } else {
+                    $message = $this->__('Submit App failure. %s', $message);
+                }
+
+                Mage::throwException($message);
             }
         } catch (Exception $e) {
             throw $e;
@@ -383,7 +400,7 @@ public function saveAction()
                         $isError = true;
                     }
                 }
-
+                /** @var $app Mage_XmlConnect_Model_Application */
                 $app = $this->_initApp('application_id', $data['devtype']);
                 if (!$app->getId() && $id) {
                     $this->_getSession()->addError($this->__('App does not exist.'));
@@ -524,6 +541,17 @@ protected function _convertPost($data)
         return $conf;
     }
 
+    /**
+     * Save Theme action
+     *
+     * @return null
+     */
+    public function saveThemeAction()
+    {
+        $data = $this->getRequest()->getPost();
+        $this->_saveThemeAction($data);
+    }
+
     /**
      * Delete theme action
      *
@@ -551,7 +579,7 @@ public function deleteThemeAction()
                     );
                 }
             } catch (Mage_Core_Exception $e) {
-                $response = array('error' => true, 'message'   => $e->getMessage());
+                $response = array('error' => true, 'message' => $e->getMessage());
             } catch (Exception $e) {
                 $response = array(
                     'error'     => true,
@@ -568,18 +596,7 @@ public function deleteThemeAction()
     }
 
     /**
-     * Save Theme action
-     *
-     * @return null
-     */
-    public function saveThemeAction()
-    {
-        $data = $this->getRequest()->getPost();
-        $this->_saveThemeAction($data);
-    }
-
-    /**
-     * Save Theme action
+     * Reset Theme action
      *
      * @return null
      */
@@ -806,6 +823,7 @@ public function gridAction()
      * Process all uploaded files
      * setup file names to the configuration return array
      *
+     * @todo remove this method from controller
      * @param array $data
      * @param bool $restore
      * @return array
@@ -844,41 +862,36 @@ protected function _processUploadedFiles($data, $restore = false)
      * Prepare post data
      * Retains previous data in the object.
      *
+     * @todo remove this method from controller
      * @param array $arr
      * @return array
      */
     public function _preparePostData(array $arr)
     {
         unset($arr['code']);
-        if (!empty($arr['conf']['native']['pages'])) {
-            /**
-             * Remove emptied pages
-             */
-            $pages = array();
-            foreach ($arr['conf']['native']['pages'] as $_page) {
-                if (!empty($_page['id']) && !empty($_page['label'])) {
-                    $pages[] = $_page;
+
+        $pageId = 0;
+        if (!empty($arr['config_data'])) {
+            foreach ($arr['config_data'] as $path => $data) {
+                if (!preg_match('/^pages:staticpage\/(\d+)$/', $path, $pageData)
+                    || empty($data['label']) || empty($data['id'])
+                ) {
+                    continue;
                 }
+                list($savedPath, $pageId) = $pageData;
+                $arr['config_data']['pages:staticpage/' . $pageId] = serialize($data);
             }
-            $arr['conf']['native']['pages'] = $pages;
         }
-        if (isset($arr['conf']['new_pages']['ids']) && isset($arr['conf']['new_pages']['labels'])) {
-            $newPages = array();
-            $cmsPages = &$arr['conf']['new_pages'];
-            $idx = 0;
-            foreach ($cmsPages['ids'] as $key => $value) {
-                if (!empty($value) && !empty($cmsPages['labels'][$key])) {
-                    $newPages[$idx]['id'] = trim($value);
-                    $newPages[$idx++]['label'] = trim($cmsPages['labels'][$key]);
+        if (isset($arr['config_data']['new_pages'])) {
+            $pageId++;
+            foreach ($arr['config_data']['new_pages'] as $page) {
+                if (empty($page['label']) || empty($page['id'])) {
+                    continue;
                 }
+                $arr['config_data']['pages:staticpage/' . $pageId] = serialize($page);
+                $pageId++;
             }
-            if (!isset($arr['conf']['native']['pages'])) {
-                $arr['conf']['native']['pages'] = array();
-            }
-            if (!empty($newPages)) {
-                $arr['conf']['native']['pages'] = array_merge($arr['conf']['native']['pages'], $newPages);
-            }
-            unset($arr['conf']['new_pages']);
+            unset($arr['config_data']['new_pages']);
         }
 
         /**
@@ -1316,13 +1329,13 @@ public function queueMessageAction()
         }
 
         if (isset($template)) {
-            $applicationId = $template->getApplicationId();
+            $appId = $template->getApplicationId();
         } else {
-            $applicationId = Mage::getModel('xmlconnect/template')->load($message->getTemplateId())->getApplicationId();
+            $appId = Mage::getModel('xmlconnect/template')->load($message->getTemplateId())->getApplicationId();
         }
 
         /** @var $app Mage_XmlConnect_Model_Application */
-        $app = Mage::getModel('xmlconnect/application')->load($applicationId);
+        $app = Mage::getModel('xmlconnect/application')->load($appId);
 
         if(!$app->isNotificationsActive()) {
             $this->_getSession()->addError(
@@ -1339,8 +1352,8 @@ public function queueMessageAction()
         } else {
             $title = $this->__('New AirMail Message');
         }
-        $this->_addBreadcrumb($this->__('AirMail Message Queue'), $this->__('AirMail Message Queue'),
-            $this->getUrl('*/*/queue')
+        $this->_addBreadcrumb(
+            $this->__('AirMail Message Queue'), $this->__('AirMail Message Queue'), $this->getUrl('*/*/queue')
         );
         $this->_addBreadcrumb($title, $title);
 
@@ -1357,4 +1370,202 @@ public function editMessageAction()
     {
         $this->_forward('queueMessage');
     }
+
+    /**
+     * Upload file controller action
+     */
+    public function uploadImagesAction()
+    {
+        $data = $this->getRequest()->getParams();
+        if (isset($data['Filename'])) {
+            // Add random string to uploaded file new
+            $newFileName = Mage::helper('core')->getRandomString(5) . '_' . $data['Filename'];
+        }
+        try {
+            $this->_initApp();
+            /** @var $imageModel Mage_XmlConnect_Model_Images */
+            $imageModel = Mage::getModel('xmlconnect/images');
+            if (isset($data['image_id']) && $data['image_id'] > 0) {
+                $imageModel->load($data['image_id']);
+            }
+            $imageModel->validateAndSetSubmitData($data)->checkType()->checkApplication();
+
+            /** @var $uploader Mage_Core_Model_File_Uploader */
+            $uploader = Mage::getModel('core/file_uploader', $imageModel->getImageType());
+            $uploader->setAllowRenameFiles(true)->setAllowedExtensions(array('jpg', 'jpeg', 'gif', 'png'));
+            $result = $uploader->save(Mage_XmlConnect_Model_Images::getBasePath(), $newFileName);
+            $result['thumbnail'] = Mage::getModel('xmlconnect/images')->getCustomSizeImageUrl(
+                $result['file'],
+                Mage_XmlConnect_Helper_Data::THUMBNAIL_IMAGE_WIDTH,
+                Mage_XmlConnect_Helper_Data::THUMBNAIL_IMAGE_HEIGHT
+            );
+
+            $imageModel->setImageFile($result['file']);
+            $imageModel->save();
+
+            $result['cookie'] = array(
+                'name'     => session_name(),
+                'value'    => $this->_getSession()->getSessionId(),
+                'lifetime' => $this->_getSession()->getCookieLifetime(),
+                'path'     => $this->_getSession()->getCookiePath(),
+                'domain'   => $this->_getSession()->getCookieDomain(),
+                'order'    => $imageModel->getOrder(),
+                'image_id' => $imageModel->getId(),
+                'file_field' => $imageModel->getImageType()
+            );
+
+            $result['image_list'] = $this->getLayout()
+                ->addBlock('xmlconnect/adminhtml_mobile_edit_tab_design_images', 'design_images')
+                ->getImageList($imageModel->getImageType(), $imageModel->getImageCount());
+
+        } catch (Exception $e) {
+            $result = array('error' => $e->getMessage(), 'errorcode' => $e->getCode());
+        }
+
+        $this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
+    }
+
+    /**
+     * Get image list by type
+     */
+    public function imageListAction()
+    {
+        $data = $this->getRequest()->getParams();
+        $result = array();
+        try {
+            $this->_initApp();
+            /** @var $imageModel Mage_XmlConnect_Model_Images */
+            $imageModel = Mage::getModel('xmlconnect/images');
+            if (!empty($data['image_type'])) {
+                $result['image_list'] = $this->getLayout()
+                    ->addBlock('xmlconnect/adminhtml_mobile_edit_tab_design_images', 'design_images')
+                    ->getImageList($data['image_type'], $imageModel->getImageCount($data['image_type']));
+            }
+        } catch (Exception $e) {
+            $result = array('error' => $e->getMessage(), 'errorcode' => $e->getCode());
+        }
+        $this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
+    }
+
+    /**
+     * Delete device image action
+     */
+    public function deleteImageAction()
+    {
+        $imageId = $this->getRequest()->getParam('image_id', false);
+        /** @var $imageModel Mage_XmlConnect_Model_Images */
+        $imageModel = Mage::getModel('xmlconnect/images');
+        try {
+            $imageModel->load($imageId);
+            if ($imageModel->getId()) {
+                $this->_initApp();
+                $imageModel->deleteAndRepairOrder();
+                $result = array('success' => $this->__('Image has been deleted.'));
+                $result['image_list'] = $this->getLayout()
+                    ->addBlock('xmlconnect/adminhtml_mobile_edit_tab_design_images', 'design_images')
+                    ->getImageList($imageModel->getImageType(), $imageModel->getImageCount());
+            } else {
+                $result = array('error' => $this->__('Image does not exist. Please reload this page.'));
+            }
+        } catch (Exception $e) {
+            $result = array('error' => $e->getMessage(), 'errorcode' => $e->getCode());
+        }
+        $this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
+    }
+
+    /**
+     * Delete device image action
+     */
+    public function deleteImageDataAction()
+    {
+        $imageId = $this->getRequest()->getParam('image_id', false);
+        try {
+            $this->_initApp();
+            if ($imageId) {
+                $image = Mage::getModel('xmlconnect/images')->load($imageId)->deleteImageAction();
+                $result = array('success' => $this->__('Image has been deleted.'));
+                $result['image_list'] = $this->getLayout()
+                    ->addBlock('xmlconnect/adminhtml_mobile_edit_tab_design_images', 'design_images')
+                    ->getImageList($image->getImageType(), $image->getImageCount());
+            } else {
+                $result = array('error' => $this->__('Image id is required.'));
+            }
+        } catch (Exception $e) {
+            $result = array('error' => $e->getMessage(), 'errorcode' => $e->getCode());
+        }
+        $this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
+    }
+
+    /**
+     * Save image action
+     */
+    public function saveImageDataAction()
+    {
+        $result = array();
+        try {
+            $imageId = $this->getRequest()->getParam('image_id', false);
+            if (!$imageId) {
+                Mage::throwException($this->__('image_id is required'));
+            }
+            $imageConfig = $this->_initApp()->getImageActionModel()->saveImageAction($this->getRequest()->getParams())
+                ->getCurrentImageActionData();
+            $result['success'] = $this->__('Image action has been saved.');
+            $result['image_action_data'] = $imageConfig;
+        } catch (Exception $e) {
+            Mage::logException($e);
+            $result = array('error' => $e->getMessage(), 'errorcode' => $e->getCode());
+        }
+        $this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
+    }
+
+    /**
+     * Global Search Action
+     */
+    public function globalSearchAction()
+    {
+        $start = $this->getRequest()->getParam('start', 1);
+        $limit = $this->getRequest()->getParam('limit', 10);
+        $query = $this->getRequest()->getParam('query', '');
+        $type = $this->getRequest()->getParam('type', 'product');
+
+        if ($type == 'product') {
+            $searchModel = Mage::getModel('xmlconnect/adminhtml_search_catalog');
+        } else {
+            $searchModel = Mage::getModel('xmlconnect/adminhtml_search_category');
+        }
+        $results = $searchModel->setStart($start)->setLimit($limit)->setQuery($query)->load()->getResults();
+
+        $block = $this->getLayout()->createBlock('adminhtml/template')
+            ->setTemplate('xmlconnect/edit/tab/design/autocomplete.phtml')->assign('items', $results);
+
+        $this->getResponse()->setBody($block->toHtml());
+    }
+
+     /**
+     * Save image order
+     */
+    public function saveImageOrderAction()
+    {
+        /** @var $imagesModel Mage_XmlConnect_Model_Images */
+        $imagesModel = Mage::getModel('xmlconnect/images');
+        $imageData = $this->getRequest()->getParam('data', false);
+        $imageType = $this->getRequest()->getParam('type', false);
+        try {
+
+            if (!$imageType || !$imageData) {
+                Mage::throwException($this->__('Type and data is required'));
+            }
+            $actionModel = $this->_initApp()->getImageActionModel();
+
+            $actionModel->saveImageOrder($imageData, $imageType);
+            $result = array('success' => $this->__('Images order has been updated.'));
+            $result['image_list'] = $this->getLayout()
+                ->addBlock('xmlconnect/adminhtml_mobile_edit_tab_design_images', 'design_images')
+                ->getImageList($imageType, $imagesModel->getImageCount($imageType));
+        } catch (Exception $e) {
+            Mage::logException($e);
+            $result = array('error' => $e->getMessage(), 'errorcode' => $e->getCode());
+        }
+        $this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/controllers/CartController.php b/app/code/core/Mage/XmlConnect/controllers/CartController.php
index 7c2a1805159..e484fee39d6 100644
--- a/app/code/core/Mage/XmlConnect/controllers/CartController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/CartController.php
@@ -414,8 +414,7 @@ public function removeStoreCreditAction()
             return;
         } else {
             $this->_message(
-                $this->__('Store Credit payment is not being used in your shopping cart.'),
-                self::MESSAGE_STATUS_ERROR
+                $this->__('Store Credit payment is not being used in your shopping cart.'), self::MESSAGE_STATUS_ERROR
             );
             return;
         }
@@ -490,4 +489,148 @@ protected function _getWishlist()
         }
         return $wishlist;
     }
+
+    /**
+     * Shopping cart display action
+     */
+    public function shoppingCartAction()
+    {
+        try {
+            $messages = array();
+            $cart = $this->_getCart();
+            if ($cart->getQuote()->getItemsCount()) {
+                $cart->init();
+                $cart->save();
+
+                if (!$this->_getQuote()->validateMinimumAmount()) {
+                    $warning = Mage::getStoreConfig('sales/minimum_order/description');
+                    $messages[parent::MESSAGE_STATUS_WARNING][] = $warning;
+                }
+            }
+            foreach ($cart->getQuote()->getMessages() as $message) {
+                if ($message) {
+                    $messages[$message->getType()][] = $message->getText();
+                }
+            }
+
+            /**
+             * if customer enters shopping cart we should mark quote
+             * as modified bc he might have checkout page in another window.
+             */
+            $this->_getSession()->setCartWasUpdated(true);
+            $this->loadLayout(false)->getLayout()->getBlock('xmlconnect.cart')->setMessages($messages);
+            $this->renderLayout();
+        } catch (Mage_Core_Exception $e) {
+            $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
+        } catch (Exception $e) {
+            Mage::logException($e);
+            $this->_message($this->__('Can\'t load cart.'), self::MESSAGE_STATUS_ERROR);
+        }
+    }
+
+    /**
+     * Action to reconfigure cart item
+     */
+    public function configureAction()
+    {
+        // Extract item and product to configure
+        $id = (int) $this->getRequest()->getParam('id');
+        $quoteItem = null;
+        try {
+            $cart = $this->_getCart();
+            $quoteItem = $cart->getQuote()->getItemById($id);
+            if (!$quoteItem) {
+                $this->_message($this->__('Quote item is not found.'), self::MESSAGE_STATUS_ERROR);
+                return;
+            }
+            $params = new Varien_Object();
+            $params->setCategoryId(false);
+            $params->setConfigureMode(true);
+            $params->setBuyRequest($quoteItem->getBuyRequest());
+
+            $productHelper = Mage::helper('catalog/product');
+            $buyRequest = $params->getBuyRequest();
+            /** @var $product Mage_Catalog_Model_Product */
+            $product = $productHelper->initProduct($quoteItem->getProduct()->getId(), $this, $params);
+
+            if ($buyRequest) {
+                $productHelper->prepareProductOptions($product, $buyRequest);
+            }
+            if ($params->hasConfigureMode()) {
+                $product->setConfigureMode($params->getConfigureMode());
+            }
+
+            $this->loadLayout(false);
+            $this->getLayout()->getBlock('xmlconnect.catalog.product')->setProduct($product);
+            $this->renderLayout();
+        } catch (Exception $e) {
+            $this->_message($this->__('Cannot configure product.'), self::MESSAGE_STATUS_ERROR);
+            Mage::logException($e);
+            return;
+        }
+    }
+
+    /**
+     * Update product configuration for a cart item
+     */
+    public function updateItemOptionsAction()
+    {
+        $cart = $this->_getCart();
+        $id = (int) $this->getRequest()->getParam('id');
+        $params = $this->getRequest()->getParams();
+
+        if (!isset($params['options'])) {
+            $params['options'] = array();
+        }
+        try {
+            if (isset($params['qty'])) {
+                $filter = new Zend_Filter_LocalizedToNormalized(
+                    array('locale' => Mage::app()->getLocale()->getLocaleCode())
+                );
+                $params['qty'] = $filter->filter($params['qty']);
+            }
+
+            $quoteItem = $cart->getQuote()->getItemById($id);
+            if (!$quoteItem) {
+                $this->_message($this->__('Quote item is not found.'), parent::MESSAGE_STATUS_ERROR);
+                return;
+            }
+
+            $item = $cart->updateItem($id, new Varien_Object($params));
+            if (is_string($item)) {
+                Mage::throwException($item);
+            }
+            if ($item->getHasError()) {
+                Mage::throwException($item->getMessage());
+            }
+            $related = $this->getRequest()->getParam('related_product');
+            if (!empty($related)) {
+                $cart->addProductsByIds(explode(',', $related));
+            }
+
+            $cart->save();
+            $this->_getSession()->setCartWasUpdated(true);
+
+            Mage::dispatchEvent('checkout_cart_update_item_complete', array(
+                'item' => $item, 'request' => $this->getRequest(), 'response' => $this->getResponse()
+            ));
+
+            $productName = Mage::helper('core')->escapeHtml($item->getProduct()->getName());
+            $message = $this->__('%s was updated in your shopping cart.', $productName);
+            if ($cart->getQuote()->getHasError()) {
+                $message .= $this->__(' But cart has some errors.');
+            }
+            $this->_message($message, parent::MESSAGE_STATUS_SUCCESS);
+        } catch (Mage_Core_Exception $e) {
+            if ($this->_getSession()->getUseNotice(true)) {
+                $this->_message($e->getMessage(), parent::MESSAGE_STATUS_ERROR);
+            } else {
+                $messageText = implode("\n", array_unique(explode("\n", $e->getMessage())));
+                $this->_message($messageText, parent::MESSAGE_STATUS_ERROR);
+            }
+        } catch (Exception $e) {
+            Mage::logException($e);
+            $this->_message($this->__('Cannot update the item.'), self::MESSAGE_STATUS_ERROR);
+        }
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/controllers/CatalogController.php b/app/code/core/Mage/XmlConnect/controllers/CatalogController.php
index 552ab22d9cd..92076c9bea3 100644
--- a/app/code/core/Mage/XmlConnect/controllers/CatalogController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/CatalogController.php
@@ -40,6 +40,9 @@ class Mage_XmlConnect_CatalogController extends Mage_XmlConnect_Controller_Actio
      */
     public function categoryAction()
     {
+        if ($this->_checkApiForward('categoryDetails', Mage_XmlConnect_Helper_Data::DEVICE_API_V_23)) {
+            return;
+        }
         try {
             $this->loadLayout(false);
             $this->renderLayout();
@@ -48,9 +51,26 @@ public function categoryAction()
             $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
         } catch (Exception $e) {
             Mage::logException($e);
-            $this->_message(
-                $this->__('An error occurred while loading categories.'), self::MESSAGE_STATUS_ERROR
-            );
+            $this->_message($this->__('An error occurred while loading categories.'), self::MESSAGE_STATUS_ERROR);
+        }
+    }
+
+    /**
+     * Category list details
+     *
+     * @return null
+     */
+    public function categoryDetailsAction()
+    {
+        try {
+            $this->loadLayout(false);
+            $this->renderLayout();
+        } catch (Mage_Core_Exception $e) {
+            Mage::logException($e);
+            $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
+        } catch (Exception $e) {
+            Mage::logException($e);
+            $this->_message($this->__('An error occurred while loading categories.'), self::MESSAGE_STATUS_ERROR);
         }
     }
 
@@ -68,9 +88,7 @@ public function filtersAction()
             $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
         } catch (Exception $e) {
             Mage::logException($e);
-            $this->_message(
-                $this->__('An error occurred while loading category filters.'), self::MESSAGE_STATUS_ERROR
-            );
+            $this->_message($this->__('An error occurred while loading category filters.'), self::MESSAGE_STATUS_ERROR);
         }
     }
 
@@ -80,9 +98,53 @@ public function filtersAction()
      * @return null
      */
     public function productAction()
+    {
+        if ($this->_checkApiForward('productView', Mage_XmlConnect_Helper_Data::DEVICE_API_V_23)) {
+            return;
+        }
+        try {
+            // Prepare data
+            /** @var $productHelper Mage_Catalog_Helper_Product */
+            $productHelper = Mage::helper('catalog/product');
+            $productId  = (int) $this->getRequest()->getParam('id');
+            $params = new Varien_Object();
+            $params->setCategoryId(false);
+
+            // Standard algorithm to prepare and render product view page
+            $product = $productHelper->initProduct($productId, $this, $params);
+
+            $this->loadLayout(false);
+            $this->getLayout()->getBlock('xmlconnect.catalog.product')->setProduct($product);
+            $this->renderLayout();
+            return;
+        } catch (Mage_Core_Exception $e) {
+            $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
+        } catch (Exception $e) {
+            $this->_message($this->__('Unable to load product info.'), self::MESSAGE_STATUS_ERROR);
+            Mage::logException($e);
+        }
+    }
+
+    /**
+     * Product view
+     *
+     * @return null
+     */
+    public function productViewAction()
     {
         try {
+            // Prepare data
+            /** @var $productHelper Mage_Catalog_Helper_Product */
+            $productHelper = Mage::helper('catalog/product');
+            $productId  = (int) $this->getRequest()->getParam('id');
+            $params = new Varien_Object();
+            $params->setCategoryId(false);
+
+            // Standard algorithm to prepare and render product view page
+            $product = $productHelper->initProduct($productId, $this, $params);
+
             $this->loadLayout(false);
+            $this->getLayout()->getBlock('xmlconnect.catalog.product')->setProduct($product);
             $this->renderLayout();
             return;
         } catch (Mage_Core_Exception $e) {
@@ -119,7 +181,10 @@ public function productOptionsAction()
     public function productGalleryAction()
     {
         try {
+            $productId = $this->getRequest()->getParam('id', null);
+
             $this->loadLayout(false);
+            $this->getLayout()->getBlock('xmlconnect.catalog.product.gallery')->setProductId($productId);
             $this->renderLayout();
         } catch (Mage_Core_Exception $e) {
             $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
@@ -171,6 +236,66 @@ public function productReviewAction()
      * @return null
      */
     public function searchAction()
+    {
+        if ($this->_checkApiForward('searchDetails', Mage_XmlConnect_Helper_Data::DEVICE_API_V_23)) {
+            return;
+        }
+        /** @var $_helper Mage_CatalogSearch_Helper_Data */
+        $_helper = Mage::helper('catalogsearch');
+        $queryParam = str_replace('%20', ' ', $this->getRequest()->getParam('query'));
+        $this->getRequest()->setParam($_helper->getQueryParamName(), $queryParam);
+        /** @var $query Mage_CatalogSearch_Model_Query */
+        $query = $_helper->getQuery();
+        $query->setStoreId(Mage::app()->getStore()->getId());
+
+        if ($query->getQueryText()) {
+            if ($_helper->isMinQueryLength()) {
+                $query->setId(0)->setIsActive(1)->setIsProcessed(1);
+            } else {
+                if ($query->getId()) {
+                    $query->setPopularity($query->getPopularity() + 1);
+                } else {
+                    $query->setPopularity(1);
+                }
+
+                /**
+                 * We don't support redirect at this moment
+                 *
+                 * @todo add redirect support for mobile application
+                 */
+                if (false && $query->getRedirect()) {
+                    $query->save();
+                    $this->getResponse()->setRedirect($query->getRedirect());
+                    return;
+                } else {
+                    $query->prepare();
+                }
+            }
+
+            $_helper->checkNotes();
+
+            if (!$_helper->isMinQueryLength()) {
+                $query->save();
+            }
+        }
+
+        try {
+            $this->loadLayout(false);
+            $this->renderLayout();
+        } catch (Mage_Core_Exception $e) {
+            $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
+        } catch (Exception $e) {
+            $this->_message($this->__('Unable to load search.'), self::MESSAGE_STATUS_ERROR);
+            Mage::logException($e);
+        }
+    }
+
+    /**
+     * Perform search products details
+     *
+     * @return null
+     */
+    public function searchDetailsAction()
     {
         /** @var $_helper Mage_CatalogSearch_Helper_Data */
         $_helper = Mage::helper('catalogsearch');
@@ -182,12 +307,10 @@ public function searchAction()
 
         if ($query->getQueryText()) {
             if ($_helper->isMinQueryLength()) {
-                $query->setId(0)
-                    ->setIsActive(1)
-                    ->setIsProcessed(1);
+                $query->setId(0)->setIsActive(1)->setIsProcessed(1);
             } else {
                 if ($query->getId()) {
-                    $query->setPopularity($query->getPopularity()+1);
+                    $query->setPopularity($query->getPopularity() + 1);
                 } else {
                     $query->setPopularity(1);
                 }
@@ -246,7 +369,7 @@ public function searchSuggestAction()
     /**
      * Send product link to friend action
      *
-     * @return this
+     * @return Mage_XmlConnect_CatalogController
      */
     public function sendEmailAction()
     {
@@ -262,9 +385,7 @@ public function sendEmailAction()
 
         if (!$helper->isAllowForGuest() && !$session->isLoggedIn()) {
             $this->_message(
-                $this->__('Customer not logged in.'),
-                self::MESSAGE_STATUS_ERROR,
-                array('logged_in' => '0')
+                $this->__('Customer not logged in.'), self::MESSAGE_STATUS_ERROR, array('logged_in' => '0')
             );
             return $this;
         }
@@ -277,8 +398,7 @@ public function sendEmailAction()
             $this->_message($this->__('No product selected.'), self::MESSAGE_STATUS_ERROR);
             return $this;
         }
-        $product = Mage::getModel('catalog/product')
-            ->load($productId);
+        $product = Mage::getModel('catalog/product')->load($productId);
         if (!$product->getId() || !$product->isVisibleInCatalog()) {
             $this->_message($this->__('Selected product is unavailable.'), self::MESSAGE_STATUS_ERROR);
             return $this;
@@ -295,7 +415,14 @@ public function sendEmailAction()
         $model->setWebsiteId(Mage::app()->getStore()->getWebsiteId());
 
         Mage::register('send_to_friend_model', $model);
-
+/*
+        if ($model->getMaxSendsToFriend()) {
+            $this->_message($this->__('Messages cannot be sent more than %d times in an hour.',
+                    $model->getMaxSendsToFriend()),
+                    self::MESSAGE_STATUS_WARNING);
+            return $this;
+        }
+*/
         $data = $this->getRequest()->getPost();
 
         if (!$data) {
diff --git a/app/code/core/Mage/XmlConnect/controllers/CheckoutController.php b/app/code/core/Mage/XmlConnect/controllers/CheckoutController.php
index e4323b9c05b..0e442e19717 100644
--- a/app/code/core/Mage/XmlConnect/controllers/CheckoutController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/CheckoutController.php
@@ -45,11 +45,9 @@ public function preDispatch()
             && !Mage::getSingleton('checkout/session')->getQuote()->isAllowedGuestCheckout()
         ) {
             $this->setFlag('', self::FLAG_NO_DISPATCH, true);
-            $this->_message(
-                $this->__('Customer not logged in.'),
-                self::MESSAGE_STATUS_ERROR,
-                array('logged_in' => '0')
-            );
+            $this->_message($this->__('Customer not logged in.'), self::MESSAGE_STATUS_ERROR, array(
+                'logged_in' => '0'
+            ));
             return ;
         }
     }
@@ -71,6 +69,9 @@ public function getOnepage()
      */
     public function indexAction()
     {
+        if ($this->_checkApiForward('addressmassaction', Mage_XmlConnect_Helper_Data::DEVICE_API_V_23)) {
+            return;
+        }
         if (!Mage::helper('checkout')->canOnepageCheckout()) {
             $this->_message($this->__('Onepage checkout is disabled.'), self::MESSAGE_STATUS_ERROR);
             return;
@@ -103,7 +104,7 @@ public function indexAction()
     }
 
     /**
-     * Display customer new billing addrress form
+     * Display customer new billing address form
      *
      * @return null
      */
@@ -121,7 +122,7 @@ public function newBillingAddressFormAction()
     }
 
     /**
-     * Display customer new shipping addrress form
+     * Display customer new shipping address form
      *
      * @return null
      */
@@ -303,7 +304,27 @@ protected function _checkUseForShipping(array $data, $billingAddress, $shippingA
     public function shippingMethodsAction()
     {
         try {
-            $result = array('error' => $this->__('Error.'));
+            $result = array('error' => $this->__('Error'));
+            $this->getOnepage()->getQuote()->getShippingAddress()->setCollectShippingRates(true);
+            $this->getOnepage()->getQuote()->collectTotals()->save();
+            $this->loadLayout(false);
+            $this->renderLayout();
+            return;
+        } catch (Mage_Core_Exception $e) {
+            $result['error'] = $e->getMessage();
+        }
+        $this->_message($result['error'], self::MESSAGE_STATUS_ERROR);
+    }
+
+    /**
+     * Get shipping methods for current quote API v23
+     *
+     * @return null
+     */
+    public function shippingMethodsListAction()
+    {
+        try {
+            $result = array('error' => $this->__('Error'));
             $this->getOnepage()->getQuote()->getShippingAddress()->setCollectShippingRates(true);
             $this->getOnepage()->getQuote()->collectTotals()->save();
             $this->loadLayout(false);
@@ -332,17 +353,21 @@ public function saveShippingMethodAction()
         if (!$result) {
 
             Mage::dispatchEvent('checkout_controller_onepage_save_shipping_method', array(
-                'request' => $this->getRequest(), 'quote' => $this->getOnepage()->getQuote()
+                'request' => $this->getRequest(),
+                'quote' => $this->getOnepage()->getQuote()
             ));
             $this->getOnepage()->getQuote()->collectTotals()->save();
-
+            if ($this->_checkApiForward('paymentmethodlist', Mage_XmlConnect_Helper_Data::DEVICE_API_V_23)) {
+                return;
+            }
             $this->_message($this->__('Shipping method has been set.'), self::MESSAGE_STATUS_SUCCESS);
-        } elseif(isset($result['error'])) {
+        } elseif (isset($result['error'])) {
             if (!is_array($result['message'])) {
                 $result['message'] = array($result['message']);
             }
             Mage::dispatchEvent('checkout_controller_onepage_save_shipping_method', array(
-                'request' => $this->getRequest(), 'quote' => $this->getOnepage()->getQuote()
+                'request' => $this->getRequest(),
+                'quote' => $this->getOnepage()->getQuote()
             ));
             $this->getOnepage()->getQuote()->collectTotals()->save();
             $this->_message(implode('. ', $result['message']), self::MESSAGE_STATUS_ERROR);
@@ -372,15 +397,18 @@ public function saveMethodAction()
     }
 
     /**
-     * Get payment methods action
+     * Get payment methods action API v23
      *
      * @return null
      */
-    public function paymentMethodsAction()
+    public function paymentMethodListAction()
     {
         try {
             $this->loadLayout(false);
-            $this->renderLayout();
+            /** @var $paymentMethodsBlock Mage_XmlConnect_Block_Checkout_Payment_Method_List */
+            $paymentMethodsBlock = $this->getLayout()->getBlock('payment.methods');
+            $response = $paymentMethodsBlock->toHtml();
+            $this->getResponse()->setBody($response);
             return;
         } catch (Mage_Core_Exception $e) {
             $result['error'] = $e->getMessage();
@@ -388,6 +416,19 @@ public function paymentMethodsAction()
         $this->_message($result['error'], self::MESSAGE_STATUS_ERROR);
     }
 
+    /**
+     * Get payment methods action
+     *
+     * @return null
+     */
+    public function paymentMethodsAction()
+    {
+        if ($this->_checkApiForward('paymentmethodlist', Mage_XmlConnect_Helper_Data::DEVICE_API_V_23)) {
+            return;
+        }
+        $this->paymentMethodListAction();
+    }
+
     /**
      * Save payment action
      *
@@ -399,17 +440,36 @@ public function savePaymentAction()
             $this->_message($this->__('Specified invalid data.'), self::MESSAGE_STATUS_ERROR);
             return;
         }
+        // set payment to quote
+        $result = array();
+        $data = $this->getRequest()->getPost('payment', array());
         try {
-            // set payment to quote
-            $result = array();
-            $data = $this->getRequest()->getPost('payment', array());
             $result = $this->getOnepage()->savePayment($data);
-            $this->_message($this->__('Payment method was successfully set.'), self::MESSAGE_STATUS_SUCCESS);
-            return;
+            if (empty($result['error'])) {
+                $method = Mage::getSingleton('checkout/session')->getQuote()->getPayment()->getMethodInstance();
+                $sentinelData = array();
+                if ($method->getIsCentinelValidationEnabled()) {
+                    $centinel = $method->getCentinelValidator();
+                    if ($centinel && $centinel->shouldAuthenticate()) {
+                        $sentinelData = array('sentinel_secure' => Mage::getUrl('*/cms/sentinelsecure'));
+                    }
+                }
+
+                if ($this->_checkApiForward('ordersummary', Mage_XmlConnect_Helper_Data::DEVICE_API_V_23)) {
+                    return;
+                }
+                $this->_message(
+                    $this->__('Payment method was successfully set.'), self::MESSAGE_STATUS_SUCCESS, $sentinelData
+                );
+                return;
+            }
+
         } catch (Mage_Payment_Exception $e) {
             $result['error'] = $e->getMessage();
+            Mage::logException($e);
         } catch (Mage_Core_Exception $e) {
             $result['error'] = $e->getMessage();
+            Mage::logException($e);
         } catch (Exception $e) {
             Mage::logException($e);
             $result['error'] = $e->getMessage();
@@ -418,7 +478,7 @@ public function savePaymentAction()
     }
 
     /**
-     * Order summary info action
+     * Order review action
      *
      * @return null
      */
@@ -436,6 +496,25 @@ public function orderReviewAction()
         }
     }
 
+    /**
+     * Checkout order summary info action
+     *
+     * @return null
+     */
+    public function orderSummaryAction()
+    {
+        $this->getOnepage()->getQuote()->collectTotals()->save();
+        try {
+            $this->loadLayout(false);
+            $this->renderLayout();
+        } catch (Mage_Core_Exception $e) {
+            $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
+        } catch (Exception $e) {
+            $this->_message($this->__('Unable to load order review.'), self::MESSAGE_STATUS_ERROR);
+            Mage::logException($e);
+        }
+    }
+
     /**
      * Create order action
      *
@@ -449,7 +528,8 @@ public function saveOrderAction()
         }
 
         try {
-            if ($requiredAgreements = Mage::helper('checkout')->getRequiredAgreementIds()) {
+            $requiredAgreements = Mage::helper('checkout')->getRequiredAgreementIds();
+            if (!empty($requiredAgreements)) {
                 $postedAgreements = array_keys($this->getRequest()->getPost('agreement', array()));
                 if (array_diff($requiredAgreements, $postedAgreements)) {
                     $error = $this->__('Please agree to all the terms and conditions before placing the order.');
@@ -457,7 +537,8 @@ public function saveOrderAction()
                     return;
                 }
             }
-            if ($data = $this->getRequest()->getPost('payment', false)) {
+            $data = $this->getRequest()->getPost('payment', false);
+            if ($data) {
                 $this->getOnepage()->getQuote()->getPayment()->importData($data);
             }
             $this->getOnepage()->saveOrder();
@@ -492,4 +573,124 @@ public function saveOrderAction()
         $this->getOnepage()->getQuote()->save();
         $this->_message($error, self::MESSAGE_STATUS_ERROR);
     }
+
+    /**
+     * Action return address form and customer saved addresses
+     *
+     * @return null
+     */
+    public function addressMassactionAction()
+    {
+        if (!Mage::helper('checkout')->canOnepageCheckout()) {
+            $this->_message($this->__('Onepage checkout is disabled.'), self::MESSAGE_STATUS_ERROR);
+            return;
+        }
+        try {
+            /** @var $quote Mage_Sales_Model_Quote */
+            $quote = $this->getOnepage()->getQuote();
+            if ($quote->getHasError()) {
+                $this->_message($this->__('Cart has some errors.'), self::MESSAGE_STATUS_ERROR);
+                return;
+            } elseif (!$quote->hasItems()) {
+                $this->_message($this->__('Cart is empty.'), self::MESSAGE_STATUS_ERROR);
+                return;
+            } elseif (!$quote->validateMinimumAmount()) {
+                $error = Mage::getStoreConfig('sales/minimum_order/error_message');
+                $this->_message($error, self::MESSAGE_STATUS_ERROR);
+                return;
+            }
+            Mage::getSingleton('checkout/session')->setCartWasUpdated(false);
+            $this->getOnepage()->initCheckout();
+
+            $this->loadLayout(false);
+            $this->renderLayout();
+        } catch (Mage_Core_Exception $e) {
+            $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
+        } catch (Exception $e) {
+            $this->_message($this->__('Unable to load addresses.'), self::MESSAGE_STATUS_ERROR);
+            Mage::logException($e);
+        }
+    }
+
+    /**
+     * Action save customer addresses info
+     *
+     * @return null
+     */
+    public function saveAddressInfoAction()
+    {
+        if (!$this->getRequest()->isPost()) {
+            $this->_message($this->__('Specified invalid data.'), self::MESSAGE_STATUS_ERROR);
+            return;
+        }
+
+        /** Save billing address */
+        $useForShipping = false;
+        $isVirtual = Mage::helper('checkout/cart')->getIsVirtualQuote();
+        $billingAddressId = $this->getRequest()->getPost('billing_address_id', false);
+        $billingData = $this->getRequest()->getPost('billing', array());
+        if (isset($billingData['use_for_shipping']) && $billingData['use_for_shipping'] == 1) {
+            $useForShipping = true;
+        }
+        try {
+            if ($billingAddressId) {
+                $billingData = Mage::getModel('customer/address')->load($billingAddressId)->getData();
+            }
+            if (isset($billingData['email'])) {
+                $billingData['email'] = trim($billingData['email']);
+            }
+            $billingSaveResult = $this->getOnepage()->saveBilling($billingData, $billingAddressId);
+            if (isset($billingSaveResult['error'])) {
+                if (!is_array($billingSaveResult['message'])) {
+                    $billingSaveResult['message'] = array($billingSaveResult['message']);
+                }
+                $this->_message(implode('. ', $billingSaveResult['message']), self::MESSAGE_STATUS_ERROR);
+                return;
+            }
+
+            if (!$useForShipping && !$isVirtual) {
+                $shippingAddressId = $this->getRequest()->getPost('shipping_address_id', false);
+                if ($shippingAddressId) {
+                    $shippingData = Mage::getModel('customer/address')->load($shippingAddressId)->getData();
+                } else {
+                    $shippingData = $this->getRequest()->getPost('shipping', array());
+                }
+                $shippingSaveResult = $this->getOnepage()->saveShipping($shippingData, $shippingAddressId);
+                if (isset($shippingSaveResult['error'])) {
+                    if (!is_array($shippingSaveResult['message'])) {
+                        $shippingSaveResult['message'] = array($shippingSaveResult['message']);
+                    }
+                    $this->_message(implode('. ', $shippingSaveResult['message']), self::MESSAGE_STATUS_ERROR);
+                    return;
+                }
+            } else {
+                $result = $this->getOnepage()->saveShipping($billingData, $billingAddressId);
+                if (isset($result['error'])) {
+                    if (!is_array($result['message'])) {
+                        $result['message'] = array($result['message']);
+                    }
+                    $this->_message(implode('. ', $result['message']), self::MESSAGE_STATUS_ERROR);
+                    return;
+                }
+            }
+
+            if ($isVirtual) {
+                /** If quote is virtual - redirect to payment methods list */
+                $this->_forward('paymentmethods', null, null, array(
+                    Mage_XmlConnect_Helper_Data::API_VERSION_REQUEST_PARAM
+                        => Mage_XmlConnect_Helper_Data::DEVICE_API_V_23
+                ));
+            } else {
+                /** Redirect to shipping methods list */
+                $this->_forward('shippingMethodsList');
+            }
+            return;
+        } catch (Mage_Core_Exception $e) {
+            $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
+            Mage::logException($e);
+        } catch (Exception $e) {
+            $this->_message($this->__('Unable to load addresses.'), self::MESSAGE_STATUS_ERROR);
+            Mage::logException($e);
+        }
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/controllers/CmsController.php b/app/code/core/Mage/XmlConnect/controllers/CmsController.php
index e9618778b3b..bfc994d78f8 100644
--- a/app/code/core/Mage/XmlConnect/controllers/CmsController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/CmsController.php
@@ -54,4 +54,31 @@ public function pageAction()
         $this->loadLayout(false);
         $this->renderLayout();
     }
+
+    /**
+     * 3d secure authentication request page
+     *
+     * @return null
+     */
+    public function sentinelSecureAction()
+    {
+        try {
+            $method = Mage::getSingleton('checkout/session')->getQuote()->getPayment()->getMethodInstance();
+            if ($method->getIsCentinelValidationEnabled()) {
+                $centinel = $method->getCentinelValidator();
+                if ($centinel && $centinel->shouldAuthenticate()) {
+                    /** @var $sentinelBlock Mage_Centinel_Block_Authentication */
+                    $sentinelBlock = $this->getLayout()->addBlock('centinel/authentication', 'centinel.frame')
+                        ->setTemplate('xmlconnect/centinel/authentication.phtml');
+                    $this->getResponse()->setBody($sentinelBlock->toHtml());
+                    return;
+                }
+            }
+        } catch (Mage_Core_Exception $e) {
+            $this->getResponse()->setBody($e->getMessage());
+        } catch (Exception $e) {
+            $this->getResponse()->setBody($e->getMessage());
+            Mage::logException($e);
+        }
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/controllers/ConfigurationController.php b/app/code/core/Mage/XmlConnect/controllers/ConfigurationController.php
index 8440490e058..5da48ae1841 100644
--- a/app/code/core/Mage/XmlConnect/controllers/ConfigurationController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/ConfigurationController.php
@@ -54,18 +54,18 @@ protected function _initApp()
     {
         $cookieName = Mage_XmlConnect_Model_Application::APP_CODE_COOKIE_NAME;
         $code = $this->getRequest()->getParam($cookieName);
-        $screenSize = (string) $this->getRequest()->getParam(
-            Mage_XmlConnect_Model_Application::APP_SCREEN_SIZE_NAME
-        );
+        $screenSize = (string) $this->getRequest()->getParam(Mage_XmlConnect_Model_Application::APP_SCREEN_SIZE_NAME);
+
         /** @var $app Mage_XmlConnect_Model_Application */
         $app = Mage::getModel('xmlconnect/application');
         if ($app) {
             $app->loadByCode($code);
-            Mage::app()->setCurrentStore(
-                Mage::app()->getStore($app->getStoreId())->getCode()
-            );
+            Mage::app()->setCurrentStore(Mage::app()->getStore($app->getStoreId())->getCode());
             Mage::getSingleton('core/locale')->emulate($app->getStoreId());
-            $app->setScreenSize($screenSize);
+            if (preg_match('/^(\d+x\d+)(_\w+)?$/', $screenSize)) {
+
+                $app->setScreenSize($screenSize);
+            }
 
             if (!$app->getId()) {
                 Mage::throwException($this->__('App with specified code does not exist.'));
@@ -82,7 +82,7 @@ protected function _initApp()
     /**
      * Set application cookies
      *
-     * Set application coolies: application code and device screen size.
+     * Set application cookies: application code and device screen size.
      *
      * @param Mage_XmlConnect_Model_Application $app
      * @return null
@@ -129,6 +129,10 @@ public function indexAction()
             $this->_initCookies($app);
 
             if ($this->getRequest()->getParam('updated_at')) {
+                /** @var $helper Mage_XmlConnect_Helper_Data */
+                $helper = Mage::helper('xmlconnect');
+                $helper->isChangeLocalization();
+
                 $updatedAt = strtotime($app->getUpdatedAt());
                 $loadedAt = (int) $this->getRequest()->getParam('updated_at');
                 if ($loadedAt >= $updatedAt) {
diff --git a/app/code/core/Mage/XmlConnect/controllers/CustomerController.php b/app/code/core/Mage/XmlConnect/controllers/CustomerController.php
index 06f32129ff1..6f9d3fcdfdb 100644
--- a/app/code/core/Mage/XmlConnect/controllers/CustomerController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/CustomerController.php
@@ -42,8 +42,7 @@ public function loginAction()
     {
         $session = $this->_getSession();
         $request = $this->getRequest();
-        if ($session->isLoggedIn()) {
-            $this->_message($this->__('You are already logged in.'), self::MESSAGE_STATUS_ERROR);
+        if (!$this->_isCustomerLoggedIn(false)) {
             return;
         }
 
@@ -106,25 +105,30 @@ public function logoutAction()
     public function formAction()
     {
         try {
-            $customer = null;
-            $editFlag = (int)$this->getRequest()->getParam('edit');
-            if ($editFlag == 1) {
-                if (!$this->_getSession()->isLoggedIn()) {
-                    $this->_message(
-                        $this->__('Customer not logged in.'), self::MESSAGE_STATUS_ERROR, array('logged_in' => '0')
-                    );
+            $editFlag = (bool)$this->getRequest()->getParam('edit');
+            if ($editFlag) {
+                if (!$this->_isCustomerLoggedIn()) {
                     return;
                 }
+                $formCode = 'customer_account_edit';
                 $customer = $this->_getSession()->getCustomer();
+            } else {
+                if (!$this->_isCustomerLoggedIn(false)) {
+                    return;
+                }
+                $formCode = 'customer_account_create';
+                $customer = Mage::getModel('customer/customer');
             }
 
-            $this->loadLayout(false)->getLayout()->getBlock('xmlconnect.customer.form')->setCustomer($customer);
+            $this->loadLayout(false)->getLayout()->getBlock('xmlconnect.customer.form')->setCustomer($customer)
+                ->setIsEditPage($editFlag)->setAttributesBlockName('customer_form_user_attributes')
+                ->setCustomerFormCode($formCode);
             $this->renderLayout();
         } catch (Mage_Core_Exception $e) {
             $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
         } catch (Exception $e) {
-            Mage::logException($e);
             $this->_message($this->__('Can\'t load customer form.'), self::MESSAGE_STATUS_ERROR);
+            Mage::logException($e);
         }
     }
 
@@ -135,10 +139,7 @@ public function formAction()
      */
     public function editAction()
     {
-        if (!$this->_getSession()->isLoggedIn()) {
-            $this->_message(
-                $this->__('Customer not logged in.'), self::MESSAGE_STATUS_ERROR, array('logged_in' => '0')
-            );
+        if (!$this->_isCustomerLoggedIn()) {
             return;
         }
         if ($this->getRequest()->isPost()) {
@@ -147,7 +148,6 @@ public function editAction()
             /* @var $customerForm Mage_Customer_Model_Form */
             $customerForm = Mage::getModel('customer/form');
             $customerForm->setFormCode('customer_account_edit')->setEntity($customer);
-
             $customerData = $customerForm->extractData($this->getRequest());
 
             $errors = array();
@@ -224,26 +224,33 @@ public function editAction()
      */
     public function saveAction()
     {
-        $session = $this->_getSession();
-        $request = $this->getRequest();
-        if ($session->isLoggedIn()) {
-            $this->_message($this->__('You are already logged in.'), self::MESSAGE_STATUS_ERROR);
+        if (!$this->_isCustomerLoggedIn(false)) {
             return;
         }
 
+        $session = $this->_getSession();
+        $request = $this->getRequest();
+
         $session->setEscapeMessages(true); // prevent XSS injection in user input
         if ($request->isPost()) {
             $errors = array();
 
-            /* @var $customer Mage_Customer_Model_Customer */
+            /** @var $customer Mage_Customer_Model_Customer */
             $customer = Mage::registry('current_customer');
             if (is_null($customer)) {
                 $customer = Mage::getModel('customer/customer');
             }
 
-            /* @var $customerForm Mage_Customer_Model_Form */
+            /** @var $customerForm Mage_Customer_Model_Form */
             $customerForm = Mage::getModel('customer/form');
-            $customerForm->setFormCode('customer_account_create')->setEntity($customer);
+
+            /** Check if registration from checkout page */
+            if ($this->getRequest()->getParam('checkout_page_registration', false)) {
+                $formCode = 'checkout_register';
+            } else {
+                $formCode = 'customer_account_create';
+            }
+            $customerForm->setFormCode($formCode)->setEntity($customer);
 
             $customerData = $customerForm->extractData($this->getRequest());
 
@@ -338,16 +345,12 @@ public function forgotPasswordAction()
                     $newPassword = $customer->generatePassword();
                     $customer->changePassword($newPassword, false);
                     $customer->sendPasswordReminderEmail();
-                    $this->_message(
-                        $this->__('A new password has been sent.'), self::MESSAGE_STATUS_SUCCESS
-                    );
+                    $this->_message($this->__('A new password has been sent.'), self::MESSAGE_STATUS_SUCCESS);
                     return;
                 } catch (Mage_Core_Exception $e) {
                     $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
                 } catch (Exception $e) {
-                    $this->_message(
-                        $this->__('Problem changing or sending password.'), self::MESSAGE_STATUS_ERROR
-                    );
+                    $this->_message($this->__('Problem changing or sending password.'), self::MESSAGE_STATUS_ERROR);
                 }
             } else {
                 $this->_message(
@@ -366,10 +369,7 @@ public function forgotPasswordAction()
      */
     public function addressAction()
     {
-        if (!$this->_getSession()->isLoggedIn()) {
-            $this->_message(
-                $this->__('Customer not logged in.'), self::MESSAGE_STATUS_ERROR, array('logged_in' => '0')
-            );
+        if (!$this->_isCustomerLoggedIn()) {
             return;
         }
 
@@ -399,37 +399,36 @@ public function addressAction()
      */
     public function addressFormAction()
     {
-        try {
-            if (!$this->_getSession()->isLoggedIn()) {
-                $this->_message(
-                    $this->__('Customer not logged in.'), self::MESSAGE_STATUS_ERROR, array('logged_in' => '0')
-                );
-                return;
-            }
-
-            $address = Mage::getModel('customer/address');
+        if (!$this->_isCustomerLoggedIn()) {
+            return;
+        }
 
-            /**
-             * Init address object
-             */
-            $addressId = (int)$this->getRequest()->getParam('id');
+        $address = Mage::getModel('customer/address');
+        $addressId = (int)$this->getRequest()->getParam('id');
+        try {
             if ($addressId) {
+                /**
+                 * Init address object
+                 */
                 $address->load($addressId);
                 if ($address->getCustomerId() != $this->_getSession()->getCustomerId()) {
                     $this->_message($this->__('Specified address does not exist.'), self::MESSAGE_STATUS_ERROR);
                     return;
                 }
             }
-
-            $this->loadLayout(false)->getLayout()->getBlock('xmlconnect.customer.address.form')->setAddress($address);
-
+            /** @var $formBlock Mage_XmlConnect_Block_Customer_Address_Form */
+            $formBlock = $this->loadLayout(false)->getLayout()->getBlock('xmlconnect.customer.address.form')
+                ->setAddress($address);
+            if (Mage::helper('xmlconnect')->checkApiVersion(Mage_XmlConnect_Helper_Data::DEVICE_API_V_23)) {
+                $formBlock->setNewCountryList(true);
+            }
             $this->renderLayout();
         } catch (Mage_Core_Exception $e) {
             $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
             Mage::logException($e);
         } catch (Exception $e) {
-            Mage::logException($e);
             $this->_message($this->__('Can\'t load customer form.'), self::MESSAGE_STATUS_ERROR);
+            Mage::logException($e);
         }
     }
 
@@ -440,10 +439,7 @@ public function addressFormAction()
      */
     public function deleteAddressAction()
     {
-        if (!$this->_getSession()->isLoggedIn()) {
-            $this->_message(
-                $this->__('Customer not logged in.'), self::MESSAGE_STATUS_ERROR, array('logged_in' => '0')
-            );
+        if (!$this->_isCustomerLoggedIn()) {
             return;
         }
 
@@ -462,8 +458,8 @@ public function deleteAddressAction()
                 $address->delete();
                 $this->_message($this->__('Address has been deleted.'), self::MESSAGE_STATUS_SUCCESS);
             } catch (Exception $e) {
-                Mage::logException($e);
                 $this->_message($this->__('An error occurred while deleting the address.'), self::MESSAGE_STATUS_ERROR);
+                Mage::logException($e);
             }
         }
     }
@@ -475,10 +471,7 @@ public function deleteAddressAction()
      */
     public function saveAddressAction()
     {
-        if (!$this->_getSession()->isLoggedIn()) {
-            $this->_message(
-                $this->__('Customer not logged in.'), self::MESSAGE_STATUS_ERROR, array('logged_in' => '0')
-            );
+        if (!$this->_isCustomerLoggedIn()) {
             return;
         }
 
@@ -499,8 +492,7 @@ public function saveAddressAction()
 
             /* @var $addressForm Mage_Customer_Model_Form */
             $addressForm = Mage::getModel('customer/form');
-            $addressForm->setFormCode('customer_address_edit')
-                ->setEntity($address);
+            $addressForm->setFormCode('customer_address_edit')->setEntity($address);
             $addressData    = $addressForm->extractData($this->getRequest());
             $addressErrors  = $addressForm->validateData($addressData);
             if ($addressErrors !== true) {
@@ -539,8 +531,8 @@ public function saveAddressAction()
             } catch (Mage_Core_Exception $e) {
                 $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
             } catch (Exception $e) {
-                Mage::logException($e);
                 $this->_message($this->__('Can\'t save address.'), self::MESSAGE_STATUS_ERROR);
+                Mage::logException($e);
             }
         } else {
             $this->_message($this->__('Address data not specified.'), self::MESSAGE_STATUS_ERROR);
@@ -554,10 +546,7 @@ public function saveAddressAction()
      */
     public function orderListAction()
     {
-        if (!$this->_getSession()->isLoggedIn()) {
-            $this->_message(
-                $this->__('Customer not logged in.'), self::MESSAGE_STATUS_ERROR, array('logged_in' => '0')
-            );
+        if (!$this->_isCustomerLoggedIn()) {
             return;
         }
 
@@ -580,10 +569,7 @@ public function orderListAction()
     public function orderDetailsAction()
     {
         try {
-            if (!$this->_getSession()->isLoggedIn()) {
-                $this->_message(
-                    $this->__('Customer not logged in.'), self::MESSAGE_STATUS_ERROR, array('logged_in' => '0')
-                );
+            if (!$this->_isCustomerLoggedIn()) {
                 return;
             }
 
@@ -601,7 +587,12 @@ public function orderDetailsAction()
                 $this->_message($this->__('Order is not available.'), self::MESSAGE_STATUS_ERROR);
                 return;
             }
+
             $this->loadLayout(false);
+            if (Mage::helper('xmlconnect')->checkApiVersion(Mage_XmlConnect_Helper_Data::DEVICE_API_V_23)) {
+                $this->getLayout()->getBlock('order.items')->setNewApi(true);
+                $this->getLayout()->getBlock('order.totals')->setNewApi(true);
+            }
             $this->renderLayout();
             return;
         } catch (Mage_Core_Exception $e) {
@@ -712,9 +703,13 @@ public function giftcardCheckAction()
                 );
                 return;
             }
+            $code = $this->getRequest()->getPost('giftcard_code', '');
+            if (!$code) {
+                $this->_message($this->__('Gift Card code is empty.'), self::MESSAGE_STATUS_ERROR);
+                return;
+            }
             /* @var $card Enterprise_GiftCardAccount_Model_Giftcardaccount */
-            $card = Mage::getModel('enterprise_giftcardaccount/giftcardaccount')
-                ->loadByCode($this->getRequest()->getParam('giftcard_code', ''));
+            $card = Mage::getModel('enterprise_giftcardaccount/giftcardaccount')->loadByCode($code);
             Mage::register('current_giftcardaccount', $card);
 
             $card->isValid(true, true, true, false);
@@ -750,18 +745,20 @@ public function giftcardRedeemAction()
                 return;
             }
 
-            $code = $this->getRequest()->getParam('giftcard_code', '');
+            $code = $this->getRequest()->getPost('giftcard_code', '');
             if ($code) {
                 if (!Mage::helper('enterprise_customerbalance')->isEnabled()) {
                     Mage::throwException($this->__('Redemption functionality is disabled.'));
                 }
-                Mage::getModel('enterprise_giftcardaccount/giftcardaccount')->loadByCode($code)
-                    ->setIsRedeemed(true)->redeem();
+                Mage::getModel('enterprise_giftcardaccount/giftcardaccount')->loadByCode($code)->setIsRedeemed(true)
+                    ->redeem();
 
                 $this->_message(
                     $this->__('Gift Card "%s" was redeemed.', Mage::helper('core')->escapeHtml($code)),
                     self::MESSAGE_STATUS_SUCCESS
                 );
+            } else {
+                $this->_message($this->__('Gift Card code is empty.'), self::MESSAGE_STATUS_ERROR);
             }
             return;
         } catch (Mage_Core_Exception $e) {
@@ -774,4 +771,71 @@ public function giftcardRedeemAction()
             Mage::logException($e);
         }
     }
+
+    /**
+     * Customer Downloadable Products list
+     *
+     * @return null
+     */
+    public function downloadsAction()
+    {
+        try {
+            $this->loadLayout(false);
+            $this->renderLayout();
+            return;
+        } catch (Mage_Core_Exception $e) {
+            $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
+        } catch (Exception $e) {
+            $this->_message($this->__('Unable to render downloadable products.'), self::MESSAGE_STATUS_ERROR);
+            Mage::logException($e);
+        }
+    }
+
+    /**
+     * Customer registration account form
+     *
+     * @return null
+     */
+    public function checkoutRegistrationAction()
+    {
+        try {
+            $this->loadLayout(false)->getLayout()->getBlock('xmlconnect.customer.checkout.registration')
+                ->setCustomer(Mage::getModel('customer/customer'))
+                ->setAttributesBlockName('customer_form_customer_user_defined_attributes')
+                ->setCustomerFormCode('checkout_register')->setCheckoutPageRegistration(true)->setIsEditPage(false);
+            $this->renderLayout();
+        } catch (Mage_Core_Exception $e) {
+            $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
+        } catch (Exception $e) {
+            Mage::logException($e);
+            $this->_message($this->__('Can\'t load customer form.'), self::MESSAGE_STATUS_ERROR);
+        }
+    }
+
+    /**
+     * Check customer access
+     *
+     * @param bool $isCustomerLogged true - allow only logged customer, false - allow only unregistered customer
+     * @return bool
+     */
+    protected function _isCustomerLoggedIn($isCustomerLogged = true)
+    {
+        if ($isCustomerLogged) {
+            if (!$this->_getSession()->isLoggedIn()) {
+                $this->_message(
+                    $this->__('Customer not logged in.'), self::MESSAGE_STATUS_ERROR, array('logged_in' => '0')
+                );
+                return false;
+            }
+        } else {
+            if ($this->_getSession()->isLoggedIn()) {
+                $this->_message(
+                    $this->__('You are already logged in.'), self::MESSAGE_STATUS_ERROR, array('logged_in' => '1')
+                );
+                return false;
+            }
+        }
+
+        return true;
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/controllers/HomebannersController.php b/app/code/core/Mage/XmlConnect/controllers/HomebannersController.php
new file mode 100644
index 00000000000..219b5149910
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/controllers/HomebannersController.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect home banners controller
+ *
+ * @category    Mage
+ * @package     Mage_Xmlconnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_HomebannersController extends Mage_XmlConnect_Controller_Action
+{
+    /**
+     * Default action
+     *
+     * @return null
+     */
+    public function indexAction()
+    {
+        try {
+            $this->loadLayout(false);
+            $this->renderLayout();
+        } catch (Mage_Core_Exception $e) {
+            $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
+        } catch (Exception $e) {
+            $this->_message($this->__('Unable to load banners.'), self::MESSAGE_STATUS_ERROR);
+            Mage::logException($e);
+        }
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/controllers/LocalizationController.php b/app/code/core/Mage/XmlConnect/controllers/LocalizationController.php
new file mode 100644
index 00000000000..bb25d59aebe
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/controllers/LocalizationController.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect localization controller
+ *
+ * @category    Mage
+ * @package     Mage_Xmlconnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_LocalizationController extends Mage_XmlConnect_Controller_Action
+{
+    /**
+     * Default action
+     *
+     * @return null
+     */
+    public function indexAction()
+    {
+        try {
+            $this->loadLayout(false);
+            $this->renderLayout();
+        } catch (Mage_Core_Exception $e) {
+            $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
+            Mage::logException($e);
+        } catch (Exception $e) {
+            $this->_message($this->__('Unable to load localization.'), self::MESSAGE_STATUS_ERROR);
+            Mage::logException($e);
+        }
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/controllers/OfflineCatalogController.php b/app/code/core/Mage/XmlConnect/controllers/OfflineCatalogController.php
new file mode 100644
index 00000000000..3c45f3603af
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/controllers/OfflineCatalogController.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect offline catalog controller
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_OfflineCatalogController extends Mage_Core_Controller_Front_Action
+{
+    /**
+     * Index action
+     *
+     * @return null
+     */
+    public function indexAction()
+    {
+        /** @var $helper Mage_XmlConnect_Helper_OfflineCatalog */
+        $helper = Mage::helper('xmlconnect/offlineCatalog');
+        $key = $this->getRequest()->getParam('key', false);
+        if (!$key || !$helper->setCurrentDeviceModel($key)) {
+            $this->_forward('noRoute');
+            return;
+        }
+        try {
+            $this->loadLayout(false);
+            Mage::getModel('xmlconnect/offlineCatalog')->exportData();
+            $helper->renderXmlObject();
+            Mage::getSingleton('core/session')->addSuccess($this->__('Offline catalog export complete.'));
+        } catch (Exception $e) {
+            Mage::logException($e);
+            Mage::getSingleton('core/session')->addError($this->__('Offline catalog export failed.'));
+        }
+        $this->getResponse()->setBody(Mage::helper('core')->jsonEncode(
+            array('result' => Mage::app()->getLayout()->getMessagesBlock()->getGroupedHtml())
+        ));
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/controllers/Paypal/MeclController.php b/app/code/core/Mage/XmlConnect/controllers/Paypal/MeclController.php
index e811634afb4..682adfb1506 100644
--- a/app/code/core/Mage/XmlConnect/controllers/Paypal/MeclController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/Paypal/MeclController.php
@@ -96,8 +96,8 @@ public function preDispatch()
             && !Mage::getSingleton('checkout/session')->getQuote()->isAllowedGuestCheckout()
         ) {
             $this->setFlag('', self::FLAG_NO_DISPATCH, true);
-            $this->_message($this->__('Customer not logged in.'), self::MESSAGE_STATUS_ERROR,
-                array('logged_in' => '0')
+            $this->_message(
+                $this->__('Customer not logged in.'), self::MESSAGE_STATUS_ERROR, array('logged_in' => '0')
             );
             return;
         }
@@ -147,6 +147,7 @@ public function returnAction()
         try {
             $this->_initCheckout();
             $this->_checkout->returnFromPaypal($this->_initToken());
+
             $this->_message($this->__('Mobile Express Checkout processed successfully.'), self::MESSAGE_STATUS_SUCCESS);
             return;
         } catch (Mage_Core_Exception $e) {
@@ -162,6 +163,9 @@ public function returnAction()
      */
     public function reviewAction()
     {
+        if ($this->_checkApiForward('orderReview', Mage_XmlConnect_Helper_Data::DEVICE_API_V_23)) {
+            return;
+        }
         try {
             $this->_initCheckout();
             $this->_checkout->prepareOrderReview($this->_initToken());
@@ -191,6 +195,41 @@ public function reviewAction()
         }
     }
 
+    /**
+     * Order review after returning from PayPal
+     */
+    public function orderReviewAction()
+    {
+        try {
+            $this->_initCheckout();
+            $this->_checkout->prepareOrderReview($this->_initToken());
+            $this->loadLayout(false);
+            $this->_initLayoutMessages('paypal/session');
+
+            $messages = $this->_getSession()->getMessages(true);
+            $messageArray = array();
+            foreach ($messages->getItems() as $message) {
+                $messageArray[] = $message;
+            }
+
+            $detailsBlock = $this->getLayout()->getBlock('xmlconnect.cart.paypal.mecl.review');
+            if (count($messageArray)) {
+                $detailsBlock->setPaypalMessages($messageArray);
+            }
+
+            $detailsBlock->setQuote($this->_getQuote())->getChild('details')->setQuote($this->_getQuote())
+                ->getChild('totals');
+
+            $this->renderLayout();
+            return;
+        } catch (Mage_Core_Exception $e) {
+            $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
+        } catch (Exception $e) {
+            $this->_message($this->__('Unable to initialize express checkout review.'), self::MESSAGE_STATUS_ERROR);
+            Mage::logException($e);
+        }
+    }
+
     /**
      * Get shipping method list for PayPal
      */
@@ -208,8 +247,7 @@ public function shippingMethodsAction()
             $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
         } catch (Exception $e) {
             $this->_message(
-                $this->__('Unable to initialize express checkout shipping method list.'),
-                self::MESSAGE_STATUS_ERROR
+                $this->__('Unable to initialize express checkout shipping method list.'), self::MESSAGE_STATUS_ERROR
             );
             Mage::logException($e);
         }
@@ -224,6 +262,7 @@ public function saveShippingMethodAction()
             $this->_initCheckout();
             if ($this->getRequest()->getParam('shipping_method', false)) {
                 $this->_checkout->updateShippingMethod($this->getRequest()->getParam('shipping_method'));
+                $this->_getQuote()->save();
                 $this->_message($this->__('Shipping method successfully updated'), self::MESSAGE_STATUS_SUCCESS);
             } else {
                 $this->_message($this->__('Shipping method is required'), self::MESSAGE_STATUS_ERROR);
@@ -243,6 +282,16 @@ public function saveShippingMethodAction()
     public function placeOrderAction()
     {
         try {
+            $requiredAgreements = Mage::helper('checkout')->getRequiredAgreementIds();
+            if (!empty($requiredAgreements)) {
+                $postedAgreements = array_keys($this->getRequest()->getPost('agreement', array()));
+                if (array_diff($requiredAgreements, $postedAgreements)) {
+                    $error = $this->__('Please agree to all the terms and conditions before placing the order.');
+                    $this->_message($error, self::MESSAGE_STATUS_ERROR);
+                    return;
+                }
+            }
+
             $this->_initCheckout();
             $this->_checkout->place($this->_initToken());
 
@@ -299,7 +348,6 @@ public function placeOrderAction()
     public function cancelAction()
     {
         try {
-            $this->_initToken(false);
             // if there is an order - cancel it
             $orderId = $this->_getCheckoutSession()->getLastOrderId();
             $order = ($orderId) ? Mage::getModel('sales/order')->load($orderId) : false;
@@ -309,7 +357,7 @@ public function cancelAction()
                 $this->_getCheckoutSession()->unsLastQuoteId()->unsLastSuccessQuoteId()->unsLastOrderId()
                     ->unsLastRealOrderId();
             }
-
+            $this->_initToken(false);
             $this->_message($this->__('Mobile Express Checkout has been canceled.'), self::MESSAGE_STATUS_SUCCESS);
         } catch (Mage_Core_Exception $e) {
             $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
@@ -369,7 +417,6 @@ protected function _getQuote()
      * Search for proper checkout token in request or session or (un)set specified one
      * Combined getter/setter
      *
-     * @throws Mage_Core_Exception
      * @param string $setToken
      * @return Mage_Paypal_ExpressController|string
      */
diff --git a/app/code/core/Mage/XmlConnect/controllers/Paypal/MepController.php b/app/code/core/Mage/XmlConnect/controllers/Paypal/MepController.php
index e25999bfa12..fa9b6e4bf1b 100644
--- a/app/code/core/Mage/XmlConnect/controllers/Paypal/MepController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/Paypal/MepController.php
@@ -127,10 +127,7 @@ public function saveShippingAddressAction()
 
             $result = $this->_checkout->saveShipping($data);
             if (!isset($result['error'])) {
-                $this->_message(
-                    $this->__('Shipping address has been set.'),
-                    self::MESSAGE_STATUS_SUCCESS
-                );
+                $this->_message($this->__('Shipping address has been set.'), self::MESSAGE_STATUS_SUCCESS);
             } else {
                 if (!is_array($result['message'])) {
                     $result['message'] = array($result['message']);
@@ -181,6 +178,7 @@ public function saveShippingMethodAction()
             $this->_initCheckout();
             $data = $this->getRequest()->getPost('shipping_method', '');
             $this->_getQuote()->getShippingAddress()->setShippingMethod($data)->setCollectShippingRates(true)->save();
+
             $result = $this->_checkout->saveShippingMethod($data);
 
             if (!isset($result['error'])) {
diff --git a/app/code/core/Mage/XmlConnect/controllers/WishlistController.php b/app/code/core/Mage/XmlConnect/controllers/WishlistController.php
index fb7baf85645..40d7bc308b7 100644
--- a/app/code/core/Mage/XmlConnect/controllers/WishlistController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/WishlistController.php
@@ -88,6 +88,9 @@ protected function _getWishlist()
      */
     public function indexAction()
     {
+        if ($this->_checkApiForward('details', Mage_XmlConnect_Helper_Data::DEVICE_API_V_23)) {
+            return;
+        }
         $this->_getWishlist();
         try {
             $this->loadLayout(false);
@@ -103,6 +106,25 @@ public function indexAction()
         }
     }
 
+    /**
+     * Display customer wishlist details
+     *
+     * @return null
+     */
+    public function detailsAction()
+    {
+        $this->_getWishlist();
+        try {
+            $this->loadLayout(false);
+            $this->renderLayout();
+        } catch (Mage_Core_Exception $e) {
+            $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
+        } catch (Exception $e) {
+            Mage::logException($e);
+            $this->_message($this->__('An error occurred while loading wishlist.'), self::MESSAGE_STATUS_ERROR);
+        }
+    }
+
     /**
      * Adding new item
      *
diff --git a/app/code/core/Mage/XmlConnect/etc/adminhtml.xml b/app/code/core/Mage/XmlConnect/etc/adminhtml.xml
index 4dd8b11176a..16cbe64f5c9 100644
--- a/app/code/core/Mage/XmlConnect/etc/adminhtml.xml
+++ b/app/code/core/Mage/XmlConnect/etc/adminhtml.xml
@@ -51,6 +51,11 @@
                     <sort_order>40</sort_order>
                     <action>adminhtml/mobile/queue</action>
                 </queue>
+                <mobile_admin_app translate="title" module="xmlconnect">
+                    <title>Admin Application Settings</title>
+                    <sort_order>50</sort_order>
+                    <action>adminhtml/admin_application</action>
+                </mobile_admin_app>
             </children>
         </xmlconnect>
     </menu>
@@ -78,6 +83,10 @@
                                 <title>Message Queue</title>
                                 <sort_order>40</sort_order>
                             </queue>
+                            <admin_connect translate="title" module="xmlconnect">
+                                <title>Admin Mobile Application</title>
+                                <sort_order>50</sort_order>
+                            </admin_connect>
                         </children>
                     </xmlconnect>
                 </children>
diff --git a/app/code/core/Mage/XmlConnect/etc/config.xml b/app/code/core/Mage/XmlConnect/etc/config.xml
index 18a3fc72212..6f6e33aec1f 100644
--- a/app/code/core/Mage/XmlConnect/etc/config.xml
+++ b/app/code/core/Mage/XmlConnect/etc/config.xml
@@ -28,8 +28,8 @@
 <config>
     <modules>
         <Mage_XmlConnect>
-            <version>1.6.0.0</version>
-            <innerVersion>22.1</innerVersion>
+            <version>1.6.0.0.1</version>
+            <innerVersion>23.1</innerVersion>
         </Mage_XmlConnect>
     </modules>
     <global>
@@ -48,6 +48,7 @@
                     <queue><table>xmlconnect_queue</table></queue>
                     <template><table>xmlconnect_notification_template</table></template>
                     <configData><table>xmlconnect_config_data</table></configData>
+                    <images><table>xmlconnect_images</table></images>
                 </entities>
             </xmlconnect_resource>
         </models>
@@ -83,7 +84,52 @@
                     </xmlconnect>
                 </observers>
             </websiterestriction_frontend>
+            <clean_catalog_images_cache_after>
+                <observers>
+                    <xmlconnect>
+                        <class>xmlconnect/observer</class>
+                        <method>clearCategoryImagesCache</method>
+                    </xmlconnect>
+                </observers>
+            </clean_catalog_images_cache_after>
+            <controller_action_predispatch>
+                <observers>
+                    <xmlconnect>
+                        <class>xmlconnect/observer</class>
+                        <method>actionFrontPreDispatchXmlAdmin</method>
+                    </xmlconnect>
+                </observers>
+            </controller_action_predispatch>
         </events>
+        <xmlconnect>
+            <sales>
+                <quote>
+                    <totals>
+                        <subtotal>
+                            <renderer>xmlconnect/cart_cartTotals_subtotal</renderer>
+                        </subtotal>
+                        <grand_total>
+                            <renderer>xmlconnect/cart_cartTotals_grandtotal</renderer>
+                        </grand_total>
+                        <shipping>
+                            <renderer>xmlconnect/cart_cartTotals_shipping</renderer>
+                        </shipping>
+                        <giftcardaccount>
+                            <renderer>xmlconnect/cart_cartTotals_nodes_giftcardaccount</renderer>
+                            <is_node>1</is_node>
+                        </giftcardaccount>
+                        <discount>
+                            <renderer>xmlconnect/cart_cartTotals_nodes_default</renderer>
+                            <is_node>1</is_node>
+                        </discount>
+                        <customerbalance>
+                            <renderer>xmlconnect/cart_cartTotals_nodes_default</renderer>
+                            <is_node>1</is_node>
+                        </customerbalance>
+                    </totals>
+                </quote>
+            </sales>
+        </xmlconnect>
     </global>
     <admin>
          <routers>
@@ -122,6 +168,14 @@
                     </xmlconnect>
                 </observers>
             </core_config_data_save_after>
+            <core_config_data_save_before>
+                <observers>
+                    <xmlconnect>
+                        <class>xmlconnect/observer</class>
+                        <method>changeUpdatedAtParamOnConfigSave</method>
+                    </xmlconnect>
+                </observers>
+            </core_config_data_save_before>
             <before_save_message_queue>
                 <observers>
                     <xmlconnect>
@@ -130,6 +184,14 @@
                     </xmlconnect>
                 </observers>
             </before_save_message_queue>
+            <controller_action_predispatch>
+                <observers>
+                    <xmlconnect>
+                        <class>xmlconnect/observer</class>
+                        <method>actionPreDispatchXmlAdmin</method>
+                    </xmlconnect>
+                </observers>
+            </controller_action_predispatch>
         </events>
     </adminhtml>
     <frontend>
@@ -167,6 +229,7 @@
                 <title>PayPal Mobile Payments Library</title>
                 <allowspecific>0</allowspecific>
                 <group>paypal</group>
+                <line_items_enabled>1</line_items_enabled>
             </paypal_mep>
             <paypal_mecl>
                 <active>1</active>
@@ -174,26 +237,20 @@
                 <title>PayPal Mobile Express Checkout Library</title>
                 <allowspecific>0</allowspecific>
                 <group>paypal</group>
+                <payment_action>Authorization</payment_action>
+                <line_items_enabled>1</line_items_enabled>
+                <solution_type>Mark</solution_type>
+                <authorization_honor_period>3</authorization_honor_period>
+                <order_valid_period>29</order_valid_period>
+                <child_authorization_number>1</child_authorization_number>
             </paypal_mecl>
         </payment>
         <screen_size>
             <!-- WARNING !!!!!  ALL IMAGE NODES MUST END ON "icon"|"Icon"|"Image"  !!!!!  -->
             <default>
-                <content>
-                        <product_small>70</product_small>
-                        <product_big>130</product_big>
-                        <category>80</category>
-                        <product_gallery_big>280</product_gallery_big>
-                        <product_gallery_small>40</product_gallery_small>
-                </content>
                 <interface>
                     <native>
-                        <navigationBar>
-                            <icon> <widthMax>35</widthMax> <heightMax>35</heightMax> </icon>
-                        </navigationBar>
-                        <sortingBar>
-                            <backgroundImage> <width>320</width> <height>40</height> </backgroundImage>
-                        </sortingBar>
+                        <!-- for all devices preview and config -->
                         <tabBar>
                             <home> <icon> <heightMax>35</heightMax> </icon> </home>
                             <shop> <icon> <heightMax>35</heightMax> </icon> </shop>
@@ -201,31 +258,8 @@
                             <cart> <icon> <heightMax>35</heightMax> </icon> </cart>
                             <more> <icon> <heightMax>35</heightMax> </icon> </more>
                         </tabBar>
-                        <body>
-                            <!-- iphone images -->
-                            <bannerImage> <width>320</width> <height>230</height> </bannerImage>
-                            <backgroundImage> <width>320</width> <height>367</height> </backgroundImage>
-
-                            <!-- ipad images -->
-                            <bannerIpadLandscapeImage> <width>1024</width> <height>344</height> </bannerIpadLandscapeImage>
-                            <bannerIpadImage> <width>768</width> <height>294</height> </bannerIpadImage>
-                            <backgroundIpadLandscapeImage> <width>1024</width> <height>704</height> </backgroundIpadLandscapeImage>
-                            <backgroundIpadPortraitImage> <width>768</width> <height>960</height> </backgroundIpadPortraitImage>
-
-                            <!-- andriod images -->
-                            <bannerAndroidImage> <width>320</width> <height>258</height> </bannerAndroidImage>
+                        <!-- for all devices preview end -->
 
-                            <!-- images that are the same for all type of devices -->
-                            <itemBackgroundIcon> <width>90</width> <height>120</height> </itemBackgroundIcon>
-                            <rowBackgroundIcon> <width>320</width> <height>90</height> </rowBackgroundIcon>
-                            <rowAttributeIcon> <widthMax>30</widthMax> <heightMax>90</heightMax> </rowAttributeIcon>
-                            <addToCartBackgroundIcon> <width>136</width> <height>28</height> </addToCartBackgroundIcon>
-                            <actionsBackgroundIcon> <width>107</width> <height>37</height> </actionsBackgroundIcon>
-                            <reviewsBackgroundIcon> <width>320</width> <height>37</height> </reviewsBackgroundIcon>
-                        </body>
-                        <appliedFilters>
-                            <backgroundImage> <width>320</width> <height>20</height> </backgroundImage>
-                        </appliedFilters>
                         <itemActions>
                             <backgroundImage> <width>320</width> <height>90</height> </backgroundImage>
                             <viewGalleryIcon> <widthMax>40</widthMax> <heightMax>40</heightMax> </viewGalleryIcon>
@@ -262,134 +296,12 @@
                     </submit>
                 </interface>
             </default>
-            <_320x480>
-                <default>
-                    <source>default</source>
-                    <updates>
-                        <u1>
-                            <path>content/product_gallery_big</path>
-                            <function>update</function>
-                            <data>560</data>
-                        </u1>
-                    </updates>
-                </default>
-                <a>
-                    <source>default</source>
-                    <updates>
-                        <u1>
-                            <path>interface/native/tabBar</path>
-                            <function>zoom</function>
-                            <data>1.02857</data>
-                        </u1>
-                    </updates>
-                </a>
-                <b>
-                    <source>default</source>
-                    <updates>
-                        <u1>
-                            <path>interface/native/tabBar</path>
-                            <!-- 48px -->
-                            <function>zoom</function>
-                            <data>1.31428</data>
-                        </u1>
-                    </updates>
-                </b>
-                <c>
-                    <source>default</source>
-                    <updates>
-                        <u1>
-                            <path>interface/native/tabBar</path>
-                            <!-- 72px -->
-                            <function>zoom</function>
-                            <data>2.05714</data>
-                        </u1>
-                    </updates>
-                </c>
-            </_320x480>
-            <_480x800>
-                <default>
-                    <source>default</source>
-                    <updates>
-                        <u1>
-                            <path>/</path>
-                            <function>zoom</function>
-                            <data>1.5</data>
-                        </u1>
-                        <u2>
-                            <path>content/product_gallery_big</path>
-                            <function>update</function>
-                            <data>840</data>
-                        </u2>
-                    </updates>
-                </default>
-            </_480x800>
-            <_480x854>
-                <default>
-                    <source>default</source>
-                    <updates>
-                        <u1>
-                            <path>/</path>
-                            <function>zoom</function>
-                            <data>1.5</data>
-                        </u1>
-                         <u2>
-                            <path>content/product_gallery_big</path>
-                            <function>update</function>
-                            <data>840</data>
-                        </u2>
-                    </updates>
-                </default>
-            </_480x854>
-            <_640x960>
-                <default>
-                    <source>default</source>
-                    <updates>
-                        <u1>
-                            <path>/</path>
-                            <function>zoom</function>
-                            <data>2.0</data>
-                        </u1>
-                        <u2>
-                            <path>content/product_gallery_big</path>
-                            <function>update</function>
-                            <data>1120</data>
-                        </u2>
-                    </updates>
-                </default>
-            </_640x960>
-            <_768x1024>
-                <default>
-                    <source>default</source>
-                    <updates>
-                        <u1>
-                            <path>content/product_small</path>
-                            <function>update</function>
-                            <data>210</data>
-                        </u1>
-                        <u2>
-                            <path>content/product_big</path>
-                            <function>update</function>
-                            <data>400</data>
-                        </u2>
-                        <u3>
-                            <path>content/category</path>
-                            <function>update</function>
-                            <data>243</data>
-                        </u3>
-                        <u4>
-                            <path>content/product_gallery_big</path>
-                            <function>update</function>
-                            <data>1288</data>
-                        </u4>
-                    </updates>
-                </default>
-            </_768x1024>
         </screen_size>
         <xmlconnect>
             <mobile_application>
                 <curl_ssl_verifypeer>1</curl_ssl_verifypeer>
                 <magentocommerce_url>www.magentocommerce.com/products/index.php/mobile/activate/index/key/</magentocommerce_url>
-                <activation_key_url>http://www.magentocommerce.com/product/mobile</activation_key_url>
+                <activation_key_url>http://magentocommerce.com/product/mobile</activation_key_url>
                 <resubmission_key_url>http://www.magentocommerce.com/product/mobile#resubmission</resubmission_key_url>
                 <urbanairship_push_url>http://urbanairship.com/products/push-notifications/</urbanairship_push_url>
                 <urbanairship_rich_push_url>http://urbanairship.com/products/rich-push/</urbanairship_rich_push_url>
diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.4.0.13-1.4.0.14.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.4.0.13-1.4.0.14.php
index 7b278fa1399..b7a1aa2bf48 100644
--- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.4.0.13-1.4.0.14.php
+++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.4.0.13-1.4.0.14.php
@@ -37,25 +37,17 @@
 
 $appTableName = $installer->getTable('xmlconnect/application');
 
-$configField = $installer
-    ->getConnection()
+$configField = $installer->getConnection()
     ->tableColumnExists($appTableName, 'configuration');
 
 if ($configField) {
     /** @var $appModel Mage_XmlConnect_Model_Application */
     $appModel = Mage::getModel('xmlconnect/application');
-    $select = $appModel->getResource()
-        ->getReadConnection()
-        ->select()
-        ->from(
-            $appTableName,
-            array('application_id', 'configuration')
+    $select = $appModel->getResource()->getReadConnection()->select()->from(
+        $appTableName, array('application_id', 'configuration')
     );
 
-    $result = $appModel
-        ->getResource()
-        ->getReadConnection()
-        ->fetchAll($select);
+    $result = $appModel->getResource()->getReadConnection()->fetchAll($select);
 
     foreach ($result as $rows) {
         if (empty($rows['configuration'])) {
@@ -69,10 +61,7 @@
         );
     }
 
-    $installer
-        ->getConnection()
-        ->dropColumn(
-            $installer->getTable('xmlconnect/application'),
-            'configuration'
+    $installer->getConnection()->dropColumn(
+        $installer->getTable('xmlconnect/application'), 'configuration'
     );
 }
diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.5.9.9-1.6.0.0.php
new file mode 100644
index 00000000000..edc8729943d
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.5.9.9-1.6.0.0.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Xmlconnect templates data update
+ *
+ * @category    Mage
+ * @package     Mage_Xmlconnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+
+/* @var $installer Mage_Core_Model_Resource_Setup */
+$installer = $this;
+
+$templateTableName = $installer->getTable('xmlconnect/template');
+$appCodeField = $installer->getConnection()->tableColumnExists($templateTableName, 'app_code');
+
+if ($appCodeField) {
+    /** @var $appModel Mage_XmlConnect_Model_Application */
+    $appModel = Mage::getModel('xmlconnect/application');
+    /** @var $templateModel Mage_XmlConnect_Model_Template */
+    $templateModel = Mage::getModel('xmlconnect/template');
+
+    $select = $templateModel->getResource()->getReadConnection()->select()
+        ->from($templateTableName, array('app_code', 'template_id'));
+
+    $result = $templateModel->getResource()->getReadConnection()->fetchAll($select);
+
+    foreach ($result as $rows) {
+        if (empty($rows['app_code'])) {
+            continue;
+        }
+        $appModel->loadByCode($rows['app_code']);
+        $templateModel->load($rows['template_id']);
+        $templateModel->setApplicationId($appModel->getApplicationId());
+        $templateModel->save();
+    }
+
+    $installer->getConnection()->dropColumn($templateTableName, 'app_code');
+}
diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.6.0.0-1.6.0.0.1.php
new file mode 100644
index 00000000000..0fead43f42c
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.6.0.0-1.6.0.0.1.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Xmlconnect Config data install
+ *
+ * @category    Mage
+ * @package     Mage_Xmlconnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+
+/* @var $installer Mage_Core_Model_Resource_Setup */
+$installer = $this;
+
+    $configTableName = $installer->getTable('xmlconnect/configData');
+
+    /** @var $configModel Mage_XmlConnect_Model_Application */
+    $configModel = Mage::getModel('xmlconnect/configData');
+    $select = $configModel->getResource()->getReadConnection()->select()->from(
+        $configTableName, array('application_id')
+    )->group('application_id')->where('category=?', Mage_XmlConnect_Model_Application::DEPRECATED_CONFIG_FLAG);
+
+    $result = $configModel->getResource()->getReadConnection()->fetchCol($select);
+
+    if (count($result)) {
+        Mage::getModel('xmlconnect/images')->dataUpgradeOldConfig($result);
+        Mage::getModel('xmlconnect/configData')->pagesUpgradeOldConfig($result);
+    }
diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-install-1.4.0.8.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-install-1.4.0.8.php
index 988741b5c1f..5761f17ce80 100644
--- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-install-1.4.0.8.php
+++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-install-1.4.0.8.php
@@ -44,7 +44,8 @@
   PRIMARY KEY (`application_id`),
   UNIQUE KEY `UNQ_XMLCONNECT_APPLICATION_CODE` (`code`),
   KEY `FK_XMLCONNECT_APPLICAION_STORE` (`store_id`),
-  CONSTRAINT `FK_XMLCONNECT_APPLICAION_STORE` FOREIGN KEY (`store_id`) REFERENCES `{$installer->getTable('core/store')}` (`store_id`) ON DELETE SET NULL ON UPDATE SET NULL
+  CONSTRAINT `FK_XMLCONNECT_APPLICAION_STORE` FOREIGN KEY (`store_id`)
+  REFERENCES `{$installer->getTable('core/store')}` (`store_id`) ON DELETE SET NULL ON UPDATE SET NULL
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 
 CREATE TABLE IF NOT EXISTS `{$installer->getTable('xmlconnect_history')}` (
@@ -58,7 +59,8 @@
   `code` varchar(255) NOT NULL,
   PRIMARY KEY (`history_id`),
   KEY `FK_XMLCONNECT_HISTORY_APPLICATION` (`application_id`),
-  CONSTRAINT `FK_XMLCONNECT_HISTORY_APPLICATION` FOREIGN KEY (`application_id`) REFERENCES `{$installer->getTable('xmlconnect/application')}` (`application_id`) ON DELETE CASCADE ON UPDATE CASCADE
+  CONSTRAINT `FK_XMLCONNECT_HISTORY_APPLICATION` FOREIGN KEY (`application_id`)
+  REFERENCES `{$installer->getTable('xmlconnect/application')}` (`application_id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 ");
 
diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.9-1.4.0.10.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.9-1.4.0.10.php
index a06ed8ba613..39278371609 100755
--- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.9-1.4.0.10.php
+++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.9-1.4.0.10.php
@@ -27,6 +27,11 @@
 $installer = $this;
 $installer->startSetup();
 
-$installer->getConnection()->changeColumn($installer->getTable('xmlconnect/queue'), 'exec_time', 'exec_time', 'TIMESTAMP NULL DEFAULT NULL');
+$installer->getConnection()->changeColumn(
+    $installer->getTable('xmlconnect/queue'),
+    'exec_time',
+    'exec_time',
+    'TIMESTAMP NULL DEFAULT NULL'
+);
 
 $installer->endSetup();
diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php
index 49b8ddafe3e..4c9407ba554 100755
--- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php
+++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php
@@ -111,8 +111,6 @@
     )
 );
 
-$installer->getConnection()->dropColumn($templateTableName, 'app_code');
-
 /**
  * Modify fields for 'xmlconnect_queue'
  */
diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/upgrade-1.6.0.0-1.6.0.0.1.php
new file mode 100644
index 00000000000..000ea1f95a7
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/upgrade-1.6.0.0-1.6.0.0.1.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/** @var $installer Mage_XmlConnect_Model_Resource_Setup */
+$installer = $this;
+$installer->startSetup();
+
+/**
+ * Application table 'xmlconnect_application'
+ */
+$appTableName = $installer->getTable('xmlconnect/application');
+
+/**
+ * Create table 'xmlconnect_images'
+ */
+$imagesTableName = $installer->getTable('xmlconnect/images');
+$imagesTable = $installer->getConnection()
+    ->newTable($imagesTableName)
+    ->addColumn('image_id', Varien_Db_Ddl_Table::TYPE_INTEGER, null, array(
+            'identity'  => true,
+            'unsigned'  => true,
+            'nullable'  => false,
+            'primary'   => true,
+        ), 'Image Id')
+    ->addColumn('application_id', Varien_Db_Ddl_Table::TYPE_SMALLINT, null, array(
+            'unsigned'  => true,
+            'nullable'  => false,
+        ), 'Application Id')
+    ->addColumn('image_file', Varien_Db_Ddl_Table::TYPE_TEXT, 255, array(
+            'nullable'  => false,
+        ), 'Image File')
+    ->addColumn('image_type', Varien_Db_Ddl_Table::TYPE_TEXT, 255, array(
+            'nullable'  => false,
+        ), 'Image Type')
+    ->addColumn('order', Varien_Db_Ddl_Table::TYPE_INTEGER, null, array(
+            'unsigned'  => true,
+            'nullable'  => false,
+        ), 'Order')
+    ->addForeignKey(
+        $installer->getFkName($imagesTableName, 'application_id', $appTableName, 'application_id'),
+        'application_id',
+        $appTableName,
+        'application_id',
+        Varien_Db_Ddl_Table::ACTION_CASCADE,
+        Varien_Db_Ddl_Table::ACTION_CASCADE
+    )
+    ->setComment('Xmlconnect Images');
+$installer->getConnection()->createTable($imagesTable);
+
+$installer->endSetup();
diff --git a/app/code/core/Zend/Db/Statement.php b/app/code/core/Zend/Db/Statement.php
new file mode 100644
index 00000000000..d6ddab40465
--- /dev/null
+++ b/app/code/core/Zend/Db/Statement.php
@@ -0,0 +1,476 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Db
+ * @subpackage Statement
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Statement.php 20096 2010-01-06 02:05:09Z bkarwin $
+ */
+
+/**
+ * @see Zend_Db
+ */
+#require_once 'Zend/Db.php';
+
+/**
+ * @see Zend_Db_Statement_Interface
+ */
+#require_once 'Zend/Db/Statement/Interface.php';
+
+/**
+ * Abstract class to emulate a PDOStatement for native database adapters.
+ *
+ * @category   Zend
+ * @package    Zend_Db
+ * @subpackage Statement
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface
+{
+
+    /**
+     * @var resource|object The driver level statement object/resource
+     */
+    protected $_stmt = null;
+
+    /**
+     * @var Zend_Db_Adapter_Abstract
+     */
+    protected $_adapter = null;
+
+    /**
+     * The current fetch mode.
+     *
+     * @var integer
+     */
+    protected $_fetchMode = Zend_Db::FETCH_ASSOC;
+
+    /**
+     * Attributes.
+     *
+     * @var array
+     */
+    protected $_attribute = array();
+
+    /**
+     * Column result bindings.
+     *
+     * @var array
+     */
+    protected $_bindColumn = array();
+
+    /**
+     * Query parameter bindings; covers bindParam() and bindValue().
+     *
+     * @var array
+     */
+    protected $_bindParam = array();
+
+    /**
+     * SQL string split into an array at placeholders.
+     *
+     * @var array
+     */
+    protected $_sqlSplit = array();
+
+    /**
+     * Parameter placeholders in the SQL string by position in the split array.
+     *
+     * @var array
+     */
+    protected $_sqlParam = array();
+
+    /**
+     * @var Zend_Db_Profiler_Query
+     */
+    protected $_queryId = null;
+
+    /**
+     * Constructor for a statement.
+     *
+     * @param Zend_Db_Adapter_Abstract $adapter
+     * @param mixed $sql Either a string or Zend_Db_Select.
+     */
+    public function __construct($adapter, $sql)
+    {
+        $this->_adapter = $adapter;
+        if ($sql instanceof Zend_Db_Select) {
+            $sql = $sql->assemble();
+        }
+        $this->_parseParameters($sql);
+        $this->_prepare($sql);
+
+        $this->_queryId = $this->_adapter->getProfiler()->queryStart($sql);
+    }
+
+    /**
+     * Internal method called by abstract statment constructor to setup
+     * the driver level statement
+     *
+     * @return void
+     */
+    protected function _prepare($sql)
+    {
+        return;
+    }
+
+    /**
+     * @param string $sql
+     * @return void
+     */
+    protected function _parseParameters($sql)
+    {
+        $sql = $this->_stripQuoted($sql);
+
+        // split into text and params
+        $this->_sqlSplit = preg_split('/(\?|\:[a-zA-Z0-9_]+)/',
+            $sql, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
+
+        // map params
+        $this->_sqlParam = array();
+        foreach ($this->_sqlSplit as $key => $val) {
+            if ($val == '?') {
+                if ($this->_adapter->supportsParameters('positional') === false) {
+                    /**
+                     * @see Zend_Db_Statement_Exception
+                     */
+                    #require_once 'Zend/Db/Statement/Exception.php';
+                    throw new Zend_Db_Statement_Exception("Invalid bind-variable position '$val'");
+                }
+            } else if ($val[0] == ':') {
+                if ($this->_adapter->supportsParameters('named') === false) {
+                    /**
+                     * @see Zend_Db_Statement_Exception
+                     */
+                    #require_once 'Zend/Db/Statement/Exception.php';
+                    throw new Zend_Db_Statement_Exception("Invalid bind-variable name '$val'");
+                }
+            }
+            $this->_sqlParam[] = $val;
+        }
+
+        // set up for binding
+        $this->_bindParam = array();
+    }
+
+    /**
+     * Remove parts of a SQL string that contain quoted strings
+     * of values or identifiers.
+     *
+     * @param string $sql
+     * @return string
+     */
+    protected function _stripQuoted($sql)
+    {
+        // get the character for delimited id quotes,
+        // this is usually " but in MySQL is `
+        $d = $this->_adapter->quoteIdentifier('a');
+        $d = $d[0];
+
+        // get the character for value quoting
+        // this should be '
+        $q = $this->_adapter->quote('a');
+        $q = $q[0];
+
+        // get a version of the SQL statement with all quoted
+        // values and delimited identifiers stripped out
+        // remove quoted identifiers
+        if (!empty($d)) {
+            $rx = "{$d}.*?(?<!(((?<![{$d}\\\\]){$d})|((?<!\\\\)\\\\))){$d}(?!{$d})";
+            $sql = preg_replace("/$rx/Us", '', $sql);
+        }
+        // remove quoted values
+        if (!empty($q)) {
+            $rx = "{$q}.*?(?<!(((?<![{$q}\\\\]){$q})|((?<!\\\\)\\\\))){$q}(?!{$q})";
+            $sql = preg_replace("/$rx/Us", '', $sql);
+        }
+        return $sql;
+    }
+
+    /**
+     * Bind a column of the statement result set to a PHP variable.
+     *
+     * @param string $column Name the column in the result set, either by
+     *                       position or by name.
+     * @param mixed  $param  Reference to the PHP variable containing the value.
+     * @param mixed  $type   OPTIONAL
+     * @return bool
+     */
+    public function bindColumn($column, &$param, $type = null)
+    {
+        $this->_bindColumn[$column] =& $param;
+        return true;
+    }
+
+    /**
+     * Binds a parameter to the specified variable name.
+     *
+     * @param mixed $parameter Name the parameter, either integer or string.
+     * @param mixed $variable  Reference to PHP variable containing the value.
+     * @param mixed $type      OPTIONAL Datatype of SQL parameter.
+     * @param mixed $length    OPTIONAL Length of SQL parameter.
+     * @param mixed $options   OPTIONAL Other options.
+     * @return bool
+     */
+    public function bindParam($parameter, &$variable, $type = null, $length = null, $options = null)
+    {
+        if (!is_int($parameter) && !is_string($parameter)) {
+            /**
+             * @see Zend_Db_Statement_Exception
+             */
+            #require_once 'Zend/Db/Statement/Exception.php';
+            throw new Zend_Db_Statement_Exception('Invalid bind-variable position');
+        }
+
+        $position = null;
+        if (($intval = (int) $parameter) > 0 && $this->_adapter->supportsParameters('positional')) {
+            if ($intval >= 1 || $intval <= count($this->_sqlParam)) {
+                $position = $intval;
+            }
+        } else if ($this->_adapter->supportsParameters('named')) {
+            if ($parameter[0] != ':') {
+                $parameter = ':' . $parameter;
+            }
+            if (in_array($parameter, $this->_sqlParam) !== false) {
+                $position = $parameter;
+            }
+        }
+
+        if ($position === null) {
+            /**
+             * @see Zend_Db_Statement_Exception
+             */
+            #require_once 'Zend/Db/Statement/Exception.php';
+            throw new Zend_Db_Statement_Exception("Invalid bind-variable position '$parameter'");
+        }
+
+        // Finally we are assured that $position is valid
+        $this->_bindParam[$position] =& $variable;
+        return $this->_bindParam($position, $variable, $type, $length, $options);
+    }
+
+    /**
+     * Binds a value to a parameter.
+     *
+     * @param mixed $parameter Name the parameter, either integer or string.
+     * @param mixed $value     Scalar value to bind to the parameter.
+     * @param mixed $type      OPTIONAL Datatype of the parameter.
+     * @return bool
+     */
+    public function bindValue($parameter, $value, $type = null)
+    {
+        return $this->bindParam($parameter, $value, $type);
+    }
+
+    /**
+     * Executes a prepared statement.
+     *
+     * @param array $params OPTIONAL Values to bind to parameter placeholders.
+     * @return bool
+     */
+    public function execute(array $params = null)
+    {
+        /*
+         * Simple case - no query profiler to manage.
+         */
+        if ($this->_queryId === null) {
+            return $this->_execute($params);
+        }
+
+        /*
+         * Do the same thing, but with query profiler
+         * management before and after the execute.
+         */
+        $prof = $this->_adapter->getProfiler();
+        $qp = $prof->getQueryProfile($this->_queryId);
+        if ($qp->hasEnded()) {
+            $this->_queryId = $prof->queryClone($qp);
+            $qp = $prof->getQueryProfile($this->_queryId);
+        }
+        if ($params !== null) {
+            $qp->bindParams($params);
+        } else {
+            $qp->bindParams($this->_bindParam);
+        }
+        $qp->start($this->_queryId);
+
+        $retval = $this->_execute($params);
+
+        $prof->queryEnd($this->_queryId);
+
+        return $retval;
+    }
+
+    /**
+     * Returns an array containing all of the result set rows.
+     *
+     * @param int $style OPTIONAL Fetch mode.
+     * @param int $col   OPTIONAL Column number, if fetch mode is by column.
+     * @return array Collection of rows, each in a format by the fetch mode.
+     */
+    public function fetchAll($style = null, $col = null)
+    {
+        $data = array();
+        if ($style === Zend_Db::FETCH_COLUMN && $col === null) {
+            $col = 0;
+        }
+        if ($col === null) {
+            while ($row = $this->fetch($style)) {
+                $data[] = $row;
+            }
+        } else {
+            while (false !== ($val = $this->fetchColumn($col))) {
+                $data[] = $val;
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * Returns a single column from the next row of a result set.
+     *
+     * @param int $col OPTIONAL Position of the column to fetch.
+     * @return string One value from the next row of result set, or false.
+     */
+    public function fetchColumn($col = 0)
+    {
+        $data = array();
+        $col = (int) $col;
+        $row = $this->fetch(Zend_Db::FETCH_NUM);
+        if (!is_array($row)) {
+            return false;
+        }
+        return $row[$col];
+    }
+
+    /**
+     * Fetches the next row and returns it as an object.
+     *
+     * @param string $class  OPTIONAL Name of the class to create.
+     * @param array  $config OPTIONAL Constructor arguments for the class.
+     * @return mixed One object instance of the specified class, or false.
+     */
+    public function fetchObject($class = 'stdClass', array $config = array())
+    {
+        $obj = new $class($config);
+        $row = $this->fetch(Zend_Db::FETCH_ASSOC);
+        if (!is_array($row)) {
+            return false;
+        }
+        foreach ($row as $key => $val) {
+            $obj->$key = $val;
+        }
+        return $obj;
+    }
+
+    /**
+     * Retrieve a statement attribute.
+     *
+     * @param string $key Attribute name.
+     * @return mixed      Attribute value.
+     */
+    public function getAttribute($key)
+    {
+        if (array_key_exists($key, $this->_attribute)) {
+            return $this->_attribute[$key];
+        }
+    }
+
+    /**
+     * Set a statement attribute.
+     *
+     * @param string $key Attribute name.
+     * @param mixed  $val Attribute value.
+     * @return bool
+     */
+    public function setAttribute($key, $val)
+    {
+        $this->_attribute[$key] = $val;
+    }
+
+    /**
+     * Set the default fetch mode for this statement.
+     *
+     * @param int   $mode The fetch mode.
+     * @return bool
+     * @throws Zend_Db_Statement_Exception
+     */
+    public function setFetchMode($mode)
+    {
+        switch ($mode) {
+            case Zend_Db::FETCH_NUM:
+            case Zend_Db::FETCH_ASSOC:
+            case Zend_Db::FETCH_BOTH:
+            case Zend_Db::FETCH_OBJ:
+                $this->_fetchMode = $mode;
+                break;
+            case Zend_Db::FETCH_BOUND:
+            default:
+                $this->closeCursor();
+                /**
+                 * @see Zend_Db_Statement_Exception
+                 */
+                #require_once 'Zend/Db/Statement/Exception.php';
+                throw new Zend_Db_Statement_Exception('invalid fetch mode');
+                break;
+        }
+    }
+
+    /**
+     * Helper function to map retrieved row
+     * to bound column variables
+     *
+     * @param array $row
+     * @return bool True
+     */
+    public function _fetchBound($row)
+    {
+        foreach ($row as $key => $value) {
+            // bindColumn() takes 1-based integer positions
+            // but fetch() returns 0-based integer indexes
+            if (is_int($key)) {
+                $key++;
+            }
+            // set results only to variables that were bound previously
+            if (isset($this->_bindColumn[$key])) {
+                $this->_bindColumn[$key] = $value;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Gets the Zend_Db_Adapter_Abstract for this
+     * particular Zend_Db_Statement object.
+     *
+     * @return Zend_Db_Adapter_Abstract
+     */
+    public function getAdapter()
+    {
+        return $this->_adapter;
+    }
+
+    /**
+     * Gets the resource or object setup by the
+     * _parse
+     * @return unknown_type
+     */
+    public function getDriverStatement()
+    {
+        return $this->_stmt;
+    }
+}
diff --git a/app/design/adminhtml/default/default/layout/index.xml b/app/design/adminhtml/default/default/layout/index.xml
index de77d959efa..da3e5561087 100644
--- a/app/design/adminhtml/default/default/layout/index.xml
+++ b/app/design/adminhtml/default/default/layout/index.xml
@@ -42,4 +42,10 @@
             </block>
         </reference>
     </adminhtml_process_edit>
+
+    <adminhtml_process_list>
+        <reference name="content">
+            <block type="index/adminhtml_process" name="process" />
+        </reference>
+    </adminhtml_process_list>
 </layout>
diff --git a/app/design/adminhtml/default/default/layout/tax.xml b/app/design/adminhtml/default/default/layout/tax.xml
new file mode 100644
index 00000000000..f0a94ea6df0
--- /dev/null
+++ b/app/design/adminhtml/default/default/layout/tax.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     default_default
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<layout>
+    <default>
+        <reference name="notifications">
+            <block type="tax/adminhtml_notifications" name="tax_notifications" template="tax/notifications.phtml"></block>
+        </reference>
+    </default>
+</layout>
diff --git a/app/design/adminhtml/default/default/layout/xmlconnect.xml b/app/design/adminhtml/default/default/layout/xmlconnect.xml
index 9ae04dcf20b..2e92cc051a7 100644
--- a/app/design/adminhtml/default/default/layout/xmlconnect.xml
+++ b/app/design/adminhtml/default/default/layout/xmlconnect.xml
@@ -30,6 +30,7 @@
     <default>
         <reference name="head">
             <action method="addCss"><name>xmlconnect/boxes.css</name></action>
+            <action method="addItem"><type>skin_css</type><name>xmlconnect/iestyles.css</name><params/><if>lte IE 8</if></action>
         </reference>
     </default>
 
@@ -80,7 +81,7 @@
             <action method="addJs"><script>mage/adminhtml/browser.js</script></action>
             <action method="addJs"><script>prototype/window.js</script></action>
             <action method="addItem"><type>js_css</type><name>prototype/windows/themes/default.css</name></action>
-            <action method="addCss"><name>lib/prototype/windows/themes/magento.css</name></action>
+            <action method="addItem"><type>js_css</type><name>prototype/windows/themes/magento.css</name></action>
         </reference>
         <reference name="content">
             <block type="xmlconnect/adminhtml_template_edit" name="template_edit"/>
@@ -97,19 +98,20 @@
     </adminhtml_mobile_new>
 
     <adminhtml_mobile_edit>
+        <update handle="editor"/>
         <reference name="left">
             <block type="xmlconnect/adminhtml_mobile_edit_tabs" name="mobile_edit_tabs">
+                <block type="xmlconnect/adminhtml_mobile_edit_tab_offlineCatalog" name="mobile_edit_tab_offlineCatalog"/>
                 <block type="xmlconnect/adminhtml_mobile_edit_tab_general" name="mobile_edit_tab_general"/>
                 <block type="xmlconnect/adminhtml_mobile_edit_tab_design" name="mobile_edit_tab_design">
+                    <block type="adminhtml/media_uploader" name="adminhtml_media_uploader" as="media_uploader"/>
+                    <block type="xmlconnect/adminhtml_mobile_edit_tab_design_images" name="mobile_edit_tab_design_images" as="design_images" />
                     <block type="xmlconnect/adminhtml_mobile_edit_tab_design_accordion" name="mobile_edit_tab_design_accordion" as="design_accordion">
-                        <block type="xmlconnect/adminhtml_mobile_edit_tab_design_accordion_images" name="accordion_images" />
                         <block type="xmlconnect/adminhtml_mobile_edit_tab_design_accordion_themes" name="accordion_themes" />
                         <block type="xmlconnect/adminhtml_mobile_edit_tab_design_accordion_tabs" name="accordion_tabs" />
 
-                        <action method="addAccordionItem"><name>images</name><block>accordion_images</block></action>
                         <action method="addAccordionItem"><name>themes</name><block>accordion_themes</block></action>
                         <action method="addAccordionItem"><name>tabs</name><block>accordion_tabs</block></action>
-
                     </block>
                     <block type="xmlconnect/adminhtml_mobile_edit_tab_design_preview" name="mobile_edit_tab_design_preview" as="app_preview" />
                 </block>
@@ -132,11 +134,15 @@
                 <action method="addTab"><id>cache_section</id><block>mobile_edit_tab_cache</block></action>
                 <action method="addTab"><id>social_section</id><block>mobile_edit_tab_social</block></action>
                 <action method="addTab"><id>notification_section</id><block>mobile_edit_tab_notification</block></action>
+                <!--<action method="addTab"><id>offline_catalog</id><block>mobile_edit_tab_offlineCatalog</block></action>-->
             </block>
         </reference>
         <reference name="content">
             <block type="xmlconnect/adminhtml_mobile_edit" name="mobile_edit_content"/>
         </reference>
+        <reference name="before_body_end">
+            <block type="core/template" name="image_action_block" template="xmlconnect/edit/tab/design/image_edit.phtml"/>
+        </reference>
         <reference name="head">
             <action method="addCss"><name>xmlconnect/dropdown.css</name></action>
             <action method="addCss"><name>xmlconnect/styles.css</name></action>
@@ -188,6 +194,7 @@
                     <action method="setActiveTab"><tab>home</tab></action>
                 </block>
             </block>
+            <block type="core/template" template="xmlconnect/edit/tab/design/preview/banner_rotator.phtml"/>
         </block>
     </adminhtml_mobile_previewhome>
 
@@ -199,6 +206,7 @@
                     <action method="setActiveTab"><tab>home</tab></action>
                 </block>
             </block>
+            <block type="core/template" template="xmlconnect/edit/tab/design/preview/banner_rotator.phtml"/>
         </block>
     </adminhtml_mobile_previewhomehor>
 
@@ -234,4 +242,41 @@
             </block>
         </block>
     </adminhtml_mobile_previewproductinfo>
+
+    <!-- Admin application actions -->
+    <adminhtml_admin_application_index>
+        <reference name="left">
+            <block type="xmlconnect/adminhtml_admin_application_edit_tabs" name="admin_app_settings_tabs"/>
+        </reference>
+        <reference name="content">
+            <block type="xmlconnect/adminhtml_admin_application_edit" name="admin_app_settings"/>
+        </reference>
+    </adminhtml_admin_application_index>
+
+    <adminhtml_connect_config_index>
+        <block type="xmlconnect/adminhtml_connect_config" name="admin.connect.config" output="toHtml"/>
+    </adminhtml_connect_config_index>
+
+    <adminhtml_connect_config_localization>
+        <block type="xmlconnect/localization" name="xmlconnect.localization" output="toHtml"/>
+    </adminhtml_connect_config_localization>
+
+    <adminhtml_connect_dashboard_index>
+        <block type="xmlconnect/adminhtml_connect_dashboard" name="admin.connect.dashboard" output="toHtml">
+            <block type="xmlconnect/adminhtml_connect_dashboard_storeSwitcher" name="admin.connect.store.switcher" as="store_switcher"/>
+            <block type="xmlconnect/adminhtml_connect_dashboard_salesInfo" name="dashboard.sales.info" as="sales_info"/>
+            <block type="xmlconnect/adminhtml_connect_dashboard_graphInfo" name="dashboard.graph.info" as="graph_info">
+                <block type="xmlconnect/adminhtml_connect_dashboard_graphOrderData" name="dashboard.graph.order.data" as="graph_order_data"/>
+                <block type="xmlconnect/adminhtml_connect_dashboard_graphAmountsData" name="dashboard.graph.amounts.data" as="graph_amounts_data"/>
+                <block type="xmlconnect/adminhtml_connect_dashboard_graphTotalsData" name="dashboard.graph.totals.data" as="graph_totals_data"/>
+            </block>
+            <block type="xmlconnect/adminhtml_connect_dashboard_lastOrders" name="dashboard.last.orders" as="last_orders"/>
+            <block type="xmlconnect/adminhtml_connect_dashboard_lastSearchTerms" name="dashboard.last.search.terms" as="last_search_terms"/>
+            <block type="xmlconnect/adminhtml_connect_dashboard_newCustomers" name="dashboard.new.customers" as="new_customers"/>
+            <block type="xmlconnect/adminhtml_connect_dashboard_topSearchTerms" name="dashboard.top.search.terms" as="top_search_terms"/>
+            <block type="xmlconnect/adminhtml_connect_dashboard_mostViewedProducts" name="dashboard.most.viewed.products" as="most_viewed"/>
+            <block type="xmlconnect/adminhtml_connect_dashboard_bestSellers" name="dashboard.best.sellers" as="best_sellers"/>
+            <block type="xmlconnect/adminhtml_connect_dashboard_customers" name="dashboard.customers" as="customers"/>
+        </block>
+    </adminhtml_connect_dashboard_index>
 </layout>
diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml
index 9fdcb2ed8de..93054c5916b 100644
--- a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml
@@ -71,6 +71,15 @@ $('product_bundle_container').select('input', 'select', 'textarea', 'button').ea
     }
 });
 <?php endif; ?>
+Validation.add('validate-greater-zero-based-on-option', '<?php echo $this->__('Please enter a number greater 0 in this field.') ?>', function(v, el) {
+    var optionType = $(el).up('div.grid').previous('table.option-header').select('select.select-product-option-type')[0],
+        v = Number(v) || 0;
+
+    if (optionType && (optionType.value == 'checkbox' || optionType.value == 'multi') && v <= 0) {
+        return false;
+    }
+    return true;
+});
 </script>
 
 <div><input type="hidden" name="affect_bundle_product_selections" value="1" /></div>
diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml
index 2928b455848..b722153fb9f 100644
--- a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml
@@ -66,7 +66,7 @@ var bundleTemplateRow ='<td>' +
                     '<input type="hidden" id="<?php echo $this->getFieldId(); ?>_{{index}}_price_scope" name="<?php echo $this->getFieldName(); ?>[{{parentIndex}}][{{index}}][default_price_scope]" value="1" />' +
                     <?php endif; ?>
                 <?php endif; ?>
-                '<td><input class="input-text required-entry validate-zero-or-greater" type="text" name="<?php echo $this->getFieldName() ?>[{{parentIndex}}][{{index}}][selection_qty]" value="{{selection_qty}}"></td>' +
+                '<td><input class="input-text required-entry validate-greater-zero-based-on-option validate-zero-or-greater" type="text" name="<?php echo $this->getFieldName() ?>[{{parentIndex}}][{{index}}][selection_qty]" value="{{selection_qty}}"></td>' +
                 '<td class="qty-box"><?php echo $this->getQtyTypeSelectHtml() ?></td>' +
                 '<td><input class="input-text required-entry validate-zero-or-greater" type="text" name="<?php echo $this->getFieldName() ?>[{{parentIndex}}][{{index}}][position]" value="{{position}}"></td>' +
                 '<td class="a-center"><input onclick="bSelection.checkGroup(event)" type="{{option_type}}" class="default" name="<?php echo $this->getFieldName() ?>[{{parentIndex}}][{{index}}][is_default]" value="1" {{checked}}></td>' +
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml
index c854d4cbb53..c7ac4d20861 100644
--- a/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml
@@ -64,10 +64,10 @@
     <?php endif; ?>
     <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
         <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-        <td><h5 class="title"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
+        <td><h5 class="title"><?php echo $this->escapeHtml($_item->getName()) ?></h5>
             <div>
                 <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
-                <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->htmlEscape($_item->getSku()))); ?>
+                <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
         <?php else: ?>
@@ -397,7 +397,7 @@
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
-            <?php echo $this->htmlEscape($_item->getDescription()) ?>
+            <?php echo $this->escapeHtml($_item->getDescription()) ?>
         </td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml
index d1c8eddab9f..f6b334b0e35 100644
--- a/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml
@@ -62,10 +62,10 @@
     <?php endif; ?>
     <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
         <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-        <td><h5 class="title"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
+        <td><h5 class="title"><?php echo $this->escapeHtml($_item->getName()) ?></h5>
             <div>
                 <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
-                <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->htmlEscape($_item->getSku()))); ?>
+                <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
         <?php else: ?>
@@ -329,7 +329,7 @@
                 <?php endforeach; ?>
                 </dl>
             <?php endif; ?>
-            <?php echo $this->htmlEscape($this->getItem()->getDescription()) ?>
+            <?php echo $this->escapeHtml($this->getItem()->getDescription()) ?>
         </td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml
index 7b8b2ef72f5..9860dbea3a9 100644
--- a/app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml
@@ -63,10 +63,10 @@
     <?php endif; ?>
     <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
         <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-        <td><h5 class="title"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
+        <td><h5 class="title"><?php echo $this->escapeHtml($_item->getName()) ?></h5>
             <div>
                 <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
-                <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->htmlEscape($_item->getSku()))); ?>
+                <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
         <?php else: ?>
@@ -385,7 +385,7 @@
             <?php else: ?>
                 &nbsp;
                         <?php endif; ?>
-            <?php echo $this->htmlEscape($_item->getDescription()) ?>
+            <?php echo $this->escapeHtml($_item->getDescription()) ?>
         </td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml
index 942e164b86d..ce048052169 100644
--- a/app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml
@@ -62,10 +62,10 @@
     <?php endif; ?>
     <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
         <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-        <td><h5 class="title"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
+        <td><h5 class="title"><?php echo $this->escapeHtml($_item->getName()) ?></h5>
             <div>
                 <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
-                <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->htmlEscape($_item->getSku()))); ?>
+                <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($_item->getSku()))); ?>
             </div>
         <?php else: ?>
         <td><div class="option-value"><?php echo $this->getValueHtml($_item)?></div></td>
@@ -328,7 +328,7 @@
                 <?php endforeach; ?>
                 </dl>
             <?php endif; ?>
-            <?php echo $this->htmlEscape($this->getItem()->getDescription()) ?>
+            <?php echo $this->escapeHtml($this->getItem()->getDescription()) ?>
         </td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml
index 08392a41176..d046e2ec3c9 100644
--- a/app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml
@@ -67,11 +67,11 @@
         <?php if (!$_item->getParentItem()): ?>
         <td>
             <h5 class="title">
-                <span id="order_item_<?php echo $_item->getId() ?>_title"><?php echo $this->htmlEscape($_item->getName()) ?></span>
+                <span id="order_item_<?php echo $_item->getId() ?>_title"><?php echo $this->escapeHtml($_item->getName()) ?></span>
             </h5>
             <div>
                 <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
-                <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->htmlEscape($_item->getSku()))); ?>
+                <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
         <?php else: ?>
@@ -400,7 +400,7 @@
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
-            <?php echo $this->htmlEscape($_item->getDescription()) ?>
+            <?php echo $this->escapeHtml($_item->getDescription()) ?>
         </td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml
index 43ca313847a..754d5736c35 100644
--- a/app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml
@@ -58,10 +58,10 @@
     <?php endif; ?>
     <tr class="<?php echo (++$_index==$_count && !$_showlastRow)?'border':'' ?>">
         <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-        <td><h5 class="title"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
+        <td><h5 class="title"><?php echo $this->escapeHtml($_item->getName()) ?></h5>
             <div>
                 <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
-                <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->htmlEscape($_item->getSku()))); ?>
+                <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
         <?php else: ?>
@@ -110,7 +110,7 @@
                         <?php else: ?>
                 &nbsp;
                         <?php endif; ?>
-            <?php echo $this->htmlEscape($_item->getDescription()) ?>
+            <?php echo $this->escapeHtml($_item->getDescription()) ?>
         </td>
         <td>&nbsp;</td>
         <td class="last">&nbsp;</td>
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml
index 68234fa4d20..5348e8927f5 100644
--- a/app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml
@@ -59,10 +59,10 @@
     <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
         <?php if (!$_item->getParentItem()): ?>
         <td>
-            <h5 class="title"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
+            <h5 class="title"><?php echo $this->escapeHtml($_item->getName()) ?></h5>
             <div>
                 <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
-                <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->htmlEscape($_item->getSku()))); ?>
+                <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
         <?php else: ?>
@@ -108,7 +108,7 @@
                 <?php endforeach; ?>
                 </dl>
             <?php endif; ?>
-            <?php echo $this->htmlEscape($_item->getDescription()) ?>
+            <?php echo $this->escapeHtml($_item->getDescription()) ?>
         </td>
         <td class="last">&nbsp;</td>
     </tr>
diff --git a/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml b/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml
index 6af041c5235..8d725603058 100644
--- a/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml
@@ -26,7 +26,7 @@
 ?>
 
 <div class="content-header">
-        <h3 class="icon-head head-categories"><?php echo $this->htmlEscape($this->getHeader()) . ($this->getCategoryId() ? ' (' . Mage::helper('catalog')->__('ID: %s', $this->getCategoryId()) . ')' : '') ?></h3>
+        <h3 class="icon-head head-categories"><?php echo $this->escapeHtml($this->getHeader()) . ($this->getCategoryId() ? ' (' . Mage::helper('catalog')->__('ID: %s', $this->getCategoryId()) . ')' : '') ?></h3>
         <p class="content-buttons form-buttons">
             <?php echo $this->getResetButtonHtml() ?>
             <?php if($this->getCategoryId()): ?>
diff --git a/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml b/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml
index e3305ad1cb2..934e6b0c1dc 100644
--- a/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml
@@ -31,6 +31,10 @@
 ?>
 <?php $_element = $this->getElement() ?>
 <?php $this->checkFieldDisable() ?>
+<?php
+    $elementToggleCode = $_element->getToggleCode() ? $_element->getToggleCode()
+        : 'toggleValueElements(this, this.parentNode.parentNode)';
+?>
 
 <?php if ($_element->getType()=='hidden'): ?>
 <tr>
@@ -48,7 +52,7 @@
     <td class="scope-label"><span class="nobr"><?php echo $this->getScopeLabel() ?></span></td>
     <?php if ($this->canDisplayUseDefault()): ?>
     <td class="value use-default">
-        <input <?php if($_element->getReadonly()):?> disabled="disabled"<?php endif; ?> type="checkbox" name="use_default[]" id="<?php echo $_element->getHtmlId() ?>_default"<?php if ($this->usedDefault()): ?> checked="checked"<?php endif; ?> onclick="toggleValueElements(this, this.parentNode.parentNode)" value="<?php echo $this->getAttributeCode() ?>"/>
+        <input <?php if($_element->getReadonly()):?> disabled="disabled"<?php endif; ?> type="checkbox" name="use_default[]" id="<?php echo $_element->getHtmlId() ?>_default"<?php if ($this->usedDefault()): ?> checked="checked"<?php endif; ?> onclick="<?php echo $elementToggleCode; ?>" value="<?php echo $this->getAttributeCode() ?>"/>
         <label for="<?php echo $_element->getHtmlId() ?>_default" class="normal"><?php echo $this->__('Use Default Value') ?></label>
     </td>
     <?php endif; ?>
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml
index 9d6abd958dd..5d50bcc689f 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml
@@ -28,6 +28,7 @@
 /**
  * Attribute options control
  *
+ * @deprecated after 1.7.0.2 The file is moved
  * @see Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit_Tab_Options
  */
 ?>
@@ -57,7 +58,7 @@
                     <?php $_labels = $this->getLabelValues() ?>
                     <?php foreach ($this->getStores() as $_store): ?>
                     <td>
-                        <input class="input-text<?php if($_store->getId()==0): ?> required-option<?php endif; ?>" type="text" name="frontend_label[<?php echo $_store->getId() ?>]" value="<?php echo $this->htmlEscape($_labels[$_store->getId()]) ?>"<?php if ($this->getReadOnly()):?> disabled="disabled"<?php endif;?>/>
+                        <input class="input-text<?php if($_store->getId()==0): ?> required-option<?php endif; ?>" type="text" name="frontend_label[<?php echo $_store->getId() ?>]" value="<?php echo $this->escapeHtml($_labels[$_store->getId()]) ?>"<?php if ($this->getReadOnly()):?> disabled="disabled"<?php endif;?>/>
                     </td>
                     <?php endforeach; ?>
                 </tr>
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml
index 08ea9dd23f7..b2bf7d44c0b 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml
@@ -27,7 +27,7 @@
 <div class="content-header">
     <table cellspacing="0">
         <tr>
-            <td style="width:50%;"><h3 class="icon-head head-product-attribute-sets"><?php echo $this->htmlEscape($this->_getHeader()) ?></h3></td>
+            <td style="width:50%;"><h3 class="icon-head head-product-attribute-sets"><?php echo $this->escapeHtml($this->_getHeader()) ?></h3></td>
             <td class="form-buttons">
                 <?php echo $this->getBackButtonHtml() ?>
                 <?php echo $this->getResetButtonHtml() ?>
diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml
index af12f083946..97c26e1eb4e 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml
@@ -74,7 +74,7 @@
 //]]>
 </script>
 
-<dt><label <?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo  $this->htmlEscape($_option->getTitle()) ?></label>
+<dt><label <?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo  $this->escapeHtml($_option->getTitle()) ?></label>
     <?php echo $this->getFormatedPrice() ?></dt>
 <dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
     <?php if ($_fileExists): ?>
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml
index 23a7fcdbf7c..59a5a11f5b3 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml
@@ -71,12 +71,12 @@ var tierPriceRowTemplate = '<tr>'
     + '<td<?php if (!$_showWebsite): ?> style="display:none"<?php endif; ?>>'
     + '<select class="<?php echo $_htmlClass ?> required-entry" name="<?php echo $_htmlName ?>[{{index}}][website_id]" id="tier_price_row_{{index}}_website">'
     <?php foreach ($this->getWebsites() as $_websiteId => $_info): ?>
-    + '<option value="<?php echo $_websiteId ?>"><?php echo $this->jsQuoteEscape($this->htmlEscape($_info['name'])) ?><?php if (!empty($_info['currency'])): ?> [<?php echo $this->htmlEscape($_info['currency']) ?>]<?php endif; ?></option>'
+    + '<option value="<?php echo $_websiteId ?>"><?php echo $this->jsQuoteEscape($this->escapeHtml($_info['name'])) ?><?php if (!empty($_info['currency'])): ?> [<?php echo $this->escapeHtml($_info['currency']) ?>]<?php endif; ?></option>'
     <?php endforeach ?>
     + '</select></td>'
     + '<td><select class="<?php echo $_htmlClass ?> custgroup required-entry" name="<?php echo $_htmlName ?>[{{index}}][cust_group]" id="tier_price_row_{{index}}_cust_group">'
     <?php foreach ($this->getCustomerGroups() as $_groupId=>$_groupName): ?>
-    + '<option value="<?php echo $_groupId ?>"><?php echo $this->jsQuoteEscape($this->htmlEscape($_groupName)) ?></option>'
+    + '<option value="<?php echo $_groupId ?>"><?php echo $this->jsQuoteEscape($this->escapeHtml($_groupName)) ?></option>'
     <?php endforeach ?>
     + '</select></td>'
     + '<td class="nobr"><input class="<?php echo $_htmlClass ?> qty required-entry validate-greater-than-zero" type="text" name="<?php echo $_htmlName ?>[{{index}}][price_qty]" value="{{qty}}" id="tier_price_row_{{index}}_qty" />'
diff --git a/app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml b/app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml
index a7640c83dc2..10db07f0cde 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml
@@ -116,8 +116,8 @@ $_block = $this;
 </table>
 </div>
 </div>
-<input type="hidden" id="<?php echo $_block->getHtmlId() ?>_save" name="<?php echo $_block->getElement()->getName() ?>[images]" value="<?php echo $_block->htmlEscape($_block->getImagesJson()) ?>" />
-<input type="hidden" id="<?php echo $_block->getHtmlId() ?>_save_image" name="<?php echo $_block->getElement()->getName() ?>[values]" value="<?php echo $_block->htmlEscape($_block->getImagesValuesJson()) ?>" />
+<input type="hidden" id="<?php echo $_block->getHtmlId() ?>_save" name="<?php echo $_block->getElement()->getName() ?>[images]" value="<?php echo $_block->escapeHtml($_block->getImagesJson()) ?>" />
+<input type="hidden" id="<?php echo $_block->getHtmlId() ?>_save_image" name="<?php echo $_block->getElement()->getName() ?>[values]" value="<?php echo $_block->escapeHtml($_block->getImagesValuesJson()) ?>" />
 <script type="text/javascript">
 //<![CDATA[
 var <?php echo $_block->getJsObjectName(); ?> = new Product.Gallery('<?php echo $_block->getHtmlId() ?>', <?php if ($_block->getElement()->getReadonly()):?>null<?php else:?><?php echo $_block->getUploader()->getJsObjectName() ?><?php endif;?>, <?php echo $_block->getImageTypesJson() ?>);
diff --git a/app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml b/app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml
index 96c56085bb4..c308ffc8706 100644
--- a/app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml
@@ -27,6 +27,7 @@
 <script type="text/javascript">
 //<![CDATA[
 
+Window.keepMultiModalWindow = true;
 var catalogWysiwygEditor = {
     overlayShowEffectOptions : null,
     overlayHideEffectOptions : null,
diff --git a/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml b/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml
index 6cd1b699e8c..39291f79713 100644
--- a/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml
+++ b/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml
@@ -401,7 +401,9 @@ addressesModel.prototype = {
                             }
                             data[id] = values.join(', ');
                         } else {
-                            data[id] = fields[i].options[fields[i].selectedIndex].text.escapeHTML();
+                            var option = fields[i].options[fields[i].selectedIndex],
+                                text   = option.value == '0' || option.value == '' ? '' : option.text;
+                            data[id] = text.escapeHTML();
                         }
                     } else if (value !== null) {
                         data[id] = value.escapeHTML();
diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml
index 00b63ec46b5..3ba2c3b21a6 100644
--- a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml
+++ b/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml
@@ -27,7 +27,7 @@
 
 <?php if ($_item = $this->getItem()): ?>
     <h5 class="title"><?php echo $_item->getName() ?></h5>
-    <div><strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong> <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->htmlEscape($this->getSku()))); ?></div>
+    <div><strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong> <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($this->getSku()))); ?></div>
     <?php if ($this->getOrderOptions()): ?>
         <dl class="item-options">
         <?php foreach ($this->getOrderOptions() as $_option): ?>
@@ -58,5 +58,5 @@
             <?php endforeach; ?>
         </dl>
     <?php endif; ?>
-    <?php echo $this->htmlEscape($_item->getDescription()) ?>
+    <?php echo $this->escapeHtml($_item->getDescription()) ?>
 <?php endif; ?>
diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml
index 59c9c595c5a..f8f4f9969eb 100644
--- a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml
+++ b/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml
@@ -27,7 +27,7 @@
 
 <?php if ($_item = $this->getItem()): ?>
     <h5 class="title"><?php echo $_item->getName() ?></h5>
-    <div><strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong> <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->htmlEscape($this->getSku()))); ?></div>
+    <div><strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong> <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($this->getSku()))); ?></div>
     <?php if ($this->getOrderOptions()): ?>
         <dl class="item-options">
         <?php foreach ($this->getOrderOptions() as $_option): ?>
@@ -58,5 +58,5 @@
             <?php endforeach; ?>
         </dl>
     <?php endif; ?>
-    <?php echo $this->htmlEscape($_item->getDescription()) ?>
+    <?php echo $this->escapeHtml($_item->getDescription()) ?>
 <?php endif; ?>
diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml
index e6f58a3f904..23bad7feb63 100644
--- a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml
+++ b/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml
@@ -27,7 +27,7 @@
 
 <?php if ($_item = $this->getItem()): ?>
     <h5 class="title"><?php echo $_item->getName() ?></h5>
-    <div><strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong> <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->htmlEscape($this->getSku()))); ?></div>
+    <div><strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong> <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($this->getSku()))); ?></div>
     <?php if ($this->getOrderOptions()): ?>
         <dl class="item-options">
         <?php foreach ($this->getOrderOptions() as $_option): ?>
@@ -58,5 +58,5 @@
             <?php endforeach; ?>
         </dl>
     <?php endif; ?>
-    <?php echo $this->htmlEscape($_item->getDescription()) ?>
+    <?php echo $this->escapeHtml($_item->getDescription()) ?>
 <?php endif; ?>
diff --git a/app/design/adminhtml/default/default/template/eav/attribute/options.phtml b/app/design/adminhtml/default/default/template/eav/attribute/options.phtml
new file mode 100644
index 00000000000..890b506c5b9
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/eav/attribute/options.phtml
@@ -0,0 +1,224 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     default_default
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * Attribute options control
+ *
+ * @see Mage_Eav_Block_Adminhtml_Attribute_Edit_Options_Abstract
+ * @var $this Mage_Eav_Block_Adminhtml_Attribute_Edit_Options_Abstract
+ */
+?>
+<div>
+<ul class="messages">
+    <li class="notice-msg">
+        <ul>
+            <li><?php echo $this->__('If you do not specify an option value for a specific store view then the default (Admin) value will be used.') ?></li>
+        </ul>
+    </li>
+</ul>
+</div>
+
+<div class="entity-edit">
+    <div class="entry-edit-head">
+        <h4 class="icon-head head-edit-form fieldset-legend"><?php echo $this->__('Manage Titles (Size, Color, etc.)') ?></h4>
+    </div>
+    <div class="box">
+            <div class="hor-scroll">
+            <table class="dynamic-grid" cellspacing="0" id="attribute-labels-table">
+                <tr>
+                <?php foreach ($this->getStores() as $_store): ?>
+                    <th><?php echo $_store->getName() ?></th>
+                <?php endforeach; ?>
+                </tr>
+                <tr>
+                    <?php $_labels = $this->getLabelValues() ?>
+                    <?php foreach ($this->getStores() as $_store): ?>
+                    <td>
+                        <input class="input-text<?php if($_store->getId()==0): ?> required-option<?php endif; ?>" type="text" name="frontend_label[<?php echo $_store->getId() ?>]" value="<?php echo $this->htmlEscape($_labels[$_store->getId()]) ?>"<?php if ($this->getReadOnly()):?> disabled="disabled"<?php endif;?>/>
+                    </td>
+                    <?php endforeach; ?>
+                </tr>
+            </table>
+            </div>
+    </div>
+</div>
+<br/>
+<div class="entity-edit" id="matage-options-panel">
+    <div class="entry-edit-head">
+    <h4 class="icon-head head-edit-form fieldset-legend"><?php echo $this->__('Manage Options (values of your attribute)') ?></h4>
+    </div>
+    <div class="box">
+        <div class="hor-scroll">
+            <table class="dynamic-grid" cellspacing="0"  cellpadding="0">
+                <tr id="attribute-options-table">
+                    <?php foreach ($this->getStores() as $_store): ?>
+                        <th><?php echo $_store->getName() ?></th>
+                    <?php endforeach; ?>
+                        <th><?php echo $this->__('Position') ?></th>
+                        <th class="nobr a-center"><?php echo $this->__('Is Default') ?></th>
+                        <th>
+                            <?php if (!$this->getReadOnly()):?>
+                                <?php echo $this->getAddNewButtonHtml() ?>
+                            <?php endif;?>
+                        </th>
+                    </tr>
+                    <tr class="no-display template" id="row-template">
+                        <?php foreach ($this->getStores() as $_store): ?>
+                        <td><input name="option[value][{{id}}][<?php echo $_store->getId() ?>]" value="{{store<?php echo $_store->getId() ?>}}" class="input-text<?php if($_store->getId()==0): ?> required-option<?php endif; ?>" type="text" <?php if ($this->getReadOnly()):?> disabled="disabled"<?php endif;?>/></td>
+                        <?php endforeach; ?>
+                        <td class="a-center"><input class="input-text" type="text" name="option[order][{{id}}]" value="{{sort_order}}" <?php if ($this->getReadOnly()):?> disabled="disabled"<?php endif;?>/></td>
+                        <td><input class="input-radio" type="radio" name="default[]" value="{{id}}" <?php if ($this->getReadOnly()):?> disabled="disabled"<?php endif;?>/></td>
+                        <td class="a-left">
+                            <input type="hidden" class="delete-flag" name="option[delete][{{id}}]" value="" />
+                            <?php if (!$this->getReadOnly()):?>
+                                <?php echo $this->getDeleteButtonHtml() ?>
+                            <?php endif;?>
+                        </td>
+                    </tr>
+            </table>
+        </div>
+        <input type="hidden" id="option-count-check" value="" />
+    </div>
+</div>
+<script type="text/javascript">
+//<![CDATA[
+var optionDefaultInputType = 'radio';
+
+// IE removes quotes from element.innerHTML whenever it thinks they're not needed, which breaks html.
+var templateText =
+        '<tr class="option-row">'+
+<?php foreach ($this->getStores() as $_store): ?>
+            '<td><input name="option[value][{{id}}][<?php echo $_store->getId() ?>]" value="{{store<?php echo $_store->getId() ?>}}" class="input-text<?php if($_store->getId()==0): ?> required-option<?php endif; ?>" type="text" <?php if ($this->getReadOnly()):?> disabled="disabled"<?php endif;?>/><\/td>'+
+<?php endforeach; ?>
+            '<td><input class="input-text" type="text" name="option[order][{{id}}]" value="{{sort_order}}" <?php if ($this->getReadOnly()):?> disabled="disabled"<?php endif;?>/><\/td>'+
+            '<td class="a-center"><input class="input-radio" type="{{intype}}" name="default[]" value="{{id}}" {{checked}} <?php if ($this->getReadOnly()):?> disabled="disabled"<?php endif;?>/><\/td>'+
+            '<td class="a-left" id="delete_button_container_{{id}}">'+
+                '<input type="hidden" class="delete-flag" name="option[delete][{{id}}]" value="" />'+
+                <?php if (!$this->getReadOnly()):?>
+                    '<?php echo $this->getDeleteButtonHtml() ?>'+
+                <?php endif;?>
+            '<\/td>'+
+        '<\/tr>';
+
+var attributeOption = {
+    table : $('attribute-options-table'),
+    templateSyntax : /(^|.|\r|\n)({{(\w+)}})/,
+    templateText : templateText,
+    itemCount : 0,
+    totalItems : 0,
+    isReadOnly: <?php echo (int)$this->getReadOnly(); ?>,
+    add : function(data) {
+        this.template = new Template(this.templateText, this.templateSyntax);
+        var isNewOption = false;
+        if(!data.id){
+            data = {};
+            data.id  = 'option_'+this.itemCount;
+            isNewOption = true;
+        }
+        if (!data.intype)
+            data.intype = optionDefaultInputType;
+        Element.insert(this.table, {after: this.template.evaluate(data)});
+        if (isNewOption && !this.isReadOnly) {
+            this.enableNewOptionDeleteButton(data.id);
+        }
+        this.bindRemoveButtons();
+        this.itemCount++;
+        this.totalItems++;
+        this.updateItemsCountField();
+    },
+    remove : function(event){
+        var element = $(Event.findElement(event, 'tr')); // !!! Button already
+                                                               // have table parent in safari
+        // Safari workaround
+        element.ancestors().each(function(parentItem){
+           if (parentItem.hasClassName('option-row')) {
+               element = parentItem;
+               throw $break;
+           } else if (parentItem.hasClassName('box')) {
+               throw $break;
+           }
+        });
+
+
+        if(element){
+            var elementFlags = element.getElementsByClassName('delete-flag');
+            if(elementFlags[0]){
+                elementFlags[0].value=1;
+            }
+
+            element.addClassName('no-display');
+            element.addClassName('template');
+            element.hide();
+            this.totalItems--;
+            this.updateItemsCountField();
+        }
+    },
+    updateItemsCountField: function() {
+        if (this.totalItems > 0) {
+            $('option-count-check').value = '1';
+        } else {
+            $('option-count-check').value = '';
+        }
+    },
+    enableNewOptionDeleteButton: function(id) {
+        $$('#delete_button_container_' + id + ' button').each(function(button) {
+            button.enable();
+            button.removeClassName('disabled');
+        });
+    },
+    bindRemoveButtons : function(){
+        var buttons = $$('.delete-option');
+        for(var i=0;i<buttons.length;i++){
+            if(!$(buttons[i]).binded){
+                $(buttons[i]).binded = true;
+                Event.observe(buttons[i], 'click', this.remove.bind(this));
+            }
+        }
+    }
+
+}
+if($('row-template')){
+    $('row-template').remove();
+}
+attributeOption.bindRemoveButtons();
+
+if($('add_new_option_button')){
+    Event.observe('add_new_option_button', 'click', attributeOption.add.bind(attributeOption));
+}
+Validation.addAllThese([
+    ['required-option', '<?php echo $this->__('Failed') ?>', function(v) {
+        return !Validation.get('IsEmpty').test(v);
+}]]);
+Validation.addAllThese([
+    ['required-options-count', '<?php echo $this->__('Options is required') ?>', function(v) {
+        return !Validation.get('IsEmpty').test(v);
+}]]);
+<?php foreach ($this->getOptionValues() as $_value): ?>
+    attributeOption.add(<?php echo $_value->toJson() ?>);
+<?php endforeach; ?>
+//]]>
+</script>
diff --git a/app/design/adminhtml/default/default/template/giftmessage/helper.phtml b/app/design/adminhtml/default/default/template/giftmessage/helper.phtml
index af8c873b5a9..a2980de5756 100644
--- a/app/design/adminhtml/default/default/template/giftmessage/helper.phtml
+++ b/app/design/adminhtml/default/default/template/giftmessage/helper.phtml
@@ -55,11 +55,11 @@
             <?php if($_giftMessage=$this->getMessage()): ?>
             <span class="field-row">
                 <label><?php echo Mage::helper('giftmessage')->__('From') ?></label>
-                <?php echo $this->htmlEscape($_giftMessage->getSender()) ?>
+                <?php echo $this->escapeHtml($_giftMessage->getSender()) ?>
             </span>
             <span class="field-row">
                 <label><?php echo Mage::helper('giftmessage')->__('To') ?></label>
-                <?php echo $this->htmlEscape($_giftMessage->getRecipient()) ?>
+                <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?>
             </span>
             <span class="field-row">
                 <label><?php echo Mage::helper('giftmessage')->__('Message') ?></label>
@@ -77,11 +77,11 @@
 
             <span class="field-row">
                 <label><?php echo Mage::helper('giftmessage')->__('From') ?></label>
-                <?php echo $this->htmlEscape($_giftMessage->getSender()) ?>
+                <?php echo $this->escapeHtml($_giftMessage->getSender()) ?>
             </span>
             <span class="field-row">
                 <label><?php echo Mage::helper('giftmessage')->__('To') ?></label>
-                <?php echo $this->htmlEscape($_giftMessage->getRecipient()) ?>
+                <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?>
             </span>
             <span class="field-row">
                 <label><?php echo Mage::helper('giftmessage')->__('Message') ?></label>
diff --git a/app/design/adminhtml/default/default/template/importexport/import/form/before.phtml b/app/design/adminhtml/default/default/template/importexport/import/form/before.phtml
index c29b9aa9e82..80a5973c8a7 100644
--- a/app/design/adminhtml/default/default/template/importexport/import/form/before.phtml
+++ b/app/design/adminhtml/default/default/template/importexport/import/form/before.phtml
@@ -107,7 +107,14 @@
                     break;
                 case 'innerHTML':
                 case 'value':
-                    $H(pair.value).each(function(val) {if ($(val.key)) $(val.key)[pair.key] = val.value;});
+                    $H(pair.value).each(function(val) {
+                        var el = $(val.key);
+                        if (el) {
+                            el[pair.key] = val.value;
+                            // if element does not visible
+                            el.offsetWidth || el.up('div.entry-edit').show();
+                        }
+                    });
                     break;
                 case 'removeClassName':
                 case 'addClassName':
diff --git a/app/design/adminhtml/default/default/template/login.phtml b/app/design/adminhtml/default/default/template/login.phtml
index aeecd052fbb..c3fddb6fbef 100644
--- a/app/design/adminhtml/default/default/template/login.phtml
+++ b/app/design/adminhtml/default/default/template/login.phtml
@@ -25,7 +25,7 @@
  */
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title><?php echo Mage::helper('adminhtml')->__('Log into Magento Admin Page') ?></title>
@@ -47,7 +47,7 @@
 <body id="page-login" onload="document.forms.loginForm.username.focus();">
     <div class="login-container">
         <div class="login-box">
-            <form method="post" action="" id="loginForm">
+            <form method="post" action="" id="loginForm" autocomplete="off">
                 <div class="login-form">
                     <input name="form_key" type="hidden" value="<?php echo $this->getFormKey() ?>" />
                     <h2><?php echo Mage::helper('adminhtml')->__('Log in to Admin Panel') ?></h2>
@@ -57,6 +57,8 @@
                     <div class="input-box input-left"><label for="username"><?php echo Mage::helper('adminhtml')->__('User Name:') ?></label><br/>
                         <input type="text" id="username" name="login[username]" value="" class="required-entry input-text" /></div>
                     <div class="input-box input-right"><label for="login"><?php echo Mage::helper('adminhtml')->__('Password:') ?></label><br />
+                        <!-- This is a dummy hidden field to trick firefox from auto filling the password -->
+                        <input type="text" class="input-text no-display" name="dummy" id="dummy" />
                         <input type="password" id="login" name="login[password]" class="required-entry input-text" value="" /></div>
                     <?php echo $this->getChildHtml('form.additional.info'); ?>
                     <div class="clear"></div>
diff --git a/app/design/adminhtml/default/default/template/moneybookers/info.phtml b/app/design/adminhtml/default/default/template/moneybookers/info.phtml
index bf97221b2df..2c99a16e0b8 100644
--- a/app/design/adminhtml/default/default/template/moneybookers/info.phtml
+++ b/app/design/adminhtml/default/default/template/moneybookers/info.phtml
@@ -18,9 +18,9 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 ?>
-<?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
+<?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?><br />
 <?php if ($this->getInfo()->getLastTransId() == ''): ?>
     <?php echo Mage::helper('moneybookers')->__('Payment has not been processed yet.') ?><br />
 <?php else: ?>
-    <?php echo Mage::helper('moneybookers')->__('Moneybookers Transaction ID: %s', $this->htmlEscape($this->getInfo()->getLastTransId())) ?><br />
+    <?php echo Mage::helper('moneybookers')->__('Moneybookers Transaction ID: %s', $this->escapeHtml($this->getInfo()->getLastTransId())) ?><br />
 <?php endif; ?>
diff --git a/app/design/adminhtml/default/default/template/moneybookers/pdf/info.phtml b/app/design/adminhtml/default/default/template/moneybookers/pdf/info.phtml
index 5c01152d9e6..14dd3e0a4bd 100644
--- a/app/design/adminhtml/default/default/template/moneybookers/pdf/info.phtml
+++ b/app/design/adminhtml/default/default/template/moneybookers/pdf/info.phtml
@@ -18,7 +18,7 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 ?>
-<?php echo $this->getMethod()->getTitle() ?>
+<?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?>
     {{pdf_row_separator}}
-<?php echo Mage::helper('moneybookers')->__('Moneybookers Transaction ID: %s', $this->htmlEscape($this->getInfo()->getLastTransId())) ?>
+<?php echo Mage::helper('moneybookers')->__('Moneybookers Transaction ID: %s', $this->escapeHtml($this->getInfo()->getLastTransId())) ?>
     {{pdf_row_separator}}
diff --git a/app/design/adminhtml/default/default/template/paygate/info/cc.phtml b/app/design/adminhtml/default/default/template/paygate/info/cc.phtml
index 9163e8b750f..099c8e843fb 100644
--- a/app/design/adminhtml/default/default/template/paygate/info/cc.phtml
+++ b/app/design/adminhtml/default/default/template/paygate/info/cc.phtml
@@ -28,7 +28,7 @@
 <div class="cards-list">
 
 <?php if (!$this->getHideTitle()): ?>
-    <div class="bold"><?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?></div>
+    <div class="bold"><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></div>
 <?php endif;?>
 
 <?php
diff --git a/app/design/adminhtml/default/default/template/paygate/info/pdf.phtml b/app/design/adminhtml/default/default/template/paygate/info/pdf.phtml
index 65e631d8687..b0d5bc215e4 100644
--- a/app/design/adminhtml/default/default/template/paygate/info/pdf.phtml
+++ b/app/design/adminhtml/default/default/template/paygate/info/pdf.phtml
@@ -30,7 +30,7 @@
     $showCount = count($cards) > 1;
 ?>
 
-<?php echo $this->getMethod()->getTitle() ?>{{pdf_row_separator}}
+<?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?>{{pdf_row_separator}}
 <?php foreach ($cards as $key => $card): ?>
     <?php if ($showCount): ?>
        <?php echo sprintf($this->__('Credit Card %s'), $key + 1); ?>
diff --git a/app/design/adminhtml/default/default/template/payment/info/checkmo.phtml b/app/design/adminhtml/default/default/template/payment/info/checkmo.phtml
index bb33e5a5125..e00a5b7e3ba 100644
--- a/app/design/adminhtml/default/default/template/payment/info/checkmo.phtml
+++ b/app/design/adminhtml/default/default/template/payment/info/checkmo.phtml
@@ -24,13 +24,13 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<?php echo $this->getMethod()->getTitle() ?>
+<?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?>
 <?php if($this->getInfo()->getAdditionalData()): ?>
-    <?php if($this->getPayableTo()): ?><br /><?php echo Mage::helper('payment')->__('Make Check payable to: %s', $this->htmlEscape($this->getPayableTo())) ?><?php endif; ?>
+    <?php if($this->getPayableTo()): ?><br /><?php echo Mage::helper('payment')->__('Make Check payable to: %s', $this->escapeHtml($this->getPayableTo())) ?><?php endif; ?>
     <?php if($this->getMailingAddress()): ?>
         <label><?php echo Mage::helper('payment')->__('Send Check to:') ?></label>
         <div class="checkmo-mailing-address">
-            <?php echo nl2br($this->htmlEscape($this->getMailingAddress())) ?>
+            <?php echo nl2br($this->escapeHtml($this->getMailingAddress())) ?>
         </div>
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/design/adminhtml/default/default/template/payment/info/default.phtml b/app/design/adminhtml/default/default/template/payment/info/default.phtml
index f25520d679f..07992a60d40 100644
--- a/app/design/adminhtml/default/default/template/payment/info/default.phtml
+++ b/app/design/adminhtml/default/default/template/payment/info/default.phtml
@@ -29,7 +29,7 @@
  * @see Mage_Payment_Block_Info
  */
 ?>
-<?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?>
+<?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?>
 
 <?php if ($_specificInfo = $this->getSpecificInformation()):?>
 <table>
diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml b/app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml
index 3076d8126cc..0b530c3c9d4 100644
--- a/app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml
+++ b/app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml
@@ -24,18 +24,18 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<?php echo $this->getMethod()->getTitle() ?>
+<?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?>
     {{pdf_row_separator}}
 <?php if($this->getInfo()->getAdditionalData()): ?>
     {{pdf_row_separator}}
     <?php if($this->getPayableTo()): ?>
-        <?php echo Mage::helper('payment')->__('Make Check payable to: %s', $this->htmlEscape($this->getPayableTo())) ?>
+        <?php echo Mage::helper('payment')->__('Make Check payable to: %s', $this->escapeHtml($this->getPayableTo())) ?>
         {{pdf_row_separator}}
     <?php endif; ?>
     <?php if($this->getMailingAddress()): ?>
         <?php echo Mage::helper('payment')->__('Send Check to:') ?>
         {{pdf_row_separator}}
-        <?php echo nl2br($this->htmlEscape($this->getMailingAddress())) ?>
+        <?php echo nl2br($this->escapeHtml($this->getMailingAddress())) ?>
         {{pdf_row_separator}}
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml b/app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml
index 1b738ed9fb4..1b85569e70e 100644
--- a/app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml
+++ b/app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml
@@ -29,7 +29,7 @@
  * @see Mage_Payment_Block_Info
  */
 ?>
-<?php echo $this->getMethod()->getTitle() ?>{{pdf_row_separator}}
+<?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?>{{pdf_row_separator}}
 
 <?php if ($_specificInfo = $this->getSpecificInformation()):?>
 <?php foreach ($_specificInfo as $_label => $_value):?>
diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml b/app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml
index 11b9b80fd3b..b07bc1438ed 100644
--- a/app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml
+++ b/app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml
@@ -24,6 +24,6 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<?php echo Mage::helper('payment')->__('Purchase Order Number: %s', $this->htmlEscape($this->getInfo()->getPoNumber())) ?>
+<?php echo Mage::helper('payment')->__('Purchase Order Number: %s', $this->escapeHtml($this->getInfo()->getPoNumber())) ?>
     {{pdf_row_separator}}
 
diff --git a/app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml b/app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml
index fc9c878d522..a503f462999 100644
--- a/app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml
+++ b/app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml
@@ -24,5 +24,5 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<p><?php echo $this->getMethod()->getTitle() ?></p>
-<p><?php echo Mage::helper('payment')->__('Purchase Order Number: %s', $this->htmlEscape($this->getInfo()->getPoNumber())) ?></p>
+<p><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></p>
+<p><?php echo Mage::helper('payment')->__('Purchase Order Number: %s', $this->escapeHtml($this->getInfo()->getPoNumber())) ?></p>
diff --git a/app/design/adminhtml/default/default/template/promo/salesrulejs.phtml b/app/design/adminhtml/default/default/template/promo/salesrulejs.phtml
index 5f8914d8cfd..84fe06bd826 100644
--- a/app/design/adminhtml/default/default/template/promo/salesrulejs.phtml
+++ b/app/design/adminhtml/default/default/template/promo/salesrulejs.phtml
@@ -108,6 +108,17 @@ function generateCouponCodes(idPrefix, generateUrl, grid) {
     });
 }
 
+Ajax.Responders.register({
+    onComplete: function() {
+        if ($('promo_catalog_edit_tabs_coupons_section_content')
+            && $('promo_catalog_edit_tabs_coupons_section_content').visible()
+            && Ajax.activeRequestCount == 0
+        ) {
+            handleCouponsTabContentActivity();
+        }
+    }
+});
+
 document.observe("dom:loaded", handleCouponsTabContentActivity);
 document.observe("dom:loaded", handleCouponTypeChange);
 //]]>
diff --git a/app/design/adminhtml/default/default/template/resetforgottenpassword.phtml b/app/design/adminhtml/default/default/template/resetforgottenpassword.phtml
index 7101a465421..734e34f33b1 100644
--- a/app/design/adminhtml/default/default/template/resetforgottenpassword.phtml
+++ b/app/design/adminhtml/default/default/template/resetforgottenpassword.phtml
@@ -50,15 +50,15 @@
                         <div id="messages">
                             <?php echo $this->getMessagesBlock()->getGroupedHtml(); ?>
                         </div>
-                        <div class="input-box">
-                            <label for="password"><em class="required">*</em><?php echo $this->__('New Password'); ?></label>
+                        <div class="input-box f-left">
+                            <label for="password"><em class="required">*</em> <?php echo $this->__('New Password'); ?></label>
                             <br />
-                            <input type="password" class="input-text required-entry validate-admin-password" name="password" id="password" style="width:461px;" />
+                            <input type="password" class="input-text required-entry validate-admin-password" name="password" id="password" />
                         </div>
-                        <div class="input-box">
-                            <label for="confirmation"><em class="required">*</em><?php echo $this->__('Confirm New Password'); ?></label>
+                        <div class="input-box f-right">
+                            <label for="confirmation"><em class="required">*</em> <?php echo $this->__('Confirm New Password'); ?></label>
                             <br />
-                            <input type="password" class="input-text required-entry validate-cpassword" name="confirmation" id="confirmation" style="width:461px;" />
+                            <input type="password" class="input-text required-entry validate-cpassword" name="confirmation" id="confirmation" />
                         </div>
                         <div class="clear"></div>
                         <div class="form-buttons">
diff --git a/app/design/adminhtml/default/default/template/sales/items/column/name.phtml b/app/design/adminhtml/default/default/template/sales/items/column/name.phtml
index 45a377d6f59..c6864a0ce20 100644
--- a/app/design/adminhtml/default/default/template/sales/items/column/name.phtml
+++ b/app/design/adminhtml/default/default/template/sales/items/column/name.phtml
@@ -31,8 +31,8 @@
 ?>
 
 <?php if ($_item = $this->getItem()): ?>
-    <h5 class="title"><span id="order_item_<?php echo $_item->getId() ?>_title"><?php echo $this->htmlEscape($_item->getName()) ?></span></h5>
-    <div><strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong> <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->htmlEscape($this->getSku()))); ?></div>
+    <h5 class="title"><span id="order_item_<?php echo $_item->getId() ?>_title"><?php echo $this->escapeHtml($_item->getName()) ?></span></h5>
+    <div><strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong> <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($this->getSku()))); ?></div>
     <?php if ($this->getOrderOptions()): ?>
         <dl class="item-options">
         <?php foreach ($this->getOrderOptions() as $_option): ?>
@@ -56,5 +56,5 @@
         <?php endforeach; ?>
         </dl>
     <?php endif; ?>
-    <?php echo $this->htmlEscape($_item->getDescription()) ?>
+    <?php echo $this->escapeHtml($_item->getDescription()) ?>
 <?php endif; ?>
diff --git a/app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml
index d65f201f733..6df95dd0cd0 100644
--- a/app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml
+++ b/app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml
@@ -26,7 +26,7 @@
 ?>
 
 <?php echo $this->getItem()->getName() ?>
-<div><strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong> <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->htmlEscape($this->getItem()->getSku()))); ?></div>
+<div><strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong> <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($this->getItem()->getSku()))); ?></div>
 <?php if ($this->getOrderOptions()): ?>
     <ul class="item-options">
     <?php foreach ($this->getOrderOptions() as $option): ?>
@@ -36,10 +36,10 @@
             <?php echo $this->getValueHtml($item) ?><br />
             <?php endforeach; ?>
         <?php else: ?>
-            <?php echo $this->htmlEscape($option['value']); ?>
+            <?php echo $this->escapeHtml($option['value']); ?>
         <?php endif; ?>
         </li>
     <?php endforeach; ?>
     </ul>
 <?php endif; ?>
-<?php echo $this->htmlEscape($this->getItem()->getDescription()) ?>
+<?php echo $this->escapeHtml($this->getItem()->getDescription()) ?>
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml b/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml
index 0d182cfe0a1..ae6a14a6e94 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml
@@ -35,12 +35,12 @@
     <?php foreach ($_methods as $_method): $_code = $_method->getCode(); $_counter++; ?>
         <dt>
         <?php if ($_methodsCount > 1): ?>
-            <input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" title="<?php echo $this->htmlEscape($_method->getTitle()) ?>" onclick="payment.switchMethod('<?php echo $_code ?>')"<?php if($this->getSelectedMethodCode()==$_code): ?> checked="checked"<?php endif; ?> <?php if ($_counter == $_methodsCount) : ?>class="validate-one-required-by-name"<?php endif;?>/>
+            <input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" title="<?php echo $this->escapeHtml($_method->getTitle()) ?>" onclick="payment.switchMethod('<?php echo $_code ?>')"<?php if($this->getSelectedMethodCode()==$_code): ?> checked="checked"<?php endif; ?> <?php if ($_counter == $_methodsCount) : ?>class="validate-one-required-by-name"<?php endif;?>/>
         <?php else :?>
             <span class="no-display"><input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" checked="checked" /></span>
         <?php endif;?>
 
-            <label for="p_method_<?php echo $_code ?>"><?php echo $_method->getTitle() ?></label>
+            <label for="p_method_<?php echo $_code ?>"><?php echo $this->escapeHtml($_method->getTitle()) ?></label>
         </dt>
         <dd>
             <?php echo $this->getChildHtml('payment.method.'.$_code) ?>
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml b/app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml
index 5d94ba7c40b..2d9e811f833 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml
@@ -64,7 +64,7 @@ endif; ?>
         </select>
         <br/>
         <?php if($this->getIsShipping()): ?>
-            <input type="checkbox" id="order-shipping_same_as_billing" name="shipping_same_as_billing" onchange="order.setShippingAsBilling(this.checked)" <?php if($this->getIsAsBilling()): ?>checked<?php endif; ?>/>
+            <input type="checkbox" id="order-shipping_same_as_billing" name="shipping_same_as_billing" onclick="order.setShippingAsBilling(this.checked)" <?php if($this->getIsAsBilling()): ?>checked<?php endif; ?>/>
             <label for="order-shipping_same_as_billing" class="no-float"><?php echo Mage::helper('sales')->__('Same As Billing Address') ?></label>
         <?php else: ?>
             &nbsp;
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml b/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml
index d129e0e0f11..ce3ec179ec9 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml
@@ -95,10 +95,7 @@
                     <td colspan="2" class="a-right"><?php echo $this->helper('sales')->__('Subtotal:') ?></td>
                     <td class="price"><strong><?php echo $this->formatPrice($this->getSubtotal()) ?></strong></td>
                     <td class="price"><strong><?php echo $this->formatPrice($this->getDiscountAmount()) ?></strong></td>
-                    <td class="price"><strong>
-                    <?php
-                        echo $this->formatPrice($this->getSubtotal() + $this->getDiscountAmount());
-                    ?></strong></td>
+                    <td class="price"><strong><?php echo $this->formatPrice($this->getSubtotalWithDiscount()) ?></strong></td>
                     <td colspan="2">&nbsp;</td>
                 </tr>
             </tfoot>
@@ -107,7 +104,7 @@
                 <tbody class="<?php echo ($i%2)?'even':'odd' ?>">
                     <tr>
                         <td class="first">
-                            <h5 class="title"><span id="order_item_<?php echo $_item->getId() ?>_title"><?php echo $this->htmlEscape($_item->getName()) ?></span></h5>
+                            <h5 class="title"><span id="order_item_<?php echo $_item->getId() ?>_title"><?php echo $this->escapeHtml($_item->getName()) ?></span></h5>
                             <div>
                                 <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
                                 <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($_item->getSku()))); ?>
@@ -314,7 +311,12 @@
 
 
     <?php if ($this->helper('tax')->displayCartPriceExclTax($this->getStore()) || $this->helper('tax')->displayCartBothPrices($this->getStore())): ?>
-        <?php $_rowTotalWithoutDiscount = $_item->getPriceInclTax() * $_item->getQty() - $_item->getDiscountAmount() - $_item->getTaxAmount(); ?>
+        <?php if ($_item->getIsPriceInclTax()): ?>
+            <?php $_rowTotalWithoutDiscount = $_item->getRowTotalInclTax() - $_item->getDiscountAmount() - $_item->getTaxAmount() ?>
+        <?php else: ?>
+            <?php $_rowTotalWithoutDiscount = $_item->getRowTotal() - $_item->getDiscountAmount() ?>
+        <?php endif; ?>
+
         <?php if ($this->helper('tax')->displayCartBothPrices($this->getStore())): ?>
             <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
         <?php endif; ?>
@@ -324,7 +326,6 @@
             <?php echo $this->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
         <?php endif; ?>
 
-
         <?php if (Mage::helper('weee')->getApplied($_item)): ?>
             <br />
             <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
@@ -357,7 +358,13 @@
         <?php if ($this->helper('tax')->displayCartBothPrices($this->getStore())): ?>
             <br /><span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
         <?php endif; ?>
-        <?php $_incl = $_item->getPriceInclTax() * $_item->getQty() - $_item->getDiscountAmount(); ?>
+
+        <?php if ($_item->getIsPriceInclTax()): ?>
+            <?php $_incl = $_item->getRowTotalInclTax() - $_item->getDiscountAmount() ?>
+        <?php else: ?>
+            <?php $_incl = $_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount(); ?>
+        <?php endif; ?>
+
         <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
             <?php echo $this->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
         <?php else: ?>
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/sidebar/items.phtml b/app/design/adminhtml/default/default/template/sales/order/create/sidebar/items.phtml
index 3204ca04988..d8e4823d95e 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/sidebar/items.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/sidebar/items.phtml
@@ -62,7 +62,7 @@
             </tr>
             <?php foreach ($this->getItems() as $_item): ?>
             <tr>
-                <td><?php echo $this->htmlEscape($_item->getName()) ?></td>
+                <td><?php echo $this->escapeHtml($_item->getName()) ?></td>
                 <?php if ($this->canDisplayItemQty()): ?>
                 <td class="a-center">
                     <?php if ($_item->getProduct()->getTypeId() != Mage_Catalog_Model_Product_Type_Grouped::TYPE_CODE): ?>
diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/form.phtml b/app/design/adminhtml/default/default/template/sales/order/invoice/create/form.phtml
index fb529065a42..522078edee5 100644
--- a/app/design/adminhtml/default/default/template/sales/order/invoice/create/form.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/invoice/create/form.phtml
@@ -99,13 +99,15 @@
 <script type="text/javascript">
 //<![CDATA[
     var createShipment = $('invoice_do_shipment');
-    createShipment.observe('click', function(e){
-        if (createShipment.checked) {
-            document.getElementById('tracking').style.display = 'block';
-        } else {
-            document.getElementById('tracking').style.display = 'none'
-        }
-    })
+    if (createShipment) {
+        createShipment.observe('click', function(e){
+            if (createShipment.checked) {
+                document.getElementById('tracking').style.display = 'block';
+            } else {
+                document.getElementById('tracking').style.display = 'none'
+            }
+        })
+    }
 
     /*forced creating of shipment*/
     var forcedShipmentCreate = <?php echo $this->getForcedShipmentCreate() ?>;
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml b/app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml
index bcf15ab60a1..720e39250f1 100644
--- a/app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml
@@ -36,16 +36,16 @@
                 <tbody>
                   <tr>
                       <td class="label"><label><?php echo Mage::helper('sales')->__('From Name') ?><?php echo $_required ? '&nbsp;<span class="required">*</span>' : ''?></label></td>
-                      <td class="input-ele"><input class="input-text" type="text" id="<?php echo $this->getFieldId('sender') ?>" name="<?php echo $this->getFieldName('sender') ?>" value="<?php echo $this->htmlEscape($this->getMessage()->getSender()) ?>" /></td>
+                      <td class="input-ele"><input class="input-text" type="text" id="<?php echo $this->getFieldId('sender') ?>" name="<?php echo $this->getFieldName('sender') ?>" value="<?php echo $this->escapeHtml($this->getMessage()->getSender()) ?>" /></td>
                       <td>&nbsp;</td>
                       <td class="label"><label><?php echo Mage::helper('sales')->__('To Name') ?><?php echo $_required ? '&nbsp;<span class="required">*</span>' : ''?></label></td>
-                      <td class="input-ele"><input class="input-text" type="text" id="<?php echo $this->getFieldId('recipient') ?>" name="<?php echo $this->getFieldName('recipient') ?>"  value="<?php echo $this->htmlEscape($this->getMessage()->getRecipient()) ?>" /></td>
+                      <td class="input-ele"><input class="input-text" type="text" id="<?php echo $this->getFieldId('recipient') ?>" name="<?php echo $this->getFieldName('recipient') ?>"  value="<?php echo $this->escapeHtml($this->getMessage()->getRecipient()) ?>" /></td>
                   </tr>
                   <tr>
                       <td class="label" colspan="6"><label for="<?php echo $this->getFieldId('message') ?>"><?php echo Mage::helper('sales')->__('Gift Message') ?></label></td>
                   </tr>
                   <tr>
-                      <td colspan="5"><textarea style="height:8em;" id="<?php echo $this->getFieldId('message') ?>" name="<?php echo $this->getFieldName('message') ?>" rows="2" cols="15"><?php echo $this->htmlEscape($this->getMessage()->getMessage()) ?></textarea></td>
+                      <td colspan="5"><textarea style="height:8em;" id="<?php echo $this->getFieldId('message') ?>" name="<?php echo $this->getFieldName('message') ?>" rows="2" cols="15"><?php echo $this->escapeHtml($this->getMessage()->getMessage()) ?></textarea></td>
                   </tr>
                   <tr>
                       <td colspan="5" class="a-right" style="padding-top:5px;"><?php echo $this->getSaveButtonHtml(); ?></td>
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/info.phtml b/app/design/adminhtml/default/default/template/sales/order/view/info.phtml
index 817d371e7dc..f8f31dff2de 100644
--- a/app/design/adminhtml/default/default/template/sales/order/view/info.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/view/info.phtml
@@ -117,9 +117,9 @@ $orderStoreDate = $this->formatDate($_order->getCreatedAtStoreDate(), 'medium',
                     <td class="label"><label><?php echo Mage::helper('sales')->__('Customer Name') ?></label></td>
                     <td class="value">
                     <?php if ($_customerUrl=$this->getCustomerViewUrl()) : ?>
-                        <a href="<?php echo $_customerUrl ?>" target="_blank"><strong><?php echo $this->htmlEscape($_order->getCustomerName()) ?></strong></a>
+                        <a href="<?php echo $_customerUrl ?>" target="_blank"><strong><?php echo $this->escapeHtml($_order->getCustomerName()) ?></strong></a>
                     <?php else: ?>
-                        <strong><?php echo $this->htmlEscape($_order->getCustomerName()) ?></strong>
+                        <strong><?php echo $this->escapeHtml($_order->getCustomerName()) ?></strong>
                     <?php endif; ?>
                     </td>
                 </tr>
diff --git a/app/design/adminhtml/default/default/template/system/autocomplete.phtml b/app/design/adminhtml/default/default/template/system/autocomplete.phtml
index 25c92821d85..534c11b4da6 100644
--- a/app/design/adminhtml/default/default/template/system/autocomplete.phtml
+++ b/app/design/adminhtml/default/default/template/system/autocomplete.phtml
@@ -28,8 +28,8 @@
 <?php foreach ($items as $item): ?>
     <li id="<?php echo $item['id'] ?>" url="<?php echo $item['url'] ?>">
         <div style="float:right; color:red; font-weight:bold;">[<?php echo $item['type'] ?>]</div>
-        <strong><?php echo $this->htmlEscape($item['name']) ?></strong><br/>
-        <span class="informal"><?php echo $this->htmlEscape($item['description']) ?></span>
+        <strong><?php echo $this->escapeHtml($item['name']) ?></strong><br/>
+        <span class="informal"><?php echo $this->escapeHtml($item['description']) ?></span>
     </li>
 <?php endforeach ?>
 </ul>
diff --git a/app/design/adminhtml/default/default/template/system/shipping/ups.phtml b/app/design/adminhtml/default/default/template/system/shipping/ups.phtml
index 9f46f6b513f..d8ed241e7ba 100644
--- a/app/design/adminhtml/default/default/template/system/shipping/ups.phtml
+++ b/app/design/adminhtml/default/default/template/system/shipping/ups.phtml
@@ -95,6 +95,7 @@ if (!$storeCode && $websiteCode) {
             this.allowedMethodsId = 'carriers_ups_allowed_methods';
             this.freeShipmentId = 'carriers_ups_free_method';
             this.onlyUpsXmlElements = ['carriers_ups_gateway_xml_url','carriers_ups_tracking_xml_url',
+                'carriers_ups_shipconfirm_xml_url', 'carriers_ups_shipaccept_xml_url',
                 'carriers_ups_username','carriers_ups_password','carriers_ups_access_license_number',
                 'carriers_ups_origin_shipment','carriers_ups_negotiated_active','carriers_ups_shipper_number',
                 'carriers_ups_mode_xml'];
diff --git a/app/design/adminhtml/default/default/template/tax/notifications.phtml b/app/design/adminhtml/default/default/template/tax/notifications.phtml
new file mode 100644
index 00000000000..c7c6daf11d9
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/tax/notifications.phtml
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     default_default
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+/* @var $this Mage_Tax_Block_Adminhtml_Notifications */
+?>
+<?php $messageDetails = $this->helper('tax')->__('Please see <a href="%s">source</a> for more details.', $this->getInfoUrl())
+        . $this->helper('tax')->__('Click here to go to <a href="%s">Tax configuration</a> and change your settings.', $this->getManageUrl());
+?>
+<?php $discountStores = $this->getWebsitesWithWrongDiscountSettings()?>
+<?php if(!Mage::helper('tax')->isWrongDiscountSettingsIgnored() && $discountStores):?>
+<div class="notification-global">
+    <strong><?php echo $this->helper('tax')->__('Warning tax discount configuration might result in different discounts than a customer might expect')?></strong>
+    <?php if(is_array($discountStores)):?><strong><?php echo $this->helper('tax')->__('for store(s)')?>: </strong><?php echo implode(', ', $discountStores)?><?php endif;?>.
+    <?php echo $messageDetails ?>
+    <span class="f-right">
+        <a href="<?php echo $this->getIgnoreTaxNotificationUrl('discount') ?>"><?php echo $this->helper('tax')->__('Ignore this notification')?></a>
+    </span>
+</div>
+<?php endif;?>
+<?php $priceDisplayStores = $this->getStoresWithWrongDisplaySettings() ?>
+<?php if(!Mage::helper('tax')->isWrongDisplaySettingsIgnored() && $priceDisplayStores):?>
+<div class="notification-global">
+    <strong><?php echo $this->helper('tax')->__('Warning tax configuration can result in rounding errors')?></strong>
+    <?php if(is_array($priceDisplayStores)):?><strong><?php echo $this->helper('tax')->__('for store(s)')?>: </strong><?php echo implode(', ', $priceDisplayStores)?><?php endif;?>.
+    <?php echo $messageDetails ?>
+    <span class="f-right">
+        <a href="<?php echo $this->getIgnoreTaxNotificationUrl('price_display') ?>"><?php echo $this->helper('tax')->__('Ignore this notification')?></a>
+    </span>
+</div>
+<?php endif;?>
diff --git a/app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml b/app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml
index 14f2490ecba..24668763af5 100644
--- a/app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml
+++ b/app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml
@@ -31,12 +31,12 @@
     <li>
         <?php if(empty($_link['url'])): ?>
             <?php if($_index!=$_size-1): ?>
-                <span><?php echo $this->htmlEscape($_link['label']) ?></span>
+                <span><?php echo $this->escapeHtml($_link['label']) ?></span>
             <?php else: ?>
-                <strong><?php echo $this->htmlEscape($_link['label']) ?></strong>
+                <strong><?php echo $this->escapeHtml($_link['label']) ?></strong>
             <?php endif; ?>
         <?php else: ?>
-            <a href="<?php echo $_link['url'] ?>" title="<?php echo $this->htmlEscape($_link['title']) ?>"><?php echo $this->htmlEscape($_link['label']) ?></a>
+            <a href="<?php echo $_link['url'] ?>" title="<?php echo $this->escapeHtml($_link['title']) ?>"><?php echo $this->escapeHtml($_link['label']) ?></a>
         <?php endif; ?>
         <?php if($_index!=$_size-1): ?>
             &raquo;
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/content.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/content.phtml
new file mode 100644
index 00000000000..f73255f53a7
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/content.phtml
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     default_default
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+
+<?php $helper =  Mage::helper('xmlconnect') ?>
+
+<div class="entry-edit">
+    <div class="entry-edit-head">
+        <h4 class="icon-head head-edit-form fieldset-legend"><?php echo $this->__('Pages') ?></h4>
+    </div>
+    <fieldset id="content_fields">
+        <table cellspacing="0" class="data border" id="tiers_table">
+            <col width="200" />
+            <col width="300" />
+            <col width/>
+            <thead>
+                <tr class="headings">
+                    <th><?php echo $this->__('Label') ?></th>
+                    <th><?php echo $this->__('Get Content from CMS Page') ?></th>
+                    <th><?php echo $this->getChildHtml('add_button') ?></th>
+                </tr>
+            </thead>
+            <tbody id='content_pages'>
+                <tr>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                </tr>
+            </tbody>
+        </table>
+    </fieldset>
+</div>
+
+<script type="text/javascript">
+//<![CDATA[
+    var cmsPageTemplate = '<tr id="config_data[{{trId}}][tr]">' +
+        '<td class="label">' +
+            '<span class="field-row">' +
+                '<input type="text" name="config_data[pages:{{pageFieldName}}][label]" value="{{labelFieldValue}}" class="label onclick_text input-text" id="config_data[pages:{{pageFieldName}}][label]">' +
+            '</span>' +
+        '</td>' +
+        '<td class="value">' +
+            '<span class="field-row">' +
+                '<select name="config_data[pages:{{pageFieldName}}][id]" id="config_data[pages:{{pageFieldName}}][id]" class=" select">' +
+                    '<option value="">' +
+                    '{{optionsList}}' +
+                '</select>' +
+            '</span>' +
+        '</td>' +
+        '<td class="label">' +
+            '<?php echo $this->getChildHtml('delete_button') ?>' +
+        '</td>' +
+    '</tr>';
+
+    var newPageTemplate = '<tr id="config_data[{{newId}}][tr]">' +
+        '<td class="label">' +
+            '<span class="field-row">' +
+                '<input type="text" name="config_data[new_pages][{{newId}}][label]" class="label onclick_text input-text" id="config_data[new_pages][{{newId}}][label]">' +
+            '</span>' +
+        '</td>' +
+        '<td class="value">' +
+            '<span class="field-row">' +
+                '<select name="config_data[new_pages][{{newId}}][id]" id="config_data[new_pages][{{newId}}][id]" class=" select">' +
+                    '<option value="">' +
+                    '{{optionsList}}' +
+                '</select>' +
+            '</span>' +
+        '</td>' +
+        '<td class="label">' +
+            '<?php echo $this->getChildHtml('delete_button') ?>' +
+        '</td>' +
+    '</tr>';
+
+    var cmsPageActionHelper = {
+        templateSyntax : /(^|.|\r|\n)({{(\w+)}})/,
+        templateText : cmsPageTemplate,
+        templateNew : newPageTemplate,
+
+        labelFieldValue : null,
+        pageFieldName : null,
+        trId : null,
+        pageOptions : '',
+
+        init : function() {
+            $('content_pages').update('');
+            <?php foreach($this->getPages() as $page): ?>
+                this.pageOptions += '<option value="<?php echo $helper->jsQuoteEscape($page['value']) ?>"><?php echo $helper->jsQuoteEscape($page['label']) ?></option>';
+            <?php endforeach; ?>
+        },
+        showPage : function(node, label, idValue) {
+            data = {};
+            data.trId  = node;
+            data.deleteId = node;
+            data.pageFieldName  = node;
+            data.labelFieldValue = label;
+            data.optionsList = this.pageOptions;
+
+            this.Template = new Template(this.templateText, this.templateSyntax);
+
+            $('content_pages').insert({'bottom': this.Template.evaluate(data)});
+            $('config_data[pages:' + node + '][id]').value = idValue;
+        },
+        insertPage : function() {
+            data = {};
+            data.newId = $('content_pages').childElementCount;
+            data.deleteId = $('content_pages').childElementCount;
+            data.optionsList = this.pageOptions;
+
+            this.Template = new Template(this.templateNew, this.templateSyntax);
+            $('content_pages').insert({'bottom': this.Template.evaluate(data)});
+        },
+        deletePage : function(id) {
+            var element = document.getElementById(id);
+            element.parentNode.removeChild(element);
+            return false;
+        }
+    }
+
+    cmsPageActionHelper.init();
+
+    <?php foreach ($this->getStaticPageList() as $category => $savedPage) : ?>
+        cmsPageActionHelper.showPage('<?php echo $category ?>', '<?php echo $helper->jsQuoteEscape($helper->jsQuoteEscape($savedPage['label'], '\\')) ?>', '<?php echo $savedPage['id'] ?>');
+    <?php endforeach; ?>
+// ]]>
+</script>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design.phtml
index 560e9ffc0c3..f97cfc32171 100644
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design.phtml
@@ -24,9 +24,502 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
+<script type="text/javascript">
+// <![CDATA[
+var imageTemplate = '<input type="hidden" name="{{file_field}}[image][{{id}}][image_id]" value="{{image_id}}" />'+
+        '<div class="banner-image">'+
+            '<div class="row">'+
+                '<div id="{{file_field}}_{{id}}_file" class="uploader">'+
+                    '<div id="{{file_field}}_{{id}}_file-old" class="file-row-info"><div id="{{file_field}}_preview_{{id}}" style="background:url({{thumbnail}}) no-repeat center;" class="image-placeholder"></div></div>'+
+                    '<div id="{{file_field}}_{{id}}_file-new" class="file-row-info new-file"></div>'+
+                    '<div class="buttons">'+
+                        '<div id="{{file_field}}_{{id}}_file-install-flash" style="display:none">'+
+                            '<?php echo $this->jsQuoteEscape(Mage::helper('media')->__('This content requires last version of Adobe Flash Player. <a href="%s">Get Flash</a>', 'http://www.adobe.com/go/getflash/')) ?>'+
+                        '</div>'+
+                    '</div>'+
+                    '<div class="clear"></div>'+
+                '</div>'+
+            '</div>'+
+            '<input type="hidden" class="validate-banner-file-{{id}}" id="{{file_field}}_{{id}}_file_save" name="{{file_field}}[image][{{id}}][file]" value="{{file_save}}" />'+
+        '</div>';
+
+function prepareImageItems(imageType, deviceId) {
+    imageItems.application_id = deviceId;
+    imageItems.itemCount = 0;
+    imageItems.ulImages = $(imageType);
+    imageItems.ulImagesId = imageType;
+}
+
+var imageItems = {
+    ulImages : null,
+    ulImagesId : null,
+    application_id : null,
+    fileUploadDir : '<?php echo Mage::getModel('xmlconnect/images')->getImageUrl('/') ?>',
+    templateSyntax : /(^|.|\r|\n)({{(\w+)}})/,
+    templateText : imageTemplate,
+    itemCount : 0,
+    excludedActionImages : ['<?php echo Mage_XmlConnect_Model_Device_Abstract::IMAGE_TYPE_ICON;?>',
+        '<?php echo Mage_XmlConnect_Model_Device_Iphone::IMAGE_TYPE_PORTRAIT_BACKGROUND;?>',
+        '<?php echo Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_PORTRAIT_BACKGROUND;?>',
+        '<?php echo Mage_XmlConnect_Model_Device_Ipad::IMAGE_TYPE_LANDSCAPE_BACKGROUND;?>'],
+    template: null,
+    imageActionTruncateLenght: 35,
+    add : function(config) {
+        try {
+            var isUploadedImage = true, uploaderClass = '';
+            this.template = new Template(this.templateText, this.templateSyntax);
+
+            config.ulImagesId = this.ulImagesId;
+
+            if (!config.id) {
+                config.id = this.itemCount;
+                this.itemCount++;
+            }
+            if (!config.image_id) {
+                config.image_id = 'uploader';
+            }
+            if (config.image_id == 'uploader') {
+                isUploadedImage = false;
+                uploaderClass = ' image-item-upload';
+            } else {
+                uploaderClass = ' image-item';
+            }
+
+            Element.insert(this.ulImages, {'bottom' : '<li id="pictureId_' + config.image_id  + '" class="' + uploaderClass  + '"></li>'});
+            Element.insert(this.ulImages.down('li', config.id), {'bottom' : this.template.evaluate(config)});
+            var container = $(config.file_field + '_' + config.id + '_file').up('li');
+
+            if (config.show_uploader == 1) {
+                config.file_save = [];
+
+                new Downloadable.FileUploader(
+                    config.file_field,
+                    config.file_field + '_' + config.id,
+                    container,
+                    config.file_field + '[image][' + config.id + ']',
+                    config.file_save,
+                    config.file_field + '_' + config.id + '_file',
+                    config
+                );
+            }
+
+            if (config.image_id != 'uploader') {
+                imageItems.addEditButton(container, config);
+                imageItems.addDeleteButton(container, config);
+            }
+        } catch (e) {
+            alert(e.message);
+        }
+    },
+    addEditButton : function(container, config) {
+        var actionAllowed = true;
+        for (var i in imageItems.excludedActionImages) {
+            if (imageItems.excludedActionImages[i] == config.file_field) {
+                actionAllowed = false;
+            }
+        }
+
+        if (config.image_id !== undefined && actionAllowed) {
+            var edit_button_id = 'edit_link_' + config.image_id;
+            var edit_button_state_id = 'edit_link_state' + config.image_id;
+            var editButton = '';
+            if (config.image_action_data !== undefined && config.image_action_data.entity_name !== undefined) {
+                editButton += '<strong><?php echo $this->__('Action'); ?>:</strong> <a id="' + edit_button_id + '" href="#" class="edit-btn">' + (config.image_action_data.action_type + ', ' + config.image_action_data.entity_name).truncate(this.imageActionTruncateLenght) + '</a>';
+            } else {
+                editButton += '<strong><?php echo $this->__('Action'); ?>:</strong> <a id="' + edit_button_id + '" href="#" class="edit-btn"><?php echo $this->__('not set'); ?></a>';
+            }
+            Element.insert(container, { 'bottom' : editButton});
+            imageItems.bindEditButton(edit_button_id, config);
+        }
+    },
+    updateEditButtonState : function(config) {
+        var edit_button_state_id = 'edit_link_' + config.image_id;
+        if (config.image_action_data !== undefined) {
+            $(edit_button_state_id).update((config.image_action_data.action_type + ', ' + config.image_action_data.entity_name).truncate(this.imageActionTruncateLenght))
+        } else {
+            $(edit_button_state_id).update('<?php echo $this->__('not set'); ?>')
+        }
+    },
+    bindEditButton : function(edit_button_id, config) {
+        try {
+            $(edit_button_id).config = config;
+            Event.observe(edit_button_id, 'click', this.editBanner.bind(this));
+        } catch (e) {
+            alert(e.message);
+        }
+    },
+    addDeleteButton : function(container, config) {
+        var delete_button_id = config.file_field + '_' + config.id + '_delete_button';
+
+        if (config.image_id === undefined) {
+            image_id = 0;
+        } else {
+            image_id = config.image_id;
+        }
+
+        var deleteButton = '<a href="#" onclick="imageItems.remove(' + image_id + '); return false;" id="' + delete_button_id + '" class="item-remove"><?php echo $this->__('Remove'); ?></a>';
+        Element.insert(container, {'bottom' : deleteButton});
+    },
+    remove : function(image_id) {
+        new Ajax.Request('<?php echo $this->getUrl('*/*/deleteimage')?>' + 'image_id/' + image_id + '/'
+            + 'application_id/' +  imageItems.application_id + '/', {
+            onSuccess : function(transport) {
+                try {
+                    if (transport.responseText.isJSON()) {
+                        var response = transport.responseText.evalJSON()
+                        if (response.error) {
+                            alert(response.error);
+                        } else {
+                            imageItems.reloadImages(response.image_list);
+                        }
+                        if(response.ajaxExpired && response.ajaxRedirect) {
+                            setLocation(response.ajaxRedirect);
+                        }
+                    } else {
+                        alert(transport.responseText);
+                    }
+                } catch (e) {
+                    alert(e.message);
+                }
+            }
+        });
+    },
+    getImageListByType : function(image_type) {
+        new Ajax.Request('<?php echo $this->getUrl('*/*/imagelist')?>' + 'image_type/' + image_type + '/'
+            + 'application_id/' +  imageItems.application_id + '/', {
+            onSuccess : function(transport) {
+                try {
+                    if (transport.responseText.isJSON()) {
+                        var response = transport.responseText.evalJSON()
+                        if (response.error) {
+                            alert(response.error);
+                        }
+                        if(response.ajaxExpired && response.ajaxRedirect) {
+                            setLocation(response.ajaxRedirect);
+                        }
+                        imageItems.reloadImages(response.image_list);
+                    } else {
+                        alert(transport.responseText);
+                    }
+                } catch (e) {
+                    alert(e.message);
+                }
+            }
+        });
+    },
+    reloadImages : function(image_list) {
+        try {
+            var imageType = image_list[0].file_field;
+            Downloadable.unsetUploaderByType(imageType);
+            var currentContainerId = imageType;
+            var currentContainer = $(currentContainerId);
+            var countOfNodes = 0;
+            while (currentContainer.childNodes[0]) {
+                ++countOfNodes;
+                currentContainer.removeChild(currentContainer.childNodes[0]);
+            }
+            prepareImageItems(imageType, this.application_id);
+            for (i=0; i < image_list.length; i++) {
+                imageItems.add(image_list[i]);
+            }
+            imageItems.addDragDrop(imageType);
+            updatePreview();
+        } catch (e) {
+            alert(e.message);
+        }
+    },
+    addDragDrop : function (type) {
+        var changeEffect;
+        Sortable.create(type, { tag: 'li', only: 'image-item', overlap:'horizontal', constraint:false,
+            onChange: function(item) {
+                var list = Sortable.options(item).element;
+            },
+
+            onUpdate: function(list) {
+                var newPositions = Sortable.sequence(list, arguments[1]).map( function(item) {
+                    return item;
+                });
+                var i = 1,
+                    data = {};
+
+                newPositions.each( function(position) {
+                    if (position != "uploader") {
+                        data['data[' + position + ']'] = i;
+                        i++;
+                    }
+                });
+
+                data['type'] = type;
+                data['application_id'] = imageItems.application_id;
+
+                new Ajax.Request("<?php echo $this->getUrl('*/*/saveImageOrder')?>", {
+                    method: "post",
+                    parameters: data,
+                    onSuccess: function (transport) {
+                        if (transport.responseText.isJSON()) {
+                            var response = transport.responseText.evalJSON()
+                        }
+                        imageItems.reloadImages(response.image_list);
+                    }
+                });
+            }
+        });
+        if ($(type).select('.image-item-upload')[0]) {
+            $(type).select('.image-item-upload')[0].stopObserving();
+        }
+    },
+    editBanner : function (event) {
+        try {
+            var element = event.element();
+            actionHelper.closeDialog();
+            actionHelper.setImageElement(element);
+            actionHelper.startDialog(element);
+            event.preventDefault();
+        } catch (e) {
+            alert(e.message);
+        }
+    }
+}
+
+jscolor.dir = '<?php echo $this->getJsUrl(); ?>jscolor/';
+
+var maxUploadFileSizeInBytes = <?php echo $this->getChild('media_uploader')->getDataMaxSizeInBytes() ?>;
+var maxUploadFileSize = '<?php echo $this->getChild('media_uploader')->getDataMaxSize() ?>';
+
+var uploaderTemplate = '<div class="no-display" id="[[idName]]-template">' +
+                            '<div id="{{id}}" class="file-row file-row-narrow">' +
+                                '<span class="file-info">' +
+                                    '<span class="file-info-name">{{name}}</span>' + ' ' +
+                                    '<span class="file-info-size">({{size}})</span>' +
+                                '</span>' +
+                                '<span class="progress-text"></span>' +
+                                '<div class="clear"></div>' +
+                            '</div>' +
+                        '</div>' +
+                        '<div class="no-display" id="[[idName]]-template-progress">' +
+                            '{{percent}}% {{uploaded}} / {{total}}' +
+                        '</div>';
+
+var fileListTemplate = '<div style="background:url({{file}}) no-repeat center;" class="image-placeholder"></div>' +
+                        '<span class="file-info">' +
+                            '<span class="file-info-name">{{name}}</span>' + ' ' +
+                            '<span class="file-info-size">({{size}})</span>' +
+                        '</span>';
+
+var Downloadable = {
+    uploaderObj : $H({}),
+    setUploaderObj : function(type, key, obj) {
+        if (!this.uploaderObj.get(type)) {
+            this.uploaderObj.set(type, $H({}));
+        }
+        this.uploaderObj.get(type).set(key, obj);
+    },
+    getUploaderObj : function(type, key){
+        try {
+            return this.uploaderObj.get(type).get(key);
+        } catch (e) {
+            try {
+                console.log(e);
+            } catch (e2) {
+                alert(e.name + '\n' + e.message);
+            }
+        }
+    },
+    unsetUploaderObj : function(type, key) {
+        try {
+            this.uploaderObj.get(type).unset(key);
+        } catch (e) {
+            try {
+                console.log(e);
+            } catch (e2) {
+                alert(e.name + '\n' + e.message);
+            }
+        }
+    },
+    unsetUploaderByType : function(type) {
+        try {
+            if (this.uploaderObj.get(type)) {
+                this.uploaderObj.unset(type);
+                this.uploaderObj.set(type, $H({}));
+            }
+        } catch (e) {
+            try {
+                console.log(e);
+            } catch (e2) {
+                alert(e.name + '\n' + e.message);
+            }
+        }
+    },
+    massUploadByType : function(type){
+        try {
+            this.uploaderObj.get(type).each(function(item){
+                item.value.upload();
+            });
+        } catch (e) {
+            try {
+                console.log(e);
+            } catch (e2) {
+                alert(e.name + '\n' + e.message);
+            }
+        }
+    }
+};
+
+Downloadable.FileUploader = Class.create();
+Downloadable.FileUploader.prototype = {
+    type : null,
+    key : null, //key, identifier of uploader obj
+    elmContainer : null, //insert Flex object and templates to elmContainer
+    fileValueName : null, //name of field of JSON data of saved file
+    fileValue : null,
+    idName : null, //id name of elements for unique uploader
+    uploaderText: uploaderTemplate,
+    uploaderSyntax : /(^|.|\r|\n)(\[\[(\w+)\]\])/,
+    uploaderObj : $H({}),
+    config : null,
+    initialize: function (type, key, elmContainer, fileValueName, fileValue ,idName, config) {
+        this.type = type;
+        this.key = key;
+        this.elmContainer = elmContainer;
+        this.fileValueName = fileValueName;
+        this.fileValue = fileValue;
+        this.idName = idName;
+        this.config = config;
+        uploaderTemplate = new Template(this.uploaderText, this.uploaderSyntax);
+
+        Element.insert(
+            elmContainer,
+            {
+                'top' : uploaderTemplate.evaluate({
+                    'idName' : this.idName,
+                    'fileValueName' : this.fileValueName,
+                    'uploaderObj' : 'Downloadable.getUploaderObj(\'' + this.type + '\', \'' + this.key + '\')'
+                })
+            }
+        );
+        $(config.file_field + '_preview_' + config.id).update('<?php echo $this->__('Choose file'); ?>');
+        if ($(this.idName + '_save')) {
+            $(this.idName + '_save').value = this.fileValue.toJSON ? this.fileValue.toJSON() : Object.toJSON(this.fileValue);
+        }
+        Downloadable.setUploaderObj(
+            this.type,
+            this.key,
+            new Flex.Uploader(this.idName, '<?php echo $this->getSkinUrl('media/uploaderSingle.swf') ?>', this.config)
+        );
+        new Downloadable.FileList(this.idName, Downloadable.getUploaderObj(type, key), this.config);
+
+        if (varienGlobalEvents) {
+            varienGlobalEvents.attachEventHandler('tabChangeBefore', Downloadable.getUploaderObj(type, key).onContainerHideBefore);
+        }
+    }
+}
+
+Downloadable.FileList = Class.create();
+Downloadable.FileList.prototype = {
+    file: [],
+    containerId: '',
+    container: null,
+    uploader: null,
+    fileListTemplate: fileListTemplate,
+    templatePattern : /(^|.|\r|\n)({{(\w+)}})/,
+    listTemplate : null,
+    initialize: function (containerId, uploader, config) {
+        this.containerId  = containerId,
+        this.container = $(this.containerId);
+        this.uploader = uploader;
+        this.uploader.onFilesComplete = this.handleUploadComplete.bind(this);
+        this.file = this.getElement('save').value.evalJSON();
+        this.listTemplate = new Template(this.fileListTemplate, this.templatePattern);
+        this.updateFiles();
+        this.uploader.handleSelect = this.handleFileSelect.bind(this);
+        this.uploader.onContainerHideBefore = this.handleContainerHideBefore.bind(this);
+        this.uploader.config = config;
+    },
+    handleContainerHideBefore: function(container) {
+        if (container && Element.descendantOf(this.uploader.container, container) && !this.uploader.checkAllComplete()) {
+            if (!confirm('<?php echo $this->__('There are files that were selected but not uploaded yet. After switching to another tab your selections may be lost. Do you wish to continue ?');?>')) {
+                return 'cannotchange';
+            } else {
+                return 'change';
+            }
+        }
+    },
+    handleFileSelect: function(event) {
+        try {
+            this.uploader.files = event.getData().files;
+            this.uploader.checkFileSize();
+            this.updateFiles();
+            if (!hasTooBigFiles) {
+                var uploaderList = $(this.uploader.flexContainerId);
+                for (i = 0; i < uploaderList.length; i++) {
+                    uploaderList[i].setStyle({visibility: 'hidden'});
+                }
+                Downloadable.massUploadByType(this.uploader.config.file_field);
+            }
+        } catch (e) {
+            alert(e.message);
+        }
+    },
+    getElement: function (name) {
+        return $(this.containerId + '_' + name);
+    },
+    handleUploadComplete: function (files) {
+        try {
+            files.each(function(item) {
+                if (!item.response.isJSON()) {
+                    try {
+                        console.log(item.response);
+                    } catch (e2) {
+                        alert(item.response);
+                    }
+                    return;
+                }
+                var response = item.response.evalJSON();
+                if (response.error) {
+                    imageItems.getImageListByType(this.uploader.config.file_field);
+                    return;
+                }
+                var newFile = {};
+                newFile.file = response.thumbnail;
+                newFile.name = response.name;
+                newFile.size = response.size;
+                newFile.status = 'new';
+                this.file[0] = newFile;
+                this.uploader.removeFile(item.id);
+                imageItems.reloadImages(response.image_list);
+            }.bind(this));
+            this.updateFiles();
+        } catch (e) {
+            alert(e.message);
+        }
+    },
+    updateFiles: function() {
+        try {
+            this.getElement('save').value = this.file.toJSON ? this.file.toJSON() : Object.toJSON(this.file);
+            this.file.each(function(row){
+                row.size = this.uploader.formatSize(row.size);
+                $(this.containerId + '-old').innerHTML = this.listTemplate.evaluate(row);
+                $(this.containerId + '-new').hide();
+                $(this.containerId + '-old').show();
+            }.bind(this));
+        } catch (e) {
+            alert(e.message);
+        }
+    }
+}
+//]]>
+</script>
+
+<?php echo $this->getChildHtml('image_action_block');?>
+
 <table border="0" cellspacing="0" cellpadding="0">
     <tr>
-        <td style="width:540px"><?php echo $this->getChildHtml('design_accordion'); ?></td>
+        <td style="width:540px">
+            <dl id="dl-image-accordion" class="accordion">
+                <?php echo $this->getChildHtml('design_images'); ?>
+            </dl>
+            <?php echo $this->getChildHtml('design_accordion'); ?>
+        </td>
         <td style="width:20px">&nbsp;</td>
         <td style="width:350px">
             <?php if ($this->canShowPreview()) : ?>
@@ -35,8 +528,5 @@
         </td>
     </tr>
 </table>
-<script type="text/javascript">
-// <![CDATA[
-jscolor.dir = '<?php echo $this->getJsUrl(); ?>jscolor/';
-// ]]>
-</script>
+
+
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/autocomplete.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/autocomplete.phtml
new file mode 100644
index 00000000000..571d09e13fc
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/autocomplete.phtml
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     default_default
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<ul>
+<?php foreach ($items as $item): ?>
+    <li id="<?php echo $item['id']; ?>">
+        <?php if ($item['type'] == Mage_XmlConnect_Model_ImageAction::ACTION_TYPE_PRODUCT) : ?>
+            <div style="float:right; color:red; font-weight:bold;">
+                <img src="<?php echo Mage::getSingleton('catalog/product_media_config')->getMediaUrl($item['image']); ?>" width="45" height="45" alt="" />
+            </div>
+        <?php endif; ?>
+        <input type="hidden" name="<?php echo $item['id']; ?>" value="<?php echo $this->escapeHtml($item['name']) ?>">
+        <strong><?php echo $this->escapeHtml($this->__('%s id:', $item['label']) . ' ' . $item['item_id']); ?></strong>
+        <p><?php echo $this->escapeHtml($item['name']) ?></p>
+        <span class="informal"><?php echo $this->escapeHtml($item['description']) ?></span>
+        <span class="informal"><a onclick="event.stopPropagation();" href="<?php echo $item['url'] ?>" target="_blank"/><?php echo $this->__('Edit') ?></a></span>
+    </li>
+<?php endforeach ?>
+</ul>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/image_edit.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/image_edit.phtml
new file mode 100644
index 00000000000..b4cdd085fdf
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/image_edit.phtml
@@ -0,0 +1,319 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     default_default
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<div class="popup-window-mask" id="image-edit-popup-mask" style="display:none"></div>
+<div id="advice-container-image" class="advice-container" style="display:none; color: #D40707;"></div>
+<div id="image_edit_block" class="image-edit-popup" style="display: none;">
+
+    <div class="image-edit-popup-head" id="image_edit_popup_head"><?php echo $this->__('Edit Image'); ?></div>
+    <div class="image-edit-popup-content">
+
+        <div class="action-select">
+            <label for="action_type_select"><?php echo $this->__('1. Please select type of the action:'); ?></label>
+            <select id="action_type_select" name="action_type_product" class="select" onchange="actionHelper.showActionByType();">
+                <option value="product"><?php echo $this->__('Product'); ?></option>
+                <option value="cms"><?php echo $this->__('CMS Page'); ?></option>
+                <option value="category"><?php echo $this->__('Category'); ?></option>
+            </select>
+        </div>
+        <form name="image_action_form" id="image_action_form">
+
+            <div id="action_selector_cms" class="action">
+                <p><?php echo $this->__('2. Please select a page'); ?>:</p>
+                <select id="action_type_cms" name="action_type_cms" class="select"">
+                    <option value="0"></option>
+                    <?php $pages = Mage::getResourceModel('xmlconnect/cms_page_collection')->toOptionIdArray(); ?>
+                    <?php if (!count($pages)):?>
+                        <option value=""><?php echo $this->__('CMS Pages haven\'t been found.'); ?></option>
+                    <?php endif;?>
+                    <?php foreach ($pages as $page):?>
+                        <option value="<?php echo $page['value']; ?>"><?php echo $page['label']; ?></option>
+                    <?php endforeach;?>
+                </select>
+            </div>
+
+            <div id="action_selector_product" class="action" style="display: none;">
+                <span id="xmlconnect_product_search_indicator" class="autocomplete-indicator" style="display: none">
+                    <img src="<?php echo $this->getSkinUrl('images/ajax-loader.gif') ?>" alt="<?php echo $this->__('Loading...') ?>" class="v-middle"/>
+                </span>
+                <?php $defProductSearch = $this->__('2. Type Product Name') ?>
+                <input id="xmlconnect_product_search" name="query" type="text" class="input-text" value="<?php echo $defProductSearch ?>" onfocus="if(this.value=='<?php echo $defProductSearch ?>')this.value=''; " onblur="if(this.value=='')this.value='<?php echo $defProductSearch ?>';" />
+                <div id="xmlconnect_product_search_autocomplete" class="autocomplete"></div>
+            </div>
+
+            <div id="action_selector_category" class="action">
+                <span id="xmlconnect_category_search_indicator" class="autocomplete-indicator" style="display: none">
+                    <img src="<?php echo $this->getSkinUrl('images/ajax-loader.gif') ?>" alt="<?php echo $this->__('Loading...') ?>" class="v-middle"/>
+                </span>
+                <?php $defCategorySearch = $this->__('2. Type Category Name') ?>
+                <input id="xmlconnect_category_search" name="query" type="text" class="input-text" value="<?php echo $defCategorySearch ?>" onfocus="if(this.value=='<?php echo $defCategorySearch ?>')this.value=''; " onblur="if(this.value=='')this.value='<?php echo $defCategorySearch ?>';" />
+                <div id="xmlconnect_category_search_autocomplete" class="autocomplete"></div>
+            </div>
+
+        </form>
+    </div>
+    <div id="action_edit_image_buttons" class="buttons-set">
+        <button type="button" id="action_delete_button" class="scalable delete" onclick="actionHelper.deleteAction();"><span><?php echo $this->__('Delete Action') ?></span></button>
+        <button type="submit" id="action_save_button" class="scalable"><span><?php echo $this->__('Save') ?></span></button>
+        <button type="button" class="scalable" onclick="actionHelper.closeDialog();"><span><?php echo $this->__('Cancel') ?></span></button>
+    </div>
+</div>
+<script type="text/javascript">
+// <![CDATA[
+    var actionHelper = {
+        currentImage : null,
+        actionTypeList : ['product', 'cms', 'category'],
+        actionTypePrefixId : 'action_selector_',
+        actionSelectorId : 'action_type_select',
+        editImageActionBlockId: 'image_edit_block',
+        selectedEntityId : null,
+        selectedEntityName : null,
+        getActionSelectorValue : function() {
+            actionSelector = $(this.actionSelectorId);
+            return actionSelector.options[actionSelector.selectedIndex].value;
+        },
+        setActionSelectorValue : function(value) {
+            $(this.actionSelectorId).setValue(value);
+        },
+        showActionByType : function() {
+            for (var i = 0; i < this.actionTypeList.length; i++) {
+                $(this.actionTypePrefixId + this.actionTypeList[i]).hide();
+            }
+            $(this.actionTypePrefixId + this.getActionSelectorValue()).show();
+        },
+        setImageElement : function(element) {
+            this.currentImage = element;
+        },
+        getImageElementConfig : function() {
+            if (this.currentImage !== null) {
+                return this.currentImage.config;
+            } else {
+                return null;
+            }
+        },
+        setImageElementConfig : function(image_action_data) {
+            this.currentImage.config.image_action_data = image_action_data;
+            imageItems.updateEditButtonState(this.currentImage.config);
+        },
+        saveSelectedAction : function(elem) {
+            if ($(elem).hasClassName('disabled')) {
+                return
+            }
+            var data = this.getImageElementConfig();
+            for (var i = 0; i < this.actionTypeList.length; i++) {
+                if ($(this.actionTypePrefixId + this.actionTypeList[i]).visible()) {
+                    data.action_type = this.actionTypeList[i];
+                    switch (data.action_type)
+                    {
+                        case 'product':
+                            data.entity_action = this.selectedEntityId;
+                            data.entity_name   = this.selectedEntityName;
+                            break;
+                        case 'cms':
+                            var cmsSelector = $('action_type_cms');
+                            data.entity_action = cmsSelector.options[cmsSelector.selectedIndex].value;
+                            break;
+                        case 'category':
+                            data.entity_action = this.selectedEntityId;
+                            data.entity_name   = this.selectedEntityName;
+                            break;
+                        default:
+                            alert('<?php echo $this->jsQuoteEscape($this->__('Action type does\'t recognized.'));?>');
+                            return;
+                    }
+
+                    this.sendActionData(data);
+                }
+            }
+        },
+        sendActionData : function (data) {
+            data.application_id = imageItems.application_id;
+            new Ajax.Request('<?php echo $this->getUrl('*/*/saveImageData')?>', {
+                parameters: data,
+                onSuccess : function(transport) {
+                    try {
+                        if (transport.responseText.isJSON()) {
+                            var response = transport.responseText.evalJSON()
+                            if(response.ajaxExpired && response.ajaxRedirect) {
+                                setLocation(response.ajaxRedirect);
+                            }
+                            if (response.error) {
+                                alert(response.error);
+                            }
+                            if (response.success) {
+                                actionHelper.setImageElementConfig(response.image_action_data);
+                                actionHelper.closeDialog();
+                                actionHelper.showAdviceMessage(response.success);
+                            }
+                        } else {
+                            alert(transport.responseText);
+                        }
+                    } catch (e) {
+                        alert(e.message);
+                    }
+                }
+            });
+        },
+        sendDeleteActionData : function (data) {
+            data.application_id = imageItems.application_id;
+            new Ajax.Request('<?php echo $this->getUrl('*/*/deleteImageData')?>', {
+                parameters: data,
+                onSuccess : function(transport) {
+                    try {
+                        if (transport.responseText.isJSON()) {
+                            var response = transport.responseText.evalJSON()
+                            if(response.ajaxExpired && response.ajaxRedirect) {
+                                setLocation(response.ajaxRedirect);
+                            }
+                            if (response.error) {
+                                alert(response.error);
+                            }
+                            if (response.success) {
+                                actionHelper.setImageElementConfig(response.image_action_data);
+                                actionHelper.closeDialog();
+                                actionHelper.showAdviceMessage(response.success);
+                            }
+                        } else {
+                            alert(transport.responseText);
+                        }
+                    } catch (e) {
+                        alert(e.message);
+                    }
+                }
+            });
+        },
+        showAdviceMessage : function (msg) {
+            var el = $('advice-container-image').update(msg);
+            new Effect.Appear(el, { duration: 1});
+            new Effect.Fade(el, { delay: 3, duration: 1 });
+        },
+        closeDialog : function () {
+            this.currentImage = null;
+            this.selectedEntityName = this.selectedEntityId = null;
+            $('image-edit-popup-mask').hide();
+            $(actionHelper.editImageActionBlockId).hide();
+            actionHelper.setActionSelectorValue('product');
+            $('xmlconnect_product_search').value = '<?php echo $defProductSearch ?>';
+        },
+        deleteAction : function () {
+            var data = this.getImageElementConfig();
+            this.sendDeleteActionData(data);
+        },
+        startDialog : function(element) {
+            var actionConfig = actionHelper.getImageElementConfig();
+            $('action_save_button').addClassName('disabled');
+            if (actionConfig !== null) {
+                if (actionConfig.image_action_data !== undefined) {
+                    $('image_edit_popup_head').update('<?php echo $this->__('Edit Action') ?>');
+                    $('action_delete_button').show();
+                    actionConfig = actionConfig.image_action_data;
+                    actionHelper.setActionSelectorValue(actionConfig.action_type);
+                    switch (actionConfig.action_type)
+                    {
+                        case 'product':
+                            $('xmlconnect_product_search').value = actionConfig.entity_name;
+                            break;
+                        case 'cms':
+                            $$('#action_type_cms option').each(function(o) {
+                                if (o.value == actionConfig.entity_action) {
+                                    o.selected = true;
+                                    $break;
+                                }
+                            });
+                            break;
+                        case 'category':
+                            $('xmlconnect_category_search').value = actionConfig.entity_name;
+                            break;
+                        default:
+                            alert('<?php echo $this->jsQuoteEscape($this->__('Action type does\'t recognized.'));?>');
+                            return;
+                    }
+                } else {
+                    $('image_edit_popup_head').update('<?php echo $this->__('Add Action') ?>');
+                    $('action_delete_button').hide();
+                }
+            } else {
+                actionHelper.setActionSelectorValue('product');
+            }
+            actionHelper.showActionByType();
+            $('image-edit-popup-mask').setStyle({ height: $('html-body').getHeight() + 'px' }).show();
+            $(this.editImageActionBlockId).show();
+        }
+    }
+
+    new Ajax.Autocompleter('xmlconnect_product_search', 'xmlconnect_product_search_autocomplete',
+        '<?php echo $this->getUrl('*/*/globalSearch', array('type' => 'product')) ?>',
+        {
+            paramName:'query',
+            minChars:1,
+            indicator:'xmlconnect_product_search_indicator',
+            updateElement:getProductSelectionCallback,
+            evalJSON:'force'
+        }
+    );
+    function getProductSelectionCallback(li) {
+        actionHelper.selectedEntityId = li.getAttribute('id').substring(10);
+        $('xmlconnect_product_search').value = actionHelper.selectedEntityName = li.select('p')[0].innerHTML;
+        $('action_save_button').removeClassName('disabled');
+    }
+    function getCategorySelectionCallback(li) {
+        actionHelper.selectedEntityId = li.getAttribute('id').substring(10);
+        $('xmlconnect_category_search').value = actionHelper.selectedEntityName = li.select('p')[0].innerHTML;
+        $('action_save_button').removeClassName('disabled');
+    }
+
+    new Ajax.Autocompleter('xmlconnect_category_search', 'xmlconnect_category_search_autocomplete',
+        '<?php echo $this->getUrl('*/*/globalSearch', array('type' => 'category')) ?>',
+        {
+            paramName:'query',
+            minChars:1,
+            indicator:'xmlconnect_category_search_indicator',
+            updateElement:getCategorySelectionCallback,
+            evalJSON:'force'
+        }
+    );
+
+    document.observe('dom:loaded', function () {
+        $('action_save_button').observe('click', function () {
+            actionHelper.saveSelectedAction(this);
+        });
+
+        $('action_type_select').observe('change', function () {
+            $('action_save_button').addClassName('disabled');
+            $('image_action_form').reset();
+        });
+
+        $('action_type_cms').observe('change', function () {
+            if ( this.value == 0 ) {
+                $('action_save_button').addClassName('disabled');
+            } else {
+                $('action_save_button').removeClassName('disabled');
+            }
+        });
+    });
+
+//]]>
+</script>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_android.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_android.phtml
new file mode 100644
index 00000000000..54a78a44014
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_android.phtml
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     default_default
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+    $deviceId = $this->getApplicationId();
+
+    /** @var $androidHelper Mage_XmlConnect_Helper_Android */
+    $androidHelper = Mage::helper('xmlconnect/android');
+    $imagesTypes = $androidHelper->getImagesTypesList();
+?>
+
+<dt class="open" id="dt-images"><a href="#"><?php echo $this->__('Images'); ?></a></dt>
+
+<dd class="open" id="dd-images">
+    <div class="entry-edit">
+    <?php if ($this->getApplicationId()) :?>
+        <div id="field_logo" class="app-images">
+            <div class="image-form-list">
+                <?php foreach($imagesTypes as $imageTypeCode => $imageConfiguredData): ?>
+                    <div id="<?php echo $imageTypeCode ?>_label" class="item-label">
+                        <?php echo $imageConfiguredData['label'] ?>
+                    </div>
+                    <div class="recommended-size"><?php echo $imageConfiguredData['sizeTip'] ?></div>
+                    <ul id="<?php echo $imageTypeCode ?>"></ul>
+                <?php endforeach; ?>
+            </div>
+        </div>
+        <script type="text/javascript">
+            //<![CDATA[
+            <?php foreach($imagesTypes as $imageTypeCode => $imageConfiguredData): ?>
+                prepareImageItems('<?php echo $imageTypeCode; ?>', '<?php echo $deviceId; ?>');
+                <?php $imageData = $this->getImagesData($imageTypeCode, $imageConfiguredData['count']); ?>
+                <?php foreach ($imageData as $item): ?>
+                    imageItems.add(<?php echo $this->getConfigJson($item); ?>);
+                <?php endforeach;?>
+                <?php if ($imageConfiguredData['sortable']): ?>
+                    imageItems.addDragDrop('<?php echo $imageTypeCode; ?>');
+                <?php endif; ?>
+            <?php endforeach; ?>
+
+            Validation.addAllThese([
+                ['validate-banner-file-0', 'Please specify File.', function(v, element) {
+                    if (element.value == '' || element.value == '[]') {
+                        return false;
+                    }
+                    return true;
+                }]
+            ]);
+            //]]>
+        </script>
+    <?php else :?>
+        <div class="save-application"><?php echo $this->__('Please save application first.'); ?></div>
+    <?php endif; ?>
+    </div>
+</dd>
+
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_ipad.phtml
new file mode 100644
index 00000000000..1530ad2b13d
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_ipad.phtml
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     default_default
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+    $deviceId = $this->getApplicationId();
+
+    /** @var $ipadHelper Mage_XmlConnect_Helper_Ipad */
+    $ipadHelper = Mage::helper('xmlconnect/ipad');
+    $imagesTypes = $ipadHelper->getImagesTypesList();
+?>
+
+<dt class="open" id="dt-images"><a href="#"><?php echo $this->__('Images'); ?></a></dt>
+
+<dd class="open" id="dd-images">
+    <div class="entry-edit">
+    <?php if ($this->getApplicationId()) :?>
+        <div id="field_logo" class="app-images">
+            <div class="image-form-list">
+                <?php foreach($imagesTypes as $imageTypeCode => $imageConfiguredData): ?>
+                    <div id="<?php echo $imageTypeCode ?>_label" class="item-label">
+                        <?php echo $imageConfiguredData['label'] ?>
+                    </div>
+                    <div class="recommended-size"><?php echo $imageConfiguredData['sizeTip'] ?></div>
+                    <ul id="<?php echo $imageTypeCode ?>"></ul>
+                <?php endforeach; ?>
+            </div>
+        </div>
+        <script type="text/javascript">
+            //<![CDATA[
+            <?php foreach($imagesTypes as $imageTypeCode => $imageConfiguredData): ?>
+                prepareImageItems('<?php echo $imageTypeCode; ?>', '<?php echo $deviceId; ?>');
+                <?php $imageData = $this->getImagesData($imageTypeCode, $imageConfiguredData['count']); ?>
+                <?php foreach ($imageData as $item): ?>
+                    imageItems.add(<?php echo $this->getConfigJson($item); ?>);
+                <?php endforeach;?>
+                <?php if ($imageConfiguredData['sortable']): ?>
+                    imageItems.addDragDrop('<?php echo $imageTypeCode; ?>');
+                <?php endif; ?>
+            <?php endforeach; ?>
+
+            Validation.addAllThese([
+                ['validate-banner-file-0', 'Please specify File.', function(v, element) {
+                    if (element.value == '' || element.value == '[]') {
+                        return false;
+                    }
+                    return true;
+                }]
+            ]);
+            //]]>
+        </script>
+    <?php else :?>
+        <div class="save-application"><?php echo $this->__('Please save application first.'); ?></div>
+    <?php endif; ?>
+    </div>
+</dd>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_iphone.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_iphone.phtml
new file mode 100644
index 00000000000..302122c17b2
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/images_iphone.phtml
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     default_default
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+    $deviceId = $this->getApplicationId();
+
+    /** @var $iphoneHelper Mage_XmlConnect_Helper_Iphone */
+    $iphoneHelper = Mage::helper('xmlconnect/iphone');
+    $imagesTypes = $iphoneHelper->getImagesTypesList();
+?>
+
+<dt class="open" id="dt-images"><a href="#"><?php echo $this->__('Images'); ?></a></dt>
+
+<dd class="open" id="dd-images">
+    <div class="entry-edit">
+    <?php if ($this->getApplicationId()) :?>
+        <div id="field_logo" class="app-images">
+            <div class="image-form-list">
+                <?php foreach($imagesTypes as $imageTypeCode => $imageConfiguredData): ?>
+                    <div id="<?php echo $imageTypeCode ?>_label" class="item-label">
+                        <?php echo $imageConfiguredData['label'] ?>
+                    </div>
+                    <div class="recommended-size"><?php echo $imageConfiguredData['sizeTip'] ?></div>
+                    <ul id="<?php echo $imageTypeCode ?>"></ul>
+                <?php endforeach; ?>
+            </div>
+        </div>
+        <script type="text/javascript">
+            //<![CDATA[
+            <?php foreach($imagesTypes as $imageTypeCode => $imageConfiguredData): ?>
+                prepareImageItems('<?php echo $imageTypeCode; ?>', '<?php echo $deviceId; ?>');
+                <?php $imageData = $this->getImagesData($imageTypeCode, $imageConfiguredData['count']); ?>
+                <?php foreach ($imageData as $item): ?>
+                    imageItems.add(<?php echo $this->getConfigJson($item); ?>);
+                <?php endforeach;?>
+                <?php if ($imageConfiguredData['sortable']): ?>
+                    imageItems.addDragDrop('<?php echo $imageTypeCode; ?>');
+                <?php endif; ?>
+            <?php endforeach; ?>
+
+            Validation.addAllThese([
+                ['validate-banner-file-0', 'Please specify File.', function(v, element) {
+                    if (element.value == '' || element.value == '[]') {
+                        return false;
+                    }
+                    return true;
+                }]
+            ]);
+            //]]>
+        </script>
+    <?php else :?>
+        <div class="save-application"><?php echo $this->__('Please save application first.'); ?></div>
+    <?php endif; ?>
+    </div>
+</dd>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/banner_rotator.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/banner_rotator.phtml
new file mode 100644
index 00000000000..addcc74b5e7
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/banner_rotator.phtml
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     default_default
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<script type="text/javascript">
+    var gallery = $$('.banners')[0];
+
+    if (gallery) {
+        var galleryLength = gallery.childElements().size(),
+            galleryWidth  = gallery.up().getDimensions().width,
+            galleryMax    = galleryLength * galleryWidth,
+            step          = galleryWidth;
+
+        if (galleryLength > 1) {
+            gallery.childElements().each(function(img) {
+                img.wrap('div', { 'class' : 'gallery-item' });
+            });
+
+            gallery.setStyle({ 'width' : galleryMax + 'px' });
+
+            setInterval(function () {
+                new Effect.Move(gallery, { x: -step, mode: 'absolute' });
+                step === galleryMax - galleryWidth ? step = 0 : step += galleryWidth;
+            }, 5000);
+        }
+    }
+</script>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_hor_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_hor_ipad.phtml
index 948c295c2e3..918c7162844 100644
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_hor_ipad.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_hor_ipad.phtml
@@ -36,7 +36,7 @@ $primaryColor = $previewModel->getData('conf/body/primaryColor');
 $secondaryColor = $previewModel->getData('conf/body/secondaryColor');
 
 $productImage = $previewModel->getPreviewImagesUrl('ipad/bg_product_image.png');
-$backgroundIpadLandscapeImage = $previewModel->setOrientation(Mage_XmlConnect_Helper_Ipad::ORIENTATION_LANDSCAPE)->getBackgroundImage();
+$backgroundIpadLandscapeImage = $previewModel->setOrientation(Mage_XmlConnect_Model_Device_Ipad::ORIENTATION_LANDSCAPE)->getBackgroundImage();
 ?>
 <div class="ipad-catalog ipad-catalog-landscape" style="background: <?php echo $previewModel->getData('conf/body/backgroundColor'); ?>;">
     <div class="status-bar"></div>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_ipad.phtml
index e77e4789495..49c8c5b4262 100644
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_ipad.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_ipad.phtml
@@ -36,7 +36,7 @@ $primaryColor = $previewModel->getData('conf/body/primaryColor');
 $secondaryColor = $previewModel->getData('conf/body/secondaryColor');
 
 $productImage = $previewModel->getPreviewImagesUrl('ipad/bg_product_image.png');
-$backgroundIpadPortraitImage = $previewModel->setOrientation(Mage_XmlConnect_Helper_Ipad::ORIENTATION_PORTRAIT)->getBackgroundImage();
+$backgroundIpadPortraitImage = $previewModel->setOrientation(Mage_XmlConnect_Model_Device_Ipad::ORIENTATION_PORTRAIT)->getBackgroundImage();
 ?>
 <div class="ipad-catalog" style="background: <?php echo $previewModel->getData('conf/body/backgroundColor'); ?>;">
     <div class="status-bar"></div>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_iphone.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_iphone.phtml
index f1360a78781..6563f72a648 100755
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_iphone.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_iphone.phtml
@@ -108,7 +108,7 @@ $productImage = $previewModel->getPreviewImagesUrl('t-shirt.png');
             </div>
             <div class="filter-header" style="background:<?php echo $naviBarTintColor; ?>;">
                 <div class="gradient"></div>
-                <div style="background: url('<?php echo $previewModel->getData('conf/appliedFilters/backgroundImage'); ?>') center center no-repeat; width: 320px;height: 100%;">
+                <div>
                     <div class="filter-lines">&nbsp;</div>
                     <div class="filter-applied">
                         <span class="filter-circle">3</span>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_android.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_android.phtml
index 35ae9672d14..700b34b7004 100755
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_android.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_android.phtml
@@ -35,7 +35,7 @@ $categoryItemTintColor = $previewModel->getData('conf/categoryItem/tintColor');
 $title1color = $previewModel->getConfigFontInfo('Title1/color');
 $title9size = $previewModel->getConfigFontInfo('Title9/size');
 $productImage = $previewModel->getPreviewImagesUrl('android/product_image.png');
-$bannerImageAndroid = $previewModel->getBannerImage();
+$bannerImagesAndroid = $previewModel->getBannerImage();
 ?>
 <div class="main-frame main-frame-home" style="background-color:<?php echo $previewModel->getData('conf/body/backgroundColor'); ?>;">
     <div class="phone home-page" style="">
@@ -49,7 +49,15 @@ $bannerImageAndroid = $previewModel->getBannerImage();
                 </div>
             </div>
         </div>
-        <div class="content" style="background-image:url(<?php echo $bannerImageAndroid; ?>)"></div>
+        <div class="content" <?php if (count($bannerImagesAndroid) > 0): ?>style="background: none;" <?php endif; ?>>
+            <div class="banners-wrap">
+                <div class="banners">
+                    <?php foreach ($bannerImagesAndroid as $image): ?>
+                        <img src="<?php echo $image; ?>" alt="" />
+                    <?php endforeach; ?>
+                </div>
+            </div>
+        </div>
         <div class="items-list-wrap" style="background-color:<?php echo $previewModel->getData('conf/body/scrollBackgroundColor'); ?>">
             <div class="items-list">
                 <ul>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_hor_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_hor_ipad.phtml
index 27dee756a4b..c9bdb89f506 100755
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_hor_ipad.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_hor_ipad.phtml
@@ -33,8 +33,8 @@ $categoryItemTintColor = $previewModel->getCategoryItemTintColor();
 $categoryItemBackgroundColor = $previewModel->getData('conf/categoryItem/backgroundColor');
 
 $productImage = $previewModel->getPreviewImagesUrl('ipad/product_image.jpg');
-$backgroundIpadLandscapeImage = $previewModel->setOrientation(Mage_XmlConnect_Helper_Ipad::ORIENTATION_LANDSCAPE)->getBackgroundImage();
-$bannerImageIpad = $previewModel->getBannerImage();
+$backgroundIpadLandscapeImage = $previewModel->setOrientation(Mage_XmlConnect_Model_Device_Ipad::ORIENTATION_LANDSCAPE)->getBackgroundImage();
+$bannerImagesIpad = $previewModel->getBannerImage();
 ?>
 <div class="ipad ipad-landscape" style="background: <?php echo $previewModel->getData('conf/body/backgroundColor'); ?>;">
     <div class="status-bar"></div>
@@ -45,7 +45,15 @@ $bannerImageIpad = $previewModel->getBannerImage();
     </div>
     <div class="shadow"></div>
     <div class="content" style="background-image:url(<?php echo $backgroundIpadLandscapeImage; ?>)">
-        <div class="app-logo" style="background-image:url(<?php echo $bannerImageIpad; ?>)"></div>
+        <div class="app-logo" <?php if (count($bannerImagesIpad) > 0): ?>style="background: none;" <?php endif; ?>>
+            <div class="banners-wrap">
+                <div class="banners">
+                    <?php foreach ($bannerImagesIpad as $image): ?>
+                        <img src="<?php echo $image; ?>" alt="" />
+                    <?php endforeach; ?>
+                </div>
+            </div>
+        </div>
         <div class="products-list-wrap">
             <ul class="products-list">
                 <li style="background-color:<?php echo $categoryItemBackgroundColor; ?>">
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_ipad.phtml
index 59a66b596fa..1c3f4df6dbd 100755
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_ipad.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_ipad.phtml
@@ -33,8 +33,8 @@ $categoryItemTintColor = $previewModel->getCategoryItemTintColor();
 $categoryItemBackgroundColor = $previewModel->getData('conf/categoryItem/backgroundColor');
 
 $productImage = $previewModel->getPreviewImagesUrl('ipad/product_image.jpg');
-$backgroundIpadPortraitImage = $previewModel->setOrientation(Mage_XmlConnect_Helper_Ipad::ORIENTATION_PORTRAIT)->getBackgroundImage();
-$bannerImageIpad = $previewModel->getBannerImage();
+$backgroundIpadPortraitImage = $previewModel->setOrientation(Mage_XmlConnect_Model_Device_Ipad::ORIENTATION_PORTRAIT)->getBackgroundImage();
+$bannerImagesIpad = $previewModel->getBannerImage();
 ?>
 <div class="ipad" style="background: <?php echo $previewModel->getData('conf/body/backgroundColor'); ?>;">
     <div class="status-bar"></div>
@@ -45,7 +45,15 @@ $bannerImageIpad = $previewModel->getBannerImage();
     </div>
     <div class="shadow"></div>
     <div class="content" style="background-image:url(<?php echo $backgroundIpadPortraitImage; ?>);">
-        <div class="app-logo" style="background-image:url(<?php echo $bannerImageIpad; ?>);"></div>
+        <div class="app-logo" <?php if (count($bannerImagesIpad) > 0): ?>style="background: none;" <?php endif; ?>>
+            <div class="banners-wrap">
+                <div class="banners">
+                    <?php foreach ($bannerImagesIpad as $image): ?>
+                        <img src="<?php echo $image; ?>" alt="" />
+                    <?php endforeach; ?>
+                </div>
+            </div>
+        </div>
         <div class="products-list-wrap">
             <ul class="products-list">
                 <li style="background-color:<?php echo $categoryItemBackgroundColor; ?>">
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_iphone.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_iphone.phtml
index d61abb85afe..817b1974b7e 100755
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_iphone.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_iphone.phtml
@@ -41,7 +41,7 @@ $title9color = $previewModel->getConfigFontInfo('Title9/color');
 
 $backgroundColor = $previewModel->getData('conf/body/backgroundColor');
 $menImage = $previewModel->getPreviewImagesUrl('men.png');
-$bannerImage = $previewModel->getBannerImage();
+$bannerImages = $previewModel->getBannerImage();
 ?>
 <div class="iphone-home">
     <div class="main-frame">
@@ -77,7 +77,13 @@ $bannerImage = $previewModel->getBannerImage();
                 </div>
             </div>
             <div class="big-logo">
-                <img src="<?php echo $bannerImage; ?>" alt="" />
+                <div class="banners-wrap">
+                    <div class="banners">
+                        <?php foreach ($bannerImages as $image): ?>
+                            <img src="<?php echo $image; ?>" alt="" />
+                        <?php endforeach; ?>
+                    </div>
+                </div>
             </div>
             <div class="catalog">
                 <div class="item" style="background:<?php echo $categoryItemBackgroundColor; ?>">
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_android.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_android.phtml
index 9d46f86de5e..71c9e58fa11 100644
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_android.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_android.phtml
@@ -30,8 +30,8 @@
 <div id="XmlconnectThemePreview"></div>
 
 <div class="mm-box-blue a-center" style="width:285px;">
-    <button type="button" class="scalable" onclick="updatePreview()"><span><span><span><?php echo $this->__('Update Preview');?></span></span></span></button>
-    <p><br />To preview the newly uploaded images, please save your application first.</p>
+    <button type="button" class="scalable" onclick="updatePreview()"><span><?php echo $this->__('Update Preview');?></span></button>
+    <p><br /><?php echo $this->__('To preview the newly uploaded images, please save your application first.'); ?></p>
 </div>
 <div class="mm-pager">
     <strong><?php echo $this->__('Screens:'); ?></strong>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_ipad.phtml
index 2e0351a645d..3bb743fcb75 100644
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_ipad.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_ipad.phtml
@@ -39,9 +39,9 @@
 <div id="XmlconnectThemePreview" class="ipad-portrait"></div>
 
 <div id="ipad-tab-orientation" class="mm-box-blue a-center ipad-tab-portrait">
-    <button type="button" class="scalable" onclick="updatePreview()"><span><span><span><?php echo $this->__('Update Preview');?></span></span></span></button>
-    <button type="button" class="scalable" onclick="changeOrientation()"><span><span><span><?php echo $this->__('Change Orientation');?></span></span></span></button>
-    <p><br />To preview the newly uploaded images, please save your application first.</p>
+    <button type="button" class="scalable" onclick="updatePreview()"><span><?php echo $this->__('Update Preview');?></span></button>
+    <button type="button" class="scalable" onclick="changeOrientation()"><span><?php echo $this->__('Change Orientation');?></span></button>
+    <p><br /><?php echo $this->__('To preview the newly uploaded images, please save your application first.') ?></p>
 </div>
 <div class="mm-pager" style="padding-left:60px;">
     <strong><?php echo $this->__('Screens:'); ?></strong>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_iphone.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_iphone.phtml
index 66afea8b317..71687408782 100644
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_iphone.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_iphone.phtml
@@ -30,8 +30,8 @@
 <div id="XmlconnectThemePreview"></div>
 
 <div class="mm-box-blue a-center" style="width:285px;">
-    <button type="button" class="scalable" onclick="updatePreview()"><span><span><span><?php echo $this->__('Update Preview');?></span></span></span></button>
-    <p><br />To preview the newly uploaded images, please save your application first.</p>
+    <button type="button" class="scalable" onclick="updatePreview()"><span><?php echo $this->__('Update Preview');?></span></button>
+    <p><br /><?php echo $this->__('To preview the newly uploaded images, please save your application first.');?></p>
 </div>
 <div class="mm-pager">
     <strong><?php echo $this->__('Screens:'); ?></strong>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/offlinecatalog.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/offlinecatalog.phtml
new file mode 100644
index 00000000000..109acff5f51
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/offlinecatalog.phtml
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     default_default
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+
+<?php $exportHelper = Mage::helper('xmlconnect/offlineCatalog') ?>
+<?php echo $this->getChildHtml('offline_catalog') ?>
+<script type="text/javascript">
+    function generateOfflineCatalog() {
+        $('messages').update();
+        new Ajax.Request('<?php echo $exportHelper->getExportUrl() ?>', {
+            method: 'get',
+            onSuccess: function(transport) {
+                try {
+                    var response = transport.responseText.evalJSON();
+                    console.log(response);
+                    $('messages').update(response.result);
+                } catch (e) {
+                    alert(e.message);
+                }
+            }
+        });
+    }
+</script>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/form/element/addrow.phtml b/app/design/adminhtml/default/default/template/xmlconnect/form/element/addrow.phtml
index b1eeee731a7..192f50497ea 100644
--- a/app/design/adminhtml/default/default/template/xmlconnect/form/element/addrow.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/form/element/addrow.phtml
@@ -58,8 +58,8 @@ function getTdValueInnerHtml() {
  * @return string
  */
 function getTdButtonInnerHtml(id) {
-    return '<button  id="'+id+'" class="scalable save onclick_button" value="&minus;">'
-    +'<span><span><span><?php echo $this->__('Delete'); ?></span></span></span></button>';
+    return '<button  id="'+id+'" class=" scalable save onclick_button" value="&minus;">'
+    +'<span><?php echo $this->__('Delete'); ?></span></button>';
 }
 
 /**
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/form/element/themes.phtml b/app/design/adminhtml/default/default/template/xmlconnect/form/element/themes.phtml
index 770421bed56..e75f87b851f 100644
--- a/app/design/adminhtml/default/default/template/xmlconnect/form/element/themes.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/form/element/themes.phtml
@@ -32,6 +32,138 @@ $themeId        = $_themesHelper->getThemeId();
 $defaultThemesArray = $_themesHelper->getDefaultThemes();
 ?>
 <tr><td colspan="2"  style="width:540px">
+    <div id="scroll_to_id" class="theme-select-cont">
+
+        <div class="advice-container" id="advice-container" style="display:none; color: #D40707;"></div>
+
+        <label for="theme_selector_id" class="f-left theme-selector-title"><?php echo $this->__('Preset Theme'); ?></label>
+
+        <div class="no-display">
+            <input type="hidden" name="conf[extra][theme]" id="theme_selector_id_value" value="<?php echo $themeId; ?>"/>
+            <input type="hidden" name="current_theme" id="theme_selector_id_value_flat" value="<?php echo $themeId; ?>"/>
+        </div>
+
+        <div id="themeSelectorList">
+            <?php echo $_themesHelper->getThemesSelector(); ?>
+        </div>
+
+        <div class="form-buttons" style="float:right">
+            <button type="button" class="scalable" id="save_theme" onclick="saveTheme();">
+                <span><?php echo $this->__('Save Theme'); ?></span>
+            </button>
+            <button type="button" class="scalable" id="save_as_theme_init">
+                <span><?php echo $this->__('Save As'); ?></span>
+            </button>
+        </div>
+
+        <div id="save_as_input_block" style="display:none;">
+            <div id="popup-window-mask"></div>
+            <div class="popup-theme-save" id="popup-theme-save">
+                <h3>Save as...</h3>
+                <div class="popup-content">
+                    <label for="input_save_as"><?php echo $this->__('Theme label:'); ?></label>
+                    <input id="input_save_as" type="text" class="input-text" name="input_save_as" autocomplete="off" value="" />
+                    <div class="validation-advice" id="advice-required-theme-name" style="display:none;"><?php echo $this->__('Theme label can\'t be empty'); ?></div>
+                    <button type="button" class="scalable save" id="save_as_theme">
+                        <span><?php echo $this->__('Save'); ?></span>
+                    </button>
+                    <button type="button" class="scalable" id="save_as_theme_cancel">
+                        <span><?php echo $this->__('Cancel'); ?></span>
+                    </button>
+                </div>
+            </div>
+        </div>
+
+    </div>
+
+</div>
+<script type="text/javascript">
+//<![CDATA[
+document.body.appendChild($('save_as_input_block'));
+//]]>
+</script>
+</td></tr>
+
+<?php
+$colorFieldset  = $this->getColorFieldset();
+$id2observe     = array();
+?>
+<?php foreach ($colorFieldset as $set) : ?>
+<tr>
+    <td colspan="2">
+        <h4 class="color-block-heading">
+            <a href="javascript:void(0);" onclick="toggleBlock('<?php echo $set['id']; ?>', this);">
+                <?php echo $set['label']; ?>
+            </a>
+        </h4>
+    </td>
+</tr>
+    <?php foreach ($set['fields'] as $field) : ?>
+        <tr class="<?php echo $set['id']; ?>_cl">
+            <td class="label"><label for="<?php echo $field['id']; ?>"><?php echo $field['label'] ?></label></td>
+            <td class="value" style="clear:both;">
+                <label class="field_label" for="<?php echo $field['id']; ?>">
+                    <span id="box_<?php echo $field['id']; ?>" class="color" style="background:<?php echo $field['value'] ?>;display:block;width:20px;height:20px;">&nbsp;</span>
+                </label>
+                <input style="background:#fff !important;color:#000 !important;margin:2px 0 0 6px;width:75px;float:left;" autocomplete="off" id="<?php echo $field['id']; ?>" name="<?php echo $field['name'] ?>" value="<?php echo $field['value'] ?>" class=" color {required:false,hash:true} input-text" type="text">
+            </td>
+        </tr>
+        <?php $id2observe[] = $field['id']; ?>
+    <?php endforeach; ?>
+<?php endforeach; ?>
+
+<tr>
+    <td colspan="2">
+        <script type="text/javascript">
+        //<![CDATA[
+                Event.observe(document, 'dom:loaded', function() {
+
+                <?php foreach ($id2observe as $id) : ?>
+                    $('<?php echo $id; ?>').observe('change', function() {
+                        changeColorListener('<?php echo $id; ?>');
+                    });
+                <?php endforeach; ?>
+
+                    toggleButtonsView();
+                });
+
+                function toggleButtonsView() {
+                    var isDefaultThemeActive = false,
+                        delete_button = $('delete_theme'),
+                        reset_button  = $('reset_theme');
+
+                    for(i = 0; i < defaultThemes.length; i++) {
+                        if ($('theme_selector_id_value_flat').value == defaultThemes[i]) {
+                            isDefaultThemeActive = true;
+                        }
+                    }
+                    if (isDefaultThemeActive) {
+                        delete_button.addClassName('disabled');
+                        reset_button.removeClassName('disabled');
+                    } else {
+                        delete_button.removeClassName('disabled');
+                        reset_button.addClassName('disabled');
+                    }
+                }
+        //]]>
+        </script>
+        <div class="reset-theme">
+
+            <button id="reset_theme" type="button" class="scalable">
+                <span><?php echo $this->__('Reset theme to default'); ?></span>
+            </button>
+
+            <button id="delete_theme" type="button" class="scalable delete">
+                <span><?php echo $this->__('Delete theme'); ?></span>
+            </button>
+
+            <div id="reset_note" style="display:none;"><?php echo $this->__('Only default theme can be reset'); ?></div>
+            <div id="delete_note" style="display:none;"><?php echo $this->__('Only custom theme can be deleted'); ?></div>
+
+        </div>
+    </td>
+</tr>
+
 <script type="text/javascript">
 // <![CDATA[
 var defaultThemes = [];
@@ -483,134 +615,3 @@ function deleteTheme() {
 }
 // ]]>
 </script>
-    <div id="scroll_to_id" class="theme-select-cont">
-
-        <div class="advice-container" id="advice-container" style="display:none; color: #D40707;"></div>
-
-        <label for="theme_selector_id" class="f-left theme-selector-title"><?php echo $this->__('Preset Theme'); ?></label>
-
-        <div class="no-display">
-            <input type="hidden" name="conf[extra][theme]" id="theme_selector_id_value" value="<?php echo $themeId; ?>"/>
-            <input type="hidden" name="current_theme" id="theme_selector_id_value_flat" value="<?php echo $themeId; ?>"/>
-        </div>
-
-        <div id="themeSelectorList">
-            <?php echo $_themesHelper->getThemesSelector(); ?>
-        </div>
-
-        <div class="form-buttons" style="float:right">
-            <button type="button" class="scalable" id="save_theme" onclick="saveTheme();">
-                <span><span><span><?php echo $this->__('Save Theme'); ?></span></span></span>
-            </button>
-            <button type="button" class="scalable" id="save_as_theme_init">
-                <span><span><span><?php echo $this->__('Save As'); ?></span></span></span>
-            </button>
-        </div>
-
-        <div id="save_as_input_block" style="display:none;">
-            <div id="popup-window-mask"></div>
-            <div class="popup-theme-save" id="popup-theme-save">
-                <h3>Save as...</h3>
-                <div class="popup-content">
-                    <label for="input_save_as"><?php echo $this->__('Theme label:'); ?></label>
-                    <input id="input_save_as" type="text" class="input-text" name="input_save_as" autocomplete="off" value="" />
-                    <div class="validation-advice" id="advice-required-theme-name" style="display:none;"><?php echo $this->__('Theme label can\'t be empty'); ?></div>
-                    <button type="button" class="scalable save" id="save_as_theme">
-                        <span><span><span><?php echo $this->__('Save'); ?></span></span></span>
-                    </button>
-                    <button type="button" class="scalable" id="save_as_theme_cancel">
-                        <span><span><span><?php echo $this->__('Cancel'); ?></span></span></span>
-                    </button>
-                </div>
-            </div>
-        </div>
-
-    </div>
-
-</div>
-<script type="text/javascript">
-//<![CDATA[
-document.body.appendChild($('save_as_input_block'));
-//]]>
-</script>
-</td></tr>
-
-<?php
-$colorFieldset  = $this->getColorFieldset();
-$id2observe     = array();
-?>
-<?php foreach ($colorFieldset as $set) : ?>
-<tr>
-    <td colspan="2">
-        <h4 class="color-block-heading">
-            <a href="javascript:void(0);" onclick="toggleBlock('<?php echo $set['id']; ?>', this);">
-                <?php echo $set['label']; ?>
-            </a>
-        </h4>
-    </td>
-</tr>
-    <?php foreach ($set['fields'] as $field) : ?>
-        <tr class="<?php echo $set['id']; ?>_cl">
-            <td class="label"><label for="<?php echo $field['id']; ?>"><?php echo $field['label'] ?></label></td>
-            <td class="value" style="clear:both;">
-                <label class="field_label" for="<?php echo $field['id']; ?>">
-                    <span id="box_<?php echo $field['id']; ?>" class="color" style="background:<?php echo $field['value'] ?>;display:block;width:20px;height:20px;">&nbsp;</span>
-                </label>
-                <input style="background:#fff !important;color:#000 !important;margin:2px 0 0 6px;width:75px;float:left;" autocomplete="off" id="<?php echo $field['id']; ?>" name="<?php echo $field['name'] ?>" value="<?php echo $field['value'] ?>" class=" color {required:false,hash:true} input-text" type="text">
-            </td>
-        </tr>
-        <?php $id2observe[] = $field['id']; ?>
-    <?php endforeach; ?>
-<?php endforeach; ?>
-
-<tr>
-    <td colspan="2">
-        <script type="text/javascript">
-        //<![CDATA[
-                Event.observe(document, 'dom:loaded', function() {
-
-                <?php foreach ($id2observe as $id) : ?>
-                    $('<?php echo $id; ?>').observe('change', function() {
-                        changeColorListener('<?php echo $id; ?>');
-                    });
-                <?php endforeach; ?>
-
-                    toggleButtonsView();
-                });
-
-                function toggleButtonsView() {
-                    var isDefaultThemeActive = false,
-                        delete_button = $('delete_theme'),
-                        reset_button  = $('reset_theme');
-
-                    for(i = 0; i < defaultThemes.length; i++) {
-                        if ($('theme_selector_id_value_flat').value == defaultThemes[i]) {
-                            isDefaultThemeActive = true;
-                        }
-                    }
-                    if (isDefaultThemeActive) {
-                        delete_button.addClassName('disabled');
-                        reset_button.removeClassName('disabled');
-                    } else {
-                        delete_button.removeClassName('disabled');
-                        reset_button.addClassName('disabled');
-                    }
-                }
-        //]]>
-        </script>
-        <div class="reset-theme">
-
-            <button id="reset_theme" type="button" class="scalable">
-                <span><span><span><?php echo $this->__('Reset theme to default'); ?></span></span></span>
-            </button>
-
-            <button id="delete_theme" type="button" class="scalable delete">
-                <span><span><span><?php echo $this->__('Delete theme'); ?></span></span></span>
-            </button>
-
-            <div id="reset_note" style="display:none;"><?php echo $this->__('Only default theme can be reset'); ?></div>
-            <div id="delete_note" style="display:none;"><?php echo $this->__('Only custom theme can be deleted'); ?></div>
-
-        </div>
-    </td>
-</tr>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/mobile/notification_helper.phtml b/app/design/adminhtml/default/default/template/xmlconnect/mobile/notification_helper.phtml
index 2b5fcac70d3..752ec40aa0c 100644
--- a/app/design/adminhtml/default/default/template/xmlconnect/mobile/notification_helper.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/mobile/notification_helper.phtml
@@ -46,7 +46,7 @@
     echo '<br />';
     echo $this->helper('xmlconnect')->__('In addition, click here to review Urban Airship\'s Terms of Service: <a href="%s" target="_blank">click here</a>.', Mage::getStoreConfig(Mage_XmlConnect_Model_Application::XML_PATH_URBAN_AIRSHIP_TOS_URL));
     echo '<br /><br />';
-    echo $this->helper('xmlconnect')->__('<a href="%s" target="_blank">Login</a> to Urabn Airship.', Mage::getStoreConfig(Mage_XmlConnect_Model_Application::XML_PATH_URBAN_AIRSHIP_PARTNER_LOGIN_URL));
+    echo $this->helper('xmlconnect')->__('<a href="%s" target="_blank">Login</a> to Urban Airship.', Mage::getStoreConfig(Mage_XmlConnect_Model_Application::XML_PATH_URBAN_AIRSHIP_PARTNER_LOGIN_URL));
 ?>
 </div>
 <br />
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/submission/app_icons_preview.phtml b/app/design/adminhtml/default/default/template/xmlconnect/submission/app_icons_preview.phtml
index a4b3cca9770..0c6806c1e3b 100644
--- a/app/design/adminhtml/default/default/template/xmlconnect/submission/app_icons_preview.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/submission/app_icons_preview.phtml
@@ -27,8 +27,6 @@
 
 <script type="text/javascript">
 // <![CDATA[
-
-<?php //$images = array ('conf/submit/loaderImage' => '/media/xmlconnect/home_screen.png'); ?>
 <?php $images = $this->getImages(); ?>
 <?php if (is_array($images)) : ?>
     <?php foreach($images as $id => $src) : ?>
diff --git a/app/design/frontend/base/default/layout/checkout.xml b/app/design/frontend/base/default/layout/checkout.xml
index 2120f7151b5..b5b4bec0912 100644
--- a/app/design/frontend/base/default/layout/checkout.xml
+++ b/app/design/frontend/base/default/layout/checkout.xml
@@ -310,7 +310,12 @@ One page checkout main layout
             <block type="page/html_wrapper" name="checkout.progress.wrapper" translate="label">
                 <label>Checkout Progress Wrapper</label>
                 <action method="setElementId"><value>checkout-progress-wrapper</value></action>
-                <block type="checkout/onepage_progress" name="checkout.progress" before="-" template="checkout/onepage/progress.phtml"/>
+                <block type="checkout/onepage_progress" name="checkout.progress" before="-" template="checkout/onepage/progress.phtml">
+                    <block type="checkout/onepage_progress" name="billing.progress" template="checkout/onepage/progress/billing.phtml"></block>
+                    <block type="checkout/onepage_progress" name="shipping.progress" template="checkout/onepage/progress/shipping.phtml"></block>
+                    <block type="checkout/onepage_progress" name="shippingmethod.progress" template="checkout/onepage/progress/shipping_method.phtml"></block>
+                    <block type="checkout/onepage_progress" name="payment.progress" template="checkout/onepage/progress/payment.phtml"></block>
+                </block>
             </block>
         </reference>
         <reference name="content">
@@ -328,7 +333,7 @@ One page checkout main layout
                     <block type="checkout/onepage_shipping_method_additional" name="checkout.onepage.shipping_method.additional" as="additional" template="checkout/onepage/shipping_method/additional.phtml"/>
                 </block>
                 <block type="checkout/onepage_payment" name="checkout.onepage.payment" as="payment" template="checkout/onepage/payment.phtml">
-                    <block type="checkout/onepage_payment_methods" name="checkout.payment.methods" as="methods" template="checkout/onepage/payment/methods.phtml">
+                    <block type="checkout/onepage_payment_methods" name="checkout.payment.methods" as="methods" template="checkout/onepage/payment/info.phtml">
                         <action method="setMethodFormTemplate"><method>purchaseorder</method><template>payment/form/purchaseorder.phtml</template></action>
                     </block>
                 </block>
@@ -337,9 +342,9 @@ One page checkout main layout
         </reference>
     </checkout_onepage_index>
 
-<!--
-One page checkout progress block
--->
+    <!--
+    One page checkout progress block
+    -->
 
     <checkout_onepage_progress>
         <!-- Mage_Checkout -->
@@ -347,15 +352,65 @@ One page checkout progress block
         <remove name="left"/>
 
         <block type="checkout/onepage_progress" name="root" output="toHtml" template="checkout/onepage/progress.phtml">
-            <block type="checkout/onepage_payment_info" name="payment_info">
-                <action method="setInfoTemplate"><method></method><template></template></action>
-            </block>
+            <action method="setInfoTemplate"><method></method><template></template></action>
+            <block type="checkout/onepage_progress" name="billing.progress" template="checkout/onepage/progress/billing.phtml"></block>
+            <block type="checkout/onepage_progress" name="shipping.progress" template="checkout/onepage/progress/shipping.phtml"></block>
+            <block type="checkout/onepage_progress" name="shippingmethod.progress" template="checkout/onepage/progress/shipping_method.phtml"></block>
+            <block type="checkout/onepage_progress" name="payment.progress" template="checkout/onepage/progress/payment.phtml"></block>
         </block>
     </checkout_onepage_progress>
 
-<!--
-One page checkout payment methods block
--->
+    <!-- Individual blocks for Progress steps begins -->
+    <checkout_onepage_progress_billing>
+        <!-- Mage_Checkout -->
+        <remove name="right"/>
+        <remove name="left"/>
+
+        <block type="checkout/onepage_progress" name="root" output="toHtml" template="checkout/onepage/progress/billing.phtml">
+            <action method="setInfoTemplate"><method></method><template></template></action>
+        </block>
+    </checkout_onepage_progress_billing>
+
+
+    <checkout_onepage_progress_shipping>
+        <!-- Mage_Checkout -->
+        <remove name="right"/>
+        <remove name="left"/>
+
+        <block type="checkout/onepage_progress" name="root" output="toHtml" template="checkout/onepage/progress/shipping.phtml">
+            <action method="setInfoTemplate"><method></method><template></template></action>
+        </block>
+    </checkout_onepage_progress_shipping>
+
+
+    <checkout_onepage_progress_shipping_method>
+        <!-- Mage_Checkout -->
+        <remove name="right"/>
+        <remove name="left"/>
+
+        <block type="checkout/onepage_progress" name="root" output="toHtml" template="checkout/onepage/progress/shipping_method.phtml">
+            <action method="setInfoTemplate"><method></method><template></template></action>
+        </block>
+    </checkout_onepage_progress_shipping_method>
+
+    <checkout_onepage_progress_payment>
+    <!-- Mage_Checkout -->
+    <remove name="right"/>
+    <remove name="left"/>
+
+    <block type="checkout/onepage_progress" name="root" output="toHtml" template="checkout/onepage/progress/payment.phtml">
+        <block type="checkout/onepage_payment_info" name="payment_info">
+            <action method="setInfoTemplate"><method></method><template></template></action>
+        </block>
+        <action method="setInfoTemplate"><method></method><template></template></action>
+    </block>
+    </checkout_onepage_progress_payment>
+
+<!-- end individual progress blocks -->
+
+    <!--
+    One page checkout payment methods block
+    -->
     <checkout_onepage_paymentmethod>
         <remove name="right"/>
         <remove name="left"/>
diff --git a/app/design/frontend/base/default/layout/page.xml b/app/design/frontend/base/default/layout/page.xml
index 286f624acc3..c731debe5c1 100644
--- a/app/design/frontend/base/default/layout/page.xml
+++ b/app/design/frontend/base/default/layout/page.xml
@@ -77,6 +77,7 @@ Default layout, loads most of the pages
                     <label>Page Header</label>
                     <action method="setElementClass"><value>top-container</value></action>
                 </block>
+                <block type="page/html_welcome" name="welcome" as="welcome"/>
             </block>
 
             <block type="page/html_breadcrumbs" name="breadcrumbs" as="breadcrumbs"/>
diff --git a/app/design/frontend/base/default/layout/xmlconnect.xml b/app/design/frontend/base/default/layout/xmlconnect.xml
index b74b5b83e64..9f8dba15c50 100644
--- a/app/design/frontend/base/default/layout/xmlconnect.xml
+++ b/app/design/frontend/base/default/layout/xmlconnect.xml
@@ -34,6 +34,16 @@
         <block type="xmlconnect/home" name="xmlconnect.home" output="toHtml"/>
     </xmlconnect_index_index>
 
+    <!-- Localization -->
+    <xmlconnect_localization_index>
+        <block type="xmlconnect/localization" name="xmlconnect.localization" output="toHtml"/>
+    </xmlconnect_localization_index>
+
+    <!-- Home banners -->
+    <xmlconnect_homebanners_index>
+        <block type="xmlconnect/homebanners" name="xmlconnect.homebanners" output="toHtml"/>
+    </xmlconnect_homebanners_index>
+
     <!-- Catalog -->
 
     <xmlconnect_catalog_filters>
@@ -54,6 +64,19 @@
         </block>
     </xmlconnect_catalog_category>
 
+    <xmlconnect_catalog_categorydetails>
+        <block type="xmlconnect/catalog_category" name="xmlconnect.catalog.category" output="toHtml">
+            <block type="xmlconnect/catalog_product_list" name="xmlconnect.catalog.product.list" as="product_list" output="">
+                <block type="xmlconnect/catalog_product_itemPrice" name="xmlconnect.catalog.product.itemprice" as="product_price" output="">
+                    <action method="addRenderer"><type>bundle</type><renderer>xmlconnect/catalog_product_itemPrice_bundle</renderer></action>
+                    <action method="addRenderer"><type>giftcard</type><renderer>xmlconnect/catalog_product_itemPrice_giftcard</renderer></action>
+                </block>
+            </block>
+
+            <block type="xmlconnect/catalog_category_info" name="xmlconnect.catalog.category.info" as="category_info" output=""/>
+        </block>
+    </xmlconnect_catalog_categorydetails>
+
     <!-- Product -->
 
     <xmlconnect_catalog_product>
@@ -74,10 +97,34 @@
                 <action method="addRenderer"><type>bundle</type><renderer>xmlconnect/catalog_product_options_bundle</renderer></action>
                 <action method="addRenderer"><type>grouped</type><renderer>xmlconnect/catalog_product_options_grouped</renderer></action>
                 <action method="addRenderer"><type>giftcard</type><renderer>xmlconnect/catalog_product_options_giftcard</renderer></action>
+                <action method="addRenderer"><type>downloadable</type><renderer>xmlconnect/catalog_product_options_downloadable</renderer></action>
             </block>
         </block>
     </xmlconnect_catalog_product>
 
+    <xmlconnect_catalog_productview>
+        <block type="xmlconnect/catalog_product" name="xmlconnect.catalog.product" output="toHtml">
+            <block type="xmlconnect/catalog_product_related" name="xmlconnect.product.related" as="related_products" output=""/>
+
+            <block type="xmlconnect/catalog_product_itemPrice" name="xmlconnect.catalog.product.price" as="product_price" output="">
+                <action method="addRenderer"><type>bundle</type><renderer>xmlconnect/catalog_product_itemPrice_bundle</renderer></action>
+                <action method="addRenderer"><type>giftcard</type><renderer>xmlconnect/catalog_product_itemPrice_giftcard</renderer></action>
+            </block>
+
+            <block type="xmlconnect/catalog_product_attributes" name="xmlconnect.catalog.product.attributes" as="additional_info" output="" />
+
+            <block type="xmlconnect/catalog_product_options" name="xmlconnect.catalog.product.options" output="">
+                <action method="addRenderer"><type>simple</type><renderer>xmlconnect/catalog_product_options_simple</renderer></action>
+                <action method="addRenderer"><type>virtual</type><renderer>xmlconnect/catalog_product_options_virtual</renderer></action>
+                <action method="addRenderer"><type>configurable</type><renderer>xmlconnect/catalog_product_options_configurable</renderer></action>
+                <action method="addRenderer"><type>bundle</type><renderer>xmlconnect/catalog_product_options_bundle</renderer></action>
+                <action method="addRenderer"><type>grouped</type><renderer>xmlconnect/catalog_product_options_grouped</renderer></action>
+                <action method="addRenderer"><type>giftcard</type><renderer>xmlconnect/catalog_product_options_giftcard</renderer></action>
+                <action method="addRenderer"><type>downloadable</type><renderer>xmlconnect/catalog_product_options_downloadable</renderer></action>
+            </block>
+        </block>
+    </xmlconnect_catalog_productview>
+
     <xmlconnect_catalog_productoptions>
         <block type="xmlconnect/catalog_product_options" name="xmlconnect.catalog.product.options" output="toHtml">
             <action method="addRenderer"><type>simple</type><renderer>xmlconnect/catalog_product_options_simple</renderer></action>
@@ -86,6 +133,7 @@
             <action method="addRenderer"><type>bundle</type><renderer>xmlconnect/catalog_product_options_bundle</renderer></action>
             <action method="addRenderer"><type>grouped</type><renderer>xmlconnect/catalog_product_options_grouped</renderer></action>
             <action method="addRenderer"><type>giftcard</type><renderer>xmlconnect/catalog_product_options_giftcard</renderer></action>
+            <action method="addRenderer"><type>downloadable</type><renderer>xmlconnect/catalog_product_options_downloadable</renderer></action>
         </block>
     </xmlconnect_catalog_productoptions>
 
@@ -114,6 +162,17 @@
         </block>
     </xmlconnect_catalog_search>
 
+    <xmlconnect_catalog_searchdetails>
+        <block type="xmlconnect/catalog_search" name="xmlconnect.catalog.search" output="toHtml">
+            <block type="xmlconnect/catalog_product_list" name="xmlconnect.catalog.product.list" as="product_list" output="">
+                <block type="xmlconnect/catalog_product_itemPrice" name="xmlconnect.catalog.product.price" as="product_price" output="">
+                    <action method="addRenderer"><type>bundle</type><renderer>xmlconnect/catalog_product_itemPrice_bundle</renderer></action>
+                    <action method="addRenderer"><type>giftcard</type><renderer>xmlconnect/catalog_product_itemPrice_giftcard</renderer></action>
+                </block>
+            </block>
+        </block>
+    </xmlconnect_catalog_searchdetails>
+
      <xmlconnect_catalog_searchsuggest>
         <block type="xmlconnect/catalog_search_suggest" name="xmlconnect.catalog.search.suggest" output="toHtml"/>
     </xmlconnect_catalog_searchsuggest>
@@ -121,11 +180,13 @@
     <!-- Shopping Cart -->
     <xmlconnect_cart_index>
         <block type="xmlconnect/cart" name="xmlconnect.cart" output="toHtml">
-            <action method="addItemRender"><type>simple</type><block>checkout/cart_item_renderer</block><template>checkout/cart/item/default.phtml</template></action>
-            <action method="addItemRender"><type>configurable</type><block>checkout/cart_item_renderer_configurable</block><template>checkout/cart/item/default.phtml</template></action>
-            <action method="addItemRender"><type>bundle</type><block>bundle/checkout_cart_item_renderer</block><template>checkout/cart/item/default.phtml</template></action>
-            <action method="addItemRender"><type>grouped</type><block>checkout/cart_item_renderer_grouped</block><template>checkout/cart/item/default.phtml</template></action>
-            <action method="addItemRender"><type>giftcard</type><block>enterprise_giftcard/checkout_cart_item_renderer</block><template>checkout/cart/item/default.phtml</template></action>
+            <action method="addItemRender"><type>simple</type><block>xmlconnect/checkout_cart_item_renderer</block><template></template></action>
+            <action method="addItemRender"><type>virtual</type><block>xmlconnect/checkout_cart_item_renderer</block><template></template></action>
+            <action method="addItemRender"><type>configurable</type><block>xmlconnect/checkout_cart_item_renderer_configurable</block><template></template></action>
+            <action method="addItemRender"><type>bundle</type><block>xmlconnect/checkout_cart_item_renderer_bundle</block><template></template></action>
+            <action method="addItemRender"><type>grouped</type><block>xmlconnect/checkout_cart_item_renderer_grouped</block><template></template></action>
+            <action method="addItemRender"><type>giftcard</type><block>xmlconnect/checkout_cart_item_renderer_giftcard</block><template></template></action>
+            <action method="addItemRender"><type>downloadable</type><block>xmlconnect/checkout_cart_item_renderer_downloadable</block><template></template></action>
 
             <block type="xmlconnect/cart_crosssell" name="xmlconnect.cart.crosssell" as="crosssell">
                 <block type="xmlconnect/catalog_product_price" name="xmlconnect.catalog.product.price" as="product_price" output="">
@@ -142,12 +203,45 @@
         </block>
     </xmlconnect_cart_info>
 
+    <xmlconnect_cart_shoppingcart>
+        <block type="xmlconnect/shoppingCart" name="xmlconnect.cart" output="toHtml">
+            <block type="xmlconnect/cart_items" name="xmlconnect.cart.items" as="items">
+                <action method="addItemRender"><type>simple</type><block>xmlconnect/checkout_cart_item_renderer</block><template></template></action>
+                <action method="addItemRender"><type>virtual</type><block>xmlconnect/checkout_cart_item_renderer</block><template></template></action>
+                <action method="addItemRender"><type>configurable</type><block>xmlconnect/checkout_cart_item_renderer_configurable</block><template></template></action>
+                <action method="addItemRender"><type>bundle</type><block>xmlconnect/checkout_cart_item_renderer_bundle</block><template></template></action>
+                <action method="addItemRender"><type>grouped</type><block>xmlconnect/checkout_cart_item_renderer_grouped</block><template></template></action>
+                <action method="addItemRender"><type>giftcard</type><block>xmlconnect/checkout_cart_item_renderer_giftcard</block><template></template></action>
+                <action method="addItemRender"><type>downloadable</type><block>xmlconnect/checkout_cart_item_renderer_downloadable</block><template></template></action>
+            </block>
+            <block type="xmlconnect/cart_crosssell" name="xmlconnect.cart.crosssell" as="crosssell">
+                <block type="xmlconnect/catalog_product_itemPrice" name="xmlconnect.catalog.product.price" as="product_price" output="">
+                    <action method="addRenderer"><type>bundle</type><renderer>xmlconnect/catalog_product_itemPrice_bundle</renderer></action>
+                    <action method="addRenderer"><type>giftcard</type><renderer>xmlconnect/catalog_product_itemPrice_giftcard</renderer></action>
+                </block>
+            </block>
+            <block type="xmlconnect/cart_cartTotals" name="xmlconnect.cart.totals" as="totals"/>
+        </block>
+    </xmlconnect_cart_shoppingcart>
+
+    <xmlconnect_cart_configure translate="label">
+        <label>Configure Cart Item</label>
+        <update handle="xmlconnect_catalog_product"/>
+        <reference name="product.info">
+            <block type="xmlconnect/cart_item_configure" name="checkout.cart.item.configure.block"/>
+        </reference>
+    </xmlconnect_cart_configure>
+
     <!-- Customer -->
 
     <xmlconnect_customer_form>
         <block type="xmlconnect/customer_form" name="xmlconnect.customer.form" output="toHtml"/>
     </xmlconnect_customer_form>
 
+    <xmlconnect_customer_checkoutregistration>
+        <block type="xmlconnect/customer_form" name="xmlconnect.customer.checkout.registration" output="toHtml"/>
+    </xmlconnect_customer_checkoutregistration>
+
     <xmlconnect_wishlist_index>
         <block type="xmlconnect/wishlist" name="xmlconnect.wishlist" output="toHtml">
             <block type="xmlconnect/catalog_product_price" name="xmlconnect.catalog.product.price" as="product_price" output="">
@@ -157,6 +251,15 @@
         </block>
     </xmlconnect_wishlist_index>
 
+    <xmlconnect_wishlist_details>
+        <block type="xmlconnect/wishlist" name="xmlconnect.wishlist" output="toHtml">
+                <block type="xmlconnect/catalog_product_itemPrice" name="xmlconnect.catalog.product.price" as="product_price" output="">
+                    <action method="addRenderer"><type>bundle</type><renderer>xmlconnect/catalog_product_itemPrice_bundle</renderer></action>
+                    <action method="addRenderer"><type>giftcard</type><renderer>xmlconnect/catalog_product_itemPrice_giftcard</renderer></action>
+                </block>
+        </block>
+    </xmlconnect_wishlist_details>
+
     <xmlconnect_customer_address>
         <block type="xmlconnect/customer_address_list" name="xmlconnect.customer.address.list" output="toHtml"/>
     </xmlconnect_customer_address>
@@ -170,15 +273,14 @@
     </xmlconnect_customer_orderlist>
 
     <xmlconnect_customer_orderdetails>
-        <block type="xmlconnect/customer_order_details" name="xmlconnect.customer.order.details" output="toHtml">
-            <block type="xmlconnect/customer_order_items" name="xmlconnect.customer.order.items" as="order_items" output="">
+        <block type="xmlconnect/customer_order_details" name="order.details" output="toHtml">
+            <block type="xmlconnect/customer_order_items" name="order.items" output="">
                 <action method="addItemRender"><type>default</type><block>xmlconnect/customer_order_item_renderer_default</block><template></template></action>
                 <action method="addItemRender"><type>grouped</type><block>xmlconnect/customer_order_item_renderer_grouped</block><template></template></action>
                 <action method="addItemRender"><type>bundle</type><block>xmlconnect/customer_order_item_renderer_bundle</block><template></template></action>
-                <action method="addItemRender"><type>downloadable</type><block>xmlconnect/customer_order_item_renderer_downloadable</block><template></template></action>
                 <action method="addItemRender"><type>giftcard</type><block>xmlconnect/customer_order_item_renderer_giftcard</block><template></template></action>
-
-                <block type="xmlconnect/customer_order_totals" name="xmlconnect.customer.order.totals" output="">
+                <action method="addItemRender"><type>downloadable</type><block>xmlconnect/customer_order_item_renderer_downloadable</block><template></template></action>
+                <block type="xmlconnect/customer_order_totals" name="order.totals" output="">
                     <block type="xmlconnect/customer_order_totals_tax" name="xmlconnect.customer.order.tax" output=""/>
                 </block>
             </block>
@@ -193,6 +295,10 @@
         <block type="xmlconnect/customer_giftcardCheck" name="xmlconnect.customer.giftcardCheck" output="toHtml"/>
     </xmlconnect_customer_giftcardcheck>
 
+    <xmlconnect_customer_downloads>
+        <block type="xmlconnect/customer_downloads" name="xmlconnect.customer.downloads" output="toHtml"/>
+    </xmlconnect_customer_downloads>
+
     <!-- Configuration -->
 
     <xmlconnect_configuration_index>
@@ -201,6 +307,13 @@
 
     <!-- Checkout (OnePage) -->
 
+    <xmlconnect_checkout_addressmassaction>
+        <block type="xmlconnect/checkout_onepage_address" name="xmlconnect.checkout.onepage.address" output="toHtml">
+            <block type="xmlconnect/checkout_onepage_address_list" name="xmlconnect.checkout.onepage.address.list" as="address_list" output=""/>
+            <block type="xmlconnect/checkout_onepage_address_form" name="xmlconnect.checkout.onepage.address.form" as="address_form" output=""/>
+        </block>
+    </xmlconnect_checkout_addressmassaction>
+
     <xmlconnect_checkout_index>
         <block type="xmlconnect/checkout_address_billing" name="xmlconnect.checkout.address.billing" output="toHtml">
             <block type="xmlconnect/customer_address_list" name="xmlconnect.customer.address.list" as="address_list" output=""/>
@@ -235,8 +348,12 @@
         <block type="xmlconnect/checkout_shipping_method_available" name="xmlconnect.checkout.shipping.method.available" output="toHtml"/>
     </xmlconnect_checkout_shippingmethods>
 
+    <xmlconnect_checkout_shippingmethodslist>
+        <block type="xmlconnect/checkout_shipping_method_availableList" name="xmlconnect.checkout.shipping.method.available" output="toHtml"/>
+    </xmlconnect_checkout_shippingmethodslist>
+
     <xmlconnect_checkout_paymentmethods>
-        <block type="xmlconnect/checkout_payment_method_list" name="xmlconnect.checkout.payment.method.list" output="toHtml">
+        <block type="xmlconnect/checkout_payment_method_list" name="payment.methods" output="">
             <block type="xmlconnect/checkout_payment_method_ccsave" name="xmlconnect.checkout.method.ccsave" as="payment_ccsave" output=""/>
             <block type="xmlconnect/checkout_payment_method_checkmo" name="xmlconnect.checkout.method.checkmo" as="payment_checkmo" output=""/>
             <block type="xmlconnect/checkout_payment_method_purchaseorder" name="xmlconnect.checkout.method.purchaseorder" as="payment_purchaseorder" output=""/>
@@ -246,14 +363,26 @@
         </block>
     </xmlconnect_checkout_paymentmethods>
 
+    <xmlconnect_checkout_paymentmethodlist>
+        <block type="xmlconnect/checkout_payment_method_listApi23" name="payment.methods" output="">
+            <block type="xmlconnect/checkout_payment_method_ccsave" name="xmlconnect.checkout.method.ccsave" as="payment_ccsave" output=""/>
+            <block type="xmlconnect/checkout_payment_method_checkmo" name="xmlconnect.checkout.method.checkmo" as="payment_checkmo" output=""/>
+            <block type="xmlconnect/checkout_payment_method_purchaseorder" name="xmlconnect.checkout.method.purchaseorder" as="payment_purchaseorder" output=""/>
+            <block type="xmlconnect/checkout_payment_method_paypal_payflow" name="xmlconnect.checkout.method.paypal.payflow" as="payment_paypal_payflow" output=""/>
+            <block type="xmlconnect/checkout_payment_method_paypal_direct" name="xmlconnect.checkout.method.paypal.direct" as="payment_paypal_direct" output=""/>
+            <block type="xmlconnect/checkout_payment_method_authorizenet" name="xmlconnect.checkout.method.authorizenet" as="payment_authorizenet" output=""/>
+        </block>
+    </xmlconnect_checkout_paymentmethodlist>
+
     <xmlconnect_checkout_orderreview>
         <block type="xmlconnect/checkout_order_review" name="xmlconnect.checkout.order.review" output="toHtml">
             <block type="xmlconnect/checkout_order_review_info" name="xmlconnect.checkout.order.info" as="order_products">
-                <action method="addItemRender"><type>default</type><block>checkout/cart_item_renderer</block><template>checkout/onepage/review/item.phtml</template></action>
-                <action method="addItemRender"><type>configurable</type><block>checkout/cart_item_renderer_configurable</block><template>checkout/onepage/review/item.phtml</template></action>
-                <action method="addItemRender"><type>bundle</type><block>bundle/checkout_cart_item_renderer</block><template>checkout/onepage/review/item.phtml</template></action>
-                <action method="addItemRender"><type>grouped</type><block>checkout/cart_item_renderer_grouped</block><template>checkout/onepage/review/item.phtml</template></action>
-                <action method="addItemRender"><type>giftcard</type><block>enterprise_giftcard/checkout_cart_item_renderer</block><template>checkout/onepage/review/item.phtml</template></action>
+                <action method="addItemRender"><type>default</type><block>xmlconnect/checkout_cart_item_renderer</block><template></template></action>
+                <action method="addItemRender"><type>configurable</type><block>xmlconnect/checkout_cart_item_renderer_configurable</block><template></template></action>
+                <action method="addItemRender"><type>bundle</type><block>xmlconnect/checkout_cart_item_renderer_bundle</block><template></template></action>
+                <action method="addItemRender"><type>grouped</type><block>xmlconnect/checkout_cart_item_renderer_grouped</block><template></template></action>
+                <action method="addItemRender"><type>giftcard</type><block>xmlconnect/checkout_cart_item_renderer_giftcard</block><template></template></action>
+                <action method="addItemRender"><type>downloadable</type><block>xmlconnect/checkout_cart_item_renderer_downloadable</block><template></template></action>
             </block>
 
             <block type="xmlconnect/cart_totals" name="xmlconnect.checkout.order.review.totals" as="totals"/>
@@ -261,6 +390,22 @@
         </block>
     </xmlconnect_checkout_orderreview>
 
+    <xmlconnect_checkout_ordersummary>
+        <block type="xmlconnect/checkout_onepage_review" name="xmlconnect.order.details" output="toHtml">
+            <block type="xmlconnect/cart_items" name="xmlconnect.cart.items" as="items">
+                <action method="addItemRender"><type>simple</type><block>xmlconnect/checkout_cart_item_renderer</block><template></template></action>
+                <action method="addItemRender"><type>virtual</type><block>xmlconnect/checkout_cart_item_renderer</block><template></template></action>
+                <action method="addItemRender"><type>configurable</type><block>xmlconnect/checkout_cart_item_renderer_configurable</block><template></template></action>
+                <action method="addItemRender"><type>bundle</type><block>xmlconnect/checkout_cart_item_renderer_bundle</block><template></template></action>
+                <action method="addItemRender"><type>grouped</type><block>xmlconnect/checkout_cart_item_renderer_grouped</block><template></template></action>
+                <action method="addItemRender"><type>giftcard</type><block>xmlconnect/checkout_cart_item_renderer_giftcard</block><template></template></action>
+                <action method="addItemRender"><type>downloadable</type><block>xmlconnect/checkout_cart_item_renderer_downloadable</block><template></template></action>
+            </block>
+            <block type="xmlconnect/cart_cartTotals" name="xmlconnect.cart.totals" as="totals"/>
+            <block type="xmlconnect/checkout_agreements" name="xmlconnect.checkout.agreements" as="agreements" output=""/>
+        </block>
+    </xmlconnect_checkout_ordersummary>
+
     <!-- Checkout with PayPal MEP -->
 
     <xmlconnect_paypal_mep_shippingmethods>
@@ -281,9 +426,22 @@
                 <action method="addItemRender"><type>configurable</type><block>xmlconnect/cart_item_renderer_configurable</block><template></template></action>
                 <block type="xmlconnect/cart_totals" name="xmlconnect.cart.totals" as="totals"/>
             </block>
+            <block type="xmlconnect/checkout_agreements" name="xmlconnect.checkout.agreements" as="agreements" output=""/>
         </block>
     </xmlconnect_paypal_mecl_review>
 
+    <xmlconnect_paypal_mecl_orderreview>
+        <block type="xmlconnect/cart_paypal_mecl_review" name="xmlconnect.cart.paypal.mecl.review" output="toHtml">
+            <block type="xmlconnect/cart_paypal_mecl_orderDetails" name="xmlconnect.cart.paypal.mecl.details" as="details">
+                <action method="addItemRender"><type>default</type><block>xmlconnect/cart_item_renderer</block><template></template></action>
+                <action method="addItemRender"><type>grouped</type><block>xmlconnect/cart_item_renderer_grouped</block><template></template></action>
+                <action method="addItemRender"><type>configurable</type><block>xmlconnect/cart_item_renderer_configurable</block><template></template></action>
+                <block type="xmlconnect/cart_cartTotals" name="xmlconnect.cart.totals" as="totals"/>
+            </block>
+            <block type="xmlconnect/checkout_agreements" name="xmlconnect.checkout.agreements" as="agreements" output=""/>
+        </block>
+    </xmlconnect_paypal_mecl_orderreview>
+
     <xmlconnect_paypal_mecl_shippingmethods>
         <block type="xmlconnect/cart_paypal_mecl_shippingmethods" name="xmlconnect.cart.paypal.mecl.shippingmethods" output="toHtml"></block>
     </xmlconnect_paypal_mecl_shippingmethods>
diff --git a/app/design/frontend/base/default/template/bundle/catalog/product/list/partof.phtml b/app/design/frontend/base/default/template/bundle/catalog/product/list/partof.phtml
index 3404c267586..0e5e363bac7 100644
--- a/app/design/frontend/base/default/template/bundle/catalog/product/list/partof.phtml
+++ b/app/design/frontend/base/default/template/bundle/catalog/product/list/partof.phtml
@@ -35,8 +35,8 @@
         <?php for($_j=0;$_j<$this->getColumnCount();$_j++): ?>
             <?php if($_bundle=$this->getIterableItem()): ?>
             <td>
-                <a href="<?php echo $_bundle->getProductUrl() ?>" title="<?php echo $this->htmlEscape($_bundle->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_bundle, 'small_image')->resize(125) ?>" width="125" height="125" alt="<?php echo $this->htmlEscape($_bundle->getName()) ?>" /></a>
-                <h3 class="product-name"><a href="<?php echo $_bundle->getProductUrl() ?>"><?php echo $this->htmlEscape($_bundle->getName()) ?></a></h3>
+                <a href="<?php echo $_bundle->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_bundle->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_bundle, 'small_image')->resize(125) ?>" width="125" height="125" alt="<?php echo $this->escapeHtml($_bundle->getName()) ?>" /></a>
+                <h3 class="product-name"><a href="<?php echo $_bundle->getProductUrl() ?>"><?php echo $this->escapeHtml($_bundle->getName()) ?></a></h3>
                 <?php echo $this->getPriceHtml($_bundle, true) ?>
                 <?php echo $this->getReviewsSummaryHtml($_bundle) ?>
             </td>
diff --git a/app/design/frontend/base/default/template/bundle/catalog/product/price.phtml b/app/design/frontend/base/default/template/bundle/catalog/product/price.phtml
index 440f0f5bddc..c5209d8daf7 100644
--- a/app/design/frontend/base/default/template/bundle/catalog/product/price.phtml
+++ b/app/design/frontend/base/default/template/bundle/catalog/product/price.phtml
@@ -24,32 +24,49 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<?php $_product     = $this->getProduct() ?>
-<?php $_priceModel  = $_product->getPriceModel() ?>
-<?php list($_minimalPriceTax, $_maximalPriceTax) = $_priceModel->getTotalPrices($_product, null, null, false) ?>
-<?php list($_minimalPriceInclTax, $_maximalPriceInclTax) = $_priceModel->getTotalPrices($_product, null, true, false) ?>
-<?php $_id = $_product->getId() ?>
+<?php
+/**
+ * @var $this Mage_Bundle_Block_Catalog_Product_Price
+ */
+/**
+ * @var $_coreHelper Mage_Core_Helper_Data
+ * @var $_weeeHelper Mage_Weee_Helper_Data
+ * @var $_taxHelper Mage_Tax_Helper_Data
+ */
+$_coreHelper = $this->helper('core');
+$_weeeHelper = $this->helper('weee');
+$_taxHelper  = $this->helper('tax');
+
+/**
+ * @var $_product Mage_Catalog_Model_Product
+ * @var $_priceModel Mage_Bundle_Model_Product_Price
+ */
+$_product     = $this->getProduct();
+$_priceModel  = $_product->getPriceModel();
 
-<?php $_weeeTaxAmount = 0; ?>
+list($_minimalPriceTax, $_maximalPriceTax) = $_priceModel->getTotalPrices($_product, null, null, false);
+list($_minimalPriceInclTax, $_maximalPriceInclTax) = $_priceModel->getTotalPrices($_product, null, true, false);
 
+$_weeeTaxAmount = 0;
+?>
 <?php
 if ($_product->getPriceType() == 1) {
-    $_weeeTaxAmount = Mage::helper('weee')->getAmount($_product);
+    $_weeeTaxAmount = $_weeeHelper->getAmount($_product);
     $_weeeTaxAmountInclTaxes = $_weeeTaxAmount;
-    if (Mage::helper('weee')->isTaxable()) {
-        $_attributes = Mage::helper('weee')->getProductWeeeAttributesForRenderer($_product, null, null, null, true);
-        $_weeeTaxAmountInclTaxes = Mage::helper('weee')->getAmountInclTaxes($_attributes);
+    if ($_weeeHelper->isTaxable()) {
+        $_attributes = $_weeeHelper->getProductWeeeAttributesForRenderer($_product, null, null, null, true);
+        $_weeeTaxAmountInclTaxes = $_weeeHelper->getAmountInclTaxes($_attributes);
     }
-    if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) {
+    if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, array(0, 1, 4))) {
         $_minimalPriceTax += $_weeeTaxAmount;
         $_minimalPriceInclTax += $_weeeTaxAmountInclTaxes;
     }
-    if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) {
+    if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 2)) {
         $_minimalPriceInclTax += $_weeeTaxAmountInclTaxes;
     }
 
-    if (Mage::helper('weee')->typeOfDisplay($_product, array(1, 2, 4))) {
-        $_weeeTaxAttributes = Mage::helper('weee')->getProductWeeeAttributesForDisplay($_product);
+    if ($_weeeHelper->typeOfDisplay($_product, array(1, 2, 4))) {
+        $_weeeTaxAttributes = $_weeeHelper->getProductWeeeAttributesForDisplay($_product);
     }
 }
 ?>
@@ -60,47 +77,51 @@ if ($_product->getPriceType() == 1) {
                 <span class="price-label"><?php echo $this->__('As low as') ?>:</span>
                 <?php if ($this->displayBothPrices()): ?>
                     <span class="price-excluding-tax">
-                        <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
-                        <?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
+                        <span class="label"><?php echo $_taxHelper->__('Excl. Tax:') ?></span>
+                        <?php echo $_coreHelper->currency($_minimalPriceTax) ?>
                     </span>
-                    <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
+                    <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
                         <span class="weee">(<small>
                             <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
-                                <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
+                                <?php if ($_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
                                     <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
                                 <?php else: ?>
                                     <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
                                 <?php endif; ?>
 
                                 <?php echo $_weeeSeparator; ?>
-                                <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
+                                <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($amount, true, true); ?>
                                 <?php $_weeeSeparator = ' + '; ?>
                             <?php endforeach; ?>
                         </small>)</span>
                     <?php endif; ?>
                     <span class="price-including-tax">
-                        <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
-                        <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
+                        <span class="label"><?php echo $_taxHelper->__('Incl. Tax:') ?></span>
+                        <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
                     </span>
             <?php else: ?>
-                <?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
-                <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
+                <?php if ($_taxHelper->displayPriceIncludingTax()): ?>
+                    <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
+                <?php else: ?>
+                    <?php echo $_coreHelper->currency($_minimalPriceTax) ?>
+                <?php endif; ?>
+                <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
                     <span class="weee">(<small>
                         <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
-                            <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
+                            <?php if ($_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
                                 <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
                             <?php else: ?>
                                 <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
                             <?php endif; ?>
 
                             <?php echo $_weeeSeparator; ?>
-                            <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
+                            <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($amount, true, true); ?>
                             <?php $_weeeSeparator = ' + '; ?>
                         <?php endforeach; ?>
                     </small>)</span>
                 <?php endif; ?>
-                <?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
-                    <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
+                <?php if ($_weeeHelper->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
+                    <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
                 <?php endif; ?>
             <?php endif; ?>
             </p>
@@ -110,57 +131,61 @@ if ($_product->getPriceType() == 1) {
                 <span class="price-label"><?php echo $this->__('From') ?>:</span>
                 <?php if ($this->displayBothPrices()): ?>
                     <span class="price-excluding-tax">
-                        <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
-                        <?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
+                        <span class="label"><?php echo $_taxHelper->__('Excl. Tax:') ?></span>
+                        <?php echo $_coreHelper->currency($_minimalPriceTax) ?>
                     </span>
-                    <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
+                    <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
                         <span class="weee">(<small>
                             <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
-                                <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
+                                <?php if ($_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
                                     <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
                                 <?php else: ?>
                                     <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
                                 <?php endif; ?>
 
                                 <?php echo $_weeeSeparator; ?>
-                                <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
+                                <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($amount, true, true); ?>
                                 <?php $_weeeSeparator = ' + '; ?>
                             <?php endforeach; ?>
                         </small>)</span>
                     <?php endif; ?>
                     <span class="price-including-tax">
-                        <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
-                        <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
+                        <span class="label"><?php echo $_taxHelper->__('Incl. Tax:') ?></span>
+                        <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
                     </span>
                 <?php else: ?>
-                    <?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
-                    <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
+                    <?php if ($_taxHelper->displayPriceIncludingTax()) : ?>
+                        <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
+                    <?php else: ?>
+                        <?php echo $_coreHelper->currency($_minimalPriceTax) ?>
+                    <?php endif; ?>
+                    <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
                         <span class="weee">(<small>
                             <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
-                                <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
+                                <?php if ($_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
                                     <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
                                 <?php else: ?>
                                     <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
                                 <?php endif; ?>
 
                                 <?php echo $_weeeSeparator; ?>
-                                <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
+                                <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($amount, true, true); ?>
                                 <?php $_weeeSeparator = ' + '; ?>
                             <?php endforeach; ?>
                         </small>)</span>
                     <?php endif; ?>
-                    <?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
-                        <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
+                    <?php if ($_weeeHelper->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
+                        <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
                     <?php endif; ?>
                 <?php endif; ?>
             </p>
                 <?php
                     if ($_product->getPriceType() == 1) {
-                        if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) {
+                        if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, array(0, 1, 4))) {
                             $_maximalPriceTax += $_weeeTaxAmount;
                             $_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
                         }
-                        if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) {
+                        if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 2)) {
                             $_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
                         }
                     }
@@ -169,94 +194,98 @@ if ($_product->getPriceType() == 1) {
                     <span class="price-label"><?php echo $this->__('To') ?>:</span>
                     <?php if ($this->displayBothPrices()): ?>
                         <span class="price-excluding-tax">
-                            <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
-                            <?php echo Mage::helper('core')->currency($_maximalPriceTax) ?>
+                            <span class="label"><?php echo $_taxHelper->__('Excl. Tax:') ?></span>
+                            <?php echo $_coreHelper->currency($_maximalPriceTax) ?>
                         </span>
-                        <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
+                        <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
                             <span class="weee">(<small>
                                 <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
-                                    <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
+                                    <?php if ($_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
                                         <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
                                     <?php else: ?>
                                         <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
                                     <?php endif; ?>
 
                                     <?php echo $_weeeSeparator; ?>
-                                    <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
+                                    <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($amount, true, true); ?>
                                     <?php $_weeeSeparator = ' + '; ?>
                                 <?php endforeach; ?>
                             </small>)</span>
                         <?php endif; ?>
                         <span class="price-including-tax">
-                            <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax') ?></span>
-                            <?php echo Mage::helper('core')->currency($_maximalPriceInclTax) ?>
+                            <span class="label"><?php echo $_taxHelper->__('Incl. Tax') ?></span>
+                            <?php echo $_coreHelper->currency($_maximalPriceInclTax) ?>
                         </span>
                     <?php else: ?>
-                        <?php echo Mage::helper('core')->currency($_maximalPriceTax) ?>
-                        <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
+                    <?php if ($_taxHelper->displayPriceIncludingTax()) : ?>
+                        <?php echo $_coreHelper->currency($_maximalPriceInclTax) ?>
+                    <?php else: ?>
+                        <?php echo $_coreHelper->currency($_maximalPriceTax) ?>
+                    <?php endif; ?>
+                        <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
                             <span class="weee">(<small>
                                 <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
-                                    <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
+                                    <?php if ($_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
                                         <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
                                     <?php else: ?>
                                         <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
                                     <?php endif; ?>
 
                                     <?php echo $_weeeSeparator; ?>
-                                    <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
+                                    <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($amount, true, true); ?>
                                     <?php $_weeeSeparator = ' + '; ?>
                                 <?php endforeach; ?>
                             </small>)</span>
                         <?php endif; ?>
-                        <?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
-                            <?php echo Mage::helper('core')->currency($_maximalPriceInclTax) ?>
+                        <?php if ($_weeeHelper->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
+                            <?php echo $_coreHelper->currency($_maximalPriceInclTax) ?>
                         <?php endif; ?>
                     <?php endif; ?>
                 </p>
             <?php else: ?>
                 <?php if ($this->displayBothPrices()): ?>
                     <span class="price-excluding-tax">
-                        <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
-                        <?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
+                        <span class="label"><?php echo $_taxHelper->__('Excl. Tax:') ?></span>
+                        <?php echo $_coreHelper->currency($_minimalPriceTax) ?>
                     </span>
-                    <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
+                    <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
                         <span class="weee">(<small>
                             <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
-                                <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
+                                <?php if ($_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
                                     <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
                                 <?php else: ?>
                                     <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
                                 <?php endif; ?>
 
                                 <?php echo $_weeeSeparator; ?>
-                                <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
+                                <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($amount, true, true); ?>
                                 <?php $_weeeSeparator = ' + '; ?>
                             <?php endforeach; ?>
                         </small>)</span>
                     <?php endif; ?>
                     <span class="price-including-tax">
-                        <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
-                        <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
+                        <span class="label"><?php echo $_taxHelper->__('Incl. Tax:') ?></span>
+                        <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
                     </span>
                 <?php else: ?>
-                    <?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
-                    <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
+                    <?php echo $_coreHelper->currency($_minimalPriceTax) ?>
+                    <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
                         <span class="weee">(<small>
                             <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
-                                <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
+                                <?php if ($_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
                                     <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
                                 <?php else: ?>
                                     <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
                                 <?php endif; ?>
 
                                 <?php echo $_weeeSeparator; ?>
-                                <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
+                                <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($amount, true, true); ?>
                                 <?php $_weeeSeparator = ' + '; ?>
                             <?php endforeach; ?>
                         </small>)</span>
                     <?php endif; ?>
-                    <?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
-                        <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
+                    <?php if ($_weeeHelper->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
+                        <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
                     <?php endif; ?>
                 <?php endif; ?>
             <?php endif; ?>
diff --git a/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle.phtml b/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle.phtml
index ac76d7271d8..b7fb9e24e21 100644
--- a/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle.phtml
+++ b/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle.phtml
@@ -34,10 +34,12 @@
 //]]>
 </script>
 <?php endif; ?>
-<?php if ($_product->isAvailable()): ?>
-    <p class="availability in-stock"><?php echo $this->helper('catalog')->__('Availability:') ?> <span><?php echo $this->helper('catalog')->__('In stock') ?></span></p>
-<?php else: ?>
-    <p class="availability out-of-stock"><?php echo $this->helper('catalog')->__('Availability:') ?> <span><?php echo $this->helper('catalog')->__('Out of stock') ?></span></p>
+<?php if ($this->displayProductStockStatus()): ?>
+    <?php if ($_product->isAvailable()): ?>
+        <p class="availability in-stock"><?php echo $this->helper('catalog')->__('Availability:') ?> <span><?php echo $this->helper('catalog')->__('In stock') ?></span></p>
+    <?php else: ?>
+        <p class="availability out-of-stock"><?php echo $this->helper('catalog')->__('Availability:') ?> <span><?php echo $this->helper('catalog')->__('Out of stock') ?></span></p>
+    <?php endif; ?>
 <?php endif; ?>
 <div class="price-box-bundle">
     <?php echo $this->getPriceHtml($_product) ?>
diff --git a/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/checkbox.phtml b/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/checkbox.phtml
index d6d3cba34ad..1545d2d9a8b 100644
--- a/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/checkbox.phtml
+++ b/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/checkbox.phtml
@@ -29,7 +29,7 @@
 <?php /* @var $this Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Checkbox */ ?>
 <?php $_option = $this->getOption() ?>
 <?php $_selections = $_option->getSelections() ?>
-<dt><label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->htmlEscape($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label></dt>
+<dt><label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->escapeHtml($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label></dt>
 <dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
     <div class="input-box">
     <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
diff --git a/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/multi.phtml b/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/multi.phtml
index 58870fb4a4f..4545f118c33 100644
--- a/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/multi.phtml
+++ b/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/multi.phtml
@@ -29,7 +29,7 @@
 <?php /* @var $this Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Multi */ ?>
 <?php $_option = $this->getOption() ?>
 <?php $_selections = $_option->getSelections() ?>
-<dt><label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->htmlEscape($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label></dt>
+<dt><label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->escapeHtml($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label></dt>
 <dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
     <div class="input-box">
     <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
diff --git a/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml b/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml
index e35a5a3e1ca..8dce988da8d 100644
--- a/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml
+++ b/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml
@@ -31,14 +31,19 @@
 <?php $_selections  = $_option->getSelections(); ?>
 <?php $_default     = $_option->getDefaultSelection(); ?>
 <?php list($_defaultQty, $_canChangeQty) = $this->_getDefaultValues(); ?>
+<?php $tierPriceHtml = ''; ?>
 
 <dt>
-    <label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->htmlEscape($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label>
+    <label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->escapeHtml($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label>
 </dt>
 <dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
     <div class="input-box">
-    <?php if ($this->_showSingle()): ?>
-        <?php echo $this->getSelectionTitlePrice($_selections[0]) ?>
+        <?php /** @var $_selection Mage_Catalog_Model_Product*/ ?>
+        <?php if ($this->_showSingle()): ?>
+            <?php echo $this->getSelectionTitlePrice($_selections[0]); ?>
+            <?php if ($_selections[0]->getSelectionCanChangeQty()): ?>
+                <?php $tierPriceHtml = $this->getTierPriceHtml($_selections[0]); ?>
+        <?php endif; ?>
         <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>" />
     <?php else:?>
         <ul class="options-list">
@@ -48,6 +53,9 @@
             </li>
         <?php endif; ?>
         <?php foreach ($_selections as $_selection): ?>
+            <?php if ($_selection->getSelectionCanChangeQty() && $this->_isSelected($_selection)): ?>
+                <?php $tierPriceHtml = $this->getTierPriceHtml($_selection); ?>
+            <?php endif; ?>
             <li><input type="radio" onclick="bundle.changeSelection(this)" class="radio<?php echo $_option->getRequired()?' validate-one-required-by-name':'' ?> change-container-classname" id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]"<?php if ($this->_isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>value="<?php echo $_selection->getSelectionId() ?>"/>
             <span class="label"><label for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"><?php echo $this->getSelectionTitlePrice($_selection) ?></label></span>
             <?php if ($_option->getRequired()): ?>
@@ -59,6 +67,7 @@
         <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
     <?php endif; ?>
     </div>
+    <span id="bundle-option-<?php echo $_option->getId() ?>-tier-prices"> <?php echo $tierPriceHtml; ?></span>
     <span class="qty-holder">
         <label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->__('Qty:') ?>&nbsp;</label><input onkeyup="bundle.changeOptionQty(this, event)" onblur="bundle.changeOptionQty(this, event)" <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>"/>
     </span>
diff --git a/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml b/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml
index f1ea3024a1a..5d59a3872ff 100644
--- a/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml
+++ b/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml
@@ -31,24 +31,33 @@
 <?php $_selections  = $_option->getSelections(); ?>
 <?php $_default     = $_option->getDefaultSelection(); ?>
 <?php list($_defaultQty, $_canChangeQty) = $this->_getDefaultValues(); ?>
+<?php $tierPriceHtml = ''; ?>
 
 <dt>
-    <label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->htmlEscape($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label>
+    <label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->escapeHtml($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label>
 </dt>
 <dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
     <div class="input-box">
+    <?php /** @var $_selection Mage_Catalog_Model_Product*/ ?>
     <?php if ($this->_showSingle()): ?>
-        <?php echo $this->getSelectionTitlePrice($_selections[0]) ?>
+        <?php echo $this->getSelectionTitlePrice($_selections[0]); ?>
+        <?php if ($_selections[0]->getSelectionCanChangeQty()): ?>
+            <?php $tierPriceHtml = $this->getTierPriceHtml($_selections[0]); ?>
+        <?php endif; ?>
         <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>"/>
     <?php else:?>
         <select onchange="bundle.changeSelection(this)" id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]" class="bundle-option-<?php echo $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> bundle-option-select change-container-classname">
             <option value=""><?php echo $this->__('Choose a selection...') ?></option>
         <?php foreach ($_selections as $_selection): ?>
+            <?php if ($_selection->getSelectionCanChangeQty() && $this->_isSelected($_selection)): ?>
+                <?php $tierPriceHtml = $this->getTierPriceHtml($_selection); ?>
+            <?php endif; ?>
             <option value="<?php echo $_selection->getSelectionId() ?>"<?php if ($this->_isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>><?php echo $this->getSelectionTitlePrice($_selection, false) ?></option>
         <?php endforeach; ?>
         </select>
     <?php endif; ?>
     </div>
+    <span id="bundle-option-<?php echo $_option->getId() ?>-tier-prices"> <?php echo $tierPriceHtml; ?></span>
     <span class="qty-holder">
         <label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->__('Qty:') ?>&nbsp;</label><input onkeyup="bundle.changeOptionQty(this, event)" onblur="bundle.changeOptionQty(this, event)" <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>"/>
     </span>
diff --git a/app/design/frontend/base/default/template/bundle/email/order/items/creditmemo/default.phtml b/app/design/frontend/base/default/template/bundle/email/order/items/creditmemo/default.phtml
index 8d2d217de9e..a4663e9d93d 100644
--- a/app/design/frontend/base/default/template/bundle/email/order/items/creditmemo/default.phtml
+++ b/app/design/frontend/base/default/template/bundle/email/order/items/creditmemo/default.phtml
@@ -53,11 +53,11 @@
 <?php endif; ?>
 <tr id="order-item-row-<?php echo $_item->getId() ?>">
     <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-    <td align="left" valign="top" style="padding:3px 9px"><strong><?php echo $this->htmlEscape($_item->getName()) ?></strong></td>
+    <td align="left" valign="top" style="padding:3px 9px"><strong><?php echo $this->escapeHtml($_item->getName()) ?></strong></td>
     <?php else: ?>
     <td align="left" valign="top" style="padding:3px 19px"><?php echo $this->getValueHtml($_item)?></td>
     <?php endif; ?>
-    <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->htmlEscape($_item->getSku()) ?></td>
+    <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($_item->getSku()) ?></td>
     <td align="center" valign="top" style="padding:3px 9px">
         <?php if ($this->canShowPriceInfo($_item)): ?>
             <?php echo $_item->getQty()*1 ?>
@@ -159,7 +159,7 @@
             <?php endforeach; ?>
         </dl>
         <?php endif; ?>
-        <?php echo $this->htmlEscape($_item->getDescription()) ?>
+        <?php echo $this->escapeHtml($_item->getDescription()) ?>
     </td>
     <td>&nbsp;</td>
     <td>&nbsp;</td>
diff --git a/app/design/frontend/base/default/template/bundle/email/order/items/invoice/default.phtml b/app/design/frontend/base/default/template/bundle/email/order/items/invoice/default.phtml
index 1b5b9b2e56a..6b7d6cc0032 100644
--- a/app/design/frontend/base/default/template/bundle/email/order/items/invoice/default.phtml
+++ b/app/design/frontend/base/default/template/bundle/email/order/items/invoice/default.phtml
@@ -54,11 +54,11 @@
 <?php endif; ?>
 <tr id="order-item-row-<?php echo $_item->getId() ?>">
     <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-    <td align="left" valign="top" style="padding:3px 9px"><strong><?php echo $this->htmlEscape($_item->getName()) ?></strong></td>
+    <td align="left" valign="top" style="padding:3px 9px"><strong><?php echo $this->escapeHtml($_item->getName()) ?></strong></td>
     <?php else: ?>
     <td align="left" valign="top" style="padding:3px 19px"><?php echo $this->getValueHtml($_item)?></td>
     <?php endif; ?>
-    <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->htmlEscape($_item->getSku()) ?></td>
+    <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($_item->getSku()) ?></td>
     <td align="center" valign="top" style="padding:3px 9px">
         <?php if ($this->canShowPriceInfo($_item)): ?>
             <?php echo $_item->getQty()*1 ?>
@@ -160,7 +160,7 @@
             <?php endforeach; ?>
         </dl>
         <?php endif; ?>
-        <?php echo $this->htmlEscape($_item->getDescription()) ?>
+        <?php echo $this->escapeHtml($_item->getDescription()) ?>
     </td>
     <td>&nbsp;</td>
     <td>&nbsp;</td>
diff --git a/app/design/frontend/base/default/template/bundle/email/order/items/order/default.phtml b/app/design/frontend/base/default/template/bundle/email/order/items/order/default.phtml
index 4f16505f4f6..6c12a481009 100644
--- a/app/design/frontend/base/default/template/bundle/email/order/items/order/default.phtml
+++ b/app/design/frontend/base/default/template/bundle/email/order/items/order/default.phtml
@@ -54,11 +54,11 @@
 <?php endif; ?>
 <tr id="order-item-row-<?php echo $_item->getId() ?>">
     <?php if (!$_item->getParentItem()): ?>
-    <td align="left" valign="top" style="padding:3px 9px"><strong><?php echo $this->htmlEscape($_item->getName()) ?></strong></td>
+    <td align="left" valign="top" style="padding:3px 9px"><strong><?php echo $this->escapeHtml($_item->getName()) ?></strong></td>
     <?php else: ?>
     <td align="left" valign="top" style="padding:3px 19px"><?php echo $this->getValueHtml($_item)?></td>
     <?php endif; ?>
-    <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->htmlEscape($_item->getSku()) ?></td>
+    <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($_item->getSku()) ?></td>
     <td align="center" valign="top" style="padding:3px 9px">
     <?php if (!$_item->getParentItem()): ?>
         <?php echo $_item->getQtyOrdered()*1 ?>
@@ -162,9 +162,9 @@
         <?php endif; ?>
         <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('giftmessage/message')->getGiftMessage($_item->getGiftMessageId())): ?>
         <br /><strong><?php echo $this->__('Gift Message') ?></strong>
-        <br /><?php echo $this->__('From:'); ?> <?php echo $this->htmlEscape($_giftMessage->getSender()) ?>
-        <br /><?php echo $this->__('To:'); ?> <?php echo $this->htmlEscape($_giftMessage->getRecipient()) ?>
-        <br /><?php echo $this->__('Message:'); ?><br /> <?php echo $this->htmlEscape($_giftMessage->getMessage()) ?>
+        <br /><?php echo $this->__('From:'); ?> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?>
+        <br /><?php echo $this->__('To:'); ?> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?>
+        <br /><?php echo $this->__('Message:'); ?><br /> <?php echo $this->escapeHtml($_giftMessage->getMessage()) ?>
         <?php endif; ?>
     </td>
     <td>&nbsp;</td>
diff --git a/app/design/frontend/base/default/template/bundle/email/order/items/shipment/default.phtml b/app/design/frontend/base/default/template/bundle/email/order/items/shipment/default.phtml
index 0f2ae132864..9a599224d96 100644
--- a/app/design/frontend/base/default/template/bundle/email/order/items/shipment/default.phtml
+++ b/app/design/frontend/base/default/template/bundle/email/order/items/shipment/default.phtml
@@ -52,11 +52,11 @@
 <?php endif; ?>
 <tr id="order-item-row-<?php echo $_item->getId() ?>">
     <?php if (!$_item->getParentItem()): ?>
-    <td align="left" valign="top" style="padding:3px 9px"><strong><?php echo $this->htmlEscape($_item->getName()) ?></strong></td>
+    <td align="left" valign="top" style="padding:3px 9px"><strong><?php echo $this->escapeHtml($_item->getName()) ?></strong></td>
     <?php else: ?>
     <td align="left" valign="top" style="padding:3px 19px"><?php echo $this->getValueHtml($_item) ?></td>
     <?php endif; ?>
-    <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->htmlEscape($_item->getSku()) ?></td>
+    <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($_item->getSku()) ?></td>
     <td align="center" valign="top" style="padding:3px 9px">
         <?php if (($this->isShipmentSeparately() && $_item->getParentItem()) || (!$this->isShipmentSeparately() && !$_item->getParentItem())): ?>
             <?php if (isset($shipItems[$_item->getId()])): ?>
@@ -84,7 +84,7 @@
             <?php endforeach; ?>
         </dl>
         <?php endif; ?>
-        <?php echo $this->htmlEscape($_item->getDescription()) ?>
+        <?php echo $this->escapeHtml($_item->getDescription()) ?>
     </td>
     <td>&nbsp;</td>
     <td>&nbsp;</td>
diff --git a/app/design/frontend/base/default/template/bundle/sales/order/creditmemo/items/renderer.phtml b/app/design/frontend/base/default/template/bundle/sales/order/creditmemo/items/renderer.phtml
index 6677c72a23e..71a583fe927 100644
--- a/app/design/frontend/base/default/template/bundle/sales/order/creditmemo/items/renderer.phtml
+++ b/app/design/frontend/base/default/template/bundle/sales/order/creditmemo/items/renderer.phtml
@@ -58,12 +58,12 @@
 <?php endif; ?>
 <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
     <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-    <td><h4 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h4>
+    <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
     </td>
     <?php else: ?>
     <td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
     <?php endif; ?>
-    <td><?php echo $this->htmlEscape($_item->getSku()) ?></td>
+    <td><?php echo $this->escapeHtml($_item->getSku()) ?></td>
     <td class="a-right">
         <?php if ($this->canShowPriceInfo($_item)): ?>
         <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
@@ -293,7 +293,7 @@
         <?php if($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
         <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <?php if (!$this->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
@@ -301,19 +301,19 @@
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
                     <div class="truncated_full_value">
                         <dl class="item-options">
-                            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                             <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
                         </dl>
                     </div>
                     <?php endif; ?>
                 </dd>
             <?php else: ?>
-                <dd><?php echo $this->htmlEscape( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
+                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
             <?php endif; ?>
         <?php endforeach; ?>
         </dl>
         <?php endif; ?>
-        <?php echo $this->htmlEscape($_item->getDescription()) ?>
+        <?php echo $this->escapeHtml($_item->getDescription()) ?>
         <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
             <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $parentItem->getId() ?>')"><?php echo Mage::helper('sales')->__('Gift Message') ?></a>
         <?php endif; ?>
diff --git a/app/design/frontend/base/default/template/bundle/sales/order/invoice/items/renderer.phtml b/app/design/frontend/base/default/template/bundle/sales/order/invoice/items/renderer.phtml
index 5ae806234d1..be1e4294d8e 100644
--- a/app/design/frontend/base/default/template/bundle/sales/order/invoice/items/renderer.phtml
+++ b/app/design/frontend/base/default/template/bundle/sales/order/invoice/items/renderer.phtml
@@ -56,11 +56,11 @@
 <?php endif; ?>
 <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
     <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-    <td><h4 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h4></td>
+    <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4></td>
     <?php else: ?>
     <td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
     <?php endif; ?>
-    <td><?php echo $this->htmlEscape($_item->getSku()) ?></td>
+    <td><?php echo $this->escapeHtml($_item->getSku()) ?></td>
     <td class="a-right">
         <?php if ($this->canShowPriceInfo($_item)): ?>
         <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
@@ -319,7 +319,7 @@
         <?php if($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
         <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <?php if (!$this->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
@@ -327,19 +327,19 @@
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
                     <div class="truncated_full_value">
                         <dl class="item-options">
-                            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                             <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
                         </dl>
                     </div>
                     <?php endif; ?>
                 </dd>
             <?php else: ?>
-                <dd><?php echo $this->htmlEscape( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
+                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
             <?php endif; ?>
         <?php endforeach; ?>
         </dl>
         <?php endif; ?>
-        <?php echo $this->htmlEscape($_item->getDescription()) ?>
+        <?php echo $this->escapeHtml($_item->getDescription()) ?>
         <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
             <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $parentItem->getId() ?>')"><?php echo Mage::helper('sales')->__('Gift Message') ?></a>
         <?php endif; ?>
diff --git a/app/design/frontend/base/default/template/bundle/sales/order/items/renderer.phtml b/app/design/frontend/base/default/template/bundle/sales/order/items/renderer.phtml
index f39d86acb8e..e185a390949 100644
--- a/app/design/frontend/base/default/template/bundle/sales/order/items/renderer.phtml
+++ b/app/design/frontend/base/default/template/bundle/sales/order/items/renderer.phtml
@@ -55,11 +55,11 @@
 <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
 
     <?php if (!$_item->getParentItem()): ?>
-    <td><h3 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h3></td>
+    <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3></td>
     <?php else: ?>
     <td><div class="option-value"><?php echo $this->getValueHtml($_item)?></div></td>
     <?php endif; ?>
-    <td><?php echo $this->htmlEscape(Mage::helper('core/string')->splitInjection($_item->getSku())) ?></td>
+    <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($_item->getSku())) ?></td>
     <td class="a-right">
         <?php if (!$_item->getParentItem()): ?>
         <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
@@ -342,7 +342,7 @@
         <?php if($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
         <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <?php if (!$this->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
@@ -350,19 +350,19 @@
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
                     <div class="truncated_full_value">
                         <dl class="item-options">
-                            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                             <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
                         </dl>
                     </div>
                     <?php endif; ?>
                 </dd>
             <?php else: ?>
-                <dd><?php echo $this->htmlEscape( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
+                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
             <?php endif; ?>
         <?php endforeach; ?>
         </dl>
         <?php endif; ?>
-        <?php echo $this->htmlEscape($_item->getDescription()) ?>
+        <?php echo $this->escapeHtml($_item->getDescription()) ?>
         <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
             <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $parentItem->getId() ?>')"><?php echo Mage::helper('sales')->__('Gift Message') ?></a>
         <?php endif; ?>
diff --git a/app/design/frontend/base/default/template/bundle/sales/order/shipment/items/renderer.phtml b/app/design/frontend/base/default/template/bundle/sales/order/shipment/items/renderer.phtml
index e77bcf80472..3baf3797f1d 100644
--- a/app/design/frontend/base/default/template/bundle/sales/order/shipment/items/renderer.phtml
+++ b/app/design/frontend/base/default/template/bundle/sales/order/shipment/items/renderer.phtml
@@ -53,11 +53,11 @@
 <?php endif; ?>
 <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
     <?php if (!$_item->getParentItem()): ?>
-    <td><h4 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h4></td>
+    <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4></td>
     <?php else: ?>
     <td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
     <?php endif; ?>
-    <td><?php echo $this->htmlEscape($_item->getSku()) ?></td>
+    <td><?php echo $this->escapeHtml($_item->getSku()) ?></td>
     <td class="a-center">
         <?php if (($this->isShipmentSeparately() && $_item->getParentItem()) || (!$this->isShipmentSeparately() && !$_item->getParentItem())): ?>
             <?php if (isset($shipItems[$_item->getId()])): ?>
@@ -80,7 +80,7 @@
         <?php if($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
         <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <?php if (!$this->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
@@ -88,19 +88,19 @@
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
                     <div class="truncated_full_value">
                         <dl class="item-options">
-                            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                             <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
                         </dl>
                     </div>
                     <?php endif; ?>
                 </dd>
             <?php else: ?>
-                <dd><?php echo $this->htmlEscape( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
+                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
             <?php endif; ?>
         <?php endforeach; ?>
         </dl>
         <?php endif; ?>
-        <?php echo $this->htmlEscape($_item->getDescription()) ?>
+        <?php echo $this->escapeHtml($_item->getDescription()) ?>
         <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
             <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $parentItem->getId() ?>')"><?php echo Mage::helper('sales')->__('Gift Message') ?></a>
         <?php endif; ?>
diff --git a/app/design/frontend/base/default/template/catalog/category/view.phtml b/app/design/frontend/base/default/template/catalog/category/view.phtml
index 0af0974d488..158071cc94c 100644
--- a/app/design/frontend/base/default/template/catalog/category/view.phtml
+++ b/app/design/frontend/base/default/template/catalog/category/view.phtml
@@ -36,7 +36,7 @@
     $_category  = $this->getCurrentCategory();
     $_imgHtml   = '';
     if ($_imgUrl = $_category->getImageUrl()) {
-        $_imgHtml = '<p class="category-image"><img src="'.$_imgUrl.'" alt="'.$this->htmlEscape($_category->getName()).'" title="'.$this->htmlEscape($_category->getName()).'" /></p>';
+        $_imgHtml = '<p class="category-image"><img src="'.$_imgUrl.'" alt="'.$this->escapeHtml($_category->getName()).'" title="'.$this->escapeHtml($_category->getName()).'" /></p>';
         $_imgHtml = $_helper->categoryAttribute($_category, $_imgHtml, 'image');
     }
 ?>
diff --git a/app/design/frontend/base/default/template/catalog/category/widget/link/link_block.phtml b/app/design/frontend/base/default/template/catalog/category/widget/link/link_block.phtml
index 2aac71b5291..5ffb7548195 100644
--- a/app/design/frontend/base/default/template/catalog/category/widget/link/link_block.phtml
+++ b/app/design/frontend/base/default/template/catalog/category/widget/link/link_block.phtml
@@ -24,4 +24,4 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<span class="widget widget-category-link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->htmlEscape($this->getAnchorText()) ?></span></a></span>
+<span class="widget widget-category-link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>
diff --git a/app/design/frontend/base/default/template/catalog/category/widget/link/link_inline.phtml b/app/design/frontend/base/default/template/catalog/category/widget/link/link_inline.phtml
index 709d5f95429..60fac35e87f 100644
--- a/app/design/frontend/base/default/template/catalog/category/widget/link/link_inline.phtml
+++ b/app/design/frontend/base/default/template/catalog/category/widget/link/link_inline.phtml
@@ -24,4 +24,4 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<span class="widget widget-category-link-inline"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->htmlEscape($this->getAnchorText()) ?></span></a></span>
+<span class="widget widget-category-link-inline"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>
diff --git a/app/design/frontend/base/default/template/catalog/navigation/left.phtml b/app/design/frontend/base/default/template/catalog/navigation/left.phtml
index d7b8125d22c..26b5e871736 100644
--- a/app/design/frontend/base/default/template/catalog/navigation/left.phtml
+++ b/app/design/frontend/base/default/template/catalog/navigation/left.phtml
@@ -46,7 +46,7 @@
                 <?php foreach ($_categories as $_category): ?>
                     <?php if($_category->getIsActive()): ?>
                     <li>
-                        <a href="<?php echo $this->getCategoryUrl($_category) ?>"<?php if ($this->isCategoryActive($_category)): ?> class="current"<?php endif; ?>><?php echo $this->htmlEscape($_category->getName()) ?></a> (<?php echo $_category->getProductCount() ?>)
+                        <a href="<?php echo $this->getCategoryUrl($_category) ?>"<?php if ($this->isCategoryActive($_category)): ?> class="current"<?php endif; ?>><?php echo $this->escapeHtml($_category->getName()) ?></a> (<?php echo $_category->getProductCount() ?>)
                     </li>
                     <?php endif; ?>
                 <?php endforeach ?>
diff --git a/app/design/frontend/base/default/template/catalog/product/compare/list.phtml b/app/design/frontend/base/default/template/catalog/product/compare/list.phtml
index 5af0427ec3f..bdc8a3cff2f 100644
--- a/app/design/frontend/base/default/template/catalog/product/compare/list.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/compare/list.phtml
@@ -71,7 +71,7 @@
                     <?php endif; ?>
                     <?php if ($this->helper('wishlist')->isAllow()) : ?>
                         <ul class="add-to-links">
-                            <li><a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="link-wishlist" onclick="setPLocation(this.href, true)"><?php echo $this->__('Add to Wishlist') ?></a></li>
+                            <li><a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></li>
                         </ul>
                     <?php endif; ?>
                 </td>
@@ -92,7 +92,7 @@
                             <?php echo $this->getPriceHtml($_item, true, '-compare-list-' . $_attribute->getCode()) ?>
                             <?php break;
                         case "small_image": ?>
-                            <img src="<?php echo $this->helper('catalog/image')->init($_item, 'small_image')->resize(125, 125); ?>" width="125" height="125" alt="<?php echo $this->htmlEscape($_item->getName()) ?>" title="<?php echo $this->htmlEscape($_item->getName()) ?>" />
+                            <img src="<?php echo $this->helper('catalog/image')->init($_item, 'small_image')->resize(125, 125); ?>" width="125" height="125" alt="<?php echo $this->escapeHtml($_item->getName()) ?>" title="<?php echo $this->escapeHtml($_item->getName()) ?>" />
                             <?php break;
                         case "date":
                               echo substr($this->getProductAttributeValue($_item, $_attribute),0,10);
@@ -124,7 +124,7 @@
                     <?php endif; ?>
                     <?php if ($this->helper('wishlist')->isAllow()) : ?>
                         <ul class="add-to-links">
-                            <li><a href="<?php echo $this->getAddToWishlistUrl($_item);?>" class="link-wishlist" onclick="setPLocation(this.href, true)"><?php echo $this->__('Add to Wishlist') ?></a></li>
+                            <li><a href="<?php echo $this->getAddToWishlistUrl($_item);?>" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></li>
                         </ul>
                     <?php endif; ?>
                 </td>
diff --git a/app/design/frontend/base/default/template/catalog/product/gallery.phtml b/app/design/frontend/base/default/template/catalog/product/gallery.phtml
index 7ead5ae5344..957cef00416 100644
--- a/app/design/frontend/base/default/template/catalog/product/gallery.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/gallery.phtml
@@ -37,10 +37,10 @@
           <?php endif; ?>
         </div>
     <?php endif; ?>
-    <?php if($_imageTitle = $this->htmlEscape($this->getCurrentImage()->getLabel())): ?>
+    <?php if($_imageTitle = $this->escapeHtml($this->getCurrentImage()->getLabel())): ?>
         <h1 class="image-label"><?php echo $_imageTitle ?></h1>
     <?php endif; ?>
-    <img src="<?php echo $this->helper('catalog/image')->init($this->getProduct(), 'image', $this->getImageFile()); ?>"<?php if($_width): ?> width="<?php echo $_width ?>"<?php endif; ?> alt="<?php echo $this->htmlEscape($this->getCurrentImage()->getLabel()) ?>" title="<?php echo $this->htmlEscape($this->getCurrentImage()->getLabel()) ?>" id="product-gallery-image" class="image" />
+    <img src="<?php echo $this->helper('catalog/image')->init($this->getProduct(), 'image', $this->getImageFile()); ?>"<?php if($_width): ?> width="<?php echo $_width ?>"<?php endif; ?> alt="<?php echo $this->escapeHtml($this->getCurrentImage()->getLabel()) ?>" title="<?php echo $this->escapeHtml($this->getCurrentImage()->getLabel()) ?>" id="product-gallery-image" class="image" />
     <div class="buttons-set"><a href="#" onclick="window.close(); return false;" class="button"><span><?php echo $this->__('Close Window') ?></span></a></div>
     <?php if($this->getPreviusImageUrl() || $this->getNextImageUrl()): ?>
         <div class="nav">
diff --git a/app/design/frontend/base/default/template/catalog/product/list/related.phtml b/app/design/frontend/base/default/template/catalog/product/list/related.phtml
index 493f8c9241b..bd0cd3533a8 100644
--- a/app/design/frontend/base/default/template/catalog/product/list/related.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/list/related.phtml
@@ -40,9 +40,9 @@
                     <?php endif; ?>
                 <?php endif; ?>
                 <div class="product">
-                    <a href="<?php echo $_item->getProductUrl() ?>" title="<?php echo $this->htmlEscape($_item->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_item, 'thumbnail')->resize(50) ?>" width="50" height="50" alt="<?php echo $this->htmlEscape($_item->getName()) ?>" /></a>
+                    <a href="<?php echo $_item->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_item->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_item, 'thumbnail')->resize(50) ?>" width="50" height="50" alt="<?php echo $this->escapeHtml($_item->getName()) ?>" /></a>
                     <div class="product-details">
-                        <p class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->htmlEscape($_item->getName()) ?></a></p>
+                        <p class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></p>
                         <?php echo $this->getPriceHtml($_item, true, '-related') ?>
                         <?php if ($this->helper('wishlist')->isAllow()) : ?>
                             <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a>
diff --git a/app/design/frontend/base/default/template/catalog/product/list/upsell.phtml b/app/design/frontend/base/default/template/catalog/product/list/upsell.phtml
index e03fb3f632b..824cb6c9219 100644
--- a/app/design/frontend/base/default/template/catalog/product/list/upsell.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/list/upsell.phtml
@@ -35,8 +35,8 @@
         <?php for($_j=0;$_j<$this->getColumnCount();$_j++): ?>
             <?php if($_link=$this->getIterableItem()): ?>
             <td>
-                <a href="<?php echo $_link->getProductUrl() ?>" title="<?php echo $this->htmlEscape($_link->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_link, 'small_image')->resize(125) ?>" width="125" height="125" alt="<?php echo $this->htmlEscape($_link->getName()) ?>" /></a>
-                <h3 class="product-name"><a href="<?php echo $_link->getProductUrl() ?>" title="<?php echo $this->htmlEscape($_link->getName()) ?>"><?php echo $this->htmlEscape($_link->getName()) ?></a></h3>
+                <a href="<?php echo $_link->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_link->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_link, 'small_image')->resize(125) ?>" width="125" height="125" alt="<?php echo $this->escapeHtml($_link->getName()) ?>" /></a>
+                <h3 class="product-name"><a href="<?php echo $_link->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_link->getName()) ?>"><?php echo $this->escapeHtml($_link->getName()) ?></a></h3>
                 <?php echo $this->getPriceHtml($_link, true, '-upsell') ?>
                 <?php echo $this->getReviewsSummaryHtml($_link) ?>
             </td>
diff --git a/app/design/frontend/base/default/template/catalog/product/new.phtml b/app/design/frontend/base/default/template/catalog/product/new.phtml
index eb6e753e38a..f792d18d10a 100644
--- a/app/design/frontend/base/default/template/catalog/product/new.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/new.phtml
@@ -32,8 +32,8 @@
         <ul class="products-grid">
         <?php endif ?>
             <li class="item<?php if(($i-1)%$_columnCount==0): ?> first<?php elseif($i%$_columnCount==0): ?> last<?php endif; ?>">
-                <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->htmlEscape($_product->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_product, 'small_image')->resize(135) ?>" width="135" height="135" alt="<?php echo $this->htmlEscape($_product->getName()) ?>" /></a>
-                <h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->htmlEscape($_product->getName()) ?>"><?php echo $this->htmlEscape($_product->getName()) ?></a></h3>
+                <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_product, 'small_image')->resize(135) ?>" width="135" height="135" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" /></a>
+                <h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>"><?php echo $this->escapeHtml($_product->getName()) ?></a></h3>
                 <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
                 <?php echo $this->getPriceHtml($_product, true, '-new') ?>
                 <div class="actions">
diff --git a/app/design/frontend/base/default/template/catalog/product/price.phtml b/app/design/frontend/base/default/template/catalog/product/price.phtml
index 4da99012269..f4f104dbf72 100644
--- a/app/design/frontend/base/default/template/catalog/product/price.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/price.phtml
@@ -47,6 +47,7 @@
     $_simplePricesTax = ($_taxHelper->displayPriceIncludingTax() || $_taxHelper->displayBothPrices());
     $_minimalPriceValue = $_product->getMinimalPrice();
     $_minimalPrice = $_taxHelper->getPrice($_product, $_minimalPriceValue, $_simplePricesTax);
+    $_specialPriceStoreLabel = $this->getProductAttribute('special_price')->getStoreLabel();
 ?>
 
 <?php if (!$_product->isGrouped()): ?>
@@ -89,18 +90,18 @@
                         <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, false) ?>
                     </span>
                 </span>
+                <span class="weee">(
+                <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
+                    <?php echo $_weeeSeparator; ?>
+                    <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
+                    <?php $_weeeSeparator = ' + '; ?>
+                    <?php endforeach; ?>
+                )</span>
                 <span class="price-including-tax">
                     <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
                     <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
                         <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
                     </span>
-                    <span class="weee">(
-                        <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
-                            <?php echo $_weeeSeparator; ?>
-                            <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
-                            <?php $_weeeSeparator = ' + '; ?>
-                        <?php endforeach; ?>
-                        )</span>
                 </span>
             <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 4)): // incl. + weee ?>
                 <span class="price-excluding-tax">
@@ -218,7 +219,7 @@
 
             <?php if ($_taxHelper->displayBothPrices()): ?>
                 <p class="special-price">
-                    <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
+                    <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
                     <span class="price-excluding-tax">
                         <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
                         <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
@@ -234,7 +235,7 @@
                 </p>
             <?php else: ?>
             <p class="special-price">
-                <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
+                <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
                 <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
                     <?php echo $_coreHelper->currency($_finalPrice + $_weeeTaxAmountInclTaxes, true, false) ?>
                 </span>
@@ -249,28 +250,46 @@
                 </span>
             </p>
 
-            <p class="special-price">
-                <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
+        <p class="special-price">
+            <?php if ($_taxHelper->displayBothPrices()): ?>
+                <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
                 <span class="price-excluding-tax">
                     <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
                     <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
-                        <?php echo $_coreHelper->currency($_finalPrice + $_weeeTaxAmount, true, false) ?>
+                      <?php echo $_coreHelper->currency($_finalPrice + $_weeeTaxAmount, true, false) ?>
                     </span>
                 </span>
-            <span class="weee">(
-                <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
-                    <?php echo $_weeeSeparator; ?>
-                    <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
-                    <?php $_weeeSeparator = ' + '; ?>
-                <?php endforeach; ?>
-                )</span>
-            <span class="price-including-tax">
+                <span class="weee">(
+                    <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
+                        <?php echo $_weeeSeparator; ?>
+                        <?php echo $_weeeTaxAttribute->getName(); ?>
+                        : <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
+                        <?php $_weeeSeparator = ' + '; ?>
+                        <?php endforeach; ?>
+                    )</span>
+                <span class="price-including-tax">
                 <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
                 <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
                     <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
                 </span>
-            </span>
-            </p>
+                </span>
+            <?php else: ?>
+                <p class="special-price">
+                <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
+                <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
+                    <?php echo $_coreHelper->currency($_finalPrice + $_weeeTaxAmountInclTaxes, true, false) ?>
+                </span>
+                </p>
+                <span class="weee">(
+                <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
+                    <?php echo $_weeeSeparator; ?>
+                    <?php echo $_weeeTaxAttribute->getName(); ?>
+                    : <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
+                    <?php $_weeeSeparator = ' + '; ?>
+                    <?php endforeach; ?>
+                )</span>
+            <?php endif; ?>
+        </p>
         <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 4)): // incl. + weee ?>
             <p class="old-price">
                 <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
@@ -280,7 +299,7 @@
             </p>
 
             <p class="special-price">
-                <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
+                <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
                 <span class="price-excluding-tax">
                     <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
                     <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
@@ -310,7 +329,7 @@
             </p>
 
             <p class="special-price">
-                <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
+                <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
                 <span class="price-excluding-tax">
                     <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
                     <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
@@ -339,7 +358,7 @@
 
             <?php if ($_taxHelper->displayBothPrices()): ?>
                 <p class="special-price">
-                    <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
+                    <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
                     <span class="price-excluding-tax">
                         <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
                         <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
@@ -355,7 +374,7 @@
                 </p>
             <?php else: ?>
             <p class="special-price">
-                <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
+                <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
                 <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
                     <?php echo $_coreHelper->currency($_finalPrice, true, false) ?>
                 </span>
@@ -391,13 +410,23 @@
 
 <?php else: /* if (!$_product->isGrouped()): */ ?>
     <?php
-    $_exclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue);
-    $_inclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue, true);
+        $showMinPrice = $this->getDisplayMinimalPrice();
+        if ($showMinPrice && $_minimalPriceValue) {
+            $_exclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue);
+            $_inclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue, true);
+            $price    = $showMinPrice ? $_minimalPriceValue : 0;
+        } else {
+            $price    = $_product->getFinalPrice();
+            $_exclTax = $_taxHelper->getPrice($_product, $price);
+            $_inclTax = $_taxHelper->getPrice($_product, $price, true);
+        }
     ?>
-    <?php if ($this->getDisplayMinimalPrice() && $_minimalPriceValue): ?>
+    <?php if ($price): ?>
         <div class="price-box">
-            <p class="minimal-price">
+            <p<?php if ($showMinPrice): ?> class="minimal-price"<?php endif ?>>
+                <?php if ($showMinPrice): ?>
                 <span class="price-label"><?php echo $this->__('Starting at:') ?></span>
+                <?php endif ?>
                 <?php if ($_taxHelper->displayBothPrices()): ?>
                     <span class="price-excluding-tax">
                         <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
diff --git a/app/design/frontend/base/default/template/catalog/product/price_msrp_item.phtml b/app/design/frontend/base/default/template/catalog/product/price_msrp_item.phtml
index b1362bad927..29ad93860f6 100644
--- a/app/design/frontend/base/default/template/catalog/product/price_msrp_item.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/price_msrp_item.phtml
@@ -78,6 +78,7 @@
                                 );
                             }
                         }
+                        optionsPrice.reload();
                     }
                 });
 
diff --git a/app/design/frontend/base/default/template/catalog/product/view.phtml b/app/design/frontend/base/default/template/catalog/product/view.phtml
index 5d9212f0612..fc34321f8d7 100644
--- a/app/design/frontend/base/default/template/catalog/product/view.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/view.phtml
@@ -40,6 +40,7 @@
 <div class="product-view">
     <div class="product-essential">
     <form action="<?php echo $this->getSubmitUrl($_product) ?>" method="post" id="product_addtocart_form"<?php if($_product->getOptions()): ?> enctype="multipart/form-data"<?php endif; ?>>
+        <?php echo $this->getBlockHtml('formkey') ?>
         <div class="no-display">
             <input type="hidden" name="product" value="<?php echo $_product->getId() ?>" />
             <input type="hidden" name="related_product" id="related-products-field" value="" />
diff --git a/app/design/frontend/base/default/template/catalog/product/view/attributes.phtml b/app/design/frontend/base/default/template/catalog/product/view/attributes.phtml
index 9e57ec75942..64d648b9560 100644
--- a/app/design/frontend/base/default/template/catalog/product/view/attributes.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/view/attributes.phtml
@@ -42,7 +42,7 @@
         <tbody>
         <?php foreach ($_additional as $_data): ?>
             <tr>
-                <th class="label"><?php echo $this->htmlEscape($this->__($_data['label'])) ?></th>
+                <th class="label"><?php echo $this->escapeHtml($this->__($_data['label'])) ?></th>
                 <td class="data"><?php echo $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
             </tr>
         <?php endforeach; ?>
diff --git a/app/design/frontend/base/default/template/catalog/product/view/media.phtml b/app/design/frontend/base/default/template/catalog/product/view/media.phtml
index a2f1eeadd54..3280b92068a 100644
--- a/app/design/frontend/base/default/template/catalog/product/view/media.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/view/media.phtml
@@ -37,7 +37,7 @@
 <?php if ($_product->getImage() != 'no_selection' && $_product->getImage()): ?>
 <p class="product-image product-image-zoom">
     <?php
-        $_img = '<img id="image" src="'.$this->helper('catalog/image')->init($_product, 'image').'" alt="'.$this->htmlEscape($this->getImageLabel()).'" title="'.$this->htmlEscape($this->getImageLabel()).'" />';
+        $_img = '<img id="image" src="'.$this->helper('catalog/image')->init($_product, 'image').'" alt="'.$this->escapeHtml($this->getImageLabel()).'" title="'.$this->escapeHtml($this->getImageLabel()).'" />';
         echo $_helper->productAttribute($_product, $_img, 'image');
     ?>
 </p>
@@ -59,7 +59,7 @@
 <?php else: ?>
 <p class="product-image">
     <?php
-        $_img = '<img src="'.$this->helper('catalog/image')->init($_product, 'image')->resize(265).'" alt="'.$this->htmlEscape($this->getImageLabel()).'" title="'.$this->htmlEscape($this->getImageLabel()).'" />';
+        $_img = '<img src="'.$this->helper('catalog/image')->init($_product, 'image')->resize(265).'" alt="'.$this->escapeHtml($this->getImageLabel()).'" title="'.$this->escapeHtml($this->getImageLabel()).'" />';
         echo $_helper->productAttribute($_product, $_img, 'image');
     ?>
 </p>
@@ -70,7 +70,7 @@
     <ul>
     <?php foreach ($this->getGalleryImages() as $_image): ?>
         <li>
-            <a href="#" onclick="popWin('<?php echo $this->getGalleryUrl($_image) ?>', 'gallery', 'width=300,height=300,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'); return false;" title="<?php echo $this->htmlEscape($_image->getLabel()) ?>"><img src="<?php echo $this->helper('catalog/image')->init($this->getProduct(), 'thumbnail', $_image->getFile())->resize(56); ?>" width="56" height="56" alt="<?php echo $this->htmlEscape($_image->getLabel()) ?>" /></a>
+            <a href="#" onclick="popWin('<?php echo $this->getGalleryUrl($_image) ?>', 'gallery', 'width=300,height=300,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'); return false;" title="<?php echo $this->escapeHtml($_image->getLabel()) ?>"><img src="<?php echo $this->helper('catalog/image')->init($this->getProduct(), 'thumbnail', $_image->getFile())->resize(56); ?>" width="56" height="56" alt="<?php echo $this->escapeHtml($_image->getLabel()) ?>" /></a>
         </li>
     <?php endforeach; ?>
     </ul>
diff --git a/app/design/frontend/base/default/template/catalog/product/view/options/type/date.phtml b/app/design/frontend/base/default/template/catalog/product/view/options/type/date.phtml
index 40f129c9082..68f7f3552a0 100644
--- a/app/design/frontend/base/default/template/catalog/product/view/options/type/date.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/view/options/type/date.phtml
@@ -26,7 +26,7 @@
 ?>
 <?php $_option = $this->getOption() ?>
 <?php $_optionId = $_option->getId() ?>
-<dt><label<?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo  $this->htmlEscape($_option->getTitle()) ?></label>
+<dt><label<?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo  $this->escapeHtml($_option->getTitle()) ?></label>
     <?php echo $this->getFormatedPrice() ?></dt>
 <dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
 
diff --git a/app/design/frontend/base/default/template/catalog/product/view/options/type/default.phtml b/app/design/frontend/base/default/template/catalog/product/view/options/type/default.phtml
index afe0cce3153..70958aaf2f4 100644
--- a/app/design/frontend/base/default/template/catalog/product/view/options/type/default.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/view/options/type/default.phtml
@@ -26,5 +26,5 @@
 ?>
 <?php $_option = $this->getOption() ?>
 <dt>
-    <label><?php echo  $this->htmlEscape($_option->getTitle()) ?></label>
+    <label><?php echo  $this->escapeHtml($_option->getTitle()) ?></label>
 </dt>
diff --git a/app/design/frontend/base/default/template/catalog/product/view/options/type/file.phtml b/app/design/frontend/base/default/template/catalog/product/view/options/type/file.phtml
index c9d67f0be60..9be636d371d 100644
--- a/app/design/frontend/base/default/template/catalog/product/view/options/type/file.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/view/options/type/file.phtml
@@ -74,7 +74,7 @@
 //]]>
 </script>
 
-<dt><label <?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo  $this->htmlEscape($_option->getTitle()) ?></label>
+<dt><label <?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo  $this->escapeHtml($_option->getTitle()) ?></label>
     <?php echo $this->getFormatedPrice() ?></dt>
 <dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
     <?php if ($_fileExists): ?>
diff --git a/app/design/frontend/base/default/template/catalog/product/view/options/type/select.phtml b/app/design/frontend/base/default/template/catalog/product/view/options/type/select.phtml
index bf3af34b7d6..961e06a639e 100644
--- a/app/design/frontend/base/default/template/catalog/product/view/options/type/select.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/view/options/type/select.phtml
@@ -27,7 +27,7 @@
 
 <?php /* @var $this Mage_Catalog_Block_Product_View_Options_Type_Select */ ?>
 <?php $_option = $this->getOption() ?>
-<dt><label<?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo  $this->htmlEscape($_option->getTitle()) ?></label></dt>
+<dt><label<?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo  $this->escapeHtml($_option->getTitle()) ?></label></dt>
 <dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
     <div class="input-box">
         <?php echo $this->getValuesHtml() ?>
diff --git a/app/design/frontend/base/default/template/catalog/product/view/options/type/text.phtml b/app/design/frontend/base/default/template/catalog/product/view/options/type/text.phtml
index 6b3282cbc17..b6146796eae 100644
--- a/app/design/frontend/base/default/template/catalog/product/view/options/type/text.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/view/options/type/text.phtml
@@ -25,7 +25,7 @@
  */
 ?>
 <?php $_option = $this->getOption(); ?>
-<dt><label<?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo  $this->htmlEscape($_option->getTitle()) ?></label>
+<dt><label<?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo  $this->escapeHtml($_option->getTitle()) ?></label>
     <?php echo $this->getFormatedPrice() ?></dt>
 <dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
     <div class="input-box">
diff --git a/app/design/frontend/base/default/template/catalog/product/view/tierprices.phtml b/app/design/frontend/base/default/template/catalog/product/view/tierprices.phtml
index 5de7643ea95..092b5721019 100644
--- a/app/design/frontend/base/default/template/catalog/product/view/tierprices.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/view/tierprices.phtml
@@ -49,7 +49,7 @@ if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))) {
     <?php endif; ?>
     <?php Mage::helper('weee')->processTierPrices($_product, $_tierPrices); ?>
     <?php foreach ($_tierPrices as $_index => $_price): ?>
-        <li>
+        <li class="tier-price tier-<?php echo $_index; ?>">
         <?php if ($_catalogHelper->canApplyMsrp($_product)): ?>
             <?php if ($this->getInGrouped()): ?>
                 <?php echo $this->__('Buy %1$s for', $_price['price_qty']) ?>:
diff --git a/app/design/frontend/base/default/template/catalog/product/view/type/default.phtml b/app/design/frontend/base/default/template/catalog/product/view/type/default.phtml
index 508f32f44f2..706d6c6569c 100644
--- a/app/design/frontend/base/default/template/catalog/product/view/type/default.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/view/type/default.phtml
@@ -27,10 +27,12 @@
 <?php /* @var $this Mage_Catalog_Block_Product_View_Abstract */?>
 <?php $_product = $this->getProduct() ?>
 
-<?php if ($_product->isAvailable()): ?>
-    <p class="availability in-stock"><?php echo $this->__('Availability:') ?> <span><?php echo $this->__('In stock') ?></span></p>
-<?php else: ?>
-    <p class="availability out-of-stock"><?php echo $this->__('Availability:') ?> <span><?php echo $this->__('Out of stock') ?></span></p>
+<?php if ($this->displayProductStockStatus()): ?>
+    <?php if ($_product->isAvailable()): ?>
+        <p class="availability in-stock"><?php echo $this->__('Availability:') ?> <span><?php echo $this->__('In stock') ?></span></p>
+    <?php else: ?>
+        <p class="availability out-of-stock"><?php echo $this->__('Availability:') ?> <span><?php echo $this->__('Out of stock') ?></span></p>
+    <?php endif; ?>
 <?php endif; ?>
 <?php echo $this->getChildHtml('product_type_data_extra') ?>
 <?php echo $this->getPriceHtml($_product) ?>
diff --git a/app/design/frontend/base/default/template/catalog/product/view/type/grouped.phtml b/app/design/frontend/base/default/template/catalog/product/view/type/grouped.phtml
index 7828bd8ed8c..a1a2369d40c 100644
--- a/app/design/frontend/base/default/template/catalog/product/view/type/grouped.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/view/type/grouped.phtml
@@ -35,10 +35,12 @@
 <?php $_product = $this->getProduct(); ?>
 <?php $_associatedProducts = $this->getAssociatedProducts(); ?>
 <?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
-<?php if ($_product->isAvailable() && $_hasAssociatedProducts): ?>
-    <p class="availability in-stock"><?php echo $this->__('Availability:') ?> <span><?php echo $this->__('In stock') ?></span></p>
-<?php else: ?>
-    <p class="availability out-of-stock"><?php echo $this->__('Availability:') ?> <span><?php echo $this->__('Out of stock') ?></span></p>
+<?php if ($this->displayProductStockStatus()): ?>
+    <?php if ($_product->isAvailable() && $_hasAssociatedProducts): ?>
+        <p class="availability in-stock"><?php echo $this->__('Availability:') ?> <span><?php echo $this->__('In stock') ?></span></p>
+    <?php else: ?>
+        <p class="availability out-of-stock"><?php echo $this->__('Availability:') ?> <span><?php echo $this->__('Out of stock') ?></span></p>
+    <?php endif; ?>
 <?php endif; ?>
 <?php echo $this->getChildHtml('product_type_data_extra') ?>
 <table class="data-table grouped-items-table" id="super-product-table">
@@ -61,7 +63,7 @@
     <?php foreach ($_associatedProducts as $_item): ?>
         <?php $_finalPriceInclTax = $this->helper('tax')->getPrice($_item, $_item->getFinalPrice(), true) ?>
         <tr>
-            <td><?php echo $this->htmlEscape($_item->getName()) ?></td>
+            <td><?php echo $this->escapeHtml($_item->getName()) ?></td>
             <?php if ($this->getCanShowProductPrice($_product)): ?>
             <td class="a-right">
                 <?php if ($this->getCanShowProductPrice($_item)): ?>
diff --git a/app/design/frontend/base/default/template/catalog/product/widget/link/link_block.phtml b/app/design/frontend/base/default/template/catalog/product/widget/link/link_block.phtml
index 1aaa07322ea..c4b133b7464 100644
--- a/app/design/frontend/base/default/template/catalog/product/widget/link/link_block.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/widget/link/link_block.phtml
@@ -24,4 +24,4 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<span class="widget widget-product-link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->htmlEscape($this->getAnchorText()) ?></span></a></span>
+<span class="widget widget-product-link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>
diff --git a/app/design/frontend/base/default/template/catalog/product/widget/link/link_inline.phtml b/app/design/frontend/base/default/template/catalog/product/widget/link/link_inline.phtml
index 7db487eb7e4..548a71b071c 100644
--- a/app/design/frontend/base/default/template/catalog/product/widget/link/link_inline.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/widget/link/link_inline.phtml
@@ -24,4 +24,4 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<span class="widget widget-product-link-inline"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->htmlEscape($this->getAnchorText()) ?></span></a></span>
+<span class="widget widget-product-link-inline"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>
diff --git a/app/design/frontend/base/default/template/catalog/product/widget/new/column/new_default_list.phtml b/app/design/frontend/base/default/template/catalog/product/widget/new/column/new_default_list.phtml
index 8e5bd52018a..d7b7fe5b5ca 100644
--- a/app/design/frontend/base/default/template/catalog/product/widget/new/column/new_default_list.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/widget/new/column/new_default_list.phtml
@@ -31,6 +31,7 @@
             <strong><span><?php echo $this->__('New Products') ?></span></strong>
         </div>
         <div class="block-content">
+            <?php echo $this->getPagerHtml() ?>
             <?php $suffix = $this->getNameInLayout(); ?>
             <ol class="mini-products-list" id="widget-new-products-<?php echo $suffix; ?>">
             <?php foreach ($_products->getItems() as $_product): ?>
diff --git a/app/design/frontend/base/default/template/catalog/product/widget/new/column/new_images_list.phtml b/app/design/frontend/base/default/template/catalog/product/widget/new/column/new_images_list.phtml
index 543a36864b9..27c11dfc826 100644
--- a/app/design/frontend/base/default/template/catalog/product/widget/new/column/new_images_list.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/widget/new/column/new_images_list.phtml
@@ -31,6 +31,7 @@
             <strong><span><?php echo $this->__('New Products') ?></span></strong>
         </div>
         <div class="block-content">
+            <?php echo $this->getPagerHtml() ?>
             <?php $suffix = $this->getNameInLayout(); ?>
             <ol class="mini-products-images-list" id="widget-new-products-<?php echo $suffix; ?>">
             <?php foreach ($_products->getItems() as $_product): ?>
diff --git a/app/design/frontend/base/default/template/catalog/product/widget/new/column/new_names_list.phtml b/app/design/frontend/base/default/template/catalog/product/widget/new/column/new_names_list.phtml
index f131a4492aa..23c6599b21b 100644
--- a/app/design/frontend/base/default/template/catalog/product/widget/new/column/new_names_list.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/widget/new/column/new_names_list.phtml
@@ -31,6 +31,7 @@
             <strong><span><?php echo $this->__('New Products') ?></span></strong>
         </div>
         <div class="block-content">
+            <?php echo $this->getPagerHtml() ?>
             <?php $suffix = $this->getNameInLayout(); ?>
             <ol id="widget-new-products-<?php echo $suffix; ?>">
             <?php foreach ($_products->getItems() as $_product): ?>
diff --git a/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml b/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml
index 8078ecd6a25..28475dd77b7 100644
--- a/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml
@@ -30,6 +30,7 @@
         <h2><?php echo $this->__('New Products') ?></h2>
     </div>
     <div class="widget-products">
+    <?php echo $this->getPagerHtml() ?>
     <?php $_columnCount = $this->getColumnCount(); ?>
         <?php $i=0; foreach ($_products->getItems() as $_product): ?>
         <?php if ($i++%$_columnCount==0): ?>
diff --git a/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml b/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml
index e0c460e9f46..52a1db67447 100644
--- a/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml
@@ -30,6 +30,7 @@
         <h2><?php echo $this->__('New Products') ?></h2>
     </div>
     <div class="widget-products">
+        <?php echo $this->getPagerHtml() ?>
         <ol class="products-list">
         <?php $i=0; foreach ($_products->getItems() as $_product): ?>
             <li class="item<?php echo (++$i == count($_products))?' last':''; ?>">
diff --git a/app/design/frontend/base/default/template/catalogsearch/advanced/result.phtml b/app/design/frontend/base/default/template/catalogsearch/advanced/result.phtml
index ab52359cedf..aca083e8baa 100644
--- a/app/design/frontend/base/default/template/catalogsearch/advanced/result.phtml
+++ b/app/design/frontend/base/default/template/catalogsearch/advanced/result.phtml
@@ -42,7 +42,7 @@
             <?php if(@$searchCriterias[$side]): ?>
                 <ul>
                     <?php foreach($searchCriterias[$side] as $criteria): ?>
-                        <li><strong><?php echo $this->htmlEscape($this->helper('catalog')->__($criteria['name'])); ?>:</strong> <?php echo $this->htmlEscape($criteria['value']); ?></li>
+                        <li><strong><?php echo $this->escapeHtml($this->helper('catalog')->__($criteria['name'])); ?>:</strong> <?php echo $this->escapeHtml($criteria['value']); ?></li>
                     <?php endforeach; ?>
                 </ul>
             <?php endif; ?>
diff --git a/app/design/frontend/base/default/template/catalogsearch/term.phtml b/app/design/frontend/base/default/template/catalogsearch/term.phtml
index 8dae53711bd..311edc6efbb 100644
--- a/app/design/frontend/base/default/template/catalogsearch/term.phtml
+++ b/app/design/frontend/base/default/template/catalogsearch/term.phtml
@@ -30,7 +30,7 @@
 <?php if( sizeof($this->getTerms()) > 0 ): ?>
     <ul class="tags-list">
         <?php foreach ($this->getTerms() as $_term): ?>
-            <li><a href="<?php echo $this->getSearchUrl($_term) ?>" style="font-size:<?php echo $_term->getRatio()*70+75 ?>%;"><?php echo $this->htmlEscape($_term->getName()) ?></a></li>
+            <li><a href="<?php echo $this->getSearchUrl($_term) ?>" style="font-size:<?php echo $_term->getRatio()*70+75 ?>%;"><?php echo $this->escapeHtml($_term->getName()) ?></a></li>
         <?php endforeach; ?>
     </ul>
 <?php else: ?>
diff --git a/app/design/frontend/base/default/template/centinel/logo.phtml b/app/design/frontend/base/default/template/centinel/logo.phtml
index b78278960c7..82ec3ab74b3 100644
--- a/app/design/frontend/base/default/template/centinel/logo.phtml
+++ b/app/design/frontend/base/default/template/centinel/logo.phtml
@@ -27,7 +27,7 @@
 <li class="centinel-logos" id="<?php echo $this->getCode() ?>_centinel_logo">
     <label><?php echo $this->__('To ensure the security of your transactions') ?></label>
     <div class="input-box">
-        <a href="#" title="<?php echo $this->__('Verified by Visa') ?> "onclick="popWin('<?php echo $this->helper('centinel')->getVisaLearnMorePageUrl()?>', 'verifiedByVisa', 'width=815,height=600,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'); return false;"><img src="<?php echo $this->getSkinUrl('images/centinel/vbv_ltbg_71x57.gif'); ?>" alt="<?php echo $this->__('Verified by Visa') ?>" /></a>
-        <a href="#" title="<?php echo $this->__('MasterCard SecureCode'); ?>" onclick="popWin('<?php echo $this->helper('centinel')->getMastercardLearnMorePageUrl()?>', 'secureCode', 'width=600,height=403,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'); return false;"><img src="<?php echo $this->getSkinUrl('images/centinel/sc_learn_62x34.gif'); ?>" alt="<?php echo $this->__('MasterCard SecureCode') ?>" /></a>
+        <a href="#" title="<?php echo $this->__('Verified by Visa') ?> " onclick="popWin('<?php echo $this->helper('centinel')->getVisaLearnMorePageUrl()?>', 'verifiedByVisa', 'width=815,height=600,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'); return false;"><img src="<?php echo $this->getSkinUrl('images/centinel/vbv_ltbg_71x57.png'); ?>" alt="<?php echo $this->__('Verified by Visa') ?>" /></a>
+        <a href="#" title="<?php echo $this->__('MasterCard SecureCode'); ?>" onclick="popWin('<?php echo $this->helper('centinel')->getMastercardLearnMorePageUrl()?>', 'secureCode', 'width=600,height=403,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'); return false;"><img src="<?php echo $this->getSkinUrl('images/centinel/sc_learn_62x34.png'); ?>" alt="<?php echo $this->__('MasterCard SecureCode') ?>" /></a>
     </div>
 </li>
diff --git a/app/design/frontend/base/default/template/checkout/cart/coupon.phtml b/app/design/frontend/base/default/template/checkout/cart/coupon.phtml
index 000df68820c..09019de43b5 100644
--- a/app/design/frontend/base/default/template/checkout/cart/coupon.phtml
+++ b/app/design/frontend/base/default/template/checkout/cart/coupon.phtml
@@ -31,7 +31,7 @@
             <label for="coupon_code"><?php echo $this->__('Enter your coupon code if you have one.') ?></label>
             <input type="hidden" name="remove" id="remove-coupone" value="0" />
             <div class="input-box">
-                <input class="input-text" id="coupon_code" name="coupon_code" value="<?php echo $this->htmlEscape($this->getCouponCode()) ?>" />
+                <input class="input-text" id="coupon_code" name="coupon_code" value="<?php echo $this->escapeHtml($this->getCouponCode()) ?>" />
             </div>
             <div class="buttons-set">
                 <button type="button" title="<?php echo $this->__('Apply Coupon') ?>" class="button" onclick="discountForm.submit(false)" value="<?php echo $this->__('Apply Coupon') ?>"><span><span><?php echo $this->__('Apply Coupon') ?></span></span></button>
diff --git a/app/design/frontend/base/default/template/checkout/cart/crosssell.phtml b/app/design/frontend/base/default/template/checkout/cart/crosssell.phtml
index 295cf381e0a..7dea728d7b8 100644
--- a/app/design/frontend/base/default/template/checkout/cart/crosssell.phtml
+++ b/app/design/frontend/base/default/template/checkout/cart/crosssell.phtml
@@ -37,9 +37,9 @@
     <ul id="crosssell-products-list">
     <?php foreach ($this->getItems() as $_item): ?>
         <li class="item">
-            <a class="product-image" href="<?php echo $_item->getProductUrl() ?>" title="<?php echo $this->htmlEscape($_item->getName()) ?>"><img src="<?php echo $this->helper('catalog/image')->init($_item, 'thumbnail')->resize(75); ?>" width="75" height="75" alt="<?php echo $this->htmlEscape($_item->getName()) ?>" /></a>
+            <a class="product-image" href="<?php echo $_item->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_item->getName()) ?>"><img src="<?php echo $this->helper('catalog/image')->init($_item, 'thumbnail')->resize(75); ?>" width="75" height="75" alt="<?php echo $this->escapeHtml($_item->getName()) ?>" /></a>
             <div class="product-details">
-                <h3 class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->htmlEscape($_item->getName()) ?></a></h3>
+                <h3 class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></h3>
                 <?php echo $this->getPriceHtml($_item, true) ?>
                 <button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_item) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
                 <ul class="add-to-links">
diff --git a/app/design/frontend/base/default/template/checkout/cart/item/default.phtml b/app/design/frontend/base/default/template/checkout/cart/item/default.phtml
index 0261f2c500a..dee564ed49b 100644
--- a/app/design/frontend/base/default/template/checkout/cart/item/default.phtml
+++ b/app/design/frontend/base/default/template/checkout/cart/item/default.phtml
@@ -30,25 +30,25 @@ $isVisibleProduct = $_item->getProduct()->isVisibleInSiteVisibility();
 $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage_Catalog_Model_Product_Attribute_Source_Msrp_Type::TYPE_BEFORE_ORDER_CONFIRM);
 ?>
 <tr>
-    <td><?php if ($this->hasProductUrl()):?><a href="<?php echo $this->getProductUrl() ?>" title="<?php echo $this->htmlEscape($this->getProductName()) ?>" class="product-image"><?php endif;?><img src="<?php echo $this->getProductThumbnail()->resize(75); ?>" width="75" height="75" alt="<?php echo $this->htmlEscape($this->getProductName()) ?>" /><?php if ($this->hasProductUrl()):?></a><?php endif;?></td>
+    <td><?php if ($this->hasProductUrl()):?><a href="<?php echo $this->getProductUrl() ?>" title="<?php echo $this->escapeHtml($this->getProductName()) ?>" class="product-image"><?php endif;?><img src="<?php echo $this->getProductThumbnail()->resize(75); ?>" width="75" height="75" alt="<?php echo $this->escapeHtml($this->getProductName()) ?>" /><?php if ($this->hasProductUrl()):?></a><?php endif;?></td>
     <td>
         <h2 class="product-name">
         <?php if ($this->hasProductUrl()):?>
-            <a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->htmlEscape($this->getProductName()) ?></a>
+            <a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a>
         <?php else: ?>
-            <?php echo $this->htmlEscape($this->getProductName()) ?>
+            <?php echo $this->escapeHtml($this->getProductName()) ?>
         <?php endif; ?>
         </h2>
         <?php if ($_options = $this->getOptionList()):?>
         <dl class="item-options">
             <?php foreach ($_options as $_option) : ?>
             <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
                 <?php if (isset($_formatedOptionValue['full_view'])): ?>
                 <div class="truncated_full_value">
                     <dl class="item-options">
-                        <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+                        <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                         <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
                     </dl>
                 </div>
diff --git a/app/design/frontend/base/default/template/checkout/cart/render/default.phtml b/app/design/frontend/base/default/template/checkout/cart/render/default.phtml
index bf7952ac6b1..ecd79f73872 100644
--- a/app/design/frontend/base/default/template/checkout/cart/render/default.phtml
+++ b/app/design/frontend/base/default/template/checkout/cart/render/default.phtml
@@ -31,7 +31,7 @@
 <?php $_item = $this->getItem() ?>
 <tr>
     <td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>" title="<?php echo $this->__('Remove Item')?>" class="btn-remove2"><?php echo $this->__('Remove Item')?></a></td>
-    <td><a href="<?php echo $this->getItemUrl($_item) ?>" title="<?php echo $this->htmlEscape($this->getItemName($_item)) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getItemProductForThumbnail($_item), 'thumbnail')->resize(75); ?>" width="75" alt="<?php echo $this->htmlEscape($this->getItemName($_item)) ?>" /></a></td>
+    <td><a href="<?php echo $this->getItemUrl($_item) ?>" title="<?php echo $this->escapeHtml($this->getItemName($_item)) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getItemProductForThumbnail($_item), 'thumbnail')->resize(75); ?>" width="75" alt="<?php echo $this->escapeHtml($this->getItemName($_item)) ?>" /></a></td>
     <td>
         <h3 class="product-name"><a href="<?php echo $this->getItemUrl($_item) ?>"><?php echo $this->getItemName($_item) ?></a></h3>
         <?php echo $this->getItemDescription($_item) ?>
diff --git a/app/design/frontend/base/default/template/checkout/cart/render/simple.phtml b/app/design/frontend/base/default/template/checkout/cart/render/simple.phtml
index c82971aa036..cb34580b394 100644
--- a/app/design/frontend/base/default/template/checkout/cart/render/simple.phtml
+++ b/app/design/frontend/base/default/template/checkout/cart/render/simple.phtml
@@ -31,7 +31,7 @@
 <?php $_item = $this->getItem() ?>
 <tr>
     <td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>" title="<?php echo $this->__('Remove Item')?>" class="btn-remove2"><?php echo $this->__('Remove Item')?></a></td>
-    <td><a href="<?php echo $this->getItemUrl($_item) ?>" title="<?php echo $this->htmlEscape($this->getItemName($_item)) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getItemProductForThumbnail($_item), 'thumbnail')->resize(75); ?>" width="75" height="75" alt="<?php echo $this->htmlEscape($this->getItemName($_item)) ?>" /></a></td>
+    <td><a href="<?php echo $this->getItemUrl($_item) ?>" title="<?php echo $this->escapeHtml($this->getItemName($_item)) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getItemProductForThumbnail($_item), 'thumbnail')->resize(75); ?>" width="75" height="75" alt="<?php echo $this->escapeHtml($this->getItemName($_item)) ?>" /></a></td>
     <td>
         <h3 class="product-name"><a href="<?php echo $this->getItemUrl($_item) ?>"><?php echo $this->getItemName($_item) ?></a></h3>
         <?php echo $this->getItemDescription($_item) ?>
diff --git a/app/design/frontend/base/default/template/checkout/cart/sidebar/default.phtml b/app/design/frontend/base/default/template/checkout/cart/sidebar/default.phtml
index 65f2ad04516..7279106e3b0 100644
--- a/app/design/frontend/base/default/template/checkout/cart/sidebar/default.phtml
+++ b/app/design/frontend/base/default/template/checkout/cart/sidebar/default.phtml
@@ -31,16 +31,16 @@
 ?>
 <li class="item">
     <?php if ($this->hasProductUrl()): ?>
-        <a href="<?php echo $this->getProductUrl()?>" title="<?php echo $this->htmlEscape($this->getProductName()) ?>" class="product-image"><img src="<?php echo $this->getProductThumbnail()->resize(50, 50)->setWatermarkSize('30x10'); ?>" width="50" height="50" alt="<?php echo $this->htmlEscape($this->getProductName()) ?>" /></a>
+        <a href="<?php echo $this->getProductUrl()?>" title="<?php echo $this->escapeHtml($this->getProductName()) ?>" class="product-image"><img src="<?php echo $this->getProductThumbnail()->resize(50, 50)->setWatermarkSize('30x10'); ?>" width="50" height="50" alt="<?php echo $this->escapeHtml($this->getProductName()) ?>" /></a>
     <?php else: ?>
-        <span class="product-image"><img src="<?php echo $this->getProductThumbnail()->resize(50, 50)->setWatermarkSize('30x10'); ?>" width="50" height="50" alt="<?php echo $this->htmlEscape($this->getProductName()) ?>" /></span>
+        <span class="product-image"><img src="<?php echo $this->getProductThumbnail()->resize(50, 50)->setWatermarkSize('30x10'); ?>" width="50" height="50" alt="<?php echo $this->escapeHtml($this->getProductName()) ?>" /></span>
     <?php endif; ?>
     <div class="product-details">
         <a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo $this->__('Remove This Item') ?>" onclick="return confirm('<?php echo $this->__('Are you sure you would like to remove this item from the shopping cart?') ?>');" class="btn-remove"><?php echo $this->__('Remove This Item') ?></a>
         <?php if ($isVisibleProduct): ?>
         <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo $this->__('Edit item') ?>" class="btn-edit"><?php echo $this->__('Edit item')?></a>
         <?php endif ?>
-        <p class="product-name"><?php if ($this->hasProductUrl()): ?><a href="<?php echo $this->getProductUrl() ?>"><?php endif; ?><?php echo $this->htmlEscape($this->getProductName()) ?><?php if ($this->hasProductUrl()): ?></a><?php endif; ?></p>
+        <p class="product-name"><?php if ($this->hasProductUrl()): ?><a href="<?php echo $this->getProductUrl() ?>"><?php endif; ?><?php echo $this->escapeHtml($this->getProductName()) ?><?php if ($this->hasProductUrl()): ?></a><?php endif; ?></p>
         <strong><?php echo $this->getQty() ?></strong> x
 
     <?php if ($canApplyMsrp): ?>
@@ -127,7 +127,7 @@
           <div class="truncated_full_value">
             <dl class="item-options">
                 <?php foreach ($_options as $_option) : ?>
-                <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+                <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                 <dd>
                     <?php if (is_array($_option['value'])): ?>
                     <?php echo nl2br(implode("\n", $_option['value'])) ?>
diff --git a/app/design/frontend/base/default/template/checkout/multishipping/addresses.phtml b/app/design/frontend/base/default/template/checkout/multishipping/addresses.phtml
index 2b8d3211909..616ec8afd5f 100644
--- a/app/design/frontend/base/default/template/checkout/multishipping/addresses.phtml
+++ b/app/design/frontend/base/default/template/checkout/multishipping/addresses.phtml
@@ -64,7 +64,7 @@
                 <?php if ($_item->getQuoteItem()) :?>
                 <tr>
                     <td><?php echo $this->getItemHtml($_item->getQuoteItem())?></td>
-                    <td><input type="text" name="ship[<?php echo $_index ?>][<?php echo $_item->getQuoteItemId() ?>][qty]" value="<?php echo $this->htmlEscape($_item->getQty()) ?>" size="2" class="input-text qty" /></td>
+                    <td><input type="text" name="ship[<?php echo $_index ?>][<?php echo $_item->getQuoteItemId() ?>][qty]" value="<?php echo $this->escapeHtml($_item->getQty()) ?>" size="2" class="input-text qty" /></td>
                     <td><?php if ($_item->getProduct()->getIsVirtual()): echo $this->__('Shipping selection is not applicable.'); else: echo $this->getAddressesHtmlSelect($_item, $_index); endif; ?></td>
                     <td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>" title="<?php echo $this->__('Remove Item') ?>" class="btn-remove2"><?php echo $this->__('Remove Item') ?></a></td>
                 </tr>
diff --git a/app/design/frontend/base/default/template/checkout/multishipping/agreements.phtml b/app/design/frontend/base/default/template/checkout/multishipping/agreements.phtml
index 7a8626a960d..3adf879495f 100644
--- a/app/design/frontend/base/default/template/checkout/multishipping/agreements.phtml
+++ b/app/design/frontend/base/default/template/checkout/multishipping/agreements.phtml
@@ -38,11 +38,11 @@
             <?php if ($_a->getIsHtml()):?>
                 <?php echo $_a->getContent() ?>
             <?php else:?>
-                <?php echo nl2br($this->htmlEscape($_a->getContent())) ?>
+                <?php echo nl2br($this->escapeHtml($_a->getContent())) ?>
             <?php endif; ?>
         </div>
         <p class="agree">
-            <input type="checkbox" id="agreement-<?php echo $_a->getId()?>" name="agreement[<?php echo $_a->getId()?>]" value="1" title="<?php echo $this->htmlEscape($_a->getCheckboxText()) ?>" class="checkbox" /><label for="agreement-<?php echo $_a->getId()?>"><?php echo $_a->getIsHtml() ? $_a->getCheckboxText() : $this->htmlEscape($_a->getCheckboxText()) ?></label>
+            <input type="checkbox" id="agreement-<?php echo $_a->getId()?>" name="agreement[<?php echo $_a->getId()?>]" value="1" title="<?php echo $this->escapeHtml($_a->getCheckboxText()) ?>" class="checkbox" /><label for="agreement-<?php echo $_a->getId()?>"><?php echo $_a->getIsHtml() ? $_a->getCheckboxText() : $this->escapeHtml($_a->getCheckboxText()) ?></label>
         </p>
     </li>
 <?php endforeach ?>
diff --git a/app/design/frontend/base/default/template/checkout/multishipping/billing.phtml b/app/design/frontend/base/default/template/checkout/multishipping/billing.phtml
index 2494c61191b..9e0cfbcd1f3 100644
--- a/app/design/frontend/base/default/template/checkout/multishipping/billing.phtml
+++ b/app/design/frontend/base/default/template/checkout/multishipping/billing.phtml
@@ -69,11 +69,11 @@
                         <?php foreach ($_methods as $_method): $_code = $_method->getCode() ?>
                             <dt>
                                 <?php if ($_methodsCount > 1): ?>
-                                <input type="radio" id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" name="payment[method]" title="<?php echo $this->htmlEscape($_method->getTitle()) ?>" onclick="payment.switchMethod('<?php echo $_code ?>')"<?php if($this->getSelectedMethodCode()==$_code): ?> checked="checked"<?php endif; ?> class="radio" />
+                                <input type="radio" id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" name="payment[method]" title="<?php echo $this->escapeHtml($_method->getTitle()) ?>" onclick="payment.switchMethod('<?php echo $_code ?>')"<?php if($this->getSelectedMethodCode()==$_code): ?> checked="checked"<?php endif; ?> class="radio" />
                                 <?php else :?>
                                 <span class="no-display"><input type="radio" id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" name="payment[method]" checked="checked" class="radio" /></span>
                                 <?php endif;?>
-                                <label for="p_method_<?php echo $_code ?>"><?php echo $_method->getTitle() ?></label>
+                                <label for="p_method_<?php echo $_code ?>"><?php echo $this->escapeHtml($_method->getTitle()) ?></label>
                             </dt>
                             <?php if($html = $this->getChildHtml('payment.method.'.$_code)) : ?>
                             <dd>
diff --git a/app/design/frontend/base/default/template/checkout/multishipping/item/default.phtml b/app/design/frontend/base/default/template/checkout/multishipping/item/default.phtml
index 129389a3b44..a8832190076 100644
--- a/app/design/frontend/base/default/template/checkout/multishipping/item/default.phtml
+++ b/app/design/frontend/base/default/template/checkout/multishipping/item/default.phtml
@@ -24,17 +24,17 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<h3 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->htmlEscape($this->getProductName()) ?></a></h3>
+<h3 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></h3>
 <?php if ($_options = $this->getOptionList()):?>
 <dl class="item-options">
     <?php foreach ($_options as $_option) : ?>
     <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-    <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+    <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
     <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
         <?php if (isset($_formatedOptionValue['full_view'])): ?>
         <div class="truncated_full_value">
             <dl class="item-options">
-                <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+                <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                 <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
             </dl>
         </div>
diff --git a/app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml b/app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml
index ede6e5b1117..c9e45555bfe 100644
--- a/app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml
+++ b/app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml
@@ -70,7 +70,7 @@
                                                 <?php echo $this->escapeHtml($_rate->getCarrierTitle()) ?>: <?php echo $this->escapeHtml($_rate->getErrorMessage()) ?>
                                            <?php else: ?>
                                                 <?php if ($_sole) : ?>
-                                                <span class="no-display"><input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $this->htmlEscape($_rate->getCode()) ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>" checked="checked"/></span>
+                                                <span class="no-display"><input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $this->escapeHtml($_rate->getCode()) ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>" checked="checked"/></span>
                                                 <?php else: ?>
                                                 <input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod($_address)) echo ' checked="checked"' ?> class="radio" />
                                                 <?php endif; ?>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/agreements.phtml b/app/design/frontend/base/default/template/checkout/onepage/agreements.phtml
index 234d59ee5cc..877819eb11e 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/agreements.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/agreements.phtml
@@ -39,11 +39,11 @@
             <?php if ($_a->getIsHtml()):?>
                 <?php echo $_a->getContent() ?>
             <?php else:?>
-                <?php echo nl2br($this->htmlEscape($_a->getContent())) ?>
+                <?php echo nl2br($this->escapeHtml($_a->getContent())) ?>
             <?php endif; ?>
         </div>
         <p class="agree">
-            <input type="checkbox" id="agreement-<?php echo $_a->getId()?>" name="agreement[<?php echo $_a->getId()?>]" value="1" title="<?php echo $this->htmlEscape($_a->getCheckboxText()) ?>" class="checkbox" /><label for="agreement-<?php echo $_a->getId()?>"><?php echo $_a->getIsHtml() ? $_a->getCheckboxText() : $this->htmlEscape($_a->getCheckboxText()) ?></label>
+            <input type="checkbox" id="agreement-<?php echo $_a->getId()?>" name="agreement[<?php echo $_a->getId()?>]" value="1" title="<?php echo $this->escapeHtml($_a->getCheckboxText()) ?>" class="checkbox" /><label for="agreement-<?php echo $_a->getId()?>"><?php echo $_a->getIsHtml() ? $_a->getCheckboxText() : $this->escapeHtml($_a->getCheckboxText()) ?></label>
         </p>
     </li>
 <?php endforeach ?>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/login.phtml b/app/design/frontend/base/default/template/checkout/onepage/login.phtml
index bd5561b6dfb..b208e89d389 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/login.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/login.phtml
@@ -72,7 +72,7 @@
                 <li>
                     <label for="login-email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
                     <div class="input-box">
-                        <input type="text" class="input-text required-entry validate-email" id="login-email" name="login[username]" value="<?php echo $this->htmlEscape($this->getUsername()) ?>" />
+                        <input type="text" class="input-text required-entry validate-email" id="login-email" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" />
                     </div>
                 </li>
                 <li>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/payment/info.phtml b/app/design/frontend/base/default/template/checkout/onepage/payment/info.phtml
new file mode 100644
index 00000000000..211e8aded26
--- /dev/null
+++ b/app/design/frontend/base/default/template/checkout/onepage/payment/info.phtml
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     base_default
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<dl class="sp-methods" id="checkout-payment-method-load">
+   <!-- Content dynamically loaded. Content from the methods.phtml is loaded during the ajax call -->
+</dl>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/payment/methods.phtml b/app/design/frontend/base/default/template/checkout/onepage/payment/methods.phtml
index 7cc449d6624..57df1bcb1f1 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/payment/methods.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/payment/methods.phtml
@@ -28,21 +28,25 @@
 /**
  * One page checkout payment methods
  *
- * @see Mage_Checkout_Block_Onepage_Payment_Methods
+ * @var $this Mage_Checkout_Block_Onepage_Payment_Methods
  */
 ?>
-<dl class="sp-methods" id="checkout-payment-method-load">
+
 <?php
     $methods = $this->getMethods();
     $oneMethod = count($methods) <= 1;
 ?>
-<?php
+<?php if (empty($methods)): ?>
+    <dt>
+        <?php echo $this->__('No Payment Methods') ?>
+    </dt>
+<?php else:
     foreach ($methods as $_method):
         $_code = $_method->getCode();
 ?>
     <dt>
     <?php if(!$oneMethod): ?>
-        <input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" title="<?php echo $this->htmlEscape($_method->getTitle()) ?>" onclick="payment.switchMethod('<?php echo $_code ?>')"<?php if($this->getSelectedMethodCode()==$_code): ?> checked="checked"<?php endif; ?> class="radio" />
+        <input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" title="<?php echo $this->escapeHtml($_method->getTitle()) ?>" onclick="payment.switchMethod('<?php echo $_code ?>')"<?php if($this->getSelectedMethodCode()==$_code): ?> checked="checked"<?php endif; ?> class="radio" />
     <?php else: ?>
         <span class="no-display"><input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" checked="checked" class="radio" /></span>
         <?php $oneMethod = $_code; ?>
@@ -54,15 +58,16 @@
         <?php echo $html; ?>
     </dd>
     <?php endif; ?>
-<?php endforeach; ?>
-</dl>
+<?php endforeach;
+    endif;
+?>
 <?php echo $this->getChildChildHtml('additional'); ?>
 <script type="text/javascript">
-//<![CDATA[
-<?php echo $this->getChildChildHtml('scripts'); ?>
-payment.init();
-<?php if (is_string($oneMethod)): ?>
+    //<![CDATA[
+    <?php echo $this->getChildChildHtml('scripts'); ?>
+    payment.init();
+    <?php if (is_string($oneMethod)): ?>
     payment.switchMethod('<?php echo $oneMethod ?>');
-<?php endif; ?>
-//]]>
+        <?php endif; ?>
+    //]]>
 </script>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/progress.phtml b/app/design/frontend/base/default/template/checkout/onepage/progress.phtml
index 7c3228cf2fc..d18b3b1f43b 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/progress.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/progress.phtml
@@ -23,7 +23,6 @@
  * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
-/* @var $this Mage_Checkout_Block_Onepage_Progress */
 ?>
 <div class="block block-progress opc-block-progress">
     <div class="block-title">
@@ -31,85 +30,30 @@
     </div>
     <div class="block-content">
         <dl>
-        <?php if ($this->getCheckout()->getStepData('billing', 'is_show')): ?>
-        <?php if ($this->isStepComplete('billing')): ?>
-            <dt class="complete">
-                <?php echo $this->__('Billing Address') ?> <span class="separator">|</span>
-                <a href="#billing" onclick="checkout.gotoSection('billing'); return false;"><?php echo $this->__('Change') ?></a>
-            </dt>
-            <dd class="complete">
-                <address><?php echo $this->getBilling()->format('html') ?></address>
-            </dd>
-        <?php else: ?>
-            <dt>
-                <?php echo $this->__('Billing Address') ?>
-            </dt>
-        <?php endif; ?>
-        <?php endif; ?>
+            <?php if ($this->getCheckout()->getStepData('billing', 'is_show')): ?>
+            <div id="billing-progress-opcheckout">
+                <?php echo $this->getChildHtml('billing.progress') ?>
+            </div>
+            <?php endif; ?>
 
-        <?php if ($this->getCheckout()->getStepData('shipping', 'is_show')): ?>
-        <?php if ($this->isStepComplete('shipping')): ?>
-            <dt class="complete">
-                <?php echo $this->__('Shipping Address') ?> <span class="separator">|</span>
-                <a href="#payment" onclick="checkout.gotoSection('shipping');return false;"><?php echo $this->__('Change') ?></a>
-            </dt>
-            <dd class="complete">
-                <address><?php echo $this->getShipping()->format('html') ?></address>
-            </dd>
-        <?php else: ?>
-            <dt>
-                <?php echo $this->__('Shipping Address') ?>
-            </dt>
-        <?php endif; ?>
-        <?php endif; ?>
+            <?php if ($this->getCheckout()->getStepData('shipping', 'is_show')): ?>
+            <div id="shipping-progress-opcheckout">
+                <?php echo $this->getChildHtml('shipping.progress') ?>
+            </div>
+            <?php endif; ?>
 
-        <?php if ($this->getCheckout()->getStepData('shipping_method', 'is_show')): ?>
-        <?php if ($this->isStepComplete('shipping_method')): ?>
-            <dt class="complete">
-                <?php echo $this->__('Shipping Method') ?> <span class="separator">|</span>
-                <a href="#shipping_method" onclick="checkout.gotoSection('shipping_method'); return false;"><?php echo $this->__('Change') ?></a>
-            </dt>
-            <dd class="complete">
-                <?php if ($this->getShippingMethod()): ?>
-                    <?php echo $this->escapeHtml($this->getShippingDescription()) ?>
+            <?php if ($this->getCheckout()->getStepData('shipping_method', 'is_show')): ?>
+            <div id="shipping_method-progress-opcheckout">
+                <?php echo $this->getChildHtml('shippingmethod.progress') ?>
+            </div>
+            <?php endif; ?>
 
-                    <?php $_excl = $this->getShippingPriceExclTax(); ?>
-                    <?php $_incl = $this->getShippingPriceInclTax(); ?>
-                    <?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
-                        <?php echo $_incl; ?>
-                    <?php else: ?>
-                        <?php echo $_excl; ?>
-                    <?php endif; ?>
-                    <?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                        (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
-                    <?php endif; ?>
-
-                <?php else: ?>
-                    <?php echo $this->__('Shipping method has not been selected yet') ?>
-                <?php endif; ?>
-            </dd>
-        <?php else: ?>
-            <dt>
-                <?php echo $this->__('Shipping Method') ?>
-            </dt>
-        <?php endif; ?>
-        <?php endif; ?>
-
-        <?php if ($this->getCheckout()->getStepData('payment', 'is_show')): ?>
-        <?php if ($this->isStepComplete('payment')): ?>
-            <dt class="complete">
-                <?php echo $this->__('Payment Method') ?> <span class="separator">|</span>
-                <a href="#payment" onclick="checkout.gotoSection('payment'); return false;"><?php echo $this->__('Change') ?></a>
-            </dt>
-            <dd class="complete">
-                <?php echo $this->getPaymentHtml() ?>
-            </dd>
-        <?php else: ?>
-            <dt>
-                <?php echo $this->__('Payment Method') ?>
-            </dt>
-        <?php endif; ?>
-        <?php endif; ?>
+            <?php if ($this->getCheckout()->getStepData('payment', 'is_show')): ?>
+            <div id="payment-progress-opcheckout">
+                <?php echo $this->getChildHtml('payment.progress') ?>
+            </div>
+            <?php endif; ?>
         </dl>
     </div>
 </div>
+
diff --git a/app/design/frontend/base/default/template/checkout/onepage/progress/billing.phtml b/app/design/frontend/base/default/template/checkout/onepage/progress/billing.phtml
new file mode 100644
index 00000000000..f5100402072
--- /dev/null
+++ b/app/design/frontend/base/default/template/checkout/onepage/progress/billing.phtml
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     base_default
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<?php if ($this->getCheckout()->getStepData('billing', 'complete')): ?>
+<dt class="complete">
+    <?php echo $this->__('Billing Address') ?><span class="changelink"> <span class="separator">|</span> <a
+        href="#billing"
+        onclick="checkout.changeSection('opc-billing'); return false;"><?php echo $this->__('Change') ?></a></span>
+</dt>
+<dd class="complete">
+    <address><?php echo $this->getBilling()->format('html') ?></address>
+</dd>
+<?php else: ?>
+<dt>
+    <?php echo $this->__('Billing Address') ?>
+</dt>
+<?php endif; ?>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/progress/payment.phtml b/app/design/frontend/base/default/template/checkout/onepage/progress/payment.phtml
new file mode 100644
index 00000000000..063ce65047e
--- /dev/null
+++ b/app/design/frontend/base/default/template/checkout/onepage/progress/payment.phtml
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     base_default
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<?php if ($this->getCheckout()->getStepData('payment', 'complete')): ?>
+<dt class="complete">
+    <?php echo $this->__('Payment Method') ?><span class="changelink"> <span class="separator">|</span> <a
+        href="#payment"
+        onclick="checkout.changeSection('opc-payment'); return false;"><?php echo $this->__('Change') ?></a></span>
+</dt>
+<dd class="complete">
+    <?php echo $this->getPaymentHtml() ?>
+</dd>
+<?php else: ?>
+<dt>
+    <?php echo $this->__('Payment Method') ?>
+</dt>
+<?php endif; ?>
+
diff --git a/app/design/frontend/base/default/template/checkout/onepage/progress/shipping.phtml b/app/design/frontend/base/default/template/checkout/onepage/progress/shipping.phtml
new file mode 100644
index 00000000000..02e173f5909
--- /dev/null
+++ b/app/design/frontend/base/default/template/checkout/onepage/progress/shipping.phtml
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     base_default
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<?php if ($this->getCheckout()->getStepData('shipping', 'complete')): ?>
+<?php $completeClass = $this->getCheckout()->getStepData('shipping', 'complete') ? 'complete' : ''; ?>
+<dt class="<?php echo $completeClass ?>">
+    <?php echo $this->__('Shipping Address') ?> <span class="changelink"><span class="separator">|</span> <a
+        href="#payment"
+        onclick="checkout.changeSection('opc-shipping');return false;"><?php echo $this->__('Change') ?></a></span>
+</dt>
+<dd class="<?php echo $completeClass ?>">
+    <?php if ($this->getCheckout()->getStepData('shipping', 'complete')): ?>
+    <address><?php echo $this->getShipping()->format('html') ?></address>
+    <?php endif; ?>
+</dd>
+<?php else: ?>
+<dt>
+    <?php echo $this->__('Shipping Address') ?>
+</dt>
+<?php endif; ?>
+
diff --git a/app/design/frontend/base/default/template/checkout/onepage/progress/shipping_method.phtml b/app/design/frontend/base/default/template/checkout/onepage/progress/shipping_method.phtml
new file mode 100644
index 00000000000..7fdcd037fdd
--- /dev/null
+++ b/app/design/frontend/base/default/template/checkout/onepage/progress/shipping_method.phtml
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     base_default
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<?php if ($this->getCheckout()->getStepData('shipping_method', 'complete')): ?>
+<dt class="complete">
+    <?php echo $this->__('Shipping Method') ?> <span class="changelink"><span class="separator">|</span> <a
+        href="#shipping_method"
+        onclick="checkout.changeSection('opc-shipping_method'); return false;"><?php echo $this->__('Change') ?></a></span>
+</dt>
+<dd class="complete">
+    <?php if ($this->getShippingMethod()): ?>
+    <?php echo $this->getShippingDescription() ?>
+
+    <?php $_excl = $this->getShippingPriceExclTax(); ?>
+    <?php $_incl = $this->getShippingPriceInclTax(); ?>
+    <?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
+        <?php echo $_incl; ?>
+        <?php else: ?>
+        <?php echo $_excl; ?>
+        <?php endif; ?>
+    <?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
+        (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
+        <?php endif; ?>
+
+    <?php else: ?>
+    <?php echo $this->__('Shipping method has not been selected yet') ?>
+    <?php endif; ?>
+</dd>
+<?php else: ?>
+<dt>
+    <?php echo $this->__('Shipping Method') ?>
+</dt>
+<?php endif; ?>
+
diff --git a/app/design/frontend/base/default/template/checkout/onepage/review.phtml b/app/design/frontend/base/default/template/checkout/onepage/review.phtml
index a3576c5544a..ef2da5a381d 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/review.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/review.phtml
@@ -25,5 +25,5 @@
  */
 ?>
 <div class="order-review" id="checkout-review-load">
-    <?php echo $this->getChildHtml('info') ?>
+    <!-- Content loaded dynamically -->
 </div>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/review/info.phtml b/app/design/frontend/base/default/template/checkout/onepage/review/info.phtml
index d98d00f95a5..63361375fa0 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/review/info.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/review/info.phtml
@@ -78,7 +78,7 @@
     </div>
     <script type="text/javascript">
     //<![CDATA[
-        review = new Review('<?php echo $this->getUrl('checkout/onepage/saveOrder') ?>', '<?php echo $this->getUrl('checkout/onepage/success') ?>', $('checkout-agreements'));
+        review = new Review('<?php echo $this->getUrl('checkout/onepage/saveOrder', array('form_key' => Mage::getSingleton('core/session')->getFormKey())) ?>', '<?php echo $this->getUrl('checkout/onepage/success') ?>', $('checkout-agreements'));
     //]]>
     </script>
 </div>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/review/item.phtml b/app/design/frontend/base/default/template/checkout/onepage/review/item.phtml
index 5d175072cfb..40ef6bdb85e 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/review/item.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/review/item.phtml
@@ -26,17 +26,17 @@
 ?>
 <?php $_item = $this->getItem()?>
 <tr>
-    <td><h3 class="product-name"><?php echo $this->htmlEscape($this->getProductName()) ?></h3>
+    <td><h3 class="product-name"><?php echo $this->escapeHtml($this->getProductName()) ?></h3>
         <?php if ($_options = $this->getOptionList()):?>
         <dl class="item-options">
             <?php foreach ($_options as $_option) : ?>
             <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
                 <?php if (isset($_formatedOptionValue['full_view'])): ?>
                 <div class="truncated_full_value">
                     <dl class="item-options">
-                        <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+                        <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                         <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
                     </dl>
                 </div>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml b/app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml
index cbaaa6a0899..725de47df29 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml
@@ -26,7 +26,7 @@
 ?>
 <form id="co-shipping-method-form" action="">
     <div id="checkout-shipping-method-load">
-        <?php echo $this->getChildHtml('available') ?>
+       <!-- Content loaded dynamically -->
     </div>
     <script type="text/javascript">
     //<![CDATA[
diff --git a/app/design/frontend/base/default/template/checkout/total/default.phtml b/app/design/frontend/base/default/template/checkout/total/default.phtml
index cc65d14ab39..ed7a4fa573d 100644
--- a/app/design/frontend/base/default/template/checkout/total/default.phtml
+++ b/app/design/frontend/base/default/template/checkout/total/default.phtml
@@ -25,11 +25,11 @@
  */
 ?>
 <tr>
-    <th colspan="<?php echo $this->getColspan(); ?>" style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right">
+    <td colspan="<?php echo $this->getColspan(); ?>" style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right">
         <?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?><strong><?php endif; ?>
             <?php echo $this->escapeHtml($this->getTotal()->getTitle()); ?>
         <?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?></strong><?php endif; ?>
-    </th>
+    </td>
     <td style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right">
         <?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?><strong><?php endif; ?>
             <?php echo $this->helper('checkout')->formatPrice($this->getTotal()->getValue()) ?>
diff --git a/app/design/frontend/base/default/template/cms/widget/link/link_block.phtml b/app/design/frontend/base/default/template/cms/widget/link/link_block.phtml
index 92780f3dabd..db3fa85e86d 100644
--- a/app/design/frontend/base/default/template/cms/widget/link/link_block.phtml
+++ b/app/design/frontend/base/default/template/cms/widget/link/link_block.phtml
@@ -24,4 +24,4 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<span class="widget widget-cms-link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->htmlEscape($this->getAnchorText()) ?></span></a></span>
+<span class="widget widget-cms-link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>
diff --git a/app/design/frontend/base/default/template/cms/widget/link/link_inline.phtml b/app/design/frontend/base/default/template/cms/widget/link/link_inline.phtml
index 82e1076355f..01f7bdca080 100644
--- a/app/design/frontend/base/default/template/cms/widget/link/link_inline.phtml
+++ b/app/design/frontend/base/default/template/cms/widget/link/link_inline.phtml
@@ -24,4 +24,4 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<span class="widget widget-cms-link-inline"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->htmlEscape($this->getAnchorText()) ?></span></a></span>
+<span class="widget widget-cms-link-inline"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>
diff --git a/app/design/frontend/base/default/template/contacts/form.phtml b/app/design/frontend/base/default/template/contacts/form.phtml
index fda841b0c3b..ed6649c8493 100644
--- a/app/design/frontend/base/default/template/contacts/form.phtml
+++ b/app/design/frontend/base/default/template/contacts/form.phtml
@@ -36,13 +36,13 @@
                 <div class="field">
                     <label for="name" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Name') ?></label>
                     <div class="input-box">
-                        <input name="name" id="name" title="<?php echo Mage::helper('contacts')->__('Name') ?>" value="<?php echo $this->htmlEscape($this->helper('contacts')->getUserName()) ?>" class="input-text required-entry" type="text" />
+                        <input name="name" id="name" title="<?php echo Mage::helper('contacts')->__('Name') ?>" value="<?php echo $this->escapeHtml($this->helper('contacts')->getUserName()) ?>" class="input-text required-entry" type="text" />
                     </div>
                 </div>
                 <div class="field">
                     <label for="email" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Email') ?></label>
                     <div class="input-box">
-                        <input name="email" id="email" title="<?php echo Mage::helper('contacts')->__('Email') ?>" value="<?php echo $this->htmlEscape($this->helper('contacts')->getUserEmail()) ?>" class="input-text required-entry validate-email" type="text" />
+                        <input name="email" id="email" title="<?php echo Mage::helper('contacts')->__('Email') ?>" value="<?php echo $this->escapeHtml($this->helper('contacts')->getUserEmail()) ?>" class="input-text required-entry validate-email" type="text" />
                     </div>
                 </div>
             </li>
diff --git a/app/design/frontend/base/default/template/core/link.phtml b/app/design/frontend/base/default/template/core/link.phtml
index 8ecfa4fecab..4ca552b74e0 100644
--- a/app/design/frontend/base/default/template/core/link.phtml
+++ b/app/design/frontend/base/default/template/core/link.phtml
@@ -24,4 +24,4 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<a <?php echo $this->getLinkAttributes() ?>><?php echo $this->htmlEscape($this->getAnchorText()) ?></a>
+<a <?php echo $this->getLinkAttributes() ?>><?php echo $this->escapeHtml($this->getAnchorText()) ?></a>
diff --git a/app/design/frontend/base/default/template/customer/account/dashboard/hello.phtml b/app/design/frontend/base/default/template/customer/account/dashboard/hello.phtml
index 7e46a28f507..fc82d91f127 100644
--- a/app/design/frontend/base/default/template/customer/account/dashboard/hello.phtml
+++ b/app/design/frontend/base/default/template/customer/account/dashboard/hello.phtml
@@ -25,6 +25,6 @@
  */
 ?>
 <div class="welcome-msg">
-    <p class="hello"><strong><?php echo $this->__('Hello, %s!', $this->htmlEscape($this->getCustomerName())) ?></strong></p>
+    <p class="hello"><strong><?php echo $this->__('Hello, %s!', $this->escapeHtml($this->getCustomerName())) ?></strong></p>
     <p><?php echo $this->__('From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.') ?></p>
 </div>
diff --git a/app/design/frontend/base/default/template/customer/account/dashboard/info.phtml b/app/design/frontend/base/default/template/customer/account/dashboard/info.phtml
index c858594b3a1..0f5c42b59c9 100644
--- a/app/design/frontend/base/default/template/customer/account/dashboard/info.phtml
+++ b/app/design/frontend/base/default/template/customer/account/dashboard/info.phtml
@@ -33,8 +33,8 @@
             </div>
             <div class="box-content">
                 <p>
-                    <?php echo $this->htmlEscape($this->getCustomer()->getName()) ?><br />
-                    <?php echo $this->htmlEscape($this->getCustomer()->getEmail()) ?><br />
+                    <?php echo $this->escapeHtml($this->getCustomer()->getName()) ?><br />
+                    <?php echo $this->escapeHtml($this->getCustomer()->getEmail()) ?><br />
                     <a href="<?php echo $this->getChangePasswordUrl() ?>"><?php echo $this->__('Change Password') ?></a>
                 </p>
             </div>
diff --git a/app/design/frontend/base/default/template/customer/form/confirmation.phtml b/app/design/frontend/base/default/template/customer/form/confirmation.phtml
index bb8f0e9520f..78c3937673a 100644
--- a/app/design/frontend/base/default/template/customer/form/confirmation.phtml
+++ b/app/design/frontend/base/default/template/customer/form/confirmation.phtml
@@ -36,7 +36,7 @@
             <li>
                 <label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
                 <div class="input-box">
-                    <input type="text" name="email" id="email_address" title="<?php echo $this->__('Email Address') ?>" class="input-text required-entry validate-email" value="<?php echo $this->htmlEscape($this->getEmail()) ?>" />
+                    <input type="text" name="email" id="email_address" title="<?php echo $this->__('Email Address') ?>" class="input-text required-entry validate-email" value="<?php echo $this->escapeHtml($this->getEmail()) ?>" />
                 </div>
             </li>
         </ul>
diff --git a/app/design/frontend/base/default/template/customer/form/edit.phtml b/app/design/frontend/base/default/template/customer/form/edit.phtml
index 29c591475c7..babb3b2bc96 100644
--- a/app/design/frontend/base/default/template/customer/form/edit.phtml
+++ b/app/design/frontend/base/default/template/customer/form/edit.phtml
@@ -28,7 +28,7 @@
     <h1><?php echo $this->__('Edit Account Information') ?></h1>
 </div>
 <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<form action="<?php echo $this->getUrl('customer/account/editPost') ?>" method="post" id="form-validate">
+<form action="<?php echo $this->getUrl('customer/account/editPost') ?>" method="post" id="form-validate" autocomplete="off">
     <div class="fieldset">
         <?php echo $this->getBlockHtml('formkey')?>
         <h2 class="legend"><?php echo $this->__('Account Information') ?></h2>
@@ -39,7 +39,7 @@
             <li>
                 <label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
                 <div class="input-box">
-                    <input type="text" name="email" id="email" value="<?php echo $this->htmlEscape($this->getCustomer()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text required-entry validate-email" />
+                    <input type="text" name="email" id="email" value="<?php echo $this->escapeHtml($this->getCustomer()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text required-entry validate-email" />
                 </div>
             </li>
         <?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
@@ -65,6 +65,8 @@
             <li>
                 <label for="current_password" class="required"><em>*</em><?php echo $this->__('Current Password') ?></label>
                 <div class="input-box">
+                    <!-- This is a dummy hidden field to trick firefox from auto filling the password -->
+                    <input type="text" class="input-text no-display" name="dummy" id="dummy" />
                     <input type="password" title="<?php echo $this->__('Current Password') ?>" class="input-text" name="current_password" id="current_password" />
                 </div>
             </li>
@@ -107,6 +109,7 @@
             $('confirmation').removeClassName('required-entry');
         }
     }
+
     <?php if($this->getCustomer()->getChangePassword()): ?>
         setPasswordForm(true);
     <?php endif; ?>
diff --git a/app/design/frontend/base/default/template/customer/form/forgotpassword.phtml b/app/design/frontend/base/default/template/customer/form/forgotpassword.phtml
index cd0f6dcb649..054a0a4f8ba 100644
--- a/app/design/frontend/base/default/template/customer/form/forgotpassword.phtml
+++ b/app/design/frontend/base/default/template/customer/form/forgotpassword.phtml
@@ -36,7 +36,7 @@
             <li>
                 <label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
                 <div class="input-box">
-                    <input type="text" name="email" alt="email" id="email_address" class="input-text required-entry validate-email" value="<?php echo $this->htmlEscape($this->getEmailValue()) ?>" />
+                    <input type="text" name="email" alt="email" id="email_address" class="input-text required-entry validate-email" value="<?php echo $this->escapeHtml($this->getEmailValue()) ?>" />
                 </div>
             </li>
             <?php echo $this->getChildHtml('form.additional.info'); ?>
diff --git a/app/design/frontend/base/default/template/customer/form/login.phtml b/app/design/frontend/base/default/template/customer/form/login.phtml
index dfb82459834..09ce221aff6 100644
--- a/app/design/frontend/base/default/template/customer/form/login.phtml
+++ b/app/design/frontend/base/default/template/customer/form/login.phtml
@@ -54,7 +54,7 @@
                         <li>
                             <label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
                             <div class="input-box">
-                                <input type="text" name="login[username]" value="<?php echo $this->htmlEscape($this->getUsername()) ?>" id="email" class="input-text required-entry validate-email" title="<?php echo $this->__('Email Address') ?>" />
+                                <input type="text" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" id="email" class="input-text required-entry validate-email" title="<?php echo $this->__('Email Address') ?>" />
                             </div>
                         </li>
                         <li>
diff --git a/app/design/frontend/base/default/template/customer/wishlist.phtml b/app/design/frontend/base/default/template/customer/wishlist.phtml
index 80b0b1e8223..d9064b2ba95 100644
--- a/app/design/frontend/base/default/template/customer/wishlist.phtml
+++ b/app/design/frontend/base/default/template/customer/wishlist.phtml
@@ -51,7 +51,7 @@
             <tr>
                 <td>
                     <input type="hidden" value="1" name="wishlist[<?php echo $item->getItemId() ?>]" />
-                    <a href="<?php echo $this->getUrl('catalog/product/view/id/'.$item->getProduct()->getId()) ?>"><?php echo $this->htmlEscape($item->getProduct()->getName()) ?></a>
+                    <a href="<?php echo $this->getUrl('catalog/product/view/id/'.$item->getProduct()->getId()) ?>"><?php echo $this->escapeHtml($item->getProduct()->getName()) ?></a>
                 </td>
                 <td><?php echo $item->getStatus() ?></td>
                 <td><input type="checkbox" value="1" name="to_cart[<?php echo $item->getItemId() ?>]" class="checkbox" /></td>
diff --git a/app/design/frontend/base/default/template/downloadable/checkout/cart/item/default.phtml b/app/design/frontend/base/default/template/downloadable/checkout/cart/item/default.phtml
index 53fba48224c..9485d4c4b10 100644
--- a/app/design/frontend/base/default/template/downloadable/checkout/cart/item/default.phtml
+++ b/app/design/frontend/base/default/template/downloadable/checkout/cart/item/default.phtml
@@ -29,19 +29,19 @@
     $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage_Catalog_Model_Product_Attribute_Source_Msrp_Type::TYPE_BEFORE_ORDER_CONFIRM);
 ?>
 <tr>
-    <td><a href="<?php echo $this->getProductUrl() ?>" class="product-image" title="<?php echo $this->htmlEscape($this->getProductName()) ?>"><img src="<?php echo $this->getProductThumbnail()->resize(75); ?>" alt="<?php echo $this->htmlEscape($this->getProductName()) ?>" /></a></td>
+    <td><a href="<?php echo $this->getProductUrl() ?>" class="product-image" title="<?php echo $this->escapeHtml($this->getProductName()) ?>"><img src="<?php echo $this->getProductThumbnail()->resize(75); ?>" alt="<?php echo $this->escapeHtml($this->getProductName()) ?>" /></a></td>
     <td>
-        <h2 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->htmlEscape($this->getProductName()) ?></a></h2>
+        <h2 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></h2>
         <?php if ($_options = $this->getOptionList()):?>
         <dl class="item-options">
             <?php foreach ($_options as $_option) : ?>
             <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
                 <?php if (isset($_formatedOptionValue['full_view'])): ?>
                 <div class="truncated_full_value">
                     <dl class="item-options">
-                        <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+                        <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                         <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
                     </dl>
                 </div>
diff --git a/app/design/frontend/base/default/template/downloadable/checkout/multishipping/item/downloadable.phtml b/app/design/frontend/base/default/template/downloadable/checkout/multishipping/item/downloadable.phtml
index a04edbbba7f..30a8a61f241 100644
--- a/app/design/frontend/base/default/template/downloadable/checkout/multishipping/item/downloadable.phtml
+++ b/app/design/frontend/base/default/template/downloadable/checkout/multishipping/item/downloadable.phtml
@@ -24,18 +24,18 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<h3 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->htmlEscape($this->getProductName()) ?></a></h3>
+<h3 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></h3>
 <!-- item custom options -->
 <?php if ($_options = $this->getOptionList()):?>
 <dl class="item-options">
     <?php foreach ($_options as $_option) : ?>
     <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-    <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+    <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
     <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
         <?php if (isset($_formatedOptionValue['full_view'])): ?>
         <div class="truncated_full_value">
             <dl class="item-options">
-                <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+                <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                 <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
             </dl>
         </div>
diff --git a/app/design/frontend/base/default/template/downloadable/checkout/onepage/review/item.phtml b/app/design/frontend/base/default/template/downloadable/checkout/onepage/review/item.phtml
index e5246d838b9..a4a48240b26 100644
--- a/app/design/frontend/base/default/template/downloadable/checkout/onepage/review/item.phtml
+++ b/app/design/frontend/base/default/template/downloadable/checkout/onepage/review/item.phtml
@@ -26,18 +26,18 @@
 ?>
 <?php $_item = $this->getItem()?>
 <tr>
-    <td><h3 class="product-name"><?php echo $this->htmlEscape($this->getProductName()) ?></h3>
+    <td><h3 class="product-name"><?php echo $this->escapeHtml($this->getProductName()) ?></h3>
         <!-- item custom options -->
         <?php if ($_options = $this->getOptionList()):?>
         <dl class="item-options">
             <?php foreach ($_options as $_option) : ?>
             <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
                 <?php if (isset($_formatedOptionValue['full_view'])): ?>
                 <div class="truncated_full_value">
                     <dl class="item-options">
-                        <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+                        <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                         <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
                     </dl>
                 </div>
diff --git a/app/design/frontend/base/default/template/downloadable/email/order/items/creditmemo/downloadable.phtml b/app/design/frontend/base/default/template/downloadable/email/order/items/creditmemo/downloadable.phtml
index 794c1d125eb..6477af143af 100644
--- a/app/design/frontend/base/default/template/downloadable/email/order/items/creditmemo/downloadable.phtml
+++ b/app/design/frontend/base/default/template/downloadable/email/order/items/creditmemo/downloadable.phtml
@@ -28,7 +28,7 @@
 <?php $_order = $this->getItem()->getOrder(); ?>
 <tr>
     <td align="left" valign="top" style="padding:3px 9px">
-        <strong><?php echo $this->htmlEscape($_item->getName()) ?></strong>
+        <strong><?php echo $this->escapeHtml($_item->getName()) ?></strong>
         <?php if ($this->getItemOptions()): ?>
         <dl style="margin:0; padding:0;">
             <?php foreach ($this->getItemOptions() as $option): ?>
@@ -45,9 +45,9 @@
             <?php endforeach; ?>
         </dl>
         <?php endif; ?>
-        <?php echo $this->htmlEscape($_item->getDescription()) ?>
+        <?php echo $this->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->htmlEscape($this->getSku($_item)) ?></td>
+    <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
     <td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQty()*1 ?></td>
     <td align="right" valign="top" style="padding:3px 9px">
         <?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
diff --git a/app/design/frontend/base/default/template/downloadable/email/order/items/invoice/downloadable.phtml b/app/design/frontend/base/default/template/downloadable/email/order/items/invoice/downloadable.phtml
index daf14838c99..ef36b027649 100644
--- a/app/design/frontend/base/default/template/downloadable/email/order/items/invoice/downloadable.phtml
+++ b/app/design/frontend/base/default/template/downloadable/email/order/items/invoice/downloadable.phtml
@@ -28,7 +28,7 @@
 <?php $_order = $this->getItem()->getOrder(); ?>
 <tr>
     <td align="left" valign="top" style="padding:3px 9px">
-        <strong><?php echo $this->htmlEscape($_item->getName()) ?></strong>
+        <strong><?php echo $this->escapeHtml($_item->getName()) ?></strong>
         <?php if ($this->getItemOptions()): ?>
         <dl style="margin:0; padding:0;">
             <?php foreach ($this->getItemOptions() as $option): ?>
@@ -48,9 +48,9 @@
             <?php endforeach; ?>
         </dl>
         <?php endif; ?>
-        <?php echo $this->htmlEscape($_item->getDescription()) ?>
+        <?php echo $this->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->htmlEscape($this->getSku($_item)) ?></td>
+    <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
     <td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQty()*1 ?></td>
     <td align="right" valign="top" style="padding:3px 9px">
         <?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
diff --git a/app/design/frontend/base/default/template/downloadable/email/order/items/order/downloadable.phtml b/app/design/frontend/base/default/template/downloadable/email/order/items/order/downloadable.phtml
index d16f6cf1542..925e9dda5cc 100644
--- a/app/design/frontend/base/default/template/downloadable/email/order/items/order/downloadable.phtml
+++ b/app/design/frontend/base/default/template/downloadable/email/order/items/order/downloadable.phtml
@@ -28,7 +28,7 @@
 <?php $_order = $this->getItem()->getOrder() ?>
 <tr>
     <td align="left" valign="top" style="padding:3px 9px">
-        <strong><?php echo $this->htmlEscape($_item->getName()) ?></strong>
+        <strong><?php echo $this->escapeHtml($_item->getName()) ?></strong>
         <?php if ($this->getItemOptions()): ?>
         <dl style="margin:0; padding:0;">
             <?php foreach ($this->getItemOptions() as $option): ?>
@@ -48,15 +48,15 @@
             <?php endforeach; ?>
         </dl>
         <?php endif; ?>
-        <?php echo $this->htmlEscape($_item->getDescription()) ?>
+        <?php echo $this->escapeHtml($_item->getDescription()) ?>
         <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('giftmessage/message')->getGiftMessage($_item->getGiftMessageId())): ?>
         <br /><strong><?php echo $this->__('Gift Message') ?></strong>
-        <br /><?php echo $this->__('From:'); ?> <?php echo $this->htmlEscape($_giftMessage->getSender()) ?>
-        <br /><?php echo $this->__('To:'); ?> <?php echo $this->htmlEscape($_giftMessage->getRecipient()) ?>
-        <br /><?php echo $this->__('Message:'); ?><br /> <?php echo $this->htmlEscape($_giftMessage->getMessage()) ?>
+        <br /><?php echo $this->__('From:'); ?> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?>
+        <br /><?php echo $this->__('To:'); ?> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?>
+        <br /><?php echo $this->__('Message:'); ?><br /> <?php echo $this->escapeHtml($_giftMessage->getMessage()) ?>
         <?php endif; ?>
     </td>
-    <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->htmlEscape($this->getSku($_item)) ?></td>
+    <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
     <td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQtyOrdered()*1 ?></td>
     <td align="right" valign="top" style="padding:3px 9px">
         <?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
diff --git a/app/design/frontend/base/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml b/app/design/frontend/base/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml
index e373cabb3a5..3f55549fa8a 100644
--- a/app/design/frontend/base/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml
+++ b/app/design/frontend/base/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml
@@ -27,25 +27,25 @@
 <?php $_item = $this->getItem() ?>
 <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
 <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
-    <td><h4 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h4>
+    <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
         <?php if($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
         <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <?php if (!$this->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
                     <div class="truncated_full_value">
                         <dl class="item-options">
-                            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                             <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
                         </dl>
                     </div>
                     <?php endif; ?>
                 </dd>
             <?php else: ?>
-                <dd><?php echo $this->htmlEscape( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
+                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
             <?php endif; ?>
         <?php endforeach; ?>
         </dl>
@@ -62,12 +62,12 @@
         <?php endif; ?>
         <!-- EOF downloadable -->
 
-        <?php echo $this->htmlEscape($_item->getDescription()) ?>
+        <?php echo $this->escapeHtml($_item->getDescription()) ?>
         <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
             <br /><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="giftmessage-preview-link expand" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
         <?php endif; ?>
     </td>
-    <td><?php echo $this->htmlEscape(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
+    <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
     <td class="a-right nowrap">
         <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
             <span class="price-excl-tax">
diff --git a/app/design/frontend/base/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml b/app/design/frontend/base/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml
index 7c6b7bda83e..49128d0e737 100644
--- a/app/design/frontend/base/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml
+++ b/app/design/frontend/base/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml
@@ -27,11 +27,11 @@
 <?php $_item = $this->getItem() ?>
 <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
 <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
-    <td><h4 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h4>
+    <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
         <?php if($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
         <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <?php if (!$this->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
@@ -39,14 +39,14 @@
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
                     <div class="truncated_full_value">
                         <dl class="item-options">
-                            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                             <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
                         </dl>
                     </div>
                     <?php endif; ?>
                 </dd>
             <?php else: ?>
-                <dd><?php echo $this->htmlEscape( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
+                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
             <?php endif; ?>
         <?php endforeach; ?>
         </dl>
@@ -63,12 +63,12 @@
         <?php endif; ?>
         <!-- EOF downloadable -->
 
-        <?php echo $this->htmlEscape($_item->getDescription()) ?>
+        <?php echo $this->escapeHtml($_item->getDescription()) ?>
         <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
             <br /><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="giftmessage-preview-link expand" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
         <?php endif; ?>
     </td>
-    <td><?php echo $this->htmlEscape(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
+    <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
     <td class="a-right nowrap">
         <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
             <span class="price-excl-tax">
diff --git a/app/design/frontend/base/default/template/downloadable/sales/order/items/renderer/downloadable.phtml b/app/design/frontend/base/default/template/downloadable/sales/order/items/renderer/downloadable.phtml
index 2869b01c10b..3573d4e2136 100644
--- a/app/design/frontend/base/default/template/downloadable/sales/order/items/renderer/downloadable.phtml
+++ b/app/design/frontend/base/default/template/downloadable/sales/order/items/renderer/downloadable.phtml
@@ -26,11 +26,11 @@
 ?>
 <?php $_item = $this->getItem() ?>
 <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
-    <td><h3 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h3>
+    <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3>
         <?php if($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
         <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <?php if (!$this->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
@@ -38,14 +38,14 @@
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
                     <div class="truncated_full_value">
                         <dl class="item-options">
-                            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                             <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
                         </dl>
                     </div>
                     <?php endif; ?>
                 </dd>
             <?php else: ?>
-                <dd><?php echo $this->htmlEscape( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
+                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
             <?php endif; ?>
         <?php endforeach; ?>
         </dl>
@@ -62,12 +62,12 @@
         <?php endif; ?>
         <!-- EOF downloadable -->
 
-        <?php echo $this->htmlEscape($_item->getDescription()) ?>
+        <?php echo $this->escapeHtml($_item->getDescription()) ?>
         <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
             <br /><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="giftmessage-preview-link expand" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
         <?php endif; ?>
     </td>
-    <td><?php echo $this->htmlEscape(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
+    <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
     <td class="a-right nowrap">
         <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
             <span class="price-excl-tax">
diff --git a/app/design/frontend/base/default/template/email/order/items.phtml b/app/design/frontend/base/default/template/email/order/items.phtml
index a0085a34dac..902d91396db 100644
--- a/app/design/frontend/base/default/template/email/order/items.phtml
+++ b/app/design/frontend/base/default/template/email/order/items.phtml
@@ -62,9 +62,9 @@
 
         <tr>
             <td colspan="4" align="left" style="padding:3px 9px">
-            <strong><?php echo $this->__('From:'); ?></strong> <?php echo $this->htmlEscape($_giftMessage->getSender()) ?>
-            <br /><strong><?php echo $this->__('To:'); ?></strong> <?php echo $this->htmlEscape($_giftMessage->getRecipient()) ?>
-            <br /><strong><?php echo $this->__('Message:'); ?></strong><br /> <?php echo $this->htmlEscape($_giftMessage->getMessage()) ?>
+            <strong><?php echo $this->__('From:'); ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?>
+            <br /><strong><?php echo $this->__('To:'); ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?>
+            <br /><strong><?php echo $this->__('Message:'); ?></strong><br /> <?php echo $this->escapeHtml($_giftMessage->getMessage()) ?>
             </td>
         </tr>
     </tbody>
diff --git a/app/design/frontend/base/default/template/email/order/items/creditmemo/default.phtml b/app/design/frontend/base/default/template/email/order/items/creditmemo/default.phtml
index 51a2e8574d8..f7a30d4abcb 100644
--- a/app/design/frontend/base/default/template/email/order/items/creditmemo/default.phtml
+++ b/app/design/frontend/base/default/template/email/order/items/creditmemo/default.phtml
@@ -28,7 +28,7 @@
 <?php $_order = $this->getItem()->getOrder(); ?>
 <tr>
     <td align="left" valign="top" style="padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
-        <strong style="font-size:11px;"><?php echo $this->htmlEscape($_item->getName()) ?></strong>
+        <strong style="font-size:11px;"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
         <?php if ($this->getItemOptions()): ?>
         <dl style="margin:0; padding:0;">
             <?php foreach ($this->getItemOptions() as $option): ?>
@@ -41,9 +41,9 @@
         <?php if ($addInfoBlock) :?>
             <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
         <?php endif; ?>
-        <?php echo $this->htmlEscape($_item->getDescription()) ?>
+        <?php echo $this->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->htmlEscape($this->getSku($_item)) ?></td>
+    <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
     <td align="center" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $_item->getQty()*1 ?></td>
     <td align="right" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
         <?php if ($this->helper('tax')->displaySalesPriceExclTax($_order->getStore()) || $this->helper('tax')->displaySalesBothPrices($_order->getStore())): ?>
diff --git a/app/design/frontend/base/default/template/email/order/items/invoice/default.phtml b/app/design/frontend/base/default/template/email/order/items/invoice/default.phtml
index 51a2e8574d8..f7a30d4abcb 100644
--- a/app/design/frontend/base/default/template/email/order/items/invoice/default.phtml
+++ b/app/design/frontend/base/default/template/email/order/items/invoice/default.phtml
@@ -28,7 +28,7 @@
 <?php $_order = $this->getItem()->getOrder(); ?>
 <tr>
     <td align="left" valign="top" style="padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
-        <strong style="font-size:11px;"><?php echo $this->htmlEscape($_item->getName()) ?></strong>
+        <strong style="font-size:11px;"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
         <?php if ($this->getItemOptions()): ?>
         <dl style="margin:0; padding:0;">
             <?php foreach ($this->getItemOptions() as $option): ?>
@@ -41,9 +41,9 @@
         <?php if ($addInfoBlock) :?>
             <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
         <?php endif; ?>
-        <?php echo $this->htmlEscape($_item->getDescription()) ?>
+        <?php echo $this->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->htmlEscape($this->getSku($_item)) ?></td>
+    <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
     <td align="center" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $_item->getQty()*1 ?></td>
     <td align="right" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
         <?php if ($this->helper('tax')->displaySalesPriceExclTax($_order->getStore()) || $this->helper('tax')->displaySalesBothPrices($_order->getStore())): ?>
diff --git a/app/design/frontend/base/default/template/email/order/items/order/default.phtml b/app/design/frontend/base/default/template/email/order/items/order/default.phtml
index 6032413de5f..60be6b2db4f 100644
--- a/app/design/frontend/base/default/template/email/order/items/order/default.phtml
+++ b/app/design/frontend/base/default/template/email/order/items/order/default.phtml
@@ -28,13 +28,13 @@
 <?php $_order = $this->getItem()->getOrder() ?>
 <tr>
     <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
-        <strong style="font-size:11px;"><?php echo $this->htmlEscape($_item->getName()) ?></strong>
+        <strong style="font-size:11px;"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
         <?php if ($this->getItemOptions()): ?>
         <dl style="margin:0; padding:0;">
             <?php foreach ($this->getItemOptions() as $option): ?>
             <dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
             <dd style="margin:0; padding:0 0 0 9px;">
-                <?php echo (isset($option['print_value']) ? $option['print_value'] : nl2br($this->escapeHtml($option['value']))) ?>
+                <?php echo nl2br($option['value']) ?>
             </dd>
             <?php endforeach; ?>
         </dl>
@@ -45,7 +45,7 @@
         <?php endif; ?>
         <?php echo $this->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->htmlEscape($this->getSku($_item)) ?></td>
+    <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
     <td align="center" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $_item->getQtyOrdered()*1 ?></td>
     <td align="right" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
         <?php if ($this->helper('tax')->displaySalesPriceExclTax($_order->getStore()) || $this->helper('tax')->displaySalesBothPrices($_order->getStore())): ?>
@@ -128,9 +128,9 @@
 <tr>
     <td colspan="4" style=" border-bottom:2px solid #CCCCCC; padding:3px 9px;">
         <strong style="color:#444444; font-size:11px;"><?php echo $this->__('Gift Message') ?></strong>
-        <?php echo $this->__('From:'); ?> <?php echo $this->htmlEscape($_giftMessage->getSender()) ?><br />
-        <?php echo $this->__('To:'); ?> <?php echo $this->htmlEscape($_giftMessage->getRecipient()) ?><br />
-        <strong><?php echo $this->__('Message:'); ?></strong><br /><?php echo $this->htmlEscape($_giftMessage->getMessage()) ?>
+        <?php echo $this->__('From:'); ?> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?><br />
+        <?php echo $this->__('To:'); ?> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?><br />
+        <strong><?php echo $this->__('Message:'); ?></strong><br /><?php echo $this->escapeHtml($_giftMessage->getMessage()) ?>
     </td>
 </tr>
 <?php endif; ?>
diff --git a/app/design/frontend/base/default/template/email/order/items/shipment/default.phtml b/app/design/frontend/base/default/template/email/order/items/shipment/default.phtml
index 0e329edf62e..452ee3ded40 100644
--- a/app/design/frontend/base/default/template/email/order/items/shipment/default.phtml
+++ b/app/design/frontend/base/default/template/email/order/items/shipment/default.phtml
@@ -27,7 +27,7 @@
 <?php $_item = $this->getItem() ?>
 <tr>
     <td align="left" valign="top" style="font-size:11px; padding:3px 9px;">
-        <strong><?php echo $this->htmlEscape($_item->getName()) ?></strong>
+        <strong><?php echo $this->escapeHtml($_item->getName()) ?></strong>
         <?php if ($this->getItemOptions()): ?>
         <dl style="margin:0; padding:0;">
             <?php foreach ($this->getItemOptions() as $option): ?>
@@ -40,8 +40,8 @@
         <?php if ($addInfoBlock) :?>
             <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
         <?php endif; ?>
-        <?php echo $this->htmlEscape($_item->getDescription()) ?>
+        <?php echo $this->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td align="left" valign="top" style="font-size:11px; padding:3px 9px;"><?php echo $this->htmlEscape($this->getSku($_item)) ?></td>
+    <td align="left" valign="top" style="font-size:11px; padding:3px 9px;"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
     <td align="center" valign="top" style="font-size:11px; padding:3px 9px;"><?php echo $_item->getQty()*1 ?></td>
 </tr>
diff --git a/app/design/frontend/base/default/template/email/order/shipment/track.phtml b/app/design/frontend/base/default/template/email/order/shipment/track.phtml
index e670dd03a2e..520d0feaf7f 100644
--- a/app/design/frontend/base/default/template/email/order/shipment/track.phtml
+++ b/app/design/frontend/base/default/template/email/order/shipment/track.phtml
@@ -37,8 +37,8 @@
     <tbody>
     <?php $i=0; foreach ($_shipment->getAllTracks() as $_item): $i++ ?>
         <tr <?php echo $i%2?'bgcolor="#F6F6F6"':'' ?>>
-            <td align="left" valign="top" style="padding:3px 9px"><?php echo $_item->getTitle() ?></td>
-            <td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getNumber() ?></td>
+            <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($_item->getTitle()) ?></td>
+            <td align="center" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($_item->getNumber()) ?></td>
         </tr>
     <?php endforeach ?>
     </tbody>
diff --git a/app/design/frontend/base/default/template/email/productalert/price.phtml b/app/design/frontend/base/default/template/email/productalert/price.phtml
index bf3ad5f7d4f..e9f64627fe2 100644
--- a/app/design/frontend/base/default/template/email/productalert/price.phtml
+++ b/app/design/frontend/base/default/template/email/productalert/price.phtml
@@ -29,10 +29,10 @@
 <table>
 <?php foreach ($_products as $_product): ?>
     <tr>
-        <td><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->htmlEscape($_product->getName()) ?>"><img src="<?php echo $_product->getThumbnailUrl() ?>" border="0" align="left" height="75" width="75" alt="<?php echo $this->htmlEscape($_product->getName()) ?>" /></a></td>
+        <td><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>"><img src="<?php echo $_product->getThumbnailUrl() ?>" border="0" align="left" height="75" width="75" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" /></a></td>
         <td>
-            <p><a href="<?php echo $_product->getProductUrl() ?>"><strong><?php echo $this->htmlEscape($_product->getName()) ?></strong></a></p>
-            <?php if ($shortDescription = $this->htmlEscape($_product->getShortDescription())): ?>
+            <p><a href="<?php echo $_product->getProductUrl() ?>"><strong><?php echo $this->escapeHtml($_product->getName()) ?></strong></a></p>
+            <?php if ($shortDescription = $this->escapeHtml($_product->getShortDescription())): ?>
             <p><small><?php echo $shortDescription ?></small></p>
             <?php endif; ?>
             <p><?php if ($_product->getPrice() != $_product->getFinalPrice()): ?>
diff --git a/app/design/frontend/base/default/template/email/productalert/stock.phtml b/app/design/frontend/base/default/template/email/productalert/stock.phtml
index f27ca00005b..4106b8301e5 100644
--- a/app/design/frontend/base/default/template/email/productalert/stock.phtml
+++ b/app/design/frontend/base/default/template/email/productalert/stock.phtml
@@ -29,10 +29,10 @@
 <table>
 <?php foreach ($_products as $_product): ?>
     <tr>
-        <td><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->htmlEscape($_product->getName()) ?>"><img src="<?php echo $this->helper('catalog/image')->init($_product, 'thumbnail')->resize(75, 75) ?>" border="0" align="left" height="75" width="75" alt="<?php echo $this->htmlEscape($_product->getName()) ?>" /></a></td>
+        <td><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>"><img src="<?php echo $this->helper('catalog/image')->init($_product, 'thumbnail')->resize(75, 75) ?>" border="0" align="left" height="75" width="75" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" /></a></td>
         <td>
-            <p><a href="<?php echo $_product->getProductUrl() ?>"><strong><?php echo $this->htmlEscape($_product->getName()) ?></strong></a></p>
-            <?php if ($shortDescription = $this->htmlEscape($_product->getShortDescription())): ?>
+            <p><a href="<?php echo $_product->getProductUrl() ?>"><strong><?php echo $this->escapeHtml($_product->getName()) ?></strong></a></p>
+            <?php if ($shortDescription = $this->escapeHtml($_product->getShortDescription())): ?>
             <p><small><?php echo $shortDescription ?></small></p>
             <?php endif; ?>
             <p><?php if ($_product->getPrice() != $_product->getFinalPrice()): ?>
diff --git a/app/design/frontend/base/default/template/giftmessage/inline.phtml b/app/design/frontend/base/default/template/giftmessage/inline.phtml
index b8dd2bd9edf..4b08308c837 100644
--- a/app/design/frontend/base/default/template/giftmessage/inline.phtml
+++ b/app/design/frontend/base/default/template/giftmessage/inline.phtml
@@ -161,13 +161,13 @@ billing.onSave = function(evt){
                  <li class="item">
                      <div class="product-img-box">
                          <p class="product-image">
-                             <img src="<?php echo $this->helper('catalog/image')->init($_product, 'thumbnail')->resize(75); ?>" width="75" height="75" alt="<?php echo $this->htmlEscape($_product->getName()) ?>" title="<?php echo $this->htmlEscape($_product->getName()) ?>" />
+                             <img src="<?php echo $this->helper('catalog/image')->init($_product, 'thumbnail')->resize(75); ?>" width="75" height="75" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>" />
                          </p>
                          <p class="number"><?php echo $this->__('Item %d of %d', $_index+1, $this->countItems()) ?></p>
                      </div>
                      <div class="details">
                          <div class="f-fix">
-                             <h5 class="product-name"><?php echo $this->htmlEscape($_product->getName()) ?></h5>
+                             <h5 class="product-name"><?php echo $this->escapeHtml($_product->getName()) ?></h5>
                              <input type="hidden" name="giftmessage[<?php echo $_item->getId() ?>][type]" value="quote_item" />
                               <ul class="form-list">
                                  <li class="fields">
@@ -278,14 +278,14 @@ billing.onSave = function(evt){
              <?php $_product=$_item->getProduct() ?>
                  <li class="item">
                      <div class="product-img-box">
-                         <p class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_product, 'small_image')->resize(75); ?>" width="75" height="75" alt="<?php echo $this->htmlEscape($_product->getName()) ?>" title="<?php echo $this->htmlEscape($_product->getName()) ?>" /></p>
+                         <p class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_product, 'small_image')->resize(75); ?>" width="75" height="75" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>" /></p>
                          <p class="number"><?php echo $this->__('Item %d of %d', $_index+1, $this->countItems()) ?></p>
                      </div>
                      <div class="details">
                          <div class="f-fix">
                              <input type="hidden" name="giftmessage[<?php echo $_item->getId() ?>][type]" value="quote_address_item" />
                              <input type="hidden" name="giftmessage[<?php echo $_item->getId() ?>][address]" value="<?php echo $this->getEntity()->getId()?>" />
-                             <h5 class="product-name"><?php echo $this->htmlEscape($_product->getName()) ?></h5>
+                             <h5 class="product-name"><?php echo $this->escapeHtml($_product->getName()) ?></h5>
                              <ul class="form-list">
                                  <li class="fields">
                                      <div class="field">
diff --git a/app/design/frontend/base/default/template/googlecheckout/link.phtml b/app/design/frontend/base/default/template/googlecheckout/link.phtml
index edcff9fdd37..4c7097412bc 100644
--- a/app/design/frontend/base/default/template/googlecheckout/link.phtml
+++ b/app/design/frontend/base/default/template/googlecheckout/link.phtml
@@ -26,12 +26,12 @@
 ?>
 <?php echo $this->getBeforeHtml(); ?>
 <?php if ($this->getIsDisabled()): ?>
-<img src="<?php echo $this->htmlEscape($this->getImageUrl())?>" alt="<?php echo Mage::helper('googlecheckout')->__('Fast checkout through Google');?>" title="<?php echo Mage::helper('googlecheckout')->__('Fast Checkout through Google');?>" />
+<img src="<?php echo $this->escapeHtml($this->getImageUrl())?>" alt="<?php echo Mage::helper('googlecheckout')->__('Fast checkout through Google');?>" title="<?php echo Mage::helper('googlecheckout')->__('Fast Checkout through Google');?>" />
 <?php else: ?>
 <form method="post" action="<?php echo $this->getCheckoutUrl();?>"<?php if ($this->getOnsubmitJs()):?> onsubmit="<?php echo $this->getOnsubmitJs() ?>"<?php endif;?>>
     <fieldset>
         <input type="hidden" name="analyticsdata" value="" />
-        <input type="image" src="<?php echo $this->htmlEscape($this->getImageUrl())?>" title="<?php echo Mage::helper('googlecheckout')->__('Fast checkout through Google');?>" alt="<?php echo Mage::helper('googlecheckout')->__('Fast Checkout through Google');?>" />
+        <input type="image" src="<?php echo $this->escapeHtml($this->getImageUrl())?>" title="<?php echo Mage::helper('googlecheckout')->__('Fast checkout through Google');?>" alt="<?php echo Mage::helper('googlecheckout')->__('Fast Checkout through Google');?>" />
     </fieldset>
 </form>
 <?php endif; ?>
diff --git a/app/design/frontend/base/default/template/moneybookers/info.phtml b/app/design/frontend/base/default/template/moneybookers/info.phtml
index 4c49647fd93..ab5b2b86f20 100644
--- a/app/design/frontend/base/default/template/moneybookers/info.phtml
+++ b/app/design/frontend/base/default/template/moneybookers/info.phtml
@@ -24,9 +24,9 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 ?>
-<?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
+<?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?><br />
 <?php if ($this->getInfo()->getLastTransId() == ''): ?>
     <em><?php echo Mage::helper('moneybookers')->__('You will be redirected to our secure payment page when you place an order.') ?></em>
 <?php else: ?>
-    <?php echo Mage::helper('moneybookers')->__('Moneybookers Transaction ID: %s', $this->htmlEscape($this->getInfo()->getLastTransId())) ?><br />
+    <?php echo Mage::helper('moneybookers')->__('Moneybookers Transaction ID: %s', $this->escapeHtml($this->getInfo()->getLastTransId())) ?><br />
 <?php endif; ?>
diff --git a/app/design/frontend/base/default/template/moneybookers/placeform.phtml b/app/design/frontend/base/default/template/moneybookers/placeform.phtml
index 4e09e231e2f..60fc188f7d6 100644
--- a/app/design/frontend/base/default/template/moneybookers/placeform.phtml
+++ b/app/design/frontend/base/default/template/moneybookers/placeform.phtml
@@ -39,4 +39,4 @@
     var paymentform = document.getElementById('moneybookers_place_form');
     window.onload = paymentform.submit();
 //]]>
-</script>
\ No newline at end of file
+</script>
diff --git a/app/design/frontend/base/default/template/page/html/breadcrumbs.phtml b/app/design/frontend/base/default/template/page/html/breadcrumbs.phtml
index 6441658b87e..a3305450710 100644
--- a/app/design/frontend/base/default/template/page/html/breadcrumbs.phtml
+++ b/app/design/frontend/base/default/template/page/html/breadcrumbs.phtml
@@ -30,11 +30,11 @@
         <?php foreach($crumbs as $_crumbName=>$_crumbInfo): ?>
             <li class="<?php echo $_crumbName ?>">
             <?php if($_crumbInfo['link']): ?>
-                <a href="<?php echo $_crumbInfo['link'] ?>" title="<?php echo $this->htmlEscape($_crumbInfo['title']) ?>"><?php echo $this->htmlEscape($_crumbInfo['label']) ?></a>
+                <a href="<?php echo $_crumbInfo['link'] ?>" title="<?php echo $this->escapeHtml($_crumbInfo['title']) ?>"><?php echo $this->escapeHtml($_crumbInfo['label']) ?></a>
             <?php elseif($_crumbInfo['last']): ?>
-                <strong><?php echo $this->htmlEscape($_crumbInfo['label']) ?></strong>
+                <strong><?php echo $this->escapeHtml($_crumbInfo['label']) ?></strong>
             <?php else: ?>
-                <?php echo $this->htmlEscape($_crumbInfo['label']) ?>
+                <?php echo $this->escapeHtml($_crumbInfo['label']) ?>
             <?php endif; ?>
             <?php if(!$_crumbInfo['last']): ?>
                 <span>/ </span>
diff --git a/app/design/frontend/base/default/template/page/html/header.phtml b/app/design/frontend/base/default/template/page/html/header.phtml
index 8ce9d6a7594..5f6a9770cc2 100644
--- a/app/design/frontend/base/default/template/page/html/header.phtml
+++ b/app/design/frontend/base/default/template/page/html/header.phtml
@@ -36,7 +36,7 @@
         <?php endif?>
         <div class="quick-access">
             <?php echo $this->getChildHtml('topSearch') ?>
-            <p class="welcome-msg"><?php echo $this->getWelcome() ?> <?php echo $this->getAdditionalHtml() ?></p>
+            <p class="welcome-msg"><?php echo $this->getChildHtml('welcome') ?> <?php echo $this->getAdditionalHtml() ?></p>
             <?php echo $this->getChildHtml('topLinks') ?>
             <?php echo $this->getChildHtml('store_language') ?>
         </div>
diff --git a/app/design/frontend/base/default/template/page/print.phtml b/app/design/frontend/base/default/template/page/print.phtml
index f2c4c41c86f..b14d04ab12e 100644
--- a/app/design/frontend/base/default/template/page/print.phtml
+++ b/app/design/frontend/base/default/template/page/print.phtml
@@ -39,7 +39,7 @@
     <div class="print-head">
         <img src="<?php echo $this->getPrintLogoUrl() ? $this->getPrintLogoUrl() : $this->getSkinUrl('images/logo_print.gif') ?>" class="logo" alt="" />
         <?php if ($this->getPrintLogoText()):?>
-            <address><?php echo nl2br($this->htmlEscape($this->getPrintLogoText())) ?></address>
+            <address><?php echo nl2br($this->escapeHtml($this->getPrintLogoText())) ?></address>
         <?php endif;?>
     </div>
     <?php echo $this->getChildHtml('content') ?>
diff --git a/app/design/frontend/base/default/template/page/switch/flags.phtml b/app/design/frontend/base/default/template/page/switch/flags.phtml
index 6a76671df50..512fd4d4bad 100644
--- a/app/design/frontend/base/default/template/page/switch/flags.phtml
+++ b/app/design/frontend/base/default/template/page/switch/flags.phtml
@@ -30,7 +30,7 @@
     <select id="select-language" title="<?php echo $this->__('Your Language') ?>" onchange="window.location.href=this.value" class="flags">
     <?php foreach ($this->getStores() as $_lang): ?>
         <?php $_selected = ($_lang->getId() == $this->getCurrentStoreId()) ? ' selected="selected"' : '' ?>
-        <option value="<?php echo $_lang->getCurrentUrl() ?>" style="background-image:url('<?php echo $this->getSkinUrl('images/flags/flag_'.$_lang->getCode().'.gif') ?>');"<?php echo $_selected ?>><?php echo $this->htmlEscape($_lang->getName()) ?></option>
+        <option value="<?php echo $_lang->getCurrentUrl() ?>" style="background-image:url('<?php echo $this->getSkinUrl('images/flags/flag_'.$_lang->getCode().'.gif') ?>');"<?php echo $_selected ?>><?php echo $this->escapeHtml($_lang->getName()) ?></option>
     <?php endforeach; ?>
     </select>
 </div>
diff --git a/app/design/frontend/base/default/template/page/switch/languages.phtml b/app/design/frontend/base/default/template/page/switch/languages.phtml
index 18e3c20f1b3..a20e8e6d832 100644
--- a/app/design/frontend/base/default/template/page/switch/languages.phtml
+++ b/app/design/frontend/base/default/template/page/switch/languages.phtml
@@ -37,7 +37,7 @@
     <select id="select-language" title="<?php echo $this->__('Your Language') ?>" onchange="window.location.href=this.value">
     <?php foreach ($this->getStores() as $_lang): ?>
         <?php $_selected = ($_lang->getId() == $this->getCurrentStoreId()) ? ' selected="selected"' : '' ?>
-        <option value="<?php echo $_lang->getCurrentUrl() ?>"<?php echo $_selected ?>><?php echo $this->htmlEscape($_lang->getName()) ?></option>
+        <option value="<?php echo $_lang->getCurrentUrl() ?>"<?php echo $_selected ?>><?php echo $this->escapeHtml($_lang->getName()) ?></option>
     <?php endforeach; ?>
     </select>
 </div>
diff --git a/app/design/frontend/base/default/template/page/switch/stores.phtml b/app/design/frontend/base/default/template/page/switch/stores.phtml
index ba15a5190fa..12e9c6225d8 100644
--- a/app/design/frontend/base/default/template/page/switch/stores.phtml
+++ b/app/design/frontend/base/default/template/page/switch/stores.phtml
@@ -24,7 +24,7 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<?php 
+<?php
 /**
  * Store switcher template
  *
@@ -40,7 +40,7 @@
     <?php endforeach;*/ ?>
     <?php foreach ($this->getGroups() as $_group): ?>
         <?php $_selected = ($_group->getId()==$this->getCurrentGroupId()) ? ' selected="selected"' : '' ?>
-        <option value="<?php echo $_group->getHomeUrl() ?>"<?php echo $_selected ?>><?php echo $this->htmlEscape($_group->getName()) ?></option>
+        <option value="<?php echo $_group->getHomeUrl() ?>"<?php echo $_selected ?>><?php echo $this->escapeHtml($_group->getName()) ?></option>
     <?php endforeach; ?>
     </select>
 </div>
diff --git a/app/design/frontend/base/default/template/paygate/info/cc.phtml b/app/design/frontend/base/default/template/paygate/info/cc.phtml
index 5ed83c20371..27a956caa18 100644
--- a/app/design/frontend/base/default/template/paygate/info/cc.phtml
+++ b/app/design/frontend/base/default/template/paygate/info/cc.phtml
@@ -26,7 +26,7 @@
 ?>
 
 <?php if (!$this->getHideTitle()): ?>
-    <p><strong><?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?></strong></p>
+    <p><strong><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></strong></p>
 <?php endif;?>
 
 <?php
diff --git a/app/design/frontend/base/default/template/payment/form/cc.phtml b/app/design/frontend/base/default/template/payment/form/cc.phtml
index 6dfe3f7f8fb..45451c2c0c3 100644
--- a/app/design/frontend/base/default/template/payment/form/cc.phtml
+++ b/app/design/frontend/base/default/template/payment/form/cc.phtml
@@ -30,7 +30,7 @@
     <li>
         <div class="input-box">
             <label for="<?php echo $_code ?>_cc_owner" class="required"><em>*</em><?php echo $this->__('Name on Card') ?></label>
-            <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="input-text required-entry" id="<?php echo $_code ?>_cc_owner" name="payment[cc_owner]" value="<?php echo $this->htmlEscape($this->getInfoData('cc_owner')) ?>" />
+            <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="input-text required-entry" id="<?php echo $_code ?>_cc_owner" name="payment[cc_owner]" value="<?php echo $this->escapeHtml($this->getInfoData('cc_owner')) ?>" />
         </div>
     </li>
 */ ?>
diff --git a/app/design/frontend/base/default/template/payment/form/ccsave.phtml b/app/design/frontend/base/default/template/payment/form/ccsave.phtml
index 42e92df6628..830c92c95b2 100644
--- a/app/design/frontend/base/default/template/payment/form/ccsave.phtml
+++ b/app/design/frontend/base/default/template/payment/form/ccsave.phtml
@@ -29,7 +29,7 @@
     <li>
         <label for="<?php echo $_code ?>_cc_owner" class="required"><em>*</em><?php echo $this->__('Name on Card') ?></label>
         <div class="input-box">
-            <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="input-text required-entry" id="<?php echo $_code ?>_cc_owner" name="payment[cc_owner]" value="<?php echo $this->htmlEscape($this->getInfoData('cc_owner')) ?>" />
+            <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="input-text required-entry" id="<?php echo $_code ?>_cc_owner" name="payment[cc_owner]" value="<?php echo $this->escapeHtml($this->getInfoData('cc_owner')) ?>" />
         </div>
     </li>
     <li>
diff --git a/app/design/frontend/base/default/template/payment/form/purchaseorder.phtml b/app/design/frontend/base/default/template/payment/form/purchaseorder.phtml
index 27d3458ec88..af44aa7818b 100644
--- a/app/design/frontend/base/default/template/payment/form/purchaseorder.phtml
+++ b/app/design/frontend/base/default/template/payment/form/purchaseorder.phtml
@@ -28,7 +28,7 @@
     <li>
         <label for="po_number" class="required"><em>*</em><?php echo $this->__('Purchase Order Number') ?></label>
         <div class="input-box">
-            <input type="text" id="po_number" name="payment[po_number]" title="<?php echo $this->__('Purchase Order Number') ?>" class="input-text required-entry" value="<?php echo $this->htmlEscape($this->getInfoData('po_number')) ?>" />
+            <input type="text" id="po_number" name="payment[po_number]" title="<?php echo $this->__('Purchase Order Number') ?>" class="input-text required-entry" value="<?php echo $this->escapeHtml($this->getInfoData('po_number')) ?>" />
         </div>
     </li>
 </ul>
diff --git a/app/design/frontend/base/default/template/payment/info/checkmo.phtml b/app/design/frontend/base/default/template/payment/info/checkmo.phtml
index 33495740e17..7d20c21abd3 100644
--- a/app/design/frontend/base/default/template/payment/info/checkmo.phtml
+++ b/app/design/frontend/base/default/template/payment/info/checkmo.phtml
@@ -24,7 +24,7 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<p><?php echo $this->getMethod()->getTitle() ?></p>
+<p><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></p>
 <?php if($this->getInfo()->getAdditionalData()): ?>
     <?php if($this->getPayableTo()): ?>
         <p><strong><?php echo $this->__('Make Check payable to:') ?></strong> <?php echo $this->escapeHtml($this->getPayableTo()) ?></p>
diff --git a/app/design/frontend/base/default/template/payment/info/default.phtml b/app/design/frontend/base/default/template/payment/info/default.phtml
index 67132c57341..b2eed7cf204 100644
--- a/app/design/frontend/base/default/template/payment/info/default.phtml
+++ b/app/design/frontend/base/default/template/payment/info/default.phtml
@@ -29,7 +29,7 @@
  * @see Mage_Payment_Block_Info
  */
 ?>
-<p><strong><?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?></strong></p>
+<p><strong><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></strong></p>
 
 <?php if ($_specificInfo = $this->getSpecificInformation()):?>
 <table>
diff --git a/app/design/frontend/base/default/template/payment/info/purchaseorder.phtml b/app/design/frontend/base/default/template/payment/info/purchaseorder.phtml
index 1ab56adfaf7..f49d9d0a1b0 100644
--- a/app/design/frontend/base/default/template/payment/info/purchaseorder.phtml
+++ b/app/design/frontend/base/default/template/payment/info/purchaseorder.phtml
@@ -24,5 +24,5 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<p><?php echo $this->getMethod()->getTitle() ?></p>
-<p><strong><?php echo $this->__('Purchase Order Number:') ?></strong> <span class="nobr"><?php echo $this->htmlEscape($this->getInfo()->getPoNumber()) ?></span></p>
+<p><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></p>
+<p><strong><?php echo $this->__('Purchase Order Number:') ?></strong> <span class="nobr"><?php echo $this->escapeHtml($this->getInfo()->getPoNumber()) ?></span></p>
diff --git a/app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml b/app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml
index 9d15a577bd2..90aba86e3fd 100644
--- a/app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml
+++ b/app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml
@@ -78,7 +78,7 @@
                 <li>
                     <label for="login-email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
                     <div class="input-box">
-                        <input type="text" class="input-text required-entry validate-email" id="login-email" name="login[username]" value="<?php echo $this->htmlEscape($this->getUsername()) ?>" />
+                        <input type="text" class="input-text required-entry validate-email" id="login-email" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" />
                     </div>
                 </li>
                 <li>
diff --git a/app/design/frontend/base/default/template/persistent/customer/form/login.phtml b/app/design/frontend/base/default/template/persistent/customer/form/login.phtml
index 622620f60d0..67bee7aef4d 100644
--- a/app/design/frontend/base/default/template/persistent/customer/form/login.phtml
+++ b/app/design/frontend/base/default/template/persistent/customer/form/login.phtml
@@ -53,7 +53,7 @@
                         <li>
                             <label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
                             <div class="input-box">
-                                <input type="text" name="login[username]" value="<?php echo $this->htmlEscape($this->getUsername()) ?>" id="email" class="input-text required-entry validate-email" title="<?php echo $this->__('Email Address') ?>" />
+                                <input type="text" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" id="email" class="input-text required-entry validate-email" title="<?php echo $this->__('Email Address') ?>" />
                             </div>
                         </li>
                         <li>
diff --git a/app/design/frontend/base/default/template/poll/active.phtml b/app/design/frontend/base/default/template/poll/active.phtml
index 5f882213b0c..f54ef112ec9 100644
--- a/app/design/frontend/base/default/template/poll/active.phtml
+++ b/app/design/frontend/base/default/template/poll/active.phtml
@@ -45,13 +45,13 @@
     </div>
     <form id="pollForm" action="<?php echo $action ?>" method="post" onsubmit="return validatePollAnswerIsSelected();">
         <div class="block-content">
-            <p class="block-subtitle"><?php echo $this->htmlEscape($poll->getPollTitle()); ?></p>
+            <p class="block-subtitle"><?php echo $this->escapeHtml($poll->getPollTitle()); ?></p>
             <?php if( $poll_answers ): ?>
             <ul id="poll-answers">
                 <?php foreach( $poll_answers as $answer ): ?>
                 <li>
                     <input type="radio" name="vote" class="radio poll_vote" id="vote_<?php echo $answer->getId() ?>" value="<?php echo $answer->getAnswerId() ?>" />
-                    <span class="label"><label for="vote_<?php echo $answer->getId() ?>"><?php echo $this->htmlEscape($answer->getAnswerTitle()) ?></label></span>
+                    <span class="label"><label for="vote_<?php echo $answer->getId() ?>"><?php echo $this->escapeHtml($answer->getAnswerTitle()) ?></label></span>
                 </li>
                 <?php endforeach; ?>
             </ul>
diff --git a/app/design/frontend/base/default/template/poll/result.phtml b/app/design/frontend/base/default/template/poll/result.phtml
index 5f020a381cf..e1b9c095e4c 100644
--- a/app/design/frontend/base/default/template/poll/result.phtml
+++ b/app/design/frontend/base/default/template/poll/result.phtml
@@ -30,13 +30,13 @@
         <strong><span><?php echo $this->__('Community Poll') ?></span></strong>
     </div>
     <div class="block-content">
-        <p class="block-subtitle"><?php echo $this->htmlEscape($poll->getPollTitle()); ?></p>
+        <p class="block-subtitle"><?php echo $this->escapeHtml($poll->getPollTitle()); ?></p>
         <?php if( $poll_answers ): ?>
         <ol id="poll-answers">
             <?php foreach( $poll_answers as $answer ): ?>
                 <li>
                     <span class="votes"><?php echo $answer->getVotesCount() ?> (<?php echo $answer->getPercent() ?>%)</span>
-                    <span class="answer"><?php echo $this->htmlEscape($answer->getAnswerTitle()) ?>:</span>
+                    <span class="answer"><?php echo $this->escapeHtml($answer->getAnswerTitle()) ?>:</span>
                 </li>
             <?php endforeach; ?>
         </ol>
diff --git a/app/design/frontend/base/default/template/review/customer/list.phtml b/app/design/frontend/base/default/template/review/customer/list.phtml
index 1717f32ea86..25e026d12cc 100644
--- a/app/design/frontend/base/default/template/review/customer/list.phtml
+++ b/app/design/frontend/base/default/template/review/customer/list.phtml
@@ -40,7 +40,7 @@
                 <?php foreach ($this->getCollection() as $_review): ?>
                 <tr>
                     <td><span class="nobr"><?php echo $this->dateFormat($_review->getReviewCreatedAt()); ?></span></td>
-                    <td><h2 class="product-name"><a href="<?php echo $this->getProductLink() ?>id/<?php echo $_review->getEntityPkValue() ?>"><?php echo $this->htmlEscape($_review->getName()) ?></a></h2></td>
+                    <td><h2 class="product-name"><a href="<?php echo $this->getProductLink() ?>id/<?php echo $_review->getEntityPkValue() ?>"><?php echo $this->escapeHtml($_review->getName()) ?></a></h2></td>
                     <td>
                     <?php if($_review->getSum()): ?>
                         <div class="rating-box">
diff --git a/app/design/frontend/base/default/template/review/customer/recent.phtml b/app/design/frontend/base/default/template/review/customer/recent.phtml
index 17040a86243..af87fc6d94c 100644
--- a/app/design/frontend/base/default/template/review/customer/recent.phtml
+++ b/app/design/frontend/base/default/template/review/customer/recent.phtml
@@ -36,7 +36,7 @@
         <li class="item">
             <span class="number"><?php echo ++$iterator ?></span>
             <div class="details">
-                <h3 class="product-name"><a href="<?php echo $this->getReviewUrl($_review->getReviewId()) ?>"><?php echo $this->htmlEscape($_review->getName()) ?></a></h3>
+                <h3 class="product-name"><a href="<?php echo $this->getReviewUrl($_review->getReviewId()) ?>"><?php echo $this->escapeHtml($_review->getName()) ?></a></h3>
                 <?php if($_review->getSum()): ?>
                     <div class="ratings">
                         <strong><?php echo $this->__('Rating:') ?></strong>
diff --git a/app/design/frontend/base/default/template/review/customer/view.phtml b/app/design/frontend/base/default/template/review/customer/view.phtml
index 2d06f00ff4d..49ec74730bf 100644
--- a/app/design/frontend/base/default/template/review/customer/view.phtml
+++ b/app/design/frontend/base/default/template/review/customer/view.phtml
@@ -30,14 +30,14 @@
         <h1><?php echo $this->__('Review Details') ?></h1>
     </div>
     <div class="product-img-box">
-        <a href="<?php echo $this->getProductData()->getProductUrl() ?>" title="<?php echo $this->htmlEscape($this->getProductData()->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getProductData(), 'small_image')->resize(125, 125); ?>" width="125" height="125" alt="<?php echo $this->htmlEscape($this->getProductData()->getName()) ?>" /></a>
+        <a href="<?php echo $this->getProductData()->getProductUrl() ?>" title="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getProductData(), 'small_image')->resize(125, 125); ?>" width="125" height="125" alt="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" /></a>
         <?php if( $this->getRating() && $this->getRating()->getSize()): ?>
             <p class="label"><?php echo $this->__('Average Customer Rating:') ?></p>
             <?php echo $this->getReviewsSummaryHtml($this->getProductData()) ?>
         <?php endif; ?>
     </div>
     <div class="product-details">
-        <h2 class="product-name"><?php echo $this->htmlEscape($this->getProductData()->getName()) ?></h2>
+        <h2 class="product-name"><?php echo $this->escapeHtml($this->getProductData()->getName()) ?></h2>
         <?php if( $this->getRating() && $this->getRating()->getSize()): ?>
         <h3><?php echo ($this->isReviewOwner()) ? $this->__('Your Rating:') : $this->__('Rating:'); ?></h3>
         <table class="ratings-table">
@@ -64,7 +64,7 @@
                 <?php endif;?>
             </dt>
             <dd>
-                <?php echo nl2br($this->htmlEscape($this->getReviewData()->getDetail())) ?>
+                <?php echo nl2br($this->escapeHtml($this->getReviewData()->getDetail())) ?>
             </dd>
         </dl>
     </div>
diff --git a/app/design/frontend/base/default/template/review/form.phtml b/app/design/frontend/base/default/template/review/form.phtml
index 6b9024a3c37..816c57ec096 100644
--- a/app/design/frontend/base/default/template/review/form.phtml
+++ b/app/design/frontend/base/default/template/review/form.phtml
@@ -30,7 +30,7 @@
     <form action="<?php echo $this->getAction() ?>" method="post" id="review-form">
         <fieldset>
             <?php echo $this->getChildHtml('form_fields_before')?>
-            <h3><?php echo $this->__("You're reviewing:"); ?> <span><?php echo $this->htmlEscape($this->getProductInfo()->getName()) ?></span></h3>
+            <h3><?php echo $this->__("You're reviewing:"); ?> <span><?php echo $this->escapeHtml($this->getProductInfo()->getName()) ?></span></h3>
             <?php if( $this->getRatings() && $this->getRatings()->getSize()): ?>
                 <h4><?php echo $this->__('How do you rate this product?') ?> <em class="required">*</em></h4>
                 <span id="input-message-box"></span>
@@ -69,19 +69,19 @@
                     <li>
                         <label for="nickname_field" class="required"><em>*</em><?php echo $this->__('Nickname') ?></label>
                         <div class="input-box">
-                            <input type="text" name="nickname" id="nickname_field" class="input-text required-entry" value="<?php echo $this->htmlEscape($data->getNickname()) ?>" />
+                            <input type="text" name="nickname" id="nickname_field" class="input-text required-entry" value="<?php echo $this->escapeHtml($data->getNickname()) ?>" />
                         </div>
                     </li>
                     <li>
                         <label for="summary_field" class="required"><em>*</em><?php echo $this->__('Summary of Your Review') ?></label>
                         <div class="input-box">
-                            <input type="text" name="title" id="summary_field" class="input-text required-entry" value="<?php echo $this->htmlEscape($data->getTitle()) ?>" />
+                            <input type="text" name="title" id="summary_field" class="input-text required-entry" value="<?php echo $this->escapeHtml($data->getTitle()) ?>" />
                         </div>
                     </li>
                     <li>
                         <label for="review_field" class="required"><em>*</em><?php echo $this->__('Review') ?></label>
                         <div class="input-box">
-                            <textarea name="detail" id="review_field" cols="5" rows="3" class="required-entry"><?php echo $this->htmlEscape($data->getDetail()) ?></textarea>
+                            <textarea name="detail" id="review_field" cols="5" rows="3" class="required-entry"><?php echo $this->escapeHtml($data->getDetail()) ?></textarea>
                         </div>
                     </li>
                 </ul>
@@ -99,18 +99,18 @@
                     var trs = $('product-review-table').select('tr');
                     var inputs;
                     var error = 1;
-    
+
                     for( var j=0; j < trs.length; j++ ) {
                         var tr = trs[j];
                         if( j > 0 ) {
                             inputs = tr.select('input');
-    
+
                             for( i in inputs ) {
                                 if( inputs[i].checked == true ) {
                                     error = 0;
                                 }
                             }
-    
+
                             if( error == 1 ) {
                                 return false;
                             } else {
diff --git a/app/design/frontend/base/default/template/review/product/view/list.phtml b/app/design/frontend/base/default/template/review/product/view/list.phtml
index 52fe4253908..b8b92b4d5fa 100644
--- a/app/design/frontend/base/default/template/review/product/view/list.phtml
+++ b/app/design/frontend/base/default/template/review/product/view/list.phtml
@@ -33,7 +33,7 @@
         <dl>
         <?php foreach ($_items as $_review):?>
             <dt>
-                <a href="<?php echo $this->getReviewUrl($_review->getId()) ?>"><?php echo $this->htmlEscape($_review->getTitle()) ?></a> <?php echo $this->__('Review by <span>%s</span>', $this->htmlEscape($_review->getNickname())) ?>
+                <a href="<?php echo $this->getReviewUrl($_review->getId()) ?>"><?php echo $this->escapeHtml($_review->getTitle()) ?></a> <?php echo $this->__('Review by <span>%s</span>', $this->escapeHtml($_review->getNickname())) ?>
             </dt>
             <dd>
                 <?php $_votes = $_review->getRatingVotes(); ?>
@@ -55,7 +55,7 @@
                     </tbody>
                 </table>
                 <?php endif; ?>
-                <?php echo nl2br($this->htmlEscape($_review->getDetail())) ?>
+                <?php echo nl2br($this->escapeHtml($_review->getDetail())) ?>
                 <small class="date"><?php echo $this->__('(Posted on %s)', $this->formatDate($_review->getCreatedAt()), 'long') ?></small>
             </dd>
         <?php endforeach; ?>
diff --git a/app/design/frontend/base/default/template/review/view.phtml b/app/design/frontend/base/default/template/review/view.phtml
index 4953df5746d..f35cac168a8 100644
--- a/app/design/frontend/base/default/template/review/view.phtml
+++ b/app/design/frontend/base/default/template/review/view.phtml
@@ -30,14 +30,14 @@
         <h1><?php echo $this->__('Review Details') ?></h1>
     </div>
     <div class="product-img-box">
-        <a href="<?php echo $this->getProductData()->getProductUrl() ?>" title="<?php echo $this->htmlEscape($this->getProductData()->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getProductData(), 'small_image')->resize(125, 125); ?>" height="125" width="125" alt="<?php echo $this->htmlEscape($this->getProductData()->getName()) ?>" /></a>
+        <a href="<?php echo $this->getProductData()->getProductUrl() ?>" title="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getProductData(), 'small_image')->resize(125, 125); ?>" height="125" width="125" alt="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" /></a>
         <?php if( $this->getRating() && $this->getRating()->getSize()): ?>
              <p class="label"><?php echo $this->__('Average Customer Rating') ?>:</p>
              <?php echo $this->getReviewsSummaryHtml($this->getProductData()) ?>
         <?php endif; ?>
     </div>
     <div class="product-details">
-        <h2 class="product-name"><?php echo $this->htmlEscape($this->getProductData()->getName()) ?></h2>
+        <h2 class="product-name"><?php echo $this->escapeHtml($this->getProductData()->getName()) ?></h2>
         <?php if( $this->getRating() && $this->getRating()->getSize()): ?>
             <h3><?php echo $this->__('Product Rating:') ?></h3>
             <table class="ratings-table">
@@ -61,7 +61,7 @@
                 <?php echo $this->__('Product Review (submitted on %s):', $this->dateFormat($this->getReviewData()->getCreatedAt())) ?>
             </dt>
             <dd>
-                <?php echo nl2br($this->htmlEscape($this->getReviewData()->getDetail())) ?>
+                <?php echo nl2br($this->escapeHtml($this->getReviewData()->getDetail())) ?>
             </dd>
         </dl>
     </div>
diff --git a/app/design/frontend/base/default/template/rss/order/details.phtml b/app/design/frontend/base/default/template/rss/order/details.phtml
index de6d2c4aa27..c43056e34e8 100644
--- a/app/design/frontend/base/default/template/rss/order/details.phtml
+++ b/app/design/frontend/base/default/template/rss/order/details.phtml
@@ -46,12 +46,12 @@ store name = $_order->getStore()->getGroup()->getName()
     <tbody>
 <?php $i=0; foreach ($_order->getAllItems() as $_item): $i++ ?>
         <tr <?php echo $i%2?'bgcolor="#eeeded"':'' ?>>
-            <td align="left" valign="top" style="padding:3px 9px"><strong><?php echo $this->htmlEscape($_item->getName()) ?></strong>
+            <td align="left" valign="top" style="padding:3px 9px"><strong><?php echo $this->escapeHtml($_item->getName()) ?></strong>
             <?php if($_item->getGiftMessageId() && $_giftMessage = $this->helper('giftmessage/message')->getGiftMessage($_item->getGiftMessageId())): ?>
             <br /><strong><?php echo $this->__('Gift Message') ?></strong>
-            <br /><?php echo $this->__('From:'); ?> <?php echo $this->htmlEscape($_giftMessage->getSender()) ?>
-            <br /><?php echo $this->__('To:'); ?> <?php echo $this->htmlEscape($_giftMessage->getRecipient()) ?>
-            <br /><?php echo $this->__('Message:'); ?><br /> <?php echo $this->htmlEscape($_giftMessage->getMessage()) ?>
+            <br /><?php echo $this->__('From:'); ?> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?>
+            <br /><?php echo $this->__('To:'); ?> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?>
+            <br /><?php echo $this->__('Message:'); ?><br /> <?php echo $this->escapeHtml($_giftMessage->getMessage()) ?>
             <?php endif; ?>
             </td>
             <td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQtyOrdered()*1 ?></td>
@@ -65,9 +65,9 @@ store name = $_order->getStore()->getGroup()->getName()
         <tr>
             <td colspan="3" align="left" style="padding:3px 9px">
             <strong><?php echo $this->__('Gift Message') ?></strong>
-            <br /><?php echo $this->__('From:'); ?> <?php echo $this->htmlEscape($_giftMessage->getSender()) ?>
-            <br /><?php echo $this->__('To:'); ?> <?php echo $this->htmlEscape($_giftMessage->getRecipient()) ?>
-            <br /><?php echo $this->__('Message:'); ?><br /> <?php echo $this->htmlEscape($_giftMessage->getMessage()) ?>
+            <br /><?php echo $this->__('From:'); ?> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?>
+            <br /><?php echo $this->__('To:'); ?> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?>
+            <br /><?php echo $this->__('Message:'); ?><br /> <?php echo $this->escapeHtml($_giftMessage->getMessage()) ?>
             </td>
         </tr>
      <?php endif; ?>
diff --git a/app/design/frontend/base/default/template/sales/guest/form.phtml b/app/design/frontend/base/default/template/sales/guest/form.phtml
index dae8b1e9bb4..46b90edad7d 100644
--- a/app/design/frontend/base/default/template/sales/guest/form.phtml
+++ b/app/design/frontend/base/default/template/sales/guest/form.phtml
@@ -1,65 +1,69 @@
 <div class="page-title">
-   <h1><?php echo Mage::helper('sales')->__('Returns') ?></h1>
+   <h1><?php echo Mage::helper('sales')->__('Orders and Returns') ?></h1>
 </div>
-<div class="block-content">
-   <form id="oar_widget_orders_and_returns_form" action="<?php echo $this->getActionUrl() ?>" method="post" class="search-form" name="guest_post">
-       <ul class="form-alt">
-           <li style="clear:both;">
-               <div class="input-box" style="float:left;width:150px;">
+
+
+<form id="oar_widget_orders_and_returns_form" action="<?php echo $this->getActionUrl() ?>" method="post" class="search-form" name="guest_post">
+    <div class="fieldset">
+        <h2 class="legend"><?php echo Mage::helper('sales')->__('Order Information') ?></h2>
+
+        <ul class="form-list">
+           <li>
+               <div class="input-box">
                    <label for="oar_order_id" class="required"><?php echo Mage::helper('sales')->__('Order ID') ?> <em>*</em></label>
                </div>
-               <div class="input-box" style="float:left;width:305px;">
+               <div class="input-box">
                    <input type="text" class="input-text required-entry" id="oar_order_id" name="oar_order_id" style="width:300px;"/>
                </div>
            </li>
-           <li style="clear:both;">
+           <li class="wide">
                <div class="input-box">
                    <?php echo Mage::helper('sales')->__('Enter the billing last name and email/ZIP as in the order billing address') ?>.
                 </div>
            </li>
-           <li style="clear:both;">
-               <div class="input-box" style="float:left;width:150px;">
+           <li>
+               <div class="input-box">
                    <label for="oar_billing_lastname" class="required"><?php echo Mage::helper('sales')->__('Billing Last Name') ?> <em>*</em></label>
                </div>
-               <div class="input-box" style="float:left;width:305px;">
+               <div class="input-box">
                    <input type="text" class="input-text required-entry" id="oar_billing_lastname" name="oar_billing_lastname"  style="width:300px;"/>
                </div>
            </li>
-           <li style="clear:both;">
-               <div class="input-box" style="float:left;width:150px;">
+           <li>
+               <div class="input-box">
                    <label class="required"><?php echo Mage::helper('sales')->__('Find Order By:') ?></label>
                </div>
-               <div class="input-box" style="float:left;width:305px;">
+               <div class="input-box">
                    <select name="oar_type" id="quick_search_type_id" class="select guest-select" title="" onchange="showIdentifyBlock(this.value);">
                        <option value="email">Email Address</option>
                        <option value="zip">ZIP Code</option>
                    </select>
                </div>
            </li>
-           <li id="oar-email" style="clear:both;">
-               <div class="input-box" style="float:left;width:150px;">
+           <li id="oar-email">
+               <div class="input-box">
                    <label for="oar_email" class="required"><?php echo Mage::helper('sales')->__('Email Address') ?> <em>*</em></label>
                </div>
-               <div class="input-box" style="float:left;width:305px;">
+               <div class="input-box">
                    <input type="text" class="input-text validate-email required-entry" id="oar_email" name="oar_email"  style="width:300px;"/>
                </div>
            </li>
-           <li id="oar-zip" style="display:none;clear:both;">
-               <div class="input-box" style="float:left;width:150px;">
+           <li id="oar-zip" style="display:none;">
+               <div class="input-box">
                    <label for="oar_zip" class="required"><?php echo Mage::helper('sales')->__('Billing ZIP Code') ?> <em>*</em></label>
                </div>
-               <div class="input-box" style="float:left;width:305px;">
+               <div class="input-box">
                    <input type="text" class="input-text required-entry" id="oar_zip" name="oar_zip" style="width:300px;"/>
                </div>
            </li>
-           <li style="clear:both;">
-               <div class="input-box" style="float:left;text-align:right;width:455px">
-                   <button type="submit" title="Continue" class="button"><span><span><?php echo Mage::helper('sales')->__('Continue') ?></span></span></button>
-               </div>
-           </li>
        </ul>
-   </form>
-</div>
+    </div>
+    <div class="buttons-set">
+        <p class="required"><?php echo Mage::helper('sales')->__('* Required Fields') ?></p>
+        <button type="submit" title="<?php echo Mage::helper('sales')->__('Continue') ?>" class="button"><span><span><?php echo Mage::helper('sales')->__('Continue') ?></span></span></button>
+    </div>
+</form>
+
 <script type="text/javascript">
 //<![CDATA[
     if ($('quick_search_type_id').value == 'zip') {
diff --git a/app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml b/app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml
index 727aa456ce8..6ec04adc581 100644
--- a/app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml
+++ b/app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml
@@ -27,25 +27,25 @@
 <?php $_item = $this->getItem() ?>
 <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
 <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
-    <td><h4 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h4>
+    <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
         <?php if($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
         <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <?php if (!$this->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
                     <div class="truncated_full_value">
                         <dl class="item-options">
-                            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                             <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
                         </dl>
                     </div>
                     <?php endif; ?>
                 </dd>
             <?php else: ?>
-                <dd><?php echo $this->htmlEscape( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
+                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
             <?php endif; ?>
         <?php endforeach; ?>
         </dl>
@@ -54,12 +54,12 @@
         <?php if ($addInfoBlock) :?>
             <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
         <?php endif; ?>
-        <?php echo $this->htmlEscape($_item->getDescription()) ?>
+        <?php echo $this->escapeHtml($_item->getDescription()) ?>
         <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
             <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
         <?php endif; ?>
     </td>
-    <td><?php echo $this->htmlEscape(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
+    <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
     <td class="a-right">
         <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
             <span class="price-excl-tax">
diff --git a/app/design/frontend/base/default/template/sales/order/details.phtml b/app/design/frontend/base/default/template/sales/order/details.phtml
index 03e811272a2..bee413bbc84 100644
--- a/app/design/frontend/base/default/template/sales/order/details.phtml
+++ b/app/design/frontend/base/default/template/sales/order/details.phtml
@@ -97,7 +97,7 @@
         <?php $_index = 0; ?>
         <?php foreach ($_items as $_item): ?>
         <tr<?php echo ($_index++ > $_count ? ' class="last"' : '') ?>>
-            <td><?php echo $this->htmlEscape($_item->getProductName()) ?></td>
+            <td><?php echo $this->escapeHtml($_item->getProductName()) ?></td>
             <td class="a-right"><?php echo $_order->formatPrice($_item->getPrice()*1) ?></td>
             <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
             <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
diff --git a/app/design/frontend/base/default/template/sales/order/history.phtml b/app/design/frontend/base/default/template/sales/order/history.phtml
index 4a79dda4400..f6a5a5e2277 100644
--- a/app/design/frontend/base/default/template/sales/order/history.phtml
+++ b/app/design/frontend/base/default/template/sales/order/history.phtml
@@ -54,7 +54,7 @@
         <tr>
             <td><?php echo $_order->getRealOrderId() ?></td>
             <td><span class="nobr"><?php echo $this->formatDate($_order->getCreatedAtStoreDate()) ?></span></td>
-            <td><?php echo $_order->getShippingAddress() ? $this->htmlEscape($_order->getShippingAddress()->getName()) : '&nbsp;' ?></td>
+            <td><?php echo $_order->getShippingAddress() ? $this->escapeHtml($_order->getShippingAddress()->getName()) : '&nbsp;' ?></td>
             <td><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
             <td><em><?php echo $_order->getStatusLabel() ?></em></td>
             <td class="a-center">
diff --git a/app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml b/app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml
index de8682144a0..0d79b725c85 100644
--- a/app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml
+++ b/app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml
@@ -27,11 +27,11 @@
 <?php $_item = $this->getItem() ?>
 <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
 <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
-    <td><h4 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h4>
+    <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
         <?php if($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
         <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <?php if (!$this->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
@@ -39,14 +39,14 @@
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
                     <div class="truncated_full_value">
                         <dl class="item-options">
-                            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                             <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
                         </dl>
                     </div>
                     <?php endif; ?>
                 </dd>
             <?php else: ?>
-                <dd><?php echo $this->htmlEscape( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
+                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
             <?php endif; ?>
         <?php endforeach; ?>
         </dl>
@@ -55,12 +55,12 @@
         <?php if ($addInfoBlock) :?>
             <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
         <?php endif; ?>
-        <?php echo $this->htmlEscape($_item->getDescription()) ?>
+        <?php echo $this->escapeHtml($_item->getDescription()) ?>
         <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
             <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
         <?php endif; ?>
     </td>
-    <td><?php echo $this->htmlEscape(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
+    <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
     <td class="a-right">
         <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
             <span class="price-excl-tax">
diff --git a/app/design/frontend/base/default/template/sales/order/items.phtml b/app/design/frontend/base/default/template/sales/order/items.phtml
index 2cf94876675..be89cca5274 100644
--- a/app/design/frontend/base/default/template/sales/order/items.phtml
+++ b/app/design/frontend/base/default/template/sales/order/items.phtml
@@ -56,8 +56,8 @@
                 <td class="gift-message-row" colspan="7">
                     <a href="#" title="<?php echo $this->__('Close') ?>" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>');" class="btn-close"><?php echo $this->__('Close') ?></a>
                     <dl class="gift-message">
-                        <dt><strong><?php echo $this->__('From:') ?></strong> <?php echo $this->htmlEscape($_giftMessage->getRecipient()) ?></dt>
-                        <dt><strong><?php echo $this->__('To:') ?></strong> <?php echo $this->htmlEscape($_giftMessage->getSender()) ?></dt>
+                        <dt><strong><?php echo $this->__('From:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?></dt>
+                        <dt><strong><?php echo $this->__('To:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?></dt>
                         <dd><?php echo $this->helper('giftmessage/message')->getEscapedGiftMessage($_item) ?></dd>
                     </dl>
                 </td>
diff --git a/app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml b/app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml
index 3a590bc9c67..cc4f6c6f3e7 100644
--- a/app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml
+++ b/app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml
@@ -26,11 +26,11 @@
 ?>
 <?php $_item = $this->getItem() ?>
 <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
-    <td><h3 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h3>
+    <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3>
         <?php if($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
         <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <?php if (!$this->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
@@ -46,7 +46,7 @@
                 </dd>
             <?php else: ?>
                 <dd>
-                    <?php echo nl2br($this->htmlEscape( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) )) ?>
+                    <?php echo nl2br($this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) )) ?>
                 </dd>
             <?php endif; ?>
         <?php endforeach; ?>
@@ -56,12 +56,12 @@
         <?php if ($addtInfoBlock) :?>
             <?php echo $addtInfoBlock->setItem($_item)->toHtml(); ?>
         <?php endif; ?>
-        <?php echo $this->htmlEscape($_item->getDescription()) ?>
+        <?php echo $this->escapeHtml($_item->getDescription()) ?>
         <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
             <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
         <?php endif; ?>
     </td>
-    <td><?php echo $this->htmlEscape(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
+    <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
     <td class="a-right">
         <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
             <span class="price-excl-tax">
diff --git a/app/design/frontend/base/default/template/sales/order/recent.phtml b/app/design/frontend/base/default/template/sales/order/recent.phtml
index d18139e0f1b..246b30b173f 100644
--- a/app/design/frontend/base/default/template/sales/order/recent.phtml
+++ b/app/design/frontend/base/default/template/sales/order/recent.phtml
@@ -53,7 +53,7 @@
                 <tr>
                     <td><?php echo $_order->getRealOrderId() ?></td>
                     <td><span class="nobr"><?php echo $this->formatDate($_order->getCreatedAtStoreDate()) ?></span></td>
-                    <td><?php echo $_order->getShippingAddress() ? $this->htmlEscape($_order->getShippingAddress()->getName()) : '&nbsp;' ?></td>
+                    <td><?php echo $_order->getShippingAddress() ? $this->escapeHtml($_order->getShippingAddress()->getName()) : '&nbsp;' ?></td>
                     <td><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
                     <td><em><?php echo $_order->getStatusLabel() ?></em></td>
                     <td class="a-center">
diff --git a/app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml b/app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml
index a7d2b81d4c3..7487c399006 100644
--- a/app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml
+++ b/app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml
@@ -27,11 +27,11 @@
 <?php $_item = $this->getItem() ?>
 <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
 <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
-    <td><h4 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h4>
+    <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
         <?php if($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
         <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <?php if (!$this->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
@@ -39,14 +39,14 @@
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
                     <div class="truncated_full_value">
                         <dl class="item-options">
-                            <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
+                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                             <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
                         </dl>
                     </div>
                     <?php endif; ?>
                 </dd>
             <?php else: ?>
-                <dd><?php echo $this->htmlEscape( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
+                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
             <?php endif; ?>
         <?php endforeach; ?>
         </dl>
@@ -55,11 +55,11 @@
         <?php if ($addInfoBlock) :?>
             <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
         <?php endif; ?>
-        <?php echo $this->htmlEscape($_item->getDescription()) ?>
+        <?php echo $this->escapeHtml($_item->getDescription()) ?>
         <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
             <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
         <?php endif; ?>
     </td>
-    <td><?php echo $this->htmlEscape(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
+    <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
     <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
 </tr>
diff --git a/app/design/frontend/base/default/template/sales/order/view.phtml b/app/design/frontend/base/default/template/sales/order/view.phtml
index 00458fdade4..195d059e81d 100644
--- a/app/design/frontend/base/default/template/sales/order/view.phtml
+++ b/app/design/frontend/base/default/template/sales/order/view.phtml
@@ -68,8 +68,8 @@
         <h2 class="sub-title"><?php echo $this->__('Gift Message for This Order') ?></h2>
         <?php $_giftMessage=$this->helper('giftmessage/message')->getGiftMessageForEntity($_order); ?>
         <dl class="gift-message">
-            <dt><strong><?php echo $this->__('From:') ?></strong> <?php echo $this->htmlEscape($_giftMessage->getSender()) ?></dt>
-            <dt><strong><?php echo $this->__('To:') ?></strong> <?php echo $this->htmlEscape($_giftMessage->getRecipient()) ?></dt>
+            <dt><strong><?php echo $this->__('From:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?></dt>
+            <dt><strong><?php echo $this->__('To:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?></dt>
             <dd><?php echo $this->helper('giftmessage/message')->getEscapedGiftMessage($_order) ?></dd>
         </dl>
     </div>
diff --git a/app/design/frontend/base/default/template/sales/reorder/sidebar.phtml b/app/design/frontend/base/default/template/sales/reorder/sidebar.phtml
index 8d3490ff7c7..60615c0304a 100644
--- a/app/design/frontend/base/default/template/sales/reorder/sidebar.phtml
+++ b/app/design/frontend/base/default/template/sales/reorder/sidebar.phtml
@@ -38,6 +38,7 @@
         <strong><span><?php echo $this->__('My Orders') ?></span></strong>
     </div>
     <form method="post" action="<?php echo $this->getFormActionUrl() ?>" id="reorder-validate-detail">
+        <?php echo $this->getBlockHtml('formkey'); ?>
         <div class="block-content">
             <p class="block-subtitle"><?php echo $this->__('Last Ordered Items') ?></p>
             <ol id="cart-sidebar-reorder">
@@ -53,7 +54,7 @@
                         //]]>
                         </script>
                     <?php endif; ?>
-                    <p class="product-name"><a href="<?php echo $_item->getProduct()->getProductUrl() ?>"><?php echo $this->htmlEscape($_item->getName()) ?></a></p>
+                    <p class="product-name"><a href="<?php echo $_item->getProduct()->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></p>
                 </li>
             <?php endforeach; ?>
             </ol>
diff --git a/app/design/frontend/base/default/template/sales/widget/guest/form.phtml b/app/design/frontend/base/default/template/sales/widget/guest/form.phtml
index c9c12da7e2d..e50d2eedea3 100644
--- a/app/design/frontend/base/default/template/sales/widget/guest/form.phtml
+++ b/app/design/frontend/base/default/template/sales/widget/guest/form.phtml
@@ -29,7 +29,9 @@
     <div class="widget">
         <div class="block block-gr-search">
             <div class="block-title">
-                <h2><?php echo $this->__('Orders and Returns') ?></h2>
+                <strong>
+                    <span><?php echo $this->__('Orders and Returns') ?></span>
+                </strong>
             </div>
             <div class="block-content">
                <form id="oar_widget_orders_and_returns_form" action="<?php echo $this->getActionUrl() ?>" method="post" class="search-form" name="guest_post">
diff --git a/app/design/frontend/base/default/template/sendfriend/send.phtml b/app/design/frontend/base/default/template/sendfriend/send.phtml
index 9cf0ae24949..b459fdab535 100644
--- a/app/design/frontend/base/default/template/sendfriend/send.phtml
+++ b/app/design/frontend/base/default/template/sendfriend/send.phtml
@@ -49,9 +49,9 @@
         ul = $('recipients_options');
         var li_mail = Element.extend(document.createElement("LI"));
         li_mail.addClassName('fields additional-row');
-        li_mail.innerHTML = '<p><a href="delete_email" title="<?php echo $this->__('Remove Email') ?>" onclick="remove_recipient('+i+'); return false" class="btn-remove"><?php echo $this->__('Remove Email') ?>"<\/a><\/p>'
-        li_mail.innerHTML += '<div class="field"><label for="recipients_name'+i+'" class="required"><em>*<\/em><?php echo $this->__('Name:') ?><\/label><div class="input-box"><input name="recipients[name][]" type="text" class="input-text required-entry" id="recipients_name'+i+'" /><\/div>';
-        li_mail.innerHTML += '<div class="field"><label for="recipients_email'+i+'" class="required"><em>*<\/em><?php echo $this->__('Email Address:') ?><\/label><div class="input-box"><input name="recipients[email][]" value="" title="<?php echo $this->__('Email Address') ?>" id="recipients_email'+i+'" type="text" class="input-text required-entry validate-email" /><\/div><\/div>';
+        li_mail.innerHTML = '<p><a href="delete_email" title="<?php echo $this->jsQuoteEscape($this->__('Remove Email')) ?>" onclick="remove_recipient('+i+'); return false" class="btn-remove"><?php echo $this->jsQuoteEscape($this->__('Remove Email')) ?>"<\/a><\/p>'
+        li_mail.innerHTML += '<div class="field"><label for="recipients_name'+i+'" class="required"><em>*<\/em><?php echo $this->jsQuoteEscape($this->__('Name:')) ?><\/label><div class="input-box"><input name="recipients[name][]" type="text" class="input-text required-entry" id="recipients_name'+i+'" /><\/div>';
+        li_mail.innerHTML += '<div class="field"><label for="recipients_email'+i+'" class="required"><em>*<\/em><?php echo $this->jsQuoteEscape($this->__('Email Address:')) ?><\/label><div class="input-box"><input name="recipients[email][]" value="" title="<?php echo $this->jsQuoteEscape($this->__('Email Address')) ?>" id="recipients_email'+i+'" type="text" class="input-text required-entry validate-email" /><\/div><\/div>';
         i++;
         recipCount++;
         if(recipCount>=maxRecip && maxRecip != 0) {
@@ -78,20 +78,20 @@
                     <div class="field">
                         <label for="sender_name" class="required"><em>*</em><?php echo $this->__('Name:') ?></label>
                         <div class="input-box">
-                            <input name="sender[name]" value="<?php echo $this->htmlEscape($this->getUserName()) ?>" title="<?php echo $this->__('Name') ?>" id="sender_name" type="text" class="input-text required-entry" />
+                            <input name="sender[name]" value="<?php echo $this->escapeHtml($this->getUserName()) ?>" title="<?php echo $this->__('Name') ?>" id="sender_name" type="text" class="input-text required-entry" />
                         </div>
                     </div>
                     <div class="field">
                        <label for="sender_email" class="required"><em>*</em><?php echo $this->__('Email:') ?></label>
                        <div class="input-box">
-                           <input name="sender[email]" value="<?php echo $this->htmlEscape($this->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" id="sender_email" type="text" class="input-text required-entry validate-email" />
+                           <input name="sender[email]" value="<?php echo $this->escapeHtml($this->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" id="sender_email" type="text" class="input-text required-entry validate-email" />
                        </div>
                     </div>
                 </li>
                 <li class="wide">
                     <label for="sender_message" class="required"><em>*</em><?php echo $this->__('Message:') ?></label>
                     <div class="input-box">
-                        <textarea name="sender[message]" class="input-text required-entry" id="sender_message" cols="3" rows="3"><?php echo $this->htmlEscape($this->getMessage())?></textarea>
+                        <textarea name="sender[message]" class="input-text required-entry" id="sender_message" cols="3" rows="3"><?php echo $this->escapeHtml($this->getMessage())?></textarea>
                     </div>
                 </li>
             </ul>
diff --git a/app/design/frontend/base/default/template/tag/cloud.phtml b/app/design/frontend/base/default/template/tag/cloud.phtml
index 821958812a9..c178279fef9 100644
--- a/app/design/frontend/base/default/template/tag/cloud.phtml
+++ b/app/design/frontend/base/default/template/tag/cloud.phtml
@@ -30,7 +30,7 @@
 <?php if( sizeof($this->getTags()) > 0 ): ?>
     <ul class="tags-list">
         <?php foreach ($this->getTags() as $_tag): ?>
-            <li><a href="<?php echo $_tag->getTaggedProductsUrl() ?>" style="font-size:<?php echo $_tag->getRatio()*70+75 ?>%;"><?php echo $this->htmlEscape($_tag->getName()) ?></a></li>
+            <li><a href="<?php echo $_tag->getTaggedProductsUrl() ?>" style="font-size:<?php echo $_tag->getRatio()*70+75 ?>%;"><?php echo $this->escapeHtml($_tag->getName()) ?></a></li>
         <?php endforeach; ?>
     </ul>
 <?php else: ?>
diff --git a/app/design/frontend/base/default/template/tag/customer/recent.phtml b/app/design/frontend/base/default/template/tag/customer/recent.phtml
index d7dd89895b7..015d5fb6826 100644
--- a/app/design/frontend/base/default/template/tag/customer/recent.phtml
+++ b/app/design/frontend/base/default/template/tag/customer/recent.phtml
@@ -35,13 +35,13 @@
             <li class="item">
                 <span class="number"><?php echo ++$iterator ?></span>
                 <div class="details">
-                    <h3 class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->htmlEscape($_item->getName()) ?></a></h3>
+                    <h3 class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></h3>
                     <div class="tags">
                         <strong><?php echo $this->__('Tags:') ?></strong>
                         <?php $_i = 0; ?>
                         <ul>
                         <?php foreach( $_item->getProductTags() as $_tag ): ?>
-                            <li><a href="<?php echo $_tag->getViewTagUrl() ?>"><?php echo $this->htmlEscape($_tag->getName()) ?></a><?php if(++$_i != sizeof($_item->getProductTags()->getItems())): ?>,<?php endif; ?></li>
+                            <li><a href="<?php echo $_tag->getViewTagUrl() ?>"><?php echo $this->escapeHtml($_tag->getName()) ?></a><?php if(++$_i != sizeof($_item->getProductTags()->getItems())): ?>,<?php endif; ?></li>
                         <?php endforeach; ?>
                         </ul>
                     </div>
diff --git a/app/design/frontend/base/default/template/tag/customer/tags.phtml b/app/design/frontend/base/default/template/tag/customer/tags.phtml
index 7068ae63531..1ef70eaa011 100644
--- a/app/design/frontend/base/default/template/tag/customer/tags.phtml
+++ b/app/design/frontend/base/default/template/tag/customer/tags.phtml
@@ -32,7 +32,7 @@
     <p><?php echo $this->__('Click on a tag to view your corresponding products.') ?></p>
     <ul class="tags-list">
         <?php foreach ($this->getTags() as $_tag): ?>
-            <li><a href="<?php echo $this->getUrl('tag/customer/view', array('tagId' => $_tag->getTagId())) ?>" style="font-size:<?php echo $_tag->getRatio()*70+75 ?>%;"><?php echo $this->htmlEscape($_tag->getName()) ?></a></li>
+            <li><a href="<?php echo $this->getUrl('tag/customer/view', array('tagId' => $_tag->getTagId())) ?>" style="font-size:<?php echo $_tag->getRatio()*70+75 ?>%;"><?php echo $this->escapeHtml($_tag->getName()) ?></a></li>
         <?php endforeach; ?>
     </ul>
 <?php else: ?>
diff --git a/app/design/frontend/base/default/template/tag/customer/view.phtml b/app/design/frontend/base/default/template/tag/customer/view.phtml
index 23d78092ef5..ecae7a01a12 100644
--- a/app/design/frontend/base/default/template/tag/customer/view.phtml
+++ b/app/design/frontend/base/default/template/tag/customer/view.phtml
@@ -30,7 +30,7 @@
 <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
 <p class="my-tag-edit">
     <a href="#" title="<?php echo $this->__('Delete') ?>" onclick="if(confirm('<?php echo $this->__('Are you sure you want to delete this tag?') ?>')) window.location='<?php echo $this->getTagInfo()->getRemoveTagUrl(); ?>'; return false;" class="button btn-remove"><span><?php echo $this->__('Delete') ?></span></a>
-    <?php echo $this->__('<strong>Tag Name:</strong> %s', $this->htmlEscape($this->getTagInfo()->getName())) ?>
+    <?php echo $this->__('<strong>Tag Name:</strong> %s', $this->escapeHtml($this->getTagInfo()->getName())) ?>
 </p>
 <div class="clearer"></div>
 <?php echo $this->getToolbarHtml() ?>
@@ -43,16 +43,18 @@
     <?php $iterator = 0 ?>
     <?php foreach($this->getMyProducts() as $_product): ?>
         <tr<?php if($iterator % 2 == 0): ?> class="odd"<?php $iterator++;endif; ?>>
-            <td><a href="<?php echo $_product->getProductUrl(); ?>" title="<?php echo $this->htmlEscape($_product->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_product, 'small_image')->resize(100, 100); ?>" width="100" height="100" alt="<?php echo $this->htmlEscape($_product->getName()) ?>" /></a></td>
+            <td><a href="<?php echo $_product->getProductUrl(); ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_product, 'small_image')->resize(100, 100); ?>" width="100" height="100" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" /></a></td>
             <td>
-                <h2 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>"><?php echo $this->htmlEscape($_product->getName()) ?></a></h2>
+                <h2 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>"><?php echo $this->escapeHtml($_product->getName()) ?></a></h2>
                 <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
                 <?php echo $this->getPriceHtml($_product) ?>
-                <?php echo $this->htmlEscape($_product->getDescription()) ?>
+                <?php echo $this->escapeHtml($_product->getDescription()) ?>
             </td>
             <td>
                 <?php if($_product->isSaleable()): ?>
-                    <button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getUrl('checkout/cart/add',array('product'=>$_product->getId())) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
+                    <?php $params[Mage_Core_Model_Url::FORM_KEY] = Mage::getSingleton('core/session')->getFormKey() ?>
+                    <?php $params['product'] = $_product->getId(); ?>
+                    <button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getUrl('checkout/cart/add', $params) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
                 <?php endif; ?>
                 <?php if ($this->helper('wishlist')->isAllow()) : ?>
                 <ul class="add-to-links">
@@ -69,7 +71,7 @@
     <tbody>
         <tr>
             <td>
-                <?php echo $this->__("Unable to find any products tagged with '%s' in the current store", $this->htmlEscape($this->getTagInfo()->getName()) ) ?>
+                <?php echo $this->__("Unable to find any products tagged with '%s' in the current store", $this->escapeHtml($this->getTagInfo()->getName()) ) ?>
             </td>
         </tr>
     </tbody>
diff --git a/app/design/frontend/base/default/template/tag/popular.phtml b/app/design/frontend/base/default/template/tag/popular.phtml
index ad0915fff83..746d1b9360f 100644
--- a/app/design/frontend/base/default/template/tag/popular.phtml
+++ b/app/design/frontend/base/default/template/tag/popular.phtml
@@ -31,7 +31,7 @@
     <div class="block-content">
         <ul class="tags-list">
             <?php foreach ($this->getTags() as $_tag): ?>
-                <li><a href="<?php echo $_tag->getTaggedProductsUrl() ?>" style="font-size:<?php echo $_tag->getRatio()*70+75 ?>%;"><?php echo $this->htmlEscape($_tag->getName()) ?></a></li>
+                <li><a href="<?php echo $_tag->getTaggedProductsUrl() ?>" style="font-size:<?php echo $_tag->getRatio()*70+75 ?>%;"><?php echo $this->escapeHtml($_tag->getName()) ?></a></li>
             <?php endforeach; ?>
         </ul>
         <div class="actions">
diff --git a/app/design/frontend/base/default/template/tax/checkout/tax.phtml b/app/design/frontend/base/default/template/tax/checkout/tax.phtml
index 195f31b69d4..b29cd19eded 100644
--- a/app/design/frontend/base/default/template/tax/checkout/tax.phtml
+++ b/app/design/frontend/base/default/template/tax/checkout/tax.phtml
@@ -61,6 +61,18 @@
         <?php $isTop = 0; ?>
         <?php endforeach; ?>
     <?php endforeach; ?>
+    <?php $weees = $this->getAllWeee(); ?>
+    <?php foreach ($weees as $weeeTitle => $weeeAmount): ?>
+    <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
+        <td class="a-right" style="<?php echo $_style ?>" colspan="1">
+            <?php echo $this->escapeHtml($weeeTitle); ?>
+            <br />
+        </td>
+        <td style="<?php echo $_style ?>" class="a-right" rowspan="1">
+            <?php echo $this->helper('checkout')->formatPrice($weeeAmount); ?>
+        </td>
+    </tr>
+    <?php endforeach; ?>
 <?php endif;?>
 <tr <?php if ($this->helper('tax')->displayFullSummary() && $_value!=0): ?> class="summary-total" onclick="expandDetails(this, '.summary-details-<?php echo $taxIter;?>')"<?php endif; ?>>
     <td style="<?php echo $_style ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
diff --git a/app/design/frontend/base/default/template/wishlist/item/column/cart.phtml b/app/design/frontend/base/default/template/wishlist/item/column/cart.phtml
index 612fa81cbf3..15606c97b97 100644
--- a/app/design/frontend/base/default/template/wishlist/item/column/cart.phtml
+++ b/app/design/frontend/base/default/template/wishlist/item/column/cart.phtml
@@ -28,9 +28,12 @@
 /* @var Mage_Wishlist_Model_Item $item */
 $item = $this->getItem();
 $product = $item->getProduct();
+$options = $this->getChild('customer.wishlist.item.options')
+    ->setItem($item)
+    ->getConfiguredOptions();
 ?>
 <div class="cart-cell">
-<?php echo $this->getPriceHtml($product);?>
+<?php echo $this->getPriceHtml($product, empty($options));?>
 <div class="add-to-cart-alt">
 <?php if ($item->canHaveQty() && $item->getProduct()->isVisibleInSiteVisibility()): ?>
     <input type="text" class="input-text qty validate-not-negative-number" name="qty[<?php echo $item->getId() ?>]" value="<?php echo $this->getAddToCartQty($item) * 1 ?>" />
diff --git a/app/design/frontend/base/default/template/wishlist/item/column/info.phtml b/app/design/frontend/base/default/template/wishlist/item/column/info.phtml
index 895a0b6bd99..1d4e06fc4c2 100644
--- a/app/design/frontend/base/default/template/wishlist/item/column/info.phtml
+++ b/app/design/frontend/base/default/template/wishlist/item/column/info.phtml
@@ -30,7 +30,7 @@ $product = $item->getProduct();
 ?>
 <h3 class="product-name"><a href="<?php echo $this->getProductUrl($item) ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>"><?php echo $this->escapeHtml($product->getName()) ?></a></h3>
 <div class="description std"><div class="inner"><?php echo $this->escapeHtml($this->stripTags($product->getShortDescription()));?></div></div>
-<textarea name="description[<?php echo $item->getWishlistItemId() ?>]" rows="3" cols="5" onfocus="focusComment(this)" onblur="focusComment(this)" title="<?php echo $this->__('Comment') ?>"><?php echo ($this->escapeHtml($item->getDescription())) ?></textarea>
+<textarea name="description[<?php echo $item->getWishlistItemId() ?>]" rows="3" cols="5" onfocus="focusComment(this)" onblur="focusComment(this)" title="<?php echo $this->__('Comment') ?>"><?php echo ($this->escapeHtml($item->getDescription() ? $item->getDescription() : $this->helper('wishlist')->defaultCommentString())) ?></textarea>
 <?php if($this->getSortedChildren()): ?>
     <div class="item-manage">
     <?php foreach($this->getSortedChildren() as $childName):?>
diff --git a/app/design/frontend/base/default/template/wishlist/shared.phtml b/app/design/frontend/base/default/template/wishlist/shared.phtml
index 10826890dc8..b6c21e9b76f 100644
--- a/app/design/frontend/base/default/template/wishlist/shared.phtml
+++ b/app/design/frontend/base/default/template/wishlist/shared.phtml
@@ -27,7 +27,7 @@
 ?>
 <div class="my-wishlist">
     <div class="page-title">
-        <h1><?php echo $this->htmlEscape($this->getHeader()) ?></h1>
+        <h1><?php echo $this->escapeHtml($this->getHeader()) ?></h1>
     </div>
     <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
     <?php if ($this->hasWishlistItems()): ?>
diff --git a/app/design/frontend/base/default/template/xmlconnect/centinel/authentication.phtml b/app/design/frontend/base/default/template/xmlconnect/centinel/authentication.phtml
new file mode 100644
index 00000000000..a0592548680
--- /dev/null
+++ b/app/design/frontend/base/default/template/xmlconnect/centinel/authentication.phtml
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     base_default
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<?php if ($this->getAuthenticationStart()):?>
+    <div class="centinel" id="centinel_authenticate_block">
+        <h3><?php echo $this->__('Card Verification')?></h3>
+        <p><?php echo $this->__('Please verify the card with the issuer bank:') ?></p>
+        <div id="authentication" class="authentication">
+            <iframe id="centinel_authenticate_iframe" frameborder="0" border="0" src="<?php echo $this->getFrameUrl() ?>"></iframe>
+        </div>
+    </div>
+    <script type="text/javascript">
+    //<![CDATA[
+        CentinelAuthenticateController = new Object;
+        Object.prototype.success = function() {
+            window.document.getElementById('centinel_authenticate_block').innerHTML = '<h4><?php echo $this->__('Verification complete');?></h4>';
+
+            /**
+             * Call android javascript interface java object method
+             */
+            if (typeof JAVAOBJECT != 'undefined') {
+                JAVAOBJECT.onSuccess();
+            } else {
+                /**
+                 * Non-existent url that have to be handled by iOS devices
+                 */
+                window.location.href = '<?php echo Mage::getStoreConfig(Mage_XmlConnect_Model_Application::XML_PATH_SECURE_BASE_LINK_URL, $this->getStoreId()) . 'authenticationcomplete/'; ?>';
+            }
+        }
+    //]]>
+    </script>
+<?php endif;?>
diff --git a/app/design/frontend/default/iphone/layout/checkout.xml b/app/design/frontend/default/iphone/layout/checkout.xml
index a00bca6c136..8139af4ae90 100644
--- a/app/design/frontend/default/iphone/layout/checkout.xml
+++ b/app/design/frontend/default/iphone/layout/checkout.xml
@@ -306,7 +306,7 @@ One page checkout main layout
                     <block type="checkout/onepage_shipping_method_additional" name="checkout.onepage.shipping_method.additional" as="additional" template="checkout/onepage/shipping_method/additional.phtml"/>
                 </block>
                 <block type="checkout/onepage_payment" name="checkout.onepage.payment" as="payment" template="checkout/onepage/payment.phtml">
-                    <block type="checkout/onepage_payment_methods" name="checkout.payment.methods" as="methods" template="checkout/onepage/payment/methods.phtml">
+                    <block type="checkout/onepage_payment_methods" name="checkout.payment.methods" as="methods" template="checkout/onepage/payment/info.phtml">
                         <action method="setMethodFormTemplate"><method>purchaseorder</method><template>payment/form/purchaseorder.phtml</template></action>
                     </block>
                 </block>
diff --git a/app/design/frontend/default/iphone/layout/customer.xml b/app/design/frontend/default/iphone/layout/customer.xml
index 664137d6423..1265ff8c679 100644
--- a/app/design/frontend/default/iphone/layout/customer.xml
+++ b/app/design/frontend/default/iphone/layout/customer.xml
@@ -74,6 +74,7 @@ Load this update on every page when customer is logged out
     <customer_logged_out>
         <reference name="account.links">
             <action method="addLink" translate="label title" module="customer"><label>Log In</label><url helper="customer/getLoginUrl"/><title>Log In</title><prepare/><urlParams/><position>1</position></action>
+            <action method="removeLinkByUrl" ifconfig="enterprise_invitation/general/registration_required_invitation"><url helper="customer/getRegisterUrl" /></action>
             <!-- <action method="addLink" translate="label title" module="customer"><label>register</label><url helper="customer/getRegisterUrl" /><title>register</title><prepare/><urlParams/><position>100</position><li/><a/><before_text> or </before_text><after_text>.</after_text></action> -->
         </reference>
         <remove name="reorder"></remove>
diff --git a/app/design/frontend/default/iphone/layout/page.xml b/app/design/frontend/default/iphone/layout/page.xml
index a0ec67bc208..cd4c7773615 100644
--- a/app/design/frontend/default/iphone/layout/page.xml
+++ b/app/design/frontend/default/iphone/layout/page.xml
@@ -76,6 +76,7 @@ Default layout, loads most of the pages
                     <label>Page Header</label>
                     <action method="setElementClass"><value>top-container</value></action>
                 </block>
+                <block type="page/html_welcome" name="welcome" as="welcome"/>
             </block>
 
             <block type="page/html_breadcrumbs" name="breadcrumbs" as="breadcrumbs"/>
diff --git a/app/design/frontend/default/iphone/template/catalog/product/view.phtml b/app/design/frontend/default/iphone/template/catalog/product/view.phtml
index becd3fb6165..4a336643abf 100644
--- a/app/design/frontend/default/iphone/template/catalog/product/view.phtml
+++ b/app/design/frontend/default/iphone/template/catalog/product/view.phtml
@@ -39,6 +39,7 @@
 <div id="messages_product_view"><?php echo $this->getMessagesBlock()->getGroupedHtml() ?></div>
 <div class="product-view">
     <form action="<?php echo $this->getSubmitUrl($_product) ?>" method="post" id="product_addtocart_form"<?php if($_product->getOptions()): ?> enctype="multipart/form-data"<?php endif; ?>>
+        <?php echo $this->getBlockHtml('formkey') ?>
         <div class="no-display">
             <input type="hidden" name="product" value="<?php echo $_product->getId() ?>" />
             <input type="hidden" name="related_product" id="related-products-field" value="" />
diff --git a/app/design/frontend/default/iphone/template/checkout/onepage/review/info.phtml b/app/design/frontend/default/iphone/template/checkout/onepage/review/info.phtml
index 23141d1f0b0..2098e0778e0 100644
--- a/app/design/frontend/default/iphone/template/checkout/onepage/review/info.phtml
+++ b/app/design/frontend/default/iphone/template/checkout/onepage/review/info.phtml
@@ -56,7 +56,7 @@
     </div>
     <script type="text/javascript">
     //<![CDATA[
-        review = new Review('<?php echo $this->getUrl('checkout/onepage/saveOrder') ?>', '<?php echo $this->getUrl('checkout/onepage/success') ?>', $('checkout-agreements'));
+        review = new Review('<?php echo $this->getUrl('checkout/onepage/saveOrder', array('form_key' => Mage::getSingleton('core/session')->getFormKey())) ?>', '<?php echo $this->getUrl('checkout/onepage/success') ?>', $('checkout-agreements'));
     //]]>
     </script>
 </div>
diff --git a/app/design/frontend/default/modern/layout/checkout.xml b/app/design/frontend/default/modern/layout/checkout.xml
index 3f16176a4c1..4c51caa21e6 100644
--- a/app/design/frontend/default/modern/layout/checkout.xml
+++ b/app/design/frontend/default/modern/layout/checkout.xml
@@ -328,7 +328,7 @@ One page checkout main layout
                     <block type="checkout/onepage_shipping_method_additional" name="checkout.onepage.shipping_method.additional" as="additional" template="checkout/onepage/shipping_method/additional.phtml"/>
                 </block>
                 <block type="checkout/onepage_payment" name="checkout.onepage.payment" as="payment" template="checkout/onepage/payment.phtml">
-                    <block type="checkout/onepage_payment_methods" name="checkout.payment.methods" as="methods" template="checkout/onepage/payment/methods.phtml">
+                    <block type="checkout/onepage_payment_methods" name="checkout.payment.methods" as="methods" template="checkout/onepage/payment/info.phtml">
                         <action method="setMethodFormTemplate"><method>purchaseorder</method><template>payment/form/purchaseorder.phtml</template></action>
                     </block>
                 </block>
diff --git a/app/design/frontend/default/modern/layout/page.xml b/app/design/frontend/default/modern/layout/page.xml
index bec40e7ed24..3050ee9fae8 100644
--- a/app/design/frontend/default/modern/layout/page.xml
+++ b/app/design/frontend/default/modern/layout/page.xml
@@ -80,6 +80,7 @@ Default layout, loads most of the pages
                     <label>Page Header</label>
                     <action method="setElementClass"><value>top-container</value></action>
                 </block>
+                <block type="page/html_welcome" name="welcome" as="welcome"/>
             </block>
 
             <block type="core/text_list" name="left" as="left" translate="label">
diff --git a/app/design/frontend/default/modern/template/catalog/product/list/upsell.phtml b/app/design/frontend/default/modern/template/catalog/product/list/upsell.phtml
index b5e98c0b79a..ad84e245b71 100644
--- a/app/design/frontend/default/modern/template/catalog/product/list/upsell.phtml
+++ b/app/design/frontend/default/modern/template/catalog/product/list/upsell.phtml
@@ -35,8 +35,8 @@
         <?php for($_j=0;$_j<$this->getColumnCount();$_j++): ?>
             <?php if($_link=$this->getIterableItem()): ?>
             <td>
-                <a href="<?php echo $_link->getProductUrl() ?>" title="<?php echo $this->htmlEscape($_link->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_link, 'small_image')->resize(125) ?>" width="125" height="125" alt="<?php echo $this->htmlEscape($_link->getName()) ?>" /></a>
-                <h3 class="product-name"><a href="<?php echo $_link->getProductUrl() ?>" title="<?php echo $this->htmlEscape($_link->getName()) ?>"><?php echo $this->htmlEscape($_link->getName()) ?></a></h3>
+                <a href="<?php echo $_link->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_link->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_link, 'small_image')->resize(125) ?>" width="125" height="125" alt="<?php echo $this->escapeHtml($_link->getName()) ?>" /></a>
+                <h3 class="product-name"><a href="<?php echo $_link->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_link->getName()) ?>"><?php echo $this->escapeHtml($_link->getName()) ?></a></h3>
                 <?php echo $this->getPriceHtml($_link, true, '-upsell') ?>
                 <?php echo $this->getReviewsSummaryHtml($_link) ?>
             </td>
diff --git a/app/design/frontend/default/modern/template/catalog/product/view.phtml b/app/design/frontend/default/modern/template/catalog/product/view.phtml
index 832a615d893..8b2cb90b3b2 100644
--- a/app/design/frontend/default/modern/template/catalog/product/view.phtml
+++ b/app/design/frontend/default/modern/template/catalog/product/view.phtml
@@ -40,6 +40,7 @@
 <div class="product-view">
     <div class="product-essential">
     <form action="<?php echo $this->getSubmitUrl($_product) ?>" method="post" id="product_addtocart_form"<?php if($_product->getOptions()): ?> enctype="multipart/form-data"<?php endif; ?>>
+        <?php echo $this->getBlockHtml('formkey') ?>
         <div class="no-display">
             <input type="hidden" name="product" value="<?php echo $_product->getId() ?>" />
             <input type="hidden" name="related_product" id="related-products-field" value="" />
diff --git a/app/design/frontend/default/modern/template/catalog/product/view/media.phtml b/app/design/frontend/default/modern/template/catalog/product/view/media.phtml
index 1daff386335..590da682dfa 100644
--- a/app/design/frontend/default/modern/template/catalog/product/view/media.phtml
+++ b/app/design/frontend/default/modern/template/catalog/product/view/media.phtml
@@ -37,7 +37,7 @@
 <?php if ($_product->getImage() != 'no_selection' && $_product->getImage()): ?>
 <p class="product-image product-image-zoom">
     <?php
-        $_img = '<img id="image" src="'.$this->helper('catalog/image')->init($_product, 'image').'" alt="'.$this->htmlEscape($this->getImageLabel()).'" title="'.$this->htmlEscape($this->getImageLabel()).'" />';
+        $_img = '<img id="image" src="'.$this->helper('catalog/image')->init($_product, 'image').'" alt="'.$this->escapeHtml($this->getImageLabel()).'" title="'.$this->escapeHtml($this->getImageLabel()).'" />';
         echo $_helper->productAttribute($_product, $_img, 'image');
     ?>
 </p>
@@ -59,7 +59,7 @@
 <?php else: ?>
 <p class="product-image">
     <?php
-        $_img = '<img src="'.$this->helper('catalog/image')->init($_product, 'image')->resize(300).'" alt="'.$this->htmlEscape($this->getImageLabel()).'" title="'.$this->htmlEscape($this->getImageLabel()).'" />';
+        $_img = '<img src="'.$this->helper('catalog/image')->init($_product, 'image')->resize(300).'" alt="'.$this->escapeHtml($this->getImageLabel()).'" title="'.$this->escapeHtml($this->getImageLabel()).'" />';
         echo $_helper->productAttribute($_product, $_img, 'image');
     ?>
 </p>
@@ -70,7 +70,7 @@
     <ul>
     <?php foreach ($this->getGalleryImages() as $_image): ?>
         <li>
-            <a href="#" onclick="popWin('<?php echo $this->getGalleryUrl($_image) ?>', 'gallery', 'width=300,height=300,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'); return false;" title="<?php echo $this->htmlEscape($_image->getLabel()) ?>"><img src="<?php echo $this->helper('catalog/image')->init($this->getProduct(), 'thumbnail', $_image->getFile())->resize(66); ?>" width="66" height="66" alt="<?php echo $this->htmlEscape($_image->getLabel()) ?>" /></a>
+            <a href="#" onclick="popWin('<?php echo $this->getGalleryUrl($_image) ?>', 'gallery', 'width=300,height=300,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'); return false;" title="<?php echo $this->escapeHtml($_image->getLabel()) ?>"><img src="<?php echo $this->helper('catalog/image')->init($this->getProduct(), 'thumbnail', $_image->getFile())->resize(66); ?>" width="66" height="66" alt="<?php echo $this->escapeHtml($_image->getLabel()) ?>" /></a>
         </li>
     <?php endforeach; ?>
     </ul>
diff --git a/app/design/frontend/default/modern/template/page/html/header.phtml b/app/design/frontend/default/modern/template/page/html/header.phtml
index b9588f15d9e..3e20149718a 100644
--- a/app/design/frontend/default/modern/template/page/html/header.phtml
+++ b/app/design/frontend/default/modern/template/page/html/header.phtml
@@ -39,7 +39,7 @@
     </div>
     <div class="quick-access">
         <?php echo $this->getChildHtml('store_language') ?>
-        <p class="welcome-msg"><?php echo $this->getWelcome()?></p>
+        <p class="welcome-msg"><?php echo $this->getChildHtml('welcome') ?></p>
         <?php echo $this->getChildHtml('topLinks') ?>
     </div>
     <?php echo $this->getChildHtml('topBar') ?>
diff --git a/app/etc/config.xml b/app/etc/config.xml
index ebba59a1af1..3c3d78c33ed 100644
--- a/app/etc/config.xml
+++ b/app/etc/config.xml
@@ -76,7 +76,7 @@
             <connection>
                 <types>
                     <pdo_mysql>
-                        <adapter>Varien_Db_Adapter_Pdo_Mysql</adapter>
+                        <adapter>Magento_Db_Adapter_Pdo_Mysql</adapter>
                         <class>Mage_Core_Model_Resource_Type_Db_Pdo_Mysql</class>
                         <compatibleMode>1</compatibleMode>
                     </pdo_mysql>
diff --git a/app/etc/local.xml.additional b/app/etc/local.xml.additional
index c491fb81dde..60eb828d610 100644
--- a/app/etc/local.xml.additional
+++ b/app/etc/local.xml.additional
@@ -36,6 +36,10 @@ to app/etc/local.xml manually.
         <session_cache_limiter><![CDATA[]]></session_cache_limiter><!-- see http://php.net/manual/en/function.session-cache-limiter.php#82174 for possible values -->
         <cache>
             <backend></backend><!-- apc / memcached / xcache / empty=file -->
+            <backend_options>
+                <connection></connection> <!-- Custom connection for db backend -->
+                <enable_two_levels>true</enable_two_levels> <!-- Enable two level cache -->
+            </backend_options>
             <slow_backend></slow_backend> <!-- database / file (default) - used for 2 levels cache setup, necessary for all shared memory storages -->
             <slow_backend_store_data></slow_backend_store_data> <!-- 1 / 0 (default) - used for 2 levels cache setup, sets whether store data in db slow cache backend -->
             <auto_refresh_fast_cache></auto_refresh_fast_cache> <!-- 1 / 0 (default) - used for 2 levels cache setup, sets whether refresh data in fast cache backend -->
@@ -76,5 +80,63 @@ to app/etc/local.xml manually.
             <header1>HTTP_X_REAL_IP</header1>
             <header2>HTTP_X_FORWARDED_FOR</header2>
         </remote_addr_headers>
+
+        <!-- example of redis cache -->
+        <cache>
+            <backend>Cm_Cache_Backend_Redis</backend>
+            <backend_options>
+                <server>127.0.0.1</server> <!-- or absolute path to unix socket for better performance -->
+                <port>6379</port>
+                <database>0</database>
+                <password></password>
+                <force_standalone>0</force_standalone>  <!-- 0 for phpredis, 1 for standalone PHP -->
+                <connect_retries>1</connect_retries>    <!-- Reduces errors due to random connection failures -->
+                <automatic_cleaning_factor>0</automatic_cleaning_factor> <!-- Disabled by default -->
+                <compress_data>1</compress_data>  <!-- 0-9 for compression level, recommended: 0 or 1 -->
+                <compress_tags>1</compress_tags>  <!-- 0-9 for compression level, recommended: 0 or 1 -->
+                <compress_threshold>20480</compress_threshold>  <!-- Strings below this size will not be compressed -->
+                <compression_lib>gzip</compression_lib> <!-- Supports gzip, lzf and snappy -->
+                <persistent>1</persistent> <!-- persistence value, 0: not in use, > 0 used as persistence ID -->
+            </backend_options>
+        </cache>
+
+        <!-- example of redis full page cache -->
+        <full_page_cache>
+            <backend>Cm_Cache_Backend_Redis</backend>
+            <backend_options>
+                <server>127.0.0.1</server> <!-- or absolute path to unix socket for better performance -->
+                <port>6379</port>
+                <database>1</database>
+                <password></password>
+                <force_standalone>0</force_standalone>  <!-- 0 for phpredis, 1 for standalone PHP -->
+                <connect_retries>1</connect_retries>    <!-- Reduces errors due to random connection failures -->
+                <automatic_cleaning_factor>0</automatic_cleaning_factor> <!-- Disabled by default -->
+                <!-- in FPC data is already gzipped, no need to do this twice -->
+                <compress_data>0</compress_data>  <!-- 0-9 for compression level, recommended: 0 or 1 -->
+                <compress_tags>1</compress_tags>  <!-- 0-9 for compression level, recommended: 0 or 1 -->
+                <compress_threshold>20480</compress_threshold>  <!-- Strings below this size will not be compressed -->
+                <compression_lib>gzip</compression_lib> <!-- Supports gzip, lzf and snappy -->
+                <lifetimelimit>43200</lifetimelimit> <!-- set lifetime for keys without TTL -->
+                <persistent>2</persistent>
+            </backend_options>
+        </full_page_cache>
+
+        <!-- example of redis session storage -->
+        <session_save>db</session_save>
+        <redis_session>                       <!-- All options seen here are the defaults -->
+            <host>127.0.0.1</host>            <!-- Specify an absolute path if using a unix socket -->
+            <port>6379</port>
+            <password></password>             <!-- Specify if your Redis server requires authentication -->
+            <timeout>2.5</timeout>            <!-- This is the Redis connection timeout, not the locking timeout -->
+            <persistent></persistent>         <!-- Specify unique string to enable persistent connections. E.g.: sess-db0; bugs with phpredis and php-fpm are known: https://github.com/nicolasff/phpredis/issues/70 -->
+            <db>0</db>                        <!-- Redis database number; protection from accidental loss is improved by using a unique DB number for sessions -->
+            <compression_threshold>2048</compression_threshold>  <!-- Set to 0 to disable compression (recommended when suhosin.session.encrypt=on); known bug with strings over 64k: https://github.com/colinmollenhour/Cm_Cache_Backend_Redis/issues/18 -->
+            <compression_lib>gzip</compression_lib>              <!-- gzip, lzf or snappy -->
+            <log_level>1</log_level>               <!-- 0 (emergency: system is unusable), 4 (warning; additional information, recommended), 5 (notice: normal but significant condition), 6 (info: informational messages), 7 (debug: the most information for development/testing) -->
+            <max_concurrency>6</max_concurrency>                 <!-- maximum number of processes that can wait for a lock on one session; for large production clusters, set this to at least 10% of the number of PHP processes -->
+            <break_after_frontend>5</break_after_frontend>       <!-- seconds to wait for a session lock in the frontend; not as critical as admin -->
+            <break_after_adminhtml>30</break_after_adminhtml>
+            <bot_lifetime>7200</bot_lifetime>                    <!-- Bots get shorter session lifetimes. 0 to disable -->
+        </redis_session>
     </global>
 </config>
diff --git a/app/etc/modules/Cm_RedisSession.xml b/app/etc/modules/Cm_RedisSession.xml
new file mode 100644
index 00000000000..5eef11fd44f
--- /dev/null
+++ b/app/etc/modules/Cm_RedisSession.xml
@@ -0,0 +1,8 @@
+<config>
+  <modules>
+    <Cm_RedisSession>
+      <active>false</active>
+      <codePool>community</codePool>
+    </Cm_RedisSession>
+  </modules>
+</config>
diff --git a/app/locale/en_US/Mage_Adminhtml.csv b/app/locale/en_US/Mage_Adminhtml.csv
index 52874d66924..eacb6b90ca6 100644
--- a/app/locale/en_US/Mage_Adminhtml.csv
+++ b/app/locale/en_US/Mage_Adminhtml.csv
@@ -201,6 +201,7 @@
 "Catalog Price Rules","Catalog Price Rules"
 "Catalog Rewrites","Catalog Rewrites"
 "Categories","Categories"
+"Category","Category"
 "Category:","Category:"
 "Chart is disabled. If you want to enable chart, click <a href=""%s"">here</a>.","Chart is disabled. If you want to enable chart, click <a href=""%s"">here</a>."
 "Checkbox","Checkbox"
@@ -351,6 +352,7 @@
 "FTP Login","FTP Login"
 "FTP Password","FTP Password"
 "FTP credentials","FTP credentials"
+"Failed","Failed"
 "Failed to add a product to cart by id ""%s"".","Failed to add a product to cart by id ""%s""."
 "Failed to cancel the billing agreement.","Failed to cancel the billing agreement."
 "Failed to clear the JavaScript/CSS cache.","Failed to clear the JavaScript/CSS cache."
@@ -411,6 +413,7 @@
 "IPN (Instant Payment Notification) Only","IPN (Instant Payment Notification) Only"
 "If there is an account associated with %s you will receive an email with a link to reset your password.","If there is an account associated with %s you will receive an email with a link to reset your password."
 "If this message persists, please contact the store owner.","If this message persists, please contact the store owner."
+"If you do not specify an option value for a specific store view then the default (Admin) value will be used.","If you do not specify an option value for a specific store view then the default (Admin) value will be used."
 "Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)"
 "Images Cache","Images Cache"
 "Import","Import"
@@ -457,6 +460,7 @@
 "Invoice voiding error.","Invoice voiding error."
 "Invoices","Invoices"
 "Is Closed","Is Closed"
+"Is Default","Is Default"
 "Issue Number","Issue Number"
 "Items","Items"
 "JavaScript seems to be disabled in your browser.","JavaScript seems to be disabled in your browser."
@@ -518,12 +522,15 @@
 "Manage Content","Manage Content"
 "Manage Currency Rates","Manage Currency Rates"
 "Manage Customers","Manage Customers"
+"Manage Options (values of your attribute)","Manage Options (values of your attribute)"
 "Manage Ratings","Manage Ratings"
 "Manage Stores","Manage Stores"
 "Manage Tax Rules","Manage Tax Rules"
 "Manage Tax Zones and Rates","Manage Tax Zones and Rates"
+"Manage Titles (Size, Color, etc.)","Manage Titles (Size, Color, etc.)"
 "Manual","Manual"
 "Matched Expression","Matched Expression"
+"Maximum sender name length is 255. Please correct your settings.","Maximum sender name length is 255. Please correct your settings."
 "Mb","Mb"
 "Media (.avi, .flv, .swf)","Media (.avi, .flv, .swf)"
 "Media storages synchronization has completed!","Media storages synchronization has completed!"
@@ -622,6 +629,7 @@
 "Only mapped fields","Only mapped fields"
 "Optional","Optional"
 "Options","Options"
+"Options is required","Options is required"
 "Order","Order"
 "Order #%s","Order #%s"
 "Order #%s (%s)","Order #%s (%s)"
@@ -715,6 +723,7 @@
 "Poll Manager","Poll Manager"
 "Polls","Polls"
 "Popular","Popular"
+"Position","Position"
 "Position of Watermark for %s","Position of Watermark for %s"
 "Pregenerated product images files.","Pregenerated product images files."
 "Prev. month (hold for menu)","Prev. month (hold for menu)"
diff --git a/app/locale/en_US/Mage_Api2.csv b/app/locale/en_US/Mage_Api2.csv
index 2974f2f1a56..6b2eddc4958 100644
--- a/app/locale/en_US/Mage_Api2.csv
+++ b/app/locale/en_US/Mage_Api2.csv
@@ -1,4 +1,7 @@
 "%s","%s"
+"%s role is a special one and can\'t be changed.","%s role is a special one and can\'t be changed."
+"%s role is a special one and can\'t be deleted.","%s role is a special one and can\'t be deleted."
+"%s role is protected.","%s role is protected."
 "ACL Attribute Rules","ACL Attribute Rules"
 "ACL Attributes Information","ACL Attributes Information"
 "Add","Add"
diff --git a/app/locale/en_US/Mage_Backup.csv b/app/locale/en_US/Mage_Backup.csv
index 6af5f4f312f..be22b2b719d 100644
--- a/app/locale/en_US/Mage_Backup.csv
+++ b/app/locale/en_US/Mage_Backup.csv
@@ -12,7 +12,9 @@
 "Backups","Backups"
 "Cannot read backup file.","Cannot read backup file."
 "Create Backup","Create Backup"
+"Database","Database"
 "Database Backup","Database Backup"
+"Database and Media","Database and Media"
 "Database and Media Backup","Database and Media Backup"
 "Database was successfuly backed up.","Database was successfuly backed up."
 "Download","Download"
@@ -35,6 +37,8 @@
 "Scheduled Backup Settings","Scheduled Backup Settings"
 "Size, Bytes","Size, Bytes"
 "Start Time","Start Time"
+"System","System"
+"System (excluding Media)","System (excluding Media)"
 "System Backup","System Backup"
 "System couldn't put store on the maintenance mode","System couldn't put store on the maintenance mode"
 "The database and media backup has been created.","The database and media backup has been created."
diff --git a/app/locale/en_US/Mage_Bundle.csv b/app/locale/en_US/Mage_Bundle.csv
index a2d47c2faea..b7b3332112d 100644
--- a/app/locale/en_US/Mage_Bundle.csv
+++ b/app/locale/en_US/Mage_Bundle.csv
@@ -32,6 +32,7 @@
 "Percent","Percent"
 "Percent Discount","Percent Discount"
 "Please Select Products to Add","Please Select Products to Add"
+"Please enter a number greater 0 in this field.","Please enter a number greater 0 in this field."
 "Please enter search conditions to view products.","Please enter search conditions to view products."
 "Please select options for product.","Please select options for product."
 "Please specify product option(s).","Please specify product option(s)."
diff --git a/app/locale/en_US/Mage_Catalog.csv b/app/locale/en_US/Mage_Catalog.csv
index ebdc3fc26c3..67e0838bda4 100644
--- a/app/locale/en_US/Mage_Catalog.csv
+++ b/app/locale/en_US/Mage_Catalog.csv
@@ -49,6 +49,8 @@
 "All","All"
 "All Product Types","All Product Types"
 "All Websites","All Websites"
+"All products","All products"
+"All products - recently added products, New products - products marked as new","All products - recently added products, New products - products marked as new"
 "All products of this set will be deleted! Are you sure you want to delete this attribute set?","All products of this set will be deleted! Are you sure you want to delete this attribute set?"
 "Allow All Products per Page","Allow All Products per Page"
 "Allow Dynamic Media URLs in Products and Categories","Allow Dynamic Media URLs in Products and Categories"
@@ -172,6 +174,7 @@
 "Category URL Suffix","Category URL Suffix"
 "Category attributes API","Category attributes API"
 "Category move error","Category move error"
+"Category move error %s","Category move error %s"
 "Category move operation is not possible: parent category is equal to child category.","Category move operation is not possible: parent category is equal to child category."
 "Category move operation is not possible: the current category was not found.","Category move operation is not possible: the current category was not found."
 "Category move operation is not possible: the new parent category was not found.","Category move operation is not possible: the new parent category was not found."
@@ -252,8 +255,10 @@
 "Disabled","Disabled"
 "Disallowed file type.","Disallowed file type."
 "Display Actual Price","Display Actual Price"
+"Display Page Control","Display Page Control"
 "Display Price Interval as One Price","Display Price Interval as One Price"
 "Display Product Count","Display Product Count"
+"Display Type","Display Type"
 "Display in Suggested Terms","Display in Suggested Terms"
 "Double click on a group to rename it","Double click on a group to rename it"
 "Double click on above image to view full picture","Double click on above image to view full picture"
@@ -276,6 +281,7 @@
 "Enable MAP","Enable MAP"
 "Enable Qty Increments","Enable Qty Increments"
 "Enable WYSIWYG","Enable WYSIWYG"
+"Enable for reindexing a big number of SKUs.","Enable for reindexing a big number of SKUs."
 "Enabled","Enabled"
 "Error during retrieval of option value: %s","Error during retrieval of option value: %s"
 "Exclude","Exclude"
@@ -417,6 +423,7 @@
 "New Search","New Search"
 "New Set Name","New Set Name"
 "New Subcategory","New Subcategory"
+"New products","New products"
 "Next","Next"
 "No","No"
 "No image","No image"
@@ -427,6 +434,7 @@
 "Not Visible Individually","Not Visible Individually"
 "Notify Low Stock RSS","Notify Low Stock RSS"
 "Notify for Quantity Below","Notify for Quantity Below"
+"Number of Products per Page","Number of Products per Page"
 "Number of Products to Display","Number of Products to Display"
 "Number of Uses","Number of Uses"
 "Number of results","Number of results"
@@ -454,7 +462,7 @@
 "Please be careful as once you click on the row it will load package data form the selected file and all unsaved form data will be lost.","Please be careful as once you click on the row it will load package data form the selected file and all unsaved form data will be lost."
 "Please click on the Close Window button if it is not closed automatically.","Please click on the Close Window button if it is not closed automatically."
 "Please enter a new group name","Please enter a new group name"
-"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> <a href=""%s"">Index Management</a>","Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> <a href=""%s"">Index Management</a>"
+"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -&gt; <a href=""%s"">Index Management</a>","Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -&gt; <a href=""%s"">Index Management</a>"
 "Please select a static block ...","Please select a static block ..."
 "Please select items.","Please select items."
 "Please select one or more attributes.","Please select one or more attributes."
@@ -515,7 +523,6 @@
 "Product collection expected.","Product collection expected."
 "Product is not loaded","Product is not loaded"
 "Product links API (related, cross sells, up sells)","Product links API (related, cross sells, up sells)"
-"Product name","Product name"
 "Product types API","Product types API"
 "Product with this combination of attributes already associated to configurable.","Product with this combination of attributes already associated to configurable."
 "Products","Products"
@@ -538,7 +545,7 @@
 "Quick Create","Quick Create"
 "Quick Overview","Quick Overview"
 "Quick simple product creation","Quick simple product creation"
-"Records for ""","Records for """
+"Records for ""%s"" store found.","Records for ""%s"" store found."
 "Redirect","Redirect"
 "Redirect URL","Redirect URL"
 "Regular Price:","Regular Price:"
@@ -612,7 +619,6 @@
 "Select type of option","Select type of option"
 "Select type options required values rows.","Select type options required values rows."
 "Selected Product Types","Selected Product Types"
-"Selected configuration is not available.","Selected configuration is not available."
 "Send Count","Send Count"
 "Set Ascending Direction","Set Ascending Direction"
 "Set Descending Direction","Set Descending Direction"
@@ -638,7 +644,7 @@
 "Skipping import row, store ""%s"" field does not exist.","Skipping import row, store ""%s"" field does not exist."
 "Skipping import row, the value ""%s"" is not valid for the ""%s"" field.","Skipping import row, the value ""%s"" is not valid for the ""%s"" field."
 "Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.","Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products."
-"Some of the products below do not have all the required options. Please edit them and configure all the required options.","Some of the products below do not have all the required options. Please edit them and configure all the required options."
+"Some of the selected item options are not currently available.","Some of the selected item options are not currently available."
 "Sort By","Sort By"
 "Sort Order","Sort Order"
 "Source Model","Source Model"
@@ -663,6 +669,8 @@
 "Template","Template"
 "Text","Text"
 "The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes. Currently there are %1\$d of them. Please reduce the number of filterable/sortable attributes in order to use this module","The Flat Catalog module has a limit of %2\$d filterable and/or sortable attributes. Currently there are %1\$d of them. Please reduce the number of filterable/sortable attributes in order to use this module"
+"The From Date value should be less than or equal to the To Date value.","The From Date value should be less than or equal to the To Date value."
+"The attribute code \'%s\' is reserved by system. Please try another attribute code","The attribute code \'%s\' is reserved by system. Please try another attribute code"
 "The attribute model is not defined","The attribute model is not defined"
 "The attribute set has been saved.","The attribute set has been saved."
 "The base directory to upload file is not specified.","The base directory to upload file is not specified."
diff --git a/app/locale/en_US/Mage_CatalogInventory.csv b/app/locale/en_US/Mage_CatalogInventory.csv
index 9f785b55782..2eb3908665d 100644
--- a/app/locale/en_US/Mage_CatalogInventory.csv
+++ b/app/locale/en_US/Mage_CatalogInventory.csv
@@ -13,6 +13,7 @@
 "Catalog Inventory","Catalog Inventory"
 "Decrease Stock When Order is Placed","Decrease Stock When Order is Placed"
 "Display Out of Stock Products","Display Out of Stock Products"
+"Display products availability in stock in the frontend","Display products availability in stock in the frontend"
 "Enable Qty Increments","Enable Qty Increments"
 "In Stock","In Stock"
 "Index Product Stock Status","Index Product Stock Status"
@@ -23,19 +24,21 @@
 "Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart"
 "Minimum Qty","Minimum Qty"
 "Minimum Qty Allowed in Shopping Cart","Minimum Qty Allowed in Shopping Cart"
+"Multi update product stock data","Multi update product stock data"
 "No Backorders","No Backorders"
 "Not all products are available in the requested quantity","Not all products are available in the requested quantity"
 "Notify for Quantity Below","Notify for Quantity Below"
 "Only X left Threshold","Only X left Threshold"
 "Out of Stock","Out of Stock"
 "Product Stock Options","Product Stock Options"
+"Products will still be shown by direct product URLs.","Products will still be shown by direct product URLs."
 "Qty Increments","Qty Increments"
 "Qty for Item's Status to Become Out of Stock","Qty for Item's Status to Become Out of Stock"
 "Retrieve stock data","Retrieve stock data"
 "Retrieve stock data by product ids","Retrieve stock data by product ids"
 "Rule price","Rule price"
 "Set Items' Status to be In Stock When Order is Cancelled","Set Items' Status to be In Stock When Order is Cancelled"
-"Some of the products are currently out of stock","Some of the products are currently out of stock"
+"Some of the products are currently out of stock.","Some of the products are currently out of stock."
 "Some of the products cannot be ordered in requested quantity.","Some of the products cannot be ordered in requested quantity."
 "Some of the products cannot be ordered in the requested quantity.","Some of the products cannot be ordered in the requested quantity."
 "Stock Options","Stock Options"
diff --git a/app/locale/en_US/Mage_Checkout.csv b/app/locale/en_US/Mage_Checkout.csv
index 3c14315faee..2b52826cf3a 100644
--- a/app/locale/en_US/Mage_Checkout.csv
+++ b/app/locale/en_US/Mage_Checkout.csv
@@ -173,6 +173,7 @@
 "New Address","New Address"
 "New Condition","New Condition"
 "New Terms and Conditions","New Terms and Conditions"
+"No Payment Methods","No Payment Methods"
 "ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER","ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER"
 "One Page Checkout","One Page Checkout"
 "One Page Checkout Failure","One Page Checkout Failure"
@@ -282,7 +283,6 @@
 "Some of the requested products are unavailable.","Some of the requested products are unavailable."
 "Some products quantities were recalculated because of quantity increment mismatch","Some products quantities were recalculated because of quantity increment mismatch"
 "Sorry, guest checkout is not enabled. Please try again or contact store owner.","Sorry, guest checkout is not enabled. Please try again or contact store owner."
-"Sorry, guest checkout is not enabled. Please try again or contact the store owner.","Sorry, guest checkout is not enabled. Please try again or contact the store owner."
 "Sorry, no quotes are available for this order at this time.","Sorry, no quotes are available for this order at this time."
 "State/Province","State/Province"
 "Status","Status"
diff --git a/app/locale/en_US/Mage_Core.csv b/app/locale/en_US/Mage_Core.csv
index 115c36f5f3e..d1e2854b137 100644
--- a/app/locale/en_US/Mage_Core.csv
+++ b/app/locale/en_US/Mage_Core.csv
@@ -159,7 +159,7 @@
 "Invalid layout update handle","Invalid layout update handle"
 "Invalid messages storage ""%s"" for layout messages initialization","Invalid messages storage ""%s"" for layout messages initialization"
 "Invalid query","Invalid query"
-"Invalid transactional email code: ","Invalid transactional email code: "
+"Invalid transactional email code: %s","Invalid transactional email code: %s"
 "Invalid website\'s configuration path: %s","Invalid website\'s configuration path: %s"
 "JavaScript Settings","JavaScript Settings"
 "Layout","Layout"
@@ -257,6 +257,7 @@
 "Profiler","Profiler"
 "Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
 "Request Path for Specified Store","Request Path for Specified Store"
+"Request path length exceeds allowed %s symbols.","Request path length exceeds allowed %s symbols."
 "Requested file may not include parent directory traversal (""../"", ""..\\ notation)""","Requested file may not include parent directory traversal (""../"", ""..\\ notation)"""
 "Requested invalid store ""%s""","Requested invalid store ""%s"""
 "Resource is not set.","Resource is not set."
@@ -313,6 +314,7 @@
 "Templates","Templates"
 "Text length does not satisfy specified text range.","Text length does not satisfy specified text range."
 "The %s you entered is invalid. Please make sure that it follows ""http://domain.com/"" format.","The %s you entered is invalid. Please make sure that it follows ""http://domain.com/"" format."
+"The From Date value should be less than or equal to the To Date value.","The From Date value should be less than or equal to the To Date value."
 "The store code may contain only letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter","The store code may contain only letters (a-z), numbers (0-9) or underscore(_), the first character must be a letter"
 "The store does not exist","The store does not exist"
 "The store has been deleted.","The store has been deleted."
diff --git a/app/locale/en_US/Mage_Cron.csv b/app/locale/en_US/Mage_Cron.csv
index acffb75303e..f902cb6f898 100644
--- a/app/locale/en_US/Mage_Cron.csv
+++ b/app/locale/en_US/Mage_Cron.csv
@@ -13,5 +13,4 @@
 "Success History Lifetime","Success History Lifetime"
 "Too late for the schedule.","Too late for the schedule."
 "Unable to save the cron expression.","Unable to save the cron expression."
-"Unknown error.","Unknown error."
 "Weekly","Weekly"
diff --git a/app/locale/en_US/Mage_Customer.csv b/app/locale/en_US/Mage_Customer.csv
index 341036e37ff..a979865b756 100644
--- a/app/locale/en_US/Mage_Customer.csv
+++ b/app/locale/en_US/Mage_Customer.csv
@@ -12,7 +12,6 @@
 "Account Information","Account Information"
 "Account Sharing Options","Account Sharing Options"
 "Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%s"">click here</a>.","Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please <a href=""%s"">click here</a>."
-"Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%s"">click here</a>.","Account confirmation is required. Please, check your email for the confirmation link. To resend the confirmation email please <a href=""%s"">click here</a>."
 "Action","Action"
 "Add New Address","Add New Address"
 "Add New Customer","Add New Customer"
@@ -160,7 +159,6 @@
 "General Subscription","General Subscription"
 "Generate Human-Friendly Customer ID","Generate Human-Friendly Customer ID"
 "Global","Global"
-"Grand Total","Grand Total"
 "Group","Group"
 "Group Information","Group Information"
 "Group Name","Group Name"
@@ -172,9 +170,6 @@
 "Hello, %s!","Hello, %s!"
 "ID","ID"
 "IP Address","IP Address"
-"If there is an account associated with %s you will receive an email with a link to reset your password.","If there is an account associated with %s you will receive an email with a link to reset your password."
-"If you are a registered VAT customer, please click <a href=""%s"">here</a> to enter you billing address for proper VAT calculation","If you are a registered VAT customer, please click <a href=""%s"">here</a> to enter you billing address for proper VAT calculation"
-"If you are a registered VAT customer, please click <a href=""%s"">here</a> to enter you shipping address for proper VAT calculation","If you are a registered VAT customer, please click <a href=""%s"">here</a> to enter you shipping address for proper VAT calculation"
 "If you believe this is an error, please contact us at %s","If you believe this is an error, please contact us at %s"
 "If you have an account with us, please log in.","If you have an account with us, please log in."
 "Invalid attribute option specified for attribute %s (%s), skipping the record.","Invalid attribute option specified for attribute %s (%s), skipping the record."
@@ -285,7 +280,6 @@
 "Please enter your email below and we\'ll send you confirmation link for it.","Please enter your email below and we\'ll send you confirmation link for it."
 "Please enter your email.","Please enter your email."
 "Please make sure your passwords match.","Please make sure your passwords match."
-"Please select","Please select"
 "Please select a website which contains store view","Please select a website which contains store view"
 "Please select region, state or province","Please select region, state or province"
 "Please, check your email for confirmation key.","Please, check your email for confirmation key."
@@ -297,7 +291,7 @@
 "Product Reviews","Product Reviews"
 "Product Tags","Product Tags"
 "Purchase On","Purchase On"
-"Purchased At","Purchased At"
+"Purchased On","Purchased On"
 "Qty","Qty"
 "Recent Orders","Recent Orders"
 "Records for %s store found.","Records for %s store found."
@@ -329,10 +323,10 @@
 "Save and Continue Edit","Save and Continue Edit"
 "Saved %d record(s)","Saved %d record(s)"
 "Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field.","Semicolon (;) separated values.<br/>Put semicolon in the beginning for empty first option.<br/>Leave empty for open text field."
+"Send Auto-Generated Password","Send Auto-Generated Password"
 "Send From","Send From"
 "Send Welcome Email","Send Welcome Email"
 "Send Welcome Email after Confirmation","Send Welcome Email after Confirmation"
-"Send auto-generated password","Send auto-generated password"
 "Send confirmation link","Send confirmation link"
 "Sending","Sending"
 "Sent","Sent"
@@ -404,7 +398,6 @@
 "There was an error validating the VAT ID.","There was an error validating the VAT ID."
 "There was an error validating the VAT ID. The customer would belong to Customer Group %s.","There was an error validating the VAT ID. The customer would belong to Customer Group %s."
 "This account is not confirmed.","This account is not confirmed."
-"This account is not confirmed. <a href=""%s"">Click here</a> to resend confirmation email.","This account is not confirmed. <a href=""%s"">Click here</a> to resend confirmation email."
 "This customer email already exists","This customer email already exists"
 "This customer has no saved addresses.","This customer has no saved addresses."
 "This email does not require confirmation.","This email does not require confirmation."
@@ -465,8 +458,6 @@
 "Your Tax ID cannot be validated.","Your Tax ID cannot be validated."
 "Your VAT ID was successfully validated.","Your VAT ID was successfully validated."
 "Your account balance is: %s","Your account balance is: %s"
-"Your password has been updated.","Your password has been updated."
-"Your password reset link has expired.","Your password reset link has expired."
 "ZIP","ZIP"
 "ZIP/Post Code","ZIP/Post Code"
 "Zip/Postal Code","Zip/Postal Code"
diff --git a/app/locale/en_US/Mage_Eav.csv b/app/locale/en_US/Mage_Eav.csv
index d8af90a97d5..2b490b2bc4f 100644
--- a/app/locale/en_US/Mage_Eav.csv
+++ b/app/locale/en_US/Mage_Eav.csv
@@ -49,7 +49,7 @@
 "Data integrity: No header row found for attribute","Data integrity: No header row found for attribute"
 "Date","Date"
 "Decimal Number","Decimal Number"
-"Default Product Listing Sort by not exists on Available Product Listing Sort By","Default Product Listing Sort by not exists on Available Product Listing Sort By"
+"Default Product Listing Sort by does not exist in Available Product Listing Sort By.","Default Product Listing Sort by does not exist in Available Product Listing Sort By."
 "Default Value","Default Value"
 "Default option value is not defined","Default option value is not defined"
 "Delete","Delete"
@@ -108,7 +108,6 @@
 "System","System"
 "Text Area","Text Area"
 "Text Field","Text Field"
-"The attribute code \'%s\' is reserved by system. Please try another attribute code","The attribute code \'%s\' is reserved by system. Please try another attribute code"
 "The value of attribute ""%s"" must be unique","The value of attribute ""%s"" must be unique"
 "The value of attribute ""%s"" must be unique.","The value of attribute ""%s"" must be unique."
 "This attribute is used in configurable products","This attribute is used in configurable products"
diff --git a/app/locale/en_US/Mage_GoogleCheckout.csv b/app/locale/en_US/Mage_GoogleCheckout.csv
index 1d0ebde617c..00159c2fc70 100644
--- a/app/locale/en_US/Mage_GoogleCheckout.csv
+++ b/app/locale/en_US/Mage_GoogleCheckout.csv
@@ -63,6 +63,7 @@
 "Google Order Status Change:","Google Order Status Change:"
 "Google Refund:","Google Refund:"
 "Google Risk Information:","Google Risk Information:"
+"GoogleCheckout is not configured","GoogleCheckout is not configured"
 "Ground","Ground"
 "Hide Cart Contents","Hide Cart Contents"
 "Home Delivery","Home Delivery"
diff --git a/app/locale/en_US/Mage_Page.csv b/app/locale/en_US/Mage_Page.csv
index ba3e49f3c7d..c767a03cc24 100644
--- a/app/locale/en_US/Mage_Page.csv
+++ b/app/locale/en_US/Mage_Page.csv
@@ -1,5 +1,5 @@
 "%s Item(s)","%s Item(s)"
-"&copy; 2012 Magento Demo Store. All Rights Reserved.","&copy; 2012 Magento Demo Store. All Rights Reserved."
+"&copy; 2013 Magento Demo Store. All Rights Reserved.","&copy; 2013 Magento Demo Store. All Rights Reserved."
 "(Shift-)Click or drag to change value","(Shift-)Click or drag to change value"
 "(ver. %s)","(ver. %s)"
 "- Click on any of the time parts to increase it","- Click on any of the time parts to increase it"
diff --git a/app/locale/en_US/Mage_Paygate.csv b/app/locale/en_US/Mage_Paygate.csv
index 841297c09be..853b0774d45 100644
--- a/app/locale/en_US/Mage_Paygate.csv
+++ b/app/locale/en_US/Mage_Paygate.csv
@@ -29,6 +29,7 @@
 "Merchant's Email","Merchant's Email"
 "Minimum Order Total","Minimum Order Total"
 "New Order Status","New Order Status"
+"Parent Authorize.Net transaction (ID %s) expired","Parent Authorize.Net transaction (ID %s) expired"
 "Payment Action","Payment Action"
 "Payment authorization error.","Payment authorization error."
 "Payment canceling error.","Payment canceling error."
diff --git a/app/locale/en_US/Mage_Paypal.csv b/app/locale/en_US/Mage_Paypal.csv
index a54962edc9d..34bccdd71cf 100644
--- a/app/locale/en_US/Mage_Paypal.csv
+++ b/app/locale/en_US/Mage_Paypal.csv
@@ -4,6 +4,12 @@
 "3D Secure Card Validation","3D Secure Card Validation"
 "3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.","3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>."
 "<a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>","<a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>"
+"A case that has been resolved and close requires a reimbursement.","A case that has been resolved and close requires a reimbursement."
+"A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.","A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof."
+"A reversal has occurred on this transaction because you have given the customer a refund.","A reversal has occurred on this transaction because you have given the customer a refund."
+"A reversal has occurred on this transaction due to a chargeback by your customer.","A reversal has occurred on this transaction due to a chargeback by your customer."
+"A reversal has occurred on this transaction due to a complaint about the transaction from your customer.","A reversal has occurred on this transaction due to a complaint about the transaction from your customer."
+"A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.","A reversal has occurred on this transaction due to your customer triggering a money-back guarantee."
 "A value is required for live mode. Refer to your CardinalCommerce agreement.","A value is required for live mode. Refer to your CardinalCommerce agreement."
 "ACH Deposit (Hold for Dispute or Other Investigation)","ACH Deposit (Hold for Dispute or Other Investigation)"
 "ACH Deposit (Reversal)","ACH Deposit (Reversal)"
@@ -73,6 +79,11 @@
 "Bonus for first ACH Use","Bonus for first ACH Use"
 "Both section above must be complete. ","Both section above must be complete. "
 "Buyer Credit Payment","Buyer Credit Payment"
+"Buyer claims that a possible duplicate payment was made to the merchant.","Buyer claims that a possible duplicate payment was made to the merchant."
+"Buyer claims that he did not receive goods or service.","Buyer claims that he did not receive goods or service."
+"Buyer claims that he/she did not authorize transaction.","Buyer claims that he/she did not authorize transaction."
+"Buyer claims that the goods or service received differ from merchant’s description of the goods or service.","Buyer claims that the goods or service received differ from merchant’s description of the goods or service."
+"Buyer claims that the received merchandise is unsatisfactory, defective, or damaged.","Buyer claims that the received merchandise is unsatisfactory, defective, or damaged."
 "Buyer\'s Tax ID","Buyer\'s Tax ID"
 "Buyer\'s Tax ID Type","Buyer\'s Tax ID Type"
 "By default it is ""reports.paypal.com"".","By default it is ""reports.paypal.com""."
@@ -86,13 +97,13 @@
 "Centinel Custom API URL","Centinel Custom API URL"
 "Charge-off","Charge-off"
 "Chargeback","Chargeback"
-"Chargeback by customer.","Chargeback by customer."
 "Checkout with PayPal","Checkout with PayPal"
 "Choose a secure bundled payment solution for your business.","Choose a secure bundled payment solution for your business."
 "City","City"
 "Click here if you are not redirected within 10 seconds...","Click here if you are not redirected within 10 seconds..."
 "Close","Close"
 "Company","Company"
+"Complaint","Complaint"
 "Completion Date","Completion Date"
 "Configure","Configure"
 "Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site.","Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site."
@@ -109,9 +120,7 @@
 "Custom Endpoint Hostname or IP-Address","Custom Endpoint Hostname or IP-Address"
 "Custom Path","Custom Path"
 "Customer Information","Customer Information"
-"Customer complaint.","Customer complaint."
 "Customer did not include a confirmed address.","Customer did not include a confirmed address."
-"Customer triggered a money-back guarantee.","Customer triggered a money-back guarantee."
 "Daily","Daily"
 "Debit","Debit"
 "Debit Card Cash Back","Debit Card Cash Back"
@@ -122,6 +131,7 @@
 "Discount","Discount"
 "Display Express Checkout in the Payment Information step","Display Express Checkout in the Payment Information step"
 "Displays on catalog pages and homepage.","Displays on catalog pages and homepage."
+"Dispute","Dispute"
 "Don't have a PayPal account? Simply enter your email address.","Don't have a PayPal account? Simply enter your email address."
 "Dynamic","Dynamic"
 "EFT Funding (German banking)","EFT Funding (German banking)"
@@ -197,6 +207,9 @@
 "Hidden Virtual PayPal Debit Card Transaction","Hidden Virtual PayPal Debit Card Transaction"
 "Hold for Dispute Investigation","Hold for Dispute Investigation"
 "IPN ""%s"".","IPN ""%s""."
+"IPN ""%s"". %s Transaction amount %s. Transaction ID: ""%s""","IPN ""%s"". %s Transaction amount %s. Transaction ID: ""%s"""
+"IPN ""%s"". A dispute has been resolved and closed. %s Transaction amount %s.","IPN ""%s"". A dispute has been resolved and closed. %s Transaction amount %s."
+"IPN ""%s"". Case type ""%s"". Case ID ""%s"" %s","IPN ""%s"". Case type ""%s"". Case ID ""%s"" %s"
 "If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement."
 "If not specified, Default Country from General Config will be used","If not specified, Default Country from General Config will be used"
 "If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only."
@@ -353,7 +366,6 @@
 "Qty","Qty"
 "Reauthorization","Reauthorization"
 "Reference Information","Reference Information"
-"Refund issued by merchant.","Refund issued by merchant."
 "Reimbursement for a chargeback.","Reimbursement for a chargeback."
 "Reimbursement of Chargeback","Reimbursement of Chargeback"
 "Report Date","Report Date"
@@ -439,6 +451,8 @@
 "Transaction ID","Transaction ID"
 "Transaction ID must not be empty.","Transaction ID must not be empty."
 "Transaction Information","Transaction Information"
+"Transaction reversal by PayPal administrators.","Transaction reversal by PayPal administrators."
+"Transaction reversal due to fraud detected by PayPal administrators.","Transaction reversal due to fraud detected by PayPal administrators."
 "Transfer Cart Line Items","Transfer Cart Line Items"
 "Transfer Shipping Options","Transfer Shipping Options"
 "Triggered Fraud Filters","Triggered Fraud Filters"
diff --git a/app/locale/en_US/Mage_Review.csv b/app/locale/en_US/Mage_Review.csv
index 04836e4c37a..018bc2254f3 100644
--- a/app/locale/en_US/Mage_Review.csv
+++ b/app/locale/en_US/Mage_Review.csv
@@ -14,6 +14,7 @@
 "All Reviews of Customer `%s`","All Reviews of Customer `%s`"
 "All Reviews of Product `%s`","All Reviews of Product `%s`"
 "Allow Guests to Write Reviews","Allow Guests to Write Reviews"
+"Approved","Approved"
 "Are you sure you want to do this?","Are you sure you want to do this?"
 "Are you sure?","Are you sure?"
 "Average Customer Rating","Average Customer Rating"
@@ -46,7 +47,9 @@
 "New Review","New Review"
 "Nickname","Nickname"
 "Nickname can\'t be empty","Nickname can\'t be empty"
+"Not Approved","Not Approved"
 "Only registered users can write reviews. Please, <a href=""%s"">log in</a> or <a href=""%s"">register</a>","Only registered users can write reviews. Please, <a href=""%s"">log in</a> or <a href=""%s"">register</a>"
+"Pending","Pending"
 "Pending Reviews","Pending Reviews"
 "Pending Reviews of Customer `%s`","Pending Reviews of Customer `%s`"
 "Please select a product","Please select a product"
diff --git a/app/locale/en_US/Mage_Rule.csv b/app/locale/en_US/Mage_Rule.csv
index d863e56b01a..06c9ccdd30d 100644
--- a/app/locale/en_US/Mage_Rule.csv
+++ b/app/locale/en_US/Mage_Rule.csv
@@ -14,6 +14,7 @@
 "Please choose an action to add...","Please choose an action to add..."
 "Remove","Remove"
 "TRUE","TRUE"
+"There is no information about associated entity type ""%s"".","There is no information about associated entity type ""%s""."
 "Websites must be specified.","Websites must be specified."
 "by","by"
 "contains","contains"
diff --git a/app/locale/en_US/Mage_Sales.csv b/app/locale/en_US/Mage_Sales.csv
index 472fe0d9431..f09b65621d9 100644
--- a/app/locale/en_US/Mage_Sales.csv
+++ b/app/locale/en_US/Mage_Sales.csv
@@ -10,6 +10,7 @@
 "%s order(s) were not released from holding status.","%s order(s) were not released from holding status."
 "* - Enter custom price excluding tax","* - Enter custom price excluding tax"
 "* - Enter custom price including tax","* - Enter custom price including tax"
+"* Required Fields","* Required Fields"
 "-- Please Select --","-- Please Select --"
 "-- Please Select Billing Agreement--","-- Please Select Billing Agreement--"
 "About This Order:","About This Order:"
@@ -268,7 +269,7 @@
 "Hold order","Hold order"
 "ID","ID"
 "ID #","ID #"
-"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s""","IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s"""
+"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s"". Credit Memo has not been created. Please create offline Credit Memo.","IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s"". Credit Memo has not been created. Please create offline Credit Memo."
 "If empty, the default description above will be used.","If empty, the default description above will be used."
 "If empty, the default error above will be used.","If empty, the default error above will be used."
 "If the invoice was created offline, try creating an offline creditmemo.","If the invoice was created offline, try creating an offline creditmemo."
@@ -452,6 +453,7 @@
 "Order credit memo","Order credit memo"
 "Order does not allow to be canceled.","Order does not allow to be canceled."
 "Order invoice","Order invoice"
+"Order is suspended as its authorizing amount %s is suspected to be fraudulent.","Order is suspended as its authorizing amount %s is suspected to be fraudulent."
 "Order is suspended as its capture amount %s is suspected to be fraudulent.","Order is suspended as its capture amount %s is suspected to be fraudulent."
 "Order object is not specified.","Order object is not specified."
 "Order saving error: %s","Order saving error: %s"
@@ -633,6 +635,7 @@
 "Select","Select"
 "Select All","Select All"
 "Select from existing customer addresses:","Select from existing customer addresses:"
+"Selected option(s) or their combination is not currently available.","Selected option(s) or their combination is not currently available."
 "Send Credit Memo Comment Email Copy To","Send Credit Memo Comment Email Copy To"
 "Send Credit Memo Comments Email Copy Method","Send Credit Memo Comments Email Copy Method"
 "Send Credit Memo Email Copy Method","Send Credit Memo Email Copy Method"
@@ -693,7 +696,9 @@
 "Size","Size"
 "Sku","Sku"
 "Sold to:","Sold to:"
-"Some of the products below do not have all the required options. Please edit them and configure all the required options.","Some of the products below do not have all the required options. Please edit them and configure all the required options."
+"Some item options or their combination are not currently available.","Some item options or their combination are not currently available."
+"Some of the products below do not have all the required options.","Some of the products below do not have all the required options."
+"Some of the selected options are not currently available.","Some of the selected options are not currently available."
 "Sorry, no quotes are available for this order at this time.","Sorry, no quotes are available for this order at this time."
 "Source object is not specified.","Source object is not specified."
 "Specified profile does not exist.","Specified profile does not exist."
@@ -759,7 +764,8 @@
 "The value that you entered is not valid.","The value that you entered is not valid."
 "There are no billing agreements yet.","There are no billing agreements yet."
 "There are no printable documents related to selected orders.","There are no printable documents related to selected orders."
-"There are no shipping labels related to selected %s.","There are no shipping labels related to selected %s."
+"There are no shipping labels related to selected orders.","There are no shipping labels related to selected orders."
+"There are no shipping labels related to selected shipments.","There are no shipping labels related to selected shipments."
 "There is no need to approve this payment.","There is no need to approve this payment."
 "There is no need to deny this payment.","There is no need to deny this payment."
 "There is no update for the payment.","There is no update for the payment."
diff --git a/app/locale/en_US/Mage_Tax.csv b/app/locale/en_US/Mage_Tax.csv
index 1d78ffbceff..36bcb3b7416 100644
--- a/app/locale/en_US/Mage_Tax.csv
+++ b/app/locale/en_US/Mage_Tax.csv
@@ -10,7 +10,6 @@
 "An error occurred while deleting this tax rule.","An error occurred while deleting this tax rule."
 "An error occurred while saving this tax class.","An error occurred while saving this tax class."
 "An error occurred while saving this tax class. A class with the same name","An error occurred while saving this tax class. A class with the same name"
-"An error occurred while saving this tax rule.","An error occurred while saving this tax rule."
 "Apply Customer Tax","Apply Customer Tax"
 "Apply Discount On Prices","Apply Discount On Prices"
 "Apply Tax On","Apply Tax On"
@@ -19,9 +18,11 @@
 "Back","Back"
 "Before Discount","Before Discount"
 "CSV","CSV"
+"Calculate off subtotal only","Calculate off subtotal only"
 "Calculation Settings","Calculation Settings"
 "Catalog Prices","Catalog Prices"
 "Class Name","Class Name"
+"Click here to go to <a href=""%s"">Tax configuration</a> and change your settings.","Click here to go to <a href=""%s"">Tax configuration</a> and change your settings."
 "Code","Code"
 "Country","Country"
 "Custom price if available","Custom price if available"
@@ -57,6 +58,7 @@
 "Grand Total (Incl.Tax)","Grand Total (Incl.Tax)"
 "Grand Total Excl. Tax","Grand Total Excl. Tax"
 "Grand Total Incl. Tax","Grand Total Incl. Tax"
+"Ignore this notification","Ignore this notification"
 "Import / Export Tax Rates","Import / Export Tax Rates"
 "Import Tax Rates","Import Tax Rates"
 "Inc. Tax","Inc. Tax"
@@ -72,6 +74,7 @@
 "Manage Tax Rates","Manage Tax Rates"
 "Manage Tax Rules","Manage Tax Rules"
 "Manage Tax Zones & Rates","Manage Tax Zones & Rates"
+"Maximum zip code length is 9.","Maximum zip code length is 9."
 "Name","Name"
 "New Class","New Class"
 "New Rule","New Rule"
@@ -81,6 +84,8 @@
 "One of the country has invalid code.","One of the country has invalid code."
 "Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings"
 "Original price only","Original price only"
+"Please fill all required fields with valid information.","Please fill all required fields with valid information."
+"Please see <a href=""%s"">source</a> for more details.","Please see <a href=""%s"">source</a> for more details."
 "Price Display Settings","Price Display Settings"
 "Priority","Priority"
 "Product Tax Class","Product Tax Class"
@@ -88,8 +93,10 @@
 "Product Tax Classes","Product Tax Classes"
 "Range From","Range From"
 "Range To","Range To"
+"Range To should be equal or greater than Range From.","Range To should be equal or greater than Range From."
 "Rate","Rate"
 "Rate Percent","Rate Percent"
+"Rate Percent should be a positive number.","Rate Percent should be a positive number."
 "Reset","Reset"
 "Row Total","Row Total"
 "Sales","Sales"
@@ -113,6 +120,7 @@
 "Subtotal (Excl.Tax)","Subtotal (Excl.Tax)"
 "Subtotal (Incl. Tax)","Subtotal (Incl. Tax)"
 "Subtotal (Incl.Tax)","Subtotal (Incl.Tax)"
+"Subtotal only","Subtotal only"
 "Tax","Tax"
 "Tax Calculation Based On","Tax Calculation Based On"
 "Tax Calculation Method Based On","Tax Calculation Method Based On"
@@ -133,17 +141,20 @@
 "The tax rate has been imported.","The tax rate has been imported."
 "The tax rate has been saved.","The tax rate has been saved."
 "The tax rule has been deleted.","The tax rule has been deleted."
-"The tax rule has been saved.","The tax rule has been saved."
 "This class no longer exists","This class no longer exists"
 "This rule no longer exists","This rule no longer exists"
 "This rule no longer exists.","This rule no longer exists."
 "Total","Total"
 "Unit Price","Unit Price"
+"Warning tax configuration can result in rounding errors","Warning tax configuration can result in rounding errors"
+"Warning tax discount configuration might result in different discounts than a customer might expect","Warning tax discount configuration might result in different discounts than a customer might expect"
 "Whether catalog prices entered by admin include tax.","Whether catalog prices entered by admin include tax."
 "Whether shipping amounts entered by admin or obtained from gateways include tax.","Whether shipping amounts entered by admin or obtained from gateways include tax."
 "Yes","Yes"
 "You cannot delete this tax class as it is used for %d customer groups.","You cannot delete this tax class as it is used for %d customer groups."
 "You cannot delete this tax class as it is used for %d products.","You cannot delete this tax class as it is used for %d products."
 "You cannot delete this tax class as it is used in Tax Rules. You have to delete the rules it is used in first.","You cannot delete this tax class as it is used in Tax Rules. You have to delete the rules it is used in first."
+"Zip code should not contain characters other than digits.","Zip code should not contain characters other than digits."
 "Zip/Post Code","Zip/Post Code"
 "Zip/Post is Range","Zip/Post is Range"
+"for store(s)","for store(s)"
diff --git a/app/locale/en_US/Mage_Usa.csv b/app/locale/en_US/Mage_Usa.csv
index a5326c94406..0733fa290e7 100644
--- a/app/locale/en_US/Mage_Usa.csv
+++ b/app/locale/en_US/Mage_Usa.csv
@@ -25,7 +25,6 @@
 "Allowed Methods","Allowed Methods"
 "Allows breaking total order weight into smaller pieces if it exeeds %s %s to ensure accurate calculation of shipping charges.","Allows breaking total order weight into smaller pieces if it exeeds %s %s to ensure accurate calculation of shipping charges."
 "Allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges.","Allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges."
-"Bound Printed Matter","Bound Printed Matter"
 "Break bulk economy","Break bulk economy"
 "Break bulk express","Break bulk express"
 "Business Service Center","Business Service Center"
@@ -44,6 +43,7 @@
 "Customer services","Customer services"
 "DHL","DHL"
 "DHL (Deprecated)","DHL (Deprecated)"
+"DHL service is not available at %s date","DHL service is not available at %s date"
 "Debug","Debug"
 "Default Package Height","Default Package Height"
 "Default Package Length","Default Package Length"
@@ -95,7 +95,17 @@
 "FedEx Pak","FedEx Pak"
 "FedEx Tube","FedEx Tube"
 "First Overnight","First Overnight"
-"First-Class","First-Class"
+"First-Class Mail International Large Envelope","First-Class Mail International Large Envelope"
+"First-Class Mail International Letter","First-Class Mail International Letter"
+"First-Class Mail International Postcard","First-Class Mail International Postcard"
+"First-Class Mail Large Envelope","First-Class Mail Large Envelope"
+"First-Class Mail Large Postcards","First-Class Mail Large Postcards"
+"First-Class Mail Letter","First-Class Mail Letter"
+"First-Class Mail Parcel","First-Class Mail Parcel"
+"First-Class Mail Postcards","First-Class Mail Postcards"
+"First-Class Package International Service","First-Class Package International Service"
+"First-Class Package Service","First-Class Package Service"
+"First-Class Package Service Hold For Pickup","First-Class Package Service Hold For Pickup"
 "Flat","Flat"
 "Flat-Rate Box","Flat-Rate Box"
 "Flat-Rate Envelope","Flat-Rate Envelope"
@@ -107,6 +117,10 @@
 "Gateway XML URL","Gateway XML URL"
 "Gift","Gift"
 "Girth","Girth"
+"Global Express Guaranteed (GXG)","Global Express Guaranteed (GXG)"
+"Global Express Guaranteed Document","Global Express Guaranteed Document"
+"Global Express Guaranteed Non-Document Non-Rectangular","Global Express Guaranteed Non-Document Non-Rectangular"
+"Global Express Guaranteed Non-Document Rectangular","Global Express Guaranteed Non-Document Rectangular"
 "Globalmail business","Globalmail business"
 "Ground","Ground"
 "Ground Commercial","Ground Commercial"
@@ -135,7 +149,7 @@
 "Large Express Box","Large Express Box"
 "Length","Length"
 "Letter","Letter"
-"Library","Library"
+"Library Mail","Library Mail"
 "Live","Live"
 "Machinable","Machinable"
 "Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
@@ -186,6 +200,63 @@
 "Please, specify origin country","Please, specify origin country"
 "Pounds","Pounds"
 "Priority Mail","Priority Mail"
+"Priority Mail Express","Priority Mail Express"
+"Priority Mail Express Flat Rate Boxes","Priority Mail Express Flat Rate Boxes"
+"Priority Mail Express Flat Rate Boxes Hold For Pickup","Priority Mail Express Flat Rate Boxes Hold For Pickup"
+"Priority Mail Express Flat Rate Envelope","Priority Mail Express Flat Rate Envelope"
+"Priority Mail Express Flat Rate Envelope Hold For Pickup","Priority Mail Express Flat Rate Envelope Hold For Pickup"
+"Priority Mail Express Hold For Pickup","Priority Mail Express Hold For Pickup"
+"Priority Mail Express International","Priority Mail Express International"
+"Priority Mail Express International Flat Rate Boxes","Priority Mail Express International Flat Rate Boxes"
+"Priority Mail Express International Flat Rate Envelope","Priority Mail Express International Flat Rate Envelope"
+"Priority Mail Express International Legal Flat Rate Envelope","Priority Mail Express International Legal Flat Rate Envelope"
+"Priority Mail Express International Padded Flat Rate Envelope","Priority Mail Express International Padded Flat Rate Envelope"
+"Priority Mail Express Legal Flat Rate Envelope","Priority Mail Express Legal Flat Rate Envelope"
+"Priority Mail Express Legal Flat Rate Envelope Hold For Pickup","Priority Mail Express Legal Flat Rate Envelope Hold For Pickup"
+"Priority Mail Express Padded Flat Rate Envelope","Priority Mail Express Padded Flat Rate Envelope"
+"Priority Mail Express Padded Flat Rate Envelope Hold For Pickup","Priority Mail Express Padded Flat Rate Envelope Hold For Pickup"
+"Priority Mail Express Sunday/Holiday Delivery","Priority Mail Express Sunday/Holiday Delivery"
+"Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes","Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes"
+"Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope"
+"Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Legal Flat Rate Envelope"
+"Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope","Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope"
+"Priority Mail Flat Rate Envelope","Priority Mail Flat Rate Envelope"
+"Priority Mail Flat Rate Envelope Hold For Pickup","Priority Mail Flat Rate Envelope Hold For Pickup"
+"Priority Mail Gift Card Flat Rate Envelope","Priority Mail Gift Card Flat Rate Envelope"
+"Priority Mail Gift Card Flat Rate Envelope Hold For Pickup","Priority Mail Gift Card Flat Rate Envelope Hold For Pickup"
+"Priority Mail Hold For Pickup","Priority Mail Hold For Pickup"
+"Priority Mail International","Priority Mail International"
+"Priority Mail International DVD Flat Rate priced box","Priority Mail International DVD Flat Rate priced box"
+"Priority Mail International Flat Rate Envelope","Priority Mail International Flat Rate Envelope"
+"Priority Mail International Gift Card Flat Rate Envelope","Priority Mail International Gift Card Flat Rate Envelope"
+"Priority Mail International Large Flat Rate Box","Priority Mail International Large Flat Rate Box"
+"Priority Mail International Large Video Flat Rate priced box","Priority Mail International Large Video Flat Rate priced box"
+"Priority Mail International Legal Flat Rate Envelope","Priority Mail International Legal Flat Rate Envelope"
+"Priority Mail International Medium Flat Rate Box","Priority Mail International Medium Flat Rate Box"
+"Priority Mail International Padded Flat Rate Envelope","Priority Mail International Padded Flat Rate Envelope"
+"Priority Mail International Small Flat Rate Box","Priority Mail International Small Flat Rate Box"
+"Priority Mail International Small Flat Rate Envelope","Priority Mail International Small Flat Rate Envelope"
+"Priority Mail International Window Flat Rate Envelope","Priority Mail International Window Flat Rate Envelope"
+"Priority Mail Large Flat Rate Box","Priority Mail Large Flat Rate Box"
+"Priority Mail Large Flat Rate Box Hold For Pickup","Priority Mail Large Flat Rate Box Hold For Pickup"
+"Priority Mail Legal Flat Rate Envelope","Priority Mail Legal Flat Rate Envelope"
+"Priority Mail Legal Flat Rate Envelope Hold For Pickup","Priority Mail Legal Flat Rate Envelope Hold For Pickup"
+"Priority Mail Medium Flat Rate Box","Priority Mail Medium Flat Rate Box"
+"Priority Mail Medium Flat Rate Box Hold For Pickup","Priority Mail Medium Flat Rate Box Hold For Pickup"
+"Priority Mail Padded Flat Rate Envelope","Priority Mail Padded Flat Rate Envelope"
+"Priority Mail Padded Flat Rate Envelope Hold For Pickup","Priority Mail Padded Flat Rate Envelope Hold For Pickup"
+"Priority Mail Regional Rate Box A","Priority Mail Regional Rate Box A"
+"Priority Mail Regional Rate Box A Hold For Pickup","Priority Mail Regional Rate Box A Hold For Pickup"
+"Priority Mail Regional Rate Box B","Priority Mail Regional Rate Box B"
+"Priority Mail Regional Rate Box B Hold For Pickup","Priority Mail Regional Rate Box B Hold For Pickup"
+"Priority Mail Regional Rate Box C","Priority Mail Regional Rate Box C"
+"Priority Mail Regional Rate Box C Hold For Pickup","Priority Mail Regional Rate Box C Hold For Pickup"
+"Priority Mail Small Flat Rate Box","Priority Mail Small Flat Rate Box"
+"Priority Mail Small Flat Rate Box Hold For Pickup","Priority Mail Small Flat Rate Box Hold For Pickup"
+"Priority Mail Small Flat Rate Envelope","Priority Mail Small Flat Rate Envelope"
+"Priority Mail Small Flat Rate Envelope Hold For Pickup","Priority Mail Small Flat Rate Envelope Hold For Pickup"
+"Priority Mail Window Flat Rate Envelope","Priority Mail Window Flat Rate Envelope"
+"Priority Mail Window Flat Rate Envelope Hold For Pickup","Priority Mail Window Flat Rate Envelope Hold For Pickup"
 "Priority Overnight","Priority Overnight"
 "Product content code is invalid","Product content code is invalid"
 "Product name is missing","Product name is missing"
@@ -223,6 +294,8 @@
 "Shipment is not available.","Shipment is not available."
 "Shipment picked up","Shipment picked up"
 "Shipper Number","Shipper Number"
+"Shipping Accept XML URL","Shipping Accept XML URL"
+"Shipping Confirm XML URL","Shipping Confirm XML URL"
 "Shipping Key","Shipping Key"
 "Shipping Key (International)","Shipping Key (International)"
 "Show Method if Not Applicable","Show Method if Not Applicable"
@@ -234,6 +307,7 @@
 "Specific","Specific"
 "Sprintline","Sprintline"
 "Standard Overnight","Standard Overnight"
+"Standard Post","Standard Post"
 "Station","Station"
 "Subtotal","Subtotal"
 "Subtotal With Discount","Subtotal With Discount"
@@ -277,6 +351,7 @@
 "UPS Worldwide Express PlusSM","UPS Worldwide Express PlusSM"
 "UPS Worldwide Saver","UPS Worldwide Saver"
 "USPS","USPS"
+"USPS GXG Envelopes","USPS GXG Envelopes"
 "Unable to retrieve tracking","Unable to retrieve tracking"
 "United Parcel Service","United Parcel Service"
 "United Parcel Service XML","United Parcel Service XML"
diff --git a/app/locale/en_US/Mage_Weee.csv b/app/locale/en_US/Mage_Weee.csv
index 28473a40872..256f23cdcf8 100644
--- a/app/locale/en_US/Mage_Weee.csv
+++ b/app/locale/en_US/Mage_Weee.csv
@@ -16,4 +16,5 @@
 "Including FPT only","Including FPT only"
 "Total","Total"
 "Total Incl. Tax","Total Incl. Tax"
+"Total excl. tax","Total excl. tax"
 "Total incl. tax","Total incl. tax"
diff --git a/app/locale/en_US/Mage_Widget.csv b/app/locale/en_US/Mage_Widget.csv
index 4ce01bfafbb..cd13487a253 100644
--- a/app/locale/en_US/Mage_Widget.csv
+++ b/app/locale/en_US/Mage_Widget.csv
@@ -6,6 +6,7 @@
 "All","All"
 "All Pages","All Pages"
 "All Product Types","All Product Types"
+"An error occurred during saving a widget: %s","An error occurred during saving a widget: %s"
 "Anchor Categories","Anchor Categories"
 "Apply","Apply"
 "Assign to Store Views","Assign to Store Views"
diff --git a/app/locale/en_US/Mage_Wishlist.csv b/app/locale/en_US/Mage_Wishlist.csv
index 598b2d67909..13d8beef989 100644
--- a/app/locale/en_US/Mage_Wishlist.csv
+++ b/app/locale/en_US/Mage_Wishlist.csv
@@ -1,4 +1,3 @@
-"%1$s has been added to your wishlist. Click <a href=""%2$s"">here</a> to continue shopping.","%1$s has been added to your wishlist. Click <a href=""%2$s"">here</a> to continue shopping."
 "%1$s has been updated in your wishlist.","%1$s has been updated in your wishlist."
 "%d product(s) have been added to shopping cart: %s.","%d product(s) have been added to shopping cart: %s."
 "%s for ""%s"".","%s for ""%s""."
@@ -83,7 +82,7 @@
 "This product(s) is currently out of stock","This product(s) is currently out of stock"
 "Unable to add the following product(s) to shopping cart: %s.","Unable to add the following product(s) to shopping cart: %s."
 "Update Wishlist","Update Wishlist"
-"User description","User description"
+"User Description","User Description"
 "View Details","View Details"
 "View Product","View Product"
 "What's this?","What's this?"
diff --git a/app/locale/en_US/Mage_XmlConnect.csv b/app/locale/en_US/Mage_XmlConnect.csv
index df89016e7dd..92851c026a2 100644
--- a/app/locale/en_US/Mage_XmlConnect.csv
+++ b/app/locale/en_US/Mage_XmlConnect.csv
@@ -1,4 +1,5 @@
 " But cart has some errors."," But cart has some errors."
+" Note: Image size affects the performance of your app."," Note: Image size affects the performance of your app."
 """Description"" is more than %d characters long","""Description"" is more than %d characters long"
 """Title"" is more than %d characters long","""Title"" is more than %d characters long"
 """id"" attribute is required for a ""%s"" field.","""id"" attribute is required for a ""%s"" field."
@@ -6,39 +7,73 @@
 """message"" attribute is required for ""%s"" validator rule.","""message"" attribute is required for ""%s"" validator rule."
 "%1$s has been added to your wishlist.","%1$s has been added to your wishlist."
 "%1$s incl tax.","%1$s incl tax."
+"%@ is not correct","%@ is not correct"
 "%s API Key required.","%s API Key required."
 "%s Application ID required.","%s Application ID required."
 "%s Secret Key required.","%s Secret Key required."
 "%s attribute is required.","%s attribute is required."
+"%s fields is required","%s fields is required"
 "%s has been added to your cart.","%s has been added to your cart."
+"%s id:","%s id:"
+"%s was updated in your shopping cart.","%s was updated in your shopping cart."
 "(Includes more countries than those listed below. As the application owner, you are responsible for complying with country-specific laws related to the distribution or sale of your application into that country, including your home country.)","(Includes more countries than those listed below. As the application owner, you are responsible for complying with country-specific laws related to the distribution or sale of your application into that country, including your home country.)"
+"* - field is required","* - field is required"
 "*Subject to change","*Subject to change"
+"1. Please select type of the action:","1. Please select type of the action:"
 "10:40 AM","10:40 AM"
+"2. Please select a page","2. Please select a page"
+"2. Type Category Name","2. Type Category Name"
+"2. Type Product Name","2. Type Product Name"
 "80px x 80px","80px x 80px"
 "80x80 px","80x80 px"
-"<a href=""%s"" target=""_blank"">Login</a> to Urabn Airship.","<a href=""%s"" target=""_blank"">Login</a> to Urabn Airship."
+"<a href=""%s"" target=""_blank"">Login</a> to Urban Airship.","<a href=""%s"" target=""_blank"">Login</a> to Urban Airship."
 "A Catalog Only App will not support functions such as add to cart, add to wishlist, or login.","A Catalog Only App will not support functions such as add to cart, add to wishlist, or login."
 "A new password has been sent.","A new password has been sent."
+"About","About"
+"Access forbidden","Access forbidden"
 "Account","Account"
+"Account Information","Account Information"
+"Account Settings","Account Settings"
 "Account confirmation is required. Please check your email for the confirmation link.","Account confirmation is required. Please check your email for the confirmation link."
 "Account information has been saved.","Account information has been saved."
 "Action","Action"
+"Action type does\'t recognized","Action type does\'t recognized"
+"Action type does\'t recognized.","Action type does\'t recognized."
+"Action type doesn\'t recognized.","Action type doesn\'t recognized."
 "Activate","Activate"
 "Activate PayPal Checkout","Activate PayPal Checkout"
 "Activate PayPal MECL","Activate PayPal MECL"
 "Activation Key","Activation Key"
+"Add","Add"
+"Add Action","Add Action"
+"Add Address from Contacts","Add Address from Contacts"
 "Add App","Add App"
+"Add Custom","Add Custom"
+"Add New Address","Add New Address"
 "Add New Template","Add New Template"
 "Add Page","Add Page"
+"Add To Wishlist","Add To Wishlist"
+"Add a billing address","Add a billing address"
+"Add a shipping address","Add a shipping address"
 "Add to Cart","Add to Cart"
 "Add to Wishlist","Add to Wishlist"
+"Adding Product to Cart...","Adding Product to Cart..."
+"Adding Product to WishList...","Adding Product to WishList..."
 "Additional Address","Additional Address"
+"Additional Info","Additional Info"
 "Address","Address"
 "Address 2","Address 2"
+"Address Book","Address Book"
+"Address Book Updated","Address Book Updated"
+"Address Info","Address Info"
+"Address book is empty","Address book is empty"
 "Address data not specified.","Address data not specified."
 "Address does not belong to this customer.","Address does not belong to this customer."
 "Address has been deleted.","Address has been deleted."
 "Address has been saved.","Address has been saved."
+"Admin Application Settings","Admin Application Settings"
+"Admin Mobile Application","Admin Mobile Application"
+"Admin application has not been enabled","Admin application has not been enabled"
 "Administrative contact for this app and for app submission issues.","Administrative contact for this app and for app submission issues."
 "Advanced Settings","Advanced Settings"
 "After submitting the App to Magento, please contact <a href=""mailto:%1$s"">%1$s</a> to receive the Application Key, Application Secret and Application Master Secret.","After submitting the App to Magento, please contact <a href=""mailto:%1$s"">%1$s</a> to receive the Application Key, Application Secret and Application Master Secret."
@@ -48,12 +83,19 @@
 "AirMail message","AirMail message"
 "AirMail templates","AirMail templates"
 "All Allowed Countries","All Allowed Countries"
+"All Images","All Images"
 "All locations","All locations"
+"Amount","Amount"
+"Amount in %@","Amount in %@"
+"Amounts","Amounts"
 "An account with this email address already exists.","An account with this email address already exists."
 "An error occurred while adding item to wishlist.","An error occurred while adding item to wishlist."
 "An error occurred while deleting the address.","An error occurred while deleting the address."
 "An error occurred while loading categories.","An error occurred while loading categories."
 "An error occurred while loading category filters.","An error occurred while loading category filters."
+"An error occurred while loading configuration.","An error occurred while loading configuration."
+"An error occurred while loading localization.","An error occurred while loading localization."
+"An error occurred while loading login form.","An error occurred while loading login form."
 "An error occurred while loading wishlist.","An error occurred while loading wishlist."
 "An error occurred while processing your order. Please contact us or try again later.","An error occurred while processing your order. Please contact us or try again later."
 "An error occurred while processing your request.","An error occurred while processing your request."
@@ -63,10 +105,10 @@
 "Android","Android"
 "Android doesn\'t support AirMail message type.","Android doesn\'t support AirMail message type."
 "App Background","App Background"
+"App Background (landscape mode)","App Background (landscape mode)"
 "App Background (landscape mode).","App Background (landscape mode)."
+"App Background (portrait mode)","App Background (portrait mode)"
 "App Background (portrait mode).","App Background (portrait mode)."
-"App Background <br />(landscape mode)","App Background <br />(landscape mode)"
-"App Background <br />(portrait mode)","App Background <br />(portrait mode)"
 "App Background image missing.","App Background image missing."
 "App Code","App Code"
 "App Information","App Information"
@@ -74,6 +116,7 @@
 "App Stores","App Stores"
 "App Submission History","App Submission History"
 "App Title","App Title"
+"App code","App code"
 "App code required.","App code required."
 "App does not exist.","App does not exist."
 "App has been deleted.","App has been deleted."
@@ -87,15 +130,31 @@
 "Application Master Secret","Application Master Secret"
 "Application Name","Application Name"
 "Application Secret","Application Secret"
+"Application doesn\'t exist.","Application doesn\'t exist."
+"Apply","Apply"
+"Applying Coupon Code","Applying Coupon Code"
+"Applying Gift Card %@","Applying Gift Card %@"
+"Are you sure you want to cancel a message?","Are you sure you want to cancel a message?"
+"Are you sure you want to cancel selected records?","Are you sure you want to cancel selected records?"
+"Are you sure you want to delete a message?","Are you sure you want to delete a message?"
+"Are you sure you want to delete selected records?","Are you sure you want to delete selected records?"
 "Are you sure you want to delete this theme? This change will affect all applications.","Are you sure you want to delete this theme? This change will affect all applications."
 "Are you sure you want to do this?","Are you sure you want to do this?"
-"Are you sure you whant to cancel a message?","Are you sure you whant to cancel a message?"
-"Are you sure you whant to delete a message?","Are you sure you whant to delete a message?"
-"Are you sure you what to cancel selected records?","Are you sure you what to cancel selected records?"
-"Are you sure you what to delete selected records?","Are you sure you what to delete selected records?"
+"Are you sure you want to remove this item?","Are you sure you want to remove this item?"
+"As Low As","As Low As"
+"As Low Excl. Tax","As Low Excl. Tax"
+"As Low Incl. Tax","As Low Incl. Tax"
 "As a Magento customer, Urban Airship is offering you unlimited Push Notifications and Rich Push for $100/year* along with a 60 day free trial.","As a Magento customer, Urban Airship is offering you unlimited Push Notifications and Rich Push for $100/year* along with a 60 day free trial."
+"As low as","As low as"
+"As low as excl. tax","As low as excl. tax"
+"As low as incl. tax","As low as incl. tax"
 "At last one application has to be created.","At last one application has to be created."
+"At least one option should be selected","At least one option should be selected"
 "Authentication complete.","Authentication complete."
+"Authentication to %@ did failed...","Authentication to %@ did failed..."
+"Average Order Amount","Average Order Amount"
+"Average Orders","Average Orders"
+"Average Rating","Average Rating"
 "Back","Back"
 "Back to App Edit","Back to App Edit"
 "Background Color","Background Color"
@@ -103,18 +162,26 @@
 "Balance Change","Balance Change"
 "Balance History","Balance History"
 "Banner on Home Screen","Banner on Home Screen"
+"Banner on Home Screen (landscape mode)","Banner on Home Screen (landscape mode)"
 "Banner on Home Screen (landscape mode) image missing.","Banner on Home Screen (landscape mode) image missing."
+"Banner on Home Screen (portrait mode)","Banner on Home Screen (portrait mode)"
 "Banner on Home Screen (portrait mode) image missing.","Banner on Home Screen (portrait mode) image missing."
-"Banner on Home Screen <br />(landscape mode)","Banner on Home Screen <br />(landscape mode)"
-"Banner on Home Screen <br />(portrait mode)","Banner on Home Screen <br />(portrait mode)"
 "Banner on Home Screen image missing.","Banner on Home Screen image missing."
+"Banners on Home Screen","Banners on Home Screen"
+"Best Sellers","Best Sellers"
+"Billing","Billing"
 "Billing Address","Billing Address"
+"Billing address","Billing address"
 "Billing address has been set.","Billing address has been set."
+"Bundle Products","Bundle Products"
 "Buy %1$s for %2$s","Buy %1$s for %2$s"
 "Buy %1$s for %2$s (%3$s incl. tax) each","Buy %1$s for %2$s (%3$s incl. tax) each"
 "Buy %1$s for %2$s each","Buy %1$s for %2$s each"
 "Buy %1$s with %2$s discount each","Buy %1$s with %2$s discount each"
+"Buy More & Save","Buy More & Save"
 "Buyer country is not allowed by store.","Buyer country is not allowed by store."
+"CMS Page","CMS Page"
+"CMS Pages haven\'t been found.","CMS Pages haven\'t been found."
 "Cache Lifetime (seconds)","Cache Lifetime (seconds)"
 "Cache Management","Cache Management"
 "Can\'t add item to shopping cart.","Can\'t add item to shopping cart."
@@ -123,12 +190,14 @@
 "Can\'t create wishlist.","Can\'t create wishlist."
 "Can\'t delete ""%s"" theme.","Can\'t delete ""%s"" theme."
 "Can\'t load XML.","Can\'t load XML."
+"Can\'t load admin application settings.","Can\'t load admin application settings."
 "Can\'t load application with id ""%s""","Can\'t load application with id ""%s"""
 "Can\'t load cart info.","Can\'t load cart info."
 "Can\'t load cart.","Can\'t load cart."
 "Can\'t load customer form.","Can\'t load customer form."
 "Can\'t load default themes.","Can\'t load default themes."
 "Can\'t load selected theme. Please check your media folder permissions.","Can\'t load selected theme. Please check your media folder permissions."
+"Can\'t load template with id ""%s""","Can\'t load template with id ""%s"""
 "Can\'t open submission form.","Can\'t open submission form."
 "Can\'t read file ""%s"".","Can\'t read file ""%s""."
 "Can\'t remove the item.","Can\'t remove the item."
@@ -143,41 +212,71 @@
 "Can\'t write to file ""%s"".","Can\'t write to file ""%s""."
 "Cancel","Cancel"
 "Canceled","Canceled"
+"Canceling PayPal ...","Canceling PayPal ..."
 "Cancelled","Cancelled"
 "Cannot apply gift card.","Cannot apply gift card."
+"Cannot configure product.","Cannot configure product."
 "Cannot load theme ""%s"".","Cannot load theme ""%s""."
 "Cannot redeem Gift Card.","Cannot redeem Gift Card."
 "Cannot remove gift card.","Cannot remove gift card."
 "Cannot save theme ""%s"". Incorrect data received","Cannot save theme ""%s"". Incorrect data received"
+"Cannot update the item.","Cannot update the item."
 "Card Verification Number","Card Verification Number"
 "Card verification number is wrong","Card verification number is wrong"
 "Carrier","Carrier"
 "Cart","Cart"
+"Cart Updated","Cart Updated"
 "Cart has been updated.","Cart has been updated."
 "Cart has some errors.","Cart has some errors."
 "Cart is empty.","Cart is empty."
 "Catalog Only App?","Catalog Only App?"
+"Category","Category"
 "Category Button Color","Category Button Color"
 "Category Item Background Color","Category Item Background Color"
+"Cc:","Cc:"
 "Chairs","Chairs"
 "Change Orientation","Change Orientation"
 "Change Password","Change Password"
 "Changes have been saved to theme.","Changes have been saved to theme."
+"Check","Check"
+"Check Gift Card","Check Gift Card"
+"Check Gift Card Promo Redeemed","Check Gift Card Promo Redeemed"
+"Checking Gift Card %@","Checking Gift Card %@"
+"Checkout","Checkout"
+"Checkout Page Registration","Checkout Page Registration"
+"Checkout as Guest","Checkout as Guest"
+"Checkout as Guest or Register","Checkout as Guest or Register"
 "Checkout has been initialized.","Checkout has been initialized."
+"Checkout initialization...","Checkout initialization..."
+"Checkout initialized!","Checkout initialized!"
+"Choose Store View","Choose Store View"
+"Choose amount","Choose amount"
+"Choose file","Choose file"
 "City","City"
+"Clear","Clear"
+"Close","Close"
 "Color Themes","Color Themes"
 "Colors","Colors"
+"Commiting updates...","Commiting updates..."
 "Company","Company"
 "Completed","Completed"
+"Configuration data have been saved","Configuration data have been saved"
+"Configure Cart Item","Configure Cart Item"
 "Confirm New Password","Confirm New Password"
 "Confirm Password","Confirm Password"
+"Connecting","Connecting"
+"Connection Error\nWe\'re sorry. The app is experiencing connection problems. The app requires a network connection to operate.","Connection Error\nWe\'re sorry. The app is experiencing connection problems. The app requires a network connection to operate."
 "Contact Email","Contact Email"
 "Contact Information","Contact Information"
+"ContactsAreEmpty","ContactsAreEmpty"
 "Container is not defined.","Container is not defined."
 "Content","Content"
+"Continue","Continue"
 "Copyright","Copyright"
 "Copyright Page Logo","Copyright Page Logo"
-"Copyright Page Logo <br />(iPhone 4 retina)","Copyright Page Logo <br />(iPhone 4 retina)"
+"Copyright Page Logo (iPhone 4 retina)","Copyright Page Logo (iPhone 4 retina)"
+"Copyright: Magento (c) 2010","Copyright: Magento (c) 2010"
+"Countries","Countries"
 "Countries Payment Applicable From","Countries Payment Applicable From"
 "Country","Country"
 "Country options don\'t recognized for ""%s"".","Country options don\'t recognized for ""%s""."
@@ -185,35 +284,45 @@
 "Coupon code %s was applied.","Coupon code %s was applied."
 "Coupon code is empty.","Coupon code is empty."
 "Coupon code was canceled.","Coupon code was canceled."
+"Create Account","Create Account"
+"Create an Account","Create an Account"
 "Creating a Template is allowed only for applications which have device type iPhone.","Creating a Template is allowed only for applications which have device type iPhone."
 "Credit Card","Credit Card"
 "Credit Card %s","Credit Card %s"
 "Credit Card Number","Credit Card Number"
 "Credit Card Type","Credit Card Type"
 "Credit card number does not match credit card type.","Credit card number does not match credit card type."
+"Cross Sells","Cross Sells"
 "Current Balance: %s","Current Balance: %s"
 "Current Password","Current Password"
-"Currently, PayPal MEP is not available for the Android application","Currently, PayPal MEP is not available for the Android application"
+"Currently, the system does not support the viewing of the order detail.","Currently, the system does not support the viewing of the order detail."
 "Custom App Icon","Custom App Icon"
-"Custom App Icon <br />(iPhone 4 retina)","Custom App Icon <br />(iPhone 4 retina)"
+"Custom App Icon (iPhone 4 retina)","Custom App Icon (iPhone 4 retina)"
 "Custom Colors","Custom Colors"
+"Custom amount","Custom amount"
+"Customer","Customer"
+"Customer Name","Customer Name"
 "Customer authentication problem.","Customer authentication problem."
 "Customer balance available in enterprise version of Magento only.","Customer balance available in enterprise version of Magento only."
 "Customer balance is disabled for current store","Customer balance is disabled for current store"
 "Customer email not specified.","Customer email not specified."
 "Customer logout problem.","Customer logout problem."
 "Customer not logged in.","Customer not logged in."
+"Customers","Customers"
 "DD","DD"
 "Date","Date"
 "Date Created","Date Created"
 "Date Submitted","Date Submitted"
 "Date Updated","Date Updated"
+"Date:","Date:"
 "Day","Day"
 "Deeper Messaging and Engagement with Rich Push.","Deeper Messaging and Engagement with Rich Push."
 "Default Billing Address","Default Billing Address"
 "Default Shipping Address","Default Shipping Address"
 "Default Theme","Default Theme"
+"Default themes are missed.","Default themes are missed."
 "Delete","Delete"
+"Delete Action","Delete Action"
 "Delete theme","Delete theme"
 "Deleted","Deleted"
 "Description","Description"
@@ -224,18 +333,37 @@
 "Device","Device"
 "Device Information","Device Information"
 "Device Type","Device Type"
+"Device doesn\'t recognized","Device doesn\'t recognized"
 "Device doesn\'t recognized. Unable to load a template.","Device doesn\'t recognized. Unable to load a template."
 "Device doesn\'t recognized: ""%s"". Unable to load a helper.","Device doesn\'t recognized: ""%s"". Unable to load a helper."
 "Device doesn\'t recognized: ""%s"". Unable to load preview model.","Device doesn\'t recognized: ""%s"". Unable to load preview model."
+"Device type doesn\'t recognized.","Device type doesn\'t recognized."
+"Discount code is empty","Discount code is empty"
+"Discount:","Discount:"
+"Done","Done"
+"Downloadable Products Updated","Downloadable Products Updated"
+"Downloads limit:","Downloads limit:"
+"E-mail","E-mail"
 "Edit","Edit"
+"Edit Action","Edit Action"
+"Edit Address","Edit Address"
 "Edit AirMail Message","Edit AirMail Message"
 "Edit AirMail Message Queue #%s","Edit AirMail Message Queue #%s"
 "Edit App ""%s""","Edit App ""%s"""
 "Edit Filter","Edit Filter"
+"Edit Image","Edit Image"
+"Edit Mail List","Edit Mail List"
 "Edit Template ""%s""","Edit Template ""%s"""
+"Edit filter","Edit filter"
+"Edit note","Edit note"
+"Either remote URL or application code was not set. Please make sure you filled all the values and try again.","Either remote URL or application code was not set. Please make sure you filled all the values and try again."
 "Element with id %s already exists","Element with id %s already exists"
 "Email","Email"
 "Email Address","Email Address"
+"Email address you provided is not valid. Please provide a valid one.","Email address you provided is not valid. Please provide a valid one."
+"Email is not correct","Email is not correct"
+"Email is not specified","Email is not specified"
+"Enable Admin Application","Enable Admin Application"
 "Enable AirMail Message Push notification","Enable AirMail Message Push notification"
 "Enable Facebook","Enable Facebook"
 "Enable Flurry Analytics","Enable Flurry Analytics"
@@ -243,30 +371,59 @@
 "Enable LinkedIn","Enable LinkedIn"
 "Enable Standard Checkout","Enable Standard Checkout"
 "Enable Twitter","Enable Twitter"
+"Enter Name","Enter Name"
+"Enter discount code first.","Enter discount code first."
+"Enter discount code if any","Enter discount code if any"
+"Enter e-mail","Enter e-mail"
+"Enter giftcard promo code here","Enter giftcard promo code here"
+"Enter text","Enter text"
+"Enter the gift card code","Enter the gift card code"
+"Error","Error"
+"Error Loading Configuration Format","Error Loading Configuration Format"
+"Error during shortening url","Error during shortening url"
+"Error message text is missed.","Error message text is missed."
 "Error while processing file ""%s"".","Error while processing file ""%s""."
 "Error while reading data from Payment Bridge. Please, try again.","Error while reading data from Payment Bridge. Please, try again."
+"Error while reading remote data","Error while reading remote data"
 "Error while uploading file ""%s"".","Error while uploading file ""%s""."
 "Error while uploading file ""%s"". Disallowed file type. Only ""jpg"", ""jpeg"", ""gif"", ""png"" are allowed.","Error while uploading file ""%s"". Disallowed file type. Only ""jpg"", ""jpeg"", ""gif"", ""png"" are allowed."
-"Error.","Error."
+"Excl. Tax","Excl. Tax"
 "Expiration Date - Month","Expiration Date - Month"
 "Expiration Date - Year","Expiration Date - Year"
 "Expires: %s","Expires: %s"
 "Extend the life of your app with Urban Airship Push Notifications.","Extend the life of your app with Urban Airship Push Notifications."
 "Extensions","Extensions"
 "FILTERS APPLIED","FILTERS APPLIED"
+"Facebook","Facebook"
 "Facebook API","Facebook API"
 "Facebook Application ID","Facebook Application ID"
+"Facebook post failed...","Facebook post failed..."
 "Fax","Fax"
 "File can\'t be uploaded.","File can\'t be uploaded."
 "File doesn\'t exist ""%s"".","File doesn\'t exist ""%s""."
+"Filter","Filter"
+"Filters","Filters"
 "First Name","First Name"
+"Fixed amounts","Fixed amounts"
 "Flurry API Code","Flurry API Code"
 "Flurry Analytics","Flurry Analytics"
 "Flurry Analytics Site","Flurry Analytics Site"
 "Fonts","Fonts"
+"Forgot Password","Forgot Password"
+"Forgot Password?","Forgot Password?"
+"Forgot your password?","Forgot your password?"
+"Form","Form"
 "Free","Free"
+"From","From"
+"From Excl. Tax","From Excl. Tax"
+"From Incl. Tax","From Incl. Tax"
+"From excl. tax","From excl. tax"
+"From incl. tax","From incl. tax"
+"Full Description","Full Description"
 "Funk Leaf","Funk Leaf"
+"Gallery","Gallery"
 "General","General"
+"Generate Offline Catalog","Generate Offline Catalog"
 "Get Content from CMS Page","Get Content from CMS Page"
 "Gift Card ""%s"" was added.","Gift Card ""%s"" was added."
 "Gift Card ""%s"" was redeemed.","Gift Card ""%s"" was redeemed."
@@ -276,6 +433,8 @@
 "Gift Card code is empty.","Gift Card code is empty."
 "Gift Card: %s","Gift Card: %s"
 "Gift card account available in enterprise version of Magento only.","Gift card account available in enterprise version of Magento only."
+"Giftcard promo code","Giftcard promo code"
+"Grand Total","Grand Total"
 "Grand Total (Excl. Tax)","Grand Total (Excl. Tax)"
 "Grand Total (Incl. Tax)","Grand Total (Incl. Tax)"
 "Guest","Guest"
@@ -286,27 +445,38 @@
 "Hot Red","Hot Red"
 "How do you rate this product?","How do you rate this product?"
 "How to incorporate Urban Airship within your application:","How to incorporate Urban Airship within your application:"
+"I Agree","I Agree"
+"I agree to the Terms and Conditions","I agree to the Terms and Conditions"
 "ID","ID"
-"Icon that will appear on the user\'s device after they download your app. Recommended size: 48px x 48px.","Icon that will appear on the user\'s device after they download your app. Recommended size: 48px x 48px."
-"Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 72px x 72px.","Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 72px x 72px."
-"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 114px x 114px.","Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 114px x 114px."
-"Icon that will appear on the user’s phone after they download your app.  You do not need to apply a gradient or soft edges (this is done automatically by Apple).  Recommended size: 57px x 57px at 72 dpi.","Icon that will appear on the user’s phone after they download your app.  You do not need to apply a gradient or soft edges (this is done automatically by Apple).  Recommended size: 57px x 57px at 72 dpi."
+"Icon that will appear on the user\'s device after they download your app.","Icon that will appear on the user\'s device after they download your app."
+"Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple)."
+"Icon that will appear on the user\'s phone after they download your app.  You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s phone after they download your app.  You do not need to apply a gradient or soft edges (this is done automatically by Apple)."
+"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple)."
 "Icons","Icons"
 "If leave this field empty, the message will be sent immediately","If leave this field empty, the message will be sent immediately"
 "If you want to disable the cache on the application side, leave the field empty. Warning! When disabling cache, the application will take time to load each page.","If you want to disable the cache on the application side, leave the field empty. Warning! When disabling cache, the application will take time to load each page."
+"Image %s is required.","Image %s is required."
+"Image action has been saved.","Image action has been saved."
+"Image does not exist. Please reload this page.","Image does not exist. Please reload this page."
 "Image file was not found.","Image file was not found."
-"Image that appears on first screen while your app is loading. Required size: 1024px x 768px.","Image that appears on first screen while your app is loading. Required size: 1024px x 768px."
-"Image that appears on first screen while your app is loading. Required size: 320px x 455px.","Image that appears on first screen while your app is loading. Required size: 320px x 455px."
-"Image that appears on first screen while your app is loading. Required size: 320px x 460px.","Image that appears on first screen while your app is loading. Required size: 320px x 460px."
-"Image that appears on first screen while your app is loading. Required size: 640px x 920px.","Image that appears on first screen while your app is loading. Required size: 640px x 920px."
-"Image that appears on first screen while your app is loading. Required size: 768px x 1024px.","Image that appears on first screen while your app is loading. Required size: 768px x 1024px."
+"Image has been deleted.","Image has been deleted."
+"Image id is required.","Image id is required."
+"Image limits don\'t recognized for ""%s"" image type","Image limits don\'t recognized for ""%s"" image type"
+"Image that appears on first screen while your app is loading.","Image that appears on first screen while your app is loading."
+"Image type doesn\'t recognized: ""%s"".","Image type doesn\'t recognized: ""%s""."
+"Image type is required.","Image type is required."
 "Images","Images"
+"Images order has been updated.","Images order has been updated."
 "In Queue","In Queue"
 "In Stock","In Stock"
 "In addition, click here to review Urban Airship\'s Terms of Service: <a href=""%s"" target=""_blank"">click here</a>.","In addition, click here to review Urban Airship\'s Terms of Service: <a href=""%s"" target=""_blank"">click here</a>."
 "In order to resubmit your app, you need to first purchase a <a href=""%s"" target=""_blank"">%s</a> from MagentoCommerce","In order to resubmit your app, you need to first purchase a <a href=""%s"" target=""_blank"">%s</a> from MagentoCommerce"
 "In order to submit your app, you need to first purchase a <a href=""%s"" target=""_blank"">%s</a> from MagentoCommerce","In order to submit your app, you need to first purchase a <a href=""%s"" target=""_blank"">%s</a> from MagentoCommerce"
 "Inactive Tabs","Inactive Tabs"
+"Incl. Tax","Incl. Tax"
+"Incl. tax","Incl. tax"
+"Initialization PayPal ...","Initialization PayPal ..."
+"Initialization of the PayPal checkout failed!","Initialization of the PayPal checkout failed!"
 "Invalid XML.","Invalid XML."
 "Invalid current password.","Invalid current password."
 "Invalid customer data.","Invalid customer data."
@@ -317,31 +487,77 @@
 "Invalid shipping method.","Invalid shipping method."
 "Issue Number","Issue Number"
 "It\'s not allowed to delete submitted application.","It\'s not allowed to delete submitted application."
+"Item","Item"
+"Item Options","Item Options"
 "Item has been added to cart.","Item has been added to cart."
 "Item has been deleted from cart.","Item has been deleted from cart."
 "Item has been removed from wishlist.","Item has been removed from wishlist."
+"Items","Items"
 "Items were updated. But can\'t update wishlist.","Items were updated. But can\'t update wishlist."
+"Keep your image size below %s KB for optimal performance.","Keep your image size below %s KB for optimal performance."
 "Key","Key"
 "Keywords","Keywords"
 "Label","Label"
+"Landscape app Background","Landscape app Background"
+"Landscape banners on Home Screen","Landscape banners on Home Screen"
 "Large iTunes Icon","Large iTunes Icon"
-"Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Required size: 512px x 512px.","Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Required size: 512px x 512px."
+"Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple).","Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple)."
+"Last 5 Orders","Last 5 Orders"
+"Last 5 Search Terms","Last 5 Search Terms"
 "Last Name","Last Name"
+"Last update: %@","Last update: %@"
+"Lifetime Sales","Lifetime Sales"
+"LindedIn","LindedIn"
+"Link:","Link:"
+"LinkedIn","LinkedIn"
 "LinkedIn API","LinkedIn API"
 "LinkedIn API Key","LinkedIn API Key"
+"LinkedIn Authorization","LinkedIn Authorization"
+"LinkedIn Autorization","LinkedIn Autorization"
 "LinkedIn Secret Key","LinkedIn Secret Key"
+"Linkedin post failed...","Linkedin post failed..."
+"List of downloadable products is empty","List of downloadable products is empty"
+"Load more items","Load more items"
 "Loader Splash Screen","Loader Splash Screen"
-"Loader Splash Screen <br />(iPhone 4 retina)","Loader Splash Screen <br />(iPhone 4 retina)"
-"Loader Splash Screen <br />(landscape mode)","Loader Splash Screen <br />(landscape mode)"
-"Loader Splash Screen <br />(portrait mode)","Loader Splash Screen <br />(portrait mode)"
+"Loader Splash Screen (iPhone 4 retina)","Loader Splash Screen (iPhone 4 retina)"
+"Loader Splash Screen (landscape mode)","Loader Splash Screen (landscape mode)"
+"Loader Splash Screen (portrait mode)","Loader Splash Screen (portrait mode)"
+"Loading %@...","Loading %@..."
+"Loading Account Form...","Loading Account Form..."
+"Loading Address Book...","Loading Address Book..."
+"Loading Address Form...","Loading Address Form..."
+"Loading CMS page ...","Loading CMS page ..."
+"Loading Cart...","Loading Cart..."
+"Loading Gallery...","Loading Gallery..."
+"Loading Login Form...","Loading Login Form..."
+"Loading My Downloadable Products...","Loading My Downloadable Products..."
+"Loading Order Details","Loading Order Details"
+"Loading Orders List...","Loading Orders List..."
 "Loading Preview...","Loading Preview..."
+"Loading Product Options...","Loading Product Options..."
+"Loading Products...","Loading Products..."
+"Loading Registration Form...","Loading Registration Form..."
+"Loading Restore Password Form...","Loading Restore Password Form..."
+"Loading Store Credit...","Loading Store Credit..."
+"Loading WishList...","Loading WishList..."
+"Loading Write Review Form...","Loading Write Review Form..."
+"Loading category ...","Loading category ..."
+"Loading more items...","Loading more items..."
+"Loading product ...","Loading product ..."
+"Loading shipping methods ...","Loading shipping methods ..."
+"Loading...","Loading..."
 "Locations","Locations"
 "Log In","Log In"
+"Log Out","Log Out"
+"Log in to Admin Panel","Log in to Admin Panel"
+"Log into Account","Log into Account"
+"Log into your account","Log into your account"
+"Log out Account","Log out Account"
+"LogInMessageTitle","LogInMessageTitle"
 "Login and password are required.","Login and password are required."
 "Logo in Header","Logo in Header"
 "Logo in Header image missing.","Logo in Header image missing."
 "Logout complete.","Logout complete."
-"M.I.","M.I."
 "MEP is PayPal\'s native checkout experience for the iPhone. You can choose to use MEP alongside standard checkout, or use it as your only checkout method for Magento mobile. PayPal MEP requires a <a href=""%s"">PayPal business account</a>","MEP is PayPal\'s native checkout experience for the iPhone. You can choose to use MEP alongside standard checkout, or use it as your only checkout method for Magento mobile. PayPal MEP requires a <a href=""%s"">PayPal business account</a>"
 "MM","MM"
 "Mailbox title","Mailbox title"
@@ -352,7 +568,11 @@
 "Manage Mobile App","Manage Mobile App"
 "Maximum length is 140","Maximum length is 140"
 "Maximum length is 255","Maximum length is 255"
+"Maximum size: %s KB.","Maximum size: %s KB."
+"Maximum: %.2f","Maximum: %.2f"
 "Merchant Label","Merchant Label"
+"Merge","Merge"
+"Message","Message"
 "Message Queue","Message Queue"
 "Message Settings","Message Settings"
 "Message Templates","Message Templates"
@@ -360,7 +580,13 @@
 "Message Type","Message Type"
 "Message can be edited when status of the message is ""In Queue"" only.","Message can be edited when status of the message is ""In Queue"" only."
 "Message content","Message content"
+"Message text is missed.","Message text is missed."
 "Message title","Message title"
+"Message too long, please use 140 symbols","Message too long, please use 140 symbols"
+"Message type doesn\'t recognized","Message type doesn\'t recognized"
+"Minimize","Minimize"
+"Minimum %@, maximum %@","Minimum %@, maximum %@"
+"Minimum: %.2f","Minimum: %.2f"
 "Mobile","Mobile"
 "Mobile Express Checkout has been canceled.","Mobile Express Checkout has been canceled."
 "Mobile Express Checkout processed successfully.","Mobile Express Checkout processed successfully."
@@ -368,39 +594,82 @@
 "More","More"
 "More Info","More Info"
 "More Tabs","More Tabs"
+"Most Viewed Products","Most Viewed Products"
+"My Account","My Account"
+"My Downloadable Products","My Downloadable Products"
+"My Orders","My Orders"
+"My Wishlist","My Wishlist"
+"Name","Name"
 "Name on Card","Name on Card"
 "Name that appears beneath your app when users install it to their device. We recommend choosing a name that is 10-12 characters and that your customers will recognize. %s chars max.","Name that appears beneath your app when users install it to their device. We recommend choosing a name that is 10-12 characters and that your customers will recognize. %s chars max."
 "New AirMail Message","New AirMail Message"
 "New AirMail Message Queue","New AirMail Message Queue"
 "New App","New App"
+"New Customers","New Customers"
 "New Password","New Password"
 "New Template","New Template"
+"New to Our Store?","New to Our Store?"
 "Nickname","Nickname"
+"No","No"
 "No Payment Information Required","No Payment Information Required"
+"No Ratings","No Ratings"
+"No internet connection. Retry later ...","No internet connection. Retry later ..."
 "No items were specifed to update.","No items were specifed to update."
 "No items were updated.","No items were updated."
 "No product selected.","No product selected."
+"No products found. Please retry with other term","No products found. Please retry with other term"
 "No shipping method required.","No shipping method required."
 "No such file ""%s"".","No such file ""%s""."
 "Not Submitted","Not Submitted"
+"Note: Image size affects the performance of your app.","Note: Image size affects the performance of your app."
 "Notice","Notice"
+"Number of Orders","Number of Orders"
+"Number of Uses","Number of Uses"
+"OK","OK"
+"OR, Pay with Standard Checkout","OR, Pay with Standard Checkout"
+"Offline Catalog","Offline Catalog"
+"Offline cart stored on server","Offline cart stored on server"
+"Offline catalog export complete.","Offline catalog export complete."
+"Offline catalog export failed.","Offline catalog export failed."
 "One or more keywords that describe your app. Keywords are matched to users\' searches in the App Store and help return accurate search results. Separate multiple keywords with commas. 100 chars is maximum.","One or more keywords that describe your app. Keywords are matched to users\' searches in the App Store and help return accurate search results. Separate multiple keywords with commas. 100 chars is maximum."
 "Onepage checkout is disabled.","Onepage checkout is disabled."
 "Only custom theme can be deleted","Only custom theme can be deleted"
 "Only default theme can be reset","Only default theme can be reset"
 "Only free apps are allowed in this version.","Only free apps are allowed in this version."
 "Only registered users can write reviews. Please, log in or register.","Only registered users can write reviews. Please, log in or register."
+"Open","Open"
+"Options","Options"
 "Options menu items","Options menu items"
+"Order","Order"
+"Order #","Order #"
 "Order #%s - %s","Order #%s - %s"
 "Order Date: %s","Order Date: %s"
+"Order Details Updated","Order Details Updated"
+"Order ID","Order ID"
+"Order ID:","Order ID:"
+"Order Info","Order Info"
+"Order List Updated","Order List Updated"
+"Order Number","Order Number"
+"Order Review","Order Review"
+"Order canceled","Order canceled"
+"Order failed","Order failed"
 "Order id is not specified.","Order id is not specified."
 "Order is not available.","Order is not available."
 "Ordered","Ordered"
+"Ordered Items","Ordered Items"
+"Orders","Orders"
+"Other amount","Other amount"
+"Out of Stock","Out of Stock"
 "Output format is not specified. Please, specify ""format"" key in constructor, or set it using setFormat().","Output format is not specified. Please, specify ""format"" key in constructor, or set it using setFormat()."
+"Overall Activity","Overall Activity"
 "POST data is not valid.","POST data is not valid."
 "Pages","Pages"
 "Password","Password"
 "Password fields cannot be empty.","Password fields cannot be empty."
+"Password is not specified","Password is not specified"
+"Password:","Password:"
+"PayPal","PayPal"
+"PayPal Checkout","PayPal Checkout"
 "PayPal MECL is the mobile version of PayPal\'s Express Checkout service. You can choose to use MECL alongside standard checkout, or use it as your only checkout method for Magento Mobile.","PayPal MECL is the mobile version of PayPal\'s Express Checkout service. You can choose to use MECL alongside standard checkout, or use it as your only checkout method for Magento Mobile."
 "PayPal MEP","PayPal MEP"
 "PayPal Mobile Embedded Payment (MEP)","PayPal Mobile Embedded Payment (MEP)"
@@ -410,11 +679,15 @@
 "Payer Email: %s","Payer Email: %s"
 "Payment Applicable From","Payment Applicable From"
 "Payment Bridge module unavailable.","Payment Bridge module unavailable."
+"Payment Information","Payment Information"
 "Payment Method","Payment Method"
 "Payment Method has been set.","Payment Method has been set."
 "Payment Methods","Payment Methods"
+"Payment method","Payment method"
 "Payment method was successfully set.","Payment method was successfully set."
 "Paypal MEP doesn\'t support checkout with any discount.","Paypal MEP doesn\'t support checkout with any discount."
+"Place Order","Place Order"
+"Placing order ...","Placing order ..."
 "Please <a href=""%s"" target=""_blank"">click here</a> to see how to setup and retrieve API credentials.","Please <a href=""%s"" target=""_blank"">click here</a> to see how to setup and retrieve API credentials."
 "Please Select Application","Please Select Application"
 "Please Select Device Type","Please Select Device Type"
@@ -424,6 +697,7 @@
 "Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Please enter a valid URL. Protocol is required (http://, https:// or ftp://)"
 "Please enter a valid date.","Please enter a valid date."
 "Please enter a valid email address. For example johndoe@domain.com.","Please enter a valid email address. For example johndoe@domain.com."
+"Please enter at least one email recipient","Please enter at least one email recipient"
 "Please enter issue number or start date for switch/solo card type.","Please enter issue number or start date for switch/solo card type."
 "Please enter the Activation Key.","Please enter the Activation Key."
 "Please enter the Copyright.","Please enter the Copyright."
@@ -432,8 +706,13 @@
 "Please enter the Resubmission Key.","Please enter the Resubmission Key."
 "Please enter the Title.","Please enter the Title."
 "Please make sure your passwords match.","Please make sure your passwords match."
+"Please save application first.","Please save application first."
 "Please select an option.","Please select an option."
 "Please select at least one country.","Please select at least one country."
+"Please select payment method to cover a quote","Please select payment method to cover a quote"
+"Please set email","Please set email"
+"Please specify payment method","Please specify payment method"
+"Please specify shipping method","Please specify shipping method"
 "Please upload  an image for ""App Background (landscape mode)"" field from Design Tab.","Please upload  an image for ""App Background (landscape mode)"" field from Design Tab."
 "Please upload  an image for ""App Background (portrait mode)"" field from Design Tab.","Please upload  an image for ""App Background (portrait mode)"" field from Design Tab."
 "Please upload  an image for ""App Background"" field from Design Tab.","Please upload  an image for ""App Background"" field from Design Tab."
@@ -444,81 +723,177 @@
 "Please use letters only (a-z or A-Z) in this field.","Please use letters only (a-z or A-Z) in this field."
 "Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.","Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas."
 "Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Please use only letters (a-z or A-Z) or numbers (0-9) only in this field. No spaces or other characters are allowed."
-"Prefix","Prefix"
+"Please wait...","Please wait..."
+"Please, specify gift card amount!","Please, specify gift card amount!"
+"Portrait app Background","Portrait app Background"
+"Portrait banners on Home Screen","Portrait banners on Home Screen"
+"Post data is empty.","Post data is empty."
+"Post this product to your wall","Post this product to your wall"
+"Posting to e-mails","Posting to e-mails"
+"Preferred size: %spx x %spx.","Preferred size: %spx x %spx."
 "Preset Theme","Preset Theme"
 "Preview","Preview"
 "Price","Price"
 "Price Font Color","Price Font Color"
+"Price excluding tax","Price excluding tax"
+"Price including tax","Price including tax"
 "Primary Color","Primary Color"
 "Primary Font Color","Primary Font Color"
 "Problem changing or sending password.","Problem changing or sending password."
+"Proceed to Checkout","Proceed to Checkout"
+"Product","Product"
+"Product Added to Cart","Product Added to Cart"
+"Product Added to Wishlist","Product Added to Wishlist"
+"Product Gallery Updated","Product Gallery Updated"
 "Product Name3 ","Product Name3 "
 "Product Name3 1","Product Name3 1"
 "Product Name3 2","Product Name3 2"
+"Product Options Updated","Product Options Updated"
+"Product Removed From Wishlist","Product Removed From Wishlist"
+"Product Reviews Updated","Product Reviews Updated"
+"Product SKU","Product SKU"
+"Product Updated","Product Updated"
+"Product added","Product added"
+"Product is out of stock","Product is out of stock"
 "Product is unavailable.","Product is unavailable."
+"Product only available on the website.","Product only available on the website."
+"Product succesfully added to cart","Product succesfully added to cart"
 "Product was not specified.","Product was not specified."
 "Product(s) currently out of stock.","Product(s) currently out of stock."
+"Products","Products"
+"Pull Down To Update..","Pull Down To Update.."
 "Purchase Order Number","Purchase Order Number"
 "Push Notification","Push Notification"
 "Push Notifications allow you to send messages directly to the people who have installed your app on their device. Send messages to your full audience even when your app is closed. Push Notifications are one of the best ways to keep your app active by delivering valuable content directly to your customers. Learn more about Push Notifications - <a href=""%1$s"" target=""_blank"">%1$s</a>","Push Notifications allow you to send messages directly to the people who have installed your app on their device. Send messages to your full audience even when your app is closed. Push Notifications are one of the best ways to keep your app active by delivering valuable content directly to your customers. Learn more about Push Notifications - <a href=""%1$s"" target=""_blank"">%1$s</a>"
 "Push Title","Push Title"
 "Push message","Push message"
 "Push title","Push title"
+"Qty","Qty"
+"Qty:","Qty:"
+"Quantity","Quantity"
+"Quantity:","Quantity:"
 "Queue Date","Queue Date"
 "Queue Message","Queue Message"
 "Queue does not exist.","Queue does not exist."
 "Queue is allowed only for applications with enabled Push Notification.","Queue is allowed only for applications with enabled Push Notification."
 "Quote instance is required.","Quote instance is required."
+"Quote item is not found.","Quote item is not found."
+"Range param doesn\'t recognized","Range param doesn\'t recognized"
+"Ratings and Reviews","Ratings and Reviews"
+"Read the Terms and Conditions","Read the Terms and Conditions"
+"Recent Activity","Recent Activity"
 "Recipient Information","Recipient Information"
-"Recommended size 1024px x 344px. Note: Image size affects the performance of your app.","Recommended size 1024px x 344px. Note: Image size affects the performance of your app."
-"Recommended size 1024px x 704px. Note: Image size affects the performance of your app.","Recommended size 1024px x 704px. Note: Image size affects the performance of your app."
-"Recommended size 320px x 230px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance.","Recommended size 320px x 230px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance."
-"Recommended size 320px x 258px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance.","Recommended size 320px x 258px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance."
-"Recommended size 320px x 367px. Note: Image size affects the performance of your app. Keep your image size below 75 KB for optimal performance.","Recommended size 320px x 367px. Note: Image size affects the performance of your app. Keep your image size below 75 KB for optimal performance."
-"Recommended size 35px x 35px.","Recommended size 35px x 35px."
-"Recommended size 768px x 294px. Note: Image size affects the performance of your app.","Recommended size 768px x 294px. Note: Image size affects the performance of your app."
-"Recommended size 768px x 960px. Note: Image size affects the performance of your app.","Recommended size 768px x 960px. Note: Image size affects the performance of your app."
+"Recommended size %spx x %spx.","Recommended size %spx x %spx."
+"Recommended size: %spx x %spx at %s dpi.","Recommended size: %spx x %spx at %s dpi."
+"Recommended size: %spx x %spx.","Recommended size: %spx x %spx."
+"Recover","Recover"
+"Redeem","Redeem"
+"Redeeming Gift Card %@","Redeeming Gift Card %@"
 "Redemption functionality is disabled.","Redemption functionality is disabled."
 "Refunded","Refunded"
+"Regions","Regions"
+"Register","Register"
+"Registering cart ...","Registering cart ..."
+"Registering user ...","Registering user ..."
+"Regular","Regular"
 "Regular and confirmation passwords must be equal","Regular and confirmation passwords must be equal"
 "Related Product Background Color","Related Product Background Color"
-"Request internal error.","Request internal error."
+"Release To Update...","Release To Update..."
+"Relevance","Relevance"
+"Remaining downloads","Remaining downloads"
+"Remove","Remove"
+"Remove Address...","Remove Address..."
+"Removing %@...","Removing %@..."
+"Removing Coupon...","Removing Coupon..."
+"Removing Gift Card...","Removing Gift Card..."
+"Removing Product from WishList...","Removing Product from WishList..."
+"Removing Store Credit...","Removing Store Credit..."
+"Request param %s is missed","Request param %s is missed"
+"Required size: %spx x %spx.","Required size: %spx x %spx."
 "Reset theme to default","Reset theme to default"
 "Resubmission Key","Resubmission Key"
 "Resubmit App","Resubmit App"
+"Resubmit App failure. %s","Resubmit App failure. %s"
+"Results","Results"
+"Revenue","Revenue"
+"Revert","Revert"
+"Revert Discount","Revert Discount"
 "Review","Review"
 "Rich Push allows you to create and send engaging experiences by adding HTML and other rich media components to your push notifications. Moving beyond alerts and badge updates, Rich Push takes users into the app while displaying content in a customizable WebKit view. Create branded messages that engage your users with new content and information, all without having to update your app. Learn more about Rich Push - <a href=""%1$s"" target=""_blank"">%1$s</a>","Rich Push allows you to create and send engaging experiences by adding HTML and other rich media components to your push notifications. Moving beyond alerts and badge updates, Rich Push takes users into the app while displaying content in a customizable WebKit view. Create branded messages that engage your users with new content and information, all without having to update your app. Learn more about Rich Push - <a href=""%1$s"" target=""_blank"">%1$s</a>"
 "SORT BY:","SORT BY:"
+"Sample","Sample"
+"Samples","Samples"
 "Save","Save"
 "Save As","Save As"
 "Save Theme","Save Theme"
 "Save and Continue Edit","Save and Continue Edit"
 "Save and Submit App","Save and Submit App"
 "Save in address book","Save in address book"
+"Saving Address...","Saving Address..."
+"Saving changes ...","Saving changes ..."
+"Saving shipping address ...","Saving shipping address ..."
+"Saving shipping methods ...","Saving shipping methods ..."
+"Screen resolution is not supported","Screen resolution is not supported"
 "Screens:","Screens:"
 "Scroll Background Color","Scroll Background Color"
 "Search","Search"
+"Search Term","Search Term"
+"Search Updated","Search Updated"
+"Searching for %@...","Searching for %@..."
 "Secondary Color","Secondary Color"
 "Secondary Font Color","Secondary Font Color"
+"See all","See all"
+"Select %@","Select %@"
 "Select All","Select All"
+"Select Chart","Select Chart"
+"Select Links","Select Links"
+"Select Options","Select Options"
+"Select Payment Method","Select Payment Method"
+"Select Range","Select Range"
+"Select a","Select a"
+"Select a Billing Address","Select a Billing Address"
+"Select a Shipping Address","Select a Shipping Address"
+"Select from Address Book","Select from Address Book"
+"Select shipping method","Select shipping method"
 "Selected product is unavailable.","Selected product is unavailable."
+"Send","Send"
 "Sender Information","Sender Information"
+"Sending e-mail failed...","Sending e-mail failed..."
+"Set","Set"
 "Settings","Settings"
+"Shake device to reset the filter","Shake device to reset the filter"
+"Share","Share"
+"Share on LinkedIn","Share on LinkedIn"
+"Share on Twitter","Share on Twitter"
+"Ship method","Ship method"
 "Shipped","Shipped"
+"Shipping","Shipping"
 "Shipping Address","Shipping Address"
 "Shipping Method","Shipping Method"
+"Shipping address","Shipping address"
 "Shipping address has been set.","Shipping address has been set."
+"Shipping method","Shipping method"
 "Shipping method has been set.","Shipping method has been set."
 "Shipping method is required","Shipping method is required"
 "Shipping method successfully updated","Shipping method successfully updated"
 "Shipping to this address is not possible.","Shipping to this address is not possible."
 "Shop","Shop"
+"Shop All","Shop All"
+"Shop Updated","Shop Updated"
+"Shopping Cart","Shopping Cart"
 "Shopping cart is empty.","Shopping cart is empty."
+"Show Password","Show Password"
+"Sign In","Sign In"
+"Signing In...","Signing In..."
+"Signing Out ...","Signing Out ..."
 "Sky Blue","Sky Blue"
 "Social Networking","Social Networking"
 "Some emails were not sent.","Some emails were not sent."
-"Sorry, no payment options are available for this order at this time.","Sorry, no payment options are available for this order at this time."
 "Sorry, no quotes are available for this order at this time.","Sorry, no quotes are available for this order at this time."
+"Sorry, there are no items in this category.","Sorry, there are no items in this category."
+"Special","Special"
+"Special Excl. Tax","Special Excl. Tax"
+"Special Incl. Tax","Special Incl. Tax"
 "Specific Countries","Specific Countries"
 "Specified address does not exist.","Specified address does not exist."
 "Specified invalid app code.","Specified invalid app code."
@@ -529,14 +904,23 @@
 "Start Date","Start Date"
 "Start Date - Month","Start Date - Month"
 "Start Date - Year","Start Date - Year"
+"Starting At","Starting At"
+"Starting At Excl. Tax","Starting At Excl. Tax"
+"Starting At Incl. Tax","Starting At Incl. Tax"
+"Starting at excl. tax","Starting at excl. tax"
+"Starting at incl. tax","Starting at incl. tax"
 "State/Province","State/Province"
 "Status","Status"
+"Storage of offline cart on server failed. Please retry later","Storage of offline cart on server failed. Please retry later"
+"Store Credit Info Updated","Store Credit Info Updated"
 "Store Credit payment is not being used in your shopping cart.","Store Credit payment is not being used in your shopping cart."
 "Store View","Store View"
-"Store logo that is displayed on copyright page of app. Preferred size: 100px x 100px.","Store logo that is displayed on copyright page of app. Preferred size: 100px x 100px."
-"Store logo that is displayed on copyright page of app. Preferred size: 200px x 200px.","Store logo that is displayed on copyright page of app. Preferred size: 200px x 200px."
+"Store credit","Store credit"
+"Store logo that is displayed on copyright page of app.","Store logo that is displayed on copyright page of app."
+"Store switcher hasn\'t been defined","Store switcher hasn\'t been defined"
 "Street Address","Street Address"
-"Street Address %s","Street Address %s"
+"Street Address 2","Street Address 2"
+"Subject:","Subject:"
 "Submission","Submission"
 "Submission Fields","Submission Fields"
 "Submission History","Submission History"
@@ -544,11 +928,23 @@
 "Submit App ""%s""","Submit App ""%s"""
 "Submit App failure. %s","Submit App failure. %s"
 "Submit App failure. Invalid activation key provided","Submit App failure. Invalid activation key provided"
+"Submit Review","Submit Review"
 "Submitted","Submitted"
+"Submitting Review...","Submitting Review..."
+"Subtotal","Subtotal"
 "Subtotal (Excl. Tax)","Subtotal (Excl. Tax)"
 "Subtotal (Incl. Tax)","Subtotal (Incl. Tax)"
-"Suffix","Suffix"
+"Subtotal Excl. Tax","Subtotal Excl. Tax"
+"Subtotal Incl. Tax","Subtotal Incl. Tax"
+"Subtotal excluding tax","Subtotal excluding tax"
+"Subtotal incl. tax:","Subtotal incl. tax:"
+"Subtotal including tax","Subtotal including tax"
+"Subtotal:","Subtotal:"
+"Success","Success"
+"Successfully posted to Facebook","Successfully posted to Facebook"
+"Successfully posted to Linkedin","Successfully posted to Linkedin"
 "Summary of Your Review","Summary of Your Review"
+"Swipe a product to reveal more options","Swipe a product to reveal more options"
 "T-Shirts","T-Shirts"
 "Tabs","Tabs"
 "Tax","Tax"
@@ -562,30 +958,79 @@
 "Template does not exist.","Template does not exist."
 "Template for new AirMail Message does not exist.","Template for new AirMail Message does not exist."
 "Template has been deleted.","Template has been deleted."
+"Terms And Conditions","Terms And Conditions"
 "Text length does not satisfy specified max text range.","Text length does not satisfy specified max text range."
 "Text length does not satisfy specified min text range.","Text length does not satisfy specified min text range."
 "Thank you for registering!","Thank you for registering!"
 "Thank you for your purchase! ","Thank you for your purchase! "
+"The %s field should be filled.","The %s field should be filled."
 "The Mailbox title will be shown in the More Info tab. To understand more about the title, please <a target=""_blank"" href=""http://www.magentocommerce.com/img/product/mobile/helpers/mail_box_title.png"">click here</a>","The Mailbox title will be shown in the More Info tab. To understand more about the title, please <a target=""_blank"" href=""http://www.magentocommerce.com/img/product/mobile/helpers/mail_box_title.png"">click here</a>"
-"The icon that appears in the Android Market. Recommended size: 512px x 512px. Maximum size: 1024 KB.","The icon that appears in the Android Market. Recommended size: 512px x 512px. Maximum size: 1024 KB."
+"The application is currently inactive.\nPlease try again later.","The application is currently inactive.\nPlease try again later."
+"The cart is empty","The cart is empty"
+"The custom amount value should be higher than 0.","The custom amount value should be higher than 0."
+"The custom amount value should not be higher than %s.","The custom amount value should not be higher than %s."
+"The custom amount value should not be lower than %s.","The custom amount value should not be lower than %s."
+"The following email(s) are either mistyped or have incorrect format. Check them and try again:\n","The following email(s) are either mistyped or have incorrect format. Check them and try again:\n"
+"The icon that appears in the Android Market.","The icon that appears in the Android Market."
+"The length of the text in the %s field is too big. Please shorten the text.","The length of the text in the %s field is too big. Please shorten the text."
+"The max length of the field ""%@"" is %d!","The max length of the field ""%@"" is %d!"
+"The minimum password length is 6","The minimum password length is 6"
+"The server responded with invalid data.","The server responded with invalid data."
+"The shortening service returned status code %d indicating a client side error.","The shortening service returned status code %d indicating a client side error."
+"The shortening service returned status code %d indicating a server side error.","The shortening service returned status code %d indicating a server side error."
 "The store credit payment has been removed from shopping cart.","The store credit payment has been removed from shopping cart."
+"The value is too big!","The value is too big!"
+"The value should not be greater than %.2f!","The value should not be greater than %.2f!"
+"The value should not be less than %.2f!","The value should not be less than %.2f!"
 "Theme configurations are successfully reset.","Theme configurations are successfully reset."
 "Theme has been created.","Theme has been created."
 "Theme has been delete.","Theme has been delete."
 "Theme label can\'t be empty","Theme label can\'t be empty"
 "Theme label:","Theme label:"
 "Theme name is not set.","Theme name is not set."
+"There are files that were selected but not uploaded yet. After switching to another tab your selections may be lost. Do you wish to continue ?","There are files that were selected but not uploaded yet. After switching to another tab your selections may be lost. Do you wish to continue ?"
+"There are no items here","There are no items here"
+"There are no items in your cart","There are no items in your cart"
+"There is an error in loading an app\'s configuration","There is an error in loading an app\'s configuration"
+"There is an error in retrieving the data. Please try again later","There is an error in retrieving the data. Please try again later"
+"There is no addresses for this contact","There is no addresses for this contact"
+"There is no store credit history!","There is no store credit history!"
 "There were some problems with the data.","There were some problems with the data."
 "This email address was not found in our records.","This email address was not found in our records."
+"This functionality disabled in offline mode","This functionality disabled in offline mode"
 "This is a required field.","This is a required field."
+"This product has no images.","This product has no images."
 "Title","Title"
 "Title bar","Title bar"
+"To","To"
+"To Excl. Tax","To Excl. Tax"
+"To Incl. Tax","To Incl. Tax"
 "To activate PayPal MEP payment method activate Express checkout first. ","To activate PayPal MEP payment method activate Express checkout first. "
+"To excl. tax","To excl. tax"
+"To incl. tax","To incl. tax"
+"To preview the newly uploaded images, please save your application first.","To preview the newly uploaded images, please save your application first."
+"To:","To:"
 "Token has not been set.","Token has not been set."
+"Too many recipients have been set.  Max amount of recipients is:","Too many recipients have been set.  Max amount of recipients is:"
+"Top Search Terms","Top Search Terms"
+"Total","Total"
+"Total Order Amount","Total Order Amount"
 "Total incl. Tax: %1$s","Total incl. Tax: %1$s"
+"Total incl. tax","Total incl. tax"
+"Totals","Totals"
+"Touch and hold a product to delete from shopping cart","Touch and hold a product to delete from shopping cart"
+"Touch and hold a product to reveal more options","Touch and hold a product to reveal more options"
+"Try Again","Try Again"
+"Twitter","Twitter"
 "Twitter API","Twitter API"
 "Twitter API Key","Twitter API Key"
+"Twitter Authorization","Twitter Authorization"
+"Twitter Autorization","Twitter Autorization"
 "Twitter Secret Key","Twitter Secret Key"
+"Twitter post failed...","Twitter post failed..."
+"Type","Type"
+"Type and data is required","Type and data is required"
+"URL","URL"
 "Unable to cancel Mobile Express Checkout.","Unable to cancel Mobile Express Checkout."
 "Unable to cancel queue.","Unable to cancel queue."
 "Unable to collect cart totals.","Unable to collect cart totals."
@@ -600,10 +1045,12 @@
 "Unable to initialize return action.","Unable to initialize return action."
 "Unable to load addresses.","Unable to load addresses."
 "Unable to load application form.","Unable to load application form."
+"Unable to load banners.","Unable to load banners."
 "Unable to load billing address form.","Unable to load billing address form."
 "Unable to load billing address.","Unable to load billing address."
 "Unable to load categories.","Unable to load categories."
 "Unable to load checkout.","Unable to load checkout."
+"Unable to load localization.","Unable to load localization."
 "Unable to load order list.","Unable to load order list."
 "Unable to load order review.","Unable to load order review."
 "Unable to load product gallery.","Unable to load product gallery."
@@ -619,6 +1066,7 @@
 "Unable to process preview.","Unable to process preview."
 "Unable to render a gift card account.","Unable to render a gift card account."
 "Unable to render an order.","Unable to render an order."
+"Unable to render downloadable products.","Unable to render downloadable products."
 "Unable to render the store credits.","Unable to render the store credits."
 "Unable to save app.","Unable to save app."
 "Unable to save message.","Unable to save message."
@@ -629,23 +1077,42 @@
 "Unable to start Mobile Express Checkout.","Unable to start Mobile Express Checkout."
 "Unable to update shipping method.","Unable to update shipping method."
 "Undefined","Undefined"
+"Unit Price","Unit Price"
+"Unit Price:","Unit Price:"
 "Unknown Error","Unknown Error"
 "Unknown Error.","Unknown Error."
+"Unknown Payment Bridge Error","Unknown Payment Bridge Error"
+"Unknown error ocured. Please retry later","Unknown error ocured. Please retry later"
 "Unsupported character in path: ""%s""","Unsupported character in path: ""%s"""
 "Unsupported value type received","Unsupported value type received"
+"Update Comment Error","Update Comment Error"
 "Update Preview","Update Preview"
+"Updating ...","Updating ..."
+"Updating Cart...","Updating Cart..."
 "Upon receiving these credentials, please fill in the corresponding fields.","Upon receiving these credentials, please fill in the corresponding fields."
 "Urban Airship Push Notification","Urban Airship Push Notification"
+"Use Billing Address","Use Billing Address"
 "Use Store Credit (%s available)","Use Store Credit (%s available)"
 "Use as my default billing address","Use as my default billing address"
 "Use as my default shipping address","Use as my default shipping address"
+"Use billing address for shipping","Use billing address for shipping"
+"User Name:","User Name:"
+"User session is expired","User session is expired"
+"Version","Version"
+"View Cart","View Cart"
 "View Details","View Details"
 "View Gallery","View Gallery"
+"View Wishlist","View Wishlist"
 "Warning: All related AirMail messages will be deleted!","Warning: All related AirMail messages will be deleted!"
+"Website is offline","Website is offline"
 "Website is offline.","Website is offline."
+"WishList Updated","WishList Updated"
 "Wishlist has been cleared.","Wishlist has been cleared."
 "Wishlist has been updated.","Wishlist has been updated."
 "Wishlist has been updated. But there are accrued some errors while updating some items.","Wishlist has been updated. But there are accrued some errors while updating some items."
+"Wishlist is empty.","Wishlist is empty."
+"Write a Review","Write a Review"
+"Write a review","Write a review"
 "Wrong Ipad background image orientation has been specified: ""%s"".","Wrong Ipad background image orientation has been specified: ""%s""."
 "Wrong PayPal Mobile Express Checkout Token specified.","Wrong PayPal Mobile Express Checkout Token specified."
 "Wrong device type.","Wrong device type."
@@ -654,21 +1121,38 @@
 "Wrong theme format.","Wrong theme format."
 "YYYY","YYYY"
 "Year","Year"
+"Yes","Yes"
 "You are already logged in.","You are already logged in."
+"You are not logged in","You are not logged in"
 "You can watch statistics here.","You can watch statistics here."
+"You canceled your order. Touch ""Pay with PayPal"" to try again.","You canceled your order. Touch ""Pay with PayPal"" to try again."
+"You have entered an incorrect decimal value in the custom amount field. Provide a valid value.","You have entered an incorrect decimal value in the custom amount field. Provide a valid value."
+"You have placed no orders.","You have placed no orders."
+"You have uncommitted actions. Commit?","You have uncommitted actions. Commit?"
+"You may also like","You may also like"
+"You must login first","You must login first"
+"You must read and agree to the Terms and Conditions before placing your order.","You must read and agree to the Terms and Conditions before placing your order."
 "You need to enable PayPal Express Checkout first from the Payment configuration before enabling PayPal MECL.","You need to enable PayPal Express Checkout first from the Payment configuration before enabling PayPal MECL."
 "You will receive an order confirmation email with details of your order and a link to track its progress.","You will receive an order confirmation email with details of your order and a link to track its progress."
 "Your current balance is:","Your current balance is:"
 "Your order # is: %s. ","Your order # is: %s. "
+"Your order cannot be completed at this time as there is no payment methods available for it.","Your order cannot be completed at this time as there is no payment methods available for it."
+"Your order failed. Touch ""Pay with PayPal"" to try again.","Your order failed. Touch ""Pay with PayPal"" to try again."
 "Your review has been accepted for moderation.","Your review has been accepted for moderation."
+"Your tweet has been sent. Thanks for sharing this product on Twitter","Your tweet has been sent. Thanks for sharing this product on Twitter"
 "Zip/Postal Code","Zip/Postal Code"
 "\'%s\' exceeds the allowed file size: %d (bytes)","\'%s\' exceeds the allowed file size: %d (bytes)"
 "\'%s\' height exceeds allowed value of %d px","\'%s\' height exceeds allowed value of %d px"
 "\'%s\' is not a valid file extension. Allowed extensions: %s","\'%s\' is not a valid file extension. Allowed extensions: %s"
 "\'%s\' width exceeds allowed value of %d px","\'%s\' width exceeds allowed value of %d px"
 "and","and"
+"as Guest","as Guest"
 "each","each"
+"field is required","field is required"
 "iPad","iPad"
 "iPhone","iPhone"
+"image_id is required","image_id is required"
+"not set","not set"
+"required","required"
 "save","save"
 "ver. %s","ver. %s"
diff --git a/app/locale/en_US/template/email/moneybookers_activateemail.html b/app/locale/en_US/template/email/moneybookers_activateemail.html
index 6570cd09197..67b7845c0b8 100644
--- a/app/locale/en_US/template/email/moneybookers_activateemail.html
+++ b/app/locale/en_US/template/email/moneybookers_activateemail.html
@@ -1,6 +1,6 @@
 <!--@subject {{var subject}} @-->
-Magento<br>
+{{var store.getFrontendName()}}<br>
 Moneybookers Email Address: {{var email_addr}}<br>
 Moneybookers Customer ID: {{var customer_id}}<br>
 URL: {{var url}}<br>
-Language: {{var language}}<br>
\ No newline at end of file
+Language: {{var language}}<br>
diff --git a/cron.php b/cron.php
index d555fca11af..682ff54f74b 100644
--- a/cron.php
+++ b/cron.php
@@ -40,10 +40,39 @@
 
 umask(0);
 
+$disabledFuncs = explode(',', ini_get('disable_functions'));
+$isShellDisabled = is_array($disabledFuncs) ? in_array('shell_exec', $disabledFuncs) : true;
+$isShellDisabled = (stripos(PHP_OS, 'win') === false) ? $isShellDisabled : true;
+
 try {
+    if (stripos(PHP_OS, 'win') === false) {
+        $options = getopt('m::');
+        if (isset($options['m'])) {
+            if ($options['m'] == 'always') {
+                $cronMode = 'always';
+            } elseif ($options['m'] == 'default') {
+                $cronMode = 'default';
+            } else {
+                Mage::throwException('Unrecognized cron mode was defined');
+            }
+        } else if (!$isShellDisabled) {
+            $fileName = basename(__FILE__);
+            $baseDir = dirname(__FILE__);
+            shell_exec("/bin/sh $baseDir/cron.sh $fileName -mdefault 1 > /dev/null 2>&1 &");
+            shell_exec("/bin/sh $baseDir/cron.sh $fileName -malways 1 > /dev/null 2>&1 &");
+            exit;
+        }
+    }
+
     Mage::getConfig()->init()->loadEventObservers('crontab');
     Mage::app()->addEventArea('crontab');
-    Mage::dispatchEvent('default');
+    if ($isShellDisabled) {
+        Mage::dispatchEvent('always');
+        Mage::dispatchEvent('default');
+    } else {
+        Mage::dispatchEvent($cronMode);
+    }
 } catch (Exception $e) {
     Mage::printException($e);
+    exit(1);
 }
diff --git a/cron.sh b/cron.sh
index 279e551008c..0120d555e3a 100644
--- a/cron.sh
+++ b/cron.sh
@@ -1,9 +1,14 @@
 #!/bin/sh
 # location of the php binary
 if [ ! "$1" = "" ] ; then
-CRONSCRIPT=$1
+    CRONSCRIPT=$1
 else
-CRONSCRIPT=cron.php
+    CRONSCRIPT=cron.php
+fi
+
+MODE=""
+if [ ! "$2" = "" ] ; then
+	MODE=" $2"
 fi
 
 PHP_BIN=`which php`
@@ -13,11 +18,11 @@ INSTALLDIR=`echo $0 | sed 's/cron\.sh//g'`
 
 #	prepend the intallation path if not given an absolute path
 if [ "$INSTALLDIR" != "" -a "`expr index $CRONSCRIPT /`" != "1" ];then
-    if ! ps auxwww | grep "$INSTALLDIR""$CRONSCRIPT" | grep -v grep 1>/dev/null 2>/dev/null ; then
-	$PHP_BIN "$INSTALLDIR""$CRONSCRIPT" &
+    if ! ps auxwww | grep "$INSTALLDIR$CRONSCRIPT$MODE" | grep -v grep 1>/dev/null 2>/dev/null ; then
+    	$PHP_BIN $INSTALLDIR$CRONSCRIPT$MODE &
     fi
 else
-    if  ! ps auxwww | grep " $CRONSCRIPT" | grep -v grep | grep -v cron.sh 1>/dev/null 2>/dev/null ; then
-        $PHP_BIN $CRONSCRIPT &
+    if  ! ps auxwww | grep "$CRONSCRIPT$MODE" | grep -v grep | grep -v cron.sh 1>/dev/null 2>/dev/null ; then
+        $PHP_BIN $CRONSCRIPT$MODE &
     fi
 fi
diff --git a/downloader/Maged/Controller.php b/downloader/Maged/Controller.php
index a5a6aa835ec..62fc577b450 100755
--- a/downloader/Maged/Controller.php
+++ b/downloader/Maged/Controller.php
@@ -991,9 +991,9 @@ public static function getVersionInfo()
     {
         return array(
             'major'     => '1',
-            'minor'     => '7',
+            'minor'     => '8',
             'revision'  => '0',
-            'patch'     => '1',
+            'patch'     => '0',
             'stability' => '',
             'number'    => '',
         );
diff --git a/downloader/js/prototype.js b/downloader/js/prototype.js
index a3f21ac7909..979f3b329bc 100755
--- a/downloader/js/prototype.js
+++ b/downloader/js/prototype.js
@@ -3274,4 +3274,4 @@ if (Prototype.Browser.WebKit) {
   }
 }
 
-Element.addMethods();
\ No newline at end of file
+Element.addMethods();
diff --git a/downloader/lib/Mage/Archive/Tar.php b/downloader/lib/Mage/Archive/Tar.php
index 516a39e9441..f609e3120f0 100644
--- a/downloader/lib/Mage/Archive/Tar.php
+++ b/downloader/lib/Mage/Archive/Tar.php
@@ -458,11 +458,8 @@ protected function _unpackCurrentTar($destination)
                 $list[] = $currentFile . DS;
             } elseif ($header['type'] == '2') {
 
-                $symlinkResult = @symlink($header['symlink'], $currentFile);
-
-                if (false === $symlinkResult) {
-                    throw new Mage_Exception('Failed to create symlink ' . $currentFile . ' to ' . $header['symlink']);
-                }
+                //we do not interrupt unpack process if symlink creation failed as symlinks are not so important
+                @symlink($header['symlink'], $currentFile);
             }
         }
 
diff --git a/downloader/target.xml b/downloader/target.xml
index 3e22070bfa6..34f681f5c8c 100644
--- a/downloader/target.xml
+++ b/downloader/target.xml
@@ -12,4 +12,4 @@
 		<target name="mageweb" label="Magento Other web accessible file" uri="." />
 		<target name="magetest" label="Magento PHPUnit test" uri="./tests" />
 		<target name="mage" label="Magento other" uri="." />
-	</targets>
\ No newline at end of file
+	</targets>
diff --git a/downloader/template/footer.phtml b/downloader/template/footer.phtml
index 1f67485d9e8..d4021b6a623 100755
--- a/downloader/template/footer.phtml
+++ b/downloader/template/footer.phtml
@@ -33,7 +33,7 @@
                 <script type="text/javascript">
                     $('bug_tracking_link').target = "varien_external";
                 </script>
-                Magento is a trademark of Magento, Inc. Copyright &copy; 2012 Magento Inc.
+                Magento is a trademark of Magento, Inc. Copyright &copy; 2013 Magento Inc.
             </p>
         </div>
     </body>
diff --git a/downloader/template/install/footer.phtml b/downloader/template/install/footer.phtml
index b11f21429a4..b2d4e08de02 100644
--- a/downloader/template/install/footer.phtml
+++ b/downloader/template/install/footer.phtml
@@ -41,7 +41,7 @@
 <script type="text/javascript">
     $('bug_tracking_link').target = "varien_external";
 </script>
-            Magento is a trademark of Magento, Inc. Copyright &copy; 2012 Magento Inc.</p>
+            Magento is a trademark of Magento, Inc. Copyright &copy; 2013 Magento Inc.</p>
         </div>
     </div>
         <!-- [end] footer -->
diff --git a/errors/default/page.phtml b/errors/default/page.phtml
index db6a89e5325..5ce67a66755 100644
--- a/errors/default/page.phtml
+++ b/errors/default/page.phtml
@@ -52,7 +52,7 @@
             </div>
             <div class="footer-container">
                 <div class="footer">
-                    <address class="copyright">Magento is a trademark of Magento Inc. Copyright &copy; 2012 Magento Inc.</address>
+                    <address class="copyright">Magento is a trademark of Magento Inc. Copyright &copy; 2013 Magento Inc.</address>
                 </div>
             </div>
         </div>
diff --git a/errors/design.xml b/errors/design.xml
index 70b7f11c8c9..f7241db2f74 100644
--- a/errors/design.xml
+++ b/errors/design.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Magento
+ * Magento Enterprise Edition
  *
  * NOTICE OF LICENSE
  *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
+ * This source file is subject to the Magento Enterprise Edition License
+ * that is bundled with this package in the file LICENSE_EE.txt.
  * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
+ * http://www.magentocommerce.com/license/enterprise-edition
  * If you did not receive a copy of the license and are unable to
  * obtain it through the world-wide-web, please send an email
  * to license@magentocommerce.com so we can send you a copy immediately.
@@ -22,7 +22,7 @@
  * @category    Mage
  * @package     Errors
  * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @license     http://www.magentocommerce.com/license/enterprise-edition
  */
 -->
 <config>
diff --git a/errors/processor.php b/errors/processor.php
index 578904edc8b..723fb1c6b02 100644
--- a/errors/processor.php
+++ b/errors/processor.php
@@ -558,7 +558,8 @@ public function sendReport()
      */
     protected function _validate()
     {
-        $email = eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$", $this->postData['email']);
+        $email = preg_match('/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/',
+            $this->postData['email']);
         return ($this->postData['firstName'] && $this->postData['lastName'] && $email);
     }
 
@@ -566,7 +567,7 @@ protected function _validate()
      * Skin setter
      *
      * @param string $value
-     * @param object $config
+     * @param stdClass $config
      */
     protected function _setSkin($value, stdClass $config = null)
     {
diff --git a/install.php b/install.php
index a96fa2c0239..a26bcc26fe5 100644
--- a/install.php
+++ b/install.php
@@ -121,7 +121,7 @@
 if (version_compare(phpversion(), '5.2.0', '<')===true) {
     die('ERROR: Whoops, it looks like you have an invalid PHP version. Magento supports PHP 5.2.0 or newer.');
 }
-
+set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path());
 require 'app/Mage.php';
 
 try {
diff --git a/js/calendar/calendar-setup.js b/js/calendar/calendar-setup.js
index 43f470ba32d..44bd62d8dc9 100644
--- a/js/calendar/calendar-setup.js
+++ b/js/calendar/calendar-setup.js
@@ -18,4 +18,4 @@
  * modify this code to suit your needs (this is recommended and much better
  * than modifying calendar.js itself).
  */
-Calendar.setup=function(params){function param_default(pname,def){if(typeof params[pname]=="undefined"){params[pname]=def;}};param_default("inputField",null);param_default("displayArea",null);param_default("button",null);param_default("eventName","click");param_default("ifFormat","%Y/%m/%d");param_default("daFormat","%Y/%m/%d");param_default("singleClick",true);param_default("disableFunc",null);param_default("dateStatusFunc",params["disableFunc"]);param_default("dateText",null);param_default("firstDay",null);param_default("align","Br");param_default("range",[1900,2999]);param_default("weekNumbers",true);param_default("flat",null);param_default("flatCallback",null);param_default("onSelect",null);param_default("onClose",null);param_default("onUpdate",null);param_default("date",null);param_default("showsTime",false);param_default("timeFormat","24");param_default("electric",true);param_default("step",2);param_default("position",null);param_default("cache",false);param_default("showOthers",false);param_default("multiple",null);var tmp=["inputField","displayArea","button"];for(var i in tmp){if(typeof params[tmp[i]]=="string"){params[tmp[i]]=document.getElementById(params[tmp[i]]);}}if(!(params.flat||params.multiple||params.inputField||params.displayArea||params.button)){alert("Calendar.setup:\n  Nothing to setup (no fields found).  Please check your code");return false;}function onSelect(cal){var p=cal.params;var update=(cal.dateClicked||p.electric);if(update&&p.inputField){p.inputField.value=cal.date.print(p.ifFormat);if(typeof p.inputField.onchange=="function")p.inputField.onchange();if(typeof fireEvent == 'function')fireEvent(p.inputField, "change");}if(update&&p.displayArea)p.displayArea.innerHTML=cal.date.print(p.daFormat);if(update&&typeof p.onUpdate=="function")p.onUpdate(cal);if(update&&p.flat){if(typeof p.flatCallback=="function")p.flatCallback(cal);}if(update&&p.singleClick&&cal.dateClicked)cal.callCloseHandler();};if(params.flat!=null){if(typeof params.flat=="string")params.flat=document.getElementById(params.flat);if(!params.flat){alert("Calendar.setup:\n  Flat specified but can't find parent.");return false;}var cal=new Calendar(params.firstDay,params.date,params.onSelect||onSelect);cal.showsOtherMonths=params.showOthers;cal.showsTime=params.showsTime;cal.time24=(params.timeFormat=="24");cal.params=params;cal.weekNumbers=params.weekNumbers;cal.setRange(params.range[0],params.range[1]);cal.setDateStatusHandler(params.dateStatusFunc);cal.getDateText=params.dateText;if(params.ifFormat){cal.setDateFormat(params.ifFormat);}if(params.inputField&&typeof params.inputField.value=="string"){cal.parseDate(params.inputField.value);}cal.create(params.flat);cal.show();return false;}var triggerEl=params.button||params.displayArea||params.inputField;triggerEl["on"+params.eventName]=function(){var dateEl=params.inputField||params.displayArea;var dateFmt=params.inputField?params.ifFormat:params.daFormat;var mustCreate=false;var cal=window.calendar;if(dateEl)params.date=Date.parseDate(dateEl.value||dateEl.innerHTML,dateFmt);if(!(cal&&params.cache)){window.calendar=cal=new Calendar(params.firstDay,params.date,params.onSelect||onSelect,params.onClose||function(cal){cal.hide();});cal.showsTime=params.showsTime;cal.time24=(params.timeFormat=="24");cal.weekNumbers=params.weekNumbers;mustCreate=true;}else{if(params.date)cal.setDate(params.date);cal.hide();}if(params.multiple){cal.multiple={};for(var i=params.multiple.length;--i>=0;){var d=params.multiple[i];var ds=d.print("%Y%m%d");cal.multiple[ds]=d;}}cal.showsOtherMonths=params.showOthers;cal.yearStep=params.step;cal.setRange(params.range[0],params.range[1]);cal.params=params;cal.setDateStatusHandler(params.dateStatusFunc);cal.getDateText=params.dateText;cal.setDateFormat(dateFmt);if(mustCreate)cal.create();cal.refresh();if(!params.position)cal.showAtElement(params.button||params.displayArea||params.inputField,params.align);else cal.showAt(params.position[0],params.position[1]);return false;};return cal;};
\ No newline at end of file
+Calendar.setup=function(params){function param_default(pname,def){if(typeof params[pname]=="undefined"){params[pname]=def;}};param_default("inputField",null);param_default("displayArea",null);param_default("button",null);param_default("eventName","click");param_default("ifFormat","%Y/%m/%d");param_default("daFormat","%Y/%m/%d");param_default("singleClick",true);param_default("disableFunc",null);param_default("dateStatusFunc",params["disableFunc"]);param_default("dateText",null);param_default("firstDay",null);param_default("align","Br");param_default("range",[1900,2999]);param_default("weekNumbers",true);param_default("flat",null);param_default("flatCallback",null);param_default("onSelect",null);param_default("onClose",null);param_default("onUpdate",null);param_default("date",null);param_default("showsTime",false);param_default("timeFormat","24");param_default("electric",true);param_default("step",2);param_default("position",null);param_default("cache",false);param_default("showOthers",false);param_default("multiple",null);var tmp=["inputField","displayArea","button"];for(var i in tmp){if(typeof params[tmp[i]]=="string"){params[tmp[i]]=document.getElementById(params[tmp[i]]);}}if(!(params.flat||params.multiple||params.inputField||params.displayArea||params.button)){alert("Calendar.setup:\n  Nothing to setup (no fields found).  Please check your code");return false;}function onSelect(cal){var p=cal.params;var update=(cal.dateClicked||p.electric);if(update&&p.inputField){p.inputField.value=cal.date.print(p.ifFormat);if(typeof p.inputField.onchange=="function")p.inputField.onchange();if(typeof fireEvent == 'function')fireEvent(p.inputField, "change");}if(update&&p.displayArea)p.displayArea.innerHTML=cal.date.print(p.daFormat);if(update&&typeof p.onUpdate=="function")p.onUpdate(cal);if(update&&p.flat){if(typeof p.flatCallback=="function")p.flatCallback(cal);}if(update&&p.singleClick&&cal.dateClicked)cal.callCloseHandler();};if(params.flat!=null){if(typeof params.flat=="string")params.flat=document.getElementById(params.flat);if(!params.flat){alert("Calendar.setup:\n  Flat specified but can't find parent.");return false;}var cal=new Calendar(params.firstDay,params.date,params.onSelect||onSelect);cal.showsOtherMonths=params.showOthers;cal.showsTime=params.showsTime;cal.time24=(params.timeFormat=="24");cal.params=params;cal.weekNumbers=params.weekNumbers;cal.setRange(params.range[0],params.range[1]);cal.setDateStatusHandler(params.dateStatusFunc);cal.getDateText=params.dateText;if(params.ifFormat){cal.setDateFormat(params.ifFormat);}if(params.inputField&&typeof params.inputField.value=="string"){cal.parseDate(params.inputField.value);}cal.create(params.flat);cal.show();return false;}var triggerEl=params.button||params.displayArea||params.inputField;triggerEl["on"+params.eventName]=function(){var dateEl=params.inputField||params.displayArea;var dateFmt=params.inputField?params.ifFormat:params.daFormat;var mustCreate=false;var cal=window.calendar;if(dateEl)params.date=Date.parseDate(dateEl.value||dateEl.innerHTML,dateFmt);if(!(cal&&params.cache)){window.calendar=cal=new Calendar(params.firstDay,params.date,params.onSelect||onSelect,params.onClose||function(cal){cal.hide();});cal.showsTime=params.showsTime;cal.time24=(params.timeFormat=="24");cal.weekNumbers=params.weekNumbers;mustCreate=true;}else{if(params.date)cal.setDate(params.date);cal.hide();}if(params.multiple){cal.multiple={};for(var i=params.multiple.length;--i>=0;){var d=params.multiple[i];var ds=d.print("%Y%m%d");cal.multiple[ds]=d;}}cal.showsOtherMonths=params.showOthers;cal.yearStep=params.step;cal.setRange(params.range[0],params.range[1]);cal.params=params;cal.setDateStatusHandler(params.dateStatusFunc);cal.getDateText=params.dateText;cal.setDateFormat(dateFmt);if(mustCreate)cal.create();cal.refresh();if(!params.position)cal.showAtElement(params.button||params.displayArea||params.inputField,params.align);else cal.showAt(params.position[0],params.position[1]);return false;};return cal;};
diff --git a/js/extjs/css/basic-dialog.css b/js/extjs/css/basic-dialog.css
index 8af8459fcc3..ca807a7e776 100644
--- a/js/extjs/css/basic-dialog.css
+++ b/js/extjs/css/basic-dialog.css
@@ -283,4 +283,4 @@ body.x-body-masked .x-dlg select {
     width:300px;
     padding-left:18px;
     line-height:18px;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/css/box.css b/js/extjs/css/box.css
index a4b02133867..c8b3cb95a2c 100644
--- a/js/extjs/css/box.css
+++ b/js/extjs/css/box.css
@@ -108,4 +108,4 @@
 
 .x-box-blue .x-box-mr {
 	background-image: url(../images/default/box/r-blue.gif);
-}
\ No newline at end of file
+}
diff --git a/js/extjs/css/button.css b/js/extjs/css/button.css
index 614918e69e2..8202e200f64 100644
--- a/js/extjs/css/button.css
+++ b/js/extjs/css/button.css
@@ -145,4 +145,4 @@
     display:block;
     background:transparent url(../images/default/toolbar/btn-arrow.gif) no-repeat right 3px;
 	padding-right:10px;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/css/combo.css b/js/extjs/css/combo.css
index cb550c05426..652b2be7bd0 100644
--- a/js/extjs/css/combo.css
+++ b/js/extjs/css/combo.css
@@ -44,4 +44,4 @@
 }
 .x-combo-noedit{
     cursor:pointer;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/css/date-picker.css b/js/extjs/css/date-picker.css
index b31141a2010..798f7eac6fe 100644
--- a/js/extjs/css/date-picker.css
+++ b/js/extjs/css/date-picker.css
@@ -243,4 +243,4 @@ td.x-date-mp-sel a {
 }
 td.x-date-mp-sep {
    border-right:1px solid #c5d2df;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/css/dd.css b/js/extjs/css/dd.css
index 08bbcc6a8b2..109018423bb 100644
--- a/js/extjs/css/dd.css
+++ b/js/extjs/css/dd.css
@@ -58,4 +58,4 @@
 }
 .x-dd-drop-ok-add .x-dd-drop-icon{
   background-image: url(../images/default/dd/drop-add.gif);
-}
\ No newline at end of file
+}
diff --git a/js/extjs/css/debug.css b/js/extjs/css/debug.css
index 07de9e63031..c4cd0ec656d 100644
--- a/js/extjs/css/debug.css
+++ b/js/extjs/css/debug.css
@@ -52,4 +52,4 @@
 .x-debug-frame {
     background:#eeeeee;
     border:1px dashed #aaaaaa;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/css/editor.css b/js/extjs/css/editor.css
index b0fc6f565cc..2aa7e1770d8 100644
--- a/js/extjs/css/editor.css
+++ b/js/extjs/css/editor.css
@@ -56,4 +56,4 @@
 .x-html-editor-tip .x-tip-bd .x-tip-bd-inner {
     padding:5px;
     padding-bottom:1px;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/css/form.css b/js/extjs/css/form.css
index 8a6ca73ddf1..f69bd3dd659 100644
--- a/js/extjs/css/form.css
+++ b/js/extjs/css/form.css
@@ -381,4 +381,4 @@
     top:0;
     display:block;
     background:transparent url(../images/default/form/exclamation.gif) no-repeat 0 2px;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/css/layout.css b/js/extjs/css/layout.css
index 9e67845abd5..70f8ffed4c7 100644
--- a/js/extjs/css/layout.css
+++ b/js/extjs/css/layout.css
@@ -249,4 +249,4 @@
 }
 .x-reader .x-layout-nested-layout .x-layout-panel-south{
     border:1px solid #99bbe8;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/css/panel.css b/js/extjs/css/panel.css
index 378878e6431..99f769e22bf 100644
--- a/js/extjs/css/panel.css
+++ b/js/extjs/css/panel.css
@@ -352,4 +352,4 @@
 }
 .x-panel-btns-ct .x-btn-click .x-btn-left{
 	background-position:0 -63px;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/css/qtips.css b/js/extjs/css/qtips.css
index b645aa6e864..6206f29d138 100644
--- a/js/extjs/css/qtips.css
+++ b/js/extjs/css/qtips.css
@@ -117,4 +117,4 @@
 }
 .x-form-invalid-tip .x-tip-bd-inner {
     padding:2px;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/css/reset-min.css b/js/extjs/css/reset-min.css
index 655242130bc..d3f7b082b96 100644
--- a/js/extjs/css/reset-min.css
+++ b/js/extjs/css/reset-min.css
@@ -6,4 +6,4 @@
  * http://www.extjs.com/license
  */
 
-html,body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquote,th,td{margin:0;padding:0;}img,body,html{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}ol,ul {list-style:none;}caption,th {text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;}q:before,q:after{content:'';}
\ No newline at end of file
+html,body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquote,th,td{margin:0;padding:0;}img,body,html{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}ol,ul {list-style:none;}caption,th {text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;}q:before,q:after{content:'';}
diff --git a/js/extjs/css/ytheme-gray.css b/js/extjs/css/ytheme-gray.css
index bc054ed51de..9f573daacad 100644
--- a/js/extjs/css/ytheme-gray.css
+++ b/js/extjs/css/ytheme-gray.css
@@ -435,4 +435,4 @@
 .x-combo-list .x-combo-selected{
 	background:#ddd !important;
     border:1px solid #aaa;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/css/ytheme-vista.css b/js/extjs/css/ytheme-vista.css
index 0055ff50fb5..5daf8a61612 100644
--- a/js/extjs/css/ytheme-vista.css
+++ b/js/extjs/css/ytheme-vista.css
@@ -508,4 +508,4 @@
 .x-combo-list .x-combo-selected{
 	background:#ddd !important;
     border:1px solid #aaa;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/fix-defer.js b/js/extjs/fix-defer.js
index 79a16b7d3f7..c6101f41d39 100644
--- a/js/extjs/fix-defer.js
+++ b/js/extjs/fix-defer.js
@@ -34,4 +34,4 @@
 
         return eDefer.apply(this, arguments);
     }
-})();
\ No newline at end of file
+})();
diff --git a/js/extjs/resources/css/basic-dialog.css b/js/extjs/resources/css/basic-dialog.css
index 8a7e793e3d8..1c2cd2284a9 100644
--- a/js/extjs/resources/css/basic-dialog.css
+++ b/js/extjs/resources/css/basic-dialog.css
@@ -283,4 +283,4 @@ body.x-body-masked .x-dlg select {
     width:300px;
     padding-left:18px;
     line-height:18px;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/resources/css/box.css b/js/extjs/resources/css/box.css
index 08cc343075e..3377e16e9f9 100644
--- a/js/extjs/resources/css/box.css
+++ b/js/extjs/resources/css/box.css
@@ -108,4 +108,4 @@
 
 .x-box-blue .x-box-mr {
 	background-image: url(../images/default/box/r-blue.gif);
-}
\ No newline at end of file
+}
diff --git a/js/extjs/resources/css/button.css b/js/extjs/resources/css/button.css
index 8a0485215e9..192ec9a5194 100644
--- a/js/extjs/resources/css/button.css
+++ b/js/extjs/resources/css/button.css
@@ -145,4 +145,4 @@
     display:block;
     background:transparent url(../images/default/toolbar/btn-arrow.gif) no-repeat right 3px;
 	padding-right:10px;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/resources/css/combo.css b/js/extjs/resources/css/combo.css
index c4ba95e42a6..9a5b11235ca 100644
--- a/js/extjs/resources/css/combo.css
+++ b/js/extjs/resources/css/combo.css
@@ -44,4 +44,4 @@
 }
 .x-combo-noedit{
     cursor:pointer;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/resources/css/date-picker.css b/js/extjs/resources/css/date-picker.css
index 3dddabb8ba5..8250ae31471 100644
--- a/js/extjs/resources/css/date-picker.css
+++ b/js/extjs/resources/css/date-picker.css
@@ -243,4 +243,4 @@ td.x-date-mp-sel a {
 }
 td.x-date-mp-sep {
    border-right:1px solid #c5d2df;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/resources/css/dd.css b/js/extjs/resources/css/dd.css
index 42ae991ddaa..4f0b181dec2 100644
--- a/js/extjs/resources/css/dd.css
+++ b/js/extjs/resources/css/dd.css
@@ -58,4 +58,4 @@
 }
 .x-dd-drop-ok-add .x-dd-drop-icon{
   background-image: url(../images/default/dd/drop-add.gif);
-}
\ No newline at end of file
+}
diff --git a/js/extjs/resources/css/debug.css b/js/extjs/resources/css/debug.css
index 8bb464f0330..62710d714d6 100644
--- a/js/extjs/resources/css/debug.css
+++ b/js/extjs/resources/css/debug.css
@@ -52,4 +52,4 @@
 .x-debug-frame {
     background:#eeeeee;
     border:1px dashed #aaaaaa;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/resources/css/editor.css b/js/extjs/resources/css/editor.css
index 301ee10c751..b7175687fa8 100644
--- a/js/extjs/resources/css/editor.css
+++ b/js/extjs/resources/css/editor.css
@@ -56,4 +56,4 @@
 .x-html-editor-tip .x-tip-bd .x-tip-bd-inner {
     padding:5px;
     padding-bottom:1px;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/resources/css/ext-all.css b/js/extjs/resources/css/ext-all.css
index e4ffdc84db6..202fcfb6683 100644
--- a/js/extjs/resources/css/ext-all.css
+++ b/js/extjs/resources/css/ext-all.css
@@ -2148,4 +2148,4 @@ body.x-body-masked .x-dlg select {
 .x-html-editor-tip .x-tip-bd .x-tip-bd-inner {
     padding:5px;
     padding-bottom:1px;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/resources/css/form.css b/js/extjs/resources/css/form.css
index 1db9d2b1b2e..355a6cbc01b 100644
--- a/js/extjs/resources/css/form.css
+++ b/js/extjs/resources/css/form.css
@@ -394,4 +394,4 @@
     top:0;
     display:block;
     background:transparent url(../images/default/form/exclamation.gif) no-repeat 0 2px;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/resources/css/grid.css b/js/extjs/resources/css/grid.css
index f3cc2c16c26..ec9a463468f 100644
--- a/js/extjs/resources/css/grid.css
+++ b/js/extjs/resources/css/grid.css
@@ -292,4 +292,4 @@
 /* dd */
 .x-dd-drag-ghost .x-grid-dd-wrap {
     padding:1px 3px 3px 1px;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/resources/css/layout.css b/js/extjs/resources/css/layout.css
index 1dc6565b69d..91ae86da184 100644
--- a/js/extjs/resources/css/layout.css
+++ b/js/extjs/resources/css/layout.css
@@ -249,4 +249,4 @@
 }
 .x-reader .x-layout-nested-layout .x-layout-panel-south{
     border:1px solid #99bbe8;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/resources/css/panel.css b/js/extjs/resources/css/panel.css
index 1058401fa37..0559094faf4 100644
--- a/js/extjs/resources/css/panel.css
+++ b/js/extjs/resources/css/panel.css
@@ -352,4 +352,4 @@
 }
 .x-panel-btns-ct .x-btn-click .x-btn-left{
 	background-position:0 -63px;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/resources/css/qtips.css b/js/extjs/resources/css/qtips.css
index 3576bedaeef..2775236398e 100644
--- a/js/extjs/resources/css/qtips.css
+++ b/js/extjs/resources/css/qtips.css
@@ -117,4 +117,4 @@
 }
 .x-form-invalid-tip .x-tip-bd-inner {
     padding:2px;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/resources/css/reset-min.css b/js/extjs/resources/css/reset-min.css
index a64bb8c354e..cd2f30c85ca 100644
--- a/js/extjs/resources/css/reset-min.css
+++ b/js/extjs/resources/css/reset-min.css
@@ -6,4 +6,4 @@
  * http://www.extjs.com/license
  */
 
-html,body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquote,th,td{margin:0;padding:0;}img,body,html{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}ol,ul {list-style:none;}caption,th {text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;}q:before,q:after{content:'';}
\ No newline at end of file
+html,body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquote,th,td{margin:0;padding:0;}img,body,html{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}ol,ul {list-style:none;}caption,th {text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;}q:before,q:after{content:'';}
diff --git a/js/extjs/resources/css/ytheme-aero.css b/js/extjs/resources/css/ytheme-aero.css
index 7e4da4814e6..91be531cbae 100644
--- a/js/extjs/resources/css/ytheme-aero.css
+++ b/js/extjs/resources/css/ytheme-aero.css
@@ -579,4 +579,4 @@ body.x-masked #x-msg-box .x-dlg-bd, body.x-body-masked #x-msg-box .x-dlg-bd{
 .x-tab-panel-body-bottom {
 	border:1px solid #8db2e3;
 	border-bottom:0 none;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/resources/css/ytheme-gray.css b/js/extjs/resources/css/ytheme-gray.css
index 1af230a8fc1..be119200bb4 100644
--- a/js/extjs/resources/css/ytheme-gray.css
+++ b/js/extjs/resources/css/ytheme-gray.css
@@ -435,4 +435,4 @@
 .x-combo-list .x-combo-selected{
 	background:#ddd !important;
     border:1px solid #aaa;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/resources/css/ytheme-magento.css b/js/extjs/resources/css/ytheme-magento.css
index 33a5e290898..20e5e506a2d 100644
--- a/js/extjs/resources/css/ytheme-magento.css
+++ b/js/extjs/resources/css/ytheme-magento.css
@@ -628,4 +628,4 @@ input.l-tcb {
 }
 .ext-ie .x-tree {
     position:static !important;
-}
\ No newline at end of file
+}
diff --git a/js/extjs/resources/css/ytheme-vista.css b/js/extjs/resources/css/ytheme-vista.css
index 7c604952dd5..b59b4cb1742 100644
--- a/js/extjs/resources/css/ytheme-vista.css
+++ b/js/extjs/resources/css/ytheme-vista.css
@@ -508,4 +508,4 @@
 .x-combo-list .x-combo-selected{
 	background:#ddd !important;
     border:1px solid #aaa;
-}
\ No newline at end of file
+}
diff --git a/js/lib/boxover.js b/js/lib/boxover.js
index b9cb869a95f..24d997103fc 100644
--- a/js/lib/boxover.js
+++ b/js/lib/boxover.js
@@ -369,4 +369,4 @@ function hideSelects(){
    for (i=0;i< elements.length;i++){
    elements[i].style.visibility='hidden';
    }
-}
\ No newline at end of file
+}
diff --git a/js/lib/ds-sleight.js b/js/lib/ds-sleight.js
index b43be15eddc..f4a0581f4b2 100644
--- a/js/lib/ds-sleight.js
+++ b/js/lib/ds-sleight.js
@@ -35,4 +35,4 @@ function enableAlphaImages(){
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/js/mage/adminhtml/browser.js b/js/mage/adminhtml/browser.js
index b9518c19c16..ba09797e336 100644
--- a/js/mage/adminhtml/browser.js
+++ b/js/mage/adminhtml/browser.js
@@ -23,12 +23,12 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 MediabrowserUtility = {
-    openDialog: function(url, width, height, title) {
+    openDialog: function(url, width, height, title, options) {
         if ($('browser_window') && typeof(Windows) != 'undefined') {
             Windows.focus('browser_window');
             return;
         }
-        this.dialogWindow = Dialog.info(null, {
+        this.dialogWindow = Dialog.info(null, Object.extend({
             closable:     true,
             resizable:    false,
             draggable:    true,
@@ -38,13 +38,13 @@ MediabrowserUtility = {
             top:          50,
             width:        width || 950,
             height:       height || 600,
-            zIndex:       1000,
+            zIndex:       options && options.zIndex || 1000,
             recenterAuto: false,
             hideEffect:   Element.hide,
             showEffect:   Element.show,
             id:           'browser_window',
             onClose: this.closeDialog.bind(this)
-        });
+        }, options || {}));
         new Ajax.Updater('modal_dialog_message', url, {evalScripts: true});
     },
     closeDialog: function(window) {
diff --git a/js/mage/adminhtml/grid.js b/js/mage/adminhtml/grid.js
index 36cbd7932e8..2545543b7b1 100644
--- a/js/mage/adminhtml/grid.js
+++ b/js/mage/adminhtml/grid.js
@@ -663,40 +663,23 @@ varienGridMassaction.prototype = {
         };
     },
     massSelect: function(evt) {
-        if(this.lastChecked.left !== false && this.lastChecked.top !== false) {
-            // Left mouse button and "Shift" key was pressed together
-            if(evt.button === 0 && evt.shiftKey === true) {
-                var clickedOffset = Event.element(evt).viewportOffset();
-
-                this.grid.rows.each(
-                    function(row) {
-                        var element = row.select('.massaction-checkbox')[0];
-                        var offset = element.viewportOffset();
-
-                        if(
-                            (
-                                // The checkbox is past the most recently clicked checkbox
-                                (offset.top < clickedOffset.top) &&
-                                // The checkbox is not past the "boundary" checkbox
-                                (offset.top > this.lastChecked.top || element == this.lastChecked.checkbox)
-                            )
-                            ||
-                            (
-                                // The checkbox is before the most recently clicked checkbox
-                                (offset.top > clickedOffset.top) &&
-                                // The checkbox is after the "boundary" checkbox
-                                (offset.top < this.lastChecked.top || element == this.lastChecked.checkbox)
-                            )
-                        ) {
-                            // Set the checkbox to the state of the most recently clicked checkbox
-                            element.checked = Event.element(evt).checked;
-
-                            this.setCheckbox(element);
-                        }
-                    }.bind(this)
-                );
-
-                this.updateCount();
+        if(this.lastChecked.left !== false
+            && this.lastChecked.top !== false
+            && evt.button === 0
+            && evt.shiftKey === true
+        ) {
+            var currentCheckbox = Event.element(evt);
+            var lastCheckbox = this.lastChecked.checkbox;
+            if (lastCheckbox != currentCheckbox) {
+                var start = this.getCheckboxOrder(lastCheckbox);
+                var finish = this.getCheckboxOrder(currentCheckbox);
+                if (start !== false && finish !== false) {
+                    this.selectCheckboxRange(
+                        Math.min(start, finish),
+                        Math.max(start, finish),
+                        currentCheckbox.checked
+                    );
+                }
             }
         }
 
@@ -705,6 +688,23 @@ varienGridMassaction.prototype = {
             top: Event.element(evt).viewportOffset().top,
             checkbox: Event.element(evt) // "boundary" checkbox
         };
+    },
+    getCheckboxOrder: function(curCheckbox) {
+        var order = false;
+        this.getCheckboxes().each(function(checkbox, key){
+            if (curCheckbox == checkbox) {
+                order = key;
+            }
+        });
+        return order;
+    },
+    selectCheckboxRange: function(start, finish, isChecked){
+        this.getCheckboxes().each((function(checkbox, key){
+            if (key >= start && key <= finish) {
+                checkbox.checked = isChecked;
+                this.setCheckbox(checkbox);
+            }
+        }).bind(this));
     }
 };
 
diff --git a/js/mage/adminhtml/sales.js b/js/mage/adminhtml/sales.js
index 694ce3eeb1d..939365a791e 100644
--- a/js/mage/adminhtml/sales.js
+++ b/js/mage/adminhtml/sales.js
@@ -212,6 +212,7 @@ AdminOrder.prototype = {
         data['order['+type+'_address][customer_address_id]'] = $('order-'+type+'_address_customer_address_id').value;
 
         if (data['reset_shipping']) {
+            this.turnOffShippingFields();
             this.resetShippingMethod(data);
         }
         else {
@@ -277,6 +278,7 @@ AdminOrder.prototype = {
         if ($('order-shipping_address_customer_address_id')) {
             $('order-shipping_address_customer_address_id').disabled = flag;
         }
+
         if ($(this.shippingAddressContainer)) {
             var dataFields = $(this.shippingAddressContainer).select('input', 'select', 'textarea');
             for (var i = 0; i < dataFields.length; i++) {
@@ -295,6 +297,17 @@ AdminOrder.prototype = {
         }
     },
 
+    turnOffShippingFields : function() {
+        if ($(this.shippingAddressContainer)) {
+            var dataFields = $(this.shippingAddressContainer).select('input', 'select', 'textarea', 'button');
+            for (var i = 0; i < dataFields.length; i++) {
+                dataFields[i].removeAttribute('name');
+                dataFields[i].removeAttribute('id');
+                dataFields[i].readOnly = true;
+            }
+        }
+    },
+
     setShippingAsBilling : function(flag){
         this.disableShippingAddress(flag);
         if(flag){
@@ -364,7 +377,7 @@ AdminOrder.prototype = {
                        field.disabled = false;
                        if (!el.include('_before') && !el.include('_after') && !field.bindChange) {
                            field.bindChange = true;
-                           field.paymentContainer = form; //@deprecated after 1.4.0.0-rc1
+                           field.paymentContainer = form; /** @deprecated after 1.4.0.0-rc1 */
                            field.method = method;
                            field.observe('change', this.changePaymentData.bind(this))
                         }
@@ -934,7 +947,7 @@ AdminOrder.prototype = {
         else {
             new Ajax.Request(url, {parameters:params,loaderArea: indicator});
         }
-        if (typeof productConfigure != 'undefined' && area instanceof Array && area.indexOf('items' != -1)) {
+        if (typeof productConfigure != 'undefined' && area instanceof Array && area.indexOf('items') != -1) {
             productConfigure.clean('quote_items');
         }
     },
@@ -952,14 +965,17 @@ AdminOrder.prototype = {
         if(typeof this.loadingAreas == 'string'){
             this.loadingAreas = [this.loadingAreas];
         }
-        if(this.loadingAreas.indexOf('message'==-1)) this.loadingAreas.push('message');
+        if(this.loadingAreas.indexOf('message') == -1) {
+            this.loadingAreas.push('message');
+        }
+
         for(var i=0; i<this.loadingAreas.length; i++){
             var id = this.loadingAreas[i];
             if($(this.getAreaId(id))){
                 if ('message' != id || response[id]) {
                     var wrapper = new Element('div');
                     wrapper.update(response[id] ? response[id] : '');
-                    $(this.getAreaId(id)).update(wrapper);
+                    $(this.getAreaId(id)).update(Prototype.Browser.IE ? wrapper.outerHTML : wrapper);
                 }
                 if ($(this.getAreaId(id)).callback) {
                     this[$(this.getAreaId(id)).callback]();
@@ -1105,7 +1121,6 @@ AdminOrder.prototype = {
         }
 
         var parentEl = el.up(1);
-        var parentPos = Element.cumulativeOffset(parentEl);
         if (show) {
             parentEl.removeClassName('ignore-validate');
         }
@@ -1125,6 +1140,7 @@ AdminOrder.prototype = {
             });
         }
 
+        parentEl.setStyle({position: 'relative'});
         el.setStyle({
             display: show ? 'none' : '',
             position: 'absolute',
@@ -1132,8 +1148,8 @@ AdminOrder.prototype = {
             opacity: 0.8,
             width: parentEl.getWidth() + 'px',
             height: parentEl.getHeight() + 'px',
-            top: parentPos[1] + 'px',
-            left: parentPos[0] + 'px'
+            top: 0,
+            left: 0
         });
     },
 
diff --git a/js/mage/adminhtml/tools.js b/js/mage/adminhtml/tools.js
index ec43d8aabda..97cc9e8e6cd 100644
--- a/js/mage/adminhtml/tools.js
+++ b/js/mage/adminhtml/tools.js
@@ -133,27 +133,23 @@ function toggleValueElements(checkbox, container, excludedElements, checked){
         var isDisabled = (checked != undefined ? checked : checkbox.checked);
         elems.each(function (elem) {
             if (checkByProductPriceType(elem)) {
-                var isIgnored = false;
-                for (var i = 0; i < ignoredElements.length; i++) {
-                    if (elem == ignoredElements[i]) {
-                        isIgnored = true;
-                        break;
-                    }
-                }
-                if (isIgnored) {
+                var i = ignoredElements.length;
+                while (i-- && elem != ignoredElements[i]);
+                if (i != -1) {
                     return;
                 }
-                elem.disabled=isDisabled;
+
+                elem.disabled = isDisabled;
                 if (isDisabled) {
                     elem.addClassName('disabled');
                 } else {
                     elem.removeClassName('disabled');
                 }
-                if(elem.tagName == 'IMG') {
+                if (elem.nodeName.toLowerCase() == 'img') {
                     isDisabled ? elem.hide() : elem.show();
                 }
             }
-        })
+        });
     }
 }
 
diff --git a/js/mage/adminhtml/wysiwyg/tiny_mce/setup.js b/js/mage/adminhtml/wysiwyg/tiny_mce/setup.js
index 06b5de7ece6..1e6a6fe4f0a 100644
--- a/js/mage/adminhtml/wysiwyg/tiny_mce/setup.js
+++ b/js/mage/adminhtml/wysiwyg/tiny_mce/setup.js
@@ -75,7 +75,7 @@ tinyMceWysiwygSetup.prototype =
 
     getSettings: function(mode)
     {
-        var plugins = 'safari,pagebreak,style,layer,table,advhr,advimage,emotions,iespell,media,searchreplace,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras';
+        var plugins = 'inlinepopups,safari,pagebreak,style,layer,table,advhr,advimage,emotions,iespell,media,searchreplace,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras';
 
         if (this.config.widget_plugin_src) {
             plugins = 'magentowidget,' + plugins;
@@ -176,7 +176,6 @@ tinyMceWysiwygSetup.prototype =
                    'store/' + storeId + '/';
 
         this.mediaBrowserOpener = o.win;
-        this.mediaBrowserOpener.blur();
         this.mediaBrowserTargetElementId = o.field;
 
         if (typeof(o.type) != 'undefined' && o.type != "") {
@@ -186,7 +185,11 @@ tinyMceWysiwygSetup.prototype =
             typeTitle = this.translate('Insert File...');
         }
 
-        MediabrowserUtility.openDialog(wUrl, false, false, typeTitle);
+        MediabrowserUtility.openDialog(wUrl, false, false, typeTitle, {
+            onBeforeShow: function(win) {
+                win.element.setStyle({zIndex: 300200});
+            }
+        });
     },
 
     translate: function(string) {
@@ -225,9 +228,11 @@ tinyMceWysiwygSetup.prototype =
             e.show();
         });
         if (Prototype.Browser.IE) {
-            // workaround for ie textarea redraw bug
-            window.setTimeout(function(){
-                $(this.id).value = $(this.id).value;
+            // workaround for IE textarea redraw bug
+            window.setTimeout(function() {
+                if ($(this.id)) {
+                    $(this.id).value = $(this.id).value;
+                }
             }.bind(this), 0);
         }
     },
diff --git a/js/prototype/effects.js b/js/prototype/effects.js
index 8a4a4f9f67e..d191283ae51 100644
--- a/js/prototype/effects.js
+++ b/js/prototype/effects.js
@@ -1091,4 +1091,4 @@ Element.Methods.visualEffect = function(element, effect, options) {
   return $(element);
 };
 
-Element.addMethods();
\ No newline at end of file
+Element.addMethods();
diff --git a/js/prototype/validation.js b/js/prototype/validation.js
index a2dad07dcee..c9c17988033 100644
--- a/js/prototype/validation.js
+++ b/js/prototype/validation.js
@@ -504,6 +504,25 @@ Validation.addAllThese([
                 var test = new Date(v);
                 return Validation.get('IsEmpty').test(v) || !isNaN(test);
             }],
+    ['validate-date-range', 'The From Date value should be less than or equal to the To Date value.', function(v, elm) {
+            var m = /\bdate-range-(\w+)-(\w+)\b/.exec(elm.className);
+            if (!m || m[2] == 'to' || Validation.get('IsEmpty').test(v)) {
+                return true;
+            }
+
+            var currentYear = new Date().getFullYear() + '';
+            var normalizedTime = function(v) {
+                v = v.split(/[.\/]/);
+                if (v[2] && v[2].length < 4) {
+                    v[2] = currentYear.substr(0, v[2].length) + v[2];
+                }
+                return new Date(v.join('/')).getTime();
+            };
+
+            var dependentElements = Element.select(elm.form, '.validate-date-range.date-range-' + m[1] + '-to');
+            return !dependentElements.length || Validation.get('IsEmpty').test(dependentElements[0].value)
+                || normalizedTime(v) <= normalizedTime(dependentElements[0].value);
+        }],
     ['validate-email', 'Please enter a valid email address. For example johndoe@domain.com.', function (v) {
                 //return Validation.get('IsEmpty').test(v) || /\w{1,}[@][\w\-]{1,}([.]([\w\-]{1,})){1,3}$/.test(v)
                 //return Validation.get('IsEmpty').test(v) || /^[\!\#$%\*/?|\^\{\}`~&\'\+\-=_a-z0-9][\!\#$%\*/?|\^\{\}`~&\'\+\-=_a-z0-9\.]{1,30}[\!\#$%\*/?|\^\{\}`~&\'\+\-=_a-z0-9]@([a-z0-9_-]{1,30}\.){1,5}[a-z]{2,4}$/i.test(v)
@@ -544,6 +563,16 @@ Validation.addAllThese([
                 }
                 return (pass.value == conf.value);
             }],
+    ['validate-both-passwords', 'Please make sure your passwords match.', function(v, input) {
+                var dependentInput = $(input.form[input.name == 'password' ? 'confirmation' : 'password']),
+                    isEqualValues  = input.value == dependentInput.value;
+
+                if (isEqualValues && dependentInput.hasClassName('validation-failed')) {
+                    Validation.test(this.className, dependentInput);
+                }
+
+                return dependentInput.value == '' || isEqualValues;
+            }],
     ['validate-url', 'Please enter a valid URL. Protocol is required (http://, https:// or ftp://)', function (v) {
                 v = (v || '').replace(/^\s+/, '').replace(/\s+$/, '');
                 return Validation.get('IsEmpty').test(v) || /^(http|https|ftp):\/\/(([A-Z0-9]([A-Z0-9_-]*[A-Z0-9]|))(\.[A-Z0-9]([A-Z0-9_-]*[A-Z0-9]|))*)(:(\d+))?(\/[A-Z0-9~](([A-Z0-9_~-]|\.)*[A-Z0-9~]|))*\/?(.*)?$/i.test(v)
diff --git a/js/prototype/window_ext.js b/js/prototype/window_ext.js
index 60efac61b4b..f69f087b2c9 100644
--- a/js/prototype/window_ext.js
+++ b/js/prototype/window_ext.js
@@ -112,4 +112,4 @@ WindowCloseKey = {
         top.Windows.close(top.Windows.focusedWindow.getId());
     }
   }
-}
\ No newline at end of file
+}
diff --git a/js/scriptaculous/builder.js b/js/scriptaculous/builder.js
index dba8becaa1d..ee99014421b 100644
--- a/js/scriptaculous/builder.js
+++ b/js/scriptaculous/builder.js
@@ -133,4 +133,4 @@ var Builder = {
       };
     });
   }
-};
\ No newline at end of file
+};
diff --git a/js/scriptaculous/controls.js b/js/scriptaculous/controls.js
index c48af2a0b32..4608bb7d30b 100644
--- a/js/scriptaculous/controls.js
+++ b/js/scriptaculous/controls.js
@@ -962,4 +962,4 @@ Form.Element.DelayedObserver = Class.create({
     this.timer = null;
     this.callback(this.element, $F(this.element));
   }
-});
\ No newline at end of file
+});
diff --git a/js/scriptaculous/dragdrop.js b/js/scriptaculous/dragdrop.js
index 9ebfe24d3c0..4573abec2b6 100644
--- a/js/scriptaculous/dragdrop.js
+++ b/js/scriptaculous/dragdrop.js
@@ -971,4 +971,4 @@ Element.findChildren = function(element, only, recursive, tagName) {
 
 Element.offsetSize = function (element, type) {
   return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')];
-};
\ No newline at end of file
+};
diff --git a/js/scriptaculous/effects.js b/js/scriptaculous/effects.js
index f31a81a0096..b811b6a2997 100644
--- a/js/scriptaculous/effects.js
+++ b/js/scriptaculous/effects.js
@@ -1127,4 +1127,4 @@ $w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTex
   function(f) { Effect.Methods[f] = Element[f]; }
 );
 
-Element.addMethods(Effect.Methods);
\ No newline at end of file
+Element.addMethods(Effect.Methods);
diff --git a/js/scriptaculous/scriptaculous.js b/js/scriptaculous/scriptaculous.js
index 3e5543bd01f..c5e0af624a2 100644
--- a/js/scriptaculous/scriptaculous.js
+++ b/js/scriptaculous/scriptaculous.js
@@ -57,4 +57,4 @@ var Scriptaculous = {
   }
 };
 
-Scriptaculous.load();
\ No newline at end of file
+Scriptaculous.load();
diff --git a/js/scriptaculous/slider.js b/js/scriptaculous/slider.js
index 4580cb8b6d8..24c40839bdb 100644
--- a/js/scriptaculous/slider.js
+++ b/js/scriptaculous/slider.js
@@ -274,4 +274,4 @@ Control.Slider = Class.create({
       this.options.onChange(this.values.length>1 ? this.values : this.value, this);
     this.event = null;
   }
-});
\ No newline at end of file
+});
diff --git a/js/scriptaculous/sound.js b/js/scriptaculous/sound.js
index e2487cde520..c5e468772cd 100644
--- a/js/scriptaculous/sound.js
+++ b/js/scriptaculous/sound.js
@@ -52,4 +52,4 @@ if(Prototype.Browser.Gecko && navigator.userAgent.indexOf("Win") > 0){
     Sound.template = new Template('<object id="sound_#{track}_#{id}" width="0" height="0" type="audio/mpeg" data="#{url}"/>');
   else
     Sound.play = function(){};
-}
\ No newline at end of file
+}
diff --git a/js/scriptaculous/unittest.js b/js/scriptaculous/unittest.js
index 446097ec516..7fd263d7b50 100644
--- a/js/scriptaculous/unittest.js
+++ b/js/scriptaculous/unittest.js
@@ -565,4 +565,4 @@ Test.context = function(name, spec, log){
     }
   }
   new Test.Unit.Runner(compiledSpec, { titles: titles, testLog: log || 'testlog', context: name });
-};
\ No newline at end of file
+};
diff --git a/js/tiny_mce/classes/WindowManager.js b/js/tiny_mce/classes/WindowManager.js
index 0421b58df49..6a81fd920b4 100644
--- a/js/tiny_mce/classes/WindowManager.js
+++ b/js/tiny_mce/classes/WindowManager.js
@@ -228,4 +228,4 @@
 			return tinymce.DOM.decode(s).replace(/\\n/g, '\n');
 		}
 	});
-}(tinymce));
\ No newline at end of file
+}(tinymce));
diff --git a/js/tiny_mce/classes/adapter/jquery/jquery.tinymce.js b/js/tiny_mce/classes/adapter/jquery/jquery.tinymce.js
index ffb565549dc..d9fb90d9285 100644
--- a/js/tiny_mce/classes/adapter/jquery/jquery.tinymce.js
+++ b/js/tiny_mce/classes/adapter/jquery/jquery.tinymce.js
@@ -333,4 +333,4 @@
 			}
 		};
 	}
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/js/tiny_mce/classes/dom/Serializer.js b/js/tiny_mce/classes/dom/Serializer.js
index c0530dd9151..35d070fda0e 100644
--- a/js/tiny_mce/classes/dom/Serializer.js
+++ b/js/tiny_mce/classes/dom/Serializer.js
@@ -376,4 +376,4 @@
 			}
 		};
 	};
-})(tinymce);
\ No newline at end of file
+})(tinymce);
diff --git a/js/tiny_mce/classes/ui/Control.js b/js/tiny_mce/classes/ui/Control.js
index 1564c827bde..f740697f326 100644
--- a/js/tiny_mce/classes/ui/Control.js
+++ b/js/tiny_mce/classes/ui/Control.js
@@ -195,4 +195,4 @@
 			tinymce.dom.Event.clear(this.id);
 		}
 	});
-})(tinymce);
\ No newline at end of file
+})(tinymce);
diff --git a/js/tiny_mce/classes/ui/DropMenu.js b/js/tiny_mce/classes/ui/DropMenu.js
index 84ef334788c..4de289061fe 100644
--- a/js/tiny_mce/classes/ui/DropMenu.js
+++ b/js/tiny_mce/classes/ui/DropMenu.js
@@ -473,4 +473,4 @@
 			DOM.addClass(ro, 'mceLast');
 		}
 	});
-})(tinymce);
\ No newline at end of file
+})(tinymce);
diff --git a/js/tiny_mce/classes/ui/Menu.js b/js/tiny_mce/classes/ui/Menu.js
index 06ff4637767..6829e4faade 100644
--- a/js/tiny_mce/classes/ui/Menu.js
+++ b/js/tiny_mce/classes/ui/Menu.js
@@ -183,4 +183,4 @@
 			return m;
 		}
 	});
-})(tinymce);
\ No newline at end of file
+})(tinymce);
diff --git a/js/tiny_mce/classes/util/JSONRequest.js b/js/tiny_mce/classes/util/JSONRequest.js
index 9e502879ced..1b485f531bf 100644
--- a/js/tiny_mce/classes/util/JSONRequest.js
+++ b/js/tiny_mce/classes/util/JSONRequest.js
@@ -109,4 +109,4 @@
 			}
 		}
 	});
-}());
\ No newline at end of file
+}());
diff --git a/js/tiny_mce/jquery.tinymce.js b/js/tiny_mce/jquery.tinymce.js
index 8e61a3cddb8..a529e58693a 100644
--- a/js/tiny_mce/jquery.tinymce.js
+++ b/js/tiny_mce/jquery.tinymce.js
@@ -1 +1 @@
-(function(b){var e,d,a=[],c=window;b.fn.tinymce=function(j){var p=this,g,k,h,m,i,l="",n="";if(!p.length){return p}if(!j){return tinyMCE.get(p[0].id)}p.css("visibility","hidden");function o(){var r=[],q=0;if(f){f();f=null}p.each(function(t,u){var s,w=u.id,v=j.oninit;if(!w){u.id=w=tinymce.DOM.uniqueId()}s=new tinymce.Editor(w,j);r.push(s);s.onInit.add(function(){var x,y=v;p.css("visibility","");if(v){if(++q==r.length){if(tinymce.is(y,"string")){x=(y.indexOf(".")===-1)?null:tinymce.resolve(y.replace(/\.\w+$/,""));y=tinymce.resolve(y)}y.apply(x||tinymce,r)}}})});b.each(r,function(t,s){s.render()})}if(!c.tinymce&&!d&&(g=j.script_url)){d=1;h=g.substring(0,g.lastIndexOf("/"));if(/_(src|dev)\.js/g.test(g)){n="_src"}m=g.lastIndexOf("?");if(m!=-1){l=g.substring(m+1)}c.tinyMCEPreInit=c.tinyMCEPreInit||{base:h,suffix:n,query:l};if(g.indexOf("gzip")!=-1){i=j.language||"en";g=g+(/\?/.test(g)?"&":"?")+"js=true&core=true&suffix="+escape(n)+"&themes="+escape(j.theme)+"&plugins="+escape(j.plugins)+"&languages="+i;if(!c.tinyMCE_GZ){tinyMCE_GZ={start:function(){tinymce.suffix=n;function q(r){tinymce.ScriptLoader.markDone(tinyMCE.baseURI.toAbsolute(r))}q("langs/"+i+".js");q("themes/"+j.theme+"/editor_template"+n+".js");q("themes/"+j.theme+"/langs/"+i+".js");b.each(j.plugins.split(","),function(s,r){if(r){q("plugins/"+r+"/editor_plugin"+n+".js");q("plugins/"+r+"/langs/"+i+".js")}})},end:function(){}}}}b.ajax({type:"GET",url:g,dataType:"script",cache:true,success:function(){tinymce.dom.Event.domLoaded=1;d=2;if(j.script_loaded){j.script_loaded()}o();b.each(a,function(q,r){r()})}})}else{if(d===1){a.push(o)}else{o()}}return p};b.extend(b.expr[":"],{tinymce:function(g){return g.id&&!!tinyMCE.get(g.id)}});function f(){function i(l){if(l==="remove"){this.each(function(n,o){var m=h(o);if(m){m.remove()}})}this.find("span.mceEditor,div.mceEditor").each(function(n,o){var m=tinyMCE.get(o.id.replace(/_parent$/,""));if(m){m.remove()}})}function k(n){var m=this,l;if(n!==e){i.call(m);m.each(function(p,q){var o;if(o=tinyMCE.get(q.id)){o.setContent(n)}})}else{if(m.length>0){if(l=tinyMCE.get(m[0].id)){return l.getContent()}}}}function h(m){var l=null;(m)&&(m.id)&&(c.tinymce)&&(l=tinyMCE.get(m.id));return l}function g(l){return !!((l)&&(l.length)&&(c.tinymce)&&(l.is(":tinymce")))}var j={};b.each(["text","html","val"],function(n,l){var o=j[l]=b.fn[l],m=(l==="text");b.fn[l]=function(s){var p=this;if(!g(p)){return o.apply(p,arguments)}if(s!==e){k.call(p.filter(":tinymce"),s);o.apply(p.not(":tinymce"),arguments);return p}else{var r="";var q=arguments;(m?p:p.eq(0)).each(function(u,v){var t=h(v);r+=t?(m?t.getContent().replace(/<(?:"[^"]*"|'[^']*'|[^'">])*>/g,""):t.getContent()):o.apply(b(v),q)});return r}}});b.each(["append","prepend"],function(n,m){var o=j[m]=b.fn[m],l=(m==="prepend");b.fn[m]=function(q){var p=this;if(!g(p)){return o.apply(p,arguments)}if(q!==e){p.filter(":tinymce").each(function(s,t){var r=h(t);r&&r.setContent(l?q+r.getContent():r.getContent()+q)});o.apply(p.not(":tinymce"),arguments);return p}}});b.each(["remove","replaceWith","replaceAll","empty"],function(m,l){var n=j[l]=b.fn[l];b.fn[l]=function(){i.call(this,l);return n.apply(this,arguments)}});j.attr=b.fn.attr;b.fn.attr=function(n,q,o){var m=this;if((!n)||(n!=="value")||(!g(m))){return j.attr.call(m,n,q,o)}if(q!==e){k.call(m.filter(":tinymce"),q);j.attr.call(m.not(":tinymce"),n,q,o);return m}else{var p=m[0],l=h(p);return l?l.getContent():j.attr.call(b(p),n,q,o)}}}})(jQuery);
\ No newline at end of file
+(function(b){var e,d,a=[],c=window;b.fn.tinymce=function(j){var p=this,g,k,h,m,i,l="",n="";if(!p.length){return p}if(!j){return tinyMCE.get(p[0].id)}p.css("visibility","hidden");function o(){var r=[],q=0;if(f){f();f=null}p.each(function(t,u){var s,w=u.id,v=j.oninit;if(!w){u.id=w=tinymce.DOM.uniqueId()}s=new tinymce.Editor(w,j);r.push(s);s.onInit.add(function(){var x,y=v;p.css("visibility","");if(v){if(++q==r.length){if(tinymce.is(y,"string")){x=(y.indexOf(".")===-1)?null:tinymce.resolve(y.replace(/\.\w+$/,""));y=tinymce.resolve(y)}y.apply(x||tinymce,r)}}})});b.each(r,function(t,s){s.render()})}if(!c.tinymce&&!d&&(g=j.script_url)){d=1;h=g.substring(0,g.lastIndexOf("/"));if(/_(src|dev)\.js/g.test(g)){n="_src"}m=g.lastIndexOf("?");if(m!=-1){l=g.substring(m+1)}c.tinyMCEPreInit=c.tinyMCEPreInit||{base:h,suffix:n,query:l};if(g.indexOf("gzip")!=-1){i=j.language||"en";g=g+(/\?/.test(g)?"&":"?")+"js=true&core=true&suffix="+escape(n)+"&themes="+escape(j.theme)+"&plugins="+escape(j.plugins)+"&languages="+i;if(!c.tinyMCE_GZ){tinyMCE_GZ={start:function(){tinymce.suffix=n;function q(r){tinymce.ScriptLoader.markDone(tinyMCE.baseURI.toAbsolute(r))}q("langs/"+i+".js");q("themes/"+j.theme+"/editor_template"+n+".js");q("themes/"+j.theme+"/langs/"+i+".js");b.each(j.plugins.split(","),function(s,r){if(r){q("plugins/"+r+"/editor_plugin"+n+".js");q("plugins/"+r+"/langs/"+i+".js")}})},end:function(){}}}}b.ajax({type:"GET",url:g,dataType:"script",cache:true,success:function(){tinymce.dom.Event.domLoaded=1;d=2;if(j.script_loaded){j.script_loaded()}o();b.each(a,function(q,r){r()})}})}else{if(d===1){a.push(o)}else{o()}}return p};b.extend(b.expr[":"],{tinymce:function(g){return g.id&&!!tinyMCE.get(g.id)}});function f(){function i(l){if(l==="remove"){this.each(function(n,o){var m=h(o);if(m){m.remove()}})}this.find("span.mceEditor,div.mceEditor").each(function(n,o){var m=tinyMCE.get(o.id.replace(/_parent$/,""));if(m){m.remove()}})}function k(n){var m=this,l;if(n!==e){i.call(m);m.each(function(p,q){var o;if(o=tinyMCE.get(q.id)){o.setContent(n)}})}else{if(m.length>0){if(l=tinyMCE.get(m[0].id)){return l.getContent()}}}}function h(m){var l=null;(m)&&(m.id)&&(c.tinymce)&&(l=tinyMCE.get(m.id));return l}function g(l){return !!((l)&&(l.length)&&(c.tinymce)&&(l.is(":tinymce")))}var j={};b.each(["text","html","val"],function(n,l){var o=j[l]=b.fn[l],m=(l==="text");b.fn[l]=function(s){var p=this;if(!g(p)){return o.apply(p,arguments)}if(s!==e){k.call(p.filter(":tinymce"),s);o.apply(p.not(":tinymce"),arguments);return p}else{var r="";var q=arguments;(m?p:p.eq(0)).each(function(u,v){var t=h(v);r+=t?(m?t.getContent().replace(/<(?:"[^"]*"|'[^']*'|[^'">])*>/g,""):t.getContent()):o.apply(b(v),q)});return r}}});b.each(["append","prepend"],function(n,m){var o=j[m]=b.fn[m],l=(m==="prepend");b.fn[m]=function(q){var p=this;if(!g(p)){return o.apply(p,arguments)}if(q!==e){p.filter(":tinymce").each(function(s,t){var r=h(t);r&&r.setContent(l?q+r.getContent():r.getContent()+q)});o.apply(p.not(":tinymce"),arguments);return p}}});b.each(["remove","replaceWith","replaceAll","empty"],function(m,l){var n=j[l]=b.fn[l];b.fn[l]=function(){i.call(this,l);return n.apply(this,arguments)}});j.attr=b.fn.attr;b.fn.attr=function(n,q,o){var m=this;if((!n)||(n!=="value")||(!g(m))){return j.attr.call(m,n,q,o)}if(q!==e){k.call(m.filter(":tinymce"),q);j.attr.call(m.not(":tinymce"),n,q,o);return m}else{var p=m[0],l=h(p);return l?l.getContent():j.attr.call(b(p),n,q,o)}}}})(jQuery);
diff --git a/js/tiny_mce/langs/en.js b/js/tiny_mce/langs/en.js
index 6379b0d9584..8f94898f11a 100644
--- a/js/tiny_mce/langs/en.js
+++ b/js/tiny_mce/langs/en.js
@@ -1 +1 @@
-tinyMCE.addI18n({en:{common:{"more_colors":"More Colors...","invalid_data":"Error: Invalid values entered, these are marked in red.","popup_blocked":"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.","clipboard_no_support":"Currently not supported by your browser, use keyboard shortcuts instead.","clipboard_msg":"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?","not_set":"-- Not Set --","class_name":"Class",browse:"Browse",close:"Close",cancel:"Cancel",update:"Update",insert:"Insert",apply:"Apply","edit_confirm":"Do you want to use the WYSIWYG mode for this textarea?","invalid_data_number":"{#field} must be a number","invalid_data_min":"{#field} must be a number greater than {#min}","invalid_data_size":"{#field} must be a number or percentage",value:"(value)"},contextmenu:{full:"Full",right:"Right",center:"Center",left:"Left",align:"Alignment"},insertdatetime:{"day_short":"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun","day_long":"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday","months_short":"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec","months_long":"January,February,March,April,May,June,July,August,September,October,November,December","inserttime_desc":"Insert Time","insertdate_desc":"Insert Date","time_fmt":"%H:%M:%S","date_fmt":"%Y-%m-%d"},print:{"print_desc":"Print"},preview:{"preview_desc":"Preview"},directionality:{"rtl_desc":"Direction Right to Left","ltr_desc":"Direction Left to Right"},layer:{content:"New layer...","absolute_desc":"Toggle Absolute Positioning","backward_desc":"Move Backward","forward_desc":"Move Forward","insertlayer_desc":"Insert New Layer"},save:{"save_desc":"Save","cancel_desc":"Cancel All Changes"},nonbreaking:{"nonbreaking_desc":"Insert Non-Breaking Space Character"},iespell:{download:"ieSpell not detected. Do you want to install it now?","iespell_desc":"Check Spelling"},advhr:{"delta_height":"","delta_width":"","advhr_desc":"Insert Horizontal Line"},emotions:{"delta_height":"","delta_width":"","emotions_desc":"Emotions"},searchreplace:{"replace_desc":"Find/Replace","delta_width":"","delta_height":"","search_desc":"Find"},advimage:{"delta_width":"","image_desc":"Insert/Edit Image","delta_height":""},advlink:{"delta_height":"","delta_width":"","link_desc":"Insert/Edit Link"},xhtmlxtras:{"attribs_delta_height":"","attribs_delta_width":"","ins_delta_height":"","ins_delta_width":"","del_delta_height":"","del_delta_width":"","acronym_delta_height":"","acronym_delta_width":"","abbr_delta_height":"","abbr_delta_width":"","cite_delta_height":"","cite_delta_width":"","attribs_desc":"Insert/Edit Attributes","ins_desc":"Insertion","del_desc":"Deletion","acronym_desc":"Acronym","abbr_desc":"Abbreviation","cite_desc":"Citation"},style:{"delta_height":"","delta_width":"",desc:"Edit CSS Style"},paste:{"plaintext_mode_stick":"Paste is now in plain text mode. Click again to toggle back to regular paste mode.","plaintext_mode":"Paste is now in plain text mode. Click again to toggle back to regular paste mode. After you paste something you will be returned to regular paste mode.","selectall_desc":"Select All","paste_word_desc":"Paste from Word","paste_text_desc":"Paste as Plain Text"},"paste_dlg":{"word_title":"Use Ctrl+V on your keyboard to paste the text into the window.","text_linebreaks":"Keep Linebreaks","text_title":"Use Ctrl+V on your keyboard to paste the text into the window."},table:{"merge_cells_delta_height":"","merge_cells_delta_width":"","table_delta_height":"","table_delta_width":"","cellprops_delta_height":"","cellprops_delta_width":"","rowprops_delta_height":"","rowprops_delta_width":"",cell:"Cell",col:"Column",row:"Row",del:"Delete Table","copy_row_desc":"Copy Table Row","cut_row_desc":"Cut Table Row","paste_row_after_desc":"Paste Table Row After","paste_row_before_desc":"Paste Table Row Before","props_desc":"Table Properties","cell_desc":"Table Cell Properties","row_desc":"Table Row Properties","merge_cells_desc":"Merge Table Cells","split_cells_desc":"Split Merged Table Cells","delete_col_desc":"Delete Column","col_after_desc":"Insert Column After","col_before_desc":"Insert Column Before","delete_row_desc":"Delete Row","row_after_desc":"Insert Row After","row_before_desc":"Insert Row Before",desc:"Insert/Edit Table"},autosave:{"warning_message":"If you restore the saved content, you will lose all the content that is currently in the editor.\n\nAre you sure you want to restore the saved content?","restore_content":"Restore auto-saved content.","unload_msg":"The changes you made will be lost if you navigate away from this page."},fullscreen:{desc:"Toggle Full Screen Mode"},media:{"delta_height":"","delta_width":"",edit:"Edit Embedded Media",desc:"Insert/Edit Embedded Media"},fullpage:{desc:"Document Properties","delta_width":"","delta_height":""},template:{desc:"Insert Predefined Template Content"},visualchars:{desc:"Show/Hide Visual Control Characters"},spellchecker:{desc:"Toggle Spell Checker",menu:"Spell Checker Settings","ignore_word":"Ignore Word","ignore_words":"Ignore All",langs:"Languages",wait:"Please wait...",sug:"Suggestions","no_sug":"No Suggestions","no_mpell":"No misspellings found.","learn_word":"Learn word"},pagebreak:{desc:"Insert Page Break for Printing"},advlist:{types:"Types",def:"Default","lower_alpha":"Lower Alpha","lower_greek":"Lower Greek","lower_roman":"Lower Roman","upper_alpha":"Upper Alpha","upper_roman":"Upper Roman",circle:"Circle",disc:"Disc",square:"Square"},colors:{"333300":"Dark olive","993300":"Burnt orange","000000":"Black","003300":"Dark green","003366":"Dark azure","000080":"Navy Blue","333399":"Indigo","333333":"Very dark gray","800000":"Maroon",FF6600:"Orange","808000":"Olive","008000":"Green","008080":"Teal","0000FF":"Blue","666699":"Grayish blue","808080":"Gray",FF0000:"Red",FF9900:"Amber","99CC00":"Yellow green","339966":"Sea green","33CCCC":"Turquoise","3366FF":"Royal blue","800080":"Purple","999999":"Medium gray",FF00FF:"Magenta",FFCC00:"Gold",FFFF00:"Yellow","00FF00":"Lime","00FFFF":"Aqua","00CCFF":"Sky blue","993366":"Brown",C0C0C0:"Silver",FF99CC:"Pink",FFCC99:"Peach",FFFF99:"Light yellow",CCFFCC:"Pale green",CCFFFF:"Pale cyan","99CCFF":"Light sky blue",CC99FF:"Plum",FFFFFF:"White"},aria:{"rich_text_area":"Rich Text Area"},wordcount:{words:"Words:"}}});
\ No newline at end of file
+tinyMCE.addI18n({en:{common:{"more_colors":"More Colors...","invalid_data":"Error: Invalid values entered, these are marked in red.","popup_blocked":"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.","clipboard_no_support":"Currently not supported by your browser, use keyboard shortcuts instead.","clipboard_msg":"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?","not_set":"-- Not Set --","class_name":"Class",browse:"Browse",close:"Close",cancel:"Cancel",update:"Update",insert:"Insert",apply:"Apply","edit_confirm":"Do you want to use the WYSIWYG mode for this textarea?","invalid_data_number":"{#field} must be a number","invalid_data_min":"{#field} must be a number greater than {#min}","invalid_data_size":"{#field} must be a number or percentage",value:"(value)"},contextmenu:{full:"Full",right:"Right",center:"Center",left:"Left",align:"Alignment"},insertdatetime:{"day_short":"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun","day_long":"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday","months_short":"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec","months_long":"January,February,March,April,May,June,July,August,September,October,November,December","inserttime_desc":"Insert Time","insertdate_desc":"Insert Date","time_fmt":"%H:%M:%S","date_fmt":"%Y-%m-%d"},print:{"print_desc":"Print"},preview:{"preview_desc":"Preview"},directionality:{"rtl_desc":"Direction Right to Left","ltr_desc":"Direction Left to Right"},layer:{content:"New layer...","absolute_desc":"Toggle Absolute Positioning","backward_desc":"Move Backward","forward_desc":"Move Forward","insertlayer_desc":"Insert New Layer"},save:{"save_desc":"Save","cancel_desc":"Cancel All Changes"},nonbreaking:{"nonbreaking_desc":"Insert Non-Breaking Space Character"},iespell:{download:"ieSpell not detected. Do you want to install it now?","iespell_desc":"Check Spelling"},advhr:{"delta_height":"","delta_width":"","advhr_desc":"Insert Horizontal Line"},emotions:{"delta_height":"","delta_width":"","emotions_desc":"Emotions"},searchreplace:{"replace_desc":"Find/Replace","delta_width":"","delta_height":"","search_desc":"Find"},advimage:{"delta_width":"","image_desc":"Insert/Edit Image","delta_height":""},advlink:{"delta_height":"","delta_width":"","link_desc":"Insert/Edit Link"},xhtmlxtras:{"attribs_delta_height":"","attribs_delta_width":"","ins_delta_height":"","ins_delta_width":"","del_delta_height":"","del_delta_width":"","acronym_delta_height":"","acronym_delta_width":"","abbr_delta_height":"","abbr_delta_width":"","cite_delta_height":"","cite_delta_width":"","attribs_desc":"Insert/Edit Attributes","ins_desc":"Insertion","del_desc":"Deletion","acronym_desc":"Acronym","abbr_desc":"Abbreviation","cite_desc":"Citation"},style:{"delta_height":"","delta_width":"",desc:"Edit CSS Style"},paste:{"plaintext_mode_stick":"Paste is now in plain text mode. Click again to toggle back to regular paste mode.","plaintext_mode":"Paste is now in plain text mode. Click again to toggle back to regular paste mode. After you paste something you will be returned to regular paste mode.","selectall_desc":"Select All","paste_word_desc":"Paste from Word","paste_text_desc":"Paste as Plain Text"},"paste_dlg":{"word_title":"Use Ctrl+V on your keyboard to paste the text into the window.","text_linebreaks":"Keep Linebreaks","text_title":"Use Ctrl+V on your keyboard to paste the text into the window."},table:{"merge_cells_delta_height":"","merge_cells_delta_width":"","table_delta_height":"","table_delta_width":"","cellprops_delta_height":"","cellprops_delta_width":"","rowprops_delta_height":"","rowprops_delta_width":"",cell:"Cell",col:"Column",row:"Row",del:"Delete Table","copy_row_desc":"Copy Table Row","cut_row_desc":"Cut Table Row","paste_row_after_desc":"Paste Table Row After","paste_row_before_desc":"Paste Table Row Before","props_desc":"Table Properties","cell_desc":"Table Cell Properties","row_desc":"Table Row Properties","merge_cells_desc":"Merge Table Cells","split_cells_desc":"Split Merged Table Cells","delete_col_desc":"Delete Column","col_after_desc":"Insert Column After","col_before_desc":"Insert Column Before","delete_row_desc":"Delete Row","row_after_desc":"Insert Row After","row_before_desc":"Insert Row Before",desc:"Insert/Edit Table"},autosave:{"warning_message":"If you restore the saved content, you will lose all the content that is currently in the editor.\n\nAre you sure you want to restore the saved content?","restore_content":"Restore auto-saved content.","unload_msg":"The changes you made will be lost if you navigate away from this page."},fullscreen:{desc:"Toggle Full Screen Mode"},media:{"delta_height":"","delta_width":"",edit:"Edit Embedded Media",desc:"Insert/Edit Embedded Media"},fullpage:{desc:"Document Properties","delta_width":"","delta_height":""},template:{desc:"Insert Predefined Template Content"},visualchars:{desc:"Show/Hide Visual Control Characters"},spellchecker:{desc:"Toggle Spell Checker",menu:"Spell Checker Settings","ignore_word":"Ignore Word","ignore_words":"Ignore All",langs:"Languages",wait:"Please wait...",sug:"Suggestions","no_sug":"No Suggestions","no_mpell":"No misspellings found.","learn_word":"Learn word"},pagebreak:{desc:"Insert Page Break for Printing"},advlist:{types:"Types",def:"Default","lower_alpha":"Lower Alpha","lower_greek":"Lower Greek","lower_roman":"Lower Roman","upper_alpha":"Upper Alpha","upper_roman":"Upper Roman",circle:"Circle",disc:"Disc",square:"Square"},colors:{"333300":"Dark olive","993300":"Burnt orange","000000":"Black","003300":"Dark green","003366":"Dark azure","000080":"Navy Blue","333399":"Indigo","333333":"Very dark gray","800000":"Maroon",FF6600:"Orange","808000":"Olive","008000":"Green","008080":"Teal","0000FF":"Blue","666699":"Grayish blue","808080":"Gray",FF0000:"Red",FF9900:"Amber","99CC00":"Yellow green","339966":"Sea green","33CCCC":"Turquoise","3366FF":"Royal blue","800080":"Purple","999999":"Medium gray",FF00FF:"Magenta",FFCC00:"Gold",FFFF00:"Yellow","00FF00":"Lime","00FFFF":"Aqua","00CCFF":"Sky blue","993366":"Brown",C0C0C0:"Silver",FF99CC:"Pink",FFCC99:"Peach",FFFF99:"Light yellow",CCFFCC:"Pale green",CCFFFF:"Pale cyan","99CCFF":"Light sky blue",CC99FF:"Plum",FFFFFF:"White"},aria:{"rich_text_area":"Rich Text Area"},wordcount:{words:"Words:"}}});
diff --git a/js/tiny_mce/plugins/advhr/editor_plugin.js b/js/tiny_mce/plugins/advhr/editor_plugin.js
index 4d3b062deea..176b2d23285 100644
--- a/js/tiny_mce/plugins/advhr/editor_plugin.js
+++ b/js/tiny_mce/plugins/advhr/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.AdvancedHRPlugin",{init:function(a,b){a.addCommand("mceAdvancedHr",function(){a.windowManager.open({file:b+"/rule.htm",width:250+parseInt(a.getLang("advhr.delta_width",0)),height:160+parseInt(a.getLang("advhr.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("advhr",{title:"advhr.advhr_desc",cmd:"mceAdvancedHr"});a.onNodeChange.add(function(d,c,e){c.setActive("advhr",e.nodeName=="HR")});a.onClick.add(function(c,d){d=d.target;if(d.nodeName==="HR"){c.selection.select(d)}})},getInfo:function(){return{longname:"Advanced HR",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advhr",tinymce.plugins.AdvancedHRPlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.AdvancedHRPlugin",{init:function(a,b){a.addCommand("mceAdvancedHr",function(){a.windowManager.open({file:b+"/rule.htm",width:250+parseInt(a.getLang("advhr.delta_width",0)),height:160+parseInt(a.getLang("advhr.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("advhr",{title:"advhr.advhr_desc",cmd:"mceAdvancedHr"});a.onNodeChange.add(function(d,c,e){c.setActive("advhr",e.nodeName=="HR")});a.onClick.add(function(c,d){d=d.target;if(d.nodeName==="HR"){c.selection.select(d)}})},getInfo:function(){return{longname:"Advanced HR",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advhr",tinymce.plugins.AdvancedHRPlugin)})();
diff --git a/js/tiny_mce/plugins/advhr/editor_plugin_src.js b/js/tiny_mce/plugins/advhr/editor_plugin_src.js
index 0c652d3303e..53d7e7f493a 100644
--- a/js/tiny_mce/plugins/advhr/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/advhr/editor_plugin_src.js
@@ -54,4 +54,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('advhr', tinymce.plugins.AdvancedHRPlugin);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/advhr/langs/en_dlg.js b/js/tiny_mce/plugins/advhr/langs/en_dlg.js
index 0c3bf15e6f4..a77d012613f 100644
--- a/js/tiny_mce/plugins/advhr/langs/en_dlg.js
+++ b/js/tiny_mce/plugins/advhr/langs/en_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.advhr_dlg',{size:"Height",noshade:"No Shadow",width:"Width",normal:"Normal",widthunits:"Units"});
\ No newline at end of file
+tinyMCE.addI18n('en.advhr_dlg',{size:"Height",noshade:"No Shadow",width:"Width",normal:"Normal",widthunits:"Units"});
diff --git a/js/tiny_mce/plugins/advimage/editor_plugin.js b/js/tiny_mce/plugins/advimage/editor_plugin.js
index d613a613938..cd75426e87f 100644
--- a/js/tiny_mce/plugins/advimage/editor_plugin.js
+++ b/js/tiny_mce/plugins/advimage/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.AdvancedImagePlugin",{init:function(a,b){a.addCommand("mceAdvImage",function(){if(a.dom.getAttrib(a.selection.getNode(),"class","").indexOf("mceItem")!=-1){return}a.windowManager.open({file:b+"/image.htm",width:480+parseInt(a.getLang("advimage.delta_width",0)),height:385+parseInt(a.getLang("advimage.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("image",{title:"advimage.image_desc",cmd:"mceAdvImage"})},getInfo:function(){return{longname:"Advanced image",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advimage",tinymce.plugins.AdvancedImagePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.AdvancedImagePlugin",{init:function(a,b){a.addCommand("mceAdvImage",function(){if(a.dom.getAttrib(a.selection.getNode(),"class","").indexOf("mceItem")!=-1){return}a.windowManager.open({file:b+"/image.htm",width:480+parseInt(a.getLang("advimage.delta_width",0)),height:385+parseInt(a.getLang("advimage.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("image",{title:"advimage.image_desc",cmd:"mceAdvImage"})},getInfo:function(){return{longname:"Advanced image",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advimage",tinymce.plugins.AdvancedImagePlugin)})();
diff --git a/js/tiny_mce/plugins/advimage/editor_plugin_src.js b/js/tiny_mce/plugins/advimage/editor_plugin_src.js
index d2678cbcf2e..7a3b873b218 100644
--- a/js/tiny_mce/plugins/advimage/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/advimage/editor_plugin_src.js
@@ -47,4 +47,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('advimage', tinymce.plugins.AdvancedImagePlugin);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/advimage/langs/en_dlg.js b/js/tiny_mce/plugins/advimage/langs/en_dlg.js
index 5f122e2cd3b..56394c0b0d8 100644
--- a/js/tiny_mce/plugins/advimage/langs/en_dlg.js
+++ b/js/tiny_mce/plugins/advimage/langs/en_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.advimage_dlg',{"image_list":"Image List","align_right":"Right","align_left":"Left","align_textbottom":"Text Bottom","align_texttop":"Text Top","align_bottom":"Bottom","align_middle":"Middle","align_top":"Top","align_baseline":"Baseline",align:"Alignment",hspace:"Horizontal Space",vspace:"Vertical Space",dimensions:"Dimensions",border:"Border",list:"Image List",alt:"Image Description",src:"Image URL","dialog_title":"Insert/Edit Image","missing_alt":"Are you sure you want to continue without including an Image Description? Without it the image may not be accessible to some users with disabilities, or to those using a text browser, or browsing the Web with images turned off.","example_img":"Appearance Preview Image",misc:"Miscellaneous",mouseout:"For Mouse Out",mouseover:"For Mouse Over","alt_image":"Alternative Image","swap_image":"Swap Image",map:"Image Map",id:"ID",rtl:"Right to Left",ltr:"Left to Right",classes:"Classes",style:"Style","long_desc":"Long Description Link",langcode:"Language Code",langdir:"Language Direction","constrain_proportions":"Constrain Proportions",preview:"Preview",title:"Title",general:"General","tab_advanced":"Advanced","tab_appearance":"Appearance","tab_general":"General",width:"Width",height:"Height"});
\ No newline at end of file
+tinyMCE.addI18n('en.advimage_dlg',{"image_list":"Image List","align_right":"Right","align_left":"Left","align_textbottom":"Text Bottom","align_texttop":"Text Top","align_bottom":"Bottom","align_middle":"Middle","align_top":"Top","align_baseline":"Baseline",align:"Alignment",hspace:"Horizontal Space",vspace:"Vertical Space",dimensions:"Dimensions",border:"Border",list:"Image List",alt:"Image Description",src:"Image URL","dialog_title":"Insert/Edit Image","missing_alt":"Are you sure you want to continue without including an Image Description? Without it the image may not be accessible to some users with disabilities, or to those using a text browser, or browsing the Web with images turned off.","example_img":"Appearance Preview Image",misc:"Miscellaneous",mouseout:"For Mouse Out",mouseover:"For Mouse Over","alt_image":"Alternative Image","swap_image":"Swap Image",map:"Image Map",id:"ID",rtl:"Right to Left",ltr:"Left to Right",classes:"Classes",style:"Style","long_desc":"Long Description Link",langcode:"Language Code",langdir:"Language Direction","constrain_proportions":"Constrain Proportions",preview:"Preview",title:"Title",general:"General","tab_advanced":"Advanced","tab_appearance":"Appearance","tab_general":"General",width:"Width",height:"Height"});
diff --git a/js/tiny_mce/plugins/advlink/editor_plugin.js b/js/tiny_mce/plugins/advlink/editor_plugin.js
index 983fe5a9ca4..dd26ac96aa7 100644
--- a/js/tiny_mce/plugins/advlink/editor_plugin.js
+++ b/js/tiny_mce/plugins/advlink/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.AdvancedLinkPlugin",{init:function(a,b){this.editor=a;a.addCommand("mceAdvLink",function(){var c=a.selection;if(c.isCollapsed()&&!a.dom.getParent(c.getNode(),"A")){return}a.windowManager.open({file:b+"/link.htm",width:480+parseInt(a.getLang("advlink.delta_width",0)),height:400+parseInt(a.getLang("advlink.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("link",{title:"advlink.link_desc",cmd:"mceAdvLink"});a.addShortcut("ctrl+k","advlink.advlink_desc","mceAdvLink");a.onNodeChange.add(function(d,c,f,e){c.setDisabled("link",e&&f.nodeName!="A");c.setActive("link",f.nodeName=="A"&&!f.name)})},getInfo:function(){return{longname:"Advanced link",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlink",tinymce.plugins.AdvancedLinkPlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.AdvancedLinkPlugin",{init:function(a,b){this.editor=a;a.addCommand("mceAdvLink",function(){var c=a.selection;if(c.isCollapsed()&&!a.dom.getParent(c.getNode(),"A")){return}a.windowManager.open({file:b+"/link.htm",width:480+parseInt(a.getLang("advlink.delta_width",0)),height:400+parseInt(a.getLang("advlink.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("link",{title:"advlink.link_desc",cmd:"mceAdvLink"});a.addShortcut("ctrl+k","advlink.advlink_desc","mceAdvLink");a.onNodeChange.add(function(d,c,f,e){c.setDisabled("link",e&&f.nodeName!="A");c.setActive("link",f.nodeName=="A"&&!f.name)})},getInfo:function(){return{longname:"Advanced link",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlink",tinymce.plugins.AdvancedLinkPlugin)})();
diff --git a/js/tiny_mce/plugins/advlink/editor_plugin_src.js b/js/tiny_mce/plugins/advlink/editor_plugin_src.js
index 14e46a7629c..cb0ba1e55bc 100644
--- a/js/tiny_mce/plugins/advlink/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/advlink/editor_plugin_src.js
@@ -58,4 +58,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('advlink', tinymce.plugins.AdvancedLinkPlugin);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/advlink/langs/en_dlg.js b/js/tiny_mce/plugins/advlink/langs/en_dlg.js
index 3169a565806..ba72f161f99 100644
--- a/js/tiny_mce/plugins/advlink/langs/en_dlg.js
+++ b/js/tiny_mce/plugins/advlink/langs/en_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.advlink_dlg',{"target_name":"Target Name",classes:"Classes",style:"Style",id:"ID","popup_position":"Position (X/Y)",langdir:"Language Direction","popup_size":"Size","popup_dependent":"Dependent (Mozilla/Firefox Only)","popup_resizable":"Make Window Resizable","popup_location":"Show Location Bar","popup_menubar":"Show Menu Bar","popup_toolbar":"Show Toolbars","popup_statusbar":"Show Status Bar","popup_scrollbars":"Show Scrollbars","popup_return":"Insert \'return false\'","popup_name":"Window Name","popup_url":"Popup URL",popup:"JavaScript Popup","target_blank":"Open in New Window","target_top":"Open in Top Frame (Replaces All Frames)","target_parent":"Open in Parent Window/Frame","target_same":"Open in This Window/Frame","anchor_names":"Anchors","popup_opts":"Options","advanced_props":"Advanced Properties","event_props":"Events","popup_props":"Popup Properties","general_props":"General Properties","advanced_tab":"Advanced","events_tab":"Events","popup_tab":"Popup","general_tab":"General",list:"Link List","is_external":"The URL you entered seems to be an external link. Do you want to add the required http:// prefix?","is_email":"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",titlefield:"Title",target:"Target",url:"Link URL",title:"Insert/Edit Link","link_list":"Link List",rtl:"Right to Left",ltr:"Left to Right",accesskey:"AccessKey",tabindex:"TabIndex",rev:"Relationship Target to Page",rel:"Relationship Page to Target",mime:"Target MIME Type",encoding:"Target Character Encoding",langcode:"Language Code","target_langcode":"Target Language",width:"Width",height:"Height"});
\ No newline at end of file
+tinyMCE.addI18n('en.advlink_dlg',{"target_name":"Target Name",classes:"Classes",style:"Style",id:"ID","popup_position":"Position (X/Y)",langdir:"Language Direction","popup_size":"Size","popup_dependent":"Dependent (Mozilla/Firefox Only)","popup_resizable":"Make Window Resizable","popup_location":"Show Location Bar","popup_menubar":"Show Menu Bar","popup_toolbar":"Show Toolbars","popup_statusbar":"Show Status Bar","popup_scrollbars":"Show Scrollbars","popup_return":"Insert \'return false\'","popup_name":"Window Name","popup_url":"Popup URL",popup:"JavaScript Popup","target_blank":"Open in New Window","target_top":"Open in Top Frame (Replaces All Frames)","target_parent":"Open in Parent Window/Frame","target_same":"Open in This Window/Frame","anchor_names":"Anchors","popup_opts":"Options","advanced_props":"Advanced Properties","event_props":"Events","popup_props":"Popup Properties","general_props":"General Properties","advanced_tab":"Advanced","events_tab":"Events","popup_tab":"Popup","general_tab":"General",list:"Link List","is_external":"The URL you entered seems to be an external link. Do you want to add the required http:// prefix?","is_email":"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",titlefield:"Title",target:"Target",url:"Link URL",title:"Insert/Edit Link","link_list":"Link List",rtl:"Right to Left",ltr:"Left to Right",accesskey:"AccessKey",tabindex:"TabIndex",rev:"Relationship Target to Page",rel:"Relationship Page to Target",mime:"Target MIME Type",encoding:"Target Character Encoding",langcode:"Language Code","target_langcode":"Target Language",width:"Width",height:"Height"});
diff --git a/js/tiny_mce/plugins/advlist/editor_plugin.js b/js/tiny_mce/plugins/advlist/editor_plugin.js
index 57ecce6e02c..11e2bfa651e 100644
--- a/js/tiny_mce/plugins/advlist/editor_plugin.js
+++ b/js/tiny_mce/plugins/advlist/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.AdvListPlugin",{init:function(b,c){var d=this;d.editor=b;function e(g){var f=[];a(g.split(/,/),function(h){f.push({title:"advlist."+(h=="default"?"def":h.replace(/-/g,"_")),styles:{listStyleType:h=="default"?"":h}})});return f}d.numlist=b.getParam("advlist_number_styles")||e("default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman");d.bullist=b.getParam("advlist_bullet_styles")||e("default,circle,disc,square");if(tinymce.isIE&&/MSIE [2-7]/.test(navigator.userAgent)){d.isIE7=true}},createControl:function(d,b){var f=this,e,i,g=f.editor;if(d=="numlist"||d=="bullist"){if(f[d][0].title=="advlist.def"){i=f[d][0]}function c(j,l){var k=true;a(l.styles,function(n,m){if(g.dom.getStyle(j,m)!=n){k=false;return false}});return k}function h(){var k,l=g.dom,j=g.selection;k=l.getParent(j.getNode(),"ol,ul");if(!k||k.nodeName==(d=="bullist"?"OL":"UL")||c(k,i)){g.execCommand(d=="bullist"?"InsertUnorderedList":"InsertOrderedList")}if(i){k=l.getParent(j.getNode(),"ol,ul");if(k){l.setStyles(k,i.styles);k.removeAttribute("data-mce-style")}}g.focus()}e=b.createSplitButton(d,{title:"advanced."+d+"_desc","class":"mce_"+d,onclick:function(){h()}});e.onRenderMenu.add(function(j,k){k.onHideMenu.add(function(){if(f.bookmark){g.selection.moveToBookmark(f.bookmark);f.bookmark=0}});k.onShowMenu.add(function(){var n=g.dom,m=n.getParent(g.selection.getNode(),"ol,ul"),l;if(m||i){l=f[d];a(k.items,function(o){var p=true;o.setSelected(0);if(m&&!o.isDisabled()){a(l,function(q){if(q.id==o.id){if(!c(m,q)){p=false;return false}}});if(p){o.setSelected(1)}}});if(!m){k.items[i.id].setSelected(1)}}g.focus();if(tinymce.isIE){f.bookmark=g.selection.getBookmark(1)}});k.add({id:g.dom.uniqueId(),title:"advlist.types","class":"mceMenuItemTitle",titleItem:true}).setDisabled(1);a(f[d],function(l){if(f.isIE7&&l.styles.listStyleType=="lower-greek"){return}l.id=g.dom.uniqueId();k.add({id:l.id,title:l.title,onclick:function(){i=l;h()}})})});return e}},getInfo:function(){return{longname:"Advanced lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlist",tinymce.plugins.AdvListPlugin)})();
\ No newline at end of file
+(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.AdvListPlugin",{init:function(b,c){var d=this;d.editor=b;function e(g){var f=[];a(g.split(/,/),function(h){f.push({title:"advlist."+(h=="default"?"def":h.replace(/-/g,"_")),styles:{listStyleType:h=="default"?"":h}})});return f}d.numlist=b.getParam("advlist_number_styles")||e("default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman");d.bullist=b.getParam("advlist_bullet_styles")||e("default,circle,disc,square");if(tinymce.isIE&&/MSIE [2-7]/.test(navigator.userAgent)){d.isIE7=true}},createControl:function(d,b){var f=this,e,i,g=f.editor;if(d=="numlist"||d=="bullist"){if(f[d][0].title=="advlist.def"){i=f[d][0]}function c(j,l){var k=true;a(l.styles,function(n,m){if(g.dom.getStyle(j,m)!=n){k=false;return false}});return k}function h(){var k,l=g.dom,j=g.selection;k=l.getParent(j.getNode(),"ol,ul");if(!k||k.nodeName==(d=="bullist"?"OL":"UL")||c(k,i)){g.execCommand(d=="bullist"?"InsertUnorderedList":"InsertOrderedList")}if(i){k=l.getParent(j.getNode(),"ol,ul");if(k){l.setStyles(k,i.styles);k.removeAttribute("data-mce-style")}}g.focus()}e=b.createSplitButton(d,{title:"advanced."+d+"_desc","class":"mce_"+d,onclick:function(){h()}});e.onRenderMenu.add(function(j,k){k.onHideMenu.add(function(){if(f.bookmark){g.selection.moveToBookmark(f.bookmark);f.bookmark=0}});k.onShowMenu.add(function(){var n=g.dom,m=n.getParent(g.selection.getNode(),"ol,ul"),l;if(m||i){l=f[d];a(k.items,function(o){var p=true;o.setSelected(0);if(m&&!o.isDisabled()){a(l,function(q){if(q.id==o.id){if(!c(m,q)){p=false;return false}}});if(p){o.setSelected(1)}}});if(!m){k.items[i.id].setSelected(1)}}g.focus();if(tinymce.isIE){f.bookmark=g.selection.getBookmark(1)}});k.add({id:g.dom.uniqueId(),title:"advlist.types","class":"mceMenuItemTitle",titleItem:true}).setDisabled(1);a(f[d],function(l){if(f.isIE7&&l.styles.listStyleType=="lower-greek"){return}l.id=g.dom.uniqueId();k.add({id:l.id,title:l.title,onclick:function(){i=l;h()}})})});return e}},getInfo:function(){return{longname:"Advanced lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlist",tinymce.plugins.AdvListPlugin)})();
diff --git a/js/tiny_mce/plugins/advlist/editor_plugin_src.js b/js/tiny_mce/plugins/advlist/editor_plugin_src.js
index a8f046b4188..183799521c9 100644
--- a/js/tiny_mce/plugins/advlist/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/advlist/editor_plugin_src.js
@@ -173,4 +173,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('advlist', tinymce.plugins.AdvListPlugin);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/autolink/editor_plugin.js b/js/tiny_mce/plugins/autolink/editor_plugin.js
index fd293dca4b0..157331b523a 100644
--- a/js/tiny_mce/plugins/autolink/editor_plugin.js
+++ b/js/tiny_mce/plugins/autolink/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.AutolinkPlugin",{init:function(a,b){var c=this;if(tinyMCE.isIE){return}a.onKeyDown.add(function(d,f){if(f.keyCode==13){return c.handleEnter(d)}});a.onKeyPress.add(function(d,f){if(f.which==41){return c.handleEclipse(d)}});a.onKeyUp.add(function(d,f){if(f.keyCode==32){return c.handleSpacebar(d)}})},handleEclipse:function(a){this.parseCurrentLine(a,-1,"(",true)},handleSpacebar:function(a){this.parseCurrentLine(a,0,"",true)},handleEnter:function(a){this.parseCurrentLine(a,-1,"",false)},parseCurrentLine:function(i,d,b,g){var a,f,c,n,k,m,h,e,j;a=i.selection.getRng().cloneRange();if(a.startOffset<5){e=a.endContainer.previousSibling;if(e==null){if(a.endContainer.firstChild==null||a.endContainer.firstChild.nextSibling==null){return}e=a.endContainer.firstChild.nextSibling}j=e.length;a.setStart(e,j);a.setEnd(e,j);if(a.endOffset<5){return}f=a.endOffset;n=e}else{n=a.endContainer;if(n.nodeType!=3&&n.firstChild){while(n.nodeType!=3&&n.firstChild){n=n.firstChild}a.setStart(n,0);a.setEnd(n,n.nodeValue.length)}if(a.endOffset==1){f=2}else{f=a.endOffset-1-d}}c=f;do{a.setStart(n,f-2);a.setEnd(n,f-1);f-=1}while(a.toString()!=" "&&a.toString()!=""&&a.toString().charCodeAt(0)!=160&&(f-2)>=0&&a.toString()!=b);if(a.toString()==b||a.toString().charCodeAt(0)==160){a.setStart(n,f);a.setEnd(n,c);f+=1}else{if(a.startOffset==0){a.setStart(n,0);a.setEnd(n,c)}else{a.setStart(n,f);a.setEnd(n,c)}}m=a.toString();h=m.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.)(.+)$/i);if(h){if(h[1]=="www."){h[1]="http://www."}k=i.selection.getBookmark();i.selection.setRng(a);tinyMCE.execCommand("createlink",false,h[1]+h[2]);i.selection.moveToBookmark(k);if(tinyMCE.isWebKit){i.selection.collapse(false);var l=Math.min(n.length,c+1);a.setStart(n,l);a.setEnd(n,l);i.selection.setRng(a)}}},getInfo:function(){return{longname:"Autolink",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autolink",tinymce.plugins.AutolinkPlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.AutolinkPlugin",{init:function(a,b){var c=this;if(tinyMCE.isIE){return}a.onKeyDown.add(function(d,f){if(f.keyCode==13){return c.handleEnter(d)}});a.onKeyPress.add(function(d,f){if(f.which==41){return c.handleEclipse(d)}});a.onKeyUp.add(function(d,f){if(f.keyCode==32){return c.handleSpacebar(d)}})},handleEclipse:function(a){this.parseCurrentLine(a,-1,"(",true)},handleSpacebar:function(a){this.parseCurrentLine(a,0,"",true)},handleEnter:function(a){this.parseCurrentLine(a,-1,"",false)},parseCurrentLine:function(i,d,b,g){var a,f,c,n,k,m,h,e,j;a=i.selection.getRng().cloneRange();if(a.startOffset<5){e=a.endContainer.previousSibling;if(e==null){if(a.endContainer.firstChild==null||a.endContainer.firstChild.nextSibling==null){return}e=a.endContainer.firstChild.nextSibling}j=e.length;a.setStart(e,j);a.setEnd(e,j);if(a.endOffset<5){return}f=a.endOffset;n=e}else{n=a.endContainer;if(n.nodeType!=3&&n.firstChild){while(n.nodeType!=3&&n.firstChild){n=n.firstChild}a.setStart(n,0);a.setEnd(n,n.nodeValue.length)}if(a.endOffset==1){f=2}else{f=a.endOffset-1-d}}c=f;do{a.setStart(n,f-2);a.setEnd(n,f-1);f-=1}while(a.toString()!=" "&&a.toString()!=""&&a.toString().charCodeAt(0)!=160&&(f-2)>=0&&a.toString()!=b);if(a.toString()==b||a.toString().charCodeAt(0)==160){a.setStart(n,f);a.setEnd(n,c);f+=1}else{if(a.startOffset==0){a.setStart(n,0);a.setEnd(n,c)}else{a.setStart(n,f);a.setEnd(n,c)}}m=a.toString();h=m.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.)(.+)$/i);if(h){if(h[1]=="www."){h[1]="http://www."}k=i.selection.getBookmark();i.selection.setRng(a);tinyMCE.execCommand("createlink",false,h[1]+h[2]);i.selection.moveToBookmark(k);if(tinyMCE.isWebKit){i.selection.collapse(false);var l=Math.min(n.length,c+1);a.setStart(n,l);a.setEnd(n,l);i.selection.setRng(a)}}},getInfo:function(){return{longname:"Autolink",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autolink",tinymce.plugins.AutolinkPlugin)})();
diff --git a/js/tiny_mce/plugins/autoresize/editor_plugin.js b/js/tiny_mce/plugins/autoresize/editor_plugin.js
index 6c4ff0d5dfc..f3ece6680ee 100644
--- a/js/tiny_mce/plugins/autoresize/editor_plugin.js
+++ b/js/tiny_mce/plugins/autoresize/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.AutoResizePlugin",{init:function(a,c){var d=this,e=0;if(a.getParam("fullscreen_is_enabled")){return}function b(){var i=a.getDoc(),f=i.body,k=i.documentElement,h=tinymce.DOM,j=d.autoresize_min_height,g;g=tinymce.isIE?f.scrollHeight:i.body.offsetHeight;if(g>d.autoresize_min_height){j=g}if(d.autoresize_max_height&&g>d.autoresize_max_height){j=d.autoresize_max_height;a.getBody().style.overflowY="auto"}else{a.getBody().style.overflowY="hidden"}if(j!==e){h.setStyle(h.get(a.id+"_ifr"),"height",j+"px");e=j}if(d.throbbing){a.setProgressState(false);a.setProgressState(true)}}d.editor=a;d.autoresize_min_height=parseInt(a.getParam("autoresize_min_height",a.getElement().offsetHeight));d.autoresize_max_height=parseInt(a.getParam("autoresize_max_height",0));a.onInit.add(function(f){f.dom.setStyle(f.getBody(),"paddingBottom",f.getParam("autoresize_bottom_margin",50)+"px")});a.onChange.add(b);a.onSetContent.add(b);a.onPaste.add(b);a.onKeyUp.add(b);a.onPostRender.add(b);if(a.getParam("autoresize_on_init",true)){a.onInit.add(function(g,f){g.setProgressState(true);d.throbbing=true;g.getBody().style.overflowY="hidden"});a.onLoadContent.add(function(g,f){b();setTimeout(function(){b();g.setProgressState(false);d.throbbing=false},1250)})}a.addCommand("mceAutoResize",b)},getInfo:function(){return{longname:"Auto Resize",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autoresize",tinymce.plugins.AutoResizePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.AutoResizePlugin",{init:function(a,c){var d=this,e=0;if(a.getParam("fullscreen_is_enabled")){return}function b(){var i=a.getDoc(),f=i.body,k=i.documentElement,h=tinymce.DOM,j=d.autoresize_min_height,g;g=tinymce.isIE?f.scrollHeight:i.body.offsetHeight;if(g>d.autoresize_min_height){j=g}if(d.autoresize_max_height&&g>d.autoresize_max_height){j=d.autoresize_max_height;a.getBody().style.overflowY="auto"}else{a.getBody().style.overflowY="hidden"}if(j!==e){h.setStyle(h.get(a.id+"_ifr"),"height",j+"px");e=j}if(d.throbbing){a.setProgressState(false);a.setProgressState(true)}}d.editor=a;d.autoresize_min_height=parseInt(a.getParam("autoresize_min_height",a.getElement().offsetHeight));d.autoresize_max_height=parseInt(a.getParam("autoresize_max_height",0));a.onInit.add(function(f){f.dom.setStyle(f.getBody(),"paddingBottom",f.getParam("autoresize_bottom_margin",50)+"px")});a.onChange.add(b);a.onSetContent.add(b);a.onPaste.add(b);a.onKeyUp.add(b);a.onPostRender.add(b);if(a.getParam("autoresize_on_init",true)){a.onInit.add(function(g,f){g.setProgressState(true);d.throbbing=true;g.getBody().style.overflowY="hidden"});a.onLoadContent.add(function(g,f){b();setTimeout(function(){b();g.setProgressState(false);d.throbbing=false},1250)})}a.addCommand("mceAutoResize",b)},getInfo:function(){return{longname:"Auto Resize",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autoresize",tinymce.plugins.AutoResizePlugin)})();
diff --git a/js/tiny_mce/plugins/autosave/editor_plugin.js b/js/tiny_mce/plugins/autosave/editor_plugin.js
index f7d0576008d..af3fd2d81f4 100644
--- a/js/tiny_mce/plugins/autosave/editor_plugin.js
+++ b/js/tiny_mce/plugins/autosave/editor_plugin.js
@@ -1 +1 @@
-(function(e){var c="autosave",g="restoredraft",b=true,f,d,a=e.util.Dispatcher;e.create("tinymce.plugins.AutoSave",{init:function(i,j){var h=this,l=i.settings;h.editor=i;function k(n){var m={s:1000,m:60000};n=/^(\d+)([ms]?)$/.exec(""+n);return(n[2]?m[n[2]]:1)*parseInt(n)}e.each({ask_before_unload:b,interval:"30s",retention:"20m",minlength:50},function(n,m){m=c+"_"+m;if(l[m]===f){l[m]=n}});l.autosave_interval=k(l.autosave_interval);l.autosave_retention=k(l.autosave_retention);i.addButton(g,{title:c+".restore_content",onclick:function(){if(i.getContent({draft:true}).replace(/\s|&nbsp;|<\/?p[^>]*>|<br[^>]*>/gi,"").length>0){i.windowManager.confirm(c+".warning_message",function(m){if(m){h.restoreDraft()}})}else{h.restoreDraft()}}});i.onNodeChange.add(function(){var m=i.controlManager;if(m.get(g)){m.setDisabled(g,!h.hasDraft())}});i.onInit.add(function(){if(i.controlManager.get(g)){h.setupStorage(i);setInterval(function(){h.storeDraft();i.nodeChanged()},l.autosave_interval)}});h.onStoreDraft=new a(h);h.onRestoreDraft=new a(h);h.onRemoveDraft=new a(h);if(!d){window.onbeforeunload=e.plugins.AutoSave._beforeUnloadHandler;d=b}},getInfo:function(){return{longname:"Auto save",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave",version:e.majorVersion+"."+e.minorVersion}},getExpDate:function(){return new Date(new Date().getTime()+this.editor.settings.autosave_retention).toUTCString()},setupStorage:function(i){var h=this,k=c+"_test",j="OK";h.key=c+i.id;e.each([function(){if(localStorage){localStorage.setItem(k,j);if(localStorage.getItem(k)===j){localStorage.removeItem(k);return localStorage}}},function(){if(sessionStorage){sessionStorage.setItem(k,j);if(sessionStorage.getItem(k)===j){sessionStorage.removeItem(k);return sessionStorage}}},function(){if(e.isIE){i.getElement().style.behavior="url('#default#userData')";return{autoExpires:b,setItem:function(l,n){var m=i.getElement();m.setAttribute(l,n);m.expires=h.getExpDate();try{m.save("TinyMCE")}catch(o){}},getItem:function(l){var m=i.getElement();try{m.load("TinyMCE");return m.getAttribute(l)}catch(n){return null}},removeItem:function(l){i.getElement().removeAttribute(l)}}}},],function(l){try{h.storage=l();if(h.storage){return false}}catch(m){}})},storeDraft:function(){var i=this,l=i.storage,j=i.editor,h,k;if(l){if(!l.getItem(i.key)&&!j.isDirty()){return}k=j.getContent({draft:true});if(k.length>j.settings.autosave_minlength){h=i.getExpDate();if(!i.storage.autoExpires){i.storage.setItem(i.key+"_expires",h)}i.storage.setItem(i.key,k);i.onStoreDraft.dispatch(i,{expires:h,content:k})}}},restoreDraft:function(){var h=this,j=h.storage,i;if(j){i=j.getItem(h.key);if(i){h.editor.setContent(i);h.onRestoreDraft.dispatch(h,{content:i})}}},hasDraft:function(){var h=this,k=h.storage,i,j;if(k){j=!!k.getItem(h.key);if(j){if(!h.storage.autoExpires){i=new Date(k.getItem(h.key+"_expires"));if(new Date().getTime()<i.getTime()){return b}h.removeDraft()}else{return b}}}return false},removeDraft:function(){var h=this,k=h.storage,i=h.key,j;if(k){j=k.getItem(i);k.removeItem(i);k.removeItem(i+"_expires");if(j){h.onRemoveDraft.dispatch(h,{content:j})}}},"static":{_beforeUnloadHandler:function(h){var i;e.each(tinyMCE.editors,function(j){if(j.plugins.autosave){j.plugins.autosave.storeDraft()}if(j.getParam("fullscreen_is_enabled")){return}if(!i&&j.isDirty()&&j.getParam("autosave_ask_before_unload")){i=j.getLang("autosave.unload_msg")}});return i}}});e.PluginManager.add("autosave",e.plugins.AutoSave)})(tinymce);
\ No newline at end of file
+(function(e){var c="autosave",g="restoredraft",b=true,f,d,a=e.util.Dispatcher;e.create("tinymce.plugins.AutoSave",{init:function(i,j){var h=this,l=i.settings;h.editor=i;function k(n){var m={s:1000,m:60000};n=/^(\d+)([ms]?)$/.exec(""+n);return(n[2]?m[n[2]]:1)*parseInt(n)}e.each({ask_before_unload:b,interval:"30s",retention:"20m",minlength:50},function(n,m){m=c+"_"+m;if(l[m]===f){l[m]=n}});l.autosave_interval=k(l.autosave_interval);l.autosave_retention=k(l.autosave_retention);i.addButton(g,{title:c+".restore_content",onclick:function(){if(i.getContent({draft:true}).replace(/\s|&nbsp;|<\/?p[^>]*>|<br[^>]*>/gi,"").length>0){i.windowManager.confirm(c+".warning_message",function(m){if(m){h.restoreDraft()}})}else{h.restoreDraft()}}});i.onNodeChange.add(function(){var m=i.controlManager;if(m.get(g)){m.setDisabled(g,!h.hasDraft())}});i.onInit.add(function(){if(i.controlManager.get(g)){h.setupStorage(i);setInterval(function(){h.storeDraft();i.nodeChanged()},l.autosave_interval)}});h.onStoreDraft=new a(h);h.onRestoreDraft=new a(h);h.onRemoveDraft=new a(h);if(!d){window.onbeforeunload=e.plugins.AutoSave._beforeUnloadHandler;d=b}},getInfo:function(){return{longname:"Auto save",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave",version:e.majorVersion+"."+e.minorVersion}},getExpDate:function(){return new Date(new Date().getTime()+this.editor.settings.autosave_retention).toUTCString()},setupStorage:function(i){var h=this,k=c+"_test",j="OK";h.key=c+i.id;e.each([function(){if(localStorage){localStorage.setItem(k,j);if(localStorage.getItem(k)===j){localStorage.removeItem(k);return localStorage}}},function(){if(sessionStorage){sessionStorage.setItem(k,j);if(sessionStorage.getItem(k)===j){sessionStorage.removeItem(k);return sessionStorage}}},function(){if(e.isIE){i.getElement().style.behavior="url('#default#userData')";return{autoExpires:b,setItem:function(l,n){var m=i.getElement();m.setAttribute(l,n);m.expires=h.getExpDate();try{m.save("TinyMCE")}catch(o){}},getItem:function(l){var m=i.getElement();try{m.load("TinyMCE");return m.getAttribute(l)}catch(n){return null}},removeItem:function(l){i.getElement().removeAttribute(l)}}}},],function(l){try{h.storage=l();if(h.storage){return false}}catch(m){}})},storeDraft:function(){var i=this,l=i.storage,j=i.editor,h,k;if(l){if(!l.getItem(i.key)&&!j.isDirty()){return}k=j.getContent({draft:true});if(k.length>j.settings.autosave_minlength){h=i.getExpDate();if(!i.storage.autoExpires){i.storage.setItem(i.key+"_expires",h)}i.storage.setItem(i.key,k);i.onStoreDraft.dispatch(i,{expires:h,content:k})}}},restoreDraft:function(){var h=this,j=h.storage,i;if(j){i=j.getItem(h.key);if(i){h.editor.setContent(i);h.onRestoreDraft.dispatch(h,{content:i})}}},hasDraft:function(){var h=this,k=h.storage,i,j;if(k){j=!!k.getItem(h.key);if(j){if(!h.storage.autoExpires){i=new Date(k.getItem(h.key+"_expires"));if(new Date().getTime()<i.getTime()){return b}h.removeDraft()}else{return b}}}return false},removeDraft:function(){var h=this,k=h.storage,i=h.key,j;if(k){j=k.getItem(i);k.removeItem(i);k.removeItem(i+"_expires");if(j){h.onRemoveDraft.dispatch(h,{content:j})}}},"static":{_beforeUnloadHandler:function(h){var i;e.each(tinyMCE.editors,function(j){if(j.plugins.autosave){j.plugins.autosave.storeDraft()}if(j.getParam("fullscreen_is_enabled")){return}if(!i&&j.isDirty()&&j.getParam("autosave_ask_before_unload")){i=j.getLang("autosave.unload_msg")}});return i}}});e.PluginManager.add("autosave",e.plugins.AutoSave)})(tinymce);
diff --git a/js/tiny_mce/plugins/autosave/langs/en.js b/js/tiny_mce/plugins/autosave/langs/en.js
index fce6bd3e1fa..f4f2e510327 100644
--- a/js/tiny_mce/plugins/autosave/langs/en.js
+++ b/js/tiny_mce/plugins/autosave/langs/en.js
@@ -1,4 +1,4 @@
 tinyMCE.addI18n('en.autosave',{
 restore_content: "Restore auto-saved content",
 warning_message: "If you restore the saved content, you will lose all the content that is currently in the editor.\n\nAre you sure you want to restore the saved content?"
-});
\ No newline at end of file
+});
diff --git a/js/tiny_mce/plugins/bbcode/editor_plugin.js b/js/tiny_mce/plugins/bbcode/editor_plugin.js
index 8f8821fd64f..f6d43ca2456 100644
--- a/js/tiny_mce/plugins/bbcode/editor_plugin.js
+++ b/js/tiny_mce/plugins/bbcode/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(a,b){var d=this,c=a.getParam("bbcode_dialect","punbb").toLowerCase();a.onBeforeSetContent.add(function(e,f){f.content=d["_"+c+"_bbcode2html"](f.content)});a.onPostProcess.add(function(e,f){if(f.set){f.content=d["_"+c+"_bbcode2html"](f.content)}if(f.get){f.content=d["_"+c+"_html2bbcode"](f.content)}})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_punbb_html2bbcode:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");b(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");b(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");b(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");b(/<font>(.*?)<\/font>/gi,"$1");b(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");b(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");b(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");b(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");b(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");b(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");b(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");b(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");b(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");b(/<\/(strong|b)>/gi,"[/b]");b(/<(strong|b)>/gi,"[b]");b(/<\/(em|i)>/gi,"[/i]");b(/<(em|i)>/gi,"[i]");b(/<\/u>/gi,"[/u]");b(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");b(/<u>/gi,"[u]");b(/<blockquote[^>]*>/gi,"[quote]");b(/<\/blockquote>/gi,"[/quote]");b(/<br \/>/gi,"\n");b(/<br\/>/gi,"\n");b(/<br>/gi,"\n");b(/<p>/gi,"");b(/<\/p>/gi,"\n");b(/&nbsp;|\u00a0/gi," ");b(/&quot;/gi,'"');b(/&lt;/gi,"<");b(/&gt;/gi,">");b(/&amp;/gi,"&");return a},_punbb_bbcode2html:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/\n/gi,"<br />");b(/\[b\]/gi,"<strong>");b(/\[\/b\]/gi,"</strong>");b(/\[i\]/gi,"<em>");b(/\[\/i\]/gi,"</em>");b(/\[u\]/gi,"<u>");b(/\[\/u\]/gi,"</u>");b(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>');b(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>');b(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />');b(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<font color="$1">$2</font>');b(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span>&nbsp;');b(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span>&nbsp;');return a}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(a,b){var d=this,c=a.getParam("bbcode_dialect","punbb").toLowerCase();a.onBeforeSetContent.add(function(e,f){f.content=d["_"+c+"_bbcode2html"](f.content)});a.onPostProcess.add(function(e,f){if(f.set){f.content=d["_"+c+"_bbcode2html"](f.content)}if(f.get){f.content=d["_"+c+"_html2bbcode"](f.content)}})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_punbb_html2bbcode:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");b(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");b(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");b(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");b(/<font>(.*?)<\/font>/gi,"$1");b(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");b(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");b(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");b(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");b(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");b(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");b(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");b(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");b(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");b(/<\/(strong|b)>/gi,"[/b]");b(/<(strong|b)>/gi,"[b]");b(/<\/(em|i)>/gi,"[/i]");b(/<(em|i)>/gi,"[i]");b(/<\/u>/gi,"[/u]");b(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");b(/<u>/gi,"[u]");b(/<blockquote[^>]*>/gi,"[quote]");b(/<\/blockquote>/gi,"[/quote]");b(/<br \/>/gi,"\n");b(/<br\/>/gi,"\n");b(/<br>/gi,"\n");b(/<p>/gi,"");b(/<\/p>/gi,"\n");b(/&nbsp;|\u00a0/gi," ");b(/&quot;/gi,'"');b(/&lt;/gi,"<");b(/&gt;/gi,">");b(/&amp;/gi,"&");return a},_punbb_bbcode2html:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/\n/gi,"<br />");b(/\[b\]/gi,"<strong>");b(/\[\/b\]/gi,"</strong>");b(/\[i\]/gi,"<em>");b(/\[\/i\]/gi,"</em>");b(/\[u\]/gi,"<u>");b(/\[\/u\]/gi,"</u>");b(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>');b(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>');b(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />');b(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<font color="$1">$2</font>');b(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span>&nbsp;');b(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span>&nbsp;');return a}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})();
diff --git a/js/tiny_mce/plugins/bbcode/editor_plugin_src.js b/js/tiny_mce/plugins/bbcode/editor_plugin_src.js
index 4e7eb3377ff..85c239f693d 100644
--- a/js/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -117,4 +117,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('bbcode', tinymce.plugins.BBCodePlugin);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/contextmenu/editor_plugin.js b/js/tiny_mce/plugins/contextmenu/editor_plugin.js
index af7ae54453b..c060aa1c91a 100644
--- a/js/tiny_mce/plugins/contextmenu/editor_plugin.js
+++ b/js/tiny_mce/plugins/contextmenu/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.dom.Event,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.ContextMenu",{init:function(e){var h=this,f,d,i;h.editor=e;d=e.settings.contextmenu_never_use_native;h.onContextMenu=new tinymce.util.Dispatcher(this);f=e.onContextMenu.add(function(j,k){if((i!==0?i:k.ctrlKey)&&!d){return}a.cancel(k);if(k.target.nodeName=="IMG"){j.selection.select(k.target)}h._getMenu(j).showMenu(k.clientX||k.pageX,k.clientY||k.pageY);a.add(j.getDoc(),"click",function(l){g(j,l)});j.nodeChanged()});e.onRemove.add(function(){if(h._menu){h._menu.removeAll()}});function g(j,k){i=0;if(k&&k.button==2){i=k.ctrlKey;return}if(h._menu){h._menu.removeAll();h._menu.destroy();a.remove(j.getDoc(),"click",g)}}e.onMouseDown.add(g);e.onKeyDown.add(g);e.onKeyDown.add(function(j,k){if(k.shiftKey&&!k.ctrlKey&&!k.altKey&&k.keyCode===121){a.cancel(k);f(j,k)}})},getInfo:function(){return{longname:"Contextmenu",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getMenu:function(e){var g=this,d=g._menu,j=e.selection,f=j.isCollapsed(),h=j.getNode()||e.getBody(),i,k;if(d){d.removeAll();d.destroy()}k=b.getPos(e.getContentAreaContainer());d=e.controlManager.createDropMenu("contextmenu",{offset_x:k.x+e.getParam("contextmenu_offset_x",0),offset_y:k.y+e.getParam("contextmenu_offset_y",0),constrain:1,keyboard_focus:true});g._menu=d;d.add({title:"advanced.cut_desc",icon:"cut",cmd:"Cut"}).setDisabled(f);d.add({title:"advanced.copy_desc",icon:"copy",cmd:"Copy"}).setDisabled(f);d.add({title:"advanced.paste_desc",icon:"paste",cmd:"Paste"});if((h.nodeName=="A"&&!e.dom.getAttrib(h,"name"))||!f){d.addSeparator();d.add({title:"advanced.link_desc",icon:"link",cmd:e.plugins.advlink?"mceAdvLink":"mceLink",ui:true});d.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"})}d.addSeparator();d.add({title:"advanced.image_desc",icon:"image",cmd:e.plugins.advimage?"mceAdvImage":"mceImage",ui:true});d.addSeparator();i=d.addMenu({title:"contextmenu.align"});i.add({title:"contextmenu.left",icon:"justifyleft",cmd:"JustifyLeft"});i.add({title:"contextmenu.center",icon:"justifycenter",cmd:"JustifyCenter"});i.add({title:"contextmenu.right",icon:"justifyright",cmd:"JustifyRight"});i.add({title:"contextmenu.full",icon:"justifyfull",cmd:"JustifyFull"});g.onContextMenu.dispatch(g,d,h,f);return d}});tinymce.PluginManager.add("contextmenu",tinymce.plugins.ContextMenu)})();
\ No newline at end of file
+(function(){var a=tinymce.dom.Event,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.ContextMenu",{init:function(e){var h=this,f,d,i;h.editor=e;d=e.settings.contextmenu_never_use_native;h.onContextMenu=new tinymce.util.Dispatcher(this);f=e.onContextMenu.add(function(j,k){if((i!==0?i:k.ctrlKey)&&!d){return}a.cancel(k);if(k.target.nodeName=="IMG"){j.selection.select(k.target)}h._getMenu(j).showMenu(k.clientX||k.pageX,k.clientY||k.pageY);a.add(j.getDoc(),"click",function(l){g(j,l)});j.nodeChanged()});e.onRemove.add(function(){if(h._menu){h._menu.removeAll()}});function g(j,k){i=0;if(k&&k.button==2){i=k.ctrlKey;return}if(h._menu){h._menu.removeAll();h._menu.destroy();a.remove(j.getDoc(),"click",g)}}e.onMouseDown.add(g);e.onKeyDown.add(g);e.onKeyDown.add(function(j,k){if(k.shiftKey&&!k.ctrlKey&&!k.altKey&&k.keyCode===121){a.cancel(k);f(j,k)}})},getInfo:function(){return{longname:"Contextmenu",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getMenu:function(e){var g=this,d=g._menu,j=e.selection,f=j.isCollapsed(),h=j.getNode()||e.getBody(),i,k;if(d){d.removeAll();d.destroy()}k=b.getPos(e.getContentAreaContainer());d=e.controlManager.createDropMenu("contextmenu",{offset_x:k.x+e.getParam("contextmenu_offset_x",0),offset_y:k.y+e.getParam("contextmenu_offset_y",0),constrain:1,keyboard_focus:true});g._menu=d;d.add({title:"advanced.cut_desc",icon:"cut",cmd:"Cut"}).setDisabled(f);d.add({title:"advanced.copy_desc",icon:"copy",cmd:"Copy"}).setDisabled(f);d.add({title:"advanced.paste_desc",icon:"paste",cmd:"Paste"});if((h.nodeName=="A"&&!e.dom.getAttrib(h,"name"))||!f){d.addSeparator();d.add({title:"advanced.link_desc",icon:"link",cmd:e.plugins.advlink?"mceAdvLink":"mceLink",ui:true});d.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"})}d.addSeparator();d.add({title:"advanced.image_desc",icon:"image",cmd:e.plugins.advimage?"mceAdvImage":"mceImage",ui:true});d.addSeparator();i=d.addMenu({title:"contextmenu.align"});i.add({title:"contextmenu.left",icon:"justifyleft",cmd:"JustifyLeft"});i.add({title:"contextmenu.center",icon:"justifycenter",cmd:"JustifyCenter"});i.add({title:"contextmenu.right",icon:"justifyright",cmd:"JustifyRight"});i.add({title:"contextmenu.full",icon:"justifyfull",cmd:"JustifyFull"});g.onContextMenu.dispatch(g,d,h,f);return d}});tinymce.PluginManager.add("contextmenu",tinymce.plugins.ContextMenu)})();
diff --git a/js/tiny_mce/plugins/directionality/editor_plugin.js b/js/tiny_mce/plugins/directionality/editor_plugin.js
index bce8e73995d..ce70a64348f 100644
--- a/js/tiny_mce/plugins/directionality/editor_plugin.js
+++ b/js/tiny_mce/plugins/directionality/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.Directionality",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceDirectionLTR",function(){var d=a.dom.getParent(a.selection.getNode(),a.dom.isBlock);if(d){if(a.dom.getAttrib(d,"dir")!="ltr"){a.dom.setAttrib(d,"dir","ltr")}else{a.dom.setAttrib(d,"dir","")}}a.nodeChanged()});a.addCommand("mceDirectionRTL",function(){var d=a.dom.getParent(a.selection.getNode(),a.dom.isBlock);if(d){if(a.dom.getAttrib(d,"dir")!="rtl"){a.dom.setAttrib(d,"dir","rtl")}else{a.dom.setAttrib(d,"dir","")}}a.nodeChanged()});a.addButton("ltr",{title:"directionality.ltr_desc",cmd:"mceDirectionLTR"});a.addButton("rtl",{title:"directionality.rtl_desc",cmd:"mceDirectionRTL"});a.onNodeChange.add(c._nodeChange,c)},getInfo:function(){return{longname:"Directionality",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,e){var d=b.dom,c;e=d.getParent(e,d.isBlock);if(!e){a.setDisabled("ltr",1);a.setDisabled("rtl",1);return}c=d.getAttrib(e,"dir");a.setActive("ltr",c=="ltr");a.setDisabled("ltr",0);a.setActive("rtl",c=="rtl");a.setDisabled("rtl",0)}});tinymce.PluginManager.add("directionality",tinymce.plugins.Directionality)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.Directionality",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceDirectionLTR",function(){var d=a.dom.getParent(a.selection.getNode(),a.dom.isBlock);if(d){if(a.dom.getAttrib(d,"dir")!="ltr"){a.dom.setAttrib(d,"dir","ltr")}else{a.dom.setAttrib(d,"dir","")}}a.nodeChanged()});a.addCommand("mceDirectionRTL",function(){var d=a.dom.getParent(a.selection.getNode(),a.dom.isBlock);if(d){if(a.dom.getAttrib(d,"dir")!="rtl"){a.dom.setAttrib(d,"dir","rtl")}else{a.dom.setAttrib(d,"dir","")}}a.nodeChanged()});a.addButton("ltr",{title:"directionality.ltr_desc",cmd:"mceDirectionLTR"});a.addButton("rtl",{title:"directionality.rtl_desc",cmd:"mceDirectionRTL"});a.onNodeChange.add(c._nodeChange,c)},getInfo:function(){return{longname:"Directionality",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,e){var d=b.dom,c;e=d.getParent(e,d.isBlock);if(!e){a.setDisabled("ltr",1);a.setDisabled("rtl",1);return}c=d.getAttrib(e,"dir");a.setActive("ltr",c=="ltr");a.setDisabled("ltr",0);a.setActive("rtl",c=="rtl");a.setDisabled("rtl",0)}});tinymce.PluginManager.add("directionality",tinymce.plugins.Directionality)})();
diff --git a/js/tiny_mce/plugins/directionality/editor_plugin_src.js b/js/tiny_mce/plugins/directionality/editor_plugin_src.js
index 4444959bf31..71f0d898551 100644
--- a/js/tiny_mce/plugins/directionality/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/directionality/editor_plugin_src.js
@@ -79,4 +79,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('directionality', tinymce.plugins.Directionality);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/emotions/editor_plugin.js b/js/tiny_mce/plugins/emotions/editor_plugin.js
index dbdd8ffb58e..bc4590f3d78 100644
--- a/js/tiny_mce/plugins/emotions/editor_plugin.js
+++ b/js/tiny_mce/plugins/emotions/editor_plugin.js
@@ -1 +1 @@
-(function(a){a.create("tinymce.plugins.EmotionsPlugin",{init:function(b,c){b.addCommand("mceEmotion",function(){b.windowManager.open({file:c+"/emotions.htm",width:250+parseInt(b.getLang("emotions.delta_width",0)),height:160+parseInt(b.getLang("emotions.delta_height",0)),inline:1},{plugin_url:c})});b.addButton("emotions",{title:"emotions.emotions_desc",cmd:"mceEmotion"})},getInfo:function(){return{longname:"Emotions",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions",version:a.majorVersion+"."+a.minorVersion}}});a.PluginManager.add("emotions",a.plugins.EmotionsPlugin)})(tinymce);
\ No newline at end of file
+(function(a){a.create("tinymce.plugins.EmotionsPlugin",{init:function(b,c){b.addCommand("mceEmotion",function(){b.windowManager.open({file:c+"/emotions.htm",width:250+parseInt(b.getLang("emotions.delta_width",0)),height:160+parseInt(b.getLang("emotions.delta_height",0)),inline:1},{plugin_url:c})});b.addButton("emotions",{title:"emotions.emotions_desc",cmd:"mceEmotion"})},getInfo:function(){return{longname:"Emotions",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions",version:a.majorVersion+"."+a.minorVersion}}});a.PluginManager.add("emotions",a.plugins.EmotionsPlugin)})(tinymce);
diff --git a/js/tiny_mce/plugins/emotions/editor_plugin_src.js b/js/tiny_mce/plugins/emotions/editor_plugin_src.js
index 71d54169723..3b3875ec326 100644
--- a/js/tiny_mce/plugins/emotions/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/emotions/editor_plugin_src.js
@@ -40,4 +40,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('emotions', tinymce.plugins.EmotionsPlugin);
-})(tinymce);
\ No newline at end of file
+})(tinymce);
diff --git a/js/tiny_mce/plugins/example/editor_plugin.js b/js/tiny_mce/plugins/example/editor_plugin.js
index ec1f81ea401..835b94284e0 100644
--- a/js/tiny_mce/plugins/example/editor_plugin.js
+++ b/js/tiny_mce/plugins/example/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.PluginManager.requireLangPack("example");tinymce.create("tinymce.plugins.ExamplePlugin",{init:function(a,b){a.addCommand("mceExample",function(){a.windowManager.open({file:b+"/dialog.htm",width:320+parseInt(a.getLang("example.delta_width",0)),height:120+parseInt(a.getLang("example.delta_height",0)),inline:1},{plugin_url:b,some_custom_arg:"custom arg"})});a.addButton("example",{title:"example.desc",cmd:"mceExample",image:b+"/img/example.gif"});a.onNodeChange.add(function(d,c,e){c.setActive("example",e.nodeName=="IMG")})},createControl:function(b,a){return null},getInfo:function(){return{longname:"Example plugin",author:"Some author",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example",version:"1.0"}}});tinymce.PluginManager.add("example",tinymce.plugins.ExamplePlugin)})();
\ No newline at end of file
+(function(){tinymce.PluginManager.requireLangPack("example");tinymce.create("tinymce.plugins.ExamplePlugin",{init:function(a,b){a.addCommand("mceExample",function(){a.windowManager.open({file:b+"/dialog.htm",width:320+parseInt(a.getLang("example.delta_width",0)),height:120+parseInt(a.getLang("example.delta_height",0)),inline:1},{plugin_url:b,some_custom_arg:"custom arg"})});a.addButton("example",{title:"example.desc",cmd:"mceExample",image:b+"/img/example.gif"});a.onNodeChange.add(function(d,c,e){c.setActive("example",e.nodeName=="IMG")})},createControl:function(b,a){return null},getInfo:function(){return{longname:"Example plugin",author:"Some author",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example",version:"1.0"}}});tinymce.PluginManager.add("example",tinymce.plugins.ExamplePlugin)})();
diff --git a/js/tiny_mce/plugins/example/editor_plugin_src.js b/js/tiny_mce/plugins/example/editor_plugin_src.js
index 9a0e7da15dc..9961ced8a0c 100644
--- a/js/tiny_mce/plugins/example/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/example/editor_plugin_src.js
@@ -81,4 +81,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('example', tinymce.plugins.ExamplePlugin);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/example_dependency/editor_plugin.js b/js/tiny_mce/plugins/example_dependency/editor_plugin.js
index 0a4551d3807..639812c935b 100644
--- a/js/tiny_mce/plugins/example_dependency/editor_plugin.js
+++ b/js/tiny_mce/plugins/example_dependency/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.ExampleDependencyPlugin",{init:function(a,b){},getInfo:function(){return{longname:"Example Dependency plugin",author:"Some author",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example_dependency",version:"1.0"}}});tinymce.PluginManager.add("example_dependency",tinymce.plugins.ExampleDependencyPlugin,["example"])})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.ExampleDependencyPlugin",{init:function(a,b){},getInfo:function(){return{longname:"Example Dependency plugin",author:"Some author",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example_dependency",version:"1.0"}}});tinymce.PluginManager.add("example_dependency",tinymce.plugins.ExampleDependencyPlugin,["example"])})();
diff --git a/js/tiny_mce/plugins/fullpage/css/fullpage.css b/js/tiny_mce/plugins/fullpage/css/fullpage.css
index 2675cec155e..ba6c2c6bdb3 100644
--- a/js/tiny_mce/plugins/fullpage/css/fullpage.css
+++ b/js/tiny_mce/plugins/fullpage/css/fullpage.css
@@ -140,4 +140,4 @@ textarea {
 	height: 55px;
 }
 
-.panel_wrapper div.current {height:420px;}
\ No newline at end of file
+.panel_wrapper div.current {height:420px;}
diff --git a/js/tiny_mce/plugins/fullpage/editor_plugin.js b/js/tiny_mce/plugins/fullpage/editor_plugin.js
index dcf76024dda..8e4c11b431a 100644
--- a/js/tiny_mce/plugins/fullpage/editor_plugin.js
+++ b/js/tiny_mce/plugins/fullpage/editor_plugin.js
@@ -1 +1 @@
-(function(){var b=tinymce.each,a=tinymce.html.Node;tinymce.create("tinymce.plugins.FullPagePlugin",{init:function(c,d){var e=this;e.editor=c;c.addCommand("mceFullPageProperties",function(){c.windowManager.open({file:d+"/fullpage.htm",width:430+parseInt(c.getLang("fullpage.delta_width",0)),height:495+parseInt(c.getLang("fullpage.delta_height",0)),inline:1},{plugin_url:d,data:e._htmlToData()})});c.addButton("fullpage",{title:"fullpage.desc",cmd:"mceFullPageProperties"});c.onBeforeSetContent.add(e._setContent,e);c.onGetContent.add(e._getContent,e)},getInfo:function(){return{longname:"Fullpage",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullpage",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_htmlToData:function(){var f=this._parseHeader(),h={},c,i,g,e=this.editor;function d(l,j){var k=l.attr(j);return k||""}h.fontface=e.getParam("fullpage_default_fontface","");h.fontsize=e.getParam("fullpage_default_fontsize","");i=f.firstChild;if(i.type==7){h.xml_pi=true;g=/encoding="([^"]+)"/.exec(i.value);if(g){h.docencoding=g[1]}}i=f.getAll("#doctype")[0];if(i){h.doctype="<!DOCTYPE"+i.value+">"}i=f.getAll("title")[0];if(i&&i.firstChild){h.metatitle=i.firstChild.value}b(f.getAll("meta"),function(m){var k=m.attr("name"),j=m.attr("http-equiv"),l;if(k){h["meta"+k.toLowerCase()]=m.attr("content")}else{if(j=="Content-Type"){l=/charset\s*=\s*(.*)\s*/gi.exec(m.attr("content"));if(l){h.docencoding=l[1]}}}});i=f.getAll("html")[0];if(i){h.langcode=d(i,"lang")||d(i,"xml:lang")}i=f.getAll("link")[0];if(i&&i.attr("rel")=="stylesheet"){h.stylesheet=i.attr("href")}i=f.getAll("body")[0];if(i){h.langdir=d(i,"dir");h.style=d(i,"style");h.visited_color=d(i,"vlink");h.link_color=d(i,"link");h.active_color=d(i,"alink")}return h},_dataToHtml:function(g){var f,d,h,j,k,e=this.editor.dom;function c(n,l,m){n.attr(l,m?m:undefined)}function i(l){if(d.firstChild){d.insert(l,d.firstChild)}else{d.append(l)}}f=this._parseHeader();d=f.getAll("head")[0];if(!d){j=f.getAll("html")[0];d=new a("head",1);if(j.firstChild){j.insert(d,j.firstChild,true)}else{j.append(d)}}j=f.firstChild;if(g.xml_pi){k='version="1.0"';if(g.docencoding){k+=' encoding="'+g.docencoding+'"'}if(j.type!=7){j=new a("xml",7);f.insert(j,f.firstChild,true)}j.value=k}else{if(j&&j.type==7){j.remove()}}j=f.getAll("#doctype")[0];if(g.doctype){if(!j){j=new a("#doctype",10);if(g.xml_pi){f.insert(j,f.firstChild)}else{i(j)}}j.value=g.doctype.substring(9,g.doctype.length-1)}else{if(j){j.remove()}}j=f.getAll("title")[0];if(g.metatitle){if(!j){j=new a("title",1);j.append(new a("#text",3)).value=g.metatitle;i(j)}}if(g.docencoding){j=null;b(f.getAll("meta"),function(l){if(l.attr("http-equiv")=="Content-Type"){j=l}});if(!j){j=new a("meta",1);j.attr("http-equiv","Content-Type");j.shortEnded=true;i(j)}j.attr("content","text/html; charset="+g.docencoding)}b("keywords,description,author,copyright,robots".split(","),function(m){var l=f.getAll("meta"),n,p,o=g["meta"+m];for(n=0;n<l.length;n++){p=l[n];if(p.attr("name")==m){if(o){p.attr("content",o)}else{p.remove()}return}}if(o){j=new a("meta",1);j.attr("name",m);j.attr("content",o);j.shortEnded=true;i(j)}});j=f.getAll("link")[0];if(j&&j.attr("rel")=="stylesheet"){if(g.stylesheet){j.attr("href",g.stylesheet)}else{j.remove()}}else{if(g.stylesheet){j=new a("link",1);j.attr({rel:"stylesheet",text:"text/css",href:g.stylesheet});j.shortEnded=true;i(j)}}j=f.getAll("body")[0];if(j){c(j,"dir",g.langdir);c(j,"style",g.style);c(j,"vlink",g.visited_color);c(j,"link",g.link_color);c(j,"alink",g.active_color);e.setAttribs(this.editor.getBody(),{style:g.style,dir:g.dir,vLink:g.visited_color,link:g.link_color,aLink:g.active_color})}j=f.getAll("html")[0];if(j){c(j,"lang",g.langcode);c(j,"xml:lang",g.langcode)}h=new tinymce.html.Serializer({validate:false,indent:true,apply_source_formatting:true,indent_before:"head,html,body,meta,title,script,link,style",indent_after:"head,html,body,meta,title,script,link,style"}).serialize(f);this.head=h.substring(0,h.indexOf("</body>"))},_parseHeader:function(){return new tinymce.html.DomParser({validate:false,root_name:"#document"}).parse(this.head)},_setContent:function(g,d){var m=this,i,c,h=d.content,f,l="",e=m.editor.dom,j;function k(n){return n.replace(/<\/?[A-Z]+/g,function(o){return o.toLowerCase()})}if(d.format=="raw"&&m.head){return}if(d.source_view&&g.getParam("fullpage_hide_in_source_view")){return}h=h.replace(/<(\/?)BODY/gi,"<$1body");i=h.indexOf("<body");if(i!=-1){i=h.indexOf(">",i);m.head=k(h.substring(0,i+1));c=h.indexOf("</body",i);if(c==-1){c=h.length}d.content=h.substring(i+1,c);m.foot=k(h.substring(c))}else{m.head=this._getDefaultHeader();m.foot="\n</body>\n</html>"}f=m._parseHeader();b(f.getAll("style"),function(n){if(n.firstChild){l+=n.firstChild.value}});j=f.getAll("body")[0];if(j){e.setAttribs(m.editor.getBody(),{style:j.attr("style")||"",dir:j.attr("dir")||"",vLink:j.attr("vlink")||"",link:j.attr("link")||"",aLink:j.attr("alink")||""})}e.remove("fullpage_styles");if(l){e.add(m.editor.getDoc().getElementsByTagName("head")[0],"style",{id:"fullpage_styles"},l);j=e.get("fullpage_styles");if(j.styleSheet){j.styleSheet.cssText=l}}},_getDefaultHeader:function(){var f="",c=this.editor,e,d="";if(c.getParam("fullpage_default_xml_pi")){f+='<?xml version="1.0" encoding="'+c.getParam("fullpage_default_encoding","ISO-8859-1")+'" ?>\n'}f+=c.getParam("fullpage_default_doctype",'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');f+="\n<html>\n<head>\n";if(e=c.getParam("fullpage_default_title")){f+="<title>"+e+"</title>\n"}if(e=c.getParam("fullpage_default_encoding")){f+='<meta http-equiv="Content-Type" content="text/html; charset='+e+'" />\n'}if(e=c.getParam("fullpage_default_font_family")){d+="font-family: "+e+";"}if(e=c.getParam("fullpage_default_font_size")){d+="font-size: "+e+";"}if(e=c.getParam("fullpage_default_text_color")){d+="color: "+e+";"}f+="</head>\n<body"+(d?' style="'+d+'"':"")+">\n";return f},_getContent:function(d,e){var c=this;if(!e.source_view||!d.getParam("fullpage_hide_in_source_view")){e.content=tinymce.trim(c.head)+"\n"+tinymce.trim(e.content)+"\n"+tinymce.trim(c.foot)}}});tinymce.PluginManager.add("fullpage",tinymce.plugins.FullPagePlugin)})();
\ No newline at end of file
+(function(){var b=tinymce.each,a=tinymce.html.Node;tinymce.create("tinymce.plugins.FullPagePlugin",{init:function(c,d){var e=this;e.editor=c;c.addCommand("mceFullPageProperties",function(){c.windowManager.open({file:d+"/fullpage.htm",width:430+parseInt(c.getLang("fullpage.delta_width",0)),height:495+parseInt(c.getLang("fullpage.delta_height",0)),inline:1},{plugin_url:d,data:e._htmlToData()})});c.addButton("fullpage",{title:"fullpage.desc",cmd:"mceFullPageProperties"});c.onBeforeSetContent.add(e._setContent,e);c.onGetContent.add(e._getContent,e)},getInfo:function(){return{longname:"Fullpage",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullpage",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_htmlToData:function(){var f=this._parseHeader(),h={},c,i,g,e=this.editor;function d(l,j){var k=l.attr(j);return k||""}h.fontface=e.getParam("fullpage_default_fontface","");h.fontsize=e.getParam("fullpage_default_fontsize","");i=f.firstChild;if(i.type==7){h.xml_pi=true;g=/encoding="([^"]+)"/.exec(i.value);if(g){h.docencoding=g[1]}}i=f.getAll("#doctype")[0];if(i){h.doctype="<!DOCTYPE"+i.value+">"}i=f.getAll("title")[0];if(i&&i.firstChild){h.metatitle=i.firstChild.value}b(f.getAll("meta"),function(m){var k=m.attr("name"),j=m.attr("http-equiv"),l;if(k){h["meta"+k.toLowerCase()]=m.attr("content")}else{if(j=="Content-Type"){l=/charset\s*=\s*(.*)\s*/gi.exec(m.attr("content"));if(l){h.docencoding=l[1]}}}});i=f.getAll("html")[0];if(i){h.langcode=d(i,"lang")||d(i,"xml:lang")}i=f.getAll("link")[0];if(i&&i.attr("rel")=="stylesheet"){h.stylesheet=i.attr("href")}i=f.getAll("body")[0];if(i){h.langdir=d(i,"dir");h.style=d(i,"style");h.visited_color=d(i,"vlink");h.link_color=d(i,"link");h.active_color=d(i,"alink")}return h},_dataToHtml:function(g){var f,d,h,j,k,e=this.editor.dom;function c(n,l,m){n.attr(l,m?m:undefined)}function i(l){if(d.firstChild){d.insert(l,d.firstChild)}else{d.append(l)}}f=this._parseHeader();d=f.getAll("head")[0];if(!d){j=f.getAll("html")[0];d=new a("head",1);if(j.firstChild){j.insert(d,j.firstChild,true)}else{j.append(d)}}j=f.firstChild;if(g.xml_pi){k='version="1.0"';if(g.docencoding){k+=' encoding="'+g.docencoding+'"'}if(j.type!=7){j=new a("xml",7);f.insert(j,f.firstChild,true)}j.value=k}else{if(j&&j.type==7){j.remove()}}j=f.getAll("#doctype")[0];if(g.doctype){if(!j){j=new a("#doctype",10);if(g.xml_pi){f.insert(j,f.firstChild)}else{i(j)}}j.value=g.doctype.substring(9,g.doctype.length-1)}else{if(j){j.remove()}}j=f.getAll("title")[0];if(g.metatitle){if(!j){j=new a("title",1);j.append(new a("#text",3)).value=g.metatitle;i(j)}}if(g.docencoding){j=null;b(f.getAll("meta"),function(l){if(l.attr("http-equiv")=="Content-Type"){j=l}});if(!j){j=new a("meta",1);j.attr("http-equiv","Content-Type");j.shortEnded=true;i(j)}j.attr("content","text/html; charset="+g.docencoding)}b("keywords,description,author,copyright,robots".split(","),function(m){var l=f.getAll("meta"),n,p,o=g["meta"+m];for(n=0;n<l.length;n++){p=l[n];if(p.attr("name")==m){if(o){p.attr("content",o)}else{p.remove()}return}}if(o){j=new a("meta",1);j.attr("name",m);j.attr("content",o);j.shortEnded=true;i(j)}});j=f.getAll("link")[0];if(j&&j.attr("rel")=="stylesheet"){if(g.stylesheet){j.attr("href",g.stylesheet)}else{j.remove()}}else{if(g.stylesheet){j=new a("link",1);j.attr({rel:"stylesheet",text:"text/css",href:g.stylesheet});j.shortEnded=true;i(j)}}j=f.getAll("body")[0];if(j){c(j,"dir",g.langdir);c(j,"style",g.style);c(j,"vlink",g.visited_color);c(j,"link",g.link_color);c(j,"alink",g.active_color);e.setAttribs(this.editor.getBody(),{style:g.style,dir:g.dir,vLink:g.visited_color,link:g.link_color,aLink:g.active_color})}j=f.getAll("html")[0];if(j){c(j,"lang",g.langcode);c(j,"xml:lang",g.langcode)}h=new tinymce.html.Serializer({validate:false,indent:true,apply_source_formatting:true,indent_before:"head,html,body,meta,title,script,link,style",indent_after:"head,html,body,meta,title,script,link,style"}).serialize(f);this.head=h.substring(0,h.indexOf("</body>"))},_parseHeader:function(){return new tinymce.html.DomParser({validate:false,root_name:"#document"}).parse(this.head)},_setContent:function(g,d){var m=this,i,c,h=d.content,f,l="",e=m.editor.dom,j;function k(n){return n.replace(/<\/?[A-Z]+/g,function(o){return o.toLowerCase()})}if(d.format=="raw"&&m.head){return}if(d.source_view&&g.getParam("fullpage_hide_in_source_view")){return}h=h.replace(/<(\/?)BODY/gi,"<$1body");i=h.indexOf("<body");if(i!=-1){i=h.indexOf(">",i);m.head=k(h.substring(0,i+1));c=h.indexOf("</body",i);if(c==-1){c=h.length}d.content=h.substring(i+1,c);m.foot=k(h.substring(c))}else{m.head=this._getDefaultHeader();m.foot="\n</body>\n</html>"}f=m._parseHeader();b(f.getAll("style"),function(n){if(n.firstChild){l+=n.firstChild.value}});j=f.getAll("body")[0];if(j){e.setAttribs(m.editor.getBody(),{style:j.attr("style")||"",dir:j.attr("dir")||"",vLink:j.attr("vlink")||"",link:j.attr("link")||"",aLink:j.attr("alink")||""})}e.remove("fullpage_styles");if(l){e.add(m.editor.getDoc().getElementsByTagName("head")[0],"style",{id:"fullpage_styles"},l);j=e.get("fullpage_styles");if(j.styleSheet){j.styleSheet.cssText=l}}},_getDefaultHeader:function(){var f="",c=this.editor,e,d="";if(c.getParam("fullpage_default_xml_pi")){f+='<?xml version="1.0" encoding="'+c.getParam("fullpage_default_encoding","ISO-8859-1")+'" ?>\n'}f+=c.getParam("fullpage_default_doctype",'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');f+="\n<html>\n<head>\n";if(e=c.getParam("fullpage_default_title")){f+="<title>"+e+"</title>\n"}if(e=c.getParam("fullpage_default_encoding")){f+='<meta http-equiv="Content-Type" content="text/html; charset='+e+'" />\n'}if(e=c.getParam("fullpage_default_font_family")){d+="font-family: "+e+";"}if(e=c.getParam("fullpage_default_font_size")){d+="font-size: "+e+";"}if(e=c.getParam("fullpage_default_text_color")){d+="color: "+e+";"}f+="</head>\n<body"+(d?' style="'+d+'"':"")+">\n";return f},_getContent:function(d,e){var c=this;if(!e.source_view||!d.getParam("fullpage_hide_in_source_view")){e.content=tinymce.trim(c.head)+"\n"+tinymce.trim(e.content)+"\n"+tinymce.trim(c.foot)}}});tinymce.PluginManager.add("fullpage",tinymce.plugins.FullPagePlugin)})();
diff --git a/js/tiny_mce/plugins/fullpage/langs/en_dlg.js b/js/tiny_mce/plugins/fullpage/langs/en_dlg.js
index 516edc74fd4..990c79b5bd7 100644
--- a/js/tiny_mce/plugins/fullpage/langs/en_dlg.js
+++ b/js/tiny_mce/plugins/fullpage/langs/en_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.fullpage_dlg',{title:"Document Properties","meta_tab":"General","appearance_tab":"Appearance","advanced_tab":"Advanced","meta_props":"Meta Information",langprops:"Language and Encoding","meta_title":"Title","meta_keywords":"Keywords","meta_description":"Description","meta_robots":"Robots",doctypes:"Doctype",langcode:"Language Code",langdir:"Language Direction",ltr:"Left to Right",rtl:"Right to Left","xml_pi":"XML Declaration",encoding:"Character Encoding","appearance_bgprops":"Background Properties","appearance_marginprops":"Body Margins","appearance_linkprops":"Link Colors","appearance_textprops":"Text Properties",bgcolor:"Background Color",bgimage:"Background Image","left_margin":"Left Margin","right_margin":"Right Margin","top_margin":"Top Margin","bottom_margin":"Bottom Margin","text_color":"Text Color","font_size":"Font Size","font_face":"Font Face","link_color":"Link Color","hover_color":"Hover Color","visited_color":"Visited Color","active_color":"Active Color",textcolor:"Color",fontsize:"Font Size",fontface:"Font Family","meta_index_follow":"Index and Follow the Links","meta_index_nofollow":"Index and Don\'t Follow the Links","meta_noindex_follow":"Do Not Index but Follow the Links","meta_noindex_nofollow":"Do Not Index and Don\'t Follow the Links","appearance_style":"Stylesheet and Style Properties",stylesheet:"Stylesheet",style:"Style",author:"Author",copyright:"Copyright",add:"Add New Element",remove:"Remove Selected Element",moveup:"Move Selected Element Up",movedown:"Move Selected Element Down","head_elements":"Head Elements",info:"Information","add_title":"Title Element","add_meta":"Meta Element","add_script":"Script Element","add_style":"Style Element","add_link":"Link Element","add_base":"Base Element","add_comment":"Comment Node","title_element":"Title Element","script_element":"Script Element","style_element":"Style Element","base_element":"Base Element","link_element":"Link Element","meta_element":"Meta Element","comment_element":"Comment",src:"Source",language:"Language",href:"HREF",target:"Target",type:"Type",charset:"Charset",defer:"Defer",media:"Media",properties:"Properties",name:"Name",value:"Value",content:"Content",rel:"Rel",rev:"Rev",hreflang:"HREF Lang","general_props":"General","advanced_props":"Advanced"});
\ No newline at end of file
+tinyMCE.addI18n('en.fullpage_dlg',{title:"Document Properties","meta_tab":"General","appearance_tab":"Appearance","advanced_tab":"Advanced","meta_props":"Meta Information",langprops:"Language and Encoding","meta_title":"Title","meta_keywords":"Keywords","meta_description":"Description","meta_robots":"Robots",doctypes:"Doctype",langcode:"Language Code",langdir:"Language Direction",ltr:"Left to Right",rtl:"Right to Left","xml_pi":"XML Declaration",encoding:"Character Encoding","appearance_bgprops":"Background Properties","appearance_marginprops":"Body Margins","appearance_linkprops":"Link Colors","appearance_textprops":"Text Properties",bgcolor:"Background Color",bgimage:"Background Image","left_margin":"Left Margin","right_margin":"Right Margin","top_margin":"Top Margin","bottom_margin":"Bottom Margin","text_color":"Text Color","font_size":"Font Size","font_face":"Font Face","link_color":"Link Color","hover_color":"Hover Color","visited_color":"Visited Color","active_color":"Active Color",textcolor:"Color",fontsize:"Font Size",fontface:"Font Family","meta_index_follow":"Index and Follow the Links","meta_index_nofollow":"Index and Don\'t Follow the Links","meta_noindex_follow":"Do Not Index but Follow the Links","meta_noindex_nofollow":"Do Not Index and Don\'t Follow the Links","appearance_style":"Stylesheet and Style Properties",stylesheet:"Stylesheet",style:"Style",author:"Author",copyright:"Copyright",add:"Add New Element",remove:"Remove Selected Element",moveup:"Move Selected Element Up",movedown:"Move Selected Element Down","head_elements":"Head Elements",info:"Information","add_title":"Title Element","add_meta":"Meta Element","add_script":"Script Element","add_style":"Style Element","add_link":"Link Element","add_base":"Base Element","add_comment":"Comment Node","title_element":"Title Element","script_element":"Script Element","style_element":"Style Element","base_element":"Base Element","link_element":"Link Element","meta_element":"Meta Element","comment_element":"Comment",src:"Source",language:"Language",href:"HREF",target:"Target",type:"Type",charset:"Charset",defer:"Defer",media:"Media",properties:"Properties",name:"Name",value:"Value",content:"Content",rel:"Rel",rev:"Rev",hreflang:"HREF Lang","general_props":"General","advanced_props":"Advanced"});
diff --git a/js/tiny_mce/plugins/fullscreen/editor_plugin.js b/js/tiny_mce/plugins/fullscreen/editor_plugin.js
index a6456f89dd8..8e62bb92e88 100644
--- a/js/tiny_mce/plugins/fullscreen/editor_plugin.js
+++ b/js/tiny_mce/plugins/fullscreen/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(d,e){var f=this,g={},c,b;f.editor=d;d.addCommand("mceFullScreen",function(){var i,j=a.doc.documentElement;if(d.getParam("fullscreen_is_enabled")){if(d.getParam("fullscreen_new_window")){closeFullscreen()}else{a.win.setTimeout(function(){tinymce.dom.Event.remove(a.win,"resize",f.resizeFunc);tinyMCE.get(d.getParam("fullscreen_editor_id")).setContent(d.getContent());tinyMCE.remove(d);a.remove("mce_fullscreen_container");j.style.overflow=d.getParam("fullscreen_html_overflow");a.setStyle(a.doc.body,"overflow",d.getParam("fullscreen_overflow"));a.win.scrollTo(d.getParam("fullscreen_scrollx"),d.getParam("fullscreen_scrolly"));tinyMCE.settings=tinyMCE.oldSettings},10)}return}if(d.getParam("fullscreen_new_window")){i=a.win.open(e+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{i.resizeTo(screen.availWidth,screen.availHeight)}catch(h){}}else{tinyMCE.oldSettings=tinyMCE.settings;g.fullscreen_overflow=a.getStyle(a.doc.body,"overflow",1)||"auto";g.fullscreen_html_overflow=a.getStyle(j,"overflow",1);c=a.getViewPort();g.fullscreen_scrollx=c.x;g.fullscreen_scrolly=c.y;if(tinymce.isOpera&&g.fullscreen_overflow=="visible"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&g.fullscreen_overflow=="scroll"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&(g.fullscreen_html_overflow=="visible"||g.fullscreen_html_overflow=="scroll")){g.fullscreen_html_overflow="auto"}if(g.fullscreen_overflow=="0px"){g.fullscreen_overflow=""}a.setStyle(a.doc.body,"overflow","hidden");j.style.overflow="hidden";c=a.getViewPort();a.win.scrollTo(0,0);if(tinymce.isIE){c.h-=1}if(tinymce.isIE6){b="absolute;top:"+c.y}else{b="fixed;top:0"}n=a.add(a.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+b+";left:0;width:"+c.w+"px;height:"+c.h+"px;z-index:200000;"});a.add(n,"div",{id:"mce_fullscreen"});tinymce.each(d.settings,function(k,l){g[l]=k});g.id="mce_fullscreen";g.width=n.clientWidth;g.height=n.clientHeight-15;g.fullscreen_is_enabled=true;g.fullscreen_editor_id=d.id;g.theme_advanced_resizing=false;g.save_onsavecallback=function(){d.setContent(tinyMCE.get(g.id).getContent());d.execCommand("mceSave")};tinymce.each(d.getParam("fullscreen_settings"),function(m,l){g[l]=m});if(g.theme_advanced_toolbar_location==="external"){g.theme_advanced_toolbar_location="top"}f.fullscreenEditor=new tinymce.Editor("mce_fullscreen",g);f.fullscreenEditor.onInit.add(function(){f.fullscreenEditor.setContent(d.getContent());f.fullscreenEditor.focus()});f.fullscreenEditor.render();f.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");f.fullscreenElement.update();f.resizeFunc=tinymce.dom.Event.add(a.win,"resize",function(){var o=tinymce.DOM.getViewPort(),l=f.fullscreenEditor,k,m;k=l.dom.getSize(l.getContainer().firstChild);m=l.dom.getSize(l.getContainer().getElementsByTagName("iframe")[0]);l.theme.resizeTo(o.w-k.w+m.w,o.h-k.h+m.h)})}});d.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});d.onNodeChange.add(function(i,h){h.setActive("fullscreen",i.getParam("fullscreen_is_enabled"))})},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();
\ No newline at end of file
+(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(d,e){var f=this,g={},c,b;f.editor=d;d.addCommand("mceFullScreen",function(){var i,j=a.doc.documentElement;if(d.getParam("fullscreen_is_enabled")){if(d.getParam("fullscreen_new_window")){closeFullscreen()}else{a.win.setTimeout(function(){tinymce.dom.Event.remove(a.win,"resize",f.resizeFunc);tinyMCE.get(d.getParam("fullscreen_editor_id")).setContent(d.getContent());tinyMCE.remove(d);a.remove("mce_fullscreen_container");j.style.overflow=d.getParam("fullscreen_html_overflow");a.setStyle(a.doc.body,"overflow",d.getParam("fullscreen_overflow"));a.win.scrollTo(d.getParam("fullscreen_scrollx"),d.getParam("fullscreen_scrolly"));tinyMCE.settings=tinyMCE.oldSettings},10)}return}if(d.getParam("fullscreen_new_window")){i=a.win.open(e+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{i.resizeTo(screen.availWidth,screen.availHeight)}catch(h){}}else{tinyMCE.oldSettings=tinyMCE.settings;g.fullscreen_overflow=a.getStyle(a.doc.body,"overflow",1)||"auto";g.fullscreen_html_overflow=a.getStyle(j,"overflow",1);c=a.getViewPort();g.fullscreen_scrollx=c.x;g.fullscreen_scrolly=c.y;if(tinymce.isOpera&&g.fullscreen_overflow=="visible"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&g.fullscreen_overflow=="scroll"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&(g.fullscreen_html_overflow=="visible"||g.fullscreen_html_overflow=="scroll")){g.fullscreen_html_overflow="auto"}if(g.fullscreen_overflow=="0px"){g.fullscreen_overflow=""}a.setStyle(a.doc.body,"overflow","hidden");j.style.overflow="hidden";c=a.getViewPort();a.win.scrollTo(0,0);if(tinymce.isIE){c.h-=1}if(tinymce.isIE6){b="absolute;top:"+c.y}else{b="fixed;top:0"}n=a.add(a.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+b+";left:0;width:"+c.w+"px;height:"+c.h+"px;z-index:200000;"});a.add(n,"div",{id:"mce_fullscreen"});tinymce.each(d.settings,function(k,l){g[l]=k});g.id="mce_fullscreen";g.width=n.clientWidth;g.height=n.clientHeight-15;g.fullscreen_is_enabled=true;g.fullscreen_editor_id=d.id;g.theme_advanced_resizing=false;g.save_onsavecallback=function(){d.setContent(tinyMCE.get(g.id).getContent());d.execCommand("mceSave")};tinymce.each(d.getParam("fullscreen_settings"),function(m,l){g[l]=m});if(g.theme_advanced_toolbar_location==="external"){g.theme_advanced_toolbar_location="top"}f.fullscreenEditor=new tinymce.Editor("mce_fullscreen",g);f.fullscreenEditor.onInit.add(function(){f.fullscreenEditor.setContent(d.getContent());f.fullscreenEditor.focus()});f.fullscreenEditor.render();f.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");f.fullscreenElement.update();f.resizeFunc=tinymce.dom.Event.add(a.win,"resize",function(){var o=tinymce.DOM.getViewPort(),l=f.fullscreenEditor,k,m;k=l.dom.getSize(l.getContainer().firstChild);m=l.dom.getSize(l.getContainer().getElementsByTagName("iframe")[0]);l.theme.resizeTo(o.w-k.w+m.w,o.h-k.h+m.h)})}});d.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});d.onNodeChange.add(function(i,h){h.setActive("fullscreen",i.getParam("fullscreen_is_enabled"))})},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();
diff --git a/js/tiny_mce/plugins/fullscreen/editor_plugin_src.js b/js/tiny_mce/plugins/fullscreen/editor_plugin_src.js
index afa4f9b46eb..c070170080b 100644
--- a/js/tiny_mce/plugins/fullscreen/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/fullscreen/editor_plugin_src.js
@@ -156,4 +156,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('fullscreen', tinymce.plugins.FullScreenPlugin);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/iespell/editor_plugin.js b/js/tiny_mce/plugins/iespell/editor_plugin.js
index e9cba106c60..90ed7f8b35e 100644
--- a/js/tiny_mce/plugins/iespell/editor_plugin.js
+++ b/js/tiny_mce/plugins/iespell/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.IESpell",{init:function(a,b){var c=this,d;if(!tinymce.isIE){return}c.editor=a;a.addCommand("mceIESpell",function(){try{d=new ActiveXObject("ieSpell.ieSpellExtension");d.CheckDocumentNode(a.getDoc().documentElement)}catch(f){if(f.number==-2146827859){a.windowManager.confirm(a.getLang("iespell.download"),function(e){if(e){window.open("http://www.iespell.com/download.php","ieSpellDownload","")}})}else{a.windowManager.alert("Error Loading ieSpell: Exception "+f.number)}}});a.addButton("iespell",{title:"iespell.iespell_desc",cmd:"mceIESpell"})},getInfo:function(){return{longname:"IESpell (IE Only)",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/iespell",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("iespell",tinymce.plugins.IESpell)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.IESpell",{init:function(a,b){var c=this,d;if(!tinymce.isIE){return}c.editor=a;a.addCommand("mceIESpell",function(){try{d=new ActiveXObject("ieSpell.ieSpellExtension");d.CheckDocumentNode(a.getDoc().documentElement)}catch(f){if(f.number==-2146827859){a.windowManager.confirm(a.getLang("iespell.download"),function(e){if(e){window.open("http://www.iespell.com/download.php","ieSpellDownload","")}})}else{a.windowManager.alert("Error Loading ieSpell: Exception "+f.number)}}});a.addButton("iespell",{title:"iespell.iespell_desc",cmd:"mceIESpell"})},getInfo:function(){return{longname:"IESpell (IE Only)",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/iespell",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("iespell",tinymce.plugins.IESpell)})();
diff --git a/js/tiny_mce/plugins/iespell/editor_plugin_src.js b/js/tiny_mce/plugins/iespell/editor_plugin_src.js
index 1b2bb984609..5ded5f2d93c 100644
--- a/js/tiny_mce/plugins/iespell/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/iespell/editor_plugin_src.js
@@ -51,4 +51,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('iespell', tinymce.plugins.IESpell);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/inlinepopups/editor_plugin.js b/js/tiny_mce/plugins/inlinepopups/editor_plugin.js
index 8bb96f9cbec..9bba91fc9f8 100644
--- a/js/tiny_mce/plugins/inlinepopups/editor_plugin.js
+++ b/js/tiny_mce/plugins/inlinepopups/editor_plugin.js
@@ -1 +1 @@
-(function(){var d=tinymce.DOM,b=tinymce.dom.Element,a=tinymce.dom.Event,e=tinymce.each,c=tinymce.is;tinymce.create("tinymce.plugins.InlinePopups",{init:function(f,g){f.onBeforeRenderUI.add(function(){f.windowManager=new tinymce.InlineWindowManager(f);d.loadCSS(g+"/skins/"+(f.settings.inlinepopups_skin||"clearlooks2")+"/window.css")})},getInfo:function(){return{longname:"InlinePopups",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.create("tinymce.InlineWindowManager:tinymce.WindowManager",{InlineWindowManager:function(f){var g=this;g.parent(f);g.zIndex=300000;g.count=0;g.windows={}},open:function(s,j){var z=this,i,k="",r=z.editor,g=0,v=0,h,m,o,q,l,x,y,n;s=s||{};j=j||{};if(!s.inline){return z.parent(s,j)}n=z._frontWindow();if(n&&d.get(n.id+"_ifr")){n.focussedElement=d.get(n.id+"_ifr").contentWindow.document.activeElement}if(!s.type){z.bookmark=r.selection.getBookmark(1)}i=d.uniqueId();h=d.getViewPort();s.width=parseInt(s.width||320);s.height=parseInt(s.height||240)+(tinymce.isIE?8:0);s.min_width=parseInt(s.min_width||150);s.min_height=parseInt(s.min_height||100);s.max_width=parseInt(s.max_width||2000);s.max_height=parseInt(s.max_height||2000);s.left=s.left||Math.round(Math.max(h.x,h.x+(h.w/2)-(s.width/2)));s.top=s.top||Math.round(Math.max(h.y,h.y+(h.h/2)-(s.height/2)));s.movable=s.resizable=true;j.mce_width=s.width;j.mce_height=s.height;j.mce_inline=true;j.mce_window_id=i;j.mce_auto_focus=s.auto_focus;z.features=s;z.params=j;z.onOpen.dispatch(z,s,j);if(s.type){k+=" mceModal";if(s.type){k+=" mce"+s.type.substring(0,1).toUpperCase()+s.type.substring(1)}s.resizable=false}if(s.statusbar){k+=" mceStatusbar"}if(s.resizable){k+=" mceResizable"}if(s.minimizable){k+=" mceMinimizable"}if(s.maximizable){k+=" mceMaximizable"}if(s.movable){k+=" mceMovable"}z._addAll(d.doc.body,["div",{id:i,role:"dialog","aria-labelledby":s.type?i+"_content":i+"_title","class":(r.settings.inlinepopups_skin||"clearlooks2")+(tinymce.isIE&&window.getSelection?" ie9":""),style:"width:100px;height:100px"},["div",{id:i+"_wrapper","class":"mceWrapper"+k},["div",{id:i+"_top","class":"mceTop"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_title"},s.title||""]],["div",{id:i+"_middle","class":"mceMiddle"},["div",{id:i+"_left","class":"mceLeft",tabindex:"0"}],["span",{id:i+"_content"}],["div",{id:i+"_right","class":"mceRight",tabindex:"0"}]],["div",{id:i+"_bottom","class":"mceBottom"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_status"},"Content"]],["a",{"class":"mceMove",tabindex:"-1",href:"javascript:;"}],["a",{"class":"mceMin",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMax",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMed",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceClose",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{id:i+"_resize_n","class":"mceResize mceResizeN",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_s","class":"mceResize mceResizeS",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_w","class":"mceResize mceResizeW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_e","class":"mceResize mceResizeE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_nw","class":"mceResize mceResizeNW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_ne","class":"mceResize mceResizeNE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_sw","class":"mceResize mceResizeSW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_se","class":"mceResize mceResizeSE",tabindex:"-1",href:"javascript:;"}]]]);d.setStyles(i,{top:-10000,left:-10000});if(tinymce.isGecko){d.setStyle(i,"overflow","auto")}if(!s.type){g+=d.get(i+"_left").clientWidth;g+=d.get(i+"_right").clientWidth;v+=d.get(i+"_top").clientHeight;v+=d.get(i+"_bottom").clientHeight}d.setStyles(i,{top:s.top,left:s.left,width:s.width+g,height:s.height+v});y=s.url||s.file;if(y){if(tinymce.relaxedDomain){y+=(y.indexOf("?")==-1?"?":"&")+"mce_rdomain="+tinymce.relaxedDomain}y=tinymce._addVer(y)}if(!s.type){d.add(i+"_content","iframe",{id:i+"_ifr",src:'javascript:""',frameBorder:0,style:"border:0;width:10px;height:10px"});d.setStyles(i+"_ifr",{width:s.width,height:s.height});d.setAttrib(i+"_ifr","src",y)}else{d.add(i+"_wrapper","a",{id:i+"_ok","class":"mceButton mceOk",href:"javascript:;",onmousedown:"return false;"},"Ok");if(s.type=="confirm"){d.add(i+"_wrapper","a",{"class":"mceButton mceCancel",href:"javascript:;",onmousedown:"return false;"},"Cancel")}d.add(i+"_middle","div",{"class":"mceIcon"});d.setHTML(i+"_content",s.content.replace("\n","<br />"));a.add(i,"keyup",function(f){var p=27;if(f.keyCode===p){s.button_func(false);return a.cancel(f)}});a.add(i,"keydown",function(f){var t,p=9;if(f.keyCode===p){t=d.select("a.mceCancel",i+"_wrapper")[0];if(t&&t!==f.target){t.focus()}else{d.get(i+"_ok").focus()}return a.cancel(f)}})}o=a.add(i,"mousedown",function(t){var u=t.target,f,p;f=z.windows[i];z.focus(i);if(u.nodeName=="A"||u.nodeName=="a"){if(u.className=="mceClose"){z.close(null,i);return a.cancel(t)}else{if(u.className=="mceMax"){f.oldPos=f.element.getXY();f.oldSize=f.element.getSize();p=d.getViewPort();p.w-=2;p.h-=2;f.element.moveTo(p.x,p.y);f.element.resizeTo(p.w,p.h);d.setStyles(i+"_ifr",{width:p.w-f.deltaWidth,height:p.h-f.deltaHeight});d.addClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMed"){f.element.moveTo(f.oldPos.x,f.oldPos.y);f.element.resizeTo(f.oldSize.w,f.oldSize.h);f.iframeElement.resizeTo(f.oldSize.w-f.deltaWidth,f.oldSize.h-f.deltaHeight);d.removeClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMove"){return z._startDrag(i,t,u.className)}else{if(d.hasClass(u,"mceResize")){return z._startDrag(i,t,u.className.substring(13))}}}}}}});q=a.add(i,"click",function(f){var p=f.target;z.focus(i);if(p.nodeName=="A"||p.nodeName=="a"){switch(p.className){case"mceClose":z.close(null,i);return a.cancel(f);case"mceButton mceOk":case"mceButton mceCancel":s.button_func(p.className=="mceButton mceOk");return a.cancel(f)}}});a.add([i+"_left",i+"_right"],"focus",function(p){var t=d.get(i+"_ifr");if(t){var f=t.contentWindow.document.body;var u=d.select(":input:enabled,*[tabindex=0]",f);if(p.target.id===(i+"_left")){u[u.length-1].focus()}else{u[0].focus()}}else{d.get(i+"_ok").focus()}});x=z.windows[i]={id:i,mousedown_func:o,click_func:q,element:new b(i,{blocker:1,container:r.getContainer()}),iframeElement:new b(i+"_ifr"),features:s,deltaWidth:g,deltaHeight:v};x.iframeElement.on("focus",function(){z.focus(i)});if(z.count==0&&z.editor.getParam("dialog_type","modal")=="modal"){d.add(d.doc.body,"div",{id:"mceModalBlocker","class":(z.editor.settings.inlinepopups_skin||"clearlooks2")+"_modalBlocker",style:{zIndex:z.zIndex-1}});d.show("mceModalBlocker");d.setAttrib(d.doc.body,"aria-hidden","true")}else{d.setStyle("mceModalBlocker","z-index",z.zIndex-1)}if(tinymce.isIE6||/Firefox\/2\./.test(navigator.userAgent)||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceModalBlocker",{position:"absolute",left:h.x,top:h.y,width:h.w-2,height:h.h-2})}d.setAttrib(i,"aria-hidden","false");z.focus(i);z._fixIELayout(i,1);if(d.get(i+"_ok")){d.get(i+"_ok").focus()}z.count++;return x},focus:function(h){var g=this,f;if(f=g.windows[h]){f.zIndex=this.zIndex++;f.element.setStyle("zIndex",f.zIndex);f.element.update();h=h+"_wrapper";d.removeClass(g.lastId,"mceFocus");d.addClass(h,"mceFocus");g.lastId=h;if(f.focussedElement){f.focussedElement.focus()}else{if(d.get(h+"_ok")){d.get(f.id+"_ok").focus()}else{if(d.get(f.id+"_ifr")){d.get(f.id+"_ifr").focus()}}}}},_addAll:function(k,h){var g,l,f=this,j=tinymce.DOM;if(c(h,"string")){k.appendChild(j.doc.createTextNode(h))}else{if(h.length){k=k.appendChild(j.create(h[0],h[1]));for(g=2;g<h.length;g++){f._addAll(k,h[g])}}}},_startDrag:function(v,G,E){var o=this,u,z,C=d.doc,f,l=o.windows[v],h=l.element,y=h.getXY(),x,q,F,g,A,s,r,j,i,m,k,n,B;g={x:0,y:0};A=d.getViewPort();A.w-=2;A.h-=2;j=G.screenX;i=G.screenY;m=k=n=B=0;u=a.add(C,"mouseup",function(p){a.remove(C,"mouseup",u);a.remove(C,"mousemove",z);if(f){f.remove()}h.moveBy(m,k);h.resizeBy(n,B);q=h.getSize();d.setStyles(v+"_ifr",{width:q.w-l.deltaWidth,height:q.h-l.deltaHeight});o._fixIELayout(v,1);return a.cancel(p)});if(E!="Move"){D()}function D(){if(f){return}o._fixIELayout(v,0);d.add(C.body,"div",{id:"mceEventBlocker","class":"mceEventBlocker "+(o.editor.settings.inlinepopups_skin||"clearlooks2"),style:{zIndex:o.zIndex+1}});if(tinymce.isIE6||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceEventBlocker",{position:"absolute",left:A.x,top:A.y,width:A.w-2,height:A.h-2})}f=new b("mceEventBlocker");f.update();x=h.getXY();q=h.getSize();s=g.x+x.x-A.x;r=g.y+x.y-A.y;d.add(f.get(),"div",{id:"mcePlaceHolder","class":"mcePlaceHolder",style:{left:s,top:r,width:q.w,height:q.h}});F=new b("mcePlaceHolder")}z=a.add(C,"mousemove",function(w){var p,H,t;D();p=w.screenX-j;H=w.screenY-i;switch(E){case"ResizeW":m=p;n=0-p;break;case"ResizeE":n=p;break;case"ResizeN":case"ResizeNW":case"ResizeNE":if(E=="ResizeNW"){m=p;n=0-p}else{if(E=="ResizeNE"){n=p}}k=H;B=0-H;break;case"ResizeS":case"ResizeSW":case"ResizeSE":if(E=="ResizeSW"){m=p;n=0-p}else{if(E=="ResizeSE"){n=p}}B=H;break;case"mceMove":m=p;k=H;break}if(n<(t=l.features.min_width-q.w)){if(m!==0){m+=n-t}n=t}if(B<(t=l.features.min_height-q.h)){if(k!==0){k+=B-t}B=t}n=Math.min(n,l.features.max_width-q.w);B=Math.min(B,l.features.max_height-q.h);m=Math.max(m,A.x-(s+A.x));k=Math.max(k,A.y-(r+A.y));m=Math.min(m,(A.w+A.x)-(s+q.w+A.x));k=Math.min(k,(A.h+A.y)-(r+q.h+A.y));if(m+k!==0){if(s+m<0){m=0}if(r+k<0){k=0}F.moveTo(s+m,r+k)}if(n+B!==0){F.resizeTo(q.w+n,q.h+B)}return a.cancel(w)});return a.cancel(G)},resizeBy:function(g,h,i){var f=this.windows[i];if(f){f.element.resizeBy(g,h);f.iframeElement.resizeBy(g,h)}},close:function(i,k){var g=this,f,j=d.doc,h,k;k=g._findId(k||i);if(!g.windows[k]){g.parent(i);return}g.count--;if(g.count==0){d.remove("mceModalBlocker");d.setAttrib(d.doc.body,"aria-hidden","false");g.editor.focus()}if(f=g.windows[k]){g.onClose.dispatch(g);a.remove(j,"mousedown",f.mousedownFunc);a.remove(j,"click",f.clickFunc);a.clear(k);a.clear(k+"_ifr");d.setAttrib(k+"_ifr","src",'javascript:""');f.element.remove();delete g.windows[k];h=g._frontWindow();if(h){g.focus(h.id)}}},_frontWindow:function(){var g,f=0;e(this.windows,function(h){if(h.zIndex>f){g=h;f=h.zIndex}});return g},setTitle:function(f,g){var h;f=this._findId(f);if(h=d.get(f+"_title")){h.innerHTML=d.encode(g)}},alert:function(g,f,j){var i=this,h;h=i.open({title:i,type:"alert",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},confirm:function(g,f,j){var i=this,h;h=i.open({title:i,type:"confirm",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},_findId:function(f){var g=this;if(typeof(f)=="string"){return f}e(g.windows,function(h){var i=d.get(h.id+"_ifr");if(i&&f==i.contentWindow){f=h.id;return false}});return f},_fixIELayout:function(i,h){var f,g;if(!tinymce.isIE6){return}e(["n","s","w","e","nw","ne","sw","se"],function(j){var k=d.get(i+"_resize_"+j);d.setStyles(k,{width:h?k.clientWidth:"",height:h?k.clientHeight:"",cursor:d.getStyle(k,"cursor",1)});d.setStyle(i+"_bottom","bottom","-1px");k=0});if(f=this.windows[i]){f.element.hide();f.element.show();e(d.select("div,a",i),function(k,j){if(k.currentStyle.backgroundImage!="none"){g=new Image();g.src=k.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/,"$1")}});d.get(i).style.filter=""}}});tinymce.PluginManager.add("inlinepopups",tinymce.plugins.InlinePopups)})();
\ No newline at end of file
+(function(){var d=tinymce.DOM,b=tinymce.dom.Element,a=tinymce.dom.Event,e=tinymce.each,c=tinymce.is;tinymce.create("tinymce.plugins.InlinePopups",{init:function(f,g){f.onBeforeRenderUI.add(function(){f.windowManager=new tinymce.InlineWindowManager(f);d.loadCSS(g+"/skins/"+(f.settings.inlinepopups_skin||"clearlooks2")+"/window.css")})},getInfo:function(){return{longname:"InlinePopups",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.create("tinymce.InlineWindowManager:tinymce.WindowManager",{InlineWindowManager:function(f){var g=this;g.parent(f);g.zIndex=300000;g.count=0;g.windows={}},open:function(s,j){var z=this,i,k="",r=z.editor,g=0,v=0,h,m,o,q,l,x,y,n;s=s||{};j=j||{};if(!s.inline){return z.parent(s,j)}n=z._frontWindow();if(n&&d.get(n.id+"_ifr")){n.focussedElement=d.get(n.id+"_ifr").contentWindow.document.activeElement}if(!s.type){z.bookmark=r.selection.getBookmark(1)}i=d.uniqueId();h=d.getViewPort();s.width=parseInt(s.width||320);s.height=parseInt(s.height||240)+(tinymce.isIE?8:0);s.min_width=parseInt(s.min_width||150);s.min_height=parseInt(s.min_height||100);s.max_width=parseInt(s.max_width||2000);s.max_height=parseInt(s.max_height||2000);s.left=s.left||Math.round(Math.max(h.x,h.x+(h.w/2)-(s.width/2)));s.top=s.top||Math.round(Math.max(h.y,h.y+(h.h/2)-(s.height/2)));s.movable=s.resizable=true;j.mce_width=s.width;j.mce_height=s.height;j.mce_inline=true;j.mce_window_id=i;j.mce_auto_focus=s.auto_focus;z.features=s;z.params=j;z.onOpen.dispatch(z,s,j);if(s.type){k+=" mceModal";if(s.type){k+=" mce"+s.type.substring(0,1).toUpperCase()+s.type.substring(1)}s.resizable=false}if(s.statusbar){k+=" mceStatusbar"}if(s.resizable){k+=" mceResizable"}if(s.minimizable){k+=" mceMinimizable"}if(s.maximizable){k+=" mceMaximizable"}if(s.movable){k+=" mceMovable"}z._addAll(d.doc.body,["div",{id:i,role:"dialog","aria-labelledby":s.type?i+"_content":i+"_title","class":(r.settings.inlinepopups_skin||"clearlooks2")+(tinymce.isIE&&window.getSelection?" ie9":""),style:"width:100px;height:100px"},["div",{id:i+"_wrapper","class":"mceWrapper"+k},["div",{id:i+"_top","class":"mceTop"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_title"},s.title||""]],["div",{id:i+"_middle","class":"mceMiddle"},["div",{id:i+"_left","class":"mceLeft",tabindex:"0"}],["span",{id:i+"_content"}],["div",{id:i+"_right","class":"mceRight",tabindex:"0"}]],["div",{id:i+"_bottom","class":"mceBottom"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_status"},"Content"]],["a",{"class":"mceMove",tabindex:"-1",href:"javascript:;"}],["a",{"class":"mceMin",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMax",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMed",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceClose",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{id:i+"_resize_n","class":"mceResize mceResizeN",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_s","class":"mceResize mceResizeS",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_w","class":"mceResize mceResizeW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_e","class":"mceResize mceResizeE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_nw","class":"mceResize mceResizeNW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_ne","class":"mceResize mceResizeNE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_sw","class":"mceResize mceResizeSW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_se","class":"mceResize mceResizeSE",tabindex:"-1",href:"javascript:;"}]]]);d.setStyles(i,{top:-10000,left:-10000});if(tinymce.isGecko){d.setStyle(i,"overflow","auto")}if(!s.type){g+=d.get(i+"_left").clientWidth;g+=d.get(i+"_right").clientWidth;v+=d.get(i+"_top").clientHeight;v+=d.get(i+"_bottom").clientHeight}d.setStyles(i,{top:s.top,left:s.left,width:s.width+g,height:s.height+v});y=s.url||s.file;if(y){if(tinymce.relaxedDomain){y+=(y.indexOf("?")==-1?"?":"&")+"mce_rdomain="+tinymce.relaxedDomain}y=tinymce._addVer(y)}if(!s.type){d.add(i+"_content","iframe",{id:i+"_ifr",src:'javascript:""',frameBorder:0,style:"border:0;width:10px;height:10px"});d.setStyles(i+"_ifr",{width:s.width,height:s.height});d.setAttrib(i+"_ifr","src",y)}else{d.add(i+"_wrapper","a",{id:i+"_ok","class":"mceButton mceOk",href:"javascript:;",onmousedown:"return false;"},"Ok");if(s.type=="confirm"){d.add(i+"_wrapper","a",{"class":"mceButton mceCancel",href:"javascript:;",onmousedown:"return false;"},"Cancel")}d.add(i+"_middle","div",{"class":"mceIcon"});d.setHTML(i+"_content",s.content.replace("\n","<br />"));a.add(i,"keyup",function(f){var p=27;if(f.keyCode===p){s.button_func(false);return a.cancel(f)}});a.add(i,"keydown",function(f){var t,p=9;if(f.keyCode===p){t=d.select("a.mceCancel",i+"_wrapper")[0];if(t&&t!==f.target){t.focus()}else{d.get(i+"_ok").focus()}return a.cancel(f)}})}o=a.add(i,"mousedown",function(t){var u=t.target,f,p;f=z.windows[i];z.focus(i);if(u.nodeName=="A"||u.nodeName=="a"){if(u.className=="mceClose"){z.close(null,i);return a.cancel(t)}else{if(u.className=="mceMax"){f.oldPos=f.element.getXY();f.oldSize=f.element.getSize();p=d.getViewPort();p.w-=2;p.h-=2;f.element.moveTo(p.x,p.y);f.element.resizeTo(p.w,p.h);d.setStyles(i+"_ifr",{width:p.w-f.deltaWidth,height:p.h-f.deltaHeight});d.addClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMed"){f.element.moveTo(f.oldPos.x,f.oldPos.y);f.element.resizeTo(f.oldSize.w,f.oldSize.h);f.iframeElement.resizeTo(f.oldSize.w-f.deltaWidth,f.oldSize.h-f.deltaHeight);d.removeClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMove"){return z._startDrag(i,t,u.className)}else{if(d.hasClass(u,"mceResize")){return z._startDrag(i,t,u.className.substring(13))}}}}}}});q=a.add(i,"click",function(f){var p=f.target;z.focus(i);if(p.nodeName=="A"||p.nodeName=="a"){switch(p.className){case"mceClose":z.close(null,i);return a.cancel(f);case"mceButton mceOk":case"mceButton mceCancel":s.button_func(p.className=="mceButton mceOk");return a.cancel(f)}}});a.add([i+"_left",i+"_right"],"focus",function(p){var t=d.get(i+"_ifr");if(t){var f=t.contentWindow.document.body;var u=d.select(":input:enabled,*[tabindex=0]",f);if(p.target.id===(i+"_left")){u[u.length-1].focus()}else{u[0].focus()}}else{d.get(i+"_ok").focus()}});x=z.windows[i]={id:i,mousedown_func:o,click_func:q,element:new b(i,{blocker:1,container:r.getContainer()}),iframeElement:new b(i+"_ifr"),features:s,deltaWidth:g,deltaHeight:v};x.iframeElement.on("focus",function(){z.focus(i)});if(z.count==0&&z.editor.getParam("dialog_type","modal")=="modal"){d.add(d.doc.body,"div",{id:"mceModalBlocker","class":(z.editor.settings.inlinepopups_skin||"clearlooks2")+"_modalBlocker",style:{zIndex:z.zIndex-1}});d.show("mceModalBlocker");d.setAttrib(d.doc.body,"aria-hidden","true")}else{d.setStyle("mceModalBlocker","z-index",z.zIndex-1)}if(tinymce.isIE6||/Firefox\/2\./.test(navigator.userAgent)||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceModalBlocker",{position:"absolute",left:h.x,top:h.y,width:h.w-2,height:h.h-2})}d.setAttrib(i,"aria-hidden","false");z.focus(i);z._fixIELayout(i,1);if(d.get(i+"_ok")){d.get(i+"_ok").focus()}z.count++;return x},focus:function(h){var g=this,f;if(f=g.windows[h]){f.zIndex=this.zIndex++;f.element.setStyle("zIndex",f.zIndex);f.element.update();h=h+"_wrapper";d.removeClass(g.lastId,"mceFocus");d.addClass(h,"mceFocus");g.lastId=h;if(f.focussedElement){f.focussedElement.focus()}else{if(d.get(h+"_ok")){d.get(f.id+"_ok").focus()}else{if(d.get(f.id+"_ifr")){d.get(f.id+"_ifr").focus()}}}}},_addAll:function(k,h){var g,l,f=this,j=tinymce.DOM;if(c(h,"string")){k.appendChild(j.doc.createTextNode(h))}else{if(h.length){k=k.appendChild(j.create(h[0],h[1]));for(g=2;g<h.length;g++){f._addAll(k,h[g])}}}},_startDrag:function(v,G,E){var o=this,u,z,C=d.doc,f,l=o.windows[v],h=l.element,y=h.getXY(),x,q,F,g,A,s,r,j,i,m,k,n,B;g={x:0,y:0};A=d.getViewPort();A.w-=2;A.h-=2;j=G.screenX;i=G.screenY;m=k=n=B=0;u=a.add(C,"mouseup",function(p){a.remove(C,"mouseup",u);a.remove(C,"mousemove",z);if(f){f.remove()}h.moveBy(m,k);h.resizeBy(n,B);q=h.getSize();d.setStyles(v+"_ifr",{width:q.w-l.deltaWidth,height:q.h-l.deltaHeight});o._fixIELayout(v,1);return a.cancel(p)});if(E!="Move"){D()}function D(){if(f){return}o._fixIELayout(v,0);d.add(C.body,"div",{id:"mceEventBlocker","class":"mceEventBlocker "+(o.editor.settings.inlinepopups_skin||"clearlooks2"),style:{zIndex:o.zIndex+1}});if(tinymce.isIE6||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceEventBlocker",{position:"absolute",left:A.x,top:A.y,width:A.w-2,height:A.h-2})}f=new b("mceEventBlocker");f.update();x=h.getXY();q=h.getSize();s=g.x+x.x-A.x;r=g.y+x.y-A.y;d.add(f.get(),"div",{id:"mcePlaceHolder","class":"mcePlaceHolder",style:{left:s,top:r,width:q.w,height:q.h}});F=new b("mcePlaceHolder")}z=a.add(C,"mousemove",function(w){var p,H,t;D();p=w.screenX-j;H=w.screenY-i;switch(E){case"ResizeW":m=p;n=0-p;break;case"ResizeE":n=p;break;case"ResizeN":case"ResizeNW":case"ResizeNE":if(E=="ResizeNW"){m=p;n=0-p}else{if(E=="ResizeNE"){n=p}}k=H;B=0-H;break;case"ResizeS":case"ResizeSW":case"ResizeSE":if(E=="ResizeSW"){m=p;n=0-p}else{if(E=="ResizeSE"){n=p}}B=H;break;case"mceMove":m=p;k=H;break}if(n<(t=l.features.min_width-q.w)){if(m!==0){m+=n-t}n=t}if(B<(t=l.features.min_height-q.h)){if(k!==0){k+=B-t}B=t}n=Math.min(n,l.features.max_width-q.w);B=Math.min(B,l.features.max_height-q.h);m=Math.max(m,A.x-(s+A.x));k=Math.max(k,A.y-(r+A.y));m=Math.min(m,(A.w+A.x)-(s+q.w+A.x));k=Math.min(k,(A.h+A.y)-(r+q.h+A.y));if(m+k!==0){if(s+m<0){m=0}if(r+k<0){k=0}F.moveTo(s+m,r+k)}if(n+B!==0){F.resizeTo(q.w+n,q.h+B)}return a.cancel(w)});return a.cancel(G)},resizeBy:function(g,h,i){var f=this.windows[i];if(f){f.element.resizeBy(g,h);f.iframeElement.resizeBy(g,h)}},close:function(i,k){var g=this,f,j=d.doc,h,k;k=g._findId(k||i);if(!g.windows[k]){g.parent(i);return}g.count--;if(g.count==0){d.remove("mceModalBlocker");d.setAttrib(d.doc.body,"aria-hidden","false");g.editor.focus()}if(f=g.windows[k]){g.onClose.dispatch(g);a.remove(j,"mousedown",f.mousedownFunc);a.remove(j,"click",f.clickFunc);a.clear(k);a.clear(k+"_ifr");d.setAttrib(k+"_ifr","src",'javascript:""');f.element.remove();delete g.windows[k];h=g._frontWindow();if(h){g.focus(h.id)}}},_frontWindow:function(){var g,f=0;e(this.windows,function(h){if(h.zIndex>f){g=h;f=h.zIndex}});return g},setTitle:function(f,g){var h;f=this._findId(f);if(h=d.get(f+"_title")){h.innerHTML=d.encode(g)}},alert:function(g,f,j){var i=this,h;h=i.open({title:i,type:"alert",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},confirm:function(g,f,j){var i=this,h;h=i.open({title:i,type:"confirm",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},_findId:function(f){var g=this;if(typeof(f)=="string"){return f}e(g.windows,function(h){var i=d.get(h.id+"_ifr");if(i&&f==i.contentWindow){f=h.id;return false}});return f},_fixIELayout:function(i,h){var f,g;if(!tinymce.isIE6){return}e(["n","s","w","e","nw","ne","sw","se"],function(j){var k=d.get(i+"_resize_"+j);d.setStyles(k,{width:h?k.clientWidth:"",height:h?k.clientHeight:"",cursor:d.getStyle(k,"cursor",1)});d.setStyle(i+"_bottom","bottom","-1px");k=0});if(f=this.windows[i]){f.element.hide();f.element.show();e(d.select("div,a",i),function(k,j){if(k.currentStyle.backgroundImage!="none"){g=new Image();g.src=k.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/,"$1")}});d.get(i).style.filter=""}}});tinymce.PluginManager.add("inlinepopups",tinymce.plugins.InlinePopups)})();
diff --git a/js/tiny_mce/plugins/insertdatetime/editor_plugin.js b/js/tiny_mce/plugins/insertdatetime/editor_plugin.js
index 938ce6b17d9..c5c12359142 100644
--- a/js/tiny_mce/plugins/insertdatetime/editor_plugin.js
+++ b/js/tiny_mce/plugins/insertdatetime/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.InsertDateTime",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceInsertDate",function(){var d=c._getDateTime(new Date(),a.getParam("plugin_insertdate_dateFormat",a.getLang("insertdatetime.date_fmt")));a.execCommand("mceInsertContent",false,d)});a.addCommand("mceInsertTime",function(){var d=c._getDateTime(new Date(),a.getParam("plugin_insertdate_timeFormat",a.getLang("insertdatetime.time_fmt")));a.execCommand("mceInsertContent",false,d)});a.addButton("insertdate",{title:"insertdatetime.insertdate_desc",cmd:"mceInsertDate"});a.addButton("inserttime",{title:"insertdatetime.inserttime_desc",cmd:"mceInsertTime"})},getInfo:function(){return{longname:"Insert date/time",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/insertdatetime",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getDateTime:function(e,a){var c=this.editor;function b(g,d){g=""+g;if(g.length<d){for(var f=0;f<(d-g.length);f++){g="0"+g}}return g}a=a.replace("%D","%m/%d/%y");a=a.replace("%r","%I:%M:%S %p");a=a.replace("%Y",""+e.getFullYear());a=a.replace("%y",""+e.getYear());a=a.replace("%m",b(e.getMonth()+1,2));a=a.replace("%d",b(e.getDate(),2));a=a.replace("%H",""+b(e.getHours(),2));a=a.replace("%M",""+b(e.getMinutes(),2));a=a.replace("%S",""+b(e.getSeconds(),2));a=a.replace("%I",""+((e.getHours()+11)%12+1));a=a.replace("%p",""+(e.getHours()<12?"AM":"PM"));a=a.replace("%B",""+c.getLang("insertdatetime.months_long").split(",")[e.getMonth()]);a=a.replace("%b",""+c.getLang("insertdatetime.months_short").split(",")[e.getMonth()]);a=a.replace("%A",""+c.getLang("insertdatetime.day_long").split(",")[e.getDay()]);a=a.replace("%a",""+c.getLang("insertdatetime.day_short").split(",")[e.getDay()]);a=a.replace("%%","%");return a}});tinymce.PluginManager.add("insertdatetime",tinymce.plugins.InsertDateTime)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.InsertDateTime",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceInsertDate",function(){var d=c._getDateTime(new Date(),a.getParam("plugin_insertdate_dateFormat",a.getLang("insertdatetime.date_fmt")));a.execCommand("mceInsertContent",false,d)});a.addCommand("mceInsertTime",function(){var d=c._getDateTime(new Date(),a.getParam("plugin_insertdate_timeFormat",a.getLang("insertdatetime.time_fmt")));a.execCommand("mceInsertContent",false,d)});a.addButton("insertdate",{title:"insertdatetime.insertdate_desc",cmd:"mceInsertDate"});a.addButton("inserttime",{title:"insertdatetime.inserttime_desc",cmd:"mceInsertTime"})},getInfo:function(){return{longname:"Insert date/time",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/insertdatetime",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getDateTime:function(e,a){var c=this.editor;function b(g,d){g=""+g;if(g.length<d){for(var f=0;f<(d-g.length);f++){g="0"+g}}return g}a=a.replace("%D","%m/%d/%y");a=a.replace("%r","%I:%M:%S %p");a=a.replace("%Y",""+e.getFullYear());a=a.replace("%y",""+e.getYear());a=a.replace("%m",b(e.getMonth()+1,2));a=a.replace("%d",b(e.getDate(),2));a=a.replace("%H",""+b(e.getHours(),2));a=a.replace("%M",""+b(e.getMinutes(),2));a=a.replace("%S",""+b(e.getSeconds(),2));a=a.replace("%I",""+((e.getHours()+11)%12+1));a=a.replace("%p",""+(e.getHours()<12?"AM":"PM"));a=a.replace("%B",""+c.getLang("insertdatetime.months_long").split(",")[e.getMonth()]);a=a.replace("%b",""+c.getLang("insertdatetime.months_short").split(",")[e.getMonth()]);a=a.replace("%A",""+c.getLang("insertdatetime.day_long").split(",")[e.getDay()]);a=a.replace("%a",""+c.getLang("insertdatetime.day_short").split(",")[e.getDay()]);a=a.replace("%%","%");return a}});tinymce.PluginManager.add("insertdatetime",tinymce.plugins.InsertDateTime)})();
diff --git a/js/tiny_mce/plugins/insertdatetime/editor_plugin_src.js b/js/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
index 181c791eca5..050a1228d5e 100644
--- a/js/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
@@ -80,4 +80,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('insertdatetime', tinymce.plugins.InsertDateTime);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/layer/editor_plugin.js b/js/tiny_mce/plugins/layer/editor_plugin.js
index ca3857a74ee..5055ee85b38 100644
--- a/js/tiny_mce/plugins/layer/editor_plugin.js
+++ b/js/tiny_mce/plugins/layer/editor_plugin.js
@@ -1 +1 @@
-(function(){function a(b){do{if(b.className&&b.className.indexOf("mceItemLayer")!=-1){return b}}while(b=b.parentNode)}tinymce.create("tinymce.plugins.Layer",{init:function(b,c){var d=this;d.editor=b;b.addCommand("mceInsertLayer",d._insertLayer,d);b.addCommand("mceMoveForward",function(){d._move(1)});b.addCommand("mceMoveBackward",function(){d._move(-1)});b.addCommand("mceMakeAbsolute",function(){d._toggleAbsolute()});b.addButton("moveforward",{title:"layer.forward_desc",cmd:"mceMoveForward"});b.addButton("movebackward",{title:"layer.backward_desc",cmd:"mceMoveBackward"});b.addButton("absolute",{title:"layer.absolute_desc",cmd:"mceMakeAbsolute"});b.addButton("insertlayer",{title:"layer.insertlayer_desc",cmd:"mceInsertLayer"});b.onInit.add(function(){var e=b.dom;if(tinymce.isIE){b.getDoc().execCommand("2D-Position",false,true)}});b.onMouseUp.add(function(f,h){var g=a(h.target);if(g){f.dom.setAttrib(g,"data-mce-style","")}});b.onMouseDown.add(function(f,j){var h=j.target,i=f.getDoc(),g;if(tinymce.isGecko){if(a(h)){if(i.designMode!=="on"){i.designMode="on";h=i.body;g=h.parentNode;g.removeChild(h);g.appendChild(h)}}else{if(i.designMode=="on"){i.designMode="off"}}}});b.onNodeChange.add(d._nodeChange,d);b.onVisualAid.add(d._visualAid,d)},getInfo:function(){return{longname:"Layer",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(c,b,f){var d,e;d=this._getParentLayer(f);e=c.dom.getParent(f,"DIV,P,IMG");if(!e){b.setDisabled("absolute",1);b.setDisabled("moveforward",1);b.setDisabled("movebackward",1)}else{b.setDisabled("absolute",0);b.setDisabled("moveforward",!d);b.setDisabled("movebackward",!d);b.setActive("absolute",d&&d.style.position.toLowerCase()=="absolute")}},_visualAid:function(b,d,c){var f=b.dom;tinymce.each(f.select("div,p",d),function(g){if(/^(absolute|relative|fixed)$/i.test(g.style.position)){if(c){f.addClass(g,"mceItemVisualAid")}else{f.removeClass(g,"mceItemVisualAid")}f.addClass(g,"mceItemLayer")}})},_move:function(j){var c=this.editor,g,h=[],f=this._getParentLayer(c.selection.getNode()),e=-1,k=-1,b;b=[];tinymce.walk(c.getBody(),function(d){if(d.nodeType==1&&/^(absolute|relative|static)$/i.test(d.style.position)){b.push(d)}},"childNodes");for(g=0;g<b.length;g++){h[g]=b[g].style.zIndex?parseInt(b[g].style.zIndex):0;if(e<0&&b[g]==f){e=g}}if(j<0){for(g=0;g<h.length;g++){if(h[g]<h[e]){k=g;break}}if(k>-1){b[e].style.zIndex=h[k];b[k].style.zIndex=h[e]}else{if(h[e]>0){b[e].style.zIndex=h[e]-1}}}else{for(g=0;g<h.length;g++){if(h[g]>h[e]){k=g;break}}if(k>-1){b[e].style.zIndex=h[k];b[k].style.zIndex=h[e]}else{b[e].style.zIndex=h[e]+1}}c.execCommand("mceRepaint")},_getParentLayer:function(b){return this.editor.dom.getParent(b,function(c){return c.nodeType==1&&/^(absolute|relative|static)$/i.test(c.style.position)})},_insertLayer:function(){var c=this.editor,e=c.dom,d=e.getPos(e.getParent(c.selection.getNode(),"*")),b=c.getBody();c.dom.add(b,"div",{style:{position:"absolute",left:d.x,top:(d.y>20?d.y:20),width:100,height:100},"class":"mceItemVisualAid mceItemLayer"},c.selection.getContent()||c.getLang("layer.content"));if(tinymce.isIE){e.setHTML(b,b.innerHTML)}},_toggleAbsolute:function(){var b=this.editor,c=this._getParentLayer(b.selection.getNode());if(!c){c=b.dom.getParent(b.selection.getNode(),"DIV,P,IMG")}if(c){if(c.style.position.toLowerCase()=="absolute"){b.dom.setStyles(c,{position:"",left:"",top:"",width:"",height:""});b.dom.removeClass(c,"mceItemVisualAid");b.dom.removeClass(c,"mceItemLayer")}else{if(c.style.left==""){c.style.left=20+"px"}if(c.style.top==""){c.style.top=20+"px"}if(c.style.width==""){c.style.width=c.width?(c.width+"px"):"100px"}if(c.style.height==""){c.style.height=c.height?(c.height+"px"):"100px"}c.style.position="absolute";b.dom.setAttrib(c,"data-mce-style","");b.addVisual(b.getBody())}b.execCommand("mceRepaint");b.nodeChanged()}}});tinymce.PluginManager.add("layer",tinymce.plugins.Layer)})();
\ No newline at end of file
+(function(){function a(b){do{if(b.className&&b.className.indexOf("mceItemLayer")!=-1){return b}}while(b=b.parentNode)}tinymce.create("tinymce.plugins.Layer",{init:function(b,c){var d=this;d.editor=b;b.addCommand("mceInsertLayer",d._insertLayer,d);b.addCommand("mceMoveForward",function(){d._move(1)});b.addCommand("mceMoveBackward",function(){d._move(-1)});b.addCommand("mceMakeAbsolute",function(){d._toggleAbsolute()});b.addButton("moveforward",{title:"layer.forward_desc",cmd:"mceMoveForward"});b.addButton("movebackward",{title:"layer.backward_desc",cmd:"mceMoveBackward"});b.addButton("absolute",{title:"layer.absolute_desc",cmd:"mceMakeAbsolute"});b.addButton("insertlayer",{title:"layer.insertlayer_desc",cmd:"mceInsertLayer"});b.onInit.add(function(){var e=b.dom;if(tinymce.isIE){b.getDoc().execCommand("2D-Position",false,true)}});b.onMouseUp.add(function(f,h){var g=a(h.target);if(g){f.dom.setAttrib(g,"data-mce-style","")}});b.onMouseDown.add(function(f,j){var h=j.target,i=f.getDoc(),g;if(tinymce.isGecko){if(a(h)){if(i.designMode!=="on"){i.designMode="on";h=i.body;g=h.parentNode;g.removeChild(h);g.appendChild(h)}}else{if(i.designMode=="on"){i.designMode="off"}}}});b.onNodeChange.add(d._nodeChange,d);b.onVisualAid.add(d._visualAid,d)},getInfo:function(){return{longname:"Layer",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(c,b,f){var d,e;d=this._getParentLayer(f);e=c.dom.getParent(f,"DIV,P,IMG");if(!e){b.setDisabled("absolute",1);b.setDisabled("moveforward",1);b.setDisabled("movebackward",1)}else{b.setDisabled("absolute",0);b.setDisabled("moveforward",!d);b.setDisabled("movebackward",!d);b.setActive("absolute",d&&d.style.position.toLowerCase()=="absolute")}},_visualAid:function(b,d,c){var f=b.dom;tinymce.each(f.select("div,p",d),function(g){if(/^(absolute|relative|fixed)$/i.test(g.style.position)){if(c){f.addClass(g,"mceItemVisualAid")}else{f.removeClass(g,"mceItemVisualAid")}f.addClass(g,"mceItemLayer")}})},_move:function(j){var c=this.editor,g,h=[],f=this._getParentLayer(c.selection.getNode()),e=-1,k=-1,b;b=[];tinymce.walk(c.getBody(),function(d){if(d.nodeType==1&&/^(absolute|relative|static)$/i.test(d.style.position)){b.push(d)}},"childNodes");for(g=0;g<b.length;g++){h[g]=b[g].style.zIndex?parseInt(b[g].style.zIndex):0;if(e<0&&b[g]==f){e=g}}if(j<0){for(g=0;g<h.length;g++){if(h[g]<h[e]){k=g;break}}if(k>-1){b[e].style.zIndex=h[k];b[k].style.zIndex=h[e]}else{if(h[e]>0){b[e].style.zIndex=h[e]-1}}}else{for(g=0;g<h.length;g++){if(h[g]>h[e]){k=g;break}}if(k>-1){b[e].style.zIndex=h[k];b[k].style.zIndex=h[e]}else{b[e].style.zIndex=h[e]+1}}c.execCommand("mceRepaint")},_getParentLayer:function(b){return this.editor.dom.getParent(b,function(c){return c.nodeType==1&&/^(absolute|relative|static)$/i.test(c.style.position)})},_insertLayer:function(){var c=this.editor,e=c.dom,d=e.getPos(e.getParent(c.selection.getNode(),"*")),b=c.getBody();c.dom.add(b,"div",{style:{position:"absolute",left:d.x,top:(d.y>20?d.y:20),width:100,height:100},"class":"mceItemVisualAid mceItemLayer"},c.selection.getContent()||c.getLang("layer.content"));if(tinymce.isIE){e.setHTML(b,b.innerHTML)}},_toggleAbsolute:function(){var b=this.editor,c=this._getParentLayer(b.selection.getNode());if(!c){c=b.dom.getParent(b.selection.getNode(),"DIV,P,IMG")}if(c){if(c.style.position.toLowerCase()=="absolute"){b.dom.setStyles(c,{position:"",left:"",top:"",width:"",height:""});b.dom.removeClass(c,"mceItemVisualAid");b.dom.removeClass(c,"mceItemLayer")}else{if(c.style.left==""){c.style.left=20+"px"}if(c.style.top==""){c.style.top=20+"px"}if(c.style.width==""){c.style.width=c.width?(c.width+"px"):"100px"}if(c.style.height==""){c.style.height=c.height?(c.height+"px"):"100px"}c.style.position="absolute";b.dom.setAttrib(c,"data-mce-style","");b.addVisual(b.getBody())}b.execCommand("mceRepaint");b.nodeChanged()}}});tinymce.PluginManager.add("layer",tinymce.plugins.Layer)})();
diff --git a/js/tiny_mce/plugins/layer/editor_plugin_src.js b/js/tiny_mce/plugins/layer/editor_plugin_src.js
index daed2806cba..8bdd47be6f3 100644
--- a/js/tiny_mce/plugins/layer/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/layer/editor_plugin_src.js
@@ -259,4 +259,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('layer', tinymce.plugins.Layer);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/legacyoutput/editor_plugin.js b/js/tiny_mce/plugins/legacyoutput/editor_plugin.js
index b3a4ce31c5e..164540c79bf 100644
--- a/js/tiny_mce/plugins/legacyoutput/editor_plugin.js
+++ b/js/tiny_mce/plugins/legacyoutput/editor_plugin.js
@@ -1 +1 @@
-(function(a){a.onAddEditor.addToTop(function(c,b){b.settings.inline_styles=false});a.create("tinymce.plugins.LegacyOutput",{init:function(b){b.onInit.add(function(){var c="p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img",e=a.explode(b.settings.font_size_style_values),d=b.schema;b.formatter.register({alignleft:{selector:c,attributes:{align:"left"}},aligncenter:{selector:c,attributes:{align:"center"}},alignright:{selector:c,attributes:{align:"right"}},alignfull:{selector:c,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:true}],strikethrough:[{inline:"strike",remove:"all"},{inline:"span",styles:{textDecoration:"line-through"},exact:true}],fontname:{inline:"font",attributes:{face:"%value"}},fontsize:{inline:"font",attributes:{size:function(f){return a.inArray(e,f.value)+1}}},forecolor:{inline:"font",styles:{color:"%value"}},hilitecolor:{inline:"font",styles:{backgroundColor:"%value"}}});a.each("b,i,u,strike".split(","),function(f){d.addValidElements(f+"[*]")});if(!d.getElementRule("font")){d.addValidElements("font[face|size|color|style]")}a.each(c.split(","),function(f){var h=d.getElementRule(f),g;if(h){if(!h.attributes.align){h.attributes.align={};h.attributesOrder.push("align")}}});b.onNodeChange.add(function(g,k){var j,f,h,i;f=g.dom.getParent(g.selection.getNode(),"font");if(f){h=f.face;i=f.size}if(j=k.get("fontselect")){j.select(function(l){return l==h})}if(j=k.get("fontsizeselect")){j.select(function(m){var l=a.inArray(e,m.fontSize);return l+1==i})}})})},getInfo:function(){return{longname:"LegacyOutput",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/legacyoutput",version:a.majorVersion+"."+a.minorVersion}}});a.PluginManager.add("legacyoutput",a.plugins.LegacyOutput)})(tinymce);
\ No newline at end of file
+(function(a){a.onAddEditor.addToTop(function(c,b){b.settings.inline_styles=false});a.create("tinymce.plugins.LegacyOutput",{init:function(b){b.onInit.add(function(){var c="p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img",e=a.explode(b.settings.font_size_style_values),d=b.schema;b.formatter.register({alignleft:{selector:c,attributes:{align:"left"}},aligncenter:{selector:c,attributes:{align:"center"}},alignright:{selector:c,attributes:{align:"right"}},alignfull:{selector:c,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:true}],strikethrough:[{inline:"strike",remove:"all"},{inline:"span",styles:{textDecoration:"line-through"},exact:true}],fontname:{inline:"font",attributes:{face:"%value"}},fontsize:{inline:"font",attributes:{size:function(f){return a.inArray(e,f.value)+1}}},forecolor:{inline:"font",styles:{color:"%value"}},hilitecolor:{inline:"font",styles:{backgroundColor:"%value"}}});a.each("b,i,u,strike".split(","),function(f){d.addValidElements(f+"[*]")});if(!d.getElementRule("font")){d.addValidElements("font[face|size|color|style]")}a.each(c.split(","),function(f){var h=d.getElementRule(f),g;if(h){if(!h.attributes.align){h.attributes.align={};h.attributesOrder.push("align")}}});b.onNodeChange.add(function(g,k){var j,f,h,i;f=g.dom.getParent(g.selection.getNode(),"font");if(f){h=f.face;i=f.size}if(j=k.get("fontselect")){j.select(function(l){return l==h})}if(j=k.get("fontsizeselect")){j.select(function(m){var l=a.inArray(e,m.fontSize);return l+1==i})}})})},getInfo:function(){return{longname:"LegacyOutput",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/legacyoutput",version:a.majorVersion+"."+a.minorVersion}}});a.PluginManager.add("legacyoutput",a.plugins.LegacyOutput)})(tinymce);
diff --git a/js/tiny_mce/plugins/lists/editor_plugin.js b/js/tiny_mce/plugins/lists/editor_plugin.js
index 86b8b1a4059..7733a9f66cc 100644
--- a/js/tiny_mce/plugins/lists/editor_plugin.js
+++ b/js/tiny_mce/plugins/lists/editor_plugin.js
@@ -1 +1 @@
-(function(){var e=tinymce.each,r=tinymce.dom.Event,g;function p(t,s){while(t&&(t.nodeType===8||(t.nodeType===3&&/^[ \t\n\r]*$/.test(t.nodeValue)))){t=s(t)}return t}function b(s){return p(s,function(t){return t.previousSibling})}function i(s){return p(s,function(t){return t.nextSibling})}function d(s,u,t){return s.dom.getParent(u,function(v){return tinymce.inArray(t,v)!==-1})}function n(s){return s&&(s.tagName==="OL"||s.tagName==="UL")}function c(u,v){var t,w,s;t=b(u.lastChild);while(n(t)){w=t;t=b(w.previousSibling)}if(w){s=v.create("li",{style:"list-style-type: none;"});v.split(u,w);v.insertAfter(s,w);s.appendChild(w);s.appendChild(w);u=s.previousSibling}return u}function m(t,s,u){t=a(t,s,u);return o(t,s,u)}function a(u,s,v){var t=b(u.previousSibling);if(t){return h(t,u,s?t:false,v)}else{return u}}function o(u,t,v){var s=i(u.nextSibling);if(s){return h(u,s,t?s:false,v)}else{return u}}function h(u,s,t,v){if(l(u,s,!!t,v)){return f(u,s,t)}else{if(u&&u.tagName==="LI"&&n(s)){u.appendChild(s)}}return s}function l(u,t,s,v){if(!u||!t){return false}else{if(u.tagName==="LI"&&t.tagName==="LI"){return t.style.listStyleType==="none"||j(t)}else{if(n(u)){return(u.tagName===t.tagName&&(s||u.style.listStyleType===t.style.listStyleType))||q(t)}else{return v&&u.tagName==="P"&&t.tagName==="P"}}}}function q(t){var s=i(t.firstChild),u=b(t.lastChild);return s&&u&&n(t)&&s===u&&(n(s)||s.style.listStyleType==="none"||j(s))}function j(u){var t=i(u.firstChild),s=b(u.lastChild);return t&&s&&t===s&&n(t)}function f(w,v,s){var u=b(w.lastChild),t=i(v.firstChild);if(w.tagName==="P"){w.appendChild(w.ownerDocument.createElement("br"))}while(v.firstChild){w.appendChild(v.firstChild)}if(s){w.style.listStyleType=s.style.listStyleType}v.parentNode.removeChild(v);h(u,t,false);return w}function k(t,u){var s;if(!u.is(t,"li,ol,ul")){s=u.getParent(t,"li");if(s){t=s}}return t}tinymce.create("tinymce.plugins.Lists",{init:function(y){var v="TABBING";var s="EMPTY";var I="ESCAPE";var z="PARAGRAPH";var M="UNKNOWN";var x=M;function E(T){return T.keyCode===tinymce.VK.TAB&&!(T.altKey||T.ctrlKey)&&(y.queryCommandState("InsertUnorderedList")||y.queryCommandState("InsertOrderedList"))}function D(){var T=y.selection.getRng();var U=T.startContainer;if(U.nodeType==3){return(T.endOffset==U.nodeValue.length)}else{if(U.nodeType==1){return T.endOffset==U.childNodes.length}}return false}function N(){var U=y.selection.getNode();var T=U.tagName==="P"&&U.parentNode.tagName==="LI"&&U.parentNode.lastChild===U;return y.selection.isCollapsed()&&T&&D()}function w(){var T=B();var V=T.parentNode.parentNode;var U=T.parentNode.lastChild===T;return U&&!t(V)&&O(T)}function t(T){if(n(T)){return T.parentNode&&T.parentNode.tagName==="LI"}else{return T.tagName==="LI"}}function F(){return y.selection.isCollapsed()&&O(B())}function B(){var T=y.selection.getStart();return((T.tagName=="BR"||T.tagName=="")&&T.parentNode.tagName=="LI")?T.parentNode:T}function O(T){var U=T.childNodes.length;if(T.tagName==="LI"){return U==0?true:U==1&&(T.firstChild.tagName==""||T.firstChild.tagName=="BR"||H(T))}return false}function H(T){var U=tinymce.grep(T.parentNode.childNodes,function(X){return X.tagName=="LI"});var V=T==U[U.length-1];var W=T.firstChild;return tinymce.isIE9&&V&&(W.nodeValue==String.fromCharCode(160)||W.nodeValue==String.fromCharCode(32))}function S(T){return T.keyCode===tinymce.VK.ENTER}function A(T){return S(T)&&!T.shiftKey}function L(T){if(E(T)){return v}else{if(A(T)&&w()){return I}else{if(A(T)&&F()){return s}else{if(A(T)&&N()){return z}else{return M}}}}}function C(T,U){if(x==v||x==s||tinymce.isGecko&&x==I){r.cancel(U)}}function J(V,X){if(x==z){var W=V.selection.getNode();var U=V.dom.create("li");var T=V.dom.getParent(W,"li");V.dom.insertAfter(U,T);if(tinyMCE.isIE8){U.appendChild(V.dom.create("&nbsp;"));V.selection.setCursorLocation(U,1)}else{if(tinyMCE.isGecko){setTimeout(function(){var Y=V.getDoc().createTextNode("\uFEFF");U.appendChild(Y);V.selection.setCursorLocation(U,0)},0)}else{V.selection.setCursorLocation(U,0)}}r.cancel(X)}}function u(W,Y){var ab;if(!tinymce.isGecko){return}var U=W.selection.getStart();if(Y.keyCode!=tinymce.VK.BACKSPACE||U.tagName!=="IMG"){return}function V(af){var ag=af.firstChild;var ae=null;do{if(!ag){break}if(ag.tagName==="LI"){ae=ag}}while(ag=ag.nextSibling);return ae}function ad(af,ae){while(af.childNodes.length>0){ae.appendChild(af.childNodes[0])}}ab=U.parentNode.previousSibling;if(!ab){return}var Z;if(ab.tagName==="UL"||ab.tagName==="OL"){Z=ab}else{if(ab.previousSibling&&(ab.previousSibling.tagName==="UL"||ab.previousSibling.tagName==="OL")){Z=ab.previousSibling}else{return}}var ac=V(Z);var T=W.dom.createRng();T.setStart(ac,1);T.setEnd(ac,1);W.selection.setRng(T);W.selection.collapse(true);var X=W.selection.getBookmark();var aa=U.parentNode.cloneNode(true);if(aa.tagName==="P"||aa.tagName==="DIV"){ad(aa,ac)}else{ac.appendChild(aa)}U.parentNode.parentNode.removeChild(U.parentNode);W.selection.moveToBookmark(X)}function G(T){var U=y.dom.getParent(T,"ol,ul");if(U!=null){var V=U.lastChild;V.appendChild(y.getDoc().createElement(""));y.selection.setCursorLocation(V,0)}}this.ed=y;y.addCommand("Indent",this.indent,this);y.addCommand("Outdent",this.outdent,this);y.addCommand("InsertUnorderedList",function(){this.applyList("UL","OL")},this);y.addCommand("InsertOrderedList",function(){this.applyList("OL","UL")},this);y.onInit.add(function(){y.editorCommands.addCommands({outdent:function(){var U=y.selection,V=y.dom;function T(W){W=V.getParent(W,V.isBlock);return W&&(parseInt(y.dom.getStyle(W,"margin-left")||0,10)+parseInt(y.dom.getStyle(W,"padding-left")||0,10))>0}return T(U.getStart())||T(U.getEnd())||y.queryCommandState("InsertOrderedList")||y.queryCommandState("InsertUnorderedList")}},"state")});y.onKeyUp.add(function(U,V){if(x==v){U.execCommand(V.shiftKey?"Outdent":"Indent",true,null);x=M;return r.cancel(V)}else{if(x==s){var T=B();var X=U.settings.list_outdent_on_enter===true||V.shiftKey;U.execCommand(X?"Outdent":"Indent",true,null);if(tinymce.isIE){G(T)}return r.cancel(V)}else{if(x==I){if(tinymce.isIE8){var W=U.getDoc().createTextNode("\uFEFF");U.selection.getNode().appendChild(W)}else{if(tinymce.isIE9||tinymce.isGecko){U.execCommand("Outdent");return r.cancel(V)}}}}}});function K(U,T){var V=y.getDoc().createTextNode("\uFEFF");U.insertBefore(V,T);y.selection.setCursorLocation(V,0);y.execCommand("mceRepaint")}function Q(U,W){if(S(W)){var T=B();if(T){var V=T.parentNode;var X=V&&V.parentNode;if(X&&X.nodeName=="LI"&&X.firstChild==V&&T==V.firstChild){K(X,V)}}}}function R(U,W){if(S(W)){var T=B();if(U.dom.select("ul li",T).length===1){var V=T.firstChild;K(T,V)}}}function P(U,Y){function V(ac,Z){var ab=[];var ad=new tinymce.dom.TreeWalker(Z,ac);for(var aa=ad.current();aa;aa=ad.next()){if(U.dom.is(aa,"ol,ul,li")){ab.push(aa)}}return ab}if(Y.keyCode==tinymce.VK.BACKSPACE){var T=B();if(T){var X=U.dom.getParent(T,"ol,ul");if(X&&X.firstChild===T){var W=V(X,T);U.execCommand("Outdent",false,W);U.undoManager.add();return r.cancel(Y)}}}}y.onKeyDown.add(function(T,U){x=L(U)});y.onKeyDown.add(C);y.onKeyDown.add(u);y.onKeyDown.add(J);if(tinymce.isGecko){y.onKeyUp.add(Q)}if(tinymce.isIE8){y.onKeyUp.add(R)}if(tinymce.isGecko||tinymce.isWebKit){y.onKeyDown.add(P)}},applyList:function(y,v){var C=this,z=C.ed,I=z.dom,s=[],H=false,u=false,w=false,B,G=z.selection.getSelectedBlocks();function E(t){if(t&&t.tagName==="BR"){I.remove(t)}}function F(M){var N=I.create(y),t;function L(O){if(O.style.marginLeft||O.style.paddingLeft){C.adjustPaddingFunction(false)(O)}}if(M.tagName==="LI"){}else{if(M.tagName==="P"||M.tagName==="DIV"||M.tagName==="BODY"){K(M,function(P,O){J(P,O,M.tagName==="BODY"?null:P.parentNode);t=P.parentNode;L(t);E(O)});if(t){if(t.tagName==="LI"&&(M.tagName==="P"||G.length>1)){I.split(t.parentNode.parentNode,t.parentNode)}m(t.parentNode,true)}return}else{t=I.create("li");I.insertAfter(t,M);t.appendChild(M);L(M);M=t}}I.insertAfter(N,M);N.appendChild(M);m(N,true);s.push(M)}function J(P,L,N){var t,O=P,M;while(!I.isBlock(P.parentNode)&&P.parentNode!==I.getRoot()){P=I.split(P.parentNode,P.previousSibling);P=P.nextSibling;O=P}if(N){t=N.cloneNode(true);P.parentNode.insertBefore(t,P);while(t.firstChild){I.remove(t.firstChild)}t=I.rename(t,"li")}else{t=I.create("li");P.parentNode.insertBefore(t,P)}while(O&&O!=L){M=O.nextSibling;t.appendChild(O);O=M}if(t.childNodes.length===0){t.innerHTML='<br _mce_bogus="1" />'}F(t)}function K(Q,T){var N,R,O=3,L=1,t="br,ul,ol,p,div,h1,h2,h3,h4,h5,h6,table,blockquote,address,pre,form,center,dl";function P(X,U){var V=I.createRng(),W;g.keep=true;z.selection.moveToBookmark(g);g.keep=false;W=z.selection.getRng(true);if(!U){U=X.parentNode.lastChild}V.setStartBefore(X);V.setEndAfter(U);return !(V.compareBoundaryPoints(O,W)>0||V.compareBoundaryPoints(L,W)<=0)}function S(U){if(U.nextSibling){return U.nextSibling}if(!I.isBlock(U.parentNode)&&U.parentNode!==I.getRoot()){return S(U.parentNode)}}N=Q.firstChild;var M=false;e(I.select(t,Q),function(U){if(U.hasAttribute&&U.hasAttribute("_mce_bogus")){return true}if(P(N,U)){I.addClass(U,"_mce_tagged_br");N=S(U)}});M=(N&&P(N,undefined));N=Q.firstChild;e(I.select(t,Q),function(V){var U=S(V);if(V.hasAttribute&&V.hasAttribute("_mce_bogus")){return true}if(I.hasClass(V,"_mce_tagged_br")){T(N,V,R);R=null}else{R=V}N=U});if(M){T(N,undefined,R)}}function D(t){K(t,function(M,L,N){J(M,L);E(L);E(N)})}function A(t){if(tinymce.inArray(s,t)!==-1){return}if(t.parentNode.tagName===v){I.split(t.parentNode,t);F(t);o(t.parentNode,false)}s.push(t)}function x(M){var O,N,L,t;if(tinymce.inArray(s,M)!==-1){return}M=c(M,I);while(I.is(M.parentNode,"ol,ul,li")){I.split(M.parentNode,M)}s.push(M);M=I.rename(M,"p");L=m(M,false,z.settings.force_br_newlines);if(L===M){O=M.firstChild;while(O){if(I.isBlock(O)){O=I.split(O.parentNode,O);t=true;N=O.nextSibling&&O.nextSibling.firstChild}else{N=O.nextSibling;if(t&&O.tagName==="BR"){I.remove(O)}t=false}O=N}}}e(G,function(t){t=k(t,I);if(t.tagName===v||(t.tagName==="LI"&&t.parentNode.tagName===v)){u=true}else{if(t.tagName===y||(t.tagName==="LI"&&t.parentNode.tagName===y)){H=true}else{w=true}}});if(w&&!H||u||G.length===0){B={LI:A,H1:F,H2:F,H3:F,H4:F,H5:F,H6:F,P:F,BODY:F,DIV:G.length>1?F:D,defaultAction:D,elements:this.selectedBlocks()}}else{B={defaultAction:x,elements:this.selectedBlocks()}}this.process(B)},indent:function(){var u=this.ed,w=u.dom,x=[];function s(z){var y=w.create("li",{style:"list-style-type: none;"});w.insertAfter(y,z);return y}function t(B){var y=s(B),D=w.getParent(B,"ol,ul"),C=D.tagName,E=w.getStyle(D,"list-style-type"),A={},z;if(E!==""){A.style="list-style-type: "+E+";"}z=w.create(C,A);y.appendChild(z);return z}function v(z){if(!d(u,z,x)){z=c(z,w);var y=t(z);y.appendChild(z);m(y.parentNode,false);m(y,false);x.push(z)}}this.process({LI:v,defaultAction:this.adjustPaddingFunction(true),elements:this.selectedBlocks()})},outdent:function(y,x){var w=this,u=w.ed,z=u.dom,s=[];function A(t){var C,B,D;if(!d(u,t,s)){if(z.getStyle(t,"margin-left")!==""||z.getStyle(t,"padding-left")!==""){return w.adjustPaddingFunction(false)(t)}D=z.getStyle(t,"text-align",true);if(D==="center"||D==="right"){z.setStyle(t,"text-align","left");return}t=c(t,z);C=t.parentNode;B=t.parentNode.parentNode;if(B.tagName==="P"){z.split(B,t.parentNode)}else{z.split(C,t);if(B.tagName==="LI"){z.split(B,t)}else{if(!z.is(B,"ol,ul")){z.rename(t,"p")}}}s.push(t)}}var v=x&&tinymce.is(x,"array")?x:this.selectedBlocks();this.process({LI:A,defaultAction:this.adjustPaddingFunction(false),elements:v});e(s,m)},process:function(y){var F=this,w=F.ed.selection,z=F.ed.dom,E,u;function B(t){var s=tinymce.grep(t.childNodes,function(H){return !(H.nodeName==="BR"||H.nodeName==="SPAN"&&z.getAttrib(H,"data-mce-type")=="bookmark"||H.nodeType==3&&(H.nodeValue==String.fromCharCode(160)||H.nodeValue==""))});return s.length===0}function x(s){z.removeClass(s,"_mce_act_on");if(!s||s.nodeType!==1||E.length>1&&B(s)){return}s=k(s,z);var t=y[s.tagName];if(!t){t=y.defaultAction}t(s)}function v(s){F.splitSafeEach(s.childNodes,x)}function C(s,t){return t>=0&&s.hasChildNodes()&&t<s.childNodes.length&&s.childNodes[t].tagName==="BR"}function D(){var t=w.getNode();var s=z.getParent(t,"td");return s!==null}E=y.elements;u=w.getRng(true);if(!u.collapsed){if(C(u.endContainer,u.endOffset-1)){u.setEnd(u.endContainer,u.endOffset-1);w.setRng(u)}if(C(u.startContainer,u.startOffset)){u.setStart(u.startContainer,u.startOffset+1);w.setRng(u)}}if(tinymce.isIE8){var G=F.ed.selection.getNode();if(G.tagName==="LI"&&!(G.parentNode.lastChild===G)){var A=F.ed.getDoc().createTextNode("\uFEFF");G.appendChild(A)}}g=w.getBookmark();y.OL=y.UL=v;F.splitSafeEach(E,x);w.moveToBookmark(g);g=null;if(!D()){F.ed.execCommand("mceRepaint")}},splitSafeEach:function(t,s){if(tinymce.isGecko&&(/Firefox\/[12]\.[0-9]/.test(navigator.userAgent)||/Firefox\/3\.[0-4]/.test(navigator.userAgent))){this.classBasedEach(t,s)}else{e(t,s)}},classBasedEach:function(v,u){var w=this.ed.dom,s,t;e(v,function(x){w.addClass(x,"_mce_act_on")});s=w.select("._mce_act_on");while(s.length>0){t=s.shift();w.removeClass(t,"_mce_act_on");u(t);s=w.select("._mce_act_on")}},adjustPaddingFunction:function(u){var s,v,t=this.ed;s=t.settings.indentation;v=/[a-z%]+/i.exec(s);s=parseInt(s,10);return function(w){var y,x;y=parseInt(t.dom.getStyle(w,"margin-left")||0,10)+parseInt(t.dom.getStyle(w,"padding-left")||0,10);if(u){x=y+s}else{x=y-s}t.dom.setStyle(w,"padding-left","");t.dom.setStyle(w,"margin-left",x>0?x+v:"")}},selectedBlocks:function(){var s=this.ed;var t=s.selection.getSelectedBlocks();return t.length==0?[s.dom.getRoot()]:t},getInfo:function(){return{longname:"Lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/lists",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("lists",tinymce.plugins.Lists)}());
\ No newline at end of file
+(function(){var e=tinymce.each,r=tinymce.dom.Event,g;function p(t,s){while(t&&(t.nodeType===8||(t.nodeType===3&&/^[ \t\n\r]*$/.test(t.nodeValue)))){t=s(t)}return t}function b(s){return p(s,function(t){return t.previousSibling})}function i(s){return p(s,function(t){return t.nextSibling})}function d(s,u,t){return s.dom.getParent(u,function(v){return tinymce.inArray(t,v)!==-1})}function n(s){return s&&(s.tagName==="OL"||s.tagName==="UL")}function c(u,v){var t,w,s;t=b(u.lastChild);while(n(t)){w=t;t=b(w.previousSibling)}if(w){s=v.create("li",{style:"list-style-type: none;"});v.split(u,w);v.insertAfter(s,w);s.appendChild(w);s.appendChild(w);u=s.previousSibling}return u}function m(t,s,u){t=a(t,s,u);return o(t,s,u)}function a(u,s,v){var t=b(u.previousSibling);if(t){return h(t,u,s?t:false,v)}else{return u}}function o(u,t,v){var s=i(u.nextSibling);if(s){return h(u,s,t?s:false,v)}else{return u}}function h(u,s,t,v){if(l(u,s,!!t,v)){return f(u,s,t)}else{if(u&&u.tagName==="LI"&&n(s)){u.appendChild(s)}}return s}function l(u,t,s,v){if(!u||!t){return false}else{if(u.tagName==="LI"&&t.tagName==="LI"){return t.style.listStyleType==="none"||j(t)}else{if(n(u)){return(u.tagName===t.tagName&&(s||u.style.listStyleType===t.style.listStyleType))||q(t)}else{return v&&u.tagName==="P"&&t.tagName==="P"}}}}function q(t){var s=i(t.firstChild),u=b(t.lastChild);return s&&u&&n(t)&&s===u&&(n(s)||s.style.listStyleType==="none"||j(s))}function j(u){var t=i(u.firstChild),s=b(u.lastChild);return t&&s&&t===s&&n(t)}function f(w,v,s){var u=b(w.lastChild),t=i(v.firstChild);if(w.tagName==="P"){w.appendChild(w.ownerDocument.createElement("br"))}while(v.firstChild){w.appendChild(v.firstChild)}if(s){w.style.listStyleType=s.style.listStyleType}v.parentNode.removeChild(v);h(u,t,false);return w}function k(t,u){var s;if(!u.is(t,"li,ol,ul")){s=u.getParent(t,"li");if(s){t=s}}return t}tinymce.create("tinymce.plugins.Lists",{init:function(y){var v="TABBING";var s="EMPTY";var I="ESCAPE";var z="PARAGRAPH";var M="UNKNOWN";var x=M;function E(T){return T.keyCode===tinymce.VK.TAB&&!(T.altKey||T.ctrlKey)&&(y.queryCommandState("InsertUnorderedList")||y.queryCommandState("InsertOrderedList"))}function D(){var T=y.selection.getRng();var U=T.startContainer;if(U.nodeType==3){return(T.endOffset==U.nodeValue.length)}else{if(U.nodeType==1){return T.endOffset==U.childNodes.length}}return false}function N(){var U=y.selection.getNode();var T=U.tagName==="P"&&U.parentNode.tagName==="LI"&&U.parentNode.lastChild===U;return y.selection.isCollapsed()&&T&&D()}function w(){var T=B();var V=T.parentNode.parentNode;var U=T.parentNode.lastChild===T;return U&&!t(V)&&O(T)}function t(T){if(n(T)){return T.parentNode&&T.parentNode.tagName==="LI"}else{return T.tagName==="LI"}}function F(){return y.selection.isCollapsed()&&O(B())}function B(){var T=y.selection.getStart();return((T.tagName=="BR"||T.tagName=="")&&T.parentNode.tagName=="LI")?T.parentNode:T}function O(T){var U=T.childNodes.length;if(T.tagName==="LI"){return U==0?true:U==1&&(T.firstChild.tagName==""||T.firstChild.tagName=="BR"||H(T))}return false}function H(T){var U=tinymce.grep(T.parentNode.childNodes,function(X){return X.tagName=="LI"});var V=T==U[U.length-1];var W=T.firstChild;return tinymce.isIE9&&V&&(W.nodeValue==String.fromCharCode(160)||W.nodeValue==String.fromCharCode(32))}function S(T){return T.keyCode===tinymce.VK.ENTER}function A(T){return S(T)&&!T.shiftKey}function L(T){if(E(T)){return v}else{if(A(T)&&w()){return I}else{if(A(T)&&F()){return s}else{if(A(T)&&N()){return z}else{return M}}}}}function C(T,U){if(x==v||x==s||tinymce.isGecko&&x==I){r.cancel(U)}}function J(V,X){if(x==z){var W=V.selection.getNode();var U=V.dom.create("li");var T=V.dom.getParent(W,"li");V.dom.insertAfter(U,T);if(tinyMCE.isIE8){U.appendChild(V.dom.create("&nbsp;"));V.selection.setCursorLocation(U,1)}else{if(tinyMCE.isGecko){setTimeout(function(){var Y=V.getDoc().createTextNode("\uFEFF");U.appendChild(Y);V.selection.setCursorLocation(U,0)},0)}else{V.selection.setCursorLocation(U,0)}}r.cancel(X)}}function u(W,Y){var ab;if(!tinymce.isGecko){return}var U=W.selection.getStart();if(Y.keyCode!=tinymce.VK.BACKSPACE||U.tagName!=="IMG"){return}function V(af){var ag=af.firstChild;var ae=null;do{if(!ag){break}if(ag.tagName==="LI"){ae=ag}}while(ag=ag.nextSibling);return ae}function ad(af,ae){while(af.childNodes.length>0){ae.appendChild(af.childNodes[0])}}ab=U.parentNode.previousSibling;if(!ab){return}var Z;if(ab.tagName==="UL"||ab.tagName==="OL"){Z=ab}else{if(ab.previousSibling&&(ab.previousSibling.tagName==="UL"||ab.previousSibling.tagName==="OL")){Z=ab.previousSibling}else{return}}var ac=V(Z);var T=W.dom.createRng();T.setStart(ac,1);T.setEnd(ac,1);W.selection.setRng(T);W.selection.collapse(true);var X=W.selection.getBookmark();var aa=U.parentNode.cloneNode(true);if(aa.tagName==="P"||aa.tagName==="DIV"){ad(aa,ac)}else{ac.appendChild(aa)}U.parentNode.parentNode.removeChild(U.parentNode);W.selection.moveToBookmark(X)}function G(T){var U=y.dom.getParent(T,"ol,ul");if(U!=null){var V=U.lastChild;V.appendChild(y.getDoc().createElement(""));y.selection.setCursorLocation(V,0)}}this.ed=y;y.addCommand("Indent",this.indent,this);y.addCommand("Outdent",this.outdent,this);y.addCommand("InsertUnorderedList",function(){this.applyList("UL","OL")},this);y.addCommand("InsertOrderedList",function(){this.applyList("OL","UL")},this);y.onInit.add(function(){y.editorCommands.addCommands({outdent:function(){var U=y.selection,V=y.dom;function T(W){W=V.getParent(W,V.isBlock);return W&&(parseInt(y.dom.getStyle(W,"margin-left")||0,10)+parseInt(y.dom.getStyle(W,"padding-left")||0,10))>0}return T(U.getStart())||T(U.getEnd())||y.queryCommandState("InsertOrderedList")||y.queryCommandState("InsertUnorderedList")}},"state")});y.onKeyUp.add(function(U,V){if(x==v){U.execCommand(V.shiftKey?"Outdent":"Indent",true,null);x=M;return r.cancel(V)}else{if(x==s){var T=B();var X=U.settings.list_outdent_on_enter===true||V.shiftKey;U.execCommand(X?"Outdent":"Indent",true,null);if(tinymce.isIE){G(T)}return r.cancel(V)}else{if(x==I){if(tinymce.isIE8){var W=U.getDoc().createTextNode("\uFEFF");U.selection.getNode().appendChild(W)}else{if(tinymce.isIE9||tinymce.isGecko){U.execCommand("Outdent");return r.cancel(V)}}}}}});function K(U,T){var V=y.getDoc().createTextNode("\uFEFF");U.insertBefore(V,T);y.selection.setCursorLocation(V,0);y.execCommand("mceRepaint")}function Q(U,W){if(S(W)){var T=B();if(T){var V=T.parentNode;var X=V&&V.parentNode;if(X&&X.nodeName=="LI"&&X.firstChild==V&&T==V.firstChild){K(X,V)}}}}function R(U,W){if(S(W)){var T=B();if(U.dom.select("ul li",T).length===1){var V=T.firstChild;K(T,V)}}}function P(U,Y){function V(ac,Z){var ab=[];var ad=new tinymce.dom.TreeWalker(Z,ac);for(var aa=ad.current();aa;aa=ad.next()){if(U.dom.is(aa,"ol,ul,li")){ab.push(aa)}}return ab}if(Y.keyCode==tinymce.VK.BACKSPACE){var T=B();if(T){var X=U.dom.getParent(T,"ol,ul");if(X&&X.firstChild===T){var W=V(X,T);U.execCommand("Outdent",false,W);U.undoManager.add();return r.cancel(Y)}}}}y.onKeyDown.add(function(T,U){x=L(U)});y.onKeyDown.add(C);y.onKeyDown.add(u);y.onKeyDown.add(J);if(tinymce.isGecko){y.onKeyUp.add(Q)}if(tinymce.isIE8){y.onKeyUp.add(R)}if(tinymce.isGecko||tinymce.isWebKit){y.onKeyDown.add(P)}},applyList:function(y,v){var C=this,z=C.ed,I=z.dom,s=[],H=false,u=false,w=false,B,G=z.selection.getSelectedBlocks();function E(t){if(t&&t.tagName==="BR"){I.remove(t)}}function F(M){var N=I.create(y),t;function L(O){if(O.style.marginLeft||O.style.paddingLeft){C.adjustPaddingFunction(false)(O)}}if(M.tagName==="LI"){}else{if(M.tagName==="P"||M.tagName==="DIV"||M.tagName==="BODY"){K(M,function(P,O){J(P,O,M.tagName==="BODY"?null:P.parentNode);t=P.parentNode;L(t);E(O)});if(t){if(t.tagName==="LI"&&(M.tagName==="P"||G.length>1)){I.split(t.parentNode.parentNode,t.parentNode)}m(t.parentNode,true)}return}else{t=I.create("li");I.insertAfter(t,M);t.appendChild(M);L(M);M=t}}I.insertAfter(N,M);N.appendChild(M);m(N,true);s.push(M)}function J(P,L,N){var t,O=P,M;while(!I.isBlock(P.parentNode)&&P.parentNode!==I.getRoot()){P=I.split(P.parentNode,P.previousSibling);P=P.nextSibling;O=P}if(N){t=N.cloneNode(true);P.parentNode.insertBefore(t,P);while(t.firstChild){I.remove(t.firstChild)}t=I.rename(t,"li")}else{t=I.create("li");P.parentNode.insertBefore(t,P)}while(O&&O!=L){M=O.nextSibling;t.appendChild(O);O=M}if(t.childNodes.length===0){t.innerHTML='<br _mce_bogus="1" />'}F(t)}function K(Q,T){var N,R,O=3,L=1,t="br,ul,ol,p,div,h1,h2,h3,h4,h5,h6,table,blockquote,address,pre,form,center,dl";function P(X,U){var V=I.createRng(),W;g.keep=true;z.selection.moveToBookmark(g);g.keep=false;W=z.selection.getRng(true);if(!U){U=X.parentNode.lastChild}V.setStartBefore(X);V.setEndAfter(U);return !(V.compareBoundaryPoints(O,W)>0||V.compareBoundaryPoints(L,W)<=0)}function S(U){if(U.nextSibling){return U.nextSibling}if(!I.isBlock(U.parentNode)&&U.parentNode!==I.getRoot()){return S(U.parentNode)}}N=Q.firstChild;var M=false;e(I.select(t,Q),function(U){if(U.hasAttribute&&U.hasAttribute("_mce_bogus")){return true}if(P(N,U)){I.addClass(U,"_mce_tagged_br");N=S(U)}});M=(N&&P(N,undefined));N=Q.firstChild;e(I.select(t,Q),function(V){var U=S(V);if(V.hasAttribute&&V.hasAttribute("_mce_bogus")){return true}if(I.hasClass(V,"_mce_tagged_br")){T(N,V,R);R=null}else{R=V}N=U});if(M){T(N,undefined,R)}}function D(t){K(t,function(M,L,N){J(M,L);E(L);E(N)})}function A(t){if(tinymce.inArray(s,t)!==-1){return}if(t.parentNode.tagName===v){I.split(t.parentNode,t);F(t);o(t.parentNode,false)}s.push(t)}function x(M){var O,N,L,t;if(tinymce.inArray(s,M)!==-1){return}M=c(M,I);while(I.is(M.parentNode,"ol,ul,li")){I.split(M.parentNode,M)}s.push(M);M=I.rename(M,"p");L=m(M,false,z.settings.force_br_newlines);if(L===M){O=M.firstChild;while(O){if(I.isBlock(O)){O=I.split(O.parentNode,O);t=true;N=O.nextSibling&&O.nextSibling.firstChild}else{N=O.nextSibling;if(t&&O.tagName==="BR"){I.remove(O)}t=false}O=N}}}e(G,function(t){t=k(t,I);if(t.tagName===v||(t.tagName==="LI"&&t.parentNode.tagName===v)){u=true}else{if(t.tagName===y||(t.tagName==="LI"&&t.parentNode.tagName===y)){H=true}else{w=true}}});if(w&&!H||u||G.length===0){B={LI:A,H1:F,H2:F,H3:F,H4:F,H5:F,H6:F,P:F,BODY:F,DIV:G.length>1?F:D,defaultAction:D,elements:this.selectedBlocks()}}else{B={defaultAction:x,elements:this.selectedBlocks()}}this.process(B)},indent:function(){var u=this.ed,w=u.dom,x=[];function s(z){var y=w.create("li",{style:"list-style-type: none;"});w.insertAfter(y,z);return y}function t(B){var y=s(B),D=w.getParent(B,"ol,ul"),C=D.tagName,E=w.getStyle(D,"list-style-type"),A={},z;if(E!==""){A.style="list-style-type: "+E+";"}z=w.create(C,A);y.appendChild(z);return z}function v(z){if(!d(u,z,x)){z=c(z,w);var y=t(z);y.appendChild(z);m(y.parentNode,false);m(y,false);x.push(z)}}this.process({LI:v,defaultAction:this.adjustPaddingFunction(true),elements:this.selectedBlocks()})},outdent:function(y,x){var w=this,u=w.ed,z=u.dom,s=[];function A(t){var C,B,D;if(!d(u,t,s)){if(z.getStyle(t,"margin-left")!==""||z.getStyle(t,"padding-left")!==""){return w.adjustPaddingFunction(false)(t)}D=z.getStyle(t,"text-align",true);if(D==="center"||D==="right"){z.setStyle(t,"text-align","left");return}t=c(t,z);C=t.parentNode;B=t.parentNode.parentNode;if(B.tagName==="P"){z.split(B,t.parentNode)}else{z.split(C,t);if(B.tagName==="LI"){z.split(B,t)}else{if(!z.is(B,"ol,ul")){z.rename(t,"p")}}}s.push(t)}}var v=x&&tinymce.is(x,"array")?x:this.selectedBlocks();this.process({LI:A,defaultAction:this.adjustPaddingFunction(false),elements:v});e(s,m)},process:function(y){var F=this,w=F.ed.selection,z=F.ed.dom,E,u;function B(t){var s=tinymce.grep(t.childNodes,function(H){return !(H.nodeName==="BR"||H.nodeName==="SPAN"&&z.getAttrib(H,"data-mce-type")=="bookmark"||H.nodeType==3&&(H.nodeValue==String.fromCharCode(160)||H.nodeValue==""))});return s.length===0}function x(s){z.removeClass(s,"_mce_act_on");if(!s||s.nodeType!==1||E.length>1&&B(s)){return}s=k(s,z);var t=y[s.tagName];if(!t){t=y.defaultAction}t(s)}function v(s){F.splitSafeEach(s.childNodes,x)}function C(s,t){return t>=0&&s.hasChildNodes()&&t<s.childNodes.length&&s.childNodes[t].tagName==="BR"}function D(){var t=w.getNode();var s=z.getParent(t,"td");return s!==null}E=y.elements;u=w.getRng(true);if(!u.collapsed){if(C(u.endContainer,u.endOffset-1)){u.setEnd(u.endContainer,u.endOffset-1);w.setRng(u)}if(C(u.startContainer,u.startOffset)){u.setStart(u.startContainer,u.startOffset+1);w.setRng(u)}}if(tinymce.isIE8){var G=F.ed.selection.getNode();if(G.tagName==="LI"&&!(G.parentNode.lastChild===G)){var A=F.ed.getDoc().createTextNode("\uFEFF");G.appendChild(A)}}g=w.getBookmark();y.OL=y.UL=v;F.splitSafeEach(E,x);w.moveToBookmark(g);g=null;if(!D()){F.ed.execCommand("mceRepaint")}},splitSafeEach:function(t,s){if(tinymce.isGecko&&(/Firefox\/[12]\.[0-9]/.test(navigator.userAgent)||/Firefox\/3\.[0-4]/.test(navigator.userAgent))){this.classBasedEach(t,s)}else{e(t,s)}},classBasedEach:function(v,u){var w=this.ed.dom,s,t;e(v,function(x){w.addClass(x,"_mce_act_on")});s=w.select("._mce_act_on");while(s.length>0){t=s.shift();w.removeClass(t,"_mce_act_on");u(t);s=w.select("._mce_act_on")}},adjustPaddingFunction:function(u){var s,v,t=this.ed;s=t.settings.indentation;v=/[a-z%]+/i.exec(s);s=parseInt(s,10);return function(w){var y,x;y=parseInt(t.dom.getStyle(w,"margin-left")||0,10)+parseInt(t.dom.getStyle(w,"padding-left")||0,10);if(u){x=y+s}else{x=y-s}t.dom.setStyle(w,"padding-left","");t.dom.setStyle(w,"margin-left",x>0?x+v:"")}},selectedBlocks:function(){var s=this.ed;var t=s.selection.getSelectedBlocks();return t.length==0?[s.dom.getRoot()]:t},getInfo:function(){return{longname:"Lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/lists",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("lists",tinymce.plugins.Lists)}());
diff --git a/js/tiny_mce/plugins/media/editor_plugin.js b/js/tiny_mce/plugins/media/editor_plugin.js
index 37b4320bd9f..a03f7d60b96 100644
--- a/js/tiny_mce/plugins/media/editor_plugin.js
+++ b/js/tiny_mce/plugins/media/editor_plugin.js
@@ -1 +1 @@
-(function(){var d=tinymce.explode("id,name,width,height,style,align,class,hspace,vspace,bgcolor,type"),h=tinymce.makeMap(d.join(",")),b=tinymce.html.Node,f,a,g=tinymce.util.JSON,e;f=[["Flash","d27cdb6e-ae6d-11cf-96b8-444553540000","application/x-shockwave-flash","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["ShockWave","166b1bca-3f9c-11cf-8075-444553540000","application/x-director","http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],["WindowsMedia","6bf52a52-394a-11d3-b153-00c04f79faa6,22d6f312-b0f6-11d0-94ab-0080c74c7e95,05589fa1-c356-11ce-bf01-00aa0055595a","application/x-mplayer2","http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701"],["QuickTime","02bf25d5-8c17-4b23-bc80-d3488abddc6b","video/quicktime","http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],["RealMedia","cfcdaa03-8be4-11cf-b84b-0020afbbccfa","audio/x-pn-realaudio-plugin","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["Java","8ad9c840-044e-11d1-b3e9-00805f499d93","application/x-java-applet","http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],["Silverlight","dfeaf541-f3e1-4c24-acac-99c30715084a","application/x-silverlight-2"],["Iframe"],["Video"],["EmbeddedAudio"],["Audio"]];function c(m){var l,j,k;if(m&&!m.splice){j=[];for(k=0;true;k++){if(m[k]){j[k]=m[k]}else{break}}return j}return m}tinymce.create("tinymce.plugins.MediaPlugin",{init:function(n,j){var r=this,l={},m,p,q,k;function o(i){return i&&i.nodeName==="IMG"&&n.dom.hasClass(i,"mceItemMedia")}r.editor=n;r.url=j;a="";for(m=0;m<f.length;m++){k=f[m][0];q={name:k,clsids:tinymce.explode(f[m][1]||""),mimes:tinymce.explode(f[m][2]||""),codebase:f[m][3]};for(p=0;p<q.clsids.length;p++){l["clsid:"+q.clsids[p]]=q}for(p=0;p<q.mimes.length;p++){l[q.mimes[p]]=q}l["mceItem"+k]=q;l[k.toLowerCase()]=q;a+=(a?"|":"")+k}tinymce.each(n.getParam("media_types","video=mp4,m4v,ogv,webm;silverlight=xap;flash=swf,flv;shockwave=dcr;quicktime=mov,qt,mpg,mpeg;shockwave=dcr;windowsmedia=avi,wmv,wm,asf,asx,wmx,wvx;realmedia=rm,ra,ram;java=jar;audio=mp3,ogg").split(";"),function(v){var s,u,t;v=v.split(/=/);u=tinymce.explode(v[1].toLowerCase());for(s=0;s<u.length;s++){t=l[v[0].toLowerCase()];if(t){l[u[s]]=t}}});a=new RegExp("write("+a+")\\(([^)]+)\\)");r.lookup=l;n.onPreInit.add(function(){n.schema.addValidElements("object[id|style|width|height|classid|codebase|*],param[name|value],embed[id|style|width|height|type|src|*],video[*],audio[*],source[*]");n.parser.addNodeFilter("object,embed,video,audio,script,iframe",function(s){var t=s.length;while(t--){r.objectToImg(s[t])}});n.serializer.addNodeFilter("img",function(s,u,t){var v=s.length,w;while(v--){w=s[v];if((w.attr("class")||"").indexOf("mceItemMedia")!==-1){r.imgToObject(w,t)}}})});n.onInit.add(function(){if(n.theme&&n.theme.onResolveName){n.theme.onResolveName.add(function(i,s){if(s.name==="img"&&n.dom.hasClass(s.node,"mceItemMedia")){s.name="media"}})}if(n&&n.plugins.contextmenu){n.plugins.contextmenu.onContextMenu.add(function(s,t,i){if(i.nodeName==="IMG"&&i.className.indexOf("mceItemMedia")!==-1){t.add({title:"media.edit",icon:"media",cmd:"mceMedia"})}})}});n.addCommand("mceMedia",function(){var s,i;i=n.selection.getNode();if(o(i)){s=n.dom.getAttrib(i,"data-mce-json");if(s){s=g.parse(s);tinymce.each(d,function(t){var u=n.dom.getAttrib(i,t);if(u){s[t]=u}});s.type=r.getType(i.className).name.toLowerCase()}}if(!s){s={type:"flash",video:{sources:[]},params:{}}}n.windowManager.open({file:j+"/media.htm",width:430+parseInt(n.getLang("media.delta_width",0)),height:500+parseInt(n.getLang("media.delta_height",0)),inline:1},{plugin_url:j,data:s})});n.addButton("media",{title:"media.desc",cmd:"mceMedia"});n.onNodeChange.add(function(s,i,t){i.setActive("media",o(t))})},convertUrl:function(k,n){var j=this,m=j.editor,l=m.settings,o=l.url_converter,i=l.url_converter_scope||j;if(!k){return k}if(n){return m.documentBaseURI.toAbsolute(k)}return o.call(i,k,"src","object")},getInfo:function(){return{longname:"Media",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media",version:tinymce.majorVersion+"."+tinymce.minorVersion}},dataToImg:function(m,k){var r=this,o=r.editor,p=o.documentBaseURI,j,q,n,l;m.params.src=r.convertUrl(m.params.src,k);q=m.video.attrs;if(q){q.src=r.convertUrl(q.src,k)}if(q){q.poster=r.convertUrl(q.poster,k)}j=c(m.video.sources);if(j){for(l=0;l<j.length;l++){j[l].src=r.convertUrl(j[l].src,k)}}n=r.editor.dom.create("img",{id:m.id,style:m.style,align:m.align,hspace:m.hspace,vspace:m.vspace,src:r.editor.theme.url+"/img/trans.gif","class":"mceItemMedia mceItem"+r.getType(m.type).name,"data-mce-json":g.serialize(m,"'")});n.width=m.width||(m.type=="audio"?"300":"320");n.height=m.height||(m.type=="audio"?"32":"240");return n},dataToHtml:function(i,j){return this.editor.serializer.serialize(this.dataToImg(i,j),{forced_root_block:"",force_absolute:j})},htmlToData:function(k){var j,i,l;l={type:"flash",video:{sources:[]},params:{}};j=this.editor.parser.parse(k);i=j.getAll("img")[0];if(i){l=g.parse(i.attr("data-mce-json"));l.type=this.getType(i.attr("class")).name.toLowerCase();tinymce.each(d,function(m){var n=i.attr(m);if(n){l[m]=n}})}return l},getType:function(m){var k,j,l;j=tinymce.explode(m," ");for(k=0;k<j.length;k++){l=this.lookup[j[k]];if(l){return l}}},imgToObject:function(z,o){var u=this,p=u.editor,C,H,j,t,I,y,G,w,k,E,s,q,A,D,m,x,l,B,F;function r(i,n){var M,L,N,K,J;J=p.getParam("flash_video_player_url",u.convertUrl(u.url+"/moxieplayer.swf"));if(J){M=p.documentBaseURI;G.params.src=J;if(p.getParam("flash_video_player_absvideourl",true)){i=M.toAbsolute(i||"",true);n=M.toAbsolute(n||"",true)}N="";L=p.getParam("flash_video_player_flashvars",{url:"$url",poster:"$poster"});tinymce.each(L,function(P,O){P=P.replace(/\$url/,i||"");P=P.replace(/\$poster/,n||"");if(P.length>0){N+=(N?"&":"")+O+"="+escape(P)}});if(N.length){G.params.flashvars=N}K=p.getParam("flash_video_player_params",{allowfullscreen:true,allowscriptaccess:true});tinymce.each(K,function(P,O){G.params[O]=""+P})}}G=z.attr("data-mce-json");if(!G){return}G=g.parse(G);q=this.getType(z.attr("class"));B=z.attr("data-mce-style");if(!B){B=z.attr("style");if(B){B=p.dom.serializeStyle(p.dom.parseStyle(B,"img"))}}if(q.name==="Iframe"){x=new b("iframe",1);tinymce.each(d,function(i){var n=z.attr(i);if(i=="class"&&n){n=n.replace(/mceItem.+ ?/g,"")}if(n&&n.length>0){x.attr(i,n)}});for(I in G.params){x.attr(I,G.params[I])}x.attr({style:B,src:G.params.src});z.replace(x);return}if(this.editor.settings.media_use_script){x=new b("script",1).attr("type","text/javascript");y=new b("#text",3);y.value="write"+q.name+"("+g.serialize(tinymce.extend(G.params,{width:z.attr("width"),height:z.attr("height")}))+");";x.append(y);z.replace(x);return}if(q.name==="Video"&&G.video.sources[0]){C=new b("video",1).attr(tinymce.extend({id:z.attr("id"),width:z.attr("width"),height:z.attr("height"),style:B},G.video.attrs));if(G.video.attrs){l=G.video.attrs.poster}k=G.video.sources=c(G.video.sources);for(A=0;A<k.length;A++){if(/\.mp4$/.test(k[A].src)){m=k[A].src}}if(!k[0].type){C.attr("src",k[0].src);k.splice(0,1)}for(A=0;A<k.length;A++){w=new b("source",1).attr(k[A]);w.shortEnded=true;C.append(w)}if(m){r(m,l);q=u.getType("flash")}else{G.params.src=""}}if(q.name==="Audio"&&G.video.sources[0]){F=new b("audio",1).attr(tinymce.extend({id:z.attr("id"),width:z.attr("width"),height:z.attr("height"),style:B},G.video.attrs));if(G.video.attrs){l=G.video.attrs.poster}k=G.video.sources=c(G.video.sources);if(!k[0].type){F.attr("src",k[0].src);k.splice(0,1)}for(A=0;A<k.length;A++){w=new b("source",1).attr(k[A]);w.shortEnded=true;F.append(w)}G.params.src=""}if(q.name==="EmbeddedAudio"){j=new b("embed",1);j.shortEnded=true;j.attr({id:z.attr("id"),width:z.attr("width"),height:z.attr("height"),style:B,type:z.attr("type")});for(I in G.params){j.attr(I,G.params[I])}tinymce.each(d,function(i){if(G[i]&&i!="type"){j.attr(i,G[i])}});G.params.src=""}if(G.params.src){if(/\.flv$/i.test(G.params.src)){r(G.params.src,"")}if(o&&o.force_absolute){G.params.src=p.documentBaseURI.toAbsolute(G.params.src)}H=new b("object",1).attr({id:z.attr("id"),width:z.attr("width"),height:z.attr("height"),style:B});tinymce.each(d,function(i){var n=G[i];if(i=="class"&&n){n=n.replace(/mceItem.+ ?/g,"")}if(n&&i!="type"){H.attr(i,n)}});for(I in G.params){s=new b("param",1);s.shortEnded=true;y=G.params[I];if(I==="src"&&q.name==="WindowsMedia"){I="url"}s.attr({name:I,value:y});H.append(s)}if(this.editor.getParam("media_strict",true)){H.attr({data:G.params.src,type:q.mimes[0]})}else{H.attr({classid:"clsid:"+q.clsids[0],codebase:q.codebase});j=new b("embed",1);j.shortEnded=true;j.attr({id:z.attr("id"),width:z.attr("width"),height:z.attr("height"),style:B,type:q.mimes[0]});for(I in G.params){j.attr(I,G.params[I])}tinymce.each(d,function(i){if(G[i]&&i!="type"){j.attr(i,G[i])}});H.append(j)}if(G.object_html){y=new b("#text",3);y.raw=true;y.value=G.object_html;H.append(y)}if(C){C.append(H)}}if(C){if(G.video_html){y=new b("#text",3);y.raw=true;y.value=G.video_html;C.append(y)}}if(F){if(G.video_html){y=new b("#text",3);y.raw=true;y.value=G.video_html;F.append(y)}}var v=C||F||H||j;if(v){z.replace(v)}else{z.remove()}},objectToImg:function(C){var L,k,F,s,M,N,y,A,x,G,E,t,q,I,B,l,K,o,H=this.lookup,m,z,v=this.editor.settings.url_converter,n=this.editor.settings.url_converter_scope,w,r,D,j;function u(i){return new tinymce.html.Serializer({inner:true,validate:false}).serialize(i)}function J(O,i){return H[(O.attr(i)||"").toLowerCase()]}function p(O){var i=O.replace(/^.*\.([^.]+)$/,"$1");return H[i.toLowerCase()||""]}if(!C.parent){return}if(C.name==="script"){if(C.firstChild){m=a.exec(C.firstChild.value)}if(!m){return}o=m[1];K={video:{},params:g.parse(m[2])};A=K.params.width;x=K.params.height}K=K||{video:{},params:{}};M=new b("img",1);M.attr({src:this.editor.theme.url+"/img/trans.gif"});N=C.name;if(N==="video"||N=="audio"){F=C;L=C.getAll("object")[0];k=C.getAll("embed")[0];A=F.attr("width");x=F.attr("height");y=F.attr("id");K.video={attrs:{},sources:[]};z=K.video.attrs;for(N in F.attributes.map){z[N]=F.attributes.map[N]}B=C.attr("src");if(B){K.video.sources.push({src:v.call(n,B,"src",C.name)})}l=F.getAll("source");for(E=0;E<l.length;E++){B=l[E].remove();K.video.sources.push({src:v.call(n,B.attr("src"),"src","source"),type:B.attr("type"),media:B.attr("media")})}if(z.poster){z.poster=v.call(n,z.poster,"poster",C.name)}}if(C.name==="object"){L=C;k=C.getAll("embed")[0]}if(C.name==="embed"){k=C}if(C.name==="iframe"){s=C;o="Iframe"}if(L){A=A||L.attr("width");x=x||L.attr("height");G=G||L.attr("style");y=y||L.attr("id");w=w||L.attr("hspace");r=r||L.attr("vspace");D=D||L.attr("align");j=j||L.attr("bgcolor");K.name=L.attr("name");I=L.getAll("param");for(E=0;E<I.length;E++){q=I[E];N=q.remove().attr("name");if(!h[N]){K.params[N]=q.attr("value")}}K.params.src=K.params.src||L.attr("data")}if(k){A=A||k.attr("width");x=x||k.attr("height");G=G||k.attr("style");y=y||k.attr("id");w=w||k.attr("hspace");r=r||k.attr("vspace");D=D||k.attr("align");j=j||k.attr("bgcolor");for(N in k.attributes.map){if(!h[N]&&!K.params[N]){K.params[N]=k.attributes.map[N]}}}if(s){A=s.attr("width");x=s.attr("height");G=G||s.attr("style");y=s.attr("id");w=s.attr("hspace");r=s.attr("vspace");D=s.attr("align");j=s.attr("bgcolor");tinymce.each(d,function(i){M.attr(i,s.attr(i))});for(N in s.attributes.map){if(!h[N]&&!K.params[N]){K.params[N]=s.attributes.map[N]}}}if(K.params.movie){K.params.src=K.params.src||K.params.movie;delete K.params.movie}if(K.params.src){K.params.src=v.call(n,K.params.src,"src","object")}if(F){if(C.name==="video"){o=H.video.name}else{if(C.name==="audio"){o=H.audio.name}}}if(L&&!o){o=(J(L,"clsid")||J(L,"classid")||J(L,"type")||{}).name}if(k&&!o){o=(J(k,"type")||p(K.params.src)||{}).name}if(k&&o=="EmbeddedAudio"){K.params.type=k.attr("type")}C.replace(M);if(k){k.remove()}if(L){t=u(L.remove());if(t){K.object_html=t}}if(F){t=u(F.remove());if(t){K.video_html=t}}K.hspace=w;K.vspace=r;K.align=D;K.bgcolor=j;M.attr({id:y,"class":"mceItemMedia mceItem"+(o||"Flash"),style:G,width:A||(C.name=="audio"?"300":"320"),height:x||(C.name=="audio"?"32":"240"),hspace:w,vspace:r,align:D,bgcolor:j,"data-mce-json":g.serialize(K,"'")})}});tinymce.PluginManager.add("media",tinymce.plugins.MediaPlugin)})();
\ No newline at end of file
+(function(){var d=tinymce.explode("id,name,width,height,style,align,class,hspace,vspace,bgcolor,type"),h=tinymce.makeMap(d.join(",")),b=tinymce.html.Node,f,a,g=tinymce.util.JSON,e;f=[["Flash","d27cdb6e-ae6d-11cf-96b8-444553540000","application/x-shockwave-flash","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["ShockWave","166b1bca-3f9c-11cf-8075-444553540000","application/x-director","http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],["WindowsMedia","6bf52a52-394a-11d3-b153-00c04f79faa6,22d6f312-b0f6-11d0-94ab-0080c74c7e95,05589fa1-c356-11ce-bf01-00aa0055595a","application/x-mplayer2","http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701"],["QuickTime","02bf25d5-8c17-4b23-bc80-d3488abddc6b","video/quicktime","http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],["RealMedia","cfcdaa03-8be4-11cf-b84b-0020afbbccfa","audio/x-pn-realaudio-plugin","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["Java","8ad9c840-044e-11d1-b3e9-00805f499d93","application/x-java-applet","http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],["Silverlight","dfeaf541-f3e1-4c24-acac-99c30715084a","application/x-silverlight-2"],["Iframe"],["Video"],["EmbeddedAudio"],["Audio"]];function c(m){var l,j,k;if(m&&!m.splice){j=[];for(k=0;true;k++){if(m[k]){j[k]=m[k]}else{break}}return j}return m}tinymce.create("tinymce.plugins.MediaPlugin",{init:function(n,j){var r=this,l={},m,p,q,k;function o(i){return i&&i.nodeName==="IMG"&&n.dom.hasClass(i,"mceItemMedia")}r.editor=n;r.url=j;a="";for(m=0;m<f.length;m++){k=f[m][0];q={name:k,clsids:tinymce.explode(f[m][1]||""),mimes:tinymce.explode(f[m][2]||""),codebase:f[m][3]};for(p=0;p<q.clsids.length;p++){l["clsid:"+q.clsids[p]]=q}for(p=0;p<q.mimes.length;p++){l[q.mimes[p]]=q}l["mceItem"+k]=q;l[k.toLowerCase()]=q;a+=(a?"|":"")+k}tinymce.each(n.getParam("media_types","video=mp4,m4v,ogv,webm;silverlight=xap;flash=swf,flv;shockwave=dcr;quicktime=mov,qt,mpg,mpeg;shockwave=dcr;windowsmedia=avi,wmv,wm,asf,asx,wmx,wvx;realmedia=rm,ra,ram;java=jar;audio=mp3,ogg").split(";"),function(v){var s,u,t;v=v.split(/=/);u=tinymce.explode(v[1].toLowerCase());for(s=0;s<u.length;s++){t=l[v[0].toLowerCase()];if(t){l[u[s]]=t}}});a=new RegExp("write("+a+")\\(([^)]+)\\)");r.lookup=l;n.onPreInit.add(function(){n.schema.addValidElements("object[id|style|width|height|classid|codebase|*],param[name|value],embed[id|style|width|height|type|src|*],video[*],audio[*],source[*]");n.parser.addNodeFilter("object,embed,video,audio,script,iframe",function(s){var t=s.length;while(t--){r.objectToImg(s[t])}});n.serializer.addNodeFilter("img",function(s,u,t){var v=s.length,w;while(v--){w=s[v];if((w.attr("class")||"").indexOf("mceItemMedia")!==-1){r.imgToObject(w,t)}}})});n.onInit.add(function(){if(n.theme&&n.theme.onResolveName){n.theme.onResolveName.add(function(i,s){if(s.name==="img"&&n.dom.hasClass(s.node,"mceItemMedia")){s.name="media"}})}if(n&&n.plugins.contextmenu){n.plugins.contextmenu.onContextMenu.add(function(s,t,i){if(i.nodeName==="IMG"&&i.className.indexOf("mceItemMedia")!==-1){t.add({title:"media.edit",icon:"media",cmd:"mceMedia"})}})}});n.addCommand("mceMedia",function(){var s,i;i=n.selection.getNode();if(o(i)){s=n.dom.getAttrib(i,"data-mce-json");if(s){s=g.parse(s);tinymce.each(d,function(t){var u=n.dom.getAttrib(i,t);if(u){s[t]=u}});s.type=r.getType(i.className).name.toLowerCase()}}if(!s){s={type:"flash",video:{sources:[]},params:{}}}n.windowManager.open({file:j+"/media.htm",width:430+parseInt(n.getLang("media.delta_width",0)),height:500+parseInt(n.getLang("media.delta_height",0)),inline:1},{plugin_url:j,data:s})});n.addButton("media",{title:"media.desc",cmd:"mceMedia"});n.onNodeChange.add(function(s,i,t){i.setActive("media",o(t))})},convertUrl:function(k,n){var j=this,m=j.editor,l=m.settings,o=l.url_converter,i=l.url_converter_scope||j;if(!k){return k}if(n){return m.documentBaseURI.toAbsolute(k)}return o.call(i,k,"src","object")},getInfo:function(){return{longname:"Media",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media",version:tinymce.majorVersion+"."+tinymce.minorVersion}},dataToImg:function(m,k){var r=this,o=r.editor,p=o.documentBaseURI,j,q,n,l;m.params.src=r.convertUrl(m.params.src,k);q=m.video.attrs;if(q){q.src=r.convertUrl(q.src,k)}if(q){q.poster=r.convertUrl(q.poster,k)}j=c(m.video.sources);if(j){for(l=0;l<j.length;l++){j[l].src=r.convertUrl(j[l].src,k)}}n=r.editor.dom.create("img",{id:m.id,style:m.style,align:m.align,hspace:m.hspace,vspace:m.vspace,src:r.editor.theme.url+"/img/trans.gif","class":"mceItemMedia mceItem"+r.getType(m.type).name,"data-mce-json":g.serialize(m,"'")});n.width=m.width||(m.type=="audio"?"300":"320");n.height=m.height||(m.type=="audio"?"32":"240");return n},dataToHtml:function(i,j){return this.editor.serializer.serialize(this.dataToImg(i,j),{forced_root_block:"",force_absolute:j})},htmlToData:function(k){var j,i,l;l={type:"flash",video:{sources:[]},params:{}};j=this.editor.parser.parse(k);i=j.getAll("img")[0];if(i){l=g.parse(i.attr("data-mce-json"));l.type=this.getType(i.attr("class")).name.toLowerCase();tinymce.each(d,function(m){var n=i.attr(m);if(n){l[m]=n}})}return l},getType:function(m){var k,j,l;j=tinymce.explode(m," ");for(k=0;k<j.length;k++){l=this.lookup[j[k]];if(l){return l}}},imgToObject:function(z,o){var u=this,p=u.editor,C,H,j,t,I,y,G,w,k,E,s,q,A,D,m,x,l,B,F;function r(i,n){var M,L,N,K,J;J=p.getParam("flash_video_player_url",u.convertUrl(u.url+"/moxieplayer.swf"));if(J){M=p.documentBaseURI;G.params.src=J;if(p.getParam("flash_video_player_absvideourl",true)){i=M.toAbsolute(i||"",true);n=M.toAbsolute(n||"",true)}N="";L=p.getParam("flash_video_player_flashvars",{url:"$url",poster:"$poster"});tinymce.each(L,function(P,O){P=P.replace(/\$url/,i||"");P=P.replace(/\$poster/,n||"");if(P.length>0){N+=(N?"&":"")+O+"="+escape(P)}});if(N.length){G.params.flashvars=N}K=p.getParam("flash_video_player_params",{allowfullscreen:true,allowscriptaccess:true});tinymce.each(K,function(P,O){G.params[O]=""+P})}}G=z.attr("data-mce-json");if(!G){return}G=g.parse(G);q=this.getType(z.attr("class"));B=z.attr("data-mce-style");if(!B){B=z.attr("style");if(B){B=p.dom.serializeStyle(p.dom.parseStyle(B,"img"))}}if(q.name==="Iframe"){x=new b("iframe",1);tinymce.each(d,function(i){var n=z.attr(i);if(i=="class"&&n){n=n.replace(/mceItem.+ ?/g,"")}if(n&&n.length>0){x.attr(i,n)}});for(I in G.params){x.attr(I,G.params[I])}x.attr({style:B,src:G.params.src});z.replace(x);return}if(this.editor.settings.media_use_script){x=new b("script",1).attr("type","text/javascript");y=new b("#text",3);y.value="write"+q.name+"("+g.serialize(tinymce.extend(G.params,{width:z.attr("width"),height:z.attr("height")}))+");";x.append(y);z.replace(x);return}if(q.name==="Video"&&G.video.sources[0]){C=new b("video",1).attr(tinymce.extend({id:z.attr("id"),width:z.attr("width"),height:z.attr("height"),style:B},G.video.attrs));if(G.video.attrs){l=G.video.attrs.poster}k=G.video.sources=c(G.video.sources);for(A=0;A<k.length;A++){if(/\.mp4$/.test(k[A].src)){m=k[A].src}}if(!k[0].type){C.attr("src",k[0].src);k.splice(0,1)}for(A=0;A<k.length;A++){w=new b("source",1).attr(k[A]);w.shortEnded=true;C.append(w)}if(m){r(m,l);q=u.getType("flash")}else{G.params.src=""}}if(q.name==="Audio"&&G.video.sources[0]){F=new b("audio",1).attr(tinymce.extend({id:z.attr("id"),width:z.attr("width"),height:z.attr("height"),style:B},G.video.attrs));if(G.video.attrs){l=G.video.attrs.poster}k=G.video.sources=c(G.video.sources);if(!k[0].type){F.attr("src",k[0].src);k.splice(0,1)}for(A=0;A<k.length;A++){w=new b("source",1).attr(k[A]);w.shortEnded=true;F.append(w)}G.params.src=""}if(q.name==="EmbeddedAudio"){j=new b("embed",1);j.shortEnded=true;j.attr({id:z.attr("id"),width:z.attr("width"),height:z.attr("height"),style:B,type:z.attr("type")});for(I in G.params){j.attr(I,G.params[I])}tinymce.each(d,function(i){if(G[i]&&i!="type"){j.attr(i,G[i])}});G.params.src=""}if(G.params.src){if(/\.flv$/i.test(G.params.src)){r(G.params.src,"")}if(o&&o.force_absolute){G.params.src=p.documentBaseURI.toAbsolute(G.params.src)}H=new b("object",1).attr({id:z.attr("id"),width:z.attr("width"),height:z.attr("height"),style:B});tinymce.each(d,function(i){var n=G[i];if(i=="class"&&n){n=n.replace(/mceItem.+ ?/g,"")}if(n&&i!="type"){H.attr(i,n)}});for(I in G.params){s=new b("param",1);s.shortEnded=true;y=G.params[I];if(I==="src"&&q.name==="WindowsMedia"){I="url"}s.attr({name:I,value:y});H.append(s)}if(this.editor.getParam("media_strict",true)){H.attr({data:G.params.src,type:q.mimes[0]})}else{H.attr({classid:"clsid:"+q.clsids[0],codebase:q.codebase});j=new b("embed",1);j.shortEnded=true;j.attr({id:z.attr("id"),width:z.attr("width"),height:z.attr("height"),style:B,type:q.mimes[0]});for(I in G.params){j.attr(I,G.params[I])}tinymce.each(d,function(i){if(G[i]&&i!="type"){j.attr(i,G[i])}});H.append(j)}if(G.object_html){y=new b("#text",3);y.raw=true;y.value=G.object_html;H.append(y)}if(C){C.append(H)}}if(C){if(G.video_html){y=new b("#text",3);y.raw=true;y.value=G.video_html;C.append(y)}}if(F){if(G.video_html){y=new b("#text",3);y.raw=true;y.value=G.video_html;F.append(y)}}var v=C||F||H||j;if(v){z.replace(v)}else{z.remove()}},objectToImg:function(C){var L,k,F,s,M,N,y,A,x,G,E,t,q,I,B,l,K,o,H=this.lookup,m,z,v=this.editor.settings.url_converter,n=this.editor.settings.url_converter_scope,w,r,D,j;function u(i){return new tinymce.html.Serializer({inner:true,validate:false}).serialize(i)}function J(O,i){return H[(O.attr(i)||"").toLowerCase()]}function p(O){var i=O.replace(/^.*\.([^.]+)$/,"$1");return H[i.toLowerCase()||""]}if(!C.parent){return}if(C.name==="script"){if(C.firstChild){m=a.exec(C.firstChild.value)}if(!m){return}o=m[1];K={video:{},params:g.parse(m[2])};A=K.params.width;x=K.params.height}K=K||{video:{},params:{}};M=new b("img",1);M.attr({src:this.editor.theme.url+"/img/trans.gif"});N=C.name;if(N==="video"||N=="audio"){F=C;L=C.getAll("object")[0];k=C.getAll("embed")[0];A=F.attr("width");x=F.attr("height");y=F.attr("id");K.video={attrs:{},sources:[]};z=K.video.attrs;for(N in F.attributes.map){z[N]=F.attributes.map[N]}B=C.attr("src");if(B){K.video.sources.push({src:v.call(n,B,"src",C.name)})}l=F.getAll("source");for(E=0;E<l.length;E++){B=l[E].remove();K.video.sources.push({src:v.call(n,B.attr("src"),"src","source"),type:B.attr("type"),media:B.attr("media")})}if(z.poster){z.poster=v.call(n,z.poster,"poster",C.name)}}if(C.name==="object"){L=C;k=C.getAll("embed")[0]}if(C.name==="embed"){k=C}if(C.name==="iframe"){s=C;o="Iframe"}if(L){A=A||L.attr("width");x=x||L.attr("height");G=G||L.attr("style");y=y||L.attr("id");w=w||L.attr("hspace");r=r||L.attr("vspace");D=D||L.attr("align");j=j||L.attr("bgcolor");K.name=L.attr("name");I=L.getAll("param");for(E=0;E<I.length;E++){q=I[E];N=q.remove().attr("name");if(!h[N]){K.params[N]=q.attr("value")}}K.params.src=K.params.src||L.attr("data")}if(k){A=A||k.attr("width");x=x||k.attr("height");G=G||k.attr("style");y=y||k.attr("id");w=w||k.attr("hspace");r=r||k.attr("vspace");D=D||k.attr("align");j=j||k.attr("bgcolor");for(N in k.attributes.map){if(!h[N]&&!K.params[N]){K.params[N]=k.attributes.map[N]}}}if(s){A=s.attr("width");x=s.attr("height");G=G||s.attr("style");y=s.attr("id");w=s.attr("hspace");r=s.attr("vspace");D=s.attr("align");j=s.attr("bgcolor");tinymce.each(d,function(i){M.attr(i,s.attr(i))});for(N in s.attributes.map){if(!h[N]&&!K.params[N]){K.params[N]=s.attributes.map[N]}}}if(K.params.movie){K.params.src=K.params.src||K.params.movie;delete K.params.movie}if(K.params.src){K.params.src=v.call(n,K.params.src,"src","object")}if(F){if(C.name==="video"){o=H.video.name}else{if(C.name==="audio"){o=H.audio.name}}}if(L&&!o){o=(J(L,"clsid")||J(L,"classid")||J(L,"type")||{}).name}if(k&&!o){o=(J(k,"type")||p(K.params.src)||{}).name}if(k&&o=="EmbeddedAudio"){K.params.type=k.attr("type")}C.replace(M);if(k){k.remove()}if(L){t=u(L.remove());if(t){K.object_html=t}}if(F){t=u(F.remove());if(t){K.video_html=t}}K.hspace=w;K.vspace=r;K.align=D;K.bgcolor=j;M.attr({id:y,"class":"mceItemMedia mceItem"+(o||"Flash"),style:G,width:A||(C.name=="audio"?"300":"320"),height:x||(C.name=="audio"?"32":"240"),hspace:w,vspace:r,align:D,bgcolor:j,"data-mce-json":g.serialize(K,"'")})}});tinymce.PluginManager.add("media",tinymce.plugins.MediaPlugin)})();
diff --git a/js/tiny_mce/plugins/nonbreaking/editor_plugin.js b/js/tiny_mce/plugins/nonbreaking/editor_plugin.js
index 687f5486690..be4a3344d7c 100644
--- a/js/tiny_mce/plugins/nonbreaking/editor_plugin.js
+++ b/js/tiny_mce/plugins/nonbreaking/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.Nonbreaking",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceNonBreaking",function(){a.execCommand("mceInsertContent",false,(a.plugins.visualchars&&a.plugins.visualchars.state)?'<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">&nbsp;</span>':"&nbsp;")});a.addButton("nonbreaking",{title:"nonbreaking.nonbreaking_desc",cmd:"mceNonBreaking"});if(a.getParam("nonbreaking_force_tab")){a.onKeyDown.add(function(d,f){if(f.keyCode==9){f.preventDefault();d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking")}})}},getInfo:function(){return{longname:"Nonbreaking space",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/nonbreaking",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("nonbreaking",tinymce.plugins.Nonbreaking)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.Nonbreaking",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceNonBreaking",function(){a.execCommand("mceInsertContent",false,(a.plugins.visualchars&&a.plugins.visualchars.state)?'<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">&nbsp;</span>':"&nbsp;")});a.addButton("nonbreaking",{title:"nonbreaking.nonbreaking_desc",cmd:"mceNonBreaking"});if(a.getParam("nonbreaking_force_tab")){a.onKeyDown.add(function(d,f){if(f.keyCode==9){f.preventDefault();d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking")}})}},getInfo:function(){return{longname:"Nonbreaking space",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/nonbreaking",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("nonbreaking",tinymce.plugins.Nonbreaking)})();
diff --git a/js/tiny_mce/plugins/nonbreaking/editor_plugin_src.js b/js/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
index d492fbefe41..674ef5186df 100644
--- a/js/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
@@ -51,4 +51,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('nonbreaking', tinymce.plugins.Nonbreaking);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/noneditable/editor_plugin.js b/js/tiny_mce/plugins/noneditable/editor_plugin.js
index 2d60138eecd..8f5294a4e64 100644
--- a/js/tiny_mce/plugins/noneditable/editor_plugin.js
+++ b/js/tiny_mce/plugins/noneditable/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.dom.Event;tinymce.create("tinymce.plugins.NonEditablePlugin",{init:function(d,e){var f=this,c,b,g;f.editor=d;c=d.getParam("noneditable_editable_class","mceEditable");b=d.getParam("noneditable_noneditable_class","mceNonEditable");d.onNodeChange.addToTop(function(i,h,l){var k,j;k=i.dom.getParent(i.selection.getStart(),function(m){return i.dom.hasClass(m,b)});j=i.dom.getParent(i.selection.getEnd(),function(m){return i.dom.hasClass(m,b)});if(k||j){g=1;f._setDisabled(1);return false}else{if(g==1){f._setDisabled(0);g=0}}})},getInfo:function(){return{longname:"Non editable elements",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_block:function(c,d){var b=d.keyCode;if((b>32&&b<41)||(b>111&&b<124)){return}return a.cancel(d)},_setDisabled:function(d){var c=this,b=c.editor;tinymce.each(b.controlManager.controls,function(e){e.setDisabled(d)});if(d!==c.disabled){if(d){b.onKeyDown.addToTop(c._block);b.onKeyPress.addToTop(c._block);b.onKeyUp.addToTop(c._block);b.onPaste.addToTop(c._block);b.onContextMenu.addToTop(c._block)}else{b.onKeyDown.remove(c._block);b.onKeyPress.remove(c._block);b.onKeyUp.remove(c._block);b.onPaste.remove(c._block);b.onContextMenu.remove(c._block)}c.disabled=d}}});tinymce.PluginManager.add("noneditable",tinymce.plugins.NonEditablePlugin)})();
\ No newline at end of file
+(function(){var a=tinymce.dom.Event;tinymce.create("tinymce.plugins.NonEditablePlugin",{init:function(d,e){var f=this,c,b,g;f.editor=d;c=d.getParam("noneditable_editable_class","mceEditable");b=d.getParam("noneditable_noneditable_class","mceNonEditable");d.onNodeChange.addToTop(function(i,h,l){var k,j;k=i.dom.getParent(i.selection.getStart(),function(m){return i.dom.hasClass(m,b)});j=i.dom.getParent(i.selection.getEnd(),function(m){return i.dom.hasClass(m,b)});if(k||j){g=1;f._setDisabled(1);return false}else{if(g==1){f._setDisabled(0);g=0}}})},getInfo:function(){return{longname:"Non editable elements",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_block:function(c,d){var b=d.keyCode;if((b>32&&b<41)||(b>111&&b<124)){return}return a.cancel(d)},_setDisabled:function(d){var c=this,b=c.editor;tinymce.each(b.controlManager.controls,function(e){e.setDisabled(d)});if(d!==c.disabled){if(d){b.onKeyDown.addToTop(c._block);b.onKeyPress.addToTop(c._block);b.onKeyUp.addToTop(c._block);b.onPaste.addToTop(c._block);b.onContextMenu.addToTop(c._block)}else{b.onKeyDown.remove(c._block);b.onKeyPress.remove(c._block);b.onKeyUp.remove(c._block);b.onPaste.remove(c._block);b.onContextMenu.remove(c._block)}c.disabled=d}}});tinymce.PluginManager.add("noneditable",tinymce.plugins.NonEditablePlugin)})();
diff --git a/js/tiny_mce/plugins/noneditable/editor_plugin_src.js b/js/tiny_mce/plugins/noneditable/editor_plugin_src.js
index 916dce29cfc..6ed18cdb413 100644
--- a/js/tiny_mce/plugins/noneditable/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/noneditable/editor_plugin_src.js
@@ -92,4 +92,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('noneditable', tinymce.plugins.NonEditablePlugin);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/pagebreak/editor_plugin.js b/js/tiny_mce/plugins/pagebreak/editor_plugin.js
index 35085e8adca..316f9d45479 100644
--- a/js/tiny_mce/plugins/pagebreak/editor_plugin.js
+++ b/js/tiny_mce/plugins/pagebreak/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.PageBreakPlugin",{init:function(b,d){var f='<img src="'+b.theme.url+'/img/trans.gif" class="mcePageBreak mceItemNoResize" />',a="mcePageBreak",c=b.getParam("pagebreak_separator","<!-- pagebreak -->"),e;e=new RegExp(c.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,function(g){return"\\"+g}),"g");b.addCommand("mcePageBreak",function(){b.execCommand("mceInsertContent",0,f)});b.addButton("pagebreak",{title:"pagebreak.desc",cmd:a});b.onInit.add(function(){if(b.theme.onResolveName){b.theme.onResolveName.add(function(g,h){if(h.node.nodeName=="IMG"&&b.dom.hasClass(h.node,a)){h.name="pagebreak"}})}});b.onClick.add(function(g,h){h=h.target;if(h.nodeName==="IMG"&&g.dom.hasClass(h,a)){g.selection.select(h)}});b.onNodeChange.add(function(h,g,i){g.setActive("pagebreak",i.nodeName==="IMG"&&h.dom.hasClass(i,a))});b.onBeforeSetContent.add(function(g,h){h.content=h.content.replace(e,f)});b.onPostProcess.add(function(g,h){if(h.get){h.content=h.content.replace(/<img[^>]+>/g,function(i){if(i.indexOf('class="mcePageBreak')!==-1){i=c}return i})}})},getInfo:function(){return{longname:"PageBreak",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/pagebreak",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("pagebreak",tinymce.plugins.PageBreakPlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.PageBreakPlugin",{init:function(b,d){var f='<img src="'+b.theme.url+'/img/trans.gif" class="mcePageBreak mceItemNoResize" />',a="mcePageBreak",c=b.getParam("pagebreak_separator","<!-- pagebreak -->"),e;e=new RegExp(c.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,function(g){return"\\"+g}),"g");b.addCommand("mcePageBreak",function(){b.execCommand("mceInsertContent",0,f)});b.addButton("pagebreak",{title:"pagebreak.desc",cmd:a});b.onInit.add(function(){if(b.theme.onResolveName){b.theme.onResolveName.add(function(g,h){if(h.node.nodeName=="IMG"&&b.dom.hasClass(h.node,a)){h.name="pagebreak"}})}});b.onClick.add(function(g,h){h=h.target;if(h.nodeName==="IMG"&&g.dom.hasClass(h,a)){g.selection.select(h)}});b.onNodeChange.add(function(h,g,i){g.setActive("pagebreak",i.nodeName==="IMG"&&h.dom.hasClass(i,a))});b.onBeforeSetContent.add(function(g,h){h.content=h.content.replace(e,f)});b.onPostProcess.add(function(g,h){if(h.get){h.content=h.content.replace(/<img[^>]+>/g,function(i){if(i.indexOf('class="mcePageBreak')!==-1){i=c}return i})}})},getInfo:function(){return{longname:"PageBreak",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/pagebreak",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("pagebreak",tinymce.plugins.PageBreakPlugin)})();
diff --git a/js/tiny_mce/plugins/pagebreak/editor_plugin_src.js b/js/tiny_mce/plugins/pagebreak/editor_plugin_src.js
index a094c191623..a60cefa9111 100644
--- a/js/tiny_mce/plugins/pagebreak/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/pagebreak/editor_plugin_src.js
@@ -71,4 +71,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('pagebreak', tinymce.plugins.PageBreakPlugin);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/paste/editor_plugin.js b/js/tiny_mce/plugins/paste/editor_plugin.js
index e47a5c630af..96980df5c4a 100644
--- a/js/tiny_mce/plugins/paste/editor_plugin.js
+++ b/js/tiny_mce/plugins/paste/editor_plugin.js
@@ -1 +1 @@
-(function(){var c=tinymce.each,a={paste_auto_cleanup_on_paste:true,paste_enable_default_filters:true,paste_block_drop:false,paste_retain_style_properties:"none",paste_strip_class_attributes:"mso",paste_remove_spans:false,paste_remove_styles:false,paste_remove_styles_if_webkit:true,paste_convert_middot_lists:true,paste_convert_headers_to_strong:false,paste_dialog_width:"450",paste_dialog_height:"400",paste_text_use_dialog:false,paste_text_sticky:false,paste_text_sticky_default:false,paste_text_notifyalways:false,paste_text_linebreaktype:"combined",paste_text_replacements:[[/\u2026/g,"..."],[/[\x93\x94\u201c\u201d]/g,'"'],[/[\x60\x91\x92\u2018\u2019]/g,"'"]]};function b(d,e){return d.getParam(e,a[e])}tinymce.create("tinymce.plugins.PastePlugin",{init:function(d,e){var f=this;f.editor=d;f.url=e;f.onPreProcess=new tinymce.util.Dispatcher(f);f.onPostProcess=new tinymce.util.Dispatcher(f);f.onPreProcess.add(f._preProcess);f.onPostProcess.add(f._postProcess);f.onPreProcess.add(function(i,j){d.execCallback("paste_preprocess",i,j)});f.onPostProcess.add(function(i,j){d.execCallback("paste_postprocess",i,j)});d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){return false}});d.pasteAsPlainText=b(d,"paste_text_sticky_default");function h(l,j){var k=d.dom,i;f.onPreProcess.dispatch(f,l);l.node=k.create("div",0,l.content);if(tinymce.isGecko){i=d.selection.getRng(true);if(i.startContainer==i.endContainer&&i.startContainer.nodeType==3){if(l.node.childNodes.length===1&&/^(p|h[1-6]|pre)$/i.test(l.node.firstChild.nodeName)&&l.content.indexOf("__MCE_ITEM__")===-1){k.remove(l.node.firstChild,true)}}}f.onPostProcess.dispatch(f,l);l.content=d.serializer.serialize(l.node,{getInner:1,forced_root_block:""});if((!j)&&(d.pasteAsPlainText)){f._insertPlainText(l.content);if(!b(d,"paste_text_sticky")){d.pasteAsPlainText=false;d.controlManager.setActive("pastetext",false)}}else{f._insert(l.content)}}d.addCommand("mceInsertClipboardContent",function(i,j){h(j,true)});if(!b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(j,i){var k=tinymce.util.Cookie;d.pasteAsPlainText=!d.pasteAsPlainText;d.controlManager.setActive("pastetext",d.pasteAsPlainText);if((d.pasteAsPlainText)&&(!k.get("tinymcePasteText"))){if(b(d,"paste_text_sticky")){d.windowManager.alert(d.translate("paste.plaintext_mode_sticky"))}else{d.windowManager.alert(d.translate("paste.plaintext_mode"))}if(!b(d,"paste_text_notifyalways")){k.set("tinymcePasteText","1",new Date(new Date().getFullYear()+1,12,31))}}})}d.addButton("pastetext",{title:"paste.paste_text_desc",cmd:"mcePasteText"});d.addButton("selectall",{title:"paste.selectall_desc",cmd:"selectall"});function g(s){var l,p,j,t,k=d.selection,o=d.dom,q=d.getBody(),i,r;if(s.clipboardData||o.doc.dataTransfer){r=(s.clipboardData||o.doc.dataTransfer).getData("Text");if(d.pasteAsPlainText){s.preventDefault();h({content:o.encode(r).replace(/\r?\n/g,"<br />")});return}}if(o.get("_mcePaste")){return}l=o.add(q,"div",{id:"_mcePaste","class":"mcePaste","data-mce-bogus":"1"},"\uFEFF\uFEFF");if(q!=d.getDoc().body){i=o.getPos(d.selection.getStart(),q).y}else{i=q.scrollTop+o.getViewPort(d.getWin()).y}o.setStyles(l,{position:"absolute",left:tinymce.isGecko?-40:0,top:i-25,width:1,height:1,overflow:"hidden"});if(tinymce.isIE){t=k.getRng();j=o.doc.body.createTextRange();j.moveToElementText(l);j.execCommand("Paste");o.remove(l);if(l.innerHTML==="\uFEFF\uFEFF"){d.execCommand("mcePasteWord");s.preventDefault();return}k.setRng(t);k.setContent("");setTimeout(function(){h({content:l.innerHTML})},0);return tinymce.dom.Event.cancel(s)}else{function m(n){n.preventDefault()}o.bind(d.getDoc(),"mousedown",m);o.bind(d.getDoc(),"keydown",m);p=d.selection.getRng();l=l.firstChild;j=d.getDoc().createRange();j.setStart(l,0);j.setEnd(l,2);k.setRng(j);window.setTimeout(function(){var u="",n;if(!o.select("div.mcePaste > div.mcePaste").length){n=o.select("div.mcePaste");c(n,function(w){var v=w.firstChild;if(v&&v.nodeName=="DIV"&&v.style.marginTop&&v.style.backgroundColor){o.remove(v,1)}c(o.select("span.Apple-style-span",w),function(x){o.remove(x,1)});c(o.select("br[data-mce-bogus]",w),function(x){o.remove(x)});if(w.parentNode.className!="mcePaste"){u+=w.innerHTML}})}else{u="<p>"+o.encode(r).replace(/\r?\n\r?\n/g,"</p><p>").replace(/\r?\n/g,"<br />")+"</p>"}c(o.select("div.mcePaste"),function(v){o.remove(v)});if(p){k.setRng(p)}h({content:u});o.unbind(d.getDoc(),"mousedown",m);o.unbind(d.getDoc(),"keydown",m)},0)}}if(b(d,"paste_auto_cleanup_on_paste")){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){g(j)}})}else{d.onPaste.addToTop(function(i,j){return g(j)})}}d.onInit.add(function(){d.controlManager.setActive("pastetext",d.pasteAsPlainText);if(b(d,"paste_block_drop")){d.dom.bind(d.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(i){i.preventDefault();i.stopPropagation();return false})}});f._legacySupport()},getInfo:function(){return{longname:"Paste text/word",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_preProcess:function(g,e){var k=this.editor,j=e.content,p=tinymce.grep,n=tinymce.explode,f=tinymce.trim,l,i;function d(h){c(h,function(o){if(o.constructor==RegExp){j=j.replace(o,"")}else{j=j.replace(o[0],o[1])}})}if(k.settings.paste_enable_default_filters==false){return}if(tinymce.isIE&&document.documentMode>=9){d([[/(?:<br>&nbsp;[\s\r\n]+|<br>)*(<\/?(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)[^>]*>)(?:<br>&nbsp;[\s\r\n]+|<br>)*/g,"$1"]]);d([[/<br><br>/g,"<BR><BR>"],[/<br>/g," "],[/<BR><BR>/g,"<br>"]])}if(/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(j)||e.wordContent){e.wordContent=true;d([/^\s*(&nbsp;)+/gi,/(&nbsp;|<br[^>]*>)+\s*$/gi]);if(b(k,"paste_convert_headers_to_strong")){j=j.replace(/<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi,"<p><strong>$1</strong></p>")}if(b(k,"paste_convert_middot_lists")){d([[/<!--\[if !supportLists\]-->/gi,"$&__MCE_ITEM__"],[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi,"$1__MCE_ITEM__"],[/(<p[^>]+(?:MsoListParagraph)[^>]+>)/gi,"$1__MCE_ITEM__"]])}d([/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\u00a0"]]);do{l=j.length;j=j.replace(/(<[a-z][^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1")}while(l!=j.length);if(b(k,"paste_retain_style_properties").replace(/^none$/i,"").length==0){j=j.replace(/<\/?span[^>]*>/gi,"")}else{d([[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(o,h){return(h.length>0)?h.replace(/./," ").slice(Math.floor(h.length/2)).split("").join("\u00a0"):""}],[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,function(t,h,r){var u=[],o=0,q=n(f(r).replace(/&quot;/gi,"'"),";");c(q,function(s){var w,y,z=n(s,":");function x(A){return A+((A!=="0")&&(/\d$/.test(A)))?"px":""}if(z.length==2){w=z[0].toLowerCase();y=z[1].toLowerCase();switch(w){case"mso-padding-alt":case"mso-padding-top-alt":case"mso-padding-right-alt":case"mso-padding-bottom-alt":case"mso-padding-left-alt":case"mso-margin-alt":case"mso-margin-top-alt":case"mso-margin-right-alt":case"mso-margin-bottom-alt":case"mso-margin-left-alt":case"mso-table-layout-alt":case"mso-height":case"mso-width":case"mso-vertical-align-alt":u[o++]=w.replace(/^mso-|-alt$/g,"")+":"+x(y);return;case"horiz-align":u[o++]="text-align:"+y;return;case"vert-align":u[o++]="vertical-align:"+y;return;case"font-color":case"mso-foreground":u[o++]="color:"+y;return;case"mso-background":case"mso-highlight":u[o++]="background:"+y;return;case"mso-default-height":u[o++]="min-height:"+x(y);return;case"mso-default-width":u[o++]="min-width:"+x(y);return;case"mso-padding-between-alt":u[o++]="border-collapse:separate;border-spacing:"+x(y);return;case"text-line-through":if((y=="single")||(y=="double")){u[o++]="text-decoration:line-through"}return;case"mso-zero-height":if(y=="yes"){u[o++]="display:none"}return}if(/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(w)){return}u[o++]=w+":"+z[1]}});if(o>0){return h+' style="'+u.join(";")+'"'}else{return h}}]])}}if(b(k,"paste_convert_headers_to_strong")){d([[/<h[1-6][^>]*>/gi,"<p><strong>"],[/<\/h[1-6][^>]*>/gi,"</strong></p>"]])}d([[/Version:[\d.]+\nStartHTML:\d+\nEndHTML:\d+\nStartFragment:\d+\nEndFragment:\d+/gi,""]]);i=b(k,"paste_strip_class_attributes");if(i!=="none"){function m(q,o){if(i==="all"){return""}var h=p(n(o.replace(/^(["'])(.*)\1$/,"$2")," "),function(r){return(/^(?!mso)/i.test(r))});return h.length?' class="'+h.join(" ")+'"':""}j=j.replace(/ class="([^"]+)"/gi,m);j=j.replace(/ class=([\-\w]+)/gi,m)}if(b(k,"paste_remove_spans")){j=j.replace(/<\/?span[^>]*>/gi,"")}e.content=j},_postProcess:function(g,i){var f=this,e=f.editor,h=e.dom,d;if(e.settings.paste_enable_default_filters==false){return}if(i.wordContent){c(h.select("a",i.node),function(j){if(!j.href||j.href.indexOf("#_Toc")!=-1){h.remove(j,1)}});if(b(e,"paste_convert_middot_lists")){f._convertLists(g,i)}d=b(e,"paste_retain_style_properties");if((tinymce.is(d,"string"))&&(d!=="all")&&(d!=="*")){d=tinymce.explode(d.replace(/^none$/i,""));c(h.select("*",i.node),function(m){var n={},k=0,l,o,j;if(d){for(l=0;l<d.length;l++){o=d[l];j=h.getStyle(m,o);if(j){n[o]=j;k++}}}h.setAttrib(m,"style","");if(d&&k>0){h.setStyles(m,n)}else{if(m.nodeName=="SPAN"&&!m.className){h.remove(m,true)}}})}}if(b(e,"paste_remove_styles")||(b(e,"paste_remove_styles_if_webkit")&&tinymce.isWebKit)){c(h.select("*[style]",i.node),function(j){j.removeAttribute("style");j.removeAttribute("data-mce-style")})}else{if(tinymce.isWebKit){c(h.select("*",i.node),function(j){j.removeAttribute("data-mce-style")})}}},_convertLists:function(g,e){var i=g.editor.dom,h,l,d=-1,f,m=[],k,j;c(i.select("p",e.node),function(t){var q,u="",s,r,n,o;for(q=t.firstChild;q&&q.nodeType==3;q=q.nextSibling){u+=q.nodeValue}u=t.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/&nbsp;/g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*\u00a0*/.test(u)){s="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0+/.test(u)){s="ol"}if(s){f=parseFloat(t.style.marginLeft||0);if(f>d){m.push(f)}if(!h||s!=k){h=i.create(s);i.insertAfter(h,t)}else{if(f>d){h=l.appendChild(i.create(s))}else{if(f<d){n=tinymce.inArray(m,f);o=i.getParents(h.parentNode,s);h=o[o.length-1-n]||h}}}c(i.select("span",t),function(v){var p=v.innerHTML.replace(/<\/?\w+[^>]*>/gi,"");if(s=="ul"&&/^__MCE_ITEM__[\u2022\u00b7\u00a7\u00d8o\u25CF]/.test(p)){i.remove(v)}else{if(/^__MCE_ITEM__[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(p)){i.remove(v)}}});r=t.innerHTML;if(s=="ul"){r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*(&nbsp;|\u00a0)+\s*/,"")}else{r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*\w+\.(&nbsp;|\u00a0)+\s*/,"")}l=h.appendChild(i.create("li",0,r));i.remove(t);d=f;k=s}else{h=d=0}});j=e.node.innerHTML;if(j.indexOf("__MCE_ITEM__")!=-1){e.node.innerHTML=j.replace(/__MCE_ITEM__/g,"")}},_insert:function(f,d){var e=this.editor,g=e.selection.getRng();if(!e.selection.isCollapsed()&&g.startContainer!=g.endContainer){e.getDoc().execCommand("Delete",false,null)}e.execCommand("mceInsertContent",false,f,{skip_undo:d})},_insertPlainText:function(g){var d=this.editor,e=b(d,"paste_text_linebreaktype"),i=b(d,"paste_text_replacements"),f=tinymce.is;function h(j){c(j,function(k){if(k.constructor==RegExp){g=g.replace(k,"")}else{g=g.replace(k[0],k[1])}})}if((typeof(g)==="string")&&(g.length>0)){if(/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(g)){h([/[\n\r]+/g])}else{h([/\r+/g])}h([[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi,"\n\n"],[/<br[^>]*>|<\/tr>/gi,"\n"],[/<\/t[dh]>\s*<t[dh][^>]*>/gi,"\t"],/<[a-z!\/?][^>]*>/gi,[/&nbsp;/gi," "],[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi,"$1"],[/\n{3,}/g,"\n\n"]]);g=d.dom.decode(tinymce.html.Entities.encodeRaw(g));if(f(i,"array")){h(i)}else{if(f(i,"string")){h(new RegExp(i,"gi"))}}if(e=="none"){h([[/\n+/g," "]])}else{if(e=="br"){h([[/\n/g,"<br />"]])}else{if(e=="p"){h([[/\n+/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"]])}else{h([[/\n\n/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"],[/\n/g,"<br />"]])}}}d.execCommand("mceInsertContent",false,g)}},_legacySupport:function(){var e=this,d=e.editor;d.addCommand("mcePasteWord",function(){d.windowManager.open({file:e.url+"/pasteword.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})});if(b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(){d.windowManager.open({file:e.url+"/pastetext.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})})}d.addButton("pasteword",{title:"paste.paste_word_desc",cmd:"mcePasteWord"})}});tinymce.PluginManager.add("paste",tinymce.plugins.PastePlugin)})();
\ No newline at end of file
+(function(){var c=tinymce.each,a={paste_auto_cleanup_on_paste:true,paste_enable_default_filters:true,paste_block_drop:false,paste_retain_style_properties:"none",paste_strip_class_attributes:"mso",paste_remove_spans:false,paste_remove_styles:false,paste_remove_styles_if_webkit:true,paste_convert_middot_lists:true,paste_convert_headers_to_strong:false,paste_dialog_width:"450",paste_dialog_height:"400",paste_text_use_dialog:false,paste_text_sticky:false,paste_text_sticky_default:false,paste_text_notifyalways:false,paste_text_linebreaktype:"combined",paste_text_replacements:[[/\u2026/g,"..."],[/[\x93\x94\u201c\u201d]/g,'"'],[/[\x60\x91\x92\u2018\u2019]/g,"'"]]};function b(d,e){return d.getParam(e,a[e])}tinymce.create("tinymce.plugins.PastePlugin",{init:function(d,e){var f=this;f.editor=d;f.url=e;f.onPreProcess=new tinymce.util.Dispatcher(f);f.onPostProcess=new tinymce.util.Dispatcher(f);f.onPreProcess.add(f._preProcess);f.onPostProcess.add(f._postProcess);f.onPreProcess.add(function(i,j){d.execCallback("paste_preprocess",i,j)});f.onPostProcess.add(function(i,j){d.execCallback("paste_postprocess",i,j)});d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){return false}});d.pasteAsPlainText=b(d,"paste_text_sticky_default");function h(l,j){var k=d.dom,i;f.onPreProcess.dispatch(f,l);l.node=k.create("div",0,l.content);if(tinymce.isGecko){i=d.selection.getRng(true);if(i.startContainer==i.endContainer&&i.startContainer.nodeType==3){if(l.node.childNodes.length===1&&/^(p|h[1-6]|pre)$/i.test(l.node.firstChild.nodeName)&&l.content.indexOf("__MCE_ITEM__")===-1){k.remove(l.node.firstChild,true)}}}f.onPostProcess.dispatch(f,l);l.content=d.serializer.serialize(l.node,{getInner:1,forced_root_block:""});if((!j)&&(d.pasteAsPlainText)){f._insertPlainText(l.content);if(!b(d,"paste_text_sticky")){d.pasteAsPlainText=false;d.controlManager.setActive("pastetext",false)}}else{f._insert(l.content)}}d.addCommand("mceInsertClipboardContent",function(i,j){h(j,true)});if(!b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(j,i){var k=tinymce.util.Cookie;d.pasteAsPlainText=!d.pasteAsPlainText;d.controlManager.setActive("pastetext",d.pasteAsPlainText);if((d.pasteAsPlainText)&&(!k.get("tinymcePasteText"))){if(b(d,"paste_text_sticky")){d.windowManager.alert(d.translate("paste.plaintext_mode_sticky"))}else{d.windowManager.alert(d.translate("paste.plaintext_mode"))}if(!b(d,"paste_text_notifyalways")){k.set("tinymcePasteText","1",new Date(new Date().getFullYear()+1,12,31))}}})}d.addButton("pastetext",{title:"paste.paste_text_desc",cmd:"mcePasteText"});d.addButton("selectall",{title:"paste.selectall_desc",cmd:"selectall"});function g(s){var l,p,j,t,k=d.selection,o=d.dom,q=d.getBody(),i,r;if(s.clipboardData||o.doc.dataTransfer){r=(s.clipboardData||o.doc.dataTransfer).getData("Text");if(d.pasteAsPlainText){s.preventDefault();h({content:o.encode(r).replace(/\r?\n/g,"<br />")});return}}if(o.get("_mcePaste")){return}l=o.add(q,"div",{id:"_mcePaste","class":"mcePaste","data-mce-bogus":"1"},"\uFEFF\uFEFF");if(q!=d.getDoc().body){i=o.getPos(d.selection.getStart(),q).y}else{i=q.scrollTop+o.getViewPort(d.getWin()).y}o.setStyles(l,{position:"absolute",left:tinymce.isGecko?-40:0,top:i-25,width:1,height:1,overflow:"hidden"});if(tinymce.isIE){t=k.getRng();j=o.doc.body.createTextRange();j.moveToElementText(l);j.execCommand("Paste");o.remove(l);if(l.innerHTML==="\uFEFF\uFEFF"){d.execCommand("mcePasteWord");s.preventDefault();return}k.setRng(t);k.setContent("");setTimeout(function(){h({content:l.innerHTML})},0);return tinymce.dom.Event.cancel(s)}else{function m(n){n.preventDefault()}o.bind(d.getDoc(),"mousedown",m);o.bind(d.getDoc(),"keydown",m);p=d.selection.getRng();l=l.firstChild;j=d.getDoc().createRange();j.setStart(l,0);j.setEnd(l,2);k.setRng(j);window.setTimeout(function(){var u="",n;if(!o.select("div.mcePaste > div.mcePaste").length){n=o.select("div.mcePaste");c(n,function(w){var v=w.firstChild;if(v&&v.nodeName=="DIV"&&v.style.marginTop&&v.style.backgroundColor){o.remove(v,1)}c(o.select("span.Apple-style-span",w),function(x){o.remove(x,1)});c(o.select("br[data-mce-bogus]",w),function(x){o.remove(x)});if(w.parentNode.className!="mcePaste"){u+=w.innerHTML}})}else{u="<p>"+o.encode(r).replace(/\r?\n\r?\n/g,"</p><p>").replace(/\r?\n/g,"<br />")+"</p>"}c(o.select("div.mcePaste"),function(v){o.remove(v)});if(p){k.setRng(p)}h({content:u});o.unbind(d.getDoc(),"mousedown",m);o.unbind(d.getDoc(),"keydown",m)},0)}}if(b(d,"paste_auto_cleanup_on_paste")){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){g(j)}})}else{d.onPaste.addToTop(function(i,j){return g(j)})}}d.onInit.add(function(){d.controlManager.setActive("pastetext",d.pasteAsPlainText);if(b(d,"paste_block_drop")){d.dom.bind(d.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(i){i.preventDefault();i.stopPropagation();return false})}});f._legacySupport()},getInfo:function(){return{longname:"Paste text/word",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_preProcess:function(g,e){var k=this.editor,j=e.content,p=tinymce.grep,n=tinymce.explode,f=tinymce.trim,l,i;function d(h){c(h,function(o){if(o.constructor==RegExp){j=j.replace(o,"")}else{j=j.replace(o[0],o[1])}})}if(k.settings.paste_enable_default_filters==false){return}if(tinymce.isIE&&document.documentMode>=9){d([[/(?:<br>&nbsp;[\s\r\n]+|<br>)*(<\/?(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)[^>]*>)(?:<br>&nbsp;[\s\r\n]+|<br>)*/g,"$1"]]);d([[/<br><br>/g,"<BR><BR>"],[/<br>/g," "],[/<BR><BR>/g,"<br>"]])}if(/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(j)||e.wordContent){e.wordContent=true;d([/^\s*(&nbsp;)+/gi,/(&nbsp;|<br[^>]*>)+\s*$/gi]);if(b(k,"paste_convert_headers_to_strong")){j=j.replace(/<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi,"<p><strong>$1</strong></p>")}if(b(k,"paste_convert_middot_lists")){d([[/<!--\[if !supportLists\]-->/gi,"$&__MCE_ITEM__"],[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi,"$1__MCE_ITEM__"],[/(<p[^>]+(?:MsoListParagraph)[^>]+>)/gi,"$1__MCE_ITEM__"]])}d([/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\u00a0"]]);do{l=j.length;j=j.replace(/(<[a-z][^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1")}while(l!=j.length);if(b(k,"paste_retain_style_properties").replace(/^none$/i,"").length==0){j=j.replace(/<\/?span[^>]*>/gi,"")}else{d([[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(o,h){return(h.length>0)?h.replace(/./," ").slice(Math.floor(h.length/2)).split("").join("\u00a0"):""}],[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,function(t,h,r){var u=[],o=0,q=n(f(r).replace(/&quot;/gi,"'"),";");c(q,function(s){var w,y,z=n(s,":");function x(A){return A+((A!=="0")&&(/\d$/.test(A)))?"px":""}if(z.length==2){w=z[0].toLowerCase();y=z[1].toLowerCase();switch(w){case"mso-padding-alt":case"mso-padding-top-alt":case"mso-padding-right-alt":case"mso-padding-bottom-alt":case"mso-padding-left-alt":case"mso-margin-alt":case"mso-margin-top-alt":case"mso-margin-right-alt":case"mso-margin-bottom-alt":case"mso-margin-left-alt":case"mso-table-layout-alt":case"mso-height":case"mso-width":case"mso-vertical-align-alt":u[o++]=w.replace(/^mso-|-alt$/g,"")+":"+x(y);return;case"horiz-align":u[o++]="text-align:"+y;return;case"vert-align":u[o++]="vertical-align:"+y;return;case"font-color":case"mso-foreground":u[o++]="color:"+y;return;case"mso-background":case"mso-highlight":u[o++]="background:"+y;return;case"mso-default-height":u[o++]="min-height:"+x(y);return;case"mso-default-width":u[o++]="min-width:"+x(y);return;case"mso-padding-between-alt":u[o++]="border-collapse:separate;border-spacing:"+x(y);return;case"text-line-through":if((y=="single")||(y=="double")){u[o++]="text-decoration:line-through"}return;case"mso-zero-height":if(y=="yes"){u[o++]="display:none"}return}if(/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(w)){return}u[o++]=w+":"+z[1]}});if(o>0){return h+' style="'+u.join(";")+'"'}else{return h}}]])}}if(b(k,"paste_convert_headers_to_strong")){d([[/<h[1-6][^>]*>/gi,"<p><strong>"],[/<\/h[1-6][^>]*>/gi,"</strong></p>"]])}d([[/Version:[\d.]+\nStartHTML:\d+\nEndHTML:\d+\nStartFragment:\d+\nEndFragment:\d+/gi,""]]);i=b(k,"paste_strip_class_attributes");if(i!=="none"){function m(q,o){if(i==="all"){return""}var h=p(n(o.replace(/^(["'])(.*)\1$/,"$2")," "),function(r){return(/^(?!mso)/i.test(r))});return h.length?' class="'+h.join(" ")+'"':""}j=j.replace(/ class="([^"]+)"/gi,m);j=j.replace(/ class=([\-\w]+)/gi,m)}if(b(k,"paste_remove_spans")){j=j.replace(/<\/?span[^>]*>/gi,"")}e.content=j},_postProcess:function(g,i){var f=this,e=f.editor,h=e.dom,d;if(e.settings.paste_enable_default_filters==false){return}if(i.wordContent){c(h.select("a",i.node),function(j){if(!j.href||j.href.indexOf("#_Toc")!=-1){h.remove(j,1)}});if(b(e,"paste_convert_middot_lists")){f._convertLists(g,i)}d=b(e,"paste_retain_style_properties");if((tinymce.is(d,"string"))&&(d!=="all")&&(d!=="*")){d=tinymce.explode(d.replace(/^none$/i,""));c(h.select("*",i.node),function(m){var n={},k=0,l,o,j;if(d){for(l=0;l<d.length;l++){o=d[l];j=h.getStyle(m,o);if(j){n[o]=j;k++}}}h.setAttrib(m,"style","");if(d&&k>0){h.setStyles(m,n)}else{if(m.nodeName=="SPAN"&&!m.className){h.remove(m,true)}}})}}if(b(e,"paste_remove_styles")||(b(e,"paste_remove_styles_if_webkit")&&tinymce.isWebKit)){c(h.select("*[style]",i.node),function(j){j.removeAttribute("style");j.removeAttribute("data-mce-style")})}else{if(tinymce.isWebKit){c(h.select("*",i.node),function(j){j.removeAttribute("data-mce-style")})}}},_convertLists:function(g,e){var i=g.editor.dom,h,l,d=-1,f,m=[],k,j;c(i.select("p",e.node),function(t){var q,u="",s,r,n,o;for(q=t.firstChild;q&&q.nodeType==3;q=q.nextSibling){u+=q.nodeValue}u=t.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/&nbsp;/g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*\u00a0*/.test(u)){s="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0+/.test(u)){s="ol"}if(s){f=parseFloat(t.style.marginLeft||0);if(f>d){m.push(f)}if(!h||s!=k){h=i.create(s);i.insertAfter(h,t)}else{if(f>d){h=l.appendChild(i.create(s))}else{if(f<d){n=tinymce.inArray(m,f);o=i.getParents(h.parentNode,s);h=o[o.length-1-n]||h}}}c(i.select("span",t),function(v){var p=v.innerHTML.replace(/<\/?\w+[^>]*>/gi,"");if(s=="ul"&&/^__MCE_ITEM__[\u2022\u00b7\u00a7\u00d8o\u25CF]/.test(p)){i.remove(v)}else{if(/^__MCE_ITEM__[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(p)){i.remove(v)}}});r=t.innerHTML;if(s=="ul"){r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*(&nbsp;|\u00a0)+\s*/,"")}else{r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*\w+\.(&nbsp;|\u00a0)+\s*/,"")}l=h.appendChild(i.create("li",0,r));i.remove(t);d=f;k=s}else{h=d=0}});j=e.node.innerHTML;if(j.indexOf("__MCE_ITEM__")!=-1){e.node.innerHTML=j.replace(/__MCE_ITEM__/g,"")}},_insert:function(f,d){var e=this.editor,g=e.selection.getRng();if(!e.selection.isCollapsed()&&g.startContainer!=g.endContainer){e.getDoc().execCommand("Delete",false,null)}e.execCommand("mceInsertContent",false,f,{skip_undo:d})},_insertPlainText:function(g){var d=this.editor,e=b(d,"paste_text_linebreaktype"),i=b(d,"paste_text_replacements"),f=tinymce.is;function h(j){c(j,function(k){if(k.constructor==RegExp){g=g.replace(k,"")}else{g=g.replace(k[0],k[1])}})}if((typeof(g)==="string")&&(g.length>0)){if(/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(g)){h([/[\n\r]+/g])}else{h([/\r+/g])}h([[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi,"\n\n"],[/<br[^>]*>|<\/tr>/gi,"\n"],[/<\/t[dh]>\s*<t[dh][^>]*>/gi,"\t"],/<[a-z!\/?][^>]*>/gi,[/&nbsp;/gi," "],[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi,"$1"],[/\n{3,}/g,"\n\n"]]);g=d.dom.decode(tinymce.html.Entities.encodeRaw(g));if(f(i,"array")){h(i)}else{if(f(i,"string")){h(new RegExp(i,"gi"))}}if(e=="none"){h([[/\n+/g," "]])}else{if(e=="br"){h([[/\n/g,"<br />"]])}else{if(e=="p"){h([[/\n+/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"]])}else{h([[/\n\n/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"],[/\n/g,"<br />"]])}}}d.execCommand("mceInsertContent",false,g)}},_legacySupport:function(){var e=this,d=e.editor;d.addCommand("mcePasteWord",function(){d.windowManager.open({file:e.url+"/pasteword.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})});if(b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(){d.windowManager.open({file:e.url+"/pastetext.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})})}d.addButton("pasteword",{title:"paste.paste_word_desc",cmd:"mcePasteWord"})}});tinymce.PluginManager.add("paste",tinymce.plugins.PastePlugin)})();
diff --git a/js/tiny_mce/plugins/paste/langs/en_dlg.js b/js/tiny_mce/plugins/paste/langs/en_dlg.js
index bc74daf85c8..7b90e687bbc 100644
--- a/js/tiny_mce/plugins/paste/langs/en_dlg.js
+++ b/js/tiny_mce/plugins/paste/langs/en_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.paste_dlg',{"word_title":"Use Ctrl+V on your keyboard to paste the text into the window.","text_linebreaks":"Keep Linebreaks","text_title":"Use Ctrl+V on your keyboard to paste the text into the window."});
\ No newline at end of file
+tinyMCE.addI18n('en.paste_dlg',{"word_title":"Use Ctrl+V on your keyboard to paste the text into the window.","text_linebreaks":"Keep Linebreaks","text_title":"Use Ctrl+V on your keyboard to paste the text into the window."});
diff --git a/js/tiny_mce/plugins/preview/editor_plugin.js b/js/tiny_mce/plugins/preview/editor_plugin.js
index 507909c5f00..85e07830a99 100644
--- a/js/tiny_mce/plugins/preview/editor_plugin.js
+++ b/js/tiny_mce/plugins/preview/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.Preview",{init:function(a,b){var d=this,c=tinymce.explode(a.settings.content_css);d.editor=a;tinymce.each(c,function(f,e){c[e]=a.documentBaseURI.toAbsolute(f)});a.addCommand("mcePreview",function(){a.windowManager.open({file:a.getParam("plugin_preview_pageurl",b+"/preview.html"),width:parseInt(a.getParam("plugin_preview_width","550")),height:parseInt(a.getParam("plugin_preview_height","600")),resizable:"yes",scrollbars:"yes",popup_css:c?c.join(","):a.baseURI.toAbsolute("themes/"+a.settings.theme+"/skins/"+a.settings.skin+"/content.css"),inline:a.getParam("plugin_preview_inline",1)},{base:a.documentBaseURI.getURI()})});a.addButton("preview",{title:"preview.preview_desc",cmd:"mcePreview"})},getInfo:function(){return{longname:"Preview",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/preview",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("preview",tinymce.plugins.Preview)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.Preview",{init:function(a,b){var d=this,c=tinymce.explode(a.settings.content_css);d.editor=a;tinymce.each(c,function(f,e){c[e]=a.documentBaseURI.toAbsolute(f)});a.addCommand("mcePreview",function(){a.windowManager.open({file:a.getParam("plugin_preview_pageurl",b+"/preview.html"),width:parseInt(a.getParam("plugin_preview_width","550")),height:parseInt(a.getParam("plugin_preview_height","600")),resizable:"yes",scrollbars:"yes",popup_css:c?c.join(","):a.baseURI.toAbsolute("themes/"+a.settings.theme+"/skins/"+a.settings.skin+"/content.css"),inline:a.getParam("plugin_preview_inline",1)},{base:a.documentBaseURI.getURI()})});a.addButton("preview",{title:"preview.preview_desc",cmd:"mcePreview"})},getInfo:function(){return{longname:"Preview",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/preview",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("preview",tinymce.plugins.Preview)})();
diff --git a/js/tiny_mce/plugins/preview/editor_plugin_src.js b/js/tiny_mce/plugins/preview/editor_plugin_src.js
index 80f00f0d9f6..1ddc93c43c0 100644
--- a/js/tiny_mce/plugins/preview/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/preview/editor_plugin_src.js
@@ -50,4 +50,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('preview', tinymce.plugins.Preview);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/print/editor_plugin.js b/js/tiny_mce/plugins/print/editor_plugin.js
index b5b3a55edf4..84f603675fe 100644
--- a/js/tiny_mce/plugins/print/editor_plugin.js
+++ b/js/tiny_mce/plugins/print/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.Print",{init:function(a,b){a.addCommand("mcePrint",function(){a.getWin().print()});a.addButton("print",{title:"print.print_desc",cmd:"mcePrint"})},getInfo:function(){return{longname:"Print",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/print",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("print",tinymce.plugins.Print)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.Print",{init:function(a,b){a.addCommand("mcePrint",function(){a.getWin().print()});a.addButton("print",{title:"print.print_desc",cmd:"mcePrint"})},getInfo:function(){return{longname:"Print",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/print",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("print",tinymce.plugins.Print)})();
diff --git a/js/tiny_mce/plugins/save/editor_plugin.js b/js/tiny_mce/plugins/save/editor_plugin.js
index 8e939966710..16744346ee5 100644
--- a/js/tiny_mce/plugins/save/editor_plugin.js
+++ b/js/tiny_mce/plugins/save/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.Save",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceSave",c._save,c);a.addCommand("mceCancel",c._cancel,c);a.addButton("save",{title:"save.save_desc",cmd:"mceSave"});a.addButton("cancel",{title:"save.cancel_desc",cmd:"mceCancel"});a.onNodeChange.add(c._nodeChange,c);a.addShortcut("ctrl+s",a.getLang("save.save_desc"),"mceSave")},getInfo:function(){return{longname:"Save",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/save",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,c){var b=this.editor;if(b.getParam("save_enablewhendirty")){a.setDisabled("save",!b.isDirty());a.setDisabled("cancel",!b.isDirty())}},_save:function(){var c=this.editor,a,e,d,b;a=tinymce.DOM.get(c.id).form||tinymce.DOM.getParent(c.id,"form");if(c.getParam("save_enablewhendirty")&&!c.isDirty()){return}tinyMCE.triggerSave();if(e=c.getParam("save_onsavecallback")){if(c.execCallback("save_onsavecallback",c)){c.startContent=tinymce.trim(c.getContent({format:"raw"}));c.nodeChanged()}return}if(a){c.isNotDirty=true;if(a.onsubmit==null||a.onsubmit()!=false){a.submit()}c.nodeChanged()}else{c.windowManager.alert("Error: No form element found.")}},_cancel:function(){var a=this.editor,c,b=tinymce.trim(a.startContent);if(c=a.getParam("save_oncancelcallback")){a.execCallback("save_oncancelcallback",a);return}a.setContent(b);a.undoManager.clear();a.nodeChanged()}});tinymce.PluginManager.add("save",tinymce.plugins.Save)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.Save",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceSave",c._save,c);a.addCommand("mceCancel",c._cancel,c);a.addButton("save",{title:"save.save_desc",cmd:"mceSave"});a.addButton("cancel",{title:"save.cancel_desc",cmd:"mceCancel"});a.onNodeChange.add(c._nodeChange,c);a.addShortcut("ctrl+s",a.getLang("save.save_desc"),"mceSave")},getInfo:function(){return{longname:"Save",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/save",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,c){var b=this.editor;if(b.getParam("save_enablewhendirty")){a.setDisabled("save",!b.isDirty());a.setDisabled("cancel",!b.isDirty())}},_save:function(){var c=this.editor,a,e,d,b;a=tinymce.DOM.get(c.id).form||tinymce.DOM.getParent(c.id,"form");if(c.getParam("save_enablewhendirty")&&!c.isDirty()){return}tinyMCE.triggerSave();if(e=c.getParam("save_onsavecallback")){if(c.execCallback("save_onsavecallback",c)){c.startContent=tinymce.trim(c.getContent({format:"raw"}));c.nodeChanged()}return}if(a){c.isNotDirty=true;if(a.onsubmit==null||a.onsubmit()!=false){a.submit()}c.nodeChanged()}else{c.windowManager.alert("Error: No form element found.")}},_cancel:function(){var a=this.editor,c,b=tinymce.trim(a.startContent);if(c=a.getParam("save_oncancelcallback")){a.execCallback("save_oncancelcallback",a);return}a.setContent(b);a.undoManager.clear();a.nodeChanged()}});tinymce.PluginManager.add("save",tinymce.plugins.Save)})();
diff --git a/js/tiny_mce/plugins/save/editor_plugin_src.js b/js/tiny_mce/plugins/save/editor_plugin_src.js
index f5a3de8f5fa..a54fd2abdba 100644
--- a/js/tiny_mce/plugins/save/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/save/editor_plugin_src.js
@@ -98,4 +98,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('save', tinymce.plugins.Save);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/searchreplace/editor_plugin.js b/js/tiny_mce/plugins/searchreplace/editor_plugin.js
index 165bc12df59..396d5c23eaf 100644
--- a/js/tiny_mce/plugins/searchreplace/editor_plugin.js
+++ b/js/tiny_mce/plugins/searchreplace/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.SearchReplacePlugin",{init:function(a,c){function b(d){window.focus();a.windowManager.open({file:c+"/searchreplace.htm",width:420+parseInt(a.getLang("searchreplace.delta_width",0)),height:170+parseInt(a.getLang("searchreplace.delta_height",0)),inline:1,auto_focus:0},{mode:d,search_string:a.selection.getContent({format:"text"}),plugin_url:c})}a.addCommand("mceSearch",function(){b("search")});a.addCommand("mceReplace",function(){b("replace")});a.addButton("search",{title:"searchreplace.search_desc",cmd:"mceSearch"});a.addButton("replace",{title:"searchreplace.replace_desc",cmd:"mceReplace"});a.addShortcut("ctrl+f","searchreplace.search_desc","mceSearch")},getInfo:function(){return{longname:"Search/Replace",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("searchreplace",tinymce.plugins.SearchReplacePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.SearchReplacePlugin",{init:function(a,c){function b(d){window.focus();a.windowManager.open({file:c+"/searchreplace.htm",width:420+parseInt(a.getLang("searchreplace.delta_width",0)),height:170+parseInt(a.getLang("searchreplace.delta_height",0)),inline:1,auto_focus:0},{mode:d,search_string:a.selection.getContent({format:"text"}),plugin_url:c})}a.addCommand("mceSearch",function(){b("search")});a.addCommand("mceReplace",function(){b("replace")});a.addButton("search",{title:"searchreplace.search_desc",cmd:"mceSearch"});a.addButton("replace",{title:"searchreplace.replace_desc",cmd:"mceReplace"});a.addShortcut("ctrl+f","searchreplace.search_desc","mceSearch")},getInfo:function(){return{longname:"Search/Replace",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("searchreplace",tinymce.plugins.SearchReplacePlugin)})();
diff --git a/js/tiny_mce/plugins/searchreplace/editor_plugin_src.js b/js/tiny_mce/plugins/searchreplace/editor_plugin_src.js
index 4c87e8fa79d..c75c8df088b 100644
--- a/js/tiny_mce/plugins/searchreplace/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/searchreplace/editor_plugin_src.js
@@ -58,4 +58,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('searchreplace', tinymce.plugins.SearchReplacePlugin);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/searchreplace/langs/en_dlg.js b/js/tiny_mce/plugins/searchreplace/langs/en_dlg.js
index 8a65900977a..cfcc4cd59a6 100644
--- a/js/tiny_mce/plugins/searchreplace/langs/en_dlg.js
+++ b/js/tiny_mce/plugins/searchreplace/langs/en_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.searchreplace_dlg',{findwhat:"Find What",replacewith:"Replace with",direction:"Direction",up:"Up",down:"Down",mcase:"Match Case",findnext:"Find Next",allreplaced:"All occurrences of the search string were replaced.","searchnext_desc":"Find Again",notfound:"The search has been completed. The search string could not be found.","search_title":"Find","replace_title":"Find/Replace",replaceall:"Replace All",replace:"Replace"});
\ No newline at end of file
+tinyMCE.addI18n('en.searchreplace_dlg',{findwhat:"Find What",replacewith:"Replace with",direction:"Direction",up:"Up",down:"Down",mcase:"Match Case",findnext:"Find Next",allreplaced:"All occurrences of the search string were replaced.","searchnext_desc":"Find Again",notfound:"The search has been completed. The search string could not be found.","search_title":"Find","replace_title":"Find/Replace",replaceall:"Replace All",replace:"Replace"});
diff --git a/js/tiny_mce/plugins/style/editor_plugin.js b/js/tiny_mce/plugins/style/editor_plugin.js
index cab2153c40f..b474c723013 100644
--- a/js/tiny_mce/plugins/style/editor_plugin.js
+++ b/js/tiny_mce/plugins/style/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.StylePlugin",{init:function(a,b){a.addCommand("mceStyleProps",function(){a.windowManager.open({file:b+"/props.htm",width:480+parseInt(a.getLang("style.delta_width",0)),height:320+parseInt(a.getLang("style.delta_height",0)),inline:1},{plugin_url:b,style_text:a.selection.getNode().style.cssText})});a.addCommand("mceSetElementStyle",function(d,c){if(e=a.selection.getNode()){a.dom.setAttrib(e,"style",c);a.execCommand("mceRepaint")}});a.onNodeChange.add(function(d,c,f){c.setDisabled("styleprops",f.nodeName==="BODY")});a.addButton("styleprops",{title:"style.desc",cmd:"mceStyleProps"})},getInfo:function(){return{longname:"Style",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("style",tinymce.plugins.StylePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.StylePlugin",{init:function(a,b){a.addCommand("mceStyleProps",function(){a.windowManager.open({file:b+"/props.htm",width:480+parseInt(a.getLang("style.delta_width",0)),height:320+parseInt(a.getLang("style.delta_height",0)),inline:1},{plugin_url:b,style_text:a.selection.getNode().style.cssText})});a.addCommand("mceSetElementStyle",function(d,c){if(e=a.selection.getNode()){a.dom.setAttrib(e,"style",c);a.execCommand("mceRepaint")}});a.onNodeChange.add(function(d,c,f){c.setDisabled("styleprops",f.nodeName==="BODY")});a.addButton("styleprops",{title:"style.desc",cmd:"mceStyleProps"})},getInfo:function(){return{longname:"Style",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("style",tinymce.plugins.StylePlugin)})();
diff --git a/js/tiny_mce/plugins/style/editor_plugin_src.js b/js/tiny_mce/plugins/style/editor_plugin_src.js
index 5f7755f1840..dab364684a1 100644
--- a/js/tiny_mce/plugins/style/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/style/editor_plugin_src.js
@@ -52,4 +52,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('style', tinymce.plugins.StylePlugin);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/style/langs/en_dlg.js b/js/tiny_mce/plugins/style/langs/en_dlg.js
index 9a1d4a22303..a87bd6a493e 100644
--- a/js/tiny_mce/plugins/style/langs/en_dlg.js
+++ b/js/tiny_mce/plugins/style/langs/en_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.style_dlg',{"text_lineheight":"Line Height","text_variant":"Variant","text_style":"Style","text_weight":"Weight","text_size":"Size","text_font":"Font","text_props":"Text","positioning_tab":"Positioning","list_tab":"List","border_tab":"Border","box_tab":"Box","block_tab":"Block","background_tab":"Background","text_tab":"Text",apply:"Apply",title:"Edit CSS Style",clip:"Clip",placement:"Placement",overflow:"Overflow",zindex:"Z-index",visibility:"Visibility","positioning_type":"Type",position:"Position","bullet_image":"Bullet Image","list_type":"Type",color:"Color",height:"Height",width:"Width",style:"Style",margin:"Margin",left:"Left",bottom:"Bottom",right:"Right",top:"Top",same:"Same for All",padding:"Padding","box_clear":"Clear","box_float":"Float","box_height":"Height","box_width":"Width","block_display":"Display","block_whitespace":"Whitespace","block_text_indent":"Text Indent","block_text_align":"Text Align","block_vertical_alignment":"Vertical Alignment","block_letterspacing":"Letter Spacing","block_wordspacing":"Word Spacing","background_vpos":"Vertical Position","background_hpos":"Horizontal Position","background_attachment":"Attachment","background_repeat":"Repeat","background_image":"Background Image","background_color":"Background Color","text_none":"None","text_blink":"Blink","text_case":"Case","text_striketrough":"Strikethrough","text_underline":"Underline","text_overline":"Overline","text_decoration":"Decoration","text_color":"Color",text:"Text",background:"Background",block:"Block",box:"Box",border:"Border",list:"List"});
\ No newline at end of file
+tinyMCE.addI18n('en.style_dlg',{"text_lineheight":"Line Height","text_variant":"Variant","text_style":"Style","text_weight":"Weight","text_size":"Size","text_font":"Font","text_props":"Text","positioning_tab":"Positioning","list_tab":"List","border_tab":"Border","box_tab":"Box","block_tab":"Block","background_tab":"Background","text_tab":"Text",apply:"Apply",title:"Edit CSS Style",clip:"Clip",placement:"Placement",overflow:"Overflow",zindex:"Z-index",visibility:"Visibility","positioning_type":"Type",position:"Position","bullet_image":"Bullet Image","list_type":"Type",color:"Color",height:"Height",width:"Width",style:"Style",margin:"Margin",left:"Left",bottom:"Bottom",right:"Right",top:"Top",same:"Same for All",padding:"Padding","box_clear":"Clear","box_float":"Float","box_height":"Height","box_width":"Width","block_display":"Display","block_whitespace":"Whitespace","block_text_indent":"Text Indent","block_text_align":"Text Align","block_vertical_alignment":"Vertical Alignment","block_letterspacing":"Letter Spacing","block_wordspacing":"Word Spacing","background_vpos":"Vertical Position","background_hpos":"Horizontal Position","background_attachment":"Attachment","background_repeat":"Repeat","background_image":"Background Image","background_color":"Background Color","text_none":"None","text_blink":"Blink","text_case":"Case","text_striketrough":"Strikethrough","text_underline":"Underline","text_overline":"Overline","text_decoration":"Decoration","text_color":"Color",text:"Text",background:"Background",block:"Block",box:"Box",border:"Border",list:"List"});
diff --git a/js/tiny_mce/plugins/tabfocus/editor_plugin.js b/js/tiny_mce/plugins/tabfocus/editor_plugin.js
index 42a82d112c5..8e02d72b028 100644
--- a/js/tiny_mce/plugins/tabfocus/editor_plugin.js
+++ b/js/tiny_mce/plugins/tabfocus/editor_plugin.js
@@ -1 +1 @@
-(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(t){n=c.select(":input:enabled,*[tabindex]");function s(v){return v.nodeName==="BODY"||(v.type!="hidden"&&!(v.style.display=="none")&&!(v.style.visibility=="hidden")&&s(v.parentNode))}function i(v){return v.attributes.tabIndex.specified||v.nodeName=="INPUT"||v.nodeName=="TEXTAREA"}function u(){return tinymce.isIE6||tinymce.isIE7}function r(v){return((!u()||i(v)))&&v.getAttribute("tabindex")!="-1"&&s(v)}d(n,function(w,v){if(w.id==l.id){j=v;return false}});if(t>0){for(m=j+1;m<n.length;m++){if(r(n[m])){return n[m]}}}else{for(m=j-1;m>=0;m--){if(r(n[m])){return n[m]}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(n.id&&(l=tinymce.get(n.id||n.name))){l.focus()}else{window.setTimeout(function(){if(!tinymce.isWebKit){window.focus()}n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})();
\ No newline at end of file
+(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(t){n=c.select(":input:enabled,*[tabindex]");function s(v){return v.nodeName==="BODY"||(v.type!="hidden"&&!(v.style.display=="none")&&!(v.style.visibility=="hidden")&&s(v.parentNode))}function i(v){return v.attributes.tabIndex.specified||v.nodeName=="INPUT"||v.nodeName=="TEXTAREA"}function u(){return tinymce.isIE6||tinymce.isIE7}function r(v){return((!u()||i(v)))&&v.getAttribute("tabindex")!="-1"&&s(v)}d(n,function(w,v){if(w.id==l.id){j=v;return false}});if(t>0){for(m=j+1;m<n.length;m++){if(r(n[m])){return n[m]}}}else{for(m=j-1;m>=0;m--){if(r(n[m])){return n[m]}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(n.id&&(l=tinymce.get(n.id||n.name))){l.focus()}else{window.setTimeout(function(){if(!tinymce.isWebKit){window.focus()}n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})();
diff --git a/js/tiny_mce/plugins/table/css/cell.css b/js/tiny_mce/plugins/table/css/cell.css
index a067ecdfedb..9658ee9cf3e 100644
--- a/js/tiny_mce/plugins/table/css/cell.css
+++ b/js/tiny_mce/plugins/table/css/cell.css
@@ -14,4 +14,4 @@
 
 #class {
 	width: 150px;
-}
\ No newline at end of file
+}
diff --git a/js/tiny_mce/plugins/table/editor_plugin.js b/js/tiny_mce/plugins/table/editor_plugin.js
index 2f3b0e2d7a8..2b5b9029a2d 100644
--- a/js/tiny_mce/plugins/table/editor_plugin.js
+++ b/js/tiny_mce/plugins/table/editor_plugin.js
@@ -1 +1 @@
-(function(d){var e=d.each;function c(g,h){var j=h.ownerDocument,f=j.createRange(),k;f.setStartBefore(h);f.setEnd(g.endContainer,g.endOffset);k=j.createElement("body");k.appendChild(f.cloneContents());return k.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi,"-").replace(/<[^>]+>/g,"").length==0}function a(g,f){return parseInt(g.getAttribute(f)||1)}function b(H,G,K){var g,L,D,o;t();o=G.getParent(K.getStart(),"th,td");if(o){L=F(o);D=I();o=z(L.x,L.y)}function A(N,M){N=N.cloneNode(M);N.removeAttribute("id");return N}function t(){var M=0;g=[];e(["thead","tbody","tfoot"],function(N){var O=G.select("> "+N+" tr",H);e(O,function(P,Q){Q+=M;e(G.select("> td, > th",P),function(W,R){var S,T,U,V;if(g[Q]){while(g[Q][R]){R++}}U=a(W,"rowspan");V=a(W,"colspan");for(T=Q;T<Q+U;T++){if(!g[T]){g[T]=[]}for(S=R;S<R+V;S++){g[T][S]={part:N,real:T==Q&&S==R,elm:W,rowspan:U,colspan:V}}}})});M+=O.length})}function z(M,O){var N;N=g[O];if(N){return N[M]}}function s(O,M,N){if(O){N=parseInt(N);if(N===1){O.removeAttribute(M,1)}else{O.setAttribute(M,N,1)}}}function j(M){return M&&(G.hasClass(M.elm,"mceSelected")||M==o)}function k(){var M=[];e(H.rows,function(N){e(N.cells,function(O){if(G.hasClass(O,"mceSelected")||O==o.elm){M.push(N);return false}})});return M}function r(){var M=G.createRng();M.setStartAfter(H);M.setEndAfter(H);K.setRng(M);G.remove(H)}function f(M){var N;d.walk(M,function(P){var O;if(P.nodeType==3){e(G.getParents(P.parentNode,null,M).reverse(),function(Q){Q=A(Q,false);if(!N){N=O=Q}else{if(O){O.appendChild(Q)}}O=Q});if(O){O.innerHTML=d.isIE?"&nbsp;":'<br data-mce-bogus="1" />'}return false}},"childNodes");M=A(M,false);s(M,"rowSpan",1);s(M,"colSpan",1);if(N){M.appendChild(N)}else{if(!d.isIE){M.innerHTML='<br data-mce-bogus="1" />'}}return M}function q(){var M=G.createRng();e(G.select("tr",H),function(N){if(N.cells.length==0){G.remove(N)}});if(G.select("tr",H).length==0){M.setStartAfter(H);M.setEndAfter(H);K.setRng(M);G.remove(H);return}e(G.select("thead,tbody,tfoot",H),function(N){if(N.rows.length==0){G.remove(N)}});t();row=g[Math.min(g.length-1,L.y)];if(row){K.select(row[Math.min(row.length-1,L.x)].elm,true);K.collapse(true)}}function u(S,Q,U,R){var P,N,M,O,T;P=g[Q][S].elm.parentNode;for(M=1;M<=U;M++){P=G.getNext(P,"tr");if(P){for(N=S;N>=0;N--){T=g[Q+M][N].elm;if(T.parentNode==P){for(O=1;O<=R;O++){G.insertAfter(f(T),T)}break}}if(N==-1){for(O=1;O<=R;O++){P.insertBefore(f(P.cells[0]),P.cells[0])}}}}}function C(){e(g,function(M,N){e(M,function(P,O){var S,R,T,Q;if(j(P)){P=P.elm;S=a(P,"colspan");R=a(P,"rowspan");if(S>1||R>1){s(P,"rowSpan",1);s(P,"colSpan",1);for(Q=0;Q<S-1;Q++){G.insertAfter(f(P),P)}u(O,N,R-1,S)}}})})}function p(V,S,Y){var P,O,X,W,U,R,T,M,V,N,Q;if(V){pos=F(V);P=pos.x;O=pos.y;X=P+(S-1);W=O+(Y-1)}else{P=L.x;O=L.y;X=D.x;W=D.y}T=z(P,O);M=z(X,W);if(T&&M&&T.part==M.part){C();t();T=z(P,O).elm;s(T,"colSpan",(X-P)+1);s(T,"rowSpan",(W-O)+1);for(R=O;R<=W;R++){for(U=P;U<=X;U++){if(!g[R]||!g[R][U]){continue}V=g[R][U].elm;if(V!=T){N=d.grep(V.childNodes);e(N,function(Z){T.appendChild(Z)});if(N.length){N=d.grep(T.childNodes);Q=0;e(N,function(Z){if(Z.nodeName=="BR"&&G.getAttrib(Z,"data-mce-bogus")&&Q++<N.length-1){T.removeChild(Z)}})}G.remove(V)}}}q()}}function l(Q){var M,S,P,R,T,U,N,V,O;e(g,function(W,X){e(W,function(Z,Y){if(j(Z)){Z=Z.elm;T=Z.parentNode;U=A(T,false);M=X;if(Q){return false}}});if(Q){return !M}});for(R=0;R<g[0].length;R++){if(!g[M][R]){continue}S=g[M][R].elm;if(S!=P){if(!Q){O=a(S,"rowspan");if(O>1){s(S,"rowSpan",O+1);continue}}else{if(M>0&&g[M-1][R]){V=g[M-1][R].elm;O=a(V,"rowSpan");if(O>1){s(V,"rowSpan",O+1);continue}}}N=f(S);s(N,"colSpan",S.colSpan);U.appendChild(N);P=S}}if(U.hasChildNodes()){if(!Q){G.insertAfter(U,T)}else{T.parentNode.insertBefore(U,T)}}}function h(N){var O,M;e(g,function(P,Q){e(P,function(S,R){if(j(S)){O=R;if(N){return false}}});if(N){return !O}});e(g,function(S,T){var P,Q,R;if(!S[O]){return}P=S[O].elm;if(P!=M){R=a(P,"colspan");Q=a(P,"rowspan");if(R==1){if(!N){G.insertAfter(f(P),P);u(O,T,Q-1,R)}else{P.parentNode.insertBefore(f(P),P);u(O,T,Q-1,R)}}else{s(P,"colSpan",P.colSpan+1)}M=P}})}function n(){var M=[];e(g,function(N,O){e(N,function(Q,P){if(j(Q)&&d.inArray(M,P)===-1){e(g,function(T){var R=T[P].elm,S;S=a(R,"colSpan");if(S>1){s(R,"colSpan",S-1)}else{G.remove(R)}});M.push(P)}})});q()}function m(){var N;function M(Q){var P,R,O;P=G.getNext(Q,"tr");e(Q.cells,function(S){var T=a(S,"rowSpan");if(T>1){s(S,"rowSpan",T-1);R=F(S);u(R.x,R.y,1,1)}});R=F(Q.cells[0]);e(g[R.y],function(S){var T;S=S.elm;if(S!=O){T=a(S,"rowSpan");if(T<=1){G.remove(S)}else{s(S,"rowSpan",T-1)}O=S}})}N=k();e(N.reverse(),function(O){M(O)});q()}function E(){var M=k();G.remove(M);q();return M}function J(){var M=k();e(M,function(O,N){M[N]=A(O,true)});return M}function B(O,N){var P=k(),M=P[N?0:P.length-1],Q=M.cells.length;e(g,function(S){var R;Q=0;e(S,function(U,T){if(U.real){Q+=U.colspan}if(U.elm.parentNode==M){R=1}});if(R){return false}});if(!N){O.reverse()}e(O,function(T){var S=T.cells.length,R;for(i=0;i<S;i++){R=T.cells[i];s(R,"colSpan",1);s(R,"rowSpan",1)}for(i=S;i<Q;i++){T.appendChild(f(T.cells[S-1]))}for(i=Q;i<S;i++){G.remove(T.cells[i])}if(N){M.parentNode.insertBefore(T,M)}else{G.insertAfter(T,M)}})}function F(M){var N;e(g,function(O,P){e(O,function(R,Q){if(R.elm==M){N={x:Q,y:P};return false}});return !N});return N}function w(M){L=F(M)}function I(){var O,N,M;N=M=0;e(g,function(P,Q){e(P,function(S,R){var U,T;if(j(S)){S=g[Q][R];if(R>N){N=R}if(Q>M){M=Q}if(S.real){U=S.colspan-1;T=S.rowspan-1;if(U){if(R+U>N){N=R+U}}if(T){if(Q+T>M){M=Q+T}}}}})});return{x:N,y:M}}function v(S){var P,O,U,T,N,M,Q,R;D=F(S);if(L&&D){P=Math.min(L.x,D.x);O=Math.min(L.y,D.y);U=Math.max(L.x,D.x);T=Math.max(L.y,D.y);N=U;M=T;for(y=O;y<=M;y++){S=g[y][P];if(!S.real){if(P-(S.colspan-1)<P){P-=S.colspan-1}}}for(x=P;x<=N;x++){S=g[O][x];if(!S.real){if(O-(S.rowspan-1)<O){O-=S.rowspan-1}}}for(y=O;y<=T;y++){for(x=P;x<=U;x++){S=g[y][x];if(S.real){Q=S.colspan-1;R=S.rowspan-1;if(Q){if(x+Q>N){N=x+Q}}if(R){if(y+R>M){M=y+R}}}}}G.removeClass(G.select("td.mceSelected,th.mceSelected"),"mceSelected");for(y=O;y<=M;y++){for(x=P;x<=N;x++){if(g[y][x]){G.addClass(g[y][x].elm,"mceSelected")}}}}}d.extend(this,{deleteTable:r,split:C,merge:p,insertRow:l,insertCol:h,deleteCols:n,deleteRows:m,cutRows:E,copyRows:J,pasteRows:B,getPos:F,setStartCell:w,setEndCell:v})}d.create("tinymce.plugins.TablePlugin",{init:function(g,h){var f,m,j=true;function l(p){var o=g.selection,n=g.dom.getParent(p||o.getNode(),"table");if(n){return new b(n,g.dom,o)}}function k(){g.getBody().style.webkitUserSelect="";if(j){g.dom.removeClass(g.dom.select("td.mceSelected,th.mceSelected"),"mceSelected");j=false}}e([["table","table.desc","mceInsertTable",true],["delete_table","table.del","mceTableDelete"],["delete_col","table.delete_col_desc","mceTableDeleteCol"],["delete_row","table.delete_row_desc","mceTableDeleteRow"],["col_after","table.col_after_desc","mceTableInsertColAfter"],["col_before","table.col_before_desc","mceTableInsertColBefore"],["row_after","table.row_after_desc","mceTableInsertRowAfter"],["row_before","table.row_before_desc","mceTableInsertRowBefore"],["row_props","table.row_desc","mceTableRowProps",true],["cell_props","table.cell_desc","mceTableCellProps",true],["split_cells","table.split_cells_desc","mceTableSplitCells",true],["merge_cells","table.merge_cells_desc","mceTableMergeCells",true]],function(n){g.addButton(n[0],{title:n[1],cmd:n[2],ui:n[3]})});if(!d.isIE){g.onClick.add(function(n,o){o=o.target;if(o.nodeName==="TABLE"){n.selection.select(o);n.nodeChanged()}})}g.onPreProcess.add(function(o,p){var n,q,r,t=o.dom,s;n=t.select("table",p.node);q=n.length;while(q--){r=n[q];t.setAttrib(r,"data-mce-style","");if((s=t.getAttrib(r,"width"))){t.setStyle(r,"width",s);t.setAttrib(r,"width","")}if((s=t.getAttrib(r,"height"))){t.setStyle(r,"height",s);t.setAttrib(r,"height","")}}});g.onNodeChange.add(function(q,o,s){var r;s=q.selection.getStart();r=q.dom.getParent(s,"td,th,caption");o.setActive("table",s.nodeName==="TABLE"||!!r);if(r&&r.nodeName==="CAPTION"){r=0}o.setDisabled("delete_table",!r);o.setDisabled("delete_col",!r);o.setDisabled("delete_table",!r);o.setDisabled("delete_row",!r);o.setDisabled("col_after",!r);o.setDisabled("col_before",!r);o.setDisabled("row_after",!r);o.setDisabled("row_before",!r);o.setDisabled("row_props",!r);o.setDisabled("cell_props",!r);o.setDisabled("split_cells",!r);o.setDisabled("merge_cells",!r)});g.onInit.add(function(r){var p,t,q=r.dom,u;f=r.windowManager;r.onMouseDown.add(function(w,z){if(z.button!=2){k();t=q.getParent(z.target,"td,th");p=q.getParent(t,"table")}});q.bind(r.getDoc(),"mouseover",function(C){var A,z,B=C.target;if(t&&(u||B!=t)&&(B.nodeName=="TD"||B.nodeName=="TH")){z=q.getParent(B,"table");if(z==p){if(!u){u=l(z);u.setStartCell(t);r.getBody().style.webkitUserSelect="none"}u.setEndCell(B);j=true}A=r.selection.getSel();try{if(A.removeAllRanges){A.removeAllRanges()}else{A.empty()}}catch(w){}C.preventDefault()}});r.onMouseUp.add(function(F,G){var z,B=F.selection,H,I=B.getSel(),w,C,A,E;if(t){if(u){F.getBody().style.webkitUserSelect=""}function D(J,L){var K=new d.dom.TreeWalker(J,J);do{if(J.nodeType==3&&d.trim(J.nodeValue).length!=0){if(L){z.setStart(J,0)}else{z.setEnd(J,J.nodeValue.length)}return}if(J.nodeName=="BR"){if(L){z.setStartBefore(J)}else{z.setEndBefore(J)}return}}while(J=(L?K.next():K.prev()))}H=q.select("td.mceSelected,th.mceSelected");if(H.length>0){z=q.createRng();C=H[0];E=H[H.length-1];z.setStartBefore(C);z.setEndAfter(C);D(C,1);w=new d.dom.TreeWalker(C,q.getParent(H[0],"table"));do{if(C.nodeName=="TD"||C.nodeName=="TH"){if(!q.hasClass(C,"mceSelected")){break}A=C}}while(C=w.next());D(A);B.setRng(z)}F.nodeChanged();t=u=p=null}});r.onKeyUp.add(function(w,z){k()});r.onKeyDown.add(function(w,z){n(w)});r.onMouseDown.add(function(w,z){if(z.button!=2){n(w)}});function o(D,z,A,F){var B=3,G=D.dom.getParent(z.startContainer,"TABLE"),C,w,E;if(G){C=G.parentNode}w=z.startContainer.nodeType==B&&z.startOffset==0&&z.endOffset==0&&F&&(A.nodeName=="TR"||A==C);E=(A.nodeName=="TD"||A.nodeName=="TH")&&!F;return w||E}function n(A){if(!d.isWebKit){return}var z=A.selection.getRng();var C=A.selection.getNode();var B=A.dom.getParent(z.startContainer,"TD,TH");if(!o(A,z,C,B)){return}if(!B){B=C}var w=B.lastChild;while(w.lastChild){w=w.lastChild}z.setEnd(w,w.nodeValue.length);A.selection.setRng(z)}r.plugins.table.fixTableCellSelection=n;if(r&&r.plugins.contextmenu){r.plugins.contextmenu.onContextMenu.add(function(A,w,C){var D,B=r.selection,z=B.getNode()||r.getBody();if(r.dom.getParent(C,"td")||r.dom.getParent(C,"th")||r.dom.select("td.mceSelected,th.mceSelected").length){w.removeAll();if(z.nodeName=="A"&&!r.dom.getAttrib(z,"name")){w.add({title:"advanced.link_desc",icon:"link",cmd:r.plugins.advlink?"mceAdvLink":"mceLink",ui:true});w.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});w.addSeparator()}if(z.nodeName=="IMG"&&z.className.indexOf("mceItem")==-1){w.add({title:"advanced.image_desc",icon:"image",cmd:r.plugins.advimage?"mceAdvImage":"mceImage",ui:true});w.addSeparator()}w.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",value:{action:"insert"}});w.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable"});w.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete"});w.addSeparator();D=w.addMenu({title:"table.cell"});D.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps"});D.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells"});D.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells"});D=w.addMenu({title:"table.row"});D.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps"});D.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});D.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});D.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});D.addSeparator();D.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});D.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});D.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"}).setDisabled(!m);D.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"}).setDisabled(!m);D=w.addMenu({title:"table.col"});D.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});D.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});D.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{w.add({title:"table.desc",icon:"table",cmd:"mceInsertTable"})}})}if(d.isWebKit){function v(C,N){var L=d.VK;var Q=N.keyCode;function O(Y,U,S){var T=Y?"previousSibling":"nextSibling";var Z=C.dom.getParent(U,"tr");var X=Z[T];if(X){z(C,U,X,Y);d.dom.Event.cancel(S);return true}else{var aa=C.dom.getParent(Z,"table");var W=Z.parentNode;var R=W.nodeName.toLowerCase();if(R==="tbody"||R===(Y?"tfoot":"thead")){var V=w(Y,aa,W,"tbody");if(V!==null){return K(Y,V,U,S)}}return M(Y,Z,T,aa,S)}}function w(V,T,U,X){var S=C.dom.select(">"+X,T);var R=S.indexOf(U);if(V&&R===0||!V&&R===S.length-1){return B(V,T)}else{if(R===-1){var W=U.tagName.toLowerCase()==="thead"?0:S.length-1;return S[W]}else{return S[R+(V?-1:1)]}}}function B(U,T){var S=U?"thead":"tfoot";var R=C.dom.select(">"+S,T);return R.length!==0?R[0]:null}function K(V,T,S,U){var R=J(T,V);R&&z(C,S,R,V);d.dom.Event.cancel(U);return true}function M(Y,U,R,X,W){var S=X[R];if(S){F(S);return true}else{var V=C.dom.getParent(X,"td,th");if(V){return O(Y,V,W)}else{var T=J(U,!Y);F(T);return d.dom.Event.cancel(W)}}}function J(S,R){return S&&S[R?"lastChild":"firstChild"]}function F(R){C.selection.setCursorLocation(R,0)}function A(){return Q==L.UP||Q==L.DOWN}function D(R){var T=R.selection.getNode();var S=R.dom.getParent(T,"tr");return S!==null}function P(S){var R=0;var T=S;while(T.previousSibling){T=T.previousSibling;R=R+a(T,"colspan")}return R}function E(T,R){var U=0;var S=0;e(T.children,function(V,W){U=U+a(V,"colspan");S=W;if(U>R){return false}});return S}function z(T,W,Y,V){var X=P(T.dom.getParent(W,"td,th"));var S=E(Y,X);var R=Y.childNodes[S];var U=J(R,V);F(U||R)}function H(R){var T=C.selection.getNode();var U=C.dom.getParent(T,"td,th");var S=C.dom.getParent(R,"td,th");return U&&U!==S&&I(U,S)}function I(S,R){return C.dom.getParent(S,"TABLE")===C.dom.getParent(R,"TABLE")}if(A()&&D(C)){var G=C.selection.getNode();setTimeout(function(){if(H(G)){O(!N.shiftKey&&Q===L.UP,G,N)}},0)}}r.onKeyDown.add(v)}if(!d.isIE){function s(){var w;for(w=r.getBody().lastChild;w&&w.nodeType==3&&!w.nodeValue.length;w=w.previousSibling){}if(w&&w.nodeName=="TABLE"){r.dom.add(r.getBody(),"p",null,'<br mce_bogus="1" />')}}if(d.isGecko){r.onKeyDown.add(function(z,B){var w,A,C=z.dom;if(B.keyCode==37||B.keyCode==38){w=z.selection.getRng();A=C.getParent(w.startContainer,"table");if(A&&z.getBody().firstChild==A){if(c(w,A)){w=C.createRng();w.setStartBefore(A);w.setEndBefore(A);z.selection.setRng(w);B.preventDefault()}}}})}r.onKeyUp.add(s);r.onSetContent.add(s);r.onVisualAid.add(s);r.onPreProcess.add(function(w,A){var z=A.node.lastChild;if(z&&z.childNodes.length==1&&z.firstChild.nodeName=="BR"){w.dom.remove(z)}});s();r.startContent=r.getContent({format:"raw"})}});e({mceTableSplitCells:function(n){n.split()},mceTableMergeCells:function(o){var p,q,n;n=g.dom.getParent(g.selection.getNode(),"th,td");if(n){p=n.rowSpan;q=n.colSpan}if(!g.dom.select("td.mceSelected,th.mceSelected").length){f.open({url:h+"/merge_cells.htm",width:240+parseInt(g.getLang("table.merge_cells_delta_width",0)),height:110+parseInt(g.getLang("table.merge_cells_delta_height",0)),inline:1},{rows:p,cols:q,onaction:function(r){o.merge(n,r.cols,r.rows)},plugin_url:h})}else{o.merge()}},mceTableInsertRowBefore:function(n){n.insertRow(true)},mceTableInsertRowAfter:function(n){n.insertRow()},mceTableInsertColBefore:function(n){n.insertCol(true)},mceTableInsertColAfter:function(n){n.insertCol()},mceTableDeleteCol:function(n){n.deleteCols()},mceTableDeleteRow:function(n){n.deleteRows()},mceTableCutRow:function(n){m=n.cutRows()},mceTableCopyRow:function(n){m=n.copyRows()},mceTablePasteRowBefore:function(n){n.pasteRows(m,true)},mceTablePasteRowAfter:function(n){n.pasteRows(m)},mceTableDelete:function(n){n.deleteTable()}},function(o,n){g.addCommand(n,function(){var p=l();if(p){o(p);g.execCommand("mceRepaint");k()}})});e({mceInsertTable:function(n){f.open({url:h+"/table.htm",width:400+parseInt(g.getLang("table.table_delta_width",0)),height:320+parseInt(g.getLang("table.table_delta_height",0)),inline:1},{plugin_url:h,action:n?n.action:0})},mceTableRowProps:function(){f.open({url:h+"/row.htm",width:400+parseInt(g.getLang("table.rowprops_delta_width",0)),height:295+parseInt(g.getLang("table.rowprops_delta_height",0)),inline:1},{plugin_url:h})},mceTableCellProps:function(){f.open({url:h+"/cell.htm",width:400+parseInt(g.getLang("table.cellprops_delta_width",0)),height:295+parseInt(g.getLang("table.cellprops_delta_height",0)),inline:1},{plugin_url:h})}},function(o,n){g.addCommand(n,function(p,q){o(q)})})}});d.PluginManager.add("table",d.plugins.TablePlugin)})(tinymce);
\ No newline at end of file
+(function(d){var e=d.each;function c(g,h){var j=h.ownerDocument,f=j.createRange(),k;f.setStartBefore(h);f.setEnd(g.endContainer,g.endOffset);k=j.createElement("body");k.appendChild(f.cloneContents());return k.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi,"-").replace(/<[^>]+>/g,"").length==0}function a(g,f){return parseInt(g.getAttribute(f)||1)}function b(H,G,K){var g,L,D,o;t();o=G.getParent(K.getStart(),"th,td");if(o){L=F(o);D=I();o=z(L.x,L.y)}function A(N,M){N=N.cloneNode(M);N.removeAttribute("id");return N}function t(){var M=0;g=[];e(["thead","tbody","tfoot"],function(N){var O=G.select("> "+N+" tr",H);e(O,function(P,Q){Q+=M;e(G.select("> td, > th",P),function(W,R){var S,T,U,V;if(g[Q]){while(g[Q][R]){R++}}U=a(W,"rowspan");V=a(W,"colspan");for(T=Q;T<Q+U;T++){if(!g[T]){g[T]=[]}for(S=R;S<R+V;S++){g[T][S]={part:N,real:T==Q&&S==R,elm:W,rowspan:U,colspan:V}}}})});M+=O.length})}function z(M,O){var N;N=g[O];if(N){return N[M]}}function s(O,M,N){if(O){N=parseInt(N);if(N===1){O.removeAttribute(M,1)}else{O.setAttribute(M,N,1)}}}function j(M){return M&&(G.hasClass(M.elm,"mceSelected")||M==o)}function k(){var M=[];e(H.rows,function(N){e(N.cells,function(O){if(G.hasClass(O,"mceSelected")||O==o.elm){M.push(N);return false}})});return M}function r(){var M=G.createRng();M.setStartAfter(H);M.setEndAfter(H);K.setRng(M);G.remove(H)}function f(M){var N;d.walk(M,function(P){var O;if(P.nodeType==3){e(G.getParents(P.parentNode,null,M).reverse(),function(Q){Q=A(Q,false);if(!N){N=O=Q}else{if(O){O.appendChild(Q)}}O=Q});if(O){O.innerHTML=d.isIE?"&nbsp;":'<br data-mce-bogus="1" />'}return false}},"childNodes");M=A(M,false);s(M,"rowSpan",1);s(M,"colSpan",1);if(N){M.appendChild(N)}else{if(!d.isIE){M.innerHTML='<br data-mce-bogus="1" />'}}return M}function q(){var M=G.createRng();e(G.select("tr",H),function(N){if(N.cells.length==0){G.remove(N)}});if(G.select("tr",H).length==0){M.setStartAfter(H);M.setEndAfter(H);K.setRng(M);G.remove(H);return}e(G.select("thead,tbody,tfoot",H),function(N){if(N.rows.length==0){G.remove(N)}});t();row=g[Math.min(g.length-1,L.y)];if(row){K.select(row[Math.min(row.length-1,L.x)].elm,true);K.collapse(true)}}function u(S,Q,U,R){var P,N,M,O,T;P=g[Q][S].elm.parentNode;for(M=1;M<=U;M++){P=G.getNext(P,"tr");if(P){for(N=S;N>=0;N--){T=g[Q+M][N].elm;if(T.parentNode==P){for(O=1;O<=R;O++){G.insertAfter(f(T),T)}break}}if(N==-1){for(O=1;O<=R;O++){P.insertBefore(f(P.cells[0]),P.cells[0])}}}}}function C(){e(g,function(M,N){e(M,function(P,O){var S,R,T,Q;if(j(P)){P=P.elm;S=a(P,"colspan");R=a(P,"rowspan");if(S>1||R>1){s(P,"rowSpan",1);s(P,"colSpan",1);for(Q=0;Q<S-1;Q++){G.insertAfter(f(P),P)}u(O,N,R-1,S)}}})})}function p(V,S,Y){var P,O,X,W,U,R,T,M,V,N,Q;if(V){pos=F(V);P=pos.x;O=pos.y;X=P+(S-1);W=O+(Y-1)}else{P=L.x;O=L.y;X=D.x;W=D.y}T=z(P,O);M=z(X,W);if(T&&M&&T.part==M.part){C();t();T=z(P,O).elm;s(T,"colSpan",(X-P)+1);s(T,"rowSpan",(W-O)+1);for(R=O;R<=W;R++){for(U=P;U<=X;U++){if(!g[R]||!g[R][U]){continue}V=g[R][U].elm;if(V!=T){N=d.grep(V.childNodes);e(N,function(Z){T.appendChild(Z)});if(N.length){N=d.grep(T.childNodes);Q=0;e(N,function(Z){if(Z.nodeName=="BR"&&G.getAttrib(Z,"data-mce-bogus")&&Q++<N.length-1){T.removeChild(Z)}})}G.remove(V)}}}q()}}function l(Q){var M,S,P,R,T,U,N,V,O;e(g,function(W,X){e(W,function(Z,Y){if(j(Z)){Z=Z.elm;T=Z.parentNode;U=A(T,false);M=X;if(Q){return false}}});if(Q){return !M}});for(R=0;R<g[0].length;R++){if(!g[M][R]){continue}S=g[M][R].elm;if(S!=P){if(!Q){O=a(S,"rowspan");if(O>1){s(S,"rowSpan",O+1);continue}}else{if(M>0&&g[M-1][R]){V=g[M-1][R].elm;O=a(V,"rowSpan");if(O>1){s(V,"rowSpan",O+1);continue}}}N=f(S);s(N,"colSpan",S.colSpan);U.appendChild(N);P=S}}if(U.hasChildNodes()){if(!Q){G.insertAfter(U,T)}else{T.parentNode.insertBefore(U,T)}}}function h(N){var O,M;e(g,function(P,Q){e(P,function(S,R){if(j(S)){O=R;if(N){return false}}});if(N){return !O}});e(g,function(S,T){var P,Q,R;if(!S[O]){return}P=S[O].elm;if(P!=M){R=a(P,"colspan");Q=a(P,"rowspan");if(R==1){if(!N){G.insertAfter(f(P),P);u(O,T,Q-1,R)}else{P.parentNode.insertBefore(f(P),P);u(O,T,Q-1,R)}}else{s(P,"colSpan",P.colSpan+1)}M=P}})}function n(){var M=[];e(g,function(N,O){e(N,function(Q,P){if(j(Q)&&d.inArray(M,P)===-1){e(g,function(T){var R=T[P].elm,S;S=a(R,"colSpan");if(S>1){s(R,"colSpan",S-1)}else{G.remove(R)}});M.push(P)}})});q()}function m(){var N;function M(Q){var P,R,O;P=G.getNext(Q,"tr");e(Q.cells,function(S){var T=a(S,"rowSpan");if(T>1){s(S,"rowSpan",T-1);R=F(S);u(R.x,R.y,1,1)}});R=F(Q.cells[0]);e(g[R.y],function(S){var T;S=S.elm;if(S!=O){T=a(S,"rowSpan");if(T<=1){G.remove(S)}else{s(S,"rowSpan",T-1)}O=S}})}N=k();e(N.reverse(),function(O){M(O)});q()}function E(){var M=k();G.remove(M);q();return M}function J(){var M=k();e(M,function(O,N){M[N]=A(O,true)});return M}function B(O,N){var P=k(),M=P[N?0:P.length-1],Q=M.cells.length;e(g,function(S){var R;Q=0;e(S,function(U,T){if(U.real){Q+=U.colspan}if(U.elm.parentNode==M){R=1}});if(R){return false}});if(!N){O.reverse()}e(O,function(T){var S=T.cells.length,R;for(i=0;i<S;i++){R=T.cells[i];s(R,"colSpan",1);s(R,"rowSpan",1)}for(i=S;i<Q;i++){T.appendChild(f(T.cells[S-1]))}for(i=Q;i<S;i++){G.remove(T.cells[i])}if(N){M.parentNode.insertBefore(T,M)}else{G.insertAfter(T,M)}})}function F(M){var N;e(g,function(O,P){e(O,function(R,Q){if(R.elm==M){N={x:Q,y:P};return false}});return !N});return N}function w(M){L=F(M)}function I(){var O,N,M;N=M=0;e(g,function(P,Q){e(P,function(S,R){var U,T;if(j(S)){S=g[Q][R];if(R>N){N=R}if(Q>M){M=Q}if(S.real){U=S.colspan-1;T=S.rowspan-1;if(U){if(R+U>N){N=R+U}}if(T){if(Q+T>M){M=Q+T}}}}})});return{x:N,y:M}}function v(S){var P,O,U,T,N,M,Q,R;D=F(S);if(L&&D){P=Math.min(L.x,D.x);O=Math.min(L.y,D.y);U=Math.max(L.x,D.x);T=Math.max(L.y,D.y);N=U;M=T;for(y=O;y<=M;y++){S=g[y][P];if(!S.real){if(P-(S.colspan-1)<P){P-=S.colspan-1}}}for(x=P;x<=N;x++){S=g[O][x];if(!S.real){if(O-(S.rowspan-1)<O){O-=S.rowspan-1}}}for(y=O;y<=T;y++){for(x=P;x<=U;x++){S=g[y][x];if(S.real){Q=S.colspan-1;R=S.rowspan-1;if(Q){if(x+Q>N){N=x+Q}}if(R){if(y+R>M){M=y+R}}}}}G.removeClass(G.select("td.mceSelected,th.mceSelected"),"mceSelected");for(y=O;y<=M;y++){for(x=P;x<=N;x++){if(g[y][x]){G.addClass(g[y][x].elm,"mceSelected")}}}}}d.extend(this,{deleteTable:r,split:C,merge:p,insertRow:l,insertCol:h,deleteCols:n,deleteRows:m,cutRows:E,copyRows:J,pasteRows:B,getPos:F,setStartCell:w,setEndCell:v})}d.create("tinymce.plugins.TablePlugin",{init:function(g,h){var f,m,j=true;function l(p){var o=g.selection,n=g.dom.getParent(p||o.getNode(),"table");if(n){return new b(n,g.dom,o)}}function k(){g.getBody().style.webkitUserSelect="";if(j){g.dom.removeClass(g.dom.select("td.mceSelected,th.mceSelected"),"mceSelected");j=false}}e([["table","table.desc","mceInsertTable",true],["delete_table","table.del","mceTableDelete"],["delete_col","table.delete_col_desc","mceTableDeleteCol"],["delete_row","table.delete_row_desc","mceTableDeleteRow"],["col_after","table.col_after_desc","mceTableInsertColAfter"],["col_before","table.col_before_desc","mceTableInsertColBefore"],["row_after","table.row_after_desc","mceTableInsertRowAfter"],["row_before","table.row_before_desc","mceTableInsertRowBefore"],["row_props","table.row_desc","mceTableRowProps",true],["cell_props","table.cell_desc","mceTableCellProps",true],["split_cells","table.split_cells_desc","mceTableSplitCells",true],["merge_cells","table.merge_cells_desc","mceTableMergeCells",true]],function(n){g.addButton(n[0],{title:n[1],cmd:n[2],ui:n[3]})});if(!d.isIE){g.onClick.add(function(n,o){o=o.target;if(o.nodeName==="TABLE"){n.selection.select(o);n.nodeChanged()}})}g.onPreProcess.add(function(o,p){var n,q,r,t=o.dom,s;n=t.select("table",p.node);q=n.length;while(q--){r=n[q];t.setAttrib(r,"data-mce-style","");if((s=t.getAttrib(r,"width"))){t.setStyle(r,"width",s);t.setAttrib(r,"width","")}if((s=t.getAttrib(r,"height"))){t.setStyle(r,"height",s);t.setAttrib(r,"height","")}}});g.onNodeChange.add(function(q,o,s){var r;s=q.selection.getStart();r=q.dom.getParent(s,"td,th,caption");o.setActive("table",s.nodeName==="TABLE"||!!r);if(r&&r.nodeName==="CAPTION"){r=0}o.setDisabled("delete_table",!r);o.setDisabled("delete_col",!r);o.setDisabled("delete_table",!r);o.setDisabled("delete_row",!r);o.setDisabled("col_after",!r);o.setDisabled("col_before",!r);o.setDisabled("row_after",!r);o.setDisabled("row_before",!r);o.setDisabled("row_props",!r);o.setDisabled("cell_props",!r);o.setDisabled("split_cells",!r);o.setDisabled("merge_cells",!r)});g.onInit.add(function(r){var p,t,q=r.dom,u;f=r.windowManager;r.onMouseDown.add(function(w,z){if(z.button!=2){k();t=q.getParent(z.target,"td,th");p=q.getParent(t,"table")}});q.bind(r.getDoc(),"mouseover",function(C){var A,z,B=C.target;if(t&&(u||B!=t)&&(B.nodeName=="TD"||B.nodeName=="TH")){z=q.getParent(B,"table");if(z==p){if(!u){u=l(z);u.setStartCell(t);r.getBody().style.webkitUserSelect="none"}u.setEndCell(B);j=true}A=r.selection.getSel();try{if(A.removeAllRanges){A.removeAllRanges()}else{A.empty()}}catch(w){}C.preventDefault()}});r.onMouseUp.add(function(F,G){var z,B=F.selection,H,I=B.getSel(),w,C,A,E;if(t){if(u){F.getBody().style.webkitUserSelect=""}function D(J,L){var K=new d.dom.TreeWalker(J,J);do{if(J.nodeType==3&&d.trim(J.nodeValue).length!=0){if(L){z.setStart(J,0)}else{z.setEnd(J,J.nodeValue.length)}return}if(J.nodeName=="BR"){if(L){z.setStartBefore(J)}else{z.setEndBefore(J)}return}}while(J=(L?K.next():K.prev()))}H=q.select("td.mceSelected,th.mceSelected");if(H.length>0){z=q.createRng();C=H[0];E=H[H.length-1];z.setStartBefore(C);z.setEndAfter(C);D(C,1);w=new d.dom.TreeWalker(C,q.getParent(H[0],"table"));do{if(C.nodeName=="TD"||C.nodeName=="TH"){if(!q.hasClass(C,"mceSelected")){break}A=C}}while(C=w.next());D(A);B.setRng(z)}F.nodeChanged();t=u=p=null}});r.onKeyUp.add(function(w,z){k()});r.onKeyDown.add(function(w,z){n(w)});r.onMouseDown.add(function(w,z){if(z.button!=2){n(w)}});function o(D,z,A,F){var B=3,G=D.dom.getParent(z.startContainer,"TABLE"),C,w,E;if(G){C=G.parentNode}w=z.startContainer.nodeType==B&&z.startOffset==0&&z.endOffset==0&&F&&(A.nodeName=="TR"||A==C);E=(A.nodeName=="TD"||A.nodeName=="TH")&&!F;return w||E}function n(A){if(!d.isWebKit){return}var z=A.selection.getRng();var C=A.selection.getNode();var B=A.dom.getParent(z.startContainer,"TD,TH");if(!o(A,z,C,B)){return}if(!B){B=C}var w=B.lastChild;while(w.lastChild){w=w.lastChild}z.setEnd(w,w.nodeValue.length);A.selection.setRng(z)}r.plugins.table.fixTableCellSelection=n;if(r&&r.plugins.contextmenu){r.plugins.contextmenu.onContextMenu.add(function(A,w,C){var D,B=r.selection,z=B.getNode()||r.getBody();if(r.dom.getParent(C,"td")||r.dom.getParent(C,"th")||r.dom.select("td.mceSelected,th.mceSelected").length){w.removeAll();if(z.nodeName=="A"&&!r.dom.getAttrib(z,"name")){w.add({title:"advanced.link_desc",icon:"link",cmd:r.plugins.advlink?"mceAdvLink":"mceLink",ui:true});w.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});w.addSeparator()}if(z.nodeName=="IMG"&&z.className.indexOf("mceItem")==-1){w.add({title:"advanced.image_desc",icon:"image",cmd:r.plugins.advimage?"mceAdvImage":"mceImage",ui:true});w.addSeparator()}w.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",value:{action:"insert"}});w.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable"});w.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete"});w.addSeparator();D=w.addMenu({title:"table.cell"});D.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps"});D.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells"});D.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells"});D=w.addMenu({title:"table.row"});D.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps"});D.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});D.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});D.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});D.addSeparator();D.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});D.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});D.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"}).setDisabled(!m);D.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"}).setDisabled(!m);D=w.addMenu({title:"table.col"});D.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});D.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});D.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{w.add({title:"table.desc",icon:"table",cmd:"mceInsertTable"})}})}if(d.isWebKit){function v(C,N){var L=d.VK;var Q=N.keyCode;function O(Y,U,S){var T=Y?"previousSibling":"nextSibling";var Z=C.dom.getParent(U,"tr");var X=Z[T];if(X){z(C,U,X,Y);d.dom.Event.cancel(S);return true}else{var aa=C.dom.getParent(Z,"table");var W=Z.parentNode;var R=W.nodeName.toLowerCase();if(R==="tbody"||R===(Y?"tfoot":"thead")){var V=w(Y,aa,W,"tbody");if(V!==null){return K(Y,V,U,S)}}return M(Y,Z,T,aa,S)}}function w(V,T,U,X){var S=C.dom.select(">"+X,T);var R=S.indexOf(U);if(V&&R===0||!V&&R===S.length-1){return B(V,T)}else{if(R===-1){var W=U.tagName.toLowerCase()==="thead"?0:S.length-1;return S[W]}else{return S[R+(V?-1:1)]}}}function B(U,T){var S=U?"thead":"tfoot";var R=C.dom.select(">"+S,T);return R.length!==0?R[0]:null}function K(V,T,S,U){var R=J(T,V);R&&z(C,S,R,V);d.dom.Event.cancel(U);return true}function M(Y,U,R,X,W){var S=X[R];if(S){F(S);return true}else{var V=C.dom.getParent(X,"td,th");if(V){return O(Y,V,W)}else{var T=J(U,!Y);F(T);return d.dom.Event.cancel(W)}}}function J(S,R){return S&&S[R?"lastChild":"firstChild"]}function F(R){C.selection.setCursorLocation(R,0)}function A(){return Q==L.UP||Q==L.DOWN}function D(R){var T=R.selection.getNode();var S=R.dom.getParent(T,"tr");return S!==null}function P(S){var R=0;var T=S;while(T.previousSibling){T=T.previousSibling;R=R+a(T,"colspan")}return R}function E(T,R){var U=0;var S=0;e(T.children,function(V,W){U=U+a(V,"colspan");S=W;if(U>R){return false}});return S}function z(T,W,Y,V){var X=P(T.dom.getParent(W,"td,th"));var S=E(Y,X);var R=Y.childNodes[S];var U=J(R,V);F(U||R)}function H(R){var T=C.selection.getNode();var U=C.dom.getParent(T,"td,th");var S=C.dom.getParent(R,"td,th");return U&&U!==S&&I(U,S)}function I(S,R){return C.dom.getParent(S,"TABLE")===C.dom.getParent(R,"TABLE")}if(A()&&D(C)){var G=C.selection.getNode();setTimeout(function(){if(H(G)){O(!N.shiftKey&&Q===L.UP,G,N)}},0)}}r.onKeyDown.add(v)}if(!d.isIE){function s(){var w;for(w=r.getBody().lastChild;w&&w.nodeType==3&&!w.nodeValue.length;w=w.previousSibling){}if(w&&w.nodeName=="TABLE"){r.dom.add(r.getBody(),"p",null,'<br mce_bogus="1" />')}}if(d.isGecko){r.onKeyDown.add(function(z,B){var w,A,C=z.dom;if(B.keyCode==37||B.keyCode==38){w=z.selection.getRng();A=C.getParent(w.startContainer,"table");if(A&&z.getBody().firstChild==A){if(c(w,A)){w=C.createRng();w.setStartBefore(A);w.setEndBefore(A);z.selection.setRng(w);B.preventDefault()}}}})}r.onKeyUp.add(s);r.onSetContent.add(s);r.onVisualAid.add(s);r.onPreProcess.add(function(w,A){var z=A.node.lastChild;if(z&&z.childNodes.length==1&&z.firstChild.nodeName=="BR"){w.dom.remove(z)}});s();r.startContent=r.getContent({format:"raw"})}});e({mceTableSplitCells:function(n){n.split()},mceTableMergeCells:function(o){var p,q,n;n=g.dom.getParent(g.selection.getNode(),"th,td");if(n){p=n.rowSpan;q=n.colSpan}if(!g.dom.select("td.mceSelected,th.mceSelected").length){f.open({url:h+"/merge_cells.htm",width:240+parseInt(g.getLang("table.merge_cells_delta_width",0)),height:110+parseInt(g.getLang("table.merge_cells_delta_height",0)),inline:1},{rows:p,cols:q,onaction:function(r){o.merge(n,r.cols,r.rows)},plugin_url:h})}else{o.merge()}},mceTableInsertRowBefore:function(n){n.insertRow(true)},mceTableInsertRowAfter:function(n){n.insertRow()},mceTableInsertColBefore:function(n){n.insertCol(true)},mceTableInsertColAfter:function(n){n.insertCol()},mceTableDeleteCol:function(n){n.deleteCols()},mceTableDeleteRow:function(n){n.deleteRows()},mceTableCutRow:function(n){m=n.cutRows()},mceTableCopyRow:function(n){m=n.copyRows()},mceTablePasteRowBefore:function(n){n.pasteRows(m,true)},mceTablePasteRowAfter:function(n){n.pasteRows(m)},mceTableDelete:function(n){n.deleteTable()}},function(o,n){g.addCommand(n,function(){var p=l();if(p){o(p);g.execCommand("mceRepaint");k()}})});e({mceInsertTable:function(n){f.open({url:h+"/table.htm",width:400+parseInt(g.getLang("table.table_delta_width",0)),height:320+parseInt(g.getLang("table.table_delta_height",0)),inline:1},{plugin_url:h,action:n?n.action:0})},mceTableRowProps:function(){f.open({url:h+"/row.htm",width:400+parseInt(g.getLang("table.rowprops_delta_width",0)),height:295+parseInt(g.getLang("table.rowprops_delta_height",0)),inline:1},{plugin_url:h})},mceTableCellProps:function(){f.open({url:h+"/cell.htm",width:400+parseInt(g.getLang("table.cellprops_delta_width",0)),height:295+parseInt(g.getLang("table.cellprops_delta_height",0)),inline:1},{plugin_url:h})}},function(o,n){g.addCommand(n,function(p,q){o(q)})})}});d.PluginManager.add("table",d.plugins.TablePlugin)})(tinymce);
diff --git a/js/tiny_mce/plugins/table/langs/en_dlg.js b/js/tiny_mce/plugins/table/langs/en_dlg.js
index 463e09ee1b6..4daffe358d5 100644
--- a/js/tiny_mce/plugins/table/langs/en_dlg.js
+++ b/js/tiny_mce/plugins/table/langs/en_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.table_dlg',{"rules_border":"border","rules_box":"box","rules_vsides":"vsides","rules_rhs":"rhs","rules_lhs":"lhs","rules_hsides":"hsides","rules_below":"below","rules_above":"above","rules_void":"void",rules:"Rules","frame_all":"all","frame_cols":"cols","frame_rows":"rows","frame_groups":"groups","frame_none":"none",frame:"Frame",caption:"Table Caption","missing_scope":"Are you sure you want to continue without specifying a scope for this table header cell. Without it, it may be difficult for some users with disabilities to understand the content or data displayed of the table.","cell_limit":"You\'ve exceeded the maximum number of cells of {$cells}.","row_limit":"You\'ve exceeded the maximum number of rows of {$rows}.","col_limit":"You\'ve exceeded the maximum number of columns of {$cols}.",colgroup:"Col Group",rowgroup:"Row Group",scope:"Scope",tfoot:"Footer",tbody:"Body",thead:"Header","row_all":"Update All Rows in Table","row_even":"Update Even Rows in Table","row_odd":"Update Odd Rows in Table","row_row":"Update Current Row","cell_all":"Update All Cells in Table","cell_row":"Update All Cells in Row","cell_cell":"Update Current Cell",th:"Header",td:"Data",summary:"Summary",bgimage:"Background Image",rtl:"Right to Left",ltr:"Left to Right",mime:"Target MIME Type",langcode:"Language Code",langdir:"Language Direction",style:"Style",id:"ID","merge_cells_title":"Merge Table Cells",bgcolor:"Background Color",bordercolor:"Border Color","align_bottom":"Bottom","align_top":"Top",valign:"Vertical Alignment","cell_type":"Cell Type","cell_title":"Table Cell Properties","row_title":"Table Row Properties","align_middle":"Center","align_right":"Right","align_left":"Left","align_default":"Default",align:"Alignment",border:"Border",cellpadding:"Cell Padding",cellspacing:"Cell Spacing",rows:"Rows",cols:"Columns",height:"Height",width:"Width",title:"Insert/Edit Table",rowtype:"Row Type","advanced_props":"Advanced Properties","general_props":"General Properties","advanced_tab":"Advanced","general_tab":"General","cell_col":"Update all cells in column"});
\ No newline at end of file
+tinyMCE.addI18n('en.table_dlg',{"rules_border":"border","rules_box":"box","rules_vsides":"vsides","rules_rhs":"rhs","rules_lhs":"lhs","rules_hsides":"hsides","rules_below":"below","rules_above":"above","rules_void":"void",rules:"Rules","frame_all":"all","frame_cols":"cols","frame_rows":"rows","frame_groups":"groups","frame_none":"none",frame:"Frame",caption:"Table Caption","missing_scope":"Are you sure you want to continue without specifying a scope for this table header cell. Without it, it may be difficult for some users with disabilities to understand the content or data displayed of the table.","cell_limit":"You\'ve exceeded the maximum number of cells of {$cells}.","row_limit":"You\'ve exceeded the maximum number of rows of {$rows}.","col_limit":"You\'ve exceeded the maximum number of columns of {$cols}.",colgroup:"Col Group",rowgroup:"Row Group",scope:"Scope",tfoot:"Footer",tbody:"Body",thead:"Header","row_all":"Update All Rows in Table","row_even":"Update Even Rows in Table","row_odd":"Update Odd Rows in Table","row_row":"Update Current Row","cell_all":"Update All Cells in Table","cell_row":"Update All Cells in Row","cell_cell":"Update Current Cell",th:"Header",td:"Data",summary:"Summary",bgimage:"Background Image",rtl:"Right to Left",ltr:"Left to Right",mime:"Target MIME Type",langcode:"Language Code",langdir:"Language Direction",style:"Style",id:"ID","merge_cells_title":"Merge Table Cells",bgcolor:"Background Color",bordercolor:"Border Color","align_bottom":"Bottom","align_top":"Top",valign:"Vertical Alignment","cell_type":"Cell Type","cell_title":"Table Cell Properties","row_title":"Table Row Properties","align_middle":"Center","align_right":"Right","align_left":"Left","align_default":"Default",align:"Alignment",border:"Border",cellpadding:"Cell Padding",cellspacing:"Cell Spacing",rows:"Rows",cols:"Columns",height:"Height",width:"Width",title:"Insert/Edit Table",rowtype:"Row Type","advanced_props":"Advanced Properties","general_props":"General Properties","advanced_tab":"Advanced","general_tab":"General","cell_col":"Update all cells in column"});
diff --git a/js/tiny_mce/plugins/template/editor_plugin.js b/js/tiny_mce/plugins/template/editor_plugin.js
index ebe3c27d78b..4125ff9a408 100644
--- a/js/tiny_mce/plugins/template/editor_plugin.js
+++ b/js/tiny_mce/plugins/template/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.TemplatePlugin",{init:function(b,c){var d=this;d.editor=b;b.addCommand("mceTemplate",function(e){b.windowManager.open({file:c+"/template.htm",width:b.getParam("template_popup_width",750),height:b.getParam("template_popup_height",600),inline:1},{plugin_url:c})});b.addCommand("mceInsertTemplate",d._insertTemplate,d);b.addButton("template",{title:"template.desc",cmd:"mceTemplate"});b.onPreProcess.add(function(e,g){var f=e.dom;a(f.select("div",g.node),function(h){if(f.hasClass(h,"mceTmpl")){a(f.select("*",h),function(i){if(f.hasClass(i,e.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))){i.innerHTML=d._getDateTime(new Date(),e.getParam("template_mdate_format",e.getLang("template.mdate_format")))}});d._replaceVals(h)}})})},getInfo:function(){return{longname:"Template plugin",author:"Moxiecode Systems AB",authorurl:"http://www.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/template",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_insertTemplate:function(i,j){var k=this,g=k.editor,f,c,d=g.dom,b=g.selection.getContent();f=j.content;a(k.editor.getParam("template_replace_values"),function(l,h){if(typeof(l)!="function"){f=f.replace(new RegExp("\\{\\$"+h+"\\}","g"),l)}});c=d.create("div",null,f);n=d.select(".mceTmpl",c);if(n&&n.length>0){c=d.create("div",null);c.appendChild(n[0].cloneNode(true))}function e(l,h){return new RegExp("\\b"+h+"\\b","g").test(l.className)}a(d.select("*",c),function(h){if(e(h,g.getParam("template_cdate_classes","cdate").replace(/\s+/g,"|"))){h.innerHTML=k._getDateTime(new Date(),g.getParam("template_cdate_format",g.getLang("template.cdate_format")))}if(e(h,g.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))){h.innerHTML=k._getDateTime(new Date(),g.getParam("template_mdate_format",g.getLang("template.mdate_format")))}if(e(h,g.getParam("template_selected_content_classes","selcontent").replace(/\s+/g,"|"))){h.innerHTML=b}});k._replaceVals(c);g.execCommand("mceInsertContent",false,c.innerHTML);g.addVisual()},_replaceVals:function(c){var d=this.editor.dom,b=this.editor.getParam("template_replace_values");a(d.select("*",c),function(f){a(b,function(g,e){if(d.hasClass(f,e)){if(typeof(b[e])=="function"){b[e](f)}}})})},_getDateTime:function(e,b){if(!b){return""}function c(g,d){var f;g=""+g;if(g.length<d){for(f=0;f<(d-g.length);f++){g="0"+g}}return g}b=b.replace("%D","%m/%d/%y");b=b.replace("%r","%I:%M:%S %p");b=b.replace("%Y",""+e.getFullYear());b=b.replace("%y",""+e.getYear());b=b.replace("%m",c(e.getMonth()+1,2));b=b.replace("%d",c(e.getDate(),2));b=b.replace("%H",""+c(e.getHours(),2));b=b.replace("%M",""+c(e.getMinutes(),2));b=b.replace("%S",""+c(e.getSeconds(),2));b=b.replace("%I",""+((e.getHours()+11)%12+1));b=b.replace("%p",""+(e.getHours()<12?"AM":"PM"));b=b.replace("%B",""+this.editor.getLang("template_months_long").split(",")[e.getMonth()]);b=b.replace("%b",""+this.editor.getLang("template_months_short").split(",")[e.getMonth()]);b=b.replace("%A",""+this.editor.getLang("template_day_long").split(",")[e.getDay()]);b=b.replace("%a",""+this.editor.getLang("template_day_short").split(",")[e.getDay()]);b=b.replace("%%","%");return b}});tinymce.PluginManager.add("template",tinymce.plugins.TemplatePlugin)})();
\ No newline at end of file
+(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.TemplatePlugin",{init:function(b,c){var d=this;d.editor=b;b.addCommand("mceTemplate",function(e){b.windowManager.open({file:c+"/template.htm",width:b.getParam("template_popup_width",750),height:b.getParam("template_popup_height",600),inline:1},{plugin_url:c})});b.addCommand("mceInsertTemplate",d._insertTemplate,d);b.addButton("template",{title:"template.desc",cmd:"mceTemplate"});b.onPreProcess.add(function(e,g){var f=e.dom;a(f.select("div",g.node),function(h){if(f.hasClass(h,"mceTmpl")){a(f.select("*",h),function(i){if(f.hasClass(i,e.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))){i.innerHTML=d._getDateTime(new Date(),e.getParam("template_mdate_format",e.getLang("template.mdate_format")))}});d._replaceVals(h)}})})},getInfo:function(){return{longname:"Template plugin",author:"Moxiecode Systems AB",authorurl:"http://www.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/template",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_insertTemplate:function(i,j){var k=this,g=k.editor,f,c,d=g.dom,b=g.selection.getContent();f=j.content;a(k.editor.getParam("template_replace_values"),function(l,h){if(typeof(l)!="function"){f=f.replace(new RegExp("\\{\\$"+h+"\\}","g"),l)}});c=d.create("div",null,f);n=d.select(".mceTmpl",c);if(n&&n.length>0){c=d.create("div",null);c.appendChild(n[0].cloneNode(true))}function e(l,h){return new RegExp("\\b"+h+"\\b","g").test(l.className)}a(d.select("*",c),function(h){if(e(h,g.getParam("template_cdate_classes","cdate").replace(/\s+/g,"|"))){h.innerHTML=k._getDateTime(new Date(),g.getParam("template_cdate_format",g.getLang("template.cdate_format")))}if(e(h,g.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))){h.innerHTML=k._getDateTime(new Date(),g.getParam("template_mdate_format",g.getLang("template.mdate_format")))}if(e(h,g.getParam("template_selected_content_classes","selcontent").replace(/\s+/g,"|"))){h.innerHTML=b}});k._replaceVals(c);g.execCommand("mceInsertContent",false,c.innerHTML);g.addVisual()},_replaceVals:function(c){var d=this.editor.dom,b=this.editor.getParam("template_replace_values");a(d.select("*",c),function(f){a(b,function(g,e){if(d.hasClass(f,e)){if(typeof(b[e])=="function"){b[e](f)}}})})},_getDateTime:function(e,b){if(!b){return""}function c(g,d){var f;g=""+g;if(g.length<d){for(f=0;f<(d-g.length);f++){g="0"+g}}return g}b=b.replace("%D","%m/%d/%y");b=b.replace("%r","%I:%M:%S %p");b=b.replace("%Y",""+e.getFullYear());b=b.replace("%y",""+e.getYear());b=b.replace("%m",c(e.getMonth()+1,2));b=b.replace("%d",c(e.getDate(),2));b=b.replace("%H",""+c(e.getHours(),2));b=b.replace("%M",""+c(e.getMinutes(),2));b=b.replace("%S",""+c(e.getSeconds(),2));b=b.replace("%I",""+((e.getHours()+11)%12+1));b=b.replace("%p",""+(e.getHours()<12?"AM":"PM"));b=b.replace("%B",""+this.editor.getLang("template_months_long").split(",")[e.getMonth()]);b=b.replace("%b",""+this.editor.getLang("template_months_short").split(",")[e.getMonth()]);b=b.replace("%A",""+this.editor.getLang("template_day_long").split(",")[e.getDay()]);b=b.replace("%a",""+this.editor.getLang("template_day_short").split(",")[e.getDay()]);b=b.replace("%%","%");return b}});tinymce.PluginManager.add("template",tinymce.plugins.TemplatePlugin)})();
diff --git a/js/tiny_mce/plugins/template/editor_plugin_src.js b/js/tiny_mce/plugins/template/editor_plugin_src.js
index 9cac2699199..62d297d4649 100644
--- a/js/tiny_mce/plugins/template/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/template/editor_plugin_src.js
@@ -156,4 +156,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('template', tinymce.plugins.TemplatePlugin);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/template/langs/en_dlg.js b/js/tiny_mce/plugins/template/langs/en_dlg.js
index 83e599d68fc..300b44c90a8 100644
--- a/js/tiny_mce/plugins/template/langs/en_dlg.js
+++ b/js/tiny_mce/plugins/template/langs/en_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.template_dlg',{title:"Templates",label:"Template","desc_label":"Description",desc:"Insert Predefined Template Content",select:"Select a Template",preview:"Preview",warning:"Warning: Updating a template with a different one may cause data loss.","mdate_format":"%Y-%m-%d %H:%M:%S","cdate_format":"%Y-%m-%d %H:%M:%S","months_long":"January,February,March,April,May,June,July,August,September,October,November,December","months_short":"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec","day_long":"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday","day_short":"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun"});
\ No newline at end of file
+tinyMCE.addI18n('en.template_dlg',{title:"Templates",label:"Template","desc_label":"Description",desc:"Insert Predefined Template Content",select:"Select a Template",preview:"Preview",warning:"Warning: Updating a template with a different one may cause data loss.","mdate_format":"%Y-%m-%d %H:%M:%S","cdate_format":"%Y-%m-%d %H:%M:%S","months_long":"January,February,March,April,May,June,July,August,September,October,November,December","months_short":"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec","day_long":"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday","day_short":"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun"});
diff --git a/js/tiny_mce/plugins/visualchars/editor_plugin.js b/js/tiny_mce/plugins/visualchars/editor_plugin.js
index 1a148e8b4fc..467829f5444 100644
--- a/js/tiny_mce/plugins/visualchars/editor_plugin.js
+++ b/js/tiny_mce/plugins/visualchars/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.VisualChars",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceVisualChars",c._toggleVisualChars,c);a.addButton("visualchars",{title:"visualchars.desc",cmd:"mceVisualChars"});a.onBeforeGetContent.add(function(d,e){if(c.state&&e.format!="raw"&&!e.draft){c.state=true;c._toggleVisualChars(false)}})},getInfo:function(){return{longname:"Visual characters",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_toggleVisualChars:function(m){var p=this,k=p.editor,a,g,j,n=k.getDoc(),o=k.getBody(),l,q=k.selection,e,c,f;p.state=!p.state;k.controlManager.setActive("visualchars",p.state);if(m){f=q.getBookmark()}if(p.state){a=[];tinymce.walk(o,function(b){if(b.nodeType==3&&b.nodeValue&&b.nodeValue.indexOf("\u00a0")!=-1){a.push(b)}},"childNodes");for(g=0;g<a.length;g++){l=a[g].nodeValue;l=l.replace(/(\u00a0)/g,'<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">$1</span>');c=k.dom.create("div",null,l);while(node=c.lastChild){k.dom.insertAfter(node,a[g])}k.dom.remove(a[g])}}else{a=k.dom.select("span.mceItemNbsp",o);for(g=a.length-1;g>=0;g--){k.dom.remove(a[g],1)}}q.moveToBookmark(f)}});tinymce.PluginManager.add("visualchars",tinymce.plugins.VisualChars)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.VisualChars",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceVisualChars",c._toggleVisualChars,c);a.addButton("visualchars",{title:"visualchars.desc",cmd:"mceVisualChars"});a.onBeforeGetContent.add(function(d,e){if(c.state&&e.format!="raw"&&!e.draft){c.state=true;c._toggleVisualChars(false)}})},getInfo:function(){return{longname:"Visual characters",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_toggleVisualChars:function(m){var p=this,k=p.editor,a,g,j,n=k.getDoc(),o=k.getBody(),l,q=k.selection,e,c,f;p.state=!p.state;k.controlManager.setActive("visualchars",p.state);if(m){f=q.getBookmark()}if(p.state){a=[];tinymce.walk(o,function(b){if(b.nodeType==3&&b.nodeValue&&b.nodeValue.indexOf("\u00a0")!=-1){a.push(b)}},"childNodes");for(g=0;g<a.length;g++){l=a[g].nodeValue;l=l.replace(/(\u00a0)/g,'<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">$1</span>');c=k.dom.create("div",null,l);while(node=c.lastChild){k.dom.insertAfter(node,a[g])}k.dom.remove(a[g])}}else{a=k.dom.select("span.mceItemNbsp",o);for(g=a.length-1;g>=0;g--){k.dom.remove(a[g],1)}}q.moveToBookmark(f)}});tinymce.PluginManager.add("visualchars",tinymce.plugins.VisualChars)})();
diff --git a/js/tiny_mce/plugins/visualchars/editor_plugin_src.js b/js/tiny_mce/plugins/visualchars/editor_plugin_src.js
index df985905b6a..d93361d799b 100644
--- a/js/tiny_mce/plugins/visualchars/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/visualchars/editor_plugin_src.js
@@ -80,4 +80,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('visualchars', tinymce.plugins.VisualChars);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/wordcount/editor_plugin.js b/js/tiny_mce/plugins/wordcount/editor_plugin.js
index a752ad32aef..285dd804625 100644
--- a/js/tiny_mce/plugins/wordcount/editor_plugin.js
+++ b/js/tiny_mce/plugins/wordcount/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.WordCount",{block:0,id:null,countre:null,cleanre:null,init:function(a,b){var c=this,d=0;c.countre=a.getParam("wordcount_countregex",/[\w\u2019\'-]+/g);c.cleanre=a.getParam("wordcount_cleanregex",/[0-9.(),;:!?%#$?\'\"_+=\\\/-]*/g);c.id=a.id+"-word-count";a.onPostRender.add(function(f,e){var g,h;h=f.getParam("wordcount_target_id");if(!h){g=tinymce.DOM.get(f.id+"_path_row");if(g){tinymce.DOM.add(g.parentNode,"div",{style:"float: right"},f.getLang("wordcount.words","Words: ")+'<span id="'+c.id+'">0</span>')}}else{tinymce.DOM.add(h,"span",{},'<span id="'+c.id+'">0</span>')}});a.onInit.add(function(e){e.selection.onSetContent.add(function(){c._count(e)});c._count(e)});a.onSetContent.add(function(e){c._count(e)});a.onKeyUp.add(function(f,g){if(g.keyCode==d){return}if(13==g.keyCode||8==d||46==d){c._count(f)}d=g.keyCode})},_getCount:function(c){var a=0;var b=c.getContent({format:"raw"});if(b){b=b.replace(/\.\.\./g," ");b=b.replace(/<.[^<>]*?>/g," ").replace(/&nbsp;|&#160;/gi," ");b=b.replace(/(\w+)(&.+?;)+(\w+)/,"$1$3").replace(/&.+?;/g," ");b=b.replace(this.cleanre,"");var d=b.match(this.countre);if(d){a=d.length}}return a},_count:function(a){var b=this;if(b.block){return}b.block=1;setTimeout(function(){if(!a.destroyed){var c=b._getCount(a);tinymce.DOM.setHTML(b.id,c.toString());setTimeout(function(){b.block=0},2000)}},1)},getInfo:function(){return{longname:"Word Count plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("wordcount",tinymce.plugins.WordCount)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.WordCount",{block:0,id:null,countre:null,cleanre:null,init:function(a,b){var c=this,d=0;c.countre=a.getParam("wordcount_countregex",/[\w\u2019\'-]+/g);c.cleanre=a.getParam("wordcount_cleanregex",/[0-9.(),;:!?%#$?\'\"_+=\\\/-]*/g);c.id=a.id+"-word-count";a.onPostRender.add(function(f,e){var g,h;h=f.getParam("wordcount_target_id");if(!h){g=tinymce.DOM.get(f.id+"_path_row");if(g){tinymce.DOM.add(g.parentNode,"div",{style:"float: right"},f.getLang("wordcount.words","Words: ")+'<span id="'+c.id+'">0</span>')}}else{tinymce.DOM.add(h,"span",{},'<span id="'+c.id+'">0</span>')}});a.onInit.add(function(e){e.selection.onSetContent.add(function(){c._count(e)});c._count(e)});a.onSetContent.add(function(e){c._count(e)});a.onKeyUp.add(function(f,g){if(g.keyCode==d){return}if(13==g.keyCode||8==d||46==d){c._count(f)}d=g.keyCode})},_getCount:function(c){var a=0;var b=c.getContent({format:"raw"});if(b){b=b.replace(/\.\.\./g," ");b=b.replace(/<.[^<>]*?>/g," ").replace(/&nbsp;|&#160;/gi," ");b=b.replace(/(\w+)(&.+?;)+(\w+)/,"$1$3").replace(/&.+?;/g," ");b=b.replace(this.cleanre,"");var d=b.match(this.countre);if(d){a=d.length}}return a},_count:function(a){var b=this;if(b.block){return}b.block=1;setTimeout(function(){if(!a.destroyed){var c=b._getCount(a);tinymce.DOM.setHTML(b.id,c.toString());setTimeout(function(){b.block=0},2000)}},1)},getInfo:function(){return{longname:"Word Count plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("wordcount",tinymce.plugins.WordCount)})();
diff --git a/js/tiny_mce/plugins/xhtmlxtras/editor_plugin.js b/js/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
index 9b98a5154b0..0b709b0d4a4 100644
--- a/js/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
+++ b/js/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.XHTMLXtrasPlugin",{init:function(a,b){a.addCommand("mceCite",function(){a.windowManager.open({file:b+"/cite.htm",width:350+parseInt(a.getLang("xhtmlxtras.cite_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.cite_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAcronym",function(){a.windowManager.open({file:b+"/acronym.htm",width:350+parseInt(a.getLang("xhtmlxtras.acronym_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.acronym_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAbbr",function(){a.windowManager.open({file:b+"/abbr.htm",width:350+parseInt(a.getLang("xhtmlxtras.abbr_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.abbr_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceDel",function(){a.windowManager.open({file:b+"/del.htm",width:340+parseInt(a.getLang("xhtmlxtras.del_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.del_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceIns",function(){a.windowManager.open({file:b+"/ins.htm",width:340+parseInt(a.getLang("xhtmlxtras.ins_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.ins_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAttributes",function(){a.windowManager.open({file:b+"/attributes.htm",width:380+parseInt(a.getLang("xhtmlxtras.attr_delta_width",0)),height:370+parseInt(a.getLang("xhtmlxtras.attr_delta_height",0)),inline:1},{plugin_url:b})});a.addButton("cite",{title:"xhtmlxtras.cite_desc",cmd:"mceCite"});a.addButton("acronym",{title:"xhtmlxtras.acronym_desc",cmd:"mceAcronym"});a.addButton("abbr",{title:"xhtmlxtras.abbr_desc",cmd:"mceAbbr"});a.addButton("del",{title:"xhtmlxtras.del_desc",cmd:"mceDel"});a.addButton("ins",{title:"xhtmlxtras.ins_desc",cmd:"mceIns"});a.addButton("attribs",{title:"xhtmlxtras.attribs_desc",cmd:"mceAttributes"});a.onNodeChange.add(function(d,c,f,e){f=d.dom.getParent(f,"CITE,ACRONYM,ABBR,DEL,INS");c.setDisabled("cite",e);c.setDisabled("acronym",e);c.setDisabled("abbr",e);c.setDisabled("del",e);c.setDisabled("ins",e);c.setDisabled("attribs",f&&f.nodeName=="BODY");c.setActive("cite",0);c.setActive("acronym",0);c.setActive("abbr",0);c.setActive("del",0);c.setActive("ins",0);if(f){do{c.setDisabled(f.nodeName.toLowerCase(),0);c.setActive(f.nodeName.toLowerCase(),1)}while(f=f.parentNode)}});a.onPreInit.add(function(){a.dom.create("abbr")})},getInfo:function(){return{longname:"XHTML Xtras Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("xhtmlxtras",tinymce.plugins.XHTMLXtrasPlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.XHTMLXtrasPlugin",{init:function(a,b){a.addCommand("mceCite",function(){a.windowManager.open({file:b+"/cite.htm",width:350+parseInt(a.getLang("xhtmlxtras.cite_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.cite_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAcronym",function(){a.windowManager.open({file:b+"/acronym.htm",width:350+parseInt(a.getLang("xhtmlxtras.acronym_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.acronym_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAbbr",function(){a.windowManager.open({file:b+"/abbr.htm",width:350+parseInt(a.getLang("xhtmlxtras.abbr_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.abbr_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceDel",function(){a.windowManager.open({file:b+"/del.htm",width:340+parseInt(a.getLang("xhtmlxtras.del_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.del_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceIns",function(){a.windowManager.open({file:b+"/ins.htm",width:340+parseInt(a.getLang("xhtmlxtras.ins_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.ins_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAttributes",function(){a.windowManager.open({file:b+"/attributes.htm",width:380+parseInt(a.getLang("xhtmlxtras.attr_delta_width",0)),height:370+parseInt(a.getLang("xhtmlxtras.attr_delta_height",0)),inline:1},{plugin_url:b})});a.addButton("cite",{title:"xhtmlxtras.cite_desc",cmd:"mceCite"});a.addButton("acronym",{title:"xhtmlxtras.acronym_desc",cmd:"mceAcronym"});a.addButton("abbr",{title:"xhtmlxtras.abbr_desc",cmd:"mceAbbr"});a.addButton("del",{title:"xhtmlxtras.del_desc",cmd:"mceDel"});a.addButton("ins",{title:"xhtmlxtras.ins_desc",cmd:"mceIns"});a.addButton("attribs",{title:"xhtmlxtras.attribs_desc",cmd:"mceAttributes"});a.onNodeChange.add(function(d,c,f,e){f=d.dom.getParent(f,"CITE,ACRONYM,ABBR,DEL,INS");c.setDisabled("cite",e);c.setDisabled("acronym",e);c.setDisabled("abbr",e);c.setDisabled("del",e);c.setDisabled("ins",e);c.setDisabled("attribs",f&&f.nodeName=="BODY");c.setActive("cite",0);c.setActive("acronym",0);c.setActive("abbr",0);c.setActive("del",0);c.setActive("ins",0);if(f){do{c.setDisabled(f.nodeName.toLowerCase(),0);c.setActive(f.nodeName.toLowerCase(),1)}while(f=f.parentNode)}});a.onPreInit.add(function(){a.dom.create("abbr")})},getInfo:function(){return{longname:"XHTML Xtras Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("xhtmlxtras",tinymce.plugins.XHTMLXtrasPlugin)})();
diff --git a/js/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js b/js/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
index f24057211c4..57130750cde 100644
--- a/js/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
+++ b/js/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
@@ -129,4 +129,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('xhtmlxtras', tinymce.plugins.XHTMLXtrasPlugin);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js b/js/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
index c4569f85ec7..d6968aa364a 100644
--- a/js/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
+++ b/js/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.xhtmlxtras_dlg',{"attribs_title":"Insert/Edit Attributes","option_rtl":"Right to Left","option_ltr":"Left to Right","insert_date":"Insert Current Date/Time",remove:"Remove","title_cite_element":"Citation Element","title_abbr_element":"Abbreviation Element","title_acronym_element":"Acronym Element","title_del_element":"Deletion Element","title_ins_element":"Insertion Element","fieldset_events_tab":"Element Events","fieldset_attrib_tab":"Element Attributes","fieldset_general_tab":"General Settings","events_tab":"Events","attrib_tab":"Attributes","general_tab":"General","attribute_attrib_tab":"Attributes","attribute_events_tab":"Events","attribute_label_accesskey":"AccessKey","attribute_label_tabindex":"TabIndex","attribute_label_langcode":"Language","attribute_option_rtl":"Right to Left","attribute_option_ltr":"Left to Right","attribute_label_langdir":"Text Direction","attribute_label_datetime":"Date/Time","attribute_label_cite":"Cite","attribute_label_style":"Style","attribute_label_class":"Class","attribute_label_id":"ID","attribute_label_title":"Title"});
\ No newline at end of file
+tinyMCE.addI18n('en.xhtmlxtras_dlg',{"attribs_title":"Insert/Edit Attributes","option_rtl":"Right to Left","option_ltr":"Left to Right","insert_date":"Insert Current Date/Time",remove:"Remove","title_cite_element":"Citation Element","title_abbr_element":"Abbreviation Element","title_acronym_element":"Acronym Element","title_del_element":"Deletion Element","title_ins_element":"Insertion Element","fieldset_events_tab":"Element Events","fieldset_attrib_tab":"Element Attributes","fieldset_general_tab":"General Settings","events_tab":"Events","attrib_tab":"Attributes","general_tab":"General","attribute_attrib_tab":"Attributes","attribute_events_tab":"Events","attribute_label_accesskey":"AccessKey","attribute_label_tabindex":"TabIndex","attribute_label_langcode":"Language","attribute_option_rtl":"Right to Left","attribute_option_ltr":"Left to Right","attribute_label_langdir":"Text Direction","attribute_label_datetime":"Date/Time","attribute_label_cite":"Cite","attribute_label_style":"Style","attribute_label_class":"Class","attribute_label_id":"ID","attribute_label_title":"Title"});
diff --git a/js/tiny_mce/themes/advanced/editor_template.js b/js/tiny_mce/themes/advanced/editor_template.js
index 812578d0bca..d4936daa0fe 100644
--- a/js/tiny_mce/themes/advanced/editor_template.js
+++ b/js/tiny_mce/themes/advanced/editor_template.js
@@ -1 +1 @@
-(function(e){var d=e.DOM,b=e.dom.Event,h=e.extend,f=e.each,a=e.util.Cookie,g,c=e.explode;e.ThemeManager.requireLangPack("advanced");e.create("tinymce.themes.AdvancedTheme",{sizes:[8,10,12,14,18,24,36],controls:{bold:["bold_desc","Bold"],italic:["italic_desc","Italic"],underline:["underline_desc","Underline"],strikethrough:["striketrough_desc","Strikethrough"],justifyleft:["justifyleft_desc","JustifyLeft"],justifycenter:["justifycenter_desc","JustifyCenter"],justifyright:["justifyright_desc","JustifyRight"],justifyfull:["justifyfull_desc","JustifyFull"],bullist:["bullist_desc","InsertUnorderedList"],numlist:["numlist_desc","InsertOrderedList"],outdent:["outdent_desc","Outdent"],indent:["indent_desc","Indent"],cut:["cut_desc","Cut"],copy:["copy_desc","Copy"],paste:["paste_desc","Paste"],undo:["undo_desc","Undo"],redo:["redo_desc","Redo"],link:["link_desc","mceLink"],unlink:["unlink_desc","unlink"],image:["image_desc","mceImage"],cleanup:["cleanup_desc","mceCleanup"],help:["help_desc","mceHelp"],code:["code_desc","mceCodeEditor"],hr:["hr_desc","InsertHorizontalRule"],removeformat:["removeformat_desc","RemoveFormat"],sub:["sub_desc","subscript"],sup:["sup_desc","superscript"],forecolor:["forecolor_desc","ForeColor"],forecolorpicker:["forecolor_desc","mceForeColor"],backcolor:["backcolor_desc","HiliteColor"],backcolorpicker:["backcolor_desc","mceBackColor"],charmap:["charmap_desc","mceCharMap"],visualaid:["visualaid_desc","mceToggleVisualAid"],anchor:["anchor_desc","mceInsertAnchor"],newdocument:["newdocument_desc","mceNewDocument"],blockquote:["blockquote_desc","mceBlockQuote"]},stateControls:["bold","italic","underline","strikethrough","bullist","numlist","justifyleft","justifycenter","justifyright","justifyfull","sub","sup","blockquote"],init:function(j,k){var l=this,m,i,n;l.editor=j;l.url=k;l.onResolveName=new e.util.Dispatcher(this);j.forcedHighContrastMode=j.settings.detect_highcontrast&&l._isHighContrast();j.settings.skin=j.forcedHighContrastMode?"highcontrast":j.settings.skin;l.settings=m=h({theme_advanced_path:true,theme_advanced_toolbar_location:"bottom",theme_advanced_buttons1:"bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",theme_advanced_buttons2:"bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",theme_advanced_buttons3:"hr,removeformat,visualaid,|,sub,sup,|,charmap",theme_advanced_blockformats:"p,address,pre,h1,h2,h3,h4,h5,h6",theme_advanced_toolbar_align:"center",theme_advanced_fonts:"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",theme_advanced_more_colors:1,theme_advanced_row_height:23,theme_advanced_resize_horizontal:1,theme_advanced_resizing_use_cookie:1,theme_advanced_font_sizes:"1,2,3,4,5,6,7",theme_advanced_font_selector:"span",theme_advanced_show_current_color:0,readonly:j.settings.readonly},j.settings);if(!m.font_size_style_values){m.font_size_style_values="8pt,10pt,12pt,14pt,18pt,24pt,36pt"}if(e.is(m.theme_advanced_font_sizes,"string")){m.font_size_style_values=e.explode(m.font_size_style_values);m.font_size_classes=e.explode(m.font_size_classes||"");n={};j.settings.theme_advanced_font_sizes=m.theme_advanced_font_sizes;f(j.getParam("theme_advanced_font_sizes","","hash"),function(q,p){var o;if(p==q&&q>=1&&q<=7){p=q+" ("+l.sizes[q-1]+"pt)";o=m.font_size_classes[q-1];q=m.font_size_style_values[q-1]||(l.sizes[q-1]+"pt")}if(/^\s*\./.test(q)){o=q.replace(/\./g,"")}n[p]=o?{"class":o}:{fontSize:q}});m.theme_advanced_font_sizes=n}if((i=m.theme_advanced_path_location)&&i!="none"){m.theme_advanced_statusbar_location=m.theme_advanced_path_location}if(m.theme_advanced_statusbar_location=="none"){m.theme_advanced_statusbar_location=0}if(j.settings.content_css!==false){j.contentCSS.push(j.baseURI.toAbsolute(k+"/skins/"+j.settings.skin+"/content.css"))}j.onInit.add(function(){if(!j.settings.readonly){j.onNodeChange.add(l._nodeChanged,l);j.onKeyUp.add(l._updateUndoStatus,l);j.onMouseUp.add(l._updateUndoStatus,l);j.dom.bind(j.dom.getRoot(),"dragend",function(){l._updateUndoStatus(j)})}});j.onSetProgressState.add(function(q,o,r){var s,t=q.id,p;if(o){l.progressTimer=setTimeout(function(){s=q.getContainer();s=s.insertBefore(d.create("DIV",{style:"position:relative"}),s.firstChild);p=d.get(q.id+"_tbl");d.add(s,"div",{id:t+"_blocker","class":"mceBlocker",style:{width:p.clientWidth+2,height:p.clientHeight+2}});d.add(s,"div",{id:t+"_progress","class":"mceProgress",style:{left:p.clientWidth/2,top:p.clientHeight/2}})},r||0)}else{d.remove(t+"_blocker");d.remove(t+"_progress");clearTimeout(l.progressTimer)}});d.loadCSS(m.editor_css?j.documentBaseURI.toAbsolute(m.editor_css):k+"/skins/"+j.settings.skin+"/ui.css");if(m.skin_variant){d.loadCSS(k+"/skins/"+j.settings.skin+"/ui_"+m.skin_variant+".css")}},_isHighContrast:function(){var i,j=d.add(d.getRoot(),"div",{style:"background-color: rgb(171,239,86);"});i=(d.getStyle(j,"background-color",true)+"").toLowerCase().replace(/ /g,"");d.remove(j);return i!="rgb(171,239,86)"&&i!="#abef56"},createControl:function(l,i){var j,k;if(k=i.createControl(l)){return k}switch(l){case"styleselect":return this._createStyleSelect();case"formatselect":return this._createBlockFormats();case"fontselect":return this._createFontSelect();case"fontsizeselect":return this._createFontSizeSelect();case"forecolor":return this._createForeColorMenu();case"backcolor":return this._createBackColorMenu()}if((j=this.controls[l])){return i.createButton(l,{title:"advanced."+j[0],cmd:j[1],ui:j[2],value:j[3]})}},execCommand:function(k,j,l){var i=this["_"+k];if(i){i.call(this,j,l);return true}return false},_importClasses:function(k){var i=this.editor,j=i.controlManager.get("styleselect");if(j.getLength()==0){f(i.dom.getClasses(),function(n,l){var m="style_"+l;i.formatter.register(m,{inline:"span",attributes:{"class":n["class"]},selector:"*"});j.add(n["class"],m)})}},_createStyleSelect:function(m){var k=this,i=k.editor,j=i.controlManager,l;l=j.createListBox("styleselect",{title:"advanced.style_select",onselect:function(o){var p,n=[];f(l.items,function(q){n.push(q.value)});i.focus();i.undoManager.add();p=i.formatter.matchAll(n);if(!o||p[0]==o){if(p[0]){i.formatter.remove(p[0])}}else{i.formatter.apply(o)}i.undoManager.add();i.nodeChanged();return false}});i.onInit.add(function(){var o=0,n=i.getParam("style_formats");if(n){f(n,function(p){var q,r=0;f(p,function(){r++});if(r>1){q=p.name=p.name||"style_"+(o++);i.formatter.register(q,p);l.add(p.title,q)}else{l.add(p.title)}})}else{f(i.getParam("theme_advanced_styles","","hash"),function(r,q){var p;if(r){p="style_"+(o++);i.formatter.register(p,{inline:"span",classes:r,selector:"*"});l.add(k.editor.translate(q),p)}})}});if(l.getLength()==0){l.onPostRender.add(function(o,p){if(!l.NativeListBox){b.add(p.id+"_text","focus",k._importClasses,k);b.add(p.id+"_text","mousedown",k._importClasses,k);b.add(p.id+"_open","focus",k._importClasses,k);b.add(p.id+"_open","mousedown",k._importClasses,k)}else{b.add(p.id,"focus",k._importClasses,k)}})}return l},_createFontSelect:function(){var k,j=this,i=j.editor;k=i.controlManager.createListBox("fontselect",{title:"advanced.fontdefault",onselect:function(l){var m=k.items[k.selectedIndex];if(!l&&m){i.execCommand("FontName",false,m.value);return}i.execCommand("FontName",false,l);k.select(function(n){return l==n});if(m&&m.value==l){k.select(null)}return false}});if(k){f(i.getParam("theme_advanced_fonts",j.settings.theme_advanced_fonts,"hash"),function(m,l){k.add(i.translate(l),m,{style:m.indexOf("dings")==-1?"font-family:"+m:""})})}return k},_createFontSizeSelect:function(){var m=this,k=m.editor,n,l=0,j=[];n=k.controlManager.createListBox("fontsizeselect",{title:"advanced.font_size",onselect:function(i){var o=n.items[n.selectedIndex];if(!i&&o){o=o.value;if(o["class"]){k.formatter.toggle("fontsize_class",{value:o["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,o.fontSize)}return}if(i["class"]){k.focus();k.undoManager.add();k.formatter.toggle("fontsize_class",{value:i["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,i.fontSize)}n.select(function(p){return i==p});if(o&&(o.value.fontSize==i.fontSize||o.value["class"]==i["class"])){n.select(null)}return false}});if(n){f(m.settings.theme_advanced_font_sizes,function(o,i){var p=o.fontSize;if(p>=1&&p<=7){p=m.sizes[parseInt(p)-1]+"pt"}n.add(i,o,{style:"font-size:"+p,"class":"mceFontSize"+(l++)+(" "+(o["class"]||""))})})}return n},_createBlockFormats:function(){var k,i={p:"advanced.paragraph",address:"advanced.address",pre:"advanced.pre",h1:"advanced.h1",h2:"advanced.h2",h3:"advanced.h3",h4:"advanced.h4",h5:"advanced.h5",h6:"advanced.h6",div:"advanced.div",blockquote:"advanced.blockquote",code:"advanced.code",dt:"advanced.dt",dd:"advanced.dd",samp:"advanced.samp"},j=this;k=j.editor.controlManager.createListBox("formatselect",{title:"advanced.block",onselect:function(l){j.editor.execCommand("FormatBlock",false,l);return false}});if(k){f(j.editor.getParam("theme_advanced_blockformats",j.settings.theme_advanced_blockformats,"hash"),function(m,l){k.add(j.editor.translate(l!=m?l:i[m]),m,{"class":"mce_formatPreview mce_"+m})})}return k},_createForeColorMenu:function(){var m,j=this,k=j.settings,l={},i;if(k.theme_advanced_more_colors){l.more_colors_func=function(){j._mceColorPicker(0,{color:m.value,func:function(n){m.setColor(n)}})}}if(i=k.theme_advanced_text_colors){l.colors=i}if(k.theme_advanced_default_foreground_color){l.default_color=k.theme_advanced_default_foreground_color}l.title="advanced.forecolor_desc";l.cmd="ForeColor";l.scope=this;m=j.editor.controlManager.createColorSplitButton("forecolor",l);return m},_createBackColorMenu:function(){var m,j=this,k=j.settings,l={},i;if(k.theme_advanced_more_colors){l.more_colors_func=function(){j._mceColorPicker(0,{color:m.value,func:function(n){m.setColor(n)}})}}if(i=k.theme_advanced_background_colors){l.colors=i}if(k.theme_advanced_default_background_color){l.default_color=k.theme_advanced_default_background_color}l.title="advanced.backcolor_desc";l.cmd="HiliteColor";l.scope=this;m=j.editor.controlManager.createColorSplitButton("backcolor",l);return m},renderUI:function(k){var m,l,q,v=this,r=v.editor,w=v.settings,u,j,i;if(r.settings){r.settings.aria_label=w.aria_label+r.getLang("advanced.help_shortcut")}m=j=d.create("span",{role:"application","aria-labelledby":r.id+"_voice",id:r.id+"_parent","class":"mceEditor "+r.settings.skin+"Skin"+(w.skin_variant?" "+r.settings.skin+"Skin"+v._ufirst(w.skin_variant):"")});d.add(m,"span",{"class":"mceVoiceLabel",style:"display:none;",id:r.id+"_voice"},w.aria_label);if(!d.boxModel){m=d.add(m,"div",{"class":"mceOldBoxModel"})}m=u=d.add(m,"table",{role:"presentation",id:r.id+"_tbl","class":"mceLayout",cellSpacing:0,cellPadding:0});m=q=d.add(m,"tbody");switch((w.theme_advanced_layout_manager||"").toLowerCase()){case"rowlayout":l=v._rowLayout(w,q,k);break;case"customlayout":l=r.execCallback("theme_advanced_custom_layout",w,q,k,j);break;default:l=v._simpleLayout(w,q,k,j)}m=k.targetNode;i=u.rows;d.addClass(i[0],"mceFirst");d.addClass(i[i.length-1],"mceLast");f(d.select("tr",q),function(o){d.addClass(o.firstChild,"mceFirst");d.addClass(o.childNodes[o.childNodes.length-1],"mceLast")});if(d.get(w.theme_advanced_toolbar_container)){d.get(w.theme_advanced_toolbar_container).appendChild(j)}else{d.insertAfter(j,m)}b.add(r.id+"_path_row","click",function(n){n=n.target;if(n.nodeName=="A"){v._sel(n.className.replace(/^.*mcePath_([0-9]+).*$/,"$1"));return b.cancel(n)}});if(!r.getParam("accessibility_focus")){b.add(d.add(j,"a",{href:"#"},"<!-- IE -->"),"focus",function(){tinyMCE.get(r.id).focus()})}if(w.theme_advanced_toolbar_location=="external"){k.deltaHeight=0}v.deltaHeight=k.deltaHeight;k.targetNode=null;r.onKeyDown.add(function(p,n){var s=121,o=122;if(n.altKey){if(n.keyCode===s){if(e.isWebKit){window.focus()}v.toolbarGroup.focus();return b.cancel(n)}else{if(n.keyCode===o){d.get(p.id+"_path_row").focus();return b.cancel(n)}}}});r.addShortcut("alt+0","","mceShortcuts",v);return{iframeContainer:l,editorContainer:r.id+"_parent",sizeContainer:u,deltaHeight:k.deltaHeight}},getInfo:function(){return{longname:"Advanced theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:e.majorVersion+"."+e.minorVersion}},resizeBy:function(i,j){var k=d.get(this.editor.id+"_ifr");this.resizeTo(k.clientWidth+i,k.clientHeight+j)},resizeTo:function(i,m,k){var j=this.editor,l=this.settings,n=d.get(j.id+"_tbl"),o=d.get(j.id+"_ifr");i=Math.max(l.theme_advanced_resizing_min_width||100,i);m=Math.max(l.theme_advanced_resizing_min_height||100,m);i=Math.min(l.theme_advanced_resizing_max_width||65535,i);m=Math.min(l.theme_advanced_resizing_max_height||65535,m);d.setStyle(n,"height","");d.setStyle(o,"height",m);if(l.theme_advanced_resize_horizontal){d.setStyle(n,"width","");d.setStyle(o,"width",i);if(i<n.clientWidth){i=n.clientWidth;d.setStyle(o,"width",n.clientWidth)}}if(k&&l.theme_advanced_resizing_use_cookie){a.setHash("TinyMCE_"+j.id+"_size",{cw:i,ch:m})}},destroy:function(){var i=this.editor.id;b.clear(i+"_resize");b.clear(i+"_path_row");b.clear(i+"_external_close")},_simpleLayout:function(y,r,k,i){var x=this,u=x.editor,v=y.theme_advanced_toolbar_location,m=y.theme_advanced_statusbar_location,l,j,q,w;if(y.readonly){l=d.add(r,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"});return j}if(v=="top"){x._addToolbars(r,k)}if(v=="external"){l=w=d.create("div",{style:"position:relative"});l=d.add(l,"div",{id:u.id+"_external","class":"mceExternalToolbar"});d.add(l,"a",{id:u.id+"_external_close",href:"javascript:;","class":"mceExternalClose"});l=d.add(l,"table",{id:u.id+"_tblext",cellSpacing:0,cellPadding:0});q=d.add(l,"tbody");if(i.firstChild.className=="mceOldBoxModel"){i.firstChild.appendChild(w)}else{i.insertBefore(w,i.firstChild)}x._addToolbars(q,k);u.onMouseUp.add(function(){var o=d.get(u.id+"_external");d.show(o);d.hide(g);var n=b.add(u.id+"_external_close","click",function(){d.hide(u.id+"_external");b.remove(u.id+"_external_close","click",n)});d.show(o);d.setStyle(o,"top",0-d.getRect(u.id+"_tblext").h-1);d.hide(o);d.show(o);o.style.filter="";g=u.id+"_external";o=null})}if(m=="top"){x._addStatusBar(r,k)}if(!y.theme_advanced_toolbar_container){l=d.add(r,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"})}if(v=="bottom"){x._addToolbars(r,k)}if(m=="bottom"){x._addStatusBar(r,k)}return j},_rowLayout:function(w,m,k){var v=this,p=v.editor,u,x,i=p.controlManager,l,j,r,q;u=w.theme_advanced_containers_default_class||"";x=w.theme_advanced_containers_default_align||"center";f(c(w.theme_advanced_containers||""),function(s,o){var n=w["theme_advanced_container_"+s]||"";switch(s.toLowerCase()){case"mceeditor":l=d.add(m,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"});break;case"mceelementpath":v._addStatusBar(m,k);break;default:q=(w["theme_advanced_container_"+s+"_align"]||x).toLowerCase();q="mce"+v._ufirst(q);l=d.add(d.add(m,"tr"),"td",{"class":"mceToolbar "+(w["theme_advanced_container_"+s+"_class"]||u)+" "+q||x});r=i.createToolbar("toolbar"+o);v._addControls(n,r);d.setHTML(l,r.renderHTML());k.deltaHeight-=w.theme_advanced_row_height}});return j},_addControls:function(j,i){var k=this,l=k.settings,m,n=k.editor.controlManager;if(l.theme_advanced_disable&&!k._disabled){m={};f(c(l.theme_advanced_disable),function(o){m[o]=1});k._disabled=m}else{m=k._disabled}f(c(j),function(p){var o;if(m&&m[p]){return}if(p=="tablecontrols"){f(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"],function(q){q=k.createControl(q,n);if(q){i.add(q)}});return}o=k.createControl(p,n);if(o){i.add(o)}})},_addToolbars:function(x,k){var A=this,p,m,r=A.editor,B=A.settings,z,j=r.controlManager,u,l,q=[],y,w;w=j.createToolbarGroup("toolbargroup",{name:r.getLang("advanced.toolbar"),tab_focus_toolbar:r.getParam("theme_advanced_tab_focus_toolbar")});A.toolbarGroup=w;y=B.theme_advanced_toolbar_align.toLowerCase();y="mce"+A._ufirst(y);l=d.add(d.add(x,"tr",{role:"presentation"}),"td",{"class":"mceToolbar "+y,role:"presentation"});for(p=1;(z=B["theme_advanced_buttons"+p]);p++){m=j.createToolbar("toolbar"+p,{"class":"mceToolbarRow"+p});if(B["theme_advanced_buttons"+p+"_add"]){z+=","+B["theme_advanced_buttons"+p+"_add"]}if(B["theme_advanced_buttons"+p+"_add_before"]){z=B["theme_advanced_buttons"+p+"_add_before"]+","+z}A._addControls(z,m);w.add(m);k.deltaHeight-=B.theme_advanced_row_height}q.push(w.renderHTML());q.push(d.createHTML("a",{href:"#",accesskey:"z",title:r.getLang("advanced.toolbar_focus"),onfocus:"tinyMCE.getInstanceById('"+r.id+"').focus();"},"<!-- IE -->"));d.setHTML(l,q.join(""))},_addStatusBar:function(m,j){var k,v=this,p=v.editor,w=v.settings,i,q,u,l;k=d.add(m,"tr");k=l=d.add(k,"td",{"class":"mceStatusbar"});k=d.add(k,"div",{id:p.id+"_path_row",role:"group","aria-labelledby":p.id+"_path_voice"});if(w.theme_advanced_path){d.add(k,"span",{id:p.id+"_path_voice"},p.translate("advanced.path"));d.add(k,"span",{},": ")}else{d.add(k,"span",{},"&#160;")}if(w.theme_advanced_resizing){d.add(l,"a",{id:p.id+"_resize",href:"javascript:;",onclick:"return false;","class":"mceResize",tabIndex:"-1"});if(w.theme_advanced_resizing_use_cookie){p.onPostRender.add(function(){var n=a.getHash("TinyMCE_"+p.id+"_size"),r=d.get(p.id+"_tbl");if(!n){return}v.resizeTo(n.cw,n.ch)})}p.onPostRender.add(function(){b.add(p.id+"_resize","click",function(n){n.preventDefault()});b.add(p.id+"_resize","mousedown",function(D){var t,r,s,o,C,z,A,F,n,E,x;function y(G){G.preventDefault();n=A+(G.screenX-C);E=F+(G.screenY-z);v.resizeTo(n,E)}function B(G){b.remove(d.doc,"mousemove",t);b.remove(p.getDoc(),"mousemove",r);b.remove(d.doc,"mouseup",s);b.remove(p.getDoc(),"mouseup",o);n=A+(G.screenX-C);E=F+(G.screenY-z);v.resizeTo(n,E,true)}D.preventDefault();C=D.screenX;z=D.screenY;x=d.get(v.editor.id+"_ifr");A=n=x.clientWidth;F=E=x.clientHeight;t=b.add(d.doc,"mousemove",y);r=b.add(p.getDoc(),"mousemove",y);s=b.add(d.doc,"mouseup",B);o=b.add(p.getDoc(),"mouseup",B)})})}j.deltaHeight-=21;k=m=null},_updateUndoStatus:function(j){var i=j.controlManager,k=j.undoManager;i.setDisabled("undo",!k.hasUndo()&&!k.typing);i.setDisabled("redo",!k.hasRedo())},_nodeChanged:function(m,r,D,q,E){var y=this,C,F=0,x,G,z=y.settings,w,k,u,B,l,j,i;e.each(y.stateControls,function(n){r.setActive(n,m.queryCommandState(y.controls[n][1]))});function o(p){var s,n=E.parents,t=p;if(typeof(p)=="string"){t=function(v){return v.nodeName==p}}for(s=0;s<n.length;s++){if(t(n[s])){return n[s]}}}r.setActive("visualaid",m.hasVisual);y._updateUndoStatus(m);r.setDisabled("outdent",!m.queryCommandState("Outdent"));C=o("A");if(G=r.get("link")){if(!C||!C.name){G.setDisabled(!C&&q);G.setActive(!!C)}}if(G=r.get("unlink")){G.setDisabled(!C&&q);G.setActive(!!C&&!C.name)}if(G=r.get("anchor")){G.setActive(!q&&!!C&&C.name)}C=o("IMG");if(G=r.get("image")){G.setActive(!q&&!!C&&D.className.indexOf("mceItem")==-1)}if(G=r.get("styleselect")){y._importClasses();j=[];f(G.items,function(n){j.push(n.value)});i=m.formatter.matchAll(j);G.select(i[0])}if(G=r.get("formatselect")){C=o(d.isBlock);if(C){G.select(C.nodeName.toLowerCase())}}o(function(p){if(p.nodeName==="SPAN"){if(!w&&p.className){w=p.className}}if(m.dom.is(p,z.theme_advanced_font_selector)){if(!k&&p.style.fontSize){k=p.style.fontSize}if(!u&&p.style.fontFamily){u=p.style.fontFamily.replace(/[\"\']+/g,"").replace(/^([^,]+).*/,"$1").toLowerCase()}if(!B&&p.style.color){B=p.style.color}if(!l&&p.style.backgroundColor){l=p.style.backgroundColor}}return false});if(G=r.get("fontselect")){G.select(function(n){return n.replace(/^([^,]+).*/,"$1").toLowerCase()==u})}if(G=r.get("fontsizeselect")){if(z.theme_advanced_runtime_fontsize&&!k&&!w){k=m.dom.getStyle(D,"fontSize",true)}G.select(function(n){if(n.fontSize&&n.fontSize===k){return true}if(n["class"]&&n["class"]===w){return true}})}if(z.theme_advanced_show_current_color){function A(p,n){if(G=r.get(p)){if(!n){n=G.settings.default_color}if(n!==G.value){G.displayColor(n)}}}A("forecolor",B);A("backcolor",l)}if(z.theme_advanced_show_current_color){function A(p,n){if(G=r.get(p)){if(!n){n=G.settings.default_color}if(n!==G.value){G.displayColor(n)}}}A("forecolor",B);A("backcolor",l)}if(z.theme_advanced_path&&z.theme_advanced_statusbar_location){C=d.get(m.id+"_path")||d.add(m.id+"_path_row","span",{id:m.id+"_path"});if(y.statusKeyboardNavigation){y.statusKeyboardNavigation.destroy();y.statusKeyboardNavigation=null}d.setHTML(C,"");o(function(H){var p=H.nodeName.toLowerCase(),s,v,t="";if(H.nodeType!=1||p==="br"||H.getAttribute("data-mce-bogus")||d.hasClass(H,"mceItemHidden")||d.hasClass(H,"mceItemRemoved")){return}if(e.isIE&&H.scopeName!=="HTML"){p=H.scopeName+":"+p}p=p.replace(/mce\:/g,"");switch(p){case"b":p="strong";break;case"i":p="em";break;case"img":if(x=d.getAttrib(H,"src")){t+="src: "+x+" "}break;case"a":if(x=d.getAttrib(H,"name")){t+="name: "+x+" ";p+="#"+x}if(x=d.getAttrib(H,"href")){t+="href: "+x+" "}break;case"font":if(x=d.getAttrib(H,"face")){t+="font: "+x+" "}if(x=d.getAttrib(H,"size")){t+="size: "+x+" "}if(x=d.getAttrib(H,"color")){t+="color: "+x+" "}break;case"span":if(x=d.getAttrib(H,"style")){t+="style: "+x+" "}break}if(x=d.getAttrib(H,"id")){t+="id: "+x+" "}if(x=H.className){x=x.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g,"");if(x){t+="class: "+x+" ";if(d.isBlock(H)||p=="img"||p=="span"){p+="."+x}}}p=p.replace(/(html:)/g,"");p={name:p,node:H,title:t};y.onResolveName.dispatch(y,p);t=p.title;p=p.name;v=d.create("a",{href:"javascript:;",role:"button",onmousedown:"return false;",title:t,"class":"mcePath_"+(F++)},p);if(C.hasChildNodes()){C.insertBefore(d.create("span",{"aria-hidden":"true"},"\u00a0\u00bb "),C.firstChild);C.insertBefore(v,C.firstChild)}else{C.appendChild(v)}},m.getBody());if(d.select("a",C).length>0){y.statusKeyboardNavigation=new e.ui.KeyboardNavigation({root:m.id+"_path_row",items:d.select("a",C),excludeFromTabOrder:true,onCancel:function(){m.focus()}},d)}}},_sel:function(i){this.editor.execCommand("mceSelectNodeDepth",false,i)},_mceInsertAnchor:function(k,j){var i=this.editor;i.windowManager.open({url:this.url+"/anchor.htm",width:320+parseInt(i.getLang("advanced.anchor_delta_width",0)),height:90+parseInt(i.getLang("advanced.anchor_delta_height",0)),inline:true},{theme_url:this.url})},_mceCharMap:function(){var i=this.editor;i.windowManager.open({url:this.url+"/charmap.htm",width:550+parseInt(i.getLang("advanced.charmap_delta_width",0)),height:260+parseInt(i.getLang("advanced.charmap_delta_height",0)),inline:true},{theme_url:this.url})},_mceHelp:function(){var i=this.editor;i.windowManager.open({url:this.url+"/about.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceShortcuts:function(){var i=this.editor;i.windowManager.open({url:this.url+"/shortcuts.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceColorPicker:function(k,j){var i=this.editor;j=j||{};i.windowManager.open({url:this.url+"/color_picker.htm",width:375+parseInt(i.getLang("advanced.colorpicker_delta_width",0)),height:250+parseInt(i.getLang("advanced.colorpicker_delta_height",0)),close_previous:false,inline:true},{input_color:j.color,func:j.func,theme_url:this.url})},_mceCodeEditor:function(j,k){var i=this.editor;i.windowManager.open({url:this.url+"/source_editor.htm",width:parseInt(i.getParam("theme_advanced_source_editor_width",720)),height:parseInt(i.getParam("theme_advanced_source_editor_height",580)),inline:true,resizable:true,maximizable:true},{theme_url:this.url})},_mceImage:function(j,k){var i=this.editor;if(i.dom.getAttrib(i.selection.getNode(),"class").indexOf("mceItem")!=-1){return}i.windowManager.open({url:this.url+"/image.htm",width:355+parseInt(i.getLang("advanced.image_delta_width",0)),height:275+parseInt(i.getLang("advanced.image_delta_height",0)),inline:true},{theme_url:this.url})},_mceLink:function(j,k){var i=this.editor;i.windowManager.open({url:this.url+"/link.htm",width:310+parseInt(i.getLang("advanced.link_delta_width",0)),height:200+parseInt(i.getLang("advanced.link_delta_height",0)),inline:true},{theme_url:this.url})},_mceNewDocument:function(){var i=this.editor;i.windowManager.confirm("advanced.newdocument",function(j){if(j){i.execCommand("mceSetContent",false,"")}})},_mceForeColor:function(){var i=this;this._mceColorPicker(0,{color:i.fgColor,func:function(j){i.fgColor=j;i.editor.execCommand("ForeColor",false,j)}})},_mceBackColor:function(){var i=this;this._mceColorPicker(0,{color:i.bgColor,func:function(j){i.bgColor=j;i.editor.execCommand("HiliteColor",false,j)}})},_ufirst:function(i){return i.substring(0,1).toUpperCase()+i.substring(1)}});e.ThemeManager.add("advanced",e.themes.AdvancedTheme)}(tinymce));
\ No newline at end of file
+(function(e){var d=e.DOM,b=e.dom.Event,h=e.extend,f=e.each,a=e.util.Cookie,g,c=e.explode;e.ThemeManager.requireLangPack("advanced");e.create("tinymce.themes.AdvancedTheme",{sizes:[8,10,12,14,18,24,36],controls:{bold:["bold_desc","Bold"],italic:["italic_desc","Italic"],underline:["underline_desc","Underline"],strikethrough:["striketrough_desc","Strikethrough"],justifyleft:["justifyleft_desc","JustifyLeft"],justifycenter:["justifycenter_desc","JustifyCenter"],justifyright:["justifyright_desc","JustifyRight"],justifyfull:["justifyfull_desc","JustifyFull"],bullist:["bullist_desc","InsertUnorderedList"],numlist:["numlist_desc","InsertOrderedList"],outdent:["outdent_desc","Outdent"],indent:["indent_desc","Indent"],cut:["cut_desc","Cut"],copy:["copy_desc","Copy"],paste:["paste_desc","Paste"],undo:["undo_desc","Undo"],redo:["redo_desc","Redo"],link:["link_desc","mceLink"],unlink:["unlink_desc","unlink"],image:["image_desc","mceImage"],cleanup:["cleanup_desc","mceCleanup"],help:["help_desc","mceHelp"],code:["code_desc","mceCodeEditor"],hr:["hr_desc","InsertHorizontalRule"],removeformat:["removeformat_desc","RemoveFormat"],sub:["sub_desc","subscript"],sup:["sup_desc","superscript"],forecolor:["forecolor_desc","ForeColor"],forecolorpicker:["forecolor_desc","mceForeColor"],backcolor:["backcolor_desc","HiliteColor"],backcolorpicker:["backcolor_desc","mceBackColor"],charmap:["charmap_desc","mceCharMap"],visualaid:["visualaid_desc","mceToggleVisualAid"],anchor:["anchor_desc","mceInsertAnchor"],newdocument:["newdocument_desc","mceNewDocument"],blockquote:["blockquote_desc","mceBlockQuote"]},stateControls:["bold","italic","underline","strikethrough","bullist","numlist","justifyleft","justifycenter","justifyright","justifyfull","sub","sup","blockquote"],init:function(j,k){var l=this,m,i,n;l.editor=j;l.url=k;l.onResolveName=new e.util.Dispatcher(this);j.forcedHighContrastMode=j.settings.detect_highcontrast&&l._isHighContrast();j.settings.skin=j.forcedHighContrastMode?"highcontrast":j.settings.skin;l.settings=m=h({theme_advanced_path:true,theme_advanced_toolbar_location:"bottom",theme_advanced_buttons1:"bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",theme_advanced_buttons2:"bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",theme_advanced_buttons3:"hr,removeformat,visualaid,|,sub,sup,|,charmap",theme_advanced_blockformats:"p,address,pre,h1,h2,h3,h4,h5,h6",theme_advanced_toolbar_align:"center",theme_advanced_fonts:"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",theme_advanced_more_colors:1,theme_advanced_row_height:23,theme_advanced_resize_horizontal:1,theme_advanced_resizing_use_cookie:1,theme_advanced_font_sizes:"1,2,3,4,5,6,7",theme_advanced_font_selector:"span",theme_advanced_show_current_color:0,readonly:j.settings.readonly},j.settings);if(!m.font_size_style_values){m.font_size_style_values="8pt,10pt,12pt,14pt,18pt,24pt,36pt"}if(e.is(m.theme_advanced_font_sizes,"string")){m.font_size_style_values=e.explode(m.font_size_style_values);m.font_size_classes=e.explode(m.font_size_classes||"");n={};j.settings.theme_advanced_font_sizes=m.theme_advanced_font_sizes;f(j.getParam("theme_advanced_font_sizes","","hash"),function(q,p){var o;if(p==q&&q>=1&&q<=7){p=q+" ("+l.sizes[q-1]+"pt)";o=m.font_size_classes[q-1];q=m.font_size_style_values[q-1]||(l.sizes[q-1]+"pt")}if(/^\s*\./.test(q)){o=q.replace(/\./g,"")}n[p]=o?{"class":o}:{fontSize:q}});m.theme_advanced_font_sizes=n}if((i=m.theme_advanced_path_location)&&i!="none"){m.theme_advanced_statusbar_location=m.theme_advanced_path_location}if(m.theme_advanced_statusbar_location=="none"){m.theme_advanced_statusbar_location=0}if(j.settings.content_css!==false){j.contentCSS.push(j.baseURI.toAbsolute(k+"/skins/"+j.settings.skin+"/content.css"))}j.onInit.add(function(){if(!j.settings.readonly){j.onNodeChange.add(l._nodeChanged,l);j.onKeyUp.add(l._updateUndoStatus,l);j.onMouseUp.add(l._updateUndoStatus,l);j.dom.bind(j.dom.getRoot(),"dragend",function(){l._updateUndoStatus(j)})}});j.onSetProgressState.add(function(q,o,r){var s,t=q.id,p;if(o){l.progressTimer=setTimeout(function(){s=q.getContainer();s=s.insertBefore(d.create("DIV",{style:"position:relative"}),s.firstChild);p=d.get(q.id+"_tbl");d.add(s,"div",{id:t+"_blocker","class":"mceBlocker",style:{width:p.clientWidth+2,height:p.clientHeight+2}});d.add(s,"div",{id:t+"_progress","class":"mceProgress",style:{left:p.clientWidth/2,top:p.clientHeight/2}})},r||0)}else{d.remove(t+"_blocker");d.remove(t+"_progress");clearTimeout(l.progressTimer)}});d.loadCSS(m.editor_css?j.documentBaseURI.toAbsolute(m.editor_css):k+"/skins/"+j.settings.skin+"/ui.css");if(m.skin_variant){d.loadCSS(k+"/skins/"+j.settings.skin+"/ui_"+m.skin_variant+".css")}},_isHighContrast:function(){var i,j=d.add(d.getRoot(),"div",{style:"background-color: rgb(171,239,86);"});i=(d.getStyle(j,"background-color",true)+"").toLowerCase().replace(/ /g,"");d.remove(j);return i!="rgb(171,239,86)"&&i!="#abef56"},createControl:function(l,i){var j,k;if(k=i.createControl(l)){return k}switch(l){case"styleselect":return this._createStyleSelect();case"formatselect":return this._createBlockFormats();case"fontselect":return this._createFontSelect();case"fontsizeselect":return this._createFontSizeSelect();case"forecolor":return this._createForeColorMenu();case"backcolor":return this._createBackColorMenu()}if((j=this.controls[l])){return i.createButton(l,{title:"advanced."+j[0],cmd:j[1],ui:j[2],value:j[3]})}},execCommand:function(k,j,l){var i=this["_"+k];if(i){i.call(this,j,l);return true}return false},_importClasses:function(k){var i=this.editor,j=i.controlManager.get("styleselect");if(j.getLength()==0){f(i.dom.getClasses(),function(n,l){var m="style_"+l;i.formatter.register(m,{inline:"span",attributes:{"class":n["class"]},selector:"*"});j.add(n["class"],m)})}},_createStyleSelect:function(m){var k=this,i=k.editor,j=i.controlManager,l;l=j.createListBox("styleselect",{title:"advanced.style_select",onselect:function(o){var p,n=[];f(l.items,function(q){n.push(q.value)});i.focus();i.undoManager.add();p=i.formatter.matchAll(n);if(!o||p[0]==o){if(p[0]){i.formatter.remove(p[0])}}else{i.formatter.apply(o)}i.undoManager.add();i.nodeChanged();return false}});i.onInit.add(function(){var o=0,n=i.getParam("style_formats");if(n){f(n,function(p){var q,r=0;f(p,function(){r++});if(r>1){q=p.name=p.name||"style_"+(o++);i.formatter.register(q,p);l.add(p.title,q)}else{l.add(p.title)}})}else{f(i.getParam("theme_advanced_styles","","hash"),function(r,q){var p;if(r){p="style_"+(o++);i.formatter.register(p,{inline:"span",classes:r,selector:"*"});l.add(k.editor.translate(q),p)}})}});if(l.getLength()==0){l.onPostRender.add(function(o,p){if(!l.NativeListBox){b.add(p.id+"_text","focus",k._importClasses,k);b.add(p.id+"_text","mousedown",k._importClasses,k);b.add(p.id+"_open","focus",k._importClasses,k);b.add(p.id+"_open","mousedown",k._importClasses,k)}else{b.add(p.id,"focus",k._importClasses,k)}})}return l},_createFontSelect:function(){var k,j=this,i=j.editor;k=i.controlManager.createListBox("fontselect",{title:"advanced.fontdefault",onselect:function(l){var m=k.items[k.selectedIndex];if(!l&&m){i.execCommand("FontName",false,m.value);return}i.execCommand("FontName",false,l);k.select(function(n){return l==n});if(m&&m.value==l){k.select(null)}return false}});if(k){f(i.getParam("theme_advanced_fonts",j.settings.theme_advanced_fonts,"hash"),function(m,l){k.add(i.translate(l),m,{style:m.indexOf("dings")==-1?"font-family:"+m:""})})}return k},_createFontSizeSelect:function(){var m=this,k=m.editor,n,l=0,j=[];n=k.controlManager.createListBox("fontsizeselect",{title:"advanced.font_size",onselect:function(i){var o=n.items[n.selectedIndex];if(!i&&o){o=o.value;if(o["class"]){k.formatter.toggle("fontsize_class",{value:o["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,o.fontSize)}return}if(i["class"]){k.focus();k.undoManager.add();k.formatter.toggle("fontsize_class",{value:i["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,i.fontSize)}n.select(function(p){return i==p});if(o&&(o.value.fontSize==i.fontSize||o.value["class"]==i["class"])){n.select(null)}return false}});if(n){f(m.settings.theme_advanced_font_sizes,function(o,i){var p=o.fontSize;if(p>=1&&p<=7){p=m.sizes[parseInt(p)-1]+"pt"}n.add(i,o,{style:"font-size:"+p,"class":"mceFontSize"+(l++)+(" "+(o["class"]||""))})})}return n},_createBlockFormats:function(){var k,i={p:"advanced.paragraph",address:"advanced.address",pre:"advanced.pre",h1:"advanced.h1",h2:"advanced.h2",h3:"advanced.h3",h4:"advanced.h4",h5:"advanced.h5",h6:"advanced.h6",div:"advanced.div",blockquote:"advanced.blockquote",code:"advanced.code",dt:"advanced.dt",dd:"advanced.dd",samp:"advanced.samp"},j=this;k=j.editor.controlManager.createListBox("formatselect",{title:"advanced.block",onselect:function(l){j.editor.execCommand("FormatBlock",false,l);return false}});if(k){f(j.editor.getParam("theme_advanced_blockformats",j.settings.theme_advanced_blockformats,"hash"),function(m,l){k.add(j.editor.translate(l!=m?l:i[m]),m,{"class":"mce_formatPreview mce_"+m})})}return k},_createForeColorMenu:function(){var m,j=this,k=j.settings,l={},i;if(k.theme_advanced_more_colors){l.more_colors_func=function(){j._mceColorPicker(0,{color:m.value,func:function(n){m.setColor(n)}})}}if(i=k.theme_advanced_text_colors){l.colors=i}if(k.theme_advanced_default_foreground_color){l.default_color=k.theme_advanced_default_foreground_color}l.title="advanced.forecolor_desc";l.cmd="ForeColor";l.scope=this;m=j.editor.controlManager.createColorSplitButton("forecolor",l);return m},_createBackColorMenu:function(){var m,j=this,k=j.settings,l={},i;if(k.theme_advanced_more_colors){l.more_colors_func=function(){j._mceColorPicker(0,{color:m.value,func:function(n){m.setColor(n)}})}}if(i=k.theme_advanced_background_colors){l.colors=i}if(k.theme_advanced_default_background_color){l.default_color=k.theme_advanced_default_background_color}l.title="advanced.backcolor_desc";l.cmd="HiliteColor";l.scope=this;m=j.editor.controlManager.createColorSplitButton("backcolor",l);return m},renderUI:function(k){var m,l,q,v=this,r=v.editor,w=v.settings,u,j,i;if(r.settings){r.settings.aria_label=w.aria_label+r.getLang("advanced.help_shortcut")}m=j=d.create("span",{role:"application","aria-labelledby":r.id+"_voice",id:r.id+"_parent","class":"mceEditor "+r.settings.skin+"Skin"+(w.skin_variant?" "+r.settings.skin+"Skin"+v._ufirst(w.skin_variant):"")});d.add(m,"span",{"class":"mceVoiceLabel",style:"display:none;",id:r.id+"_voice"},w.aria_label);if(!d.boxModel){m=d.add(m,"div",{"class":"mceOldBoxModel"})}m=u=d.add(m,"table",{role:"presentation",id:r.id+"_tbl","class":"mceLayout",cellSpacing:0,cellPadding:0});m=q=d.add(m,"tbody");switch((w.theme_advanced_layout_manager||"").toLowerCase()){case"rowlayout":l=v._rowLayout(w,q,k);break;case"customlayout":l=r.execCallback("theme_advanced_custom_layout",w,q,k,j);break;default:l=v._simpleLayout(w,q,k,j)}m=k.targetNode;i=u.rows;d.addClass(i[0],"mceFirst");d.addClass(i[i.length-1],"mceLast");f(d.select("tr",q),function(o){d.addClass(o.firstChild,"mceFirst");d.addClass(o.childNodes[o.childNodes.length-1],"mceLast")});if(d.get(w.theme_advanced_toolbar_container)){d.get(w.theme_advanced_toolbar_container).appendChild(j)}else{d.insertAfter(j,m)}b.add(r.id+"_path_row","click",function(n){n=n.target;if(n.nodeName=="A"){v._sel(n.className.replace(/^.*mcePath_([0-9]+).*$/,"$1"));return b.cancel(n)}});if(!r.getParam("accessibility_focus")){b.add(d.add(j,"a",{href:"#"},"<!-- IE -->"),"focus",function(){tinyMCE.get(r.id).focus()})}if(w.theme_advanced_toolbar_location=="external"){k.deltaHeight=0}v.deltaHeight=k.deltaHeight;k.targetNode=null;r.onKeyDown.add(function(p,n){var s=121,o=122;if(n.altKey){if(n.keyCode===s){if(e.isWebKit){window.focus()}v.toolbarGroup.focus();return b.cancel(n)}else{if(n.keyCode===o){d.get(p.id+"_path_row").focus();return b.cancel(n)}}}});r.addShortcut("alt+0","","mceShortcuts",v);return{iframeContainer:l,editorContainer:r.id+"_parent",sizeContainer:u,deltaHeight:k.deltaHeight}},getInfo:function(){return{longname:"Advanced theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:e.majorVersion+"."+e.minorVersion}},resizeBy:function(i,j){var k=d.get(this.editor.id+"_ifr");this.resizeTo(k.clientWidth+i,k.clientHeight+j)},resizeTo:function(i,m,k){var j=this.editor,l=this.settings,n=d.get(j.id+"_tbl"),o=d.get(j.id+"_ifr");i=Math.max(l.theme_advanced_resizing_min_width||100,i);m=Math.max(l.theme_advanced_resizing_min_height||100,m);i=Math.min(l.theme_advanced_resizing_max_width||65535,i);m=Math.min(l.theme_advanced_resizing_max_height||65535,m);d.setStyle(n,"height","");d.setStyle(o,"height",m);if(l.theme_advanced_resize_horizontal){d.setStyle(n,"width","");d.setStyle(o,"width",i);if(i<n.clientWidth){i=n.clientWidth;d.setStyle(o,"width",n.clientWidth)}}if(k&&l.theme_advanced_resizing_use_cookie){a.setHash("TinyMCE_"+j.id+"_size",{cw:i,ch:m})}},destroy:function(){var i=this.editor.id;b.clear(i+"_resize");b.clear(i+"_path_row");b.clear(i+"_external_close")},_simpleLayout:function(y,r,k,i){var x=this,u=x.editor,v=y.theme_advanced_toolbar_location,m=y.theme_advanced_statusbar_location,l,j,q,w;if(y.readonly){l=d.add(r,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"});return j}if(v=="top"){x._addToolbars(r,k)}if(v=="external"){l=w=d.create("div",{style:"position:relative"});l=d.add(l,"div",{id:u.id+"_external","class":"mceExternalToolbar"});d.add(l,"a",{id:u.id+"_external_close",href:"javascript:;","class":"mceExternalClose"});l=d.add(l,"table",{id:u.id+"_tblext",cellSpacing:0,cellPadding:0});q=d.add(l,"tbody");if(i.firstChild.className=="mceOldBoxModel"){i.firstChild.appendChild(w)}else{i.insertBefore(w,i.firstChild)}x._addToolbars(q,k);u.onMouseUp.add(function(){var o=d.get(u.id+"_external");d.show(o);d.hide(g);var n=b.add(u.id+"_external_close","click",function(){d.hide(u.id+"_external");b.remove(u.id+"_external_close","click",n)});d.show(o);d.setStyle(o,"top",0-d.getRect(u.id+"_tblext").h-1);d.hide(o);d.show(o);o.style.filter="";g=u.id+"_external";o=null})}if(m=="top"){x._addStatusBar(r,k)}if(!y.theme_advanced_toolbar_container){l=d.add(r,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"})}if(v=="bottom"){x._addToolbars(r,k)}if(m=="bottom"){x._addStatusBar(r,k)}return j},_rowLayout:function(w,m,k){var v=this,p=v.editor,u,x,i=p.controlManager,l,j,r,q;u=w.theme_advanced_containers_default_class||"";x=w.theme_advanced_containers_default_align||"center";f(c(w.theme_advanced_containers||""),function(s,o){var n=w["theme_advanced_container_"+s]||"";switch(s.toLowerCase()){case"mceeditor":l=d.add(m,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"});break;case"mceelementpath":v._addStatusBar(m,k);break;default:q=(w["theme_advanced_container_"+s+"_align"]||x).toLowerCase();q="mce"+v._ufirst(q);l=d.add(d.add(m,"tr"),"td",{"class":"mceToolbar "+(w["theme_advanced_container_"+s+"_class"]||u)+" "+q||x});r=i.createToolbar("toolbar"+o);v._addControls(n,r);d.setHTML(l,r.renderHTML());k.deltaHeight-=w.theme_advanced_row_height}});return j},_addControls:function(j,i){var k=this,l=k.settings,m,n=k.editor.controlManager;if(l.theme_advanced_disable&&!k._disabled){m={};f(c(l.theme_advanced_disable),function(o){m[o]=1});k._disabled=m}else{m=k._disabled}f(c(j),function(p){var o;if(m&&m[p]){return}if(p=="tablecontrols"){f(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"],function(q){q=k.createControl(q,n);if(q){i.add(q)}});return}o=k.createControl(p,n);if(o){i.add(o)}})},_addToolbars:function(x,k){var A=this,p,m,r=A.editor,B=A.settings,z,j=r.controlManager,u,l,q=[],y,w;w=j.createToolbarGroup("toolbargroup",{name:r.getLang("advanced.toolbar"),tab_focus_toolbar:r.getParam("theme_advanced_tab_focus_toolbar")});A.toolbarGroup=w;y=B.theme_advanced_toolbar_align.toLowerCase();y="mce"+A._ufirst(y);l=d.add(d.add(x,"tr",{role:"presentation"}),"td",{"class":"mceToolbar "+y,role:"presentation"});for(p=1;(z=B["theme_advanced_buttons"+p]);p++){m=j.createToolbar("toolbar"+p,{"class":"mceToolbarRow"+p});if(B["theme_advanced_buttons"+p+"_add"]){z+=","+B["theme_advanced_buttons"+p+"_add"]}if(B["theme_advanced_buttons"+p+"_add_before"]){z=B["theme_advanced_buttons"+p+"_add_before"]+","+z}A._addControls(z,m);w.add(m);k.deltaHeight-=B.theme_advanced_row_height}q.push(w.renderHTML());q.push(d.createHTML("a",{href:"#",accesskey:"z",title:r.getLang("advanced.toolbar_focus"),onfocus:"tinyMCE.getInstanceById('"+r.id+"').focus();"},"<!-- IE -->"));d.setHTML(l,q.join(""))},_addStatusBar:function(m,j){var k,v=this,p=v.editor,w=v.settings,i,q,u,l;k=d.add(m,"tr");k=l=d.add(k,"td",{"class":"mceStatusbar"});k=d.add(k,"div",{id:p.id+"_path_row",role:"group","aria-labelledby":p.id+"_path_voice"});if(w.theme_advanced_path){d.add(k,"span",{id:p.id+"_path_voice"},p.translate("advanced.path"));d.add(k,"span",{},": ")}else{d.add(k,"span",{},"&#160;")}if(w.theme_advanced_resizing){d.add(l,"a",{id:p.id+"_resize",href:"javascript:;",onclick:"return false;","class":"mceResize",tabIndex:"-1"});if(w.theme_advanced_resizing_use_cookie){p.onPostRender.add(function(){var n=a.getHash("TinyMCE_"+p.id+"_size"),r=d.get(p.id+"_tbl");if(!n){return}v.resizeTo(n.cw,n.ch)})}p.onPostRender.add(function(){b.add(p.id+"_resize","click",function(n){n.preventDefault()});b.add(p.id+"_resize","mousedown",function(D){var t,r,s,o,C,z,A,F,n,E,x;function y(G){G.preventDefault();n=A+(G.screenX-C);E=F+(G.screenY-z);v.resizeTo(n,E)}function B(G){b.remove(d.doc,"mousemove",t);b.remove(p.getDoc(),"mousemove",r);b.remove(d.doc,"mouseup",s);b.remove(p.getDoc(),"mouseup",o);n=A+(G.screenX-C);E=F+(G.screenY-z);v.resizeTo(n,E,true)}D.preventDefault();C=D.screenX;z=D.screenY;x=d.get(v.editor.id+"_ifr");A=n=x.clientWidth;F=E=x.clientHeight;t=b.add(d.doc,"mousemove",y);r=b.add(p.getDoc(),"mousemove",y);s=b.add(d.doc,"mouseup",B);o=b.add(p.getDoc(),"mouseup",B)})})}j.deltaHeight-=21;k=m=null},_updateUndoStatus:function(j){var i=j.controlManager,k=j.undoManager;i.setDisabled("undo",!k.hasUndo()&&!k.typing);i.setDisabled("redo",!k.hasRedo())},_nodeChanged:function(m,r,D,q,E){var y=this,C,F=0,x,G,z=y.settings,w,k,u,B,l,j,i;e.each(y.stateControls,function(n){r.setActive(n,m.queryCommandState(y.controls[n][1]))});function o(p){var s,n=E.parents,t=p;if(typeof(p)=="string"){t=function(v){return v.nodeName==p}}for(s=0;s<n.length;s++){if(t(n[s])){return n[s]}}}r.setActive("visualaid",m.hasVisual);y._updateUndoStatus(m);r.setDisabled("outdent",!m.queryCommandState("Outdent"));C=o("A");if(G=r.get("link")){if(!C||!C.name){G.setDisabled(!C&&q);G.setActive(!!C)}}if(G=r.get("unlink")){G.setDisabled(!C&&q);G.setActive(!!C&&!C.name)}if(G=r.get("anchor")){G.setActive(!q&&!!C&&C.name)}C=o("IMG");if(G=r.get("image")){G.setActive(!q&&!!C&&D.className.indexOf("mceItem")==-1)}if(G=r.get("styleselect")){y._importClasses();j=[];f(G.items,function(n){j.push(n.value)});i=m.formatter.matchAll(j);G.select(i[0])}if(G=r.get("formatselect")){C=o(d.isBlock);if(C){G.select(C.nodeName.toLowerCase())}}o(function(p){if(p.nodeName==="SPAN"){if(!w&&p.className){w=p.className}}if(m.dom.is(p,z.theme_advanced_font_selector)){if(!k&&p.style.fontSize){k=p.style.fontSize}if(!u&&p.style.fontFamily){u=p.style.fontFamily.replace(/[\"\']+/g,"").replace(/^([^,]+).*/,"$1").toLowerCase()}if(!B&&p.style.color){B=p.style.color}if(!l&&p.style.backgroundColor){l=p.style.backgroundColor}}return false});if(G=r.get("fontselect")){G.select(function(n){return n.replace(/^([^,]+).*/,"$1").toLowerCase()==u})}if(G=r.get("fontsizeselect")){if(z.theme_advanced_runtime_fontsize&&!k&&!w){k=m.dom.getStyle(D,"fontSize",true)}G.select(function(n){if(n.fontSize&&n.fontSize===k){return true}if(n["class"]&&n["class"]===w){return true}})}if(z.theme_advanced_show_current_color){function A(p,n){if(G=r.get(p)){if(!n){n=G.settings.default_color}if(n!==G.value){G.displayColor(n)}}}A("forecolor",B);A("backcolor",l)}if(z.theme_advanced_show_current_color){function A(p,n){if(G=r.get(p)){if(!n){n=G.settings.default_color}if(n!==G.value){G.displayColor(n)}}}A("forecolor",B);A("backcolor",l)}if(z.theme_advanced_path&&z.theme_advanced_statusbar_location){C=d.get(m.id+"_path")||d.add(m.id+"_path_row","span",{id:m.id+"_path"});if(y.statusKeyboardNavigation){y.statusKeyboardNavigation.destroy();y.statusKeyboardNavigation=null}d.setHTML(C,"");o(function(H){var p=H.nodeName.toLowerCase(),s,v,t="";if(H.nodeType!=1||p==="br"||H.getAttribute("data-mce-bogus")||d.hasClass(H,"mceItemHidden")||d.hasClass(H,"mceItemRemoved")){return}if(e.isIE&&H.scopeName!=="HTML"){p=H.scopeName+":"+p}p=p.replace(/mce\:/g,"");switch(p){case"b":p="strong";break;case"i":p="em";break;case"img":if(x=d.getAttrib(H,"src")){t+="src: "+x+" "}break;case"a":if(x=d.getAttrib(H,"name")){t+="name: "+x+" ";p+="#"+x}if(x=d.getAttrib(H,"href")){t+="href: "+x+" "}break;case"font":if(x=d.getAttrib(H,"face")){t+="font: "+x+" "}if(x=d.getAttrib(H,"size")){t+="size: "+x+" "}if(x=d.getAttrib(H,"color")){t+="color: "+x+" "}break;case"span":if(x=d.getAttrib(H,"style")){t+="style: "+x+" "}break}if(x=d.getAttrib(H,"id")){t+="id: "+x+" "}if(x=H.className){x=x.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g,"");if(x){t+="class: "+x+" ";if(d.isBlock(H)||p=="img"||p=="span"){p+="."+x}}}p=p.replace(/(html:)/g,"");p={name:p,node:H,title:t};y.onResolveName.dispatch(y,p);t=p.title;p=p.name;v=d.create("a",{href:"javascript:;",role:"button",onmousedown:"return false;",title:t,"class":"mcePath_"+(F++)},p);if(C.hasChildNodes()){C.insertBefore(d.create("span",{"aria-hidden":"true"},"\u00a0\u00bb "),C.firstChild);C.insertBefore(v,C.firstChild)}else{C.appendChild(v)}},m.getBody());if(d.select("a",C).length>0){y.statusKeyboardNavigation=new e.ui.KeyboardNavigation({root:m.id+"_path_row",items:d.select("a",C),excludeFromTabOrder:true,onCancel:function(){m.focus()}},d)}}},_sel:function(i){this.editor.execCommand("mceSelectNodeDepth",false,i)},_mceInsertAnchor:function(k,j){var i=this.editor;i.windowManager.open({url:this.url+"/anchor.htm",width:320+parseInt(i.getLang("advanced.anchor_delta_width",0)),height:90+parseInt(i.getLang("advanced.anchor_delta_height",0)),inline:true},{theme_url:this.url})},_mceCharMap:function(){var i=this.editor;i.windowManager.open({url:this.url+"/charmap.htm",width:550+parseInt(i.getLang("advanced.charmap_delta_width",0)),height:260+parseInt(i.getLang("advanced.charmap_delta_height",0)),inline:true},{theme_url:this.url})},_mceHelp:function(){var i=this.editor;i.windowManager.open({url:this.url+"/about.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceShortcuts:function(){var i=this.editor;i.windowManager.open({url:this.url+"/shortcuts.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceColorPicker:function(k,j){var i=this.editor;j=j||{};i.windowManager.open({url:this.url+"/color_picker.htm",width:375+parseInt(i.getLang("advanced.colorpicker_delta_width",0)),height:250+parseInt(i.getLang("advanced.colorpicker_delta_height",0)),close_previous:false,inline:true},{input_color:j.color,func:j.func,theme_url:this.url})},_mceCodeEditor:function(j,k){var i=this.editor;i.windowManager.open({url:this.url+"/source_editor.htm",width:parseInt(i.getParam("theme_advanced_source_editor_width",720)),height:parseInt(i.getParam("theme_advanced_source_editor_height",580)),inline:true,resizable:true,maximizable:true},{theme_url:this.url})},_mceImage:function(j,k){var i=this.editor;if(i.dom.getAttrib(i.selection.getNode(),"class").indexOf("mceItem")!=-1){return}i.windowManager.open({url:this.url+"/image.htm",width:355+parseInt(i.getLang("advanced.image_delta_width",0)),height:275+parseInt(i.getLang("advanced.image_delta_height",0)),inline:true},{theme_url:this.url})},_mceLink:function(j,k){var i=this.editor;i.windowManager.open({url:this.url+"/link.htm",width:310+parseInt(i.getLang("advanced.link_delta_width",0)),height:200+parseInt(i.getLang("advanced.link_delta_height",0)),inline:true},{theme_url:this.url})},_mceNewDocument:function(){var i=this.editor;i.windowManager.confirm("advanced.newdocument",function(j){if(j){i.execCommand("mceSetContent",false,"")}})},_mceForeColor:function(){var i=this;this._mceColorPicker(0,{color:i.fgColor,func:function(j){i.fgColor=j;i.editor.execCommand("ForeColor",false,j)}})},_mceBackColor:function(){var i=this;this._mceColorPicker(0,{color:i.bgColor,func:function(j){i.bgColor=j;i.editor.execCommand("HiliteColor",false,j)}})},_ufirst:function(i){return i.substring(0,1).toUpperCase()+i.substring(1)}});e.ThemeManager.add("advanced",e.themes.AdvancedTheme)}(tinymce));
diff --git a/js/tiny_mce/themes/advanced/langs/en.js b/js/tiny_mce/themes/advanced/langs/en.js
index 6e584818743..741893afe72 100644
--- a/js/tiny_mce/themes/advanced/langs/en.js
+++ b/js/tiny_mce/themes/advanced/langs/en.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.advanced',{"underline_desc":"Underline (Ctrl+U)","italic_desc":"Italic (Ctrl+I)","bold_desc":"Bold (Ctrl+B)",dd:"Definition Description",dt:"Definition Term ",samp:"Code Sample",code:"Code",blockquote:"Block Quote",h6:"Heading 6",h5:"Heading 5",h4:"Heading 4",h3:"Heading 3",h2:"Heading 2",h1:"Heading 1",pre:"Preformatted",address:"Address",div:"DIV",paragraph:"Paragraph",block:"Format",fontdefault:"Font Family","font_size":"Font Size","style_select":"Styles","anchor_delta_height":"","anchor_delta_width":"","charmap_delta_height":"","charmap_delta_width":"","colorpicker_delta_height":"","colorpicker_delta_width":"","link_delta_height":"","link_delta_width":"","image_delta_height":"","image_delta_width":"","more_colors":"More Colors...","toolbar_focus":"Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X",newdocument:"Are you sure you want clear all contents?",path:"Path","clipboard_msg":"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?","blockquote_desc":"Block Quote","help_desc":"Help","newdocument_desc":"New Document","image_props_desc":"Image Properties","paste_desc":"Paste (Ctrl+V)","copy_desc":"Copy (Ctrl+C)","cut_desc":"Cut (Ctrl+X)","anchor_desc":"Insert/Edit Anchor","visualaid_desc":"show/Hide Guidelines/Invisible Elements","charmap_desc":"Insert Special Character","backcolor_desc":"Select Background Color","forecolor_desc":"Select Text Color","custom1_desc":"Your Custom Description Here","removeformat_desc":"Remove Formatting","hr_desc":"Insert Horizontal Line","sup_desc":"Superscript","sub_desc":"Subscript","code_desc":"Edit HTML Source","cleanup_desc":"Cleanup Messy Code","image_desc":"Insert/Edit Image","unlink_desc":"Unlink","link_desc":"Insert/Edit Link","redo_desc":"Redo (Ctrl+Y)","undo_desc":"Undo (Ctrl+Z)","indent_desc":"Increase Indent","outdent_desc":"Decrease Indent","numlist_desc":"Insert/Remove Numbered List","bullist_desc":"Insert/Remove Bulleted List","justifyfull_desc":"Align Full","justifyright_desc":"Align Right","justifycenter_desc":"Align Center","justifyleft_desc":"Align Left","striketrough_desc":"Strikethrough","help_shortcut":"Press ALT-F10 for toolbar. Press ALT-0 for help","rich_text_area":"Rich Text Area","shortcuts_desc":"Accessability Help",toolbar:"Toolbar"});
\ No newline at end of file
+tinyMCE.addI18n('en.advanced',{"underline_desc":"Underline (Ctrl+U)","italic_desc":"Italic (Ctrl+I)","bold_desc":"Bold (Ctrl+B)",dd:"Definition Description",dt:"Definition Term ",samp:"Code Sample",code:"Code",blockquote:"Block Quote",h6:"Heading 6",h5:"Heading 5",h4:"Heading 4",h3:"Heading 3",h2:"Heading 2",h1:"Heading 1",pre:"Preformatted",address:"Address",div:"DIV",paragraph:"Paragraph",block:"Format",fontdefault:"Font Family","font_size":"Font Size","style_select":"Styles","anchor_delta_height":"","anchor_delta_width":"","charmap_delta_height":"","charmap_delta_width":"","colorpicker_delta_height":"","colorpicker_delta_width":"","link_delta_height":"","link_delta_width":"","image_delta_height":"","image_delta_width":"","more_colors":"More Colors...","toolbar_focus":"Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X",newdocument:"Are you sure you want clear all contents?",path:"Path","clipboard_msg":"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?","blockquote_desc":"Block Quote","help_desc":"Help","newdocument_desc":"New Document","image_props_desc":"Image Properties","paste_desc":"Paste (Ctrl+V)","copy_desc":"Copy (Ctrl+C)","cut_desc":"Cut (Ctrl+X)","anchor_desc":"Insert/Edit Anchor","visualaid_desc":"show/Hide Guidelines/Invisible Elements","charmap_desc":"Insert Special Character","backcolor_desc":"Select Background Color","forecolor_desc":"Select Text Color","custom1_desc":"Your Custom Description Here","removeformat_desc":"Remove Formatting","hr_desc":"Insert Horizontal Line","sup_desc":"Superscript","sub_desc":"Subscript","code_desc":"Edit HTML Source","cleanup_desc":"Cleanup Messy Code","image_desc":"Insert/Edit Image","unlink_desc":"Unlink","link_desc":"Insert/Edit Link","redo_desc":"Redo (Ctrl+Y)","undo_desc":"Undo (Ctrl+Z)","indent_desc":"Increase Indent","outdent_desc":"Decrease Indent","numlist_desc":"Insert/Remove Numbered List","bullist_desc":"Insert/Remove Bulleted List","justifyfull_desc":"Align Full","justifyright_desc":"Align Right","justifycenter_desc":"Align Center","justifyleft_desc":"Align Left","striketrough_desc":"Strikethrough","help_shortcut":"Press ALT-F10 for toolbar. Press ALT-0 for help","rich_text_area":"Rich Text Area","shortcuts_desc":"Accessability Help",toolbar:"Toolbar"});
diff --git a/js/tiny_mce/themes/advanced/skins/o2k7/ui_black.css b/js/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
index 50c9b76a2d4..21869e0ea89 100644
--- a/js/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
+++ b/js/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
@@ -5,4 +5,4 @@
 .o2k7SkinBlack table.mceListBoxEnabled:hover .mceText, .o2k7SkinBlack .mceListBoxHover .mceText, .o2k7SkinBlack .mceListBoxSelected .mceText {background:#FFF; border:1px solid #FFBD69; border-right:0}
 .o2k7SkinBlack .mceExternalToolbar, .o2k7SkinBlack .mceListBox .mceText, .o2k7SkinBlack div.mceMenu, .o2k7SkinBlack table.mceLayout, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack table.mceLayout tr.mceFirst td, .o2k7SkinBlack table.mceLayout, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack table.mceLayout tr.mceLast td, .o2k7SkinBlack .mceIframeContainer {border-color: #535353;}
 .o2k7SkinBlack table.mceSplitButtonEnabled:hover a.mceAction, .o2k7SkinBlack .mceSplitButtonHover a.mceAction, .o2k7SkinBlack .mceSplitButtonSelected {background-image:url(img/button_bg_black.png)}
-.o2k7SkinBlack .mceMenu .mceMenuItemEnabled a:hover, .o2k7SkinBlack .mceMenu .mceMenuItemActive {background-color:#FFE7A1}
\ No newline at end of file
+.o2k7SkinBlack .mceMenu .mceMenuItemEnabled a:hover, .o2k7SkinBlack .mceMenu .mceMenuItemActive {background-color:#FFE7A1}
diff --git a/js/tiny_mce/themes/simple/editor_template.js b/js/tiny_mce/themes/simple/editor_template.js
index 4b3209cc921..81fd39f4988 100644
--- a/js/tiny_mce/themes/simple/editor_template.js
+++ b/js/tiny_mce/themes/simple/editor_template.js
@@ -1 +1 @@
-(function(){var a=tinymce.DOM;tinymce.ThemeManager.requireLangPack("simple");tinymce.create("tinymce.themes.SimpleTheme",{init:function(c,d){var e=this,b=["Bold","Italic","Underline","Strikethrough","InsertUnorderedList","InsertOrderedList"],f=c.settings;e.editor=c;c.contentCSS.push(d+"/skins/"+f.skin+"/content.css");c.onInit.add(function(){c.onNodeChange.add(function(h,g){tinymce.each(b,function(i){g.get(i.toLowerCase()).setActive(h.queryCommandState(i))})})});a.loadCSS((f.editor_css?c.documentBaseURI.toAbsolute(f.editor_css):"")||d+"/skins/"+f.skin+"/ui.css")},renderUI:function(h){var e=this,i=h.targetNode,b,c,d=e.editor,f=d.controlManager,g;i=a.insertAfter(a.create("span",{id:d.id+"_container","class":"mceEditor "+d.settings.skin+"SimpleSkin"}),i);i=g=a.add(i,"table",{cellPadding:0,cellSpacing:0,"class":"mceLayout"});i=c=a.add(i,"tbody");i=a.add(c,"tr");i=b=a.add(a.add(i,"td"),"div",{"class":"mceIframeContainer"});i=a.add(a.add(c,"tr",{"class":"last"}),"td",{"class":"mceToolbar mceLast",align:"center"});c=e.toolbar=f.createToolbar("tools1");c.add(f.createButton("bold",{title:"simple.bold_desc",cmd:"Bold"}));c.add(f.createButton("italic",{title:"simple.italic_desc",cmd:"Italic"}));c.add(f.createButton("underline",{title:"simple.underline_desc",cmd:"Underline"}));c.add(f.createButton("strikethrough",{title:"simple.striketrough_desc",cmd:"Strikethrough"}));c.add(f.createSeparator());c.add(f.createButton("undo",{title:"simple.undo_desc",cmd:"Undo"}));c.add(f.createButton("redo",{title:"simple.redo_desc",cmd:"Redo"}));c.add(f.createSeparator());c.add(f.createButton("cleanup",{title:"simple.cleanup_desc",cmd:"mceCleanup"}));c.add(f.createSeparator());c.add(f.createButton("insertunorderedlist",{title:"simple.bullist_desc",cmd:"InsertUnorderedList"}));c.add(f.createButton("insertorderedlist",{title:"simple.numlist_desc",cmd:"InsertOrderedList"}));c.renderTo(i);return{iframeContainer:b,editorContainer:d.id+"_container",sizeContainer:g,deltaHeight:-20}},getInfo:function(){return{longname:"Simple theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.ThemeManager.add("simple",tinymce.themes.SimpleTheme)})();
\ No newline at end of file
+(function(){var a=tinymce.DOM;tinymce.ThemeManager.requireLangPack("simple");tinymce.create("tinymce.themes.SimpleTheme",{init:function(c,d){var e=this,b=["Bold","Italic","Underline","Strikethrough","InsertUnorderedList","InsertOrderedList"],f=c.settings;e.editor=c;c.contentCSS.push(d+"/skins/"+f.skin+"/content.css");c.onInit.add(function(){c.onNodeChange.add(function(h,g){tinymce.each(b,function(i){g.get(i.toLowerCase()).setActive(h.queryCommandState(i))})})});a.loadCSS((f.editor_css?c.documentBaseURI.toAbsolute(f.editor_css):"")||d+"/skins/"+f.skin+"/ui.css")},renderUI:function(h){var e=this,i=h.targetNode,b,c,d=e.editor,f=d.controlManager,g;i=a.insertAfter(a.create("span",{id:d.id+"_container","class":"mceEditor "+d.settings.skin+"SimpleSkin"}),i);i=g=a.add(i,"table",{cellPadding:0,cellSpacing:0,"class":"mceLayout"});i=c=a.add(i,"tbody");i=a.add(c,"tr");i=b=a.add(a.add(i,"td"),"div",{"class":"mceIframeContainer"});i=a.add(a.add(c,"tr",{"class":"last"}),"td",{"class":"mceToolbar mceLast",align:"center"});c=e.toolbar=f.createToolbar("tools1");c.add(f.createButton("bold",{title:"simple.bold_desc",cmd:"Bold"}));c.add(f.createButton("italic",{title:"simple.italic_desc",cmd:"Italic"}));c.add(f.createButton("underline",{title:"simple.underline_desc",cmd:"Underline"}));c.add(f.createButton("strikethrough",{title:"simple.striketrough_desc",cmd:"Strikethrough"}));c.add(f.createSeparator());c.add(f.createButton("undo",{title:"simple.undo_desc",cmd:"Undo"}));c.add(f.createButton("redo",{title:"simple.redo_desc",cmd:"Redo"}));c.add(f.createSeparator());c.add(f.createButton("cleanup",{title:"simple.cleanup_desc",cmd:"mceCleanup"}));c.add(f.createSeparator());c.add(f.createButton("insertunorderedlist",{title:"simple.bullist_desc",cmd:"InsertUnorderedList"}));c.add(f.createButton("insertorderedlist",{title:"simple.numlist_desc",cmd:"InsertOrderedList"}));c.renderTo(i);return{iframeContainer:b,editorContainer:d.id+"_container",sizeContainer:g,deltaHeight:-20}},getInfo:function(){return{longname:"Simple theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.ThemeManager.add("simple",tinymce.themes.SimpleTheme)})();
diff --git a/js/tiny_mce/themes/simple/editor_template_src.js b/js/tiny_mce/themes/simple/editor_template_src.js
index 01ce87c58a9..ece70f34d36 100644
--- a/js/tiny_mce/themes/simple/editor_template_src.js
+++ b/js/tiny_mce/themes/simple/editor_template_src.js
@@ -81,4 +81,4 @@
 	});
 
 	tinymce.ThemeManager.add('simple', tinymce.themes.SimpleTheme);
-})();
\ No newline at end of file
+})();
diff --git a/js/tiny_mce/themes/simple/langs/en.js b/js/tiny_mce/themes/simple/langs/en.js
index 088ed0fcbed..ba09813b8c4 100644
--- a/js/tiny_mce/themes/simple/langs/en.js
+++ b/js/tiny_mce/themes/simple/langs/en.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.simple',{"cleanup_desc":"Cleanup Messy Code","redo_desc":"Redo (Ctrl+Y)","undo_desc":"Undo (Ctrl+Z)","numlist_desc":"Insert/Remove Numbered List","bullist_desc":"Insert/Remove Bulleted List","striketrough_desc":"Strikethrough","underline_desc":"Underline (Ctrl+U)","italic_desc":"Italic (Ctrl+I)","bold_desc":"Bold (Ctrl+B)"});
\ No newline at end of file
+tinyMCE.addI18n('en.simple',{"cleanup_desc":"Cleanup Messy Code","redo_desc":"Redo (Ctrl+Y)","undo_desc":"Undo (Ctrl+Z)","numlist_desc":"Insert/Remove Numbered List","bullist_desc":"Insert/Remove Bulleted List","striketrough_desc":"Strikethrough","underline_desc":"Underline (Ctrl+U)","italic_desc":"Italic (Ctrl+I)","bold_desc":"Bold (Ctrl+B)"});
diff --git a/js/tiny_mce/tiny_mce.js b/js/tiny_mce/tiny_mce.js
index ad3745f86bf..6b66860f7b6 100644
--- a/js/tiny_mce/tiny_mce.js
+++ b/js/tiny_mce/tiny_mce.js
@@ -1 +1 @@
-(function(d){var a=/^\s*|\s*$/g,e,c="B".replace(/A(.)|B/,"$1")==="$1";var b={majorVersion:"3",minorVersion:"4.7",releaseDate:"2011-11-03",_init:function(){var s=this,q=document,o=navigator,g=o.userAgent,m,f,l,k,j,r;s.isOpera=d.opera&&opera.buildNumber;s.isWebKit=/WebKit/.test(g);s.isIE=!s.isWebKit&&!s.isOpera&&(/MSIE/gi).test(g)&&(/Explorer/gi).test(o.appName);s.isIE6=s.isIE&&/MSIE [56]/.test(g);s.isIE7=s.isIE&&/MSIE [7]/.test(g);s.isIE8=s.isIE&&/MSIE [8]/.test(g);s.isIE9=s.isIE&&/MSIE [9]/.test(g);s.isGecko=!s.isWebKit&&/Gecko/.test(g);s.isMac=g.indexOf("Mac")!=-1;s.isAir=/adobeair/i.test(g);s.isIDevice=/(iPad|iPhone)/.test(g);s.isIOS5=s.isIDevice&&g.match(/AppleWebKit\/(\d*)/)[1]>=534;if(d.tinyMCEPreInit){s.suffix=tinyMCEPreInit.suffix;s.baseURL=tinyMCEPreInit.base;s.query=tinyMCEPreInit.query;return}s.suffix="";f=q.getElementsByTagName("base");for(m=0;m<f.length;m++){if(r=f[m].href){if(/^https?:\/\/[^\/]+$/.test(r)){r+="/"}k=r?r.match(/.*\//)[0]:""}}function h(i){if(i.src&&/tiny_mce(|_gzip|_jquery|_prototype|_full)(_dev|_src)?.js/.test(i.src)){if(/_(src|dev)\.js/g.test(i.src)){s.suffix="_src"}if((j=i.src.indexOf("?"))!=-1){s.query=i.src.substring(j+1)}s.baseURL=i.src.substring(0,i.src.lastIndexOf("/"));if(k&&s.baseURL.indexOf("://")==-1&&s.baseURL.indexOf("/")!==0){s.baseURL=k+s.baseURL}return s.baseURL}return null}f=q.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}l=q.getElementsByTagName("head")[0];if(l){f=l.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}}return},is:function(g,f){if(!f){return g!==e}if(f=="array"&&(g.hasOwnProperty&&g instanceof Array)){return true}return typeof(g)==f},makeMap:function(f,j,h){var g;f=f||[];j=j||",";if(typeof(f)=="string"){f=f.split(j)}h=h||{};g=f.length;while(g--){h[f[g]]={}}return h},each:function(i,f,h){var j,g;if(!i){return 0}h=h||i;if(i.length!==e){for(j=0,g=i.length;j<g;j++){if(f.call(h,i[j],j,i)===false){return 0}}}else{for(j in i){if(i.hasOwnProperty(j)){if(f.call(h,i[j],j,i)===false){return 0}}}}return 1},map:function(g,h){var i=[];b.each(g,function(f){i.push(h(f))});return i},grep:function(g,h){var i=[];b.each(g,function(f){if(!h||h(f)){i.push(f)}});return i},inArray:function(g,h){var j,f;if(g){for(j=0,f=g.length;j<f;j++){if(g[j]===h){return j}}}return -1},extend:function(k,j){var h,g,f=arguments;for(h=1,g=f.length;h<g;h++){j=f[h];b.each(j,function(i,l){if(i!==e){k[l]=i}})}return k},trim:function(f){return(f?""+f:"").replace(a,"")},create:function(o,f,j){var n=this,g,i,k,l,h,m=0;o=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(o);k=o[3].match(/(^|\.)(\w+)$/i)[2];i=n.createNS(o[3].replace(/\.\w+$/,""),j);if(i[k]){return}if(o[2]=="static"){i[k]=f;if(this.onCreate){this.onCreate(o[2],o[3],i[k])}return}if(!f[k]){f[k]=function(){};m=1}i[k]=f[k];n.extend(i[k].prototype,f);if(o[5]){g=n.resolve(o[5]).prototype;l=o[5].match(/\.(\w+)$/i)[1];h=i[k];if(m){i[k]=function(){return g[l].apply(this,arguments)}}else{i[k]=function(){this.parent=g[l];return h.apply(this,arguments)}}i[k].prototype[k]=i[k];n.each(g,function(p,q){i[k].prototype[q]=g[q]});n.each(f,function(p,q){if(g[q]){i[k].prototype[q]=function(){this.parent=g[q];return p.apply(this,arguments)}}else{if(q!=k){i[k].prototype[q]=p}}})}n.each(f["static"],function(p,q){i[k][q]=p});if(this.onCreate){this.onCreate(o[2],o[3],i[k].prototype)}},walk:function(i,h,j,g){g=g||this;if(i){if(j){i=i[j]}b.each(i,function(k,f){if(h.call(g,k,f,j)===false){return false}b.walk(k,h,j,g)})}},createNS:function(j,h){var g,f;h=h||d;j=j.split(".");for(g=0;g<j.length;g++){f=j[g];if(!h[f]){h[f]={}}h=h[f]}return h},resolve:function(j,h){var g,f;h=h||d;j=j.split(".");for(g=0,f=j.length;g<f;g++){h=h[j[g]];if(!h){break}}return h},addUnload:function(j,i){var h=this;j={func:j,scope:i||this};if(!h.unloads){function g(){var f=h.unloads,l,m;if(f){for(m in f){l=f[m];if(l&&l.func){l.func.call(l.scope,1)}}if(d.detachEvent){d.detachEvent("onbeforeunload",k);d.detachEvent("onunload",g)}else{if(d.removeEventListener){d.removeEventListener("unload",g,false)}}h.unloads=l=f=w=g=0;if(d.CollectGarbage){CollectGarbage()}}}function k(){var l=document;if(l.readyState=="interactive"){function f(){l.detachEvent("onstop",f);if(g){g()}l=0}if(l){l.attachEvent("onstop",f)}d.setTimeout(function(){if(l){l.detachEvent("onstop",f)}},0)}}if(d.attachEvent){d.attachEvent("onunload",g);d.attachEvent("onbeforeunload",k)}else{if(d.addEventListener){d.addEventListener("unload",g,false)}}h.unloads=[j]}else{h.unloads.push(j)}return j},removeUnload:function(i){var g=this.unloads,h=null;b.each(g,function(j,f){if(j&&j.func==i){g.splice(f,1);h=i;return false}});return h},explode:function(f,g){return f?b.map(f.split(g||","),b.trim):f},_addVer:function(g){var f;if(!this.query){return g}f=(g.indexOf("?")==-1?"?":"&")+this.query;if(g.indexOf("#")==-1){return g+f}return g.replace("#",f+"#")},_replace:function(h,f,g){if(c){return g.replace(h,function(){var l=f,j=arguments,k;for(k=0;k<j.length-2;k++){if(j[k]===e){l=l.replace(new RegExp("\\$"+k,"g"),"")}else{l=l.replace(new RegExp("\\$"+k,"g"),j[k])}}return l})}return g.replace(h,f)}};b._init();d.tinymce=d.tinyMCE=b})(window);tinymce.create("tinymce.util.Dispatcher",{scope:null,listeners:null,Dispatcher:function(a){this.scope=a||this;this.listeners=[]},add:function(a,b){this.listeners.push({cb:a,scope:b||this.scope});return a},addToTop:function(a,b){this.listeners.unshift({cb:a,scope:b||this.scope});return a},remove:function(a){var b=this.listeners,c=null;tinymce.each(b,function(e,d){if(a==e.cb){c=a;b.splice(d,1);return false}});return c},dispatch:function(){var f,d=arguments,e,b=this.listeners,g;for(e=0;e<b.length;e++){g=b[e];f=g.cb.apply(g.scope,d);if(f===false){break}}return f}});(function(){var a=tinymce.each;tinymce.create("tinymce.util.URI",{URI:function(e,g){var f=this,i,d,c,h;e=tinymce.trim(e);g=f.settings=g||{};if(/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e)){f.source=e;return}if(e.indexOf("/")===0&&e.indexOf("//")!==0){e=(g.base_uri?g.base_uri.protocol||"http":"http")+"://mce_host"+e}if(!/^[\w-]*:?\/\//.test(e)){h=g.base_uri?g.base_uri.path:new tinymce.util.URI(location.href).directory;e=((g.base_uri&&g.base_uri.protocol)||"http")+"://mce_host"+f.toAbsPath(h,e)}e=e.replace(/@@/g,"(mce_at)");e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e);a(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],function(b,j){var k=e[j];if(k){k=k.replace(/\(mce_at\)/g,"@@")}f[b]=k});if(c=g.base_uri){if(!f.protocol){f.protocol=c.protocol}if(!f.userInfo){f.userInfo=c.userInfo}if(!f.port&&f.host=="mce_host"){f.port=c.port}if(!f.host||f.host=="mce_host"){f.host=c.host}f.source=""}},setPath:function(c){var b=this;c=/^(.*?)\/?(\w+)?$/.exec(c);b.path=c[0];b.directory=c[1];b.file=c[2];b.source="";b.getURI()},toRelative:function(b){var c=this,d;if(b==="./"){return b}b=new tinymce.util.URI(b,{base_uri:c});if((b.host!="mce_host"&&c.host!=b.host&&b.host)||c.port!=b.port||c.protocol!=b.protocol){return b.getURI()}d=c.toRelPath(c.path,b.path);if(b.query){d+="?"+b.query}if(b.anchor){d+="#"+b.anchor}return d},toAbsolute:function(b,c){var b=new tinymce.util.URI(b,{base_uri:this});return b.getURI(this.host==b.host&&this.protocol==b.protocol?c:0)},toRelPath:function(g,h){var c,f=0,d="",e,b;g=g.substring(0,g.lastIndexOf("/"));g=g.split("/");c=h.split("/");if(g.length>=c.length){for(e=0,b=g.length;e<b;e++){if(e>=c.length||g[e]!=c[e]){f=e+1;break}}}if(g.length<c.length){for(e=0,b=c.length;e<b;e++){if(e>=g.length||g[e]!=c[e]){f=e+1;break}}}if(f==1){return h}for(e=0,b=g.length-(f-1);e<b;e++){d+="../"}for(e=f-1,b=c.length;e<b;e++){if(e!=f-1){d+="/"+c[e]}else{d+=c[e]}}return d},toAbsPath:function(e,f){var c,b=0,h=[],d,g;d=/\/$/.test(f)?"/":"";e=e.split("/");f=f.split("/");a(e,function(i){if(i){h.push(i)}});e=h;for(c=f.length-1,h=[];c>=0;c--){if(f[c].length==0||f[c]=="."){continue}if(f[c]==".."){b++;continue}if(b>0){b--;continue}h.push(f[c])}c=e.length-b;if(c<=0){g=h.reverse().join("/")}else{g=e.slice(0,c).join("/")+"/"+h.reverse().join("/")}if(g.indexOf("/")!==0){g="/"+g}if(d&&g.lastIndexOf("/")!==g.length-1){g+=d}return g},getURI:function(d){var c,b=this;if(!b.source||d){c="";if(!d){if(b.protocol){c+=b.protocol+"://"}if(b.userInfo){c+=b.userInfo+"@"}if(b.host){c+=b.host}if(b.port){c+=":"+b.port}}if(b.path){c+=b.path}if(b.query){c+="?"+b.query}if(b.anchor){c+="#"+b.anchor}b.source=c}return b.source}})})();(function(){var a=tinymce.each;tinymce.create("static tinymce.util.Cookie",{getHash:function(d){var b=this.get(d),c;if(b){a(b.split("&"),function(e){e=e.split("=");c=c||{};c[unescape(e[0])]=unescape(e[1])})}return c},setHash:function(j,b,g,f,i,c){var h="";a(b,function(e,d){h+=(!h?"":"&")+escape(d)+"="+escape(e)});this.set(j,h,g,f,i,c)},get:function(i){var h=document.cookie,g,f=i+"=",d;if(!h){return}d=h.indexOf("; "+f);if(d==-1){d=h.indexOf(f);if(d!=0){return null}}else{d+=2}g=h.indexOf(";",d);if(g==-1){g=h.length}return unescape(h.substring(d+f.length,g))},set:function(i,b,g,f,h,c){document.cookie=i+"="+escape(b)+((g)?"; expires="+g.toGMTString():"")+((f)?"; path="+escape(f):"")+((h)?"; domain="+h:"")+((c)?"; secure":"")},remove:function(e,b){var c=new Date();c.setTime(c.getTime()-1000);this.set(e,"",c,b,c)}})})();(function(){function serialize(o,quote){var i,v,t;quote=quote||'"';if(o==null){return"null"}t=typeof o;if(t=="string"){v="\bb\tt\nn\ff\rr\"\"''\\\\";return quote+o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g,function(a,b){if(quote==='"'&&a==="'"){return a}i=v.indexOf(b);if(i+1){return"\\"+v.charAt(i+1)}a=b.charCodeAt().toString(16);return"\\u"+"0000".substring(a.length)+a})+quote}if(t=="object"){if(o.hasOwnProperty&&o instanceof Array){for(i=0,v="[";i<o.length;i++){v+=(i>0?",":"")+serialize(o[i],quote)}return v+"]"}v="{";for(i in o){if(o.hasOwnProperty(i)){v+=typeof o[i]!="function"?(v.length>1?","+quote:quote)+i+quote+":"+serialize(o[i],quote):""}}return v+"}"}return""+o}tinymce.util.JSON={serialize:serialize,parse:function(s){try{return eval("("+s+")")}catch(ex){}}}})();tinymce.create("static tinymce.util.XHR",{send:function(g){var a,e,b=window,h=0;g.scope=g.scope||this;g.success_scope=g.success_scope||g.scope;g.error_scope=g.error_scope||g.scope;g.async=g.async===false?false:true;g.data=g.data||"";function d(i){a=0;try{a=new ActiveXObject(i)}catch(c){}return a}a=b.XMLHttpRequest?new XMLHttpRequest():d("Microsoft.XMLHTTP")||d("Msxml2.XMLHTTP");if(a){if(a.overrideMimeType){a.overrideMimeType(g.content_type)}a.open(g.type||(g.data?"POST":"GET"),g.url,g.async);if(g.content_type){a.setRequestHeader("Content-Type",g.content_type)}a.setRequestHeader("X-Requested-With","XMLHttpRequest");a.send(g.data);function f(){if(!g.async||a.readyState==4||h++>10000){if(g.success&&h<10000&&a.status==200){g.success.call(g.success_scope,""+a.responseText,a,g)}else{if(g.error){g.error.call(g.error_scope,h>10000?"TIMED_OUT":"GENERAL",a,g)}}a=null}else{b.setTimeout(f,10)}}if(!g.async){return f()}e=b.setTimeout(f,10)}}});(function(){var c=tinymce.extend,b=tinymce.util.JSON,a=tinymce.util.XHR;tinymce.create("tinymce.util.JSONRequest",{JSONRequest:function(d){this.settings=c({},d);this.count=0},send:function(f){var e=f.error,d=f.success;f=c(this.settings,f);f.success=function(h,g){h=b.parse(h);if(typeof(h)=="undefined"){h={error:"JSON Parse error."}}if(h.error){e.call(f.error_scope||f.scope,h.error,g)}else{d.call(f.success_scope||f.scope,h.result)}};f.error=function(h,g){if(e){e.call(f.error_scope||f.scope,h,g)}};f.data=b.serialize({id:f.id||"c"+(this.count++),method:f.method,params:f.params});f.content_type="application/json";a.send(f)},"static":{sendRPC:function(d){return new tinymce.util.JSONRequest().send(d)}}})}());(function(a){a.VK={DELETE:46,BACKSPACE:8,ENTER:13,TAB:9,SPACEBAR:32,UP:38,DOWN:40}})(tinymce);(function(k){var i=k.VK,j=i.BACKSPACE,h=i.DELETE;function c(m){var o=m.dom,n=m.selection;m.onKeyDown.add(function(q,u){var p,v,s,t,r;r=u.keyCode==h;if(r||u.keyCode==j){u.preventDefault();p=n.getRng();v=o.getParent(p.startContainer,o.isBlock);if(r){v=o.getNext(v,o.isBlock)}if(v){s=v.firstChild;while(s&&s.nodeType==3&&s.nodeValue.length==0){s=s.nextSibling}if(s&&s.nodeName==="SPAN"){t=s.cloneNode(false)}}q.getDoc().execCommand(r?"ForwardDelete":"Delete",false,null);v=o.getParent(p.startContainer,o.isBlock);k.each(o.select("span.Apple-style-span,font.Apple-style-span",v),function(x){var y=n.getBookmark();if(t){o.replace(t.cloneNode(false),x,true)}else{o.remove(x,true)}n.moveToBookmark(y)})}})}function d(m){m.onKeyUp.add(function(n,p){var o=p.keyCode;if(o==h||o==j){if(n.dom.isEmpty(n.getBody())){n.setContent("",{format:"raw"});n.nodeChanged();return}}})}function b(m){m.dom.bind(m.getDoc(),"focusin",function(){m.selection.setRng(m.selection.getRng())})}function e(m){m.onKeyDown.add(function(n,q){if(q.keyCode===j){if(n.selection.isCollapsed()&&n.selection.getRng(true).startOffset===0){var p=n.selection.getNode();var o=p.previousSibling;if(o&&o.nodeName&&o.nodeName.toLowerCase()==="hr"){n.dom.remove(o);k.dom.Event.cancel(q)}}}})}function g(m){if(!Range.prototype.getClientRects){m.onMouseDown.add(function(o,p){if(p.target.nodeName==="HTML"){var n=o.getBody();n.blur();setTimeout(function(){n.focus()},0)}})}}function f(m){m.onClick.add(function(n,o){o=o.target;if(/^(IMG|HR)$/.test(o.nodeName)){n.selection.getSel().setBaseAndExtent(o,0,o,1)}if(o.nodeName=="A"&&n.dom.hasClass(o,"mceItemAnchor")){n.selection.select(o)}n.nodeChanged()})}function l(m){var o,n;m.dom.bind(m.getDoc(),"selectionchange",function(){if(n){clearTimeout(n);n=0}n=window.setTimeout(function(){var p=m.selection.getRng();if(!o||!k.dom.RangeUtils.compareRanges(p,o)){m.nodeChanged();o=p}},50)})}function a(m){document.body.setAttribute("role","application")}k.create("tinymce.util.Quirks",{Quirks:function(m){if(k.isWebKit){c(m);d(m);b(m);f(m);if(k.isIDevice){l(m)}}if(k.isIE){e(m);d(m);a(m)}if(k.isGecko){e(m);g(m)}}})})(tinymce);(function(j){var a,g,d,k=/[&<>\"\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,b=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,f=/[<>&\"\']/g,c=/&(#x|#)?([\w]+);/g,i={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"};g={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;"};d={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"};function h(l){var m;m=document.createElement("div");m.innerHTML=l;return m.textContent||m.innerText||l}function e(m,p){var n,o,l,q={};if(m){m=m.split(",");p=p||10;for(n=0;n<m.length;n+=2){o=String.fromCharCode(parseInt(m[n],p));if(!g[o]){l="&"+m[n+1]+";";q[o]=l;q[l]=o}}return q}}a=e("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);j.html=j.html||{};j.html.Entities={encodeRaw:function(m,l){return m.replace(l?k:b,function(n){return g[n]||n})},encodeAllRaw:function(l){return(""+l).replace(f,function(m){return g[m]||m})},encodeNumeric:function(m,l){return m.replace(l?k:b,function(n){if(n.length>1){return"&#"+(((n.charCodeAt(0)-55296)*1024)+(n.charCodeAt(1)-56320)+65536)+";"}return g[n]||"&#"+n.charCodeAt(0)+";"})},encodeNamed:function(n,l,m){m=m||a;return n.replace(l?k:b,function(o){return g[o]||m[o]||o})},getEncodeFunc:function(l,o){var p=j.html.Entities;o=e(o)||a;function m(r,q){return r.replace(q?k:b,function(s){return g[s]||o[s]||"&#"+s.charCodeAt(0)+";"||s})}function n(r,q){return p.encodeNamed(r,q,o)}l=j.makeMap(l.replace(/\+/g,","));if(l.named&&l.numeric){return m}if(l.named){if(o){return n}return p.encodeNamed}if(l.numeric){return p.encodeNumeric}return p.encodeRaw},decode:function(l){return l.replace(c,function(n,m,o){if(m){o=parseInt(o,m.length===2?16:10);if(o>65535){o-=65536;return String.fromCharCode(55296+(o>>10),56320+(o&1023))}else{return i[o]||String.fromCharCode(o)}}return d[n]||a[n]||h(n)})}}})(tinymce);tinymce.html.Styles=function(d,f){var k=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,h=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,b=/\s*([^:]+):\s*([^;]+);?/g,l=/\s+$/,m=/rgb/,e,g,a={},j;d=d||{};j="\\\" \\' \\; \\: ; : \uFEFF".split(" ");for(g=0;g<j.length;g++){a[j[g]]="\uFEFF"+g;a["\uFEFF"+g]=j[g]}function c(n,q,p,i){function o(r){r=parseInt(r).toString(16);return r.length>1?r:"0"+r}return"#"+o(q)+o(p)+o(i)}return{toHex:function(i){return i.replace(k,c)},parse:function(r){var y={},p,n,v,q,u=d.url_converter,x=d.url_converter_scope||this;function o(C,F){var E,B,A,D;E=y[C+"-top"+F];if(!E){return}B=y[C+"-right"+F];if(E!=B){return}A=y[C+"-bottom"+F];if(B!=A){return}D=y[C+"-left"+F];if(A!=D){return}y[C+F]=D;delete y[C+"-top"+F];delete y[C+"-right"+F];delete y[C+"-bottom"+F];delete y[C+"-left"+F]}function t(B){var C=y[B],A;if(!C||C.indexOf(" ")<0){return}C=C.split(" ");A=C.length;while(A--){if(C[A]!==C[0]){return false}}y[B]=C[0];return true}function z(C,B,A,D){if(!t(B)){return}if(!t(A)){return}if(!t(D)){return}y[C]=y[B]+" "+y[A]+" "+y[D];delete y[B];delete y[A];delete y[D]}function s(A){q=true;return a[A]}function i(B,A){if(q){B=B.replace(/\uFEFF[0-9]/g,function(C){return a[C]})}if(!A){B=B.replace(/\\([\'\";:])/g,"$1")}return B}if(r){r=r.replace(/\\[\"\';:\uFEFF]/g,s).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(A){return A.replace(/[;:]/g,s)});while(p=b.exec(r)){n=p[1].replace(l,"").toLowerCase();v=p[2].replace(l,"");if(n&&v.length>0){if(n==="font-weight"&&v==="700"){v="bold"}else{if(n==="color"||n==="background-color"){v=v.toLowerCase()}}v=v.replace(k,c);v=v.replace(h,function(B,A,E,D,F,C){F=F||C;if(F){F=i(F);return"'"+F.replace(/\'/g,"\\'")+"'"}A=i(A||E||D);if(u){A=u.call(x,A,"style")}return"url('"+A.replace(/\'/g,"\\'")+"')"});y[n]=q?i(v,true):v}b.lastIndex=p.index+p[0].length}o("border","");o("border","-width");o("border","-color");o("border","-style");o("padding","");o("margin","");z("border","border-width","border-style","border-color");if(y.border==="medium none"){delete y.border}}return y},serialize:function(p,r){var o="",n,q;function i(t){var x,u,s,v;x=f.styles[t];if(x){for(u=0,s=x.length;u<s;u++){t=x[u];v=p[t];if(v!==e&&v.length>0){o+=(o.length>0?" ":"")+t+": "+v+";"}}}}if(r&&f&&f.styles){i("*");i(r)}else{for(n in p){q=p[n];if(q!==e&&q.length>0){o+=(o.length>0?" ":"")+n+": "+q+";"}}}return o}}};(function(m){var h={},j,l,g,f,c={},b,e,d=m.makeMap,k=m.each;function i(o,n){return o.split(n||",")}function a(r,q){var o,p={};function n(s){return s.replace(/[A-Z]+/g,function(t){return n(r[t])})}for(o in r){if(r.hasOwnProperty(o)){r[o]=n(r[o])}}n(q).replace(/#/g,"#text").replace(/(\w+)\[([^\]]+)\]\[([^\]]*)\]/g,function(v,t,s,u){s=i(s,"|");p[t]={attributes:d(s),attributesOrder:s,children:d(u,"|",{"#comment":{}})}});return p}l="h1,h2,h3,h4,h5,h6,hr,p,div,address,pre,form,table,tbody,thead,tfoot,th,tr,td,li,ol,ul,caption,blockquote,center,dl,dt,dd,dir,fieldset,noscript,menu,isindex,samp,header,footer,article,section,hgroup";l=d(l,",",d(l.toUpperCase()));h=a({Z:"H|K|N|O|P",Y:"X|form|R|Q",ZG:"E|span|width|align|char|charoff|valign",X:"p|T|div|U|W|isindex|fieldset|table",ZF:"E|align|char|charoff|valign",W:"pre|hr|blockquote|address|center|noframes",ZE:"abbr|axis|headers|scope|rowspan|colspan|align|char|charoff|valign|nowrap|bgcolor|width|height",ZD:"[E][S]",U:"ul|ol|dl|menu|dir",ZC:"p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q",T:"h1|h2|h3|h4|h5|h6",ZB:"X|S|Q",S:"R|P",ZA:"a|G|J|M|O|P",R:"a|H|K|N|O",Q:"noscript|P",P:"ins|del|script",O:"input|select|textarea|label|button",N:"M|L",M:"em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym",L:"sub|sup",K:"J|I",J:"tt|i|b|u|s|strike",I:"big|small|font|basefont",H:"G|F",G:"br|span|bdo",F:"object|applet|img|map|iframe",E:"A|B|C",D:"accesskey|tabindex|onfocus|onblur",C:"onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup",B:"lang|xml:lang|dir",A:"id|class|style|title"},"script[id|charset|type|language|src|defer|xml:space][]style[B|id|type|media|title|xml:space][]object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]param[id|name|value|valuetype|type][]p[E|align][#|S]a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]br[A|clear][]span[E][#|S]bdo[A|C|B][#|S]applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]h1[E|align][#|S]img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]map[B|C|A|name][X|form|Q|area]h2[E|align][#|S]iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]h3[E|align][#|S]tt[E][#|S]i[E][#|S]b[E][#|S]u[E][#|S]s[E][#|S]strike[E][#|S]big[E][#|S]small[E][#|S]font[A|B|size|color|face][#|S]basefont[id|size|color|face][]em[E][#|S]strong[E][#|S]dfn[E][#|S]code[E][#|S]q[E|cite][#|S]samp[E][#|S]kbd[E][#|S]var[E][#|S]cite[E][#|S]abbr[E][#|S]acronym[E][#|S]sub[E][#|S]sup[E][#|S]input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]optgroup[E|disabled|label][option]option[E|selected|disabled|label|value][]textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]label[E|for|accesskey|onfocus|onblur][#|S]button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]h4[E|align][#|S]ins[E|cite|datetime][#|Y]h5[E|align][#|S]del[E|cite|datetime][#|Y]h6[E|align][#|S]div[E|align][#|Y]ul[E|type|compact][li]li[E|type|value][#|Y]ol[E|type|compact|start][li]dl[E|compact][dt|dd]dt[E][#|S]dd[E][#|Y]menu[E|compact][li]dir[E|compact][li]pre[E|width|xml:space][#|ZA]hr[E|align|noshade|size|width][]blockquote[E|cite][#|Y]address[E][#|S|p]center[E][#|Y]noframes[E][#|Y]isindex[A|B|prompt][]fieldset[E][#|legend|Y]legend[E|accesskey|align][#|S]table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]caption[E|align][#|S]col[ZG][]colgroup[ZG][col]thead[ZF][tr]tr[ZF|bgcolor][th|td]th[E|ZE][#|Y]form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]noscript[E][#|Y]td[E|ZE][#|Y]tfoot[ZF][tr]tbody[ZF][tr]area[E|D|shape|coords|href|nohref|alt|target][]base[id|href|target][]body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]");j=d("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected,autoplay,loop,controls");g=d("area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed,source");f=m.extend(d("td,th,iframe,video,audio,object"),g);b=d("pre,script,style,textarea");e=d("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");m.html.Schema=function(r){var A=this,n={},o={},y=[],q,p;r=r||{};if(r.verify_html===false){r.valid_elements="*[*]"}if(r.valid_styles){q={};k(r.valid_styles,function(C,B){q[B]=m.explode(C)})}p=r.whitespace_elements?d(r.whitespace_elements):b;function z(B){return new RegExp("^"+B.replace(/([?+*])/g,".$1")+"$")}function t(I){var H,D,W,S,X,C,F,R,U,N,V,Z,L,G,T,B,P,E,Y,aa,M,Q,K=/^([#+-])?([^\[\/]+)(?:\/([^\[]+))?(?:\[([^\]]+)\])?$/,O=/^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,J=/[*?+]/;if(I){I=i(I);if(n["@"]){P=n["@"].attributes;E=n["@"].attributesOrder}for(H=0,D=I.length;H<D;H++){C=K.exec(I[H]);if(C){T=C[1];N=C[2];B=C[3];U=C[4];L={};G=[];F={attributes:L,attributesOrder:G};if(T==="#"){F.paddEmpty=true}if(T==="-"){F.removeEmpty=true}if(P){for(aa in P){L[aa]=P[aa]}G.push.apply(G,E)}if(U){U=i(U,"|");for(W=0,S=U.length;W<S;W++){C=O.exec(U[W]);if(C){R={};Z=C[1];V=C[2].replace(/::/g,":");T=C[3];Q=C[4];if(Z==="!"){F.attributesRequired=F.attributesRequired||[];F.attributesRequired.push(V);R.required=true}if(Z==="-"){delete L[V];G.splice(m.inArray(G,V),1);continue}if(T){if(T==="="){F.attributesDefault=F.attributesDefault||[];F.attributesDefault.push({name:V,value:Q});R.defaultValue=Q}if(T===":"){F.attributesForced=F.attributesForced||[];F.attributesForced.push({name:V,value:Q});R.forcedValue=Q}if(T==="<"){R.validValues=d(Q,"?")}}if(J.test(V)){F.attributePatterns=F.attributePatterns||[];R.pattern=z(V);F.attributePatterns.push(R)}else{if(!L[V]){G.push(V)}L[V]=R}}}}if(!P&&N=="@"){P=L;E=G}if(B){F.outputName=N;n[B]=F}if(J.test(N)){F.pattern=z(N);y.push(F)}else{n[N]=F}}}}}function v(B){n={};y=[];t(B);k(h,function(D,C){o[C]=D.children})}function s(C){var B=/^(~)?(.+)$/;if(C){k(i(C),function(G){var E=B.exec(G),F=E[1]==="~",H=F?"span":"div",D=E[2];o[D]=o[H];c[D]=H;if(!F){l[D]={}}k(o,function(I,J){if(I[H]){I[D]=I[H]}})})}}function u(C){var B=/^([+\-]?)(\w+)\[([^\]]+)\]$/;if(C){k(i(C),function(G){var F=B.exec(G),D,E;if(F){E=F[1];if(E){D=o[F[2]]}else{D=o[F[2]]={"#comment":{}}}D=o[F[2]];k(i(F[3],"|"),function(H){if(E==="-"){delete D[H]}else{D[H]={}}})}})}}function x(B){var D=n[B],C;if(D){return D}C=y.length;while(C--){D=y[C];if(D.pattern.test(B)){return D}}}if(!r.valid_elements){k(h,function(C,B){n[B]={attributes:C.attributes,attributesOrder:C.attributesOrder};o[B]=C.children});k(i("strong/b,em/i"),function(B){B=i(B,"/");n[B[1]].outputName=B[0]});n.img.attributesDefault=[{name:"alt",value:""}];k(i("ol,ul,sub,sup,blockquote,span,font,a,table,tbody,tr"),function(B){n[B].removeEmpty=true});k(i("p,h1,h2,h3,h4,h5,h6,th,td,pre,div,address,caption"),function(B){n[B].paddEmpty=true})}else{v(r.valid_elements)}s(r.custom_elements);u(r.valid_children);t(r.extended_valid_elements);u("+ol[ul|ol],+ul[ul|ol]");if(!x("span")){t("span[!data-mce-type|*]")}if(r.invalid_elements){m.each(m.explode(r.invalid_elements),function(B){if(n[B]){delete n[B]}})}A.children=o;A.styles=q;A.getBoolAttrs=function(){return j};A.getBlockElements=function(){return l};A.getShortEndedElements=function(){return g};A.getSelfClosingElements=function(){return e};A.getNonEmptyElements=function(){return f};A.getWhiteSpaceElements=function(){return p};A.isValidChild=function(B,D){var C=o[B];return !!(C&&C[D])};A.getElementRule=x;A.getCustomElements=function(){return c};A.addValidElements=t;A.setValidElements=v;A.addCustomElements=s;A.addValidChildren=u};m.html.Schema.boolAttrMap=j;m.html.Schema.blockElementsMap=l})(tinymce);(function(a){a.html.SaxParser=function(c,e){var b=this,d=function(){};c=c||{};b.schema=e=e||new a.html.Schema();if(c.fix_self_closing!==false){c.fix_self_closing=true}a.each("comment cdata text start end pi doctype".split(" "),function(f){if(f){b[f]=c[f]||d}});b.parse=function(D){var n=this,g,F=0,H,A,z=[],M,P,B,q,y,r,L,G,N,u,m,k,s,Q,o,O,E,R,K,f,I,l,C,J,h,v=0,j=a.html.Entities.decode,x,p;function t(S){var U,T;U=z.length;while(U--){if(z[U].name===S){break}}if(U>=0){for(T=z.length-1;T>=U;T--){S=z[T];if(S.valid){n.end(S.name)}}z.length=U}}l=new RegExp("<(?:(?:!--([\\w\\W]*?)-->)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:!DOCTYPE([\\w\\W]*?)>)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([^>]+)>)|(?:([^\\s\\/<>]+)((?:\\s+[^\"'>]+(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>]*))*|\\/)>))","g");C=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:\\.|[^\"])*)\")|(?:\'((?:\\.|[^\'])*)\')|([^>\s]+)))?/g;J={script:/<\/script[^>]*>/gi,style:/<\/style[^>]*>/gi,noscript:/<\/noscript[^>]*>/gi};L=e.getShortEndedElements();I=e.getSelfClosingElements();G=e.getBoolAttrs();u=c.validate;r=c.remove_internals;x=c.fix_self_closing;p=a.isIE;o=/^:/;while(g=l.exec(D)){if(F<g.index){n.text(j(D.substr(F,g.index-F)))}if(H=g[6]){H=H.toLowerCase();if(p&&o.test(H)){H=H.substr(1)}t(H)}else{if(H=g[7]){H=H.toLowerCase();if(p&&o.test(H)){H=H.substr(1)}N=H in L;if(x&&I[H]&&z.length>0&&z[z.length-1].name===H){t(H)}if(!u||(m=e.getElementRule(H))){k=true;if(u){O=m.attributes;E=m.attributePatterns}if(Q=g[8]){y=Q.indexOf("data-mce-type")!==-1;if(y&&r){k=false}M=[];M.map={};Q.replace(C,function(T,S,X,W,V){var Y,U;S=S.toLowerCase();X=S in G?S:j(X||W||V||"");if(u&&!y&&S.indexOf("data-")!==0){Y=O[S];if(!Y&&E){U=E.length;while(U--){Y=E[U];if(Y.pattern.test(S)){break}}if(U===-1){Y=null}}if(!Y){return}if(Y.validValues&&!(X in Y.validValues)){return}}M.map[S]=X;M.push({name:S,value:X})})}else{M=[];M.map={}}if(u&&!y){R=m.attributesRequired;K=m.attributesDefault;f=m.attributesForced;if(f){P=f.length;while(P--){s=f[P];q=s.name;h=s.value;if(h==="{$uid}"){h="mce_"+v++}M.map[q]=h;M.push({name:q,value:h})}}if(K){P=K.length;while(P--){s=K[P];q=s.name;if(!(q in M.map)){h=s.value;if(h==="{$uid}"){h="mce_"+v++}M.map[q]=h;M.push({name:q,value:h})}}}if(R){P=R.length;while(P--){if(R[P] in M.map){break}}if(P===-1){k=false}}if(M.map["data-mce-bogus"]){k=false}}if(k){n.start(H,M,N)}}else{k=false}if(A=J[H]){A.lastIndex=F=g.index+g[0].length;if(g=A.exec(D)){if(k){B=D.substr(F,g.index-F)}F=g.index+g[0].length}else{B=D.substr(F);F=D.length}if(k&&B.length>0){n.text(B,true)}if(k){n.end(H)}l.lastIndex=F;continue}if(!N){if(!Q||Q.indexOf("/")!=Q.length-1){z.push({name:H,valid:k})}else{if(k){n.end(H)}}}}else{if(H=g[1]){n.comment(H)}else{if(H=g[2]){n.cdata(H)}else{if(H=g[3]){n.doctype(H)}else{if(H=g[4]){n.pi(H,g[5])}}}}}}F=g.index+g[0].length}if(F<D.length){n.text(j(D.substr(F)))}for(P=z.length-1;P>=0;P--){H=z[P];if(H.valid){n.end(H.name)}}}}})(tinymce);(function(d){var c=/^[ \t\r\n]*$/,e={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11};function a(k,l,j){var i,h,f=j?"lastChild":"firstChild",g=j?"prev":"next";if(k[f]){return k[f]}if(k!==l){i=k[g];if(i){return i}for(h=k.parent;h&&h!==l;h=h.parent){i=h[g];if(i){return i}}}}function b(f,g){this.name=f;this.type=g;if(g===1){this.attributes=[];this.attributes.map={}}}d.extend(b.prototype,{replace:function(g){var f=this;if(g.parent){g.remove()}f.insert(g,f);f.remove();return f},attr:function(h,l){var f=this,g,j,k;if(typeof h!=="string"){for(j in h){f.attr(j,h[j])}return f}if(g=f.attributes){if(l!==k){if(l===null){if(h in g.map){delete g.map[h];j=g.length;while(j--){if(g[j].name===h){g=g.splice(j,1);return f}}}return f}if(h in g.map){j=g.length;while(j--){if(g[j].name===h){g[j].value=l;break}}}else{g.push({name:h,value:l})}g.map[h]=l;return f}else{return g.map[h]}}},clone:function(){var g=this,n=new b(g.name,g.type),h,f,m,j,k;if(m=g.attributes){k=[];k.map={};for(h=0,f=m.length;h<f;h++){j=m[h];if(j.name!=="id"){k[k.length]={name:j.name,value:j.value};k.map[j.name]=j.value}}n.attributes=k}n.value=g.value;n.shortEnded=g.shortEnded;return n},wrap:function(g){var f=this;f.parent.insert(g,f);g.append(f);return f},unwrap:function(){var f=this,h,g;for(h=f.firstChild;h;){g=h.next;f.insert(h,f,true);h=g}f.remove()},remove:function(){var f=this,h=f.parent,g=f.next,i=f.prev;if(h){if(h.firstChild===f){h.firstChild=g;if(g){g.prev=null}}else{i.next=g}if(h.lastChild===f){h.lastChild=i;if(i){i.next=null}}else{g.prev=i}f.parent=f.next=f.prev=null}return f},append:function(h){var f=this,g;if(h.parent){h.remove()}g=f.lastChild;if(g){g.next=h;h.prev=g;f.lastChild=h}else{f.lastChild=f.firstChild=h}h.parent=f;return h},insert:function(h,f,i){var g;if(h.parent){h.remove()}g=f.parent||this;if(i){if(f===g.firstChild){g.firstChild=h}else{f.prev.next=h}h.prev=f.prev;h.next=f;f.prev=h}else{if(f===g.lastChild){g.lastChild=h}else{f.next.prev=h}h.next=f.next;h.prev=f;f.next=h}h.parent=g;return h},getAll:function(g){var f=this,h,i=[];for(h=f.firstChild;h;h=a(h,f)){if(h.name===g){i.push(h)}}return i},empty:function(){var g=this,f,h,j;if(g.firstChild){f=[];for(j=g.firstChild;j;j=a(j,g)){f.push(j)}h=f.length;while(h--){j=f[h];j.parent=j.firstChild=j.lastChild=j.next=j.prev=null}}g.firstChild=g.lastChild=null;return g},isEmpty:function(k){var f=this,j=f.firstChild,h,g;if(j){do{if(j.type===1){if(j.attributes.map["data-mce-bogus"]){continue}if(k[j.name]){return false}h=j.attributes.length;while(h--){g=j.attributes[h].name;if(g==="name"||g.indexOf("data-")===0){return false}}}if((j.type===3&&!c.test(j.value))){return false}}while(j=a(j,f))}return true},walk:function(f){return a(this,null,f)}});d.extend(b,{create:function(g,f){var i,h;i=new b(g,e[g]||1);if(f){for(h in f){i.attr(h,f[h])}}return i}});d.html.Node=b})(tinymce);(function(b){var a=b.html.Node;b.html.DomParser=function(g,h){var f=this,e={},d=[],i={},c={};g=g||{};g.validate="validate" in g?g.validate:true;g.root_name=g.root_name||"body";f.schema=h=h||new b.html.Schema();function j(m){var o,p,x,v,z,n,q,l,t,u,k,s,y,r;s=b.makeMap("tr,td,th,tbody,thead,tfoot,table");k=h.getNonEmptyElements();for(o=0;o<m.length;o++){p=m[o];if(!p.parent){continue}v=[p];for(x=p.parent;x&&!h.isValidChild(x.name,p.name)&&!s[x.name];x=x.parent){v.push(x)}if(x&&v.length>1){v.reverse();z=n=f.filterNode(v[0].clone());for(t=0;t<v.length-1;t++){if(h.isValidChild(n.name,v[t].name)){q=f.filterNode(v[t].clone());n.append(q)}else{q=n}for(l=v[t].firstChild;l&&l!=v[t+1];){r=l.next;q.append(l);l=r}n=q}if(!z.isEmpty(k)){x.insert(z,v[0],true);x.insert(p,z)}else{x.insert(p,v[0],true)}x=v[0];if(x.isEmpty(k)||x.firstChild===x.lastChild&&x.firstChild.name==="br"){x.empty().remove()}}else{if(p.parent){if(p.name==="li"){y=p.prev;if(y&&(y.name==="ul"||y.name==="ul")){y.append(p);continue}y=p.next;if(y&&(y.name==="ul"||y.name==="ul")){y.insert(p,y.firstChild,true);continue}p.wrap(f.filterNode(new a("ul",1)));continue}if(h.isValidChild(p.parent.name,"div")&&h.isValidChild("div",p.name)){p.wrap(f.filterNode(new a("div",1)))}else{if(p.name==="style"||p.name==="script"){p.empty().remove()}else{p.unwrap()}}}}}}f.filterNode=function(m){var l,k,n;if(k in e){n=i[k];if(n){n.push(m)}else{i[k]=[m]}}l=d.length;while(l--){k=d[l].name;if(k in m.attributes.map){n=c[k];if(n){n.push(m)}else{c[k]=[m]}}}return m};f.addNodeFilter=function(k,l){b.each(b.explode(k),function(m){var n=e[m];if(!n){e[m]=n=[]}n.push(l)})};f.addAttributeFilter=function(k,l){b.each(b.explode(k),function(m){var n;for(n=0;n<d.length;n++){if(d[n].name===m){d[n].callbacks.push(l);return}}d.push({name:m,callbacks:[l]})})};f.parse=function(v,m){var n,H,A,z,C,B,x,r,E,K,y,o,D,J=[],t,k,s,p,u,q;m=m||{};i={};c={};o=b.extend(b.makeMap("script,style,head,html,body,title,meta,param"),h.getBlockElements());u=h.getNonEmptyElements();p=h.children;y=g.validate;q="forced_root_block" in m?m.forced_root_block:g.forced_root_block;s=h.getWhiteSpaceElements();D=/^[ \t\r\n]+/;t=/[ \t\r\n]+$/;k=/[ \t\r\n]+/g;function F(){var L=H.firstChild,l,M;while(L){l=L.next;if(L.type==3||(L.type==1&&L.name!=="p"&&!o[L.name]&&!L.attr("data-mce-type"))){if(!M){M=I(q,1);H.insert(M,L);M.append(L)}else{M.append(L)}}else{M=null}L=l}}function I(l,L){var M=new a(l,L),N;if(l in e){N=i[l];if(N){N.push(M)}else{i[l]=[M]}}return M}function G(M){var N,l,L;for(N=M.prev;N&&N.type===3;){l=N.value.replace(t,"");if(l.length>0){N.value=l;N=N.prev}else{L=N.prev;N.remove();N=L}}}n=new b.html.SaxParser({validate:y,fix_self_closing:!y,cdata:function(l){A.append(I("#cdata",4)).value=l},text:function(M,l){var L;if(!s[A.name]){M=M.replace(k," ");if(A.lastChild&&o[A.lastChild.name]){M=M.replace(D,"")}}if(M.length!==0){L=I("#text",3);L.raw=!!l;A.append(L).value=M}},comment:function(l){A.append(I("#comment",8)).value=l},pi:function(l,L){A.append(I(l,7)).value=L;G(A)},doctype:function(L){var l;l=A.append(I("#doctype",10));l.value=L;G(A)},start:function(l,T,M){var R,O,N,L,P,U,S,Q;N=y?h.getElementRule(l):{};if(N){R=I(N.outputName||l,1);R.attributes=T;R.shortEnded=M;A.append(R);Q=p[A.name];if(Q&&p[R.name]&&!Q[R.name]){J.push(R)}O=d.length;while(O--){P=d[O].name;if(P in T.map){E=c[P];if(E){E.push(R)}else{c[P]=[R]}}}if(o[l]){G(R)}if(!M){A=R}}},end:function(l){var P,M,O,L,N;M=y?h.getElementRule(l):{};if(M){if(o[l]){if(!s[A.name]){for(P=A.firstChild;P&&P.type===3;){O=P.value.replace(D,"");if(O.length>0){P.value=O;P=P.next}else{L=P.next;P.remove();P=L}}for(P=A.lastChild;P&&P.type===3;){O=P.value.replace(t,"");if(O.length>0){P.value=O;P=P.prev}else{L=P.prev;P.remove();P=L}}}P=A.prev;if(P&&P.type===3){O=P.value.replace(D,"");if(O.length>0){P.value=O}else{P.remove()}}}if(M.removeEmpty||M.paddEmpty){if(A.isEmpty(u)){if(M.paddEmpty){A.empty().append(new a("#text","3")).value="\u00a0"}else{if(!A.attributes.map.name){N=A.parent;A.empty().remove();A=N;return}}}}A=A.parent}}},h);H=A=new a(m.context||g.root_name,11);n.parse(v);if(y&&J.length){if(!m.context){j(J)}else{m.invalid=true}}if(q&&H.name=="body"){F()}if(!m.invalid){for(K in i){E=e[K];z=i[K];x=z.length;while(x--){if(!z[x].parent){z.splice(x,1)}}for(C=0,B=E.length;C<B;C++){E[C](z,K,m)}}for(C=0,B=d.length;C<B;C++){E=d[C];if(E.name in c){z=c[E.name];x=z.length;while(x--){if(!z[x].parent){z.splice(x,1)}}for(x=0,r=E.callbacks.length;x<r;x++){E.callbacks[x](z,E.name,m)}}}}return H};if(g.remove_trailing_brs){f.addNodeFilter("br",function(n,m){var r,q=n.length,o,u=h.getBlockElements(),k=h.getNonEmptyElements(),s,p,t;u.body=1;for(r=0;r<q;r++){o=n[r];s=o.parent;if(u[o.parent.name]&&o===s.lastChild){p=o.prev;while(p){t=p.name;if(t!=="span"||p.attr("data-mce-type")!=="bookmark"){if(t!=="br"){break}if(t==="br"){o=null;break}}p=p.prev}if(o){o.remove();if(s.isEmpty(k)){elementRule=h.getElementRule(s.name);if(elementRule){if(elementRule.removeEmpty){s.remove()}else{if(elementRule.paddEmpty){s.empty().append(new b.html.Node("#text",3)).value="\u00a0"}}}}}}}})}}})(tinymce);tinymce.html.Writer=function(e){var c=[],a,b,d,f,g;e=e||{};a=e.indent;b=tinymce.makeMap(e.indent_before||"");d=tinymce.makeMap(e.indent_after||"");f=tinymce.html.Entities.getEncodeFunc(e.entity_encoding||"raw",e.entities);g=e.element_format=="html";return{start:function(m,k,p){var n,j,h,o;if(a&&b[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}c.push("<",m);if(k){for(n=0,j=k.length;n<j;n++){h=k[n];c.push(" ",h.name,'="',f(h.value,true),'"')}}if(!p||g){c[c.length]=">"}else{c[c.length]=" />"}if(p&&a&&d[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}},end:function(h){var i;c.push("</",h,">");if(a&&d[h]&&c.length>0){i=c[c.length-1];if(i.length>0&&i!=="\n"){c.push("\n")}}},text:function(i,h){if(i.length>0){c[c.length]=h?i:f(i)}},cdata:function(h){c.push("<![CDATA[",h,"]]>")},comment:function(h){c.push("<!--",h,"-->")},pi:function(h,i){if(i){c.push("<?",h," ",i,"?>")}else{c.push("<?",h,"?>")}if(a){c.push("\n")}},doctype:function(h){c.push("<!DOCTYPE",h,">",a?"\n":"")},reset:function(){c.length=0},getContent:function(){return c.join("").replace(/\n$/,"")}}};(function(a){a.html.Serializer=function(c,d){var b=this,e=new a.html.Writer(c);c=c||{};c.validate="validate" in c?c.validate:true;b.schema=d=d||new a.html.Schema();b.writer=e;b.serialize=function(h){var g,i;i=c.validate;g={3:function(k,j){e.text(k.value,k.raw)},8:function(j){e.comment(j.value)},7:function(j){e.pi(j.name,j.value)},10:function(j){e.doctype(j.value)},4:function(j){e.cdata(j.value)},11:function(j){if((j=j.firstChild)){do{f(j)}while(j=j.next)}}};e.reset();function f(k){var t=g[k.type],j,o,s,r,p,u,n,m,q;if(!t){j=k.name;o=k.shortEnded;s=k.attributes;if(i&&s&&s.length>1){u=[];u.map={};q=d.getElementRule(k.name);for(n=0,m=q.attributesOrder.length;n<m;n++){r=q.attributesOrder[n];if(r in s.map){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}for(n=0,m=s.length;n<m;n++){r=s[n].name;if(!(r in u.map)){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}s=u}e.start(k.name,s,o);if(!o){if((k=k.firstChild)){do{f(k)}while(k=k.next)}e.end(j)}}else{t(k)}}if(h.type==1&&!c.inner){f(h)}else{g[11](h)}return e.getContent()}}})(tinymce);(function(h){var f=h.each,e=h.is,d=h.isWebKit,b=h.isIE,c=h.html.Entities,a=/^([a-z0-9],?)+$/i,g=h.html.Schema.blockElementsMap,i=/^[ \t\r\n]*$/;h.create("tinymce.dom.DOMUtils",{doc:null,root:null,files:null,pixelStyles:/^(top|left|bottom|right|width|height|borderWidth)$/,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"},DOMUtils:function(o,m){var l=this,j,k;l.doc=o;l.win=window;l.files={};l.cssFlicker=false;l.counter=0;l.stdMode=!h.isIE||o.documentMode>=8;l.boxModel=!h.isIE||o.compatMode=="CSS1Compat"||l.stdMode;l.hasOuterHTML="outerHTML" in o.createElement("a");l.settings=m=h.extend({keep_values:false,hex_colors:1},m);l.schema=m.schema;l.styles=new h.html.Styles({url_converter:m.url_converter,url_converter_scope:m.url_converter_scope},m.schema);if(h.isIE6){try{o.execCommand("BackgroundImageCache",false,true)}catch(n){l.cssFlicker=true}}if(b&&m.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(p){o.createElement(p)});for(k in m.schema.getCustomElements()){o.createElement(k)}}h.addUnload(l.destroy,l)},getRoot:function(){var j=this,k=j.settings;return(k&&j.get(k.root_element))||j.doc.body},getViewPort:function(k){var l,j;k=!k?this.win:k;l=k.document;j=this.boxModel?l.documentElement:l.body;return{x:k.pageXOffset||j.scrollLeft,y:k.pageYOffset||j.scrollTop,w:k.innerWidth||j.clientWidth,h:k.innerHeight||j.clientHeight}},getRect:function(m){var l,j=this,k;m=j.get(m);l=j.getPos(m);k=j.getSize(m);return{x:l.x,y:l.y,w:k.w,h:k.h}},getSize:function(m){var k=this,j,l;m=k.get(m);j=k.getStyle(m,"width");l=k.getStyle(m,"height");if(j.indexOf("px")===-1){j=0}if(l.indexOf("px")===-1){l=0}return{w:parseInt(j)||m.offsetWidth||m.clientWidth,h:parseInt(l)||m.offsetHeight||m.clientHeight}},getParent:function(l,k,j){return this.getParents(l,k,j,false)},getParents:function(u,p,l,s){var k=this,j,m=k.settings,q=[];u=k.get(u);s=s===undefined;if(m.strict_root){l=l||k.getRoot()}if(e(p,"string")){j=p;if(p==="*"){p=function(o){return o.nodeType==1}}else{p=function(o){return k.is(o,j)}}}while(u){if(u==l||!u.nodeType||u.nodeType===9){break}if(!p||p(u)){if(s){q.push(u)}else{return u}}u=u.parentNode}return s?q:null},get:function(j){var k;if(j&&this.doc&&typeof(j)=="string"){k=j;j=this.doc.getElementById(j);if(j&&j.id!==k){return this.doc.getElementsByName(k)[1]}}return j},getNext:function(k,j){return this._findSib(k,j,"nextSibling")},getPrev:function(k,j){return this._findSib(k,j,"previousSibling")},select:function(l,k){var j=this;return h.dom.Sizzle(l,j.get(k)||j.get(j.settings.root_element)||j.doc,[])},is:function(l,j){var k;if(l.length===undefined){if(j==="*"){return l.nodeType==1}if(a.test(j)){j=j.toLowerCase().split(/,/);l=l.nodeName.toLowerCase();for(k=j.length-1;k>=0;k--){if(j[k]==l){return true}}return false}}return h.dom.Sizzle.matches(j,l.nodeType?[l]:l).length>0},add:function(m,q,j,l,o){var k=this;return this.run(m,function(s){var r,n;r=e(q,"string")?k.doc.createElement(q):q;k.setAttribs(r,j);if(l){if(l.nodeType){r.appendChild(l)}else{k.setHTML(r,l)}}return !o?s.appendChild(r):r})},create:function(l,j,k){return this.add(this.doc.createElement(l),l,j,k,1)},createHTML:function(r,j,p){var q="",m=this,l;q+="<"+r;for(l in j){if(j.hasOwnProperty(l)){q+=" "+l+'="'+m.encode(j[l])+'"'}}if(typeof(p)!="undefined"){return q+">"+p+"</"+r+">"}return q+" />"},remove:function(j,k){return this.run(j,function(m){var n,l=m.parentNode;if(!l){return null}if(k){while(n=m.firstChild){if(!h.isIE||n.nodeType!==3||n.nodeValue){l.insertBefore(n,m)}else{m.removeChild(n)}}}return l.removeChild(m)})},setStyle:function(m,j,k){var l=this;return l.run(m,function(p){var o,n;o=p.style;j=j.replace(/-(\D)/g,function(r,q){return q.toUpperCase()});if(l.pixelStyles.test(j)&&(h.is(k,"number")||/^[\-0-9\.]+$/.test(k))){k+="px"}switch(j){case"opacity":if(b){o.filter=k===""?"":"alpha(opacity="+(k*100)+")";if(!m.currentStyle||!m.currentStyle.hasLayout){o.display="inline-block"}}o[j]=o["-moz-opacity"]=o["-khtml-opacity"]=k||"";break;case"float":b?o.styleFloat=k:o.cssFloat=k;break;default:o[j]=k||""}if(l.settings.update_styles){l.setAttrib(p,"data-mce-style")}})},getStyle:function(m,j,l){m=this.get(m);if(!m){return}if(this.doc.defaultView&&l){j=j.replace(/[A-Z]/g,function(n){return"-"+n});try{return this.doc.defaultView.getComputedStyle(m,null).getPropertyValue(j)}catch(k){return null}}j=j.replace(/-(\D)/g,function(o,n){return n.toUpperCase()});if(j=="float"){j=b?"styleFloat":"cssFloat"}if(m.currentStyle&&l){return m.currentStyle[j]}return m.style?m.style[j]:undefined},setStyles:function(m,n){var k=this,l=k.settings,j;j=l.update_styles;l.update_styles=0;f(n,function(o,p){k.setStyle(m,p,o)});l.update_styles=j;if(l.update_styles){k.setAttrib(m,l.cssText)}},removeAllAttribs:function(j){return this.run(j,function(m){var l,k=m.attributes;for(l=k.length-1;l>=0;l--){m.removeAttributeNode(k.item(l))}})},setAttrib:function(l,m,j){var k=this;if(!l||!m){return}if(k.settings.strict){m=m.toLowerCase()}return this.run(l,function(o){var n=k.settings;if(j!==null){switch(m){case"style":if(!e(j,"string")){f(j,function(p,q){k.setStyle(o,q,p)});return}if(n.keep_values){if(j&&!k._isRes(j)){o.setAttribute("data-mce-style",j,2)}else{o.removeAttribute("data-mce-style",2)}}o.style.cssText=j;break;case"class":o.className=j||"";break;case"src":case"href":if(n.keep_values){if(n.url_converter){j=n.url_converter.call(n.url_converter_scope||k,j,m,o)}k.setAttrib(o,"data-mce-"+m,j,2)}break;case"shape":o.setAttribute("data-mce-style",j);break}}if(e(j)&&j!==null&&j.length!==0){o.setAttribute(m,""+j,2)}else{o.removeAttribute(m,2)}})},setAttribs:function(k,l){var j=this;return this.run(k,function(m){f(l,function(o,p){j.setAttrib(m,p,o)})})},getAttrib:function(o,p,l){var j,k=this,m;o=k.get(o);if(!o||o.nodeType!==1){return l===m?false:l}if(!e(l)){l=""}if(/^(src|href|style|coords|shape)$/.test(p)){j=o.getAttribute("data-mce-"+p);if(j){return j}}if(b&&k.props[p]){j=o[k.props[p]];j=j&&j.nodeValue?j.nodeValue:j}if(!j){j=o.getAttribute(p,2)}if(/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(p)){if(o[k.props[p]]===true&&j===""){return p}return j?p:""}if(o.nodeName==="FORM"&&o.getAttributeNode(p)){return o.getAttributeNode(p).nodeValue}if(p==="style"){j=j||o.style.cssText;if(j){j=k.serializeStyle(k.parseStyle(j),o.nodeName);if(k.settings.keep_values&&!k._isRes(j)){o.setAttribute("data-mce-style",j)}}}if(d&&p==="class"&&j){j=j.replace(/(apple|webkit)\-[a-z\-]+/gi,"")}if(b){switch(p){case"rowspan":case"colspan":if(j===1){j=""}break;case"size":if(j==="+0"||j===20||j===0){j=""}break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":if(j===0){j=""}break;case"hspace":if(j===-1){j=""}break;case"maxlength":case"tabindex":if(j===32768||j===2147483647||j==="32768"){j=""}break;case"multiple":case"compact":case"noshade":case"nowrap":if(j===65535){return p}return l;case"shape":j=j.toLowerCase();break;default:if(p.indexOf("on")===0&&j){j=h._replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/,"$1",""+j)}}}return(j!==m&&j!==null&&j!=="")?""+j:l},getPos:function(s,m){var k=this,j=0,q=0,o,p=k.doc,l;s=k.get(s);m=m||p.body;if(s){if(s.getBoundingClientRect){s=s.getBoundingClientRect();o=k.boxModel?p.documentElement:p.body;j=s.left+(p.documentElement.scrollLeft||p.body.scrollLeft)-o.clientTop;q=s.top+(p.documentElement.scrollTop||p.body.scrollTop)-o.clientLeft;return{x:j,y:q}}l=s;while(l&&l!=m&&l.nodeType){j+=l.offsetLeft||0;q+=l.offsetTop||0;l=l.offsetParent}l=s.parentNode;while(l&&l!=m&&l.nodeType){j-=l.scrollLeft||0;q-=l.scrollTop||0;l=l.parentNode}}return{x:j,y:q}},parseStyle:function(j){return this.styles.parse(j)},serializeStyle:function(k,j){return this.styles.serialize(k,j)},loadCSS:function(j){var l=this,m=l.doc,k;if(!j){j=""}k=l.select("head")[0];f(j.split(","),function(n){var o;if(l.files[n]){return}l.files[n]=true;o=l.create("link",{rel:"stylesheet",href:h._addVer(n)});if(b&&m.documentMode&&m.recalc){o.onload=function(){if(m.recalc){m.recalc()}o.onload=null}}k.appendChild(o)})},addClass:function(j,k){return this.run(j,function(l){var m;if(!k){return 0}if(this.hasClass(l,k)){return l.className}m=this.removeClass(l,k);return l.className=(m!=""?(m+" "):"")+k})},removeClass:function(l,m){var j=this,k;return j.run(l,function(o){var n;if(j.hasClass(o,m)){if(!k){k=new RegExp("(^|\\s+)"+m+"(\\s+|$)","g")}n=o.className.replace(k," ");n=h.trim(n!=" "?n:"");o.className=n;if(!n){o.removeAttribute("class");o.removeAttribute("className")}return n}return o.className})},hasClass:function(k,j){k=this.get(k);if(!k||!j){return false}return(" "+k.className+" ").indexOf(" "+j+" ")!==-1},show:function(j){return this.setStyle(j,"display","block")},hide:function(j){return this.setStyle(j,"display","none")},isHidden:function(j){j=this.get(j);return !j||j.style.display=="none"||this.getStyle(j,"display")=="none"},uniqueId:function(j){return(!j?"mce_":j)+(this.counter++)},setHTML:function(l,k){var j=this;return j.run(l,function(n){if(b){while(n.firstChild){n.removeChild(n.firstChild)}try{n.innerHTML="<br />"+k;n.removeChild(n.firstChild)}catch(m){n=j.create("div");n.innerHTML="<br />"+k;f(n.childNodes,function(p,o){if(o){n.appendChild(p)}})}}else{n.innerHTML=k}return k})},getOuterHTML:function(l){var k,j=this;l=j.get(l);if(!l){return null}if(l.nodeType===1&&j.hasOuterHTML){return l.outerHTML}k=(l.ownerDocument||j.doc).createElement("body");k.appendChild(l.cloneNode(true));return k.innerHTML},setOuterHTML:function(m,k,n){var j=this;function l(p,o,r){var s,q;q=r.createElement("body");q.innerHTML=o;s=q.lastChild;while(s){j.insertAfter(s.cloneNode(true),p);s=s.previousSibling}j.remove(p)}return this.run(m,function(p){p=j.get(p);if(p.nodeType==1){n=n||p.ownerDocument||j.doc;if(b){try{if(b&&p.nodeType==1){p.outerHTML=k}else{l(p,k,n)}}catch(o){l(p,k,n)}}else{l(p,k,n)}}})},decode:c.decode,encode:c.encodeAllRaw,insertAfter:function(j,k){k=this.get(k);return this.run(j,function(m){var l,n;l=k.parentNode;n=k.nextSibling;if(n){l.insertBefore(m,n)}else{l.appendChild(m)}return m})},isBlock:function(k){var j=k.nodeType;if(j){return !!(j===1&&g[k.nodeName])}return !!g[k]},replace:function(p,m,j){var l=this;if(e(m,"array")){p=p.cloneNode(true)}return l.run(m,function(k){if(j){f(h.grep(k.childNodes),function(n){p.appendChild(n)})}return k.parentNode.replaceChild(p,k)})},rename:function(m,j){var l=this,k;if(m.nodeName!=j.toUpperCase()){k=l.create(j);f(l.getAttribs(m),function(n){l.setAttrib(k,n.nodeName,l.getAttrib(m,n.nodeName))});l.replace(k,m,1)}return k||m},findCommonAncestor:function(l,j){var m=l,k;while(m){k=j;while(k&&m!=k){k=k.parentNode}if(m==k){break}m=m.parentNode}if(!m&&l.ownerDocument){return l.ownerDocument.documentElement}return m},toHex:function(j){var l=/^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(j);function k(m){m=parseInt(m).toString(16);return m.length>1?m:"0"+m}if(l){j="#"+k(l[1])+k(l[2])+k(l[3]);return j}return j},getClasses:function(){var n=this,j=[],m,o={},p=n.settings.class_filter,l;if(n.classes){return n.classes}function q(r){f(r.imports,function(s){q(s)});f(r.cssRules||r.rules,function(s){switch(s.type||1){case 1:if(s.selectorText){f(s.selectorText.split(","),function(t){t=t.replace(/^\s*|\s*$|^\s\./g,"");if(/\.mce/.test(t)||!/\.[\w\-]+$/.test(t)){return}l=t;t=h._replace(/.*\.([a-z0-9_\-]+).*/i,"$1",t);if(p&&!(t=p(t,l))){return}if(!o[t]){j.push({"class":t});o[t]=1}})}break;case 3:q(s.styleSheet);break}})}try{f(n.doc.styleSheets,q)}catch(k){}if(j.length>0){n.classes=j}return j},run:function(m,l,k){var j=this,n;if(j.doc&&typeof(m)==="string"){m=j.get(m)}if(!m){return false}k=k||this;if(!m.nodeType&&(m.length||m.length===0)){n=[];f(m,function(p,o){if(p){if(typeof(p)=="string"){p=j.doc.getElementById(p)}n.push(l.call(k,p,o))}});return n}return l.call(k,m)},getAttribs:function(k){var j;k=this.get(k);if(!k){return[]}if(b){j=[];if(k.nodeName=="OBJECT"){return k.attributes}if(k.nodeName==="OPTION"&&this.getAttrib(k,"selected")){j.push({specified:1,nodeName:"selected"})}k.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi,"").replace(/[\w:\-]+/gi,function(l){j.push({specified:1,nodeName:l})});return j}return k.attributes},isEmpty:function(m,k){var r=this,o,n,q,j,l,p;m=m.firstChild;if(m){j=new h.dom.TreeWalker(m);k=k||r.schema?r.schema.getNonEmptyElements():null;do{q=m.nodeType;if(q===1){if(m.getAttribute("data-mce-bogus")){continue}l=m.nodeName.toLowerCase();if(k&&k[l]){p=m.parentNode;if(l==="br"&&r.isBlock(p)&&p.firstChild===m&&p.lastChild===m){continue}return false}n=r.getAttribs(m);o=m.attributes.length;while(o--){l=m.attributes[o].nodeName;if(l==="name"||l==="data-mce-bookmark"){return false}}}if((q===3&&!i.test(m.nodeValue))){return false}}while(m=j.next())}return true},destroy:function(k){var j=this;if(j.events){j.events.destroy()}j.win=j.doc=j.root=j.events=null;if(!k){h.removeUnload(j.destroy)}},createRng:function(){var j=this.doc;return j.createRange?j.createRange():new h.dom.Range(this)},nodeIndex:function(n,o){var j=0,l,m,k;if(n){for(l=n.nodeType,n=n.previousSibling,m=n;n;n=n.previousSibling){k=n.nodeType;if(o&&k==3){if(k==l||!n.nodeValue.length){continue}}j++;l=k}}return j},split:function(n,m,q){var s=this,j=s.createRng(),o,l,p;function k(v){var t,r=v.childNodes,u=v.nodeType;if(u==1&&v.getAttribute("data-mce-type")=="bookmark"){return}for(t=r.length-1;t>=0;t--){k(r[t])}if(u!=9){if(u==3&&v.nodeValue.length>0){if(!s.isBlock(v.parentNode)||h.trim(v.nodeValue).length>0){return}}else{if(u==1){r=v.childNodes;if(r.length==1&&r[0]&&r[0].nodeType==1&&r[0].getAttribute("data-mce-type")=="bookmark"){v.parentNode.insertBefore(r[0],v)}if(r.length||/^(br|hr|input|img)$/i.test(v.nodeName)){return}}}s.remove(v)}return v}if(n&&m){j.setStart(n.parentNode,s.nodeIndex(n));j.setEnd(m.parentNode,s.nodeIndex(m));o=j.extractContents();j=s.createRng();j.setStart(m.parentNode,s.nodeIndex(m)+1);j.setEnd(n.parentNode,s.nodeIndex(n)+1);l=j.extractContents();p=n.parentNode;p.insertBefore(k(o),n);if(q){p.replaceChild(q,m)}else{p.insertBefore(m,n)}p.insertBefore(k(l),n);s.remove(n);return q||m}},bind:function(n,j,m,l){var k=this;if(!k.events){k.events=new h.dom.EventUtils()}return k.events.add(n,j,m,l||this)},unbind:function(m,j,l){var k=this;if(!k.events){k.events=new h.dom.EventUtils()}return k.events.remove(m,j,l)},_findSib:function(m,j,k){var l=this,n=j;if(m){if(e(n,"string")){n=function(o){return l.is(o,j)}}for(m=m[k];m;m=m[k]){if(n(m)){return m}}}return null},_isRes:function(j){return/^(top|left|bottom|right|width|height)/i.test(j)||/;\s*(top|left|bottom|right|width|height)/i.test(j)}});h.DOM=new h.dom.DOMUtils(document,{process_html:0})})(tinymce);(function(a){function b(c){var N=this,e=c.doc,S=0,E=1,j=2,D=true,R=false,U="startOffset",h="startContainer",P="endContainer",z="endOffset",k=tinymce.extend,n=c.nodeIndex;k(N,{startContainer:e,startOffset:0,endContainer:e,endOffset:0,collapsed:D,commonAncestorContainer:e,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:q,setEnd:s,setStartBefore:g,setStartAfter:I,setEndBefore:J,setEndAfter:u,collapse:A,selectNode:x,selectNodeContents:F,compareBoundaryPoints:v,deleteContents:p,extractContents:H,cloneContents:d,insertNode:C,surroundContents:M,cloneRange:K});function q(V,t){B(D,V,t)}function s(V,t){B(R,V,t)}function g(t){q(t.parentNode,n(t))}function I(t){q(t.parentNode,n(t)+1)}function J(t){s(t.parentNode,n(t))}function u(t){s(t.parentNode,n(t)+1)}function A(t){if(t){N[P]=N[h];N[z]=N[U]}else{N[h]=N[P];N[U]=N[z]}N.collapsed=D}function x(t){g(t);u(t)}function F(t){q(t,0);s(t,t.nodeType===1?t.childNodes.length:t.nodeValue.length)}function v(Y,t){var ab=N[h],W=N[U],aa=N[P],V=N[z],Z=t.startContainer,ad=t.startOffset,X=t.endContainer,ac=t.endOffset;if(Y===0){return G(ab,W,Z,ad)}if(Y===1){return G(aa,V,Z,ad)}if(Y===2){return G(aa,V,X,ac)}if(Y===3){return G(ab,W,X,ac)}}function p(){m(j)}function H(){return m(S)}function d(){return m(E)}function C(Y){var V=this[h],t=this[U],X,W;if((V.nodeType===3||V.nodeType===4)&&V.nodeValue){if(!t){V.parentNode.insertBefore(Y,V)}else{if(t>=V.nodeValue.length){c.insertAfter(Y,V)}else{X=V.splitText(t);V.parentNode.insertBefore(Y,X)}}}else{if(V.childNodes.length>0){W=V.childNodes[t]}if(W){V.insertBefore(Y,W)}else{V.appendChild(Y)}}}function M(V){var t=N.extractContents();N.insertNode(V);V.appendChild(t);N.selectNode(V)}function K(){return k(new b(c),{startContainer:N[h],startOffset:N[U],endContainer:N[P],endOffset:N[z],collapsed:N.collapsed,commonAncestorContainer:N.commonAncestorContainer})}function O(t,V){var W;if(t.nodeType==3){return t}if(V<0){return t}W=t.firstChild;while(W&&V>0){--V;W=W.nextSibling}if(W){return W}return t}function l(){return(N[h]==N[P]&&N[U]==N[z])}function G(X,Z,V,Y){var aa,W,t,ab,ad,ac;if(X==V){if(Z==Y){return 0}if(Z<Y){return -1}return 1}aa=V;while(aa&&aa.parentNode!=X){aa=aa.parentNode}if(aa){W=0;t=X.firstChild;while(t!=aa&&W<Z){W++;t=t.nextSibling}if(Z<=W){return -1}return 1}aa=X;while(aa&&aa.parentNode!=V){aa=aa.parentNode}if(aa){W=0;t=V.firstChild;while(t!=aa&&W<Y){W++;t=t.nextSibling}if(W<Y){return -1}return 1}ab=c.findCommonAncestor(X,V);ad=X;while(ad&&ad.parentNode!=ab){ad=ad.parentNode}if(!ad){ad=ab}ac=V;while(ac&&ac.parentNode!=ab){ac=ac.parentNode}if(!ac){ac=ab}if(ad==ac){return 0}t=ab.firstChild;while(t){if(t==ad){return -1}if(t==ac){return 1}t=t.nextSibling}}function B(V,Y,X){var t,W;if(V){N[h]=Y;N[U]=X}else{N[P]=Y;N[z]=X}t=N[P];while(t.parentNode){t=t.parentNode}W=N[h];while(W.parentNode){W=W.parentNode}if(W==t){if(G(N[h],N[U],N[P],N[z])>0){N.collapse(V)}}else{N.collapse(V)}N.collapsed=l();N.commonAncestorContainer=c.findCommonAncestor(N[h],N[P])}function m(ab){var aa,X=0,ad=0,V,Z,W,Y,t,ac;if(N[h]==N[P]){return f(ab)}for(aa=N[P],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[h]){return r(aa,ab)}++X}for(aa=N[h],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[P]){return T(aa,ab)}++ad}Z=ad-X;W=N[h];while(Z>0){W=W.parentNode;Z--}Y=N[P];while(Z<0){Y=Y.parentNode;Z++}for(t=W.parentNode,ac=Y.parentNode;t!=ac;t=t.parentNode,ac=ac.parentNode){W=t;Y=ac}return o(W,Y,ab)}function f(Z){var ab,Y,X,aa,t,W,V;if(Z!=j){ab=e.createDocumentFragment()}if(N[U]==N[z]){return ab}if(N[h].nodeType==3){Y=N[h].nodeValue;X=Y.substring(N[U],N[z]);if(Z!=E){N[h].deleteData(N[U],N[z]-N[U]);N.collapse(D)}if(Z==j){return}ab.appendChild(e.createTextNode(X));return ab}aa=O(N[h],N[U]);t=N[z]-N[U];while(t>0){W=aa.nextSibling;V=y(aa,Z);if(ab){ab.appendChild(V)}--t;aa=W}if(Z!=E){N.collapse(D)}return ab}function r(ab,Y){var aa,Z,V,t,X,W;if(Y!=j){aa=e.createDocumentFragment()}Z=i(ab,Y);if(aa){aa.appendChild(Z)}V=n(ab);t=V-N[U];if(t<=0){if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}Z=ab.previousSibling;while(t>0){X=Z.previousSibling;W=y(Z,Y);if(aa){aa.insertBefore(W,aa.firstChild)}--t;Z=X}if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}function T(Z,Y){var ab,V,aa,t,X,W;if(Y!=j){ab=e.createDocumentFragment()}aa=Q(Z,Y);if(ab){ab.appendChild(aa)}V=n(Z);++V;t=N[z]-V;aa=Z.nextSibling;while(t>0){X=aa.nextSibling;W=y(aa,Y);if(ab){ab.appendChild(W)}--t;aa=X}if(Y!=E){N.setStartAfter(Z);N.collapse(D)}return ab}function o(Z,t,ac){var W,ae,Y,aa,ab,V,ad,X;if(ac!=j){ae=e.createDocumentFragment()}W=Q(Z,ac);if(ae){ae.appendChild(W)}Y=Z.parentNode;aa=n(Z);ab=n(t);++aa;V=ab-aa;ad=Z.nextSibling;while(V>0){X=ad.nextSibling;W=y(ad,ac);if(ae){ae.appendChild(W)}ad=X;--V}W=i(t,ac);if(ae){ae.appendChild(W)}if(ac!=E){N.setStartAfter(Z);N.collapse(D)}return ae}function i(aa,ab){var W=O(N[P],N[z]-1),ac,Z,Y,t,V,X=W!=N[P];if(W==aa){return L(W,X,R,ab)}ac=W.parentNode;Z=L(ac,R,R,ab);while(ac){while(W){Y=W.previousSibling;t=L(W,X,R,ab);if(ab!=j){Z.insertBefore(t,Z.firstChild)}X=D;W=Y}if(ac==aa){return Z}W=ac.previousSibling;ac=ac.parentNode;V=L(ac,R,R,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function Q(aa,ab){var X=O(N[h],N[U]),Y=X!=N[h],ac,Z,W,t,V;if(X==aa){return L(X,Y,D,ab)}ac=X.parentNode;Z=L(ac,R,D,ab);while(ac){while(X){W=X.nextSibling;t=L(X,Y,D,ab);if(ab!=j){Z.appendChild(t)}Y=D;X=W}if(ac==aa){return Z}X=ac.nextSibling;ac=ac.parentNode;V=L(ac,R,D,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function L(t,Y,ab,ac){var X,W,Z,V,aa;if(Y){return y(t,ac)}if(t.nodeType==3){X=t.nodeValue;if(ab){V=N[U];W=X.substring(V);Z=X.substring(0,V)}else{V=N[z];W=X.substring(0,V);Z=X.substring(V)}if(ac!=E){t.nodeValue=Z}if(ac==j){return}aa=t.cloneNode(R);aa.nodeValue=W;return aa}if(ac==j){return}return t.cloneNode(R)}function y(V,t){if(t!=j){return t==E?V.cloneNode(D):V}V.parentNode.removeChild(V)}}a.Range=b})(tinymce.dom);(function(){function a(d){var b=this,h=d.dom,c=true,f=false;function e(i,j){var k,t=0,q,n,m,l,o,r,p=-1,s;k=i.duplicate();k.collapse(j);s=k.parentElement();if(s.ownerDocument!==d.dom.doc){return}while(s.contentEditable==="false"){s=s.parentNode}if(!s.hasChildNodes()){return{node:s,inside:1}}m=s.children;q=m.length-1;while(t<=q){r=Math.floor((t+q)/2);l=m[r];k.moveToElementText(l);p=k.compareEndPoints(j?"StartToStart":"EndToEnd",i);if(p>0){q=r-1}else{if(p<0){t=r+1}else{return{node:l}}}}if(p<0){if(!l){k.moveToElementText(s);k.collapse(true);l=s;n=true}else{k.collapse(false)}k.setEndPoint(j?"EndToStart":"EndToEnd",i);if(k.compareEndPoints(j?"StartToStart":"StartToEnd",i)>0){k=i.duplicate();k.collapse(j);o=-1;while(s==k.parentElement()){if(k.move("character",-1)==0){break}o++}}o=o||k.text.replace("\r\n"," ").length}else{k.collapse(true);k.setEndPoint(j?"StartToStart":"StartToEnd",i);o=k.text.replace("\r\n"," ").length}return{node:l,position:p,offset:o,inside:n}}function g(){var i=d.getRng(),r=h.createRng(),l,k,p,q,m,j;l=i.item?i.item(0):i.parentElement();if(l.ownerDocument!=h.doc){return r}k=d.isCollapsed();if(i.item){r.setStart(l.parentNode,h.nodeIndex(l));r.setEnd(r.startContainer,r.startOffset+1);return r}function o(A){var u=e(i,A),s,y,z=0,x,v,t;s=u.node;y=u.offset;if(u.inside&&!s.hasChildNodes()){r[A?"setStart":"setEnd"](s,0);return}if(y===v){r[A?"setStartBefore":"setEndAfter"](s);return}if(u.position<0){x=u.inside?s.firstChild:s.nextSibling;if(!x){r[A?"setStartAfter":"setEndAfter"](s);return}if(!y){if(x.nodeType==3){r[A?"setStart":"setEnd"](x,0)}else{r[A?"setStartBefore":"setEndBefore"](x)}return}while(x){t=x.nodeValue;z+=t.length;if(z>=y){s=x;z-=y;z=t.length-z;break}x=x.nextSibling}}else{x=s.previousSibling;if(!x){return r[A?"setStartBefore":"setEndBefore"](s)}if(!y){if(s.nodeType==3){r[A?"setStart":"setEnd"](x,s.nodeValue.length)}else{r[A?"setStartAfter":"setEndAfter"](x)}return}while(x){z+=x.nodeValue.length;if(z>=y){s=x;z-=y;break}x=x.previousSibling}}r[A?"setStart":"setEnd"](s,z)}try{o(true);if(!k){o()}}catch(n){if(n.number==-2147024809){m=b.getBookmark(2);p=i.duplicate();p.collapse(true);l=p.parentElement();if(!k){p=i.duplicate();p.collapse(false);q=p.parentElement();q.innerHTML=q.innerHTML}l.innerHTML=l.innerHTML;b.moveToBookmark(m);i=d.getRng();o(true);if(!k){o()}}else{throw n}}return r}this.getBookmark=function(m){var j=d.getRng(),o,i,l={};function n(u){var u,t,p,s,r,q=[];t=u.parentNode;p=h.getRoot().parentNode;while(t!=p&&t.nodeType!==9){s=t.children;r=s.length;while(r--){if(u===s[r]){q.push(r);break}}u=t;t=t.parentNode}return q}function k(q){var p;p=e(j,q);if(p){return{position:p.position,offset:p.offset,indexes:n(p.node),inside:p.inside}}}if(m===2){if(!j.item){l.start=k(true);if(!d.isCollapsed()){l.end=k()}}else{l.start={ctrl:true,indexes:n(j.item(0))}}}return l};this.moveToBookmark=function(k){var j,i=h.doc.body;function m(o){var r,q,n,p;r=h.getRoot();for(q=o.length-1;q>=0;q--){p=r.children;n=o[q];if(n<=p.length-1){r=p[n]}}return r}function l(r){var n=k[r?"start":"end"],q,p,o;if(n){q=n.position>0;p=i.createTextRange();p.moveToElementText(m(n.indexes));offset=n.offset;if(offset!==o){p.collapse(n.inside||q);p.moveStart("character",q?-offset:offset)}else{p.collapse(r)}j.setEndPoint(r?"StartToStart":"EndToStart",p);if(r){j.collapse(true)}}}if(k.start){if(k.start.ctrl){j=i.createControlRange();j.addElement(m(k.start.indexes));j.select()}else{j=i.createTextRange();l(true);l();j.select()}}};this.addRange=function(i){var n,l,k,p,s,q,r=d.dom.doc,m=r.body;function j(z){var u,y,t,x,v;t=h.create("a");u=z?k:s;y=z?p:q;x=n.duplicate();if(u==r||u==r.documentElement){u=m;y=0}if(u.nodeType==3){u.parentNode.insertBefore(t,u);x.moveToElementText(t);x.moveStart("character",y);h.remove(t);n.setEndPoint(z?"StartToStart":"EndToEnd",x)}else{v=u.childNodes;if(v.length){if(y>=v.length){h.insertAfter(t,v[v.length-1])}else{u.insertBefore(t,v[y])}x.moveToElementText(t)}else{t=r.createTextNode("\uFEFF");u.appendChild(t);x.moveToElementText(t.parentNode);x.collapse(c)}n.setEndPoint(z?"StartToStart":"EndToEnd",x);h.remove(t)}}k=i.startContainer;p=i.startOffset;s=i.endContainer;q=i.endOffset;n=m.createTextRange();if(k==s&&k.nodeType==1&&p==q-1){if(p==q-1){try{l=m.createControlRange();l.addElement(k.childNodes[p]);l.select();return}catch(o){}}}j(true);j();n.select()};this.getRangeAt=g}tinymce.dom.TridentSelection=a})();(function(){var p=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,j=0,d=Object.prototype.toString,o=false,i=true;[0,0].sort(function(){i=false;return 0});var b=function(v,e,z,A){z=z||[];e=e||document;var C=e;if(e.nodeType!==1&&e.nodeType!==9){return[]}if(!v||typeof v!=="string"){return z}var x=[],s,E,H,r,u=true,t=b.isXML(e),B=v,D,G,F,y;do{p.exec("");s=p.exec(B);if(s){B=s[3];x.push(s[1]);if(s[2]){r=s[3];break}}}while(s);if(x.length>1&&k.exec(v)){if(x.length===2&&f.relative[x[0]]){E=h(x[0]+x[1],e)}else{E=f.relative[x[0]]?[e]:b(x.shift(),e);while(x.length){v=x.shift();if(f.relative[v]){v+=x.shift()}E=h(v,E)}}}else{if(!A&&x.length>1&&e.nodeType===9&&!t&&f.match.ID.test(x[0])&&!f.match.ID.test(x[x.length-1])){D=b.find(x.shift(),e,t);e=D.expr?b.filter(D.expr,D.set)[0]:D.set[0]}if(e){D=A?{expr:x.pop(),set:a(A)}:b.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&e.parentNode?e.parentNode:e,t);E=D.expr?b.filter(D.expr,D.set):D.set;if(x.length>0){H=a(E)}else{u=false}while(x.length){G=x.pop();F=G;if(!f.relative[G]){G=""}else{F=x.pop()}if(F==null){F=e}f.relative[G](H,F,t)}}else{H=x=[]}}if(!H){H=E}if(!H){b.error(G||v)}if(d.call(H)==="[object Array]"){if(!u){z.push.apply(z,H)}else{if(e&&e.nodeType===1){for(y=0;H[y]!=null;y++){if(H[y]&&(H[y]===true||H[y].nodeType===1&&b.contains(e,H[y]))){z.push(E[y])}}}else{for(y=0;H[y]!=null;y++){if(H[y]&&H[y].nodeType===1){z.push(E[y])}}}}}else{a(H,z)}if(r){b(r,C,z,A);b.uniqueSort(z)}return z};b.uniqueSort=function(r){if(c){o=i;r.sort(c);if(o){for(var e=1;e<r.length;e++){if(r[e]===r[e-1]){r.splice(e--,1)}}}}return r};b.matches=function(e,r){return b(e,null,null,r)};b.find=function(y,e,z){var x;if(!y){return[]}for(var t=0,s=f.order.length;t<s;t++){var v=f.order[t],u;if((u=f.leftMatch[v].exec(y))){var r=u[1];u.splice(1,1);if(r.substr(r.length-1)!=="\\"){u[1]=(u[1]||"").replace(/\\/g,"");x=f.find[v](u,e,z);if(x!=null){y=y.replace(f.match[v],"");break}}}}if(!x){x=e.getElementsByTagName("*")}return{set:x,expr:y}};b.filter=function(C,B,F,u){var s=C,H=[],z=B,x,e,y=B&&B[0]&&b.isXML(B[0]);while(C&&B.length){for(var A in f.filter){if((x=f.leftMatch[A].exec(C))!=null&&x[2]){var r=f.filter[A],G,E,t=x[1];e=false;x.splice(1,1);if(t.substr(t.length-1)==="\\"){continue}if(z===H){H=[]}if(f.preFilter[A]){x=f.preFilter[A](x,z,F,H,u,y);if(!x){e=G=true}else{if(x===true){continue}}}if(x){for(var v=0;(E=z[v])!=null;v++){if(E){G=r(E,x,v,z);var D=u^!!G;if(F&&G!=null){if(D){e=true}else{z[v]=false}}else{if(D){H.push(E);e=true}}}}}if(G!==undefined){if(!F){z=H}C=C.replace(f.match[A],"");if(!e){return[]}break}}}if(C===s){if(e==null){b.error(C)}else{break}}s=C}return z};b.error=function(e){throw"Syntax error, unrecognized expression: "+e};var f=b.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(e){return e.getAttribute("href")}},relative:{"+":function(x,r){var t=typeof r==="string",v=t&&!/\W/.test(r),y=t&&!v;if(v){r=r.toLowerCase()}for(var s=0,e=x.length,u;s<e;s++){if((u=x[s])){while((u=u.previousSibling)&&u.nodeType!==1){}x[s]=y||u&&u.nodeName.toLowerCase()===r?u||false:u===r}}if(y){b.filter(r,x,true)}},">":function(x,r){var u=typeof r==="string",v,s=0,e=x.length;if(u&&!/\W/.test(r)){r=r.toLowerCase();for(;s<e;s++){v=x[s];if(v){var t=v.parentNode;x[s]=t.nodeName.toLowerCase()===r?t:false}}}else{for(;s<e;s++){v=x[s];if(v){x[s]=u?v.parentNode:v.parentNode===r}}if(u){b.filter(r,x,true)}}},"":function(t,r,v){var s=j++,e=q,u;if(typeof r==="string"&&!/\W/.test(r)){r=r.toLowerCase();u=r;e=n}e("parentNode",r,s,t,u,v)},"~":function(t,r,v){var s=j++,e=q,u;if(typeof r==="string"&&!/\W/.test(r)){r=r.toLowerCase();u=r;e=n}e("previousSibling",r,s,t,u,v)}},find:{ID:function(r,s,t){if(typeof s.getElementById!=="undefined"&&!t){var e=s.getElementById(r[1]);return e?[e]:[]}},NAME:function(s,v){if(typeof v.getElementsByName!=="undefined"){var r=[],u=v.getElementsByName(s[1]);for(var t=0,e=u.length;t<e;t++){if(u[t].getAttribute("name")===s[1]){r.push(u[t])}}return r.length===0?null:r}},TAG:function(e,r){return r.getElementsByTagName(e[1])}},preFilter:{CLASS:function(t,r,s,e,x,y){t=" "+t[1].replace(/\\/g,"")+" ";if(y){return t}for(var u=0,v;(v=r[u])!=null;u++){if(v){if(x^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(t)>=0)){if(!s){e.push(v)}}else{if(s){r[u]=false}}}}return false},ID:function(e){return e[1].replace(/\\/g,"")},TAG:function(r,e){return r[1].toLowerCase()},CHILD:function(e){if(e[1]==="nth"){var r=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(e[2]==="even"&&"2n"||e[2]==="odd"&&"2n+1"||!/\D/.test(e[2])&&"0n+"+e[2]||e[2]);e[2]=(r[1]+(r[2]||1))-0;e[3]=r[3]-0}e[0]=j++;return e},ATTR:function(u,r,s,e,v,x){var t=u[1].replace(/\\/g,"");if(!x&&f.attrMap[t]){u[1]=f.attrMap[t]}if(u[2]==="~="){u[4]=" "+u[4]+" "}return u},PSEUDO:function(u,r,s,e,v){if(u[1]==="not"){if((p.exec(u[3])||"").length>1||/^\w/.test(u[3])){u[3]=b(u[3],null,null,r)}else{var t=b.filter(u[3],r,s,true^v);if(!s){e.push.apply(e,t)}return false}}else{if(f.match.POS.test(u[0])||f.match.CHILD.test(u[0])){return true}}return u},POS:function(e){e.unshift(true);return e}},filters:{enabled:function(e){return e.disabled===false&&e.type!=="hidden"},disabled:function(e){return e.disabled===true},checked:function(e){return e.checked===true},selected:function(e){e.parentNode.selectedIndex;return e.selected===true},parent:function(e){return !!e.firstChild},empty:function(e){return !e.firstChild},has:function(s,r,e){return !!b(e[3],s).length},header:function(e){return(/h\d/i).test(e.nodeName)},text:function(e){return"text"===e.type},radio:function(e){return"radio"===e.type},checkbox:function(e){return"checkbox"===e.type},file:function(e){return"file"===e.type},password:function(e){return"password"===e.type},submit:function(e){return"submit"===e.type},image:function(e){return"image"===e.type},reset:function(e){return"reset"===e.type},button:function(e){return"button"===e.type||e.nodeName.toLowerCase()==="button"},input:function(e){return(/input|select|textarea|button/i).test(e.nodeName)}},setFilters:{first:function(r,e){return e===0},last:function(s,r,e,t){return r===t.length-1},even:function(r,e){return e%2===0},odd:function(r,e){return e%2===1},lt:function(s,r,e){return r<e[3]-0},gt:function(s,r,e){return r>e[3]-0},nth:function(s,r,e){return e[3]-0===r},eq:function(s,r,e){return e[3]-0===r}},filter:{PSEUDO:function(s,y,x,z){var e=y[1],r=f.filters[e];if(r){return r(s,x,y,z)}else{if(e==="contains"){return(s.textContent||s.innerText||b.getText([s])||"").indexOf(y[3])>=0}else{if(e==="not"){var t=y[3];for(var v=0,u=t.length;v<u;v++){if(t[v]===s){return false}}return true}else{b.error("Syntax error, unrecognized expression: "+e)}}}},CHILD:function(e,t){var x=t[1],r=e;switch(x){case"only":case"first":while((r=r.previousSibling)){if(r.nodeType===1){return false}}if(x==="first"){return true}r=e;case"last":while((r=r.nextSibling)){if(r.nodeType===1){return false}}return true;case"nth":var s=t[2],A=t[3];if(s===1&&A===0){return true}var v=t[0],z=e.parentNode;if(z&&(z.sizcache!==v||!e.nodeIndex)){var u=0;for(r=z.firstChild;r;r=r.nextSibling){if(r.nodeType===1){r.nodeIndex=++u}}z.sizcache=v}var y=e.nodeIndex-A;if(s===0){return y===0}else{return(y%s===0&&y/s>=0)}}},ID:function(r,e){return r.nodeType===1&&r.getAttribute("id")===e},TAG:function(r,e){return(e==="*"&&r.nodeType===1)||r.nodeName.toLowerCase()===e},CLASS:function(r,e){return(" "+(r.className||r.getAttribute("class"))+" ").indexOf(e)>-1},ATTR:function(v,t){var s=t[1],e=f.attrHandle[s]?f.attrHandle[s](v):v[s]!=null?v[s]:v.getAttribute(s),x=e+"",u=t[2],r=t[4];return e==null?u==="!=":u==="="?x===r:u==="*="?x.indexOf(r)>=0:u==="~="?(" "+x+" ").indexOf(r)>=0:!r?x&&e!==false:u==="!="?x!==r:u==="^="?x.indexOf(r)===0:u==="$="?x.substr(x.length-r.length)===r:u==="|="?x===r||x.substr(0,r.length+1)===r+"-":false},POS:function(u,r,s,v){var e=r[2],t=f.setFilters[e];if(t){return t(u,s,r,v)}}}};var k=f.match.POS,g=function(r,e){return"\\"+(e-0+1)};for(var m in f.match){f.match[m]=new RegExp(f.match[m].source+(/(?![^\[]*\])(?![^\(]*\))/.source));f.leftMatch[m]=new RegExp(/(^(?:.|\r|\n)*?)/.source+f.match[m].source.replace(/\\(\d+)/g,g))}var a=function(r,e){r=Array.prototype.slice.call(r,0);if(e){e.push.apply(e,r);return e}return r};try{Array.prototype.slice.call(document.documentElement.childNodes,0)[0].nodeType}catch(l){a=function(u,t){var r=t||[],s=0;if(d.call(u)==="[object Array]"){Array.prototype.push.apply(r,u)}else{if(typeof u.length==="number"){for(var e=u.length;s<e;s++){r.push(u[s])}}else{for(;u[s];s++){r.push(u[s])}}}return r}}var c;if(document.documentElement.compareDocumentPosition){c=function(r,e){if(!r.compareDocumentPosition||!e.compareDocumentPosition){if(r==e){o=true}return r.compareDocumentPosition?-1:1}var s=r.compareDocumentPosition(e)&4?-1:r===e?0:1;if(s===0){o=true}return s}}else{if("sourceIndex" in document.documentElement){c=function(r,e){if(!r.sourceIndex||!e.sourceIndex){if(r==e){o=true}return r.sourceIndex?-1:1}var s=r.sourceIndex-e.sourceIndex;if(s===0){o=true}return s}}else{if(document.createRange){c=function(t,r){if(!t.ownerDocument||!r.ownerDocument){if(t==r){o=true}return t.ownerDocument?-1:1}var s=t.ownerDocument.createRange(),e=r.ownerDocument.createRange();s.setStart(t,0);s.setEnd(t,0);e.setStart(r,0);e.setEnd(r,0);var u=s.compareBoundaryPoints(Range.START_TO_END,e);if(u===0){o=true}return u}}}}b.getText=function(e){var r="",t;for(var s=0;e[s];s++){t=e[s];if(t.nodeType===3||t.nodeType===4){r+=t.nodeValue}else{if(t.nodeType!==8){r+=b.getText(t.childNodes)}}}return r};(function(){var r=document.createElement("div"),s="script"+(new Date()).getTime();r.innerHTML="<a name='"+s+"'/>";var e=document.documentElement;e.insertBefore(r,e.firstChild);if(document.getElementById(s)){f.find.ID=function(u,v,x){if(typeof v.getElementById!=="undefined"&&!x){var t=v.getElementById(u[1]);return t?t.id===u[1]||typeof t.getAttributeNode!=="undefined"&&t.getAttributeNode("id").nodeValue===u[1]?[t]:undefined:[]}};f.filter.ID=function(v,t){var u=typeof v.getAttributeNode!=="undefined"&&v.getAttributeNode("id");return v.nodeType===1&&u&&u.nodeValue===t}}e.removeChild(r);e=r=null})();(function(){var e=document.createElement("div");e.appendChild(document.createComment(""));if(e.getElementsByTagName("*").length>0){f.find.TAG=function(r,v){var u=v.getElementsByTagName(r[1]);if(r[1]==="*"){var t=[];for(var s=0;u[s];s++){if(u[s].nodeType===1){t.push(u[s])}}u=t}return u}}e.innerHTML="<a href='#'></a>";if(e.firstChild&&typeof e.firstChild.getAttribute!=="undefined"&&e.firstChild.getAttribute("href")!=="#"){f.attrHandle.href=function(r){return r.getAttribute("href",2)}}e=null})();if(document.querySelectorAll){(function(){var e=b,s=document.createElement("div");s.innerHTML="<p class='TEST'></p>";if(s.querySelectorAll&&s.querySelectorAll(".TEST").length===0){return}b=function(x,v,t,u){v=v||document;if(!u&&v.nodeType===9&&!b.isXML(v)){try{return a(v.querySelectorAll(x),t)}catch(y){}}return e(x,v,t,u)};for(var r in e){b[r]=e[r]}s=null})()}(function(){var e=document.createElement("div");e.innerHTML="<div class='test e'></div><div class='test'></div>";if(!e.getElementsByClassName||e.getElementsByClassName("e").length===0){return}e.lastChild.className="e";if(e.getElementsByClassName("e").length===1){return}f.order.splice(1,0,"CLASS");f.find.CLASS=function(r,s,t){if(typeof s.getElementsByClassName!=="undefined"&&!t){return s.getElementsByClassName(r[1])}};e=null})();function n(r,x,v,A,y,z){for(var t=0,s=A.length;t<s;t++){var e=A[t];if(e){e=e[r];var u=false;while(e){if(e.sizcache===v){u=A[e.sizset];break}if(e.nodeType===1&&!z){e.sizcache=v;e.sizset=t}if(e.nodeName.toLowerCase()===x){u=e;break}e=e[r]}A[t]=u}}}function q(r,x,v,A,y,z){for(var t=0,s=A.length;t<s;t++){var e=A[t];if(e){e=e[r];var u=false;while(e){if(e.sizcache===v){u=A[e.sizset];break}if(e.nodeType===1){if(!z){e.sizcache=v;e.sizset=t}if(typeof x!=="string"){if(e===x){u=true;break}}else{if(b.filter(x,[e]).length>0){u=e;break}}}e=e[r]}A[t]=u}}}b.contains=document.compareDocumentPosition?function(r,e){return !!(r.compareDocumentPosition(e)&16)}:function(r,e){return r!==e&&(r.contains?r.contains(e):true)};b.isXML=function(e){var r=(e?e.ownerDocument||e:0).documentElement;return r?r.nodeName!=="HTML":false};var h=function(e,y){var t=[],u="",v,s=y.nodeType?[y]:y;while((v=f.match.PSEUDO.exec(e))){u+=v[0];e=e.replace(f.match.PSEUDO,"")}e=f.relative[e]?e+"*":e;for(var x=0,r=s.length;x<r;x++){b(e,s[x],t)}return b.filter(u,t)};window.tinymce.dom.Sizzle=b})();(function(d){var f=d.each,c=d.DOM,b=d.isIE,e=d.isWebKit,a;d.create("tinymce.dom.EventUtils",{EventUtils:function(){this.inits=[];this.events=[]},add:function(m,p,l,j){var g,h=this,i=h.events,k;if(p instanceof Array){k=[];f(p,function(o){k.push(h.add(m,o,l,j))});return k}if(m&&m.hasOwnProperty&&m instanceof Array){k=[];f(m,function(n){n=c.get(n);k.push(h.add(n,p,l,j))});return k}m=c.get(m);if(!m){return}g=function(n){if(h.disabled){return}n=n||window.event;if(n&&b){if(!n.target){n.target=n.srcElement}d.extend(n,h._stoppers)}if(!j){return l(n)}return l.call(j,n)};if(p=="unload"){d.unloads.unshift({func:g});return g}if(p=="init"){if(h.domLoaded){g()}else{h.inits.push(g)}return g}i.push({obj:m,name:p,func:l,cfunc:g,scope:j});h._add(m,p,g);return l},remove:function(l,m,k){var h=this,g=h.events,i=false,j;if(l&&l.hasOwnProperty&&l instanceof Array){j=[];f(l,function(n){n=c.get(n);j.push(h.remove(n,m,k))});return j}l=c.get(l);f(g,function(o,n){if(o.obj==l&&o.name==m&&(!k||(o.func==k||o.cfunc==k))){g.splice(n,1);h._remove(l,m,o.cfunc);i=true;return false}});return i},clear:function(l){var j=this,g=j.events,h,k;if(l){l=c.get(l);for(h=g.length-1;h>=0;h--){k=g[h];if(k.obj===l){j._remove(k.obj,k.name,k.cfunc);k.obj=k.cfunc=null;g.splice(h,1)}}}},cancel:function(g){if(!g){return false}this.stop(g);return this.prevent(g)},stop:function(g){if(g.stopPropagation){g.stopPropagation()}else{g.cancelBubble=true}return false},prevent:function(g){if(g.preventDefault){g.preventDefault()}else{g.returnValue=false}return false},destroy:function(){var g=this;f(g.events,function(j,h){g._remove(j.obj,j.name,j.cfunc);j.obj=j.cfunc=null});g.events=[];g=null},_add:function(h,i,g){if(h.attachEvent){h.attachEvent("on"+i,g)}else{if(h.addEventListener){h.addEventListener(i,g,false)}else{h["on"+i]=g}}},_remove:function(i,j,h){if(i){try{if(i.detachEvent){i.detachEvent("on"+j,h)}else{if(i.removeEventListener){i.removeEventListener(j,h,false)}else{i["on"+j]=null}}}catch(g){}}},_pageInit:function(h){var g=this;if(g.domLoaded){return}g.domLoaded=true;f(g.inits,function(i){i()});g.inits=[]},_wait:function(i){var g=this,h=i.document;if(i.tinyMCE_GZ&&tinyMCE_GZ.loaded){g.domLoaded=1;return}if(h.attachEvent){h.attachEvent("onreadystatechange",function(){if(h.readyState==="complete"){h.detachEvent("onreadystatechange",arguments.callee);g._pageInit(i)}});if(h.documentElement.doScroll&&i==i.top){(function(){if(g.domLoaded){return}try{h.documentElement.doScroll("left")}catch(j){setTimeout(arguments.callee,0);return}g._pageInit(i)})()}}else{if(h.addEventListener){g._add(i,"DOMContentLoaded",function(){g._pageInit(i)})}}g._add(i,"load",function(){g._pageInit(i)})},_stoppers:{preventDefault:function(){this.returnValue=false},stopPropagation:function(){this.cancelBubble=true}}});a=d.dom.Event=new d.dom.EventUtils();a._wait(window);d.addUnload(function(){a.destroy()})})(tinymce);(function(a){a.dom.Element=function(f,d){var b=this,e,c;b.settings=d=d||{};b.id=f;b.dom=e=d.dom||a.DOM;if(!a.isIE){c=e.get(b.id)}a.each(("getPos,getRect,getParent,add,setStyle,getStyle,setStyles,setAttrib,setAttribs,getAttrib,addClass,removeClass,hasClass,getOuterHTML,setOuterHTML,remove,show,hide,isHidden,setHTML,get").split(/,/),function(g){b[g]=function(){var h=[f],j;for(j=0;j<arguments.length;j++){h.push(arguments[j])}h=e[g].apply(e,h);b.update(g);return h}});a.extend(b,{on:function(i,h,g){return a.dom.Event.add(b.id,i,h,g)},getXY:function(){return{x:parseInt(b.getStyle("left")),y:parseInt(b.getStyle("top"))}},getSize:function(){var g=e.get(b.id);return{w:parseInt(b.getStyle("width")||g.clientWidth),h:parseInt(b.getStyle("height")||g.clientHeight)}},moveTo:function(g,h){b.setStyles({left:g,top:h})},moveBy:function(g,i){var h=b.getXY();b.moveTo(h.x+g,h.y+i)},resizeTo:function(g,i){b.setStyles({width:g,height:i})},resizeBy:function(g,j){var i=b.getSize();b.resizeTo(i.w+g,i.h+j)},update:function(h){var g;if(a.isIE6&&d.blocker){h=h||"";if(h.indexOf("get")===0||h.indexOf("has")===0||h.indexOf("is")===0){return}if(h=="remove"){e.remove(b.blocker);return}if(!b.blocker){b.blocker=e.uniqueId();g=e.add(d.container||e.getRoot(),"iframe",{id:b.blocker,style:"position:absolute;",frameBorder:0,src:'javascript:""'});e.setStyle(g,"opacity",0)}else{g=e.get(b.blocker)}e.setStyles(g,{left:b.getStyle("left",1),top:b.getStyle("top",1),width:b.getStyle("width",1),height:b.getStyle("height",1),display:b.getStyle("display",1),zIndex:parseInt(b.getStyle("zIndex",1)||0)-1})}}})}})(tinymce);(function(c){function e(f){return f.replace(/[\n\r]+/g,"")}var b=c.is,a=c.isIE,d=c.each;c.create("tinymce.dom.Selection",{Selection:function(i,h,g){var f=this;f.dom=i;f.win=h;f.serializer=g;d(["onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent"],function(j){f[j]=new c.util.Dispatcher(f)});if(!f.win.getSelection){f.tridentSel=new c.dom.TridentSelection(f)}if(c.isIE&&i.boxModel){this._fixIESelection()}c.addUnload(f.destroy,f)},setCursorLocation:function(h,i){var f=this;var g=f.dom.createRng();g.setStart(h,i);g.setEnd(h,i);f.setRng(g);f.collapse(false)},getContent:function(g){var f=this,h=f.getRng(),l=f.dom.create("body"),j=f.getSel(),i,k,m;g=g||{};i=k="";g.get=true;g.format=g.format||"html";g.forced_root_block="";f.onBeforeGetContent.dispatch(f,g);if(g.format=="text"){return f.isCollapsed()?"":(h.text||(j.toString?j.toString():""))}if(h.cloneContents){m=h.cloneContents();if(m){l.appendChild(m)}}else{if(b(h.item)||b(h.htmlText)){l.innerHTML="<br>"+(h.item?h.item(0).outerHTML:h.htmlText);l.removeChild(l.firstChild)}else{l.innerHTML=h.toString()}}if(/^\s/.test(l.innerHTML)){i=" "}if(/\s+$/.test(l.innerHTML)){k=" "}g.getInner=true;g.content=f.isCollapsed()?"":i+f.serializer.serialize(l,g)+k;f.onGetContent.dispatch(f,g);return g.content},setContent:function(g,i){var n=this,f=n.getRng(),j,k=n.win.document,m,l;i=i||{format:"html"};i.set=true;g=i.content=g;if(!i.no_events){n.onBeforeSetContent.dispatch(n,i)}g=i.content;if(f.insertNode){g+='<span id="__caret">_</span>';if(f.startContainer==k&&f.endContainer==k){k.body.innerHTML=g}else{f.deleteContents();if(k.body.childNodes.length==0){k.body.innerHTML=g}else{if(f.createContextualFragment){f.insertNode(f.createContextualFragment(g))}else{m=k.createDocumentFragment();l=k.createElement("div");m.appendChild(l);l.outerHTML=g;f.insertNode(m)}}}j=n.dom.get("__caret");f=k.createRange();f.setStartBefore(j);f.setEndBefore(j);n.setRng(f);n.dom.remove("__caret");try{n.setRng(f)}catch(h){}}else{if(f.item){k.execCommand("Delete",false,null);f=n.getRng()}if(/^\s+/.test(g)){f.pasteHTML('<span id="__mce_tmp">_</span>'+g);n.dom.remove("__mce_tmp")}else{f.pasteHTML(g)}}if(!i.no_events){n.onSetContent.dispatch(n,i)}},getStart:function(){var g=this.getRng(),h,f,j,i;if(g.duplicate||g.item){if(g.item){return g.item(0)}j=g.duplicate();j.collapse(1);h=j.parentElement();f=i=g.parentElement();while(i=i.parentNode){if(i==h){h=f;break}}return h}else{h=g.startContainer;if(h.nodeType==1&&h.hasChildNodes()){h=h.childNodes[Math.min(h.childNodes.length-1,g.startOffset)]}if(h&&h.nodeType==3){return h.parentNode}return h}},getEnd:function(){var g=this,h=g.getRng(),i,f;if(h.duplicate||h.item){if(h.item){return h.item(0)}h=h.duplicate();h.collapse(0);i=h.parentElement();if(i&&i.nodeName=="BODY"){return i.lastChild||i}return i}else{i=h.endContainer;f=h.endOffset;if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[f>0?f-1:f]}if(i&&i.nodeType==3){return i.parentNode}return i}},getBookmark:function(r,s){var v=this,m=v.dom,g,j,i,n,h,o,p,l="\uFEFF",u;function f(x,y){var t=0;d(m.select(x),function(A,z){if(A==y){t=z}});return t}if(r==2){function k(){var x=v.getRng(true),t=m.getRoot(),y={};function z(C,H){var B=C[H?"startContainer":"endContainer"],G=C[H?"startOffset":"endOffset"],A=[],D,F,E=0;if(B.nodeType==3){if(s){for(D=B.previousSibling;D&&D.nodeType==3;D=D.previousSibling){G+=D.nodeValue.length}}A.push(G)}else{F=B.childNodes;if(G>=F.length&&F.length){E=1;G=Math.max(0,F.length-1)}A.push(v.dom.nodeIndex(F[G],s)+E)}for(;B&&B!=t;B=B.parentNode){A.push(v.dom.nodeIndex(B,s))}return A}y.start=z(x,true);if(!v.isCollapsed()){y.end=z(x)}return y}if(v.tridentSel){return v.tridentSel.getBookmark(r)}return k()}if(r){return{rng:v.getRng()}}g=v.getRng();i=m.uniqueId();n=tinyMCE.activeEditor.selection.isCollapsed();u="overflow:hidden;line-height:0px";if(g.duplicate||g.item){if(!g.item){j=g.duplicate();try{g.collapse();g.pasteHTML('<span data-mce-type="bookmark" id="'+i+'_start" style="'+u+'">'+l+"</span>");if(!n){j.collapse(false);g.moveToElementText(j.parentElement());if(g.compareEndPoints("StartToEnd",j)==0){j.move("character",-1)}j.pasteHTML('<span data-mce-type="bookmark" id="'+i+'_end" style="'+u+'">'+l+"</span>")}}catch(q){return null}}else{o=g.item(0);h=o.nodeName;return{name:h,index:f(h,o)}}}else{o=v.getNode();h=o.nodeName;if(h=="IMG"){return{name:h,index:f(h,o)}}j=g.cloneRange();if(!n){j.collapse(false);j.insertNode(m.create("span",{"data-mce-type":"bookmark",id:i+"_end",style:u},l))}g.collapse(true);g.insertNode(m.create("span",{"data-mce-type":"bookmark",id:i+"_start",style:u},l))}v.moveToBookmark({id:i,keep:1});return{id:i}},moveToBookmark:function(n){var r=this,l=r.dom,i,h,f,q,j,s,o,p;if(n){if(n.start){f=l.createRng();q=l.getRoot();function g(z){var t=n[z?"start":"end"],v,x,y,u;if(t){y=t[0];for(x=q,v=t.length-1;v>=1;v--){u=x.childNodes;if(t[v]>u.length-1){return}x=u[t[v]]}if(x.nodeType===3){y=Math.min(t[0],x.nodeValue.length)}if(x.nodeType===1){y=Math.min(t[0],x.childNodes.length)}if(z){f.setStart(x,y)}else{f.setEnd(x,y)}}return true}if(r.tridentSel){return r.tridentSel.moveToBookmark(n)}if(g(true)&&g()){r.setRng(f)}}else{if(n.id){function k(A){var u=l.get(n.id+"_"+A),z,t,x,y,v=n.keep;if(u){z=u.parentNode;if(A=="start"){if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}j=s=z;o=p=t}else{if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}s=z;p=t}if(!v){y=u.previousSibling;x=u.nextSibling;d(c.grep(u.childNodes),function(B){if(B.nodeType==3){B.nodeValue=B.nodeValue.replace(/\uFEFF/g,"")}});while(u=l.get(n.id+"_"+A)){l.remove(u,1)}if(y&&x&&y.nodeType==x.nodeType&&y.nodeType==3&&!c.isOpera){t=y.nodeValue.length;y.appendData(x.nodeValue);l.remove(x);if(A=="start"){j=s=y;o=p=t}else{s=y;p=t}}}}}function m(t){if(l.isBlock(t)&&!t.innerHTML){t.innerHTML=!a?'<br data-mce-bogus="1" />':" "}return t}k("start");k("end");if(j){f=l.createRng();f.setStart(m(j),o);f.setEnd(m(s),p);r.setRng(f)}}else{if(n.name){r.select(l.select(n.name)[n.index])}else{if(n.rng){r.setRng(n.rng)}}}}}},select:function(k,j){var i=this,l=i.dom,g=l.createRng(),f;if(k){f=l.nodeIndex(k);g.setStart(k.parentNode,f);g.setEnd(k.parentNode,f+1);if(j){function h(m,o){var n=new c.dom.TreeWalker(m,m);do{if(m.nodeType==3&&c.trim(m.nodeValue).length!=0){if(o){g.setStart(m,0)}else{g.setEnd(m,m.nodeValue.length)}return}if(m.nodeName=="BR"){if(o){g.setStartBefore(m)}else{g.setEndBefore(m)}return}}while(m=(o?n.next():n.prev()))}h(k,1);h(k)}i.setRng(g)}return k},isCollapsed:function(){var f=this,h=f.getRng(),g=f.getSel();if(!h||h.item){return false}if(h.compareEndPoints){return h.compareEndPoints("StartToEnd",h)===0}return !g||h.collapsed},collapse:function(f){var h=this,g=h.getRng(),i;if(g.item){i=g.item(0);g=h.win.document.body.createTextRange();g.moveToElementText(i)}g.collapse(!!f);h.setRng(g)},getSel:function(){var g=this,f=this.win;return f.getSelection?f.getSelection():f.document.selection},getRng:function(l){var g=this,h,i,k,j=g.win.document;if(l&&g.tridentSel){return g.tridentSel.getRangeAt(0)}try{if(h=g.getSel()){i=h.rangeCount>0?h.getRangeAt(0):(h.createRange?h.createRange():j.createRange())}}catch(f){}if(c.isIE&&i&&i.setStart&&j.selection.createRange().item){k=j.selection.createRange().item(0);i=j.createRange();i.setStartBefore(k);i.setEndAfter(k)}if(!i){i=j.createRange?j.createRange():j.body.createTextRange()}if(g.selectedRange&&g.explicitRange){if(i.compareBoundaryPoints(i.START_TO_START,g.selectedRange)===0&&i.compareBoundaryPoints(i.END_TO_END,g.selectedRange)===0){i=g.explicitRange}else{g.selectedRange=null;g.explicitRange=null}}return i},setRng:function(i){var h,g=this;if(!g.tridentSel){h=g.getSel();if(h){g.explicitRange=i;try{h.removeAllRanges()}catch(f){}h.addRange(i);g.selectedRange=h.getRangeAt(0)}}else{if(i.cloneRange){g.tridentSel.addRange(i);return}try{i.select()}catch(f){}}},setNode:function(g){var f=this;f.setContent(f.dom.getOuterHTML(g));return g},getNode:function(){var h=this,g=h.getRng(),i=h.getSel(),l,k=g.startContainer,f=g.endContainer;if(!g){return h.dom.getRoot()}if(g.setStart){l=g.commonAncestorContainer;if(!g.collapsed){if(g.startContainer==g.endContainer){if(g.endOffset-g.startOffset<2){if(g.startContainer.hasChildNodes()){l=g.startContainer.childNodes[g.startOffset]}}}if(k.nodeType===3&&f.nodeType===3){function j(p,m){var o=p;while(p&&p.nodeType===3&&p.length===0){p=m?p.nextSibling:p.previousSibling}return p||o}if(k.length===g.startOffset){k=j(k.nextSibling,true)}else{k=k.parentNode}if(g.endOffset===0){f=j(f.previousSibling,false)}else{f=f.parentNode}if(k&&k===f){return k}}}if(l&&l.nodeType==3){return l.parentNode}return l}return g.item?g.item(0):g.parentElement()},getSelectedBlocks:function(o,g){var m=this,j=m.dom,l,k,h,i=[];l=j.getParent(o||m.getStart(),j.isBlock);k=j.getParent(g||m.getEnd(),j.isBlock);if(l){i.push(l)}if(l&&k&&l!=k){h=l;var f=new c.dom.TreeWalker(l,j.getRoot());while((h=f.next())&&h!=k){if(j.isBlock(h)){i.push(h)}}}if(k&&l!=k){i.push(k)}return i},normalize:function(){var g=this,f,i;if(c.isIE){return}function h(p){var k,o,n,m=g.dom,j=m.getRoot(),l;k=f[(p?"start":"end")+"Container"];o=f[(p?"start":"end")+"Offset"];if(k.nodeType===9){k=k.body;o=0}if(k===j){if(k.hasChildNodes()){k=k.childNodes[Math.min(!p&&o>0?o-1:o,k.childNodes.length-1)];o=0;if(k.hasChildNodes()){l=k;n=new c.dom.TreeWalker(k,j);do{if(l.nodeType===3){o=p?0:l.nodeValue.length-1;k=l;break}if(l.nodeName==="BR"){o=m.nodeIndex(l);k=l.parentNode;break}}while(l=(p?n.next():n.prev()));i=true}}}if(i){f["set"+(p?"Start":"End")](k,o)}}f=g.getRng();h(true);if(f.collapsed){h()}if(i){g.setRng(f)}},destroy:function(g){var f=this;f.win=null;if(!g){c.removeUnload(f.destroy)}},_fixIESelection:function(){var g=this.dom,m=g.doc,h=m.body,j,n,f;m.documentElement.unselectable=true;function i(o,r){var p=h.createTextRange();try{p.moveToPoint(o,r)}catch(q){p=null}return p}function l(p){var o;if(p.button){o=i(p.x,p.y);if(o){if(o.compareEndPoints("StartToStart",n)>0){o.setEndPoint("StartToStart",n)}else{o.setEndPoint("EndToEnd",n)}o.select()}}else{k()}}function k(){var o=m.selection.createRange();if(n&&!o.item&&o.compareEndPoints("StartToEnd",o)===0){n.select()}g.unbind(m,"mouseup",k);g.unbind(m,"mousemove",l);n=j=0}g.bind(m,["mousedown","contextmenu"],function(o){if(o.target.nodeName==="HTML"){if(j){k()}f=m.documentElement;if(f.scrollHeight>f.clientHeight){return}j=1;n=i(o.x,o.y);if(n){g.bind(m,"mouseup",k);g.bind(m,"mousemove",l);g.win.focus();n.select()}}})}})})(tinymce);(function(a){a.dom.Serializer=function(e,i,f){var h,b,d=a.isIE,g=a.each,c;if(!e.apply_source_formatting){e.indent=false}e.remove_trailing_brs=true;i=i||a.DOM;f=f||new a.html.Schema(e);e.entity_encoding=e.entity_encoding||"named";h=new a.util.Dispatcher(self);b=new a.util.Dispatcher(self);c=new a.html.DomParser(e,f);c.addAttributeFilter("src,href,style",function(k,j){var o=k.length,l,q,n="data-mce-"+j,p=e.url_converter,r=e.url_converter_scope,m;while(o--){l=k[o];q=l.attributes.map[n];if(q!==m){l.attr(j,q.length>0?q:null);l.attr(n,null)}else{q=l.attributes.map[j];if(j==="style"){q=i.serializeStyle(i.parseStyle(q),l.name)}else{if(p){q=p.call(r,q,j,l.name)}}l.attr(j,q.length>0?q:null)}}});c.addAttributeFilter("class",function(j,k){var l=j.length,m,n;while(l--){m=j[l];n=m.attr("class").replace(/\s*mce(Item\w+|Selected)\s*/g,"");m.attr("class",n.length>0?n:null)}});c.addAttributeFilter("data-mce-type",function(j,l,k){var m=j.length,n;while(m--){n=j[m];if(n.attributes.map["data-mce-type"]==="bookmark"&&!k.cleanup){n.remove()}}});c.addNodeFilter("script,style",function(k,l){var m=k.length,n,o;function j(p){return p.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g,"").replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g,"")}while(m--){n=k[m];o=n.firstChild?n.firstChild.value:"";if(l==="script"){n.attr("type",(n.attr("type")||"text/javascript").replace(/^mce\-/,""));if(o.length>0){n.firstChild.value="// <![CDATA[\n"+j(o)+"\n// ]]>"}}else{if(o.length>0){n.firstChild.value="<!--\n"+j(o)+"\n-->"}}}});c.addNodeFilter("#comment",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.value.indexOf("[CDATA[")===0){m.name="#cdata";m.type=4;m.value=m.value.replace(/^\[CDATA\[|\]\]$/g,"")}else{if(m.value.indexOf("mce:protected ")===0){m.name="#text";m.type=3;m.raw=true;m.value=unescape(m.value).substr(14)}}}});c.addNodeFilter("xml:namespace,input",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.type===7){m.remove()}else{if(m.type===1){if(k==="input"&&!("type" in m.attributes.map)){m.attr("type","text")}}}}});if(e.fix_list_elements){c.addNodeFilter("ul,ol",function(k,l){var m=k.length,n,j;while(m--){n=k[m];j=n.parent;if(j.name==="ul"||j.name==="ol"){if(n.prev&&n.prev.name==="li"){n.prev.append(n)}}}})}c.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style",function(j,k){var l=j.length;while(l--){j[l].attr(k,null)}});return{schema:f,addNodeFilter:c.addNodeFilter,addAttributeFilter:c.addAttributeFilter,onPreProcess:h,onPostProcess:b,serialize:function(o,m){var l,p,k,j,n;if(d&&i.select("script,style,select,map").length>0){n=o.innerHTML;o=o.cloneNode(false);i.setHTML(o,n)}else{o=o.cloneNode(true)}l=o.ownerDocument.implementation;if(l.createHTMLDocument){p=l.createHTMLDocument("");g(o.nodeName=="BODY"?o.childNodes:[o],function(q){p.body.appendChild(p.importNode(q,true))});if(o.nodeName!="BODY"){o=p.body.firstChild}else{o=p.body}k=i.doc;i.doc=p}m=m||{};m.format=m.format||"html";if(!m.no_events){m.node=o;h.dispatch(self,m)}j=new a.html.Serializer(e,f);m.content=j.serialize(c.parse(m.getInner?o.innerHTML:a.trim(i.getOuterHTML(o),m),m));if(!m.cleanup){m.content=m.content.replace(/\uFEFF|\u200B/g,"")}if(!m.no_events){b.dispatch(self,m)}if(k){i.doc=k}m.node=null;return m.content},addRules:function(j){f.addValidElements(j)},setRules:function(j){f.setValidElements(j)}}}})(tinymce);(function(a){a.dom.ScriptLoader=function(h){var c=0,k=1,i=2,l={},j=[],f={},d=[],g=0,e;function b(m,v){var x=this,q=a.DOM,s,o,r,n;function p(){q.remove(n);if(s){s.onreadystatechange=s.onload=s=null}v()}function u(){if(typeof(console)!=="undefined"&&console.log){console.log("Failed to load: "+m)}}n=q.uniqueId();if(a.isIE6){o=new a.util.URI(m);r=location;if(o.host==r.hostname&&o.port==r.port&&(o.protocol+":")==r.protocol&&o.protocol.toLowerCase()!="file"){a.util.XHR.send({url:a._addVer(o.getURI()),success:function(y){var t=q.create("script",{type:"text/javascript"});t.text=y;document.getElementsByTagName("head")[0].appendChild(t);q.remove(t);p()},error:u});return}}s=q.create("script",{id:n,type:"text/javascript",src:a._addVer(m)});if(!a.isIE){s.onload=p}s.onerror=u;if(!a.isOpera){s.onreadystatechange=function(){var t=s.readyState;if(t=="complete"||t=="loaded"){p()}}}(document.getElementsByTagName("head")[0]||document.body).appendChild(s)}this.isDone=function(m){return l[m]==i};this.markDone=function(m){l[m]=i};this.add=this.load=function(m,q,n){var o,p=l[m];if(p==e){j.push(m);l[m]=c}if(q){if(!f[m]){f[m]=[]}f[m].push({func:q,scope:n||this})}};this.loadQueue=function(n,m){this.loadScripts(j,n,m)};this.loadScripts=function(m,q,p){var o;function n(r){a.each(f[r],function(s){s.func.call(s.scope)});f[r]=e}d.push({func:q,scope:p||this});o=function(){var r=a.grep(m);m.length=0;a.each(r,function(s){if(l[s]==i){n(s);return}if(l[s]!=k){l[s]=k;g++;b(s,function(){l[s]=i;g--;n(s);o()})}});if(!g){a.each(d,function(s){s.func.call(s.scope)});d.length=0}};o()}};a.ScriptLoader=new a.dom.ScriptLoader()})(tinymce);tinymce.dom.TreeWalker=function(a,c){var b=a;function d(i,f,e,j){var h,g;if(i){if(!j&&i[f]){return i[f]}if(i!=c){h=i[e];if(h){return h}for(g=i.parentNode;g&&g!=c;g=g.parentNode){h=g[e];if(h){return h}}}}}this.current=function(){return b};this.next=function(e){return(b=d(b,"firstChild","nextSibling",e))};this.prev=function(e){return(b=d(b,"lastChild","previousSibling",e))}};(function(a){a.dom.RangeUtils=function(c){var b="\uFEFF";this.walk=function(d,s){var i=d.startContainer,l=d.startOffset,t=d.endContainer,m=d.endOffset,j,g,o,h,r,q,e;e=c.select("td.mceSelected,th.mceSelected");if(e.length>0){a.each(e,function(u){s([u])});return}function f(u){var v;v=u[0];if(v.nodeType===3&&v===i&&l>=v.nodeValue.length){u.splice(0,1)}v=u[u.length-1];if(m===0&&u.length>0&&v===t&&v.nodeType===3){u.splice(u.length-1,1)}return u}function p(x,v,u){var y=[];for(;x&&x!=u;x=x[v]){y.push(x)}return y}function n(v,u){do{if(v.parentNode==u){return v}v=v.parentNode}while(v)}function k(x,v,y){var u=y?"nextSibling":"previousSibling";for(h=x,r=h.parentNode;h&&h!=v;h=r){r=h.parentNode;q=p(h==x?h:h[u],u);if(q.length){if(!y){q.reverse()}s(f(q))}}}if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[l]}if(t.nodeType==1&&t.hasChildNodes()){t=t.childNodes[Math.min(m-1,t.childNodes.length-1)]}if(i==t){return s(f([i]))}j=c.findCommonAncestor(i,t);for(h=i;h;h=h.parentNode){if(h===t){return k(i,j,true)}if(h===j){break}}for(h=t;h;h=h.parentNode){if(h===i){return k(t,j)}if(h===j){break}}g=n(i,j)||i;o=n(t,j)||t;k(i,g,true);q=p(g==i?g:g.nextSibling,"nextSibling",o==t?o.nextSibling:o);if(q.length){s(f(q))}k(t,o)};this.split=function(e){var h=e.startContainer,d=e.startOffset,i=e.endContainer,g=e.endOffset;function f(j,k){return j.splitText(k)}if(h==i&&h.nodeType==3){if(d>0&&d<h.nodeValue.length){i=f(h,d);h=i.previousSibling;if(g>d){g=g-d;h=i=f(i,g).previousSibling;g=i.nodeValue.length;d=0}else{g=0}}}else{if(h.nodeType==3&&d>0&&d<h.nodeValue.length){h=f(h,d);d=0}if(i.nodeType==3&&g>0&&g<i.nodeValue.length){i=f(i,g).previousSibling;g=i.nodeValue.length}}return{startContainer:h,startOffset:d,endContainer:i,endOffset:g}}};a.dom.RangeUtils.compareRanges=function(c,b){if(c&&b){if(c.item||c.duplicate){if(c.item&&b.item&&c.item(0)===b.item(0)){return true}if(c.isEqual&&b.isEqual&&b.isEqual(c)){return true}}else{return c.startContainer==b.startContainer&&c.startOffset==b.startOffset}}return false}})(tinymce);(function(b){var a=b.dom.Event,c=b.each;b.create("tinymce.ui.KeyboardNavigation",{KeyboardNavigation:function(e,f){var p=this,m=e.root,l=e.items,n=e.enableUpDown,i=e.enableLeftRight||!e.enableUpDown,k=e.excludeFromTabOrder,j,h,o,d,g;f=f||b.DOM;j=function(q){g=q.target.id};h=function(q){f.setAttrib(q.target.id,"tabindex","-1")};d=function(q){var r=f.get(g);f.setAttrib(r,"tabindex","0");r.focus()};p.focus=function(){f.get(g).focus()};p.destroy=function(){c(l,function(q){f.unbind(f.get(q.id),"focus",j);f.unbind(f.get(q.id),"blur",h)});f.unbind(f.get(m),"focus",d);f.unbind(f.get(m),"keydown",o);l=f=m=p.focus=j=h=o=d=null;p.destroy=function(){}};p.moveFocus=function(u,r){var q=-1,t=p.controls,s;if(!g){return}c(l,function(x,v){if(x.id===g){q=v;return false}});q+=u;if(q<0){q=l.length-1}else{if(q>=l.length){q=0}}s=l[q];f.setAttrib(g,"tabindex","-1");f.setAttrib(s.id,"tabindex","0");f.get(s.id).focus();if(e.actOnFocus){e.onAction(s.id)}if(r){a.cancel(r)}};o=function(y){var u=37,t=39,x=38,z=40,q=27,s=14,r=13,v=32;switch(y.keyCode){case u:if(i){p.moveFocus(-1)}break;case t:if(i){p.moveFocus(1)}break;case x:if(n){p.moveFocus(-1)}break;case z:if(n){p.moveFocus(1)}break;case q:if(e.onCancel){e.onCancel();a.cancel(y)}break;case s:case r:case v:if(e.onAction){e.onAction(g);a.cancel(y)}break}};c(l,function(s,q){var r;if(!s.id){s.id=f.uniqueId("_mce_item_")}if(k){f.bind(s.id,"blur",h);r="-1"}else{r=(q===0?"0":"-1")}f.setAttrib(s.id,"tabindex",r);f.bind(f.get(s.id),"focus",j)});if(l[0]){g=l[0].id}f.setAttrib(m,"tabindex","-1");f.bind(f.get(m),"focus",d);f.bind(f.get(m),"keydown",o)}})})(tinymce);(function(c){var b=c.DOM,a=c.is;c.create("tinymce.ui.Control",{Control:function(f,e,d){this.id=f;this.settings=e=e||{};this.rendered=false;this.onRender=new c.util.Dispatcher(this);this.classPrefix="";this.scope=e.scope||this;this.disabled=0;this.active=0;this.editor=d},setAriaProperty:function(f,e){var d=b.get(this.id+"_aria")||b.get(this.id);if(d){b.setAttrib(d,"aria-"+f,!!e)}},focus:function(){b.get(this.id).focus()},setDisabled:function(d){if(d!=this.disabled){this.setAriaProperty("disabled",d);this.setState("Disabled",d);this.setState("Enabled",!d);this.disabled=d}},isDisabled:function(){return this.disabled},setActive:function(d){if(d!=this.active){this.setState("Active",d);this.active=d;this.setAriaProperty("pressed",d)}},isActive:function(){return this.active},setState:function(f,d){var e=b.get(this.id);f=this.classPrefix+f;if(d){b.addClass(e,f)}else{b.removeClass(e,f)}},isRendered:function(){return this.rendered},renderHTML:function(){},renderTo:function(d){b.setHTML(d,this.renderHTML())},postRender:function(){var e=this,d;if(a(e.disabled)){d=e.disabled;e.disabled=-1;e.setDisabled(d)}if(a(e.active)){d=e.active;e.active=-1;e.setActive(d)}},remove:function(){b.remove(this.id);this.destroy()},destroy:function(){c.dom.Event.clear(this.id)}})})(tinymce);tinymce.create("tinymce.ui.Container:tinymce.ui.Control",{Container:function(c,b,a){this.parent(c,b,a);this.controls=[];this.lookup={}},add:function(a){this.lookup[a.id]=a;this.controls.push(a);return a},get:function(a){return this.lookup[a]}});tinymce.create("tinymce.ui.Separator:tinymce.ui.Control",{Separator:function(b,a){this.parent(b,a);this.classPrefix="mceSeparator";this.setDisabled(true)},renderHTML:function(){return tinymce.DOM.createHTML("span",{"class":this.classPrefix,role:"separator","aria-orientation":"vertical",tabindex:"-1"})}});(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.MenuItem:tinymce.ui.Control",{MenuItem:function(g,f){this.parent(g,f);this.classPrefix="mceMenuItem"},setSelected:function(f){this.setState("Selected",f);this.setAriaProperty("checked",!!f);this.selected=f},isSelected:function(){return this.selected},postRender:function(){var f=this;f.parent();if(c(f.selected)){f.setSelected(f.selected)}}})})(tinymce);(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.Menu:tinymce.ui.MenuItem",{Menu:function(h,g){var f=this;f.parent(h,g);f.items={};f.collapsed=false;f.menuCount=0;f.onAddItem=new d.util.Dispatcher(this)},expand:function(g){var f=this;if(g){a(f,function(h){if(h.expand){h.expand()}},"items",f)}f.collapsed=false},collapse:function(g){var f=this;if(g){a(f,function(h){if(h.collapse){h.collapse()}},"items",f)}f.collapsed=true},isCollapsed:function(){return this.collapsed},add:function(f){if(!f.settings){f=new d.ui.MenuItem(f.id||b.uniqueId(),f)}this.onAddItem.dispatch(this,f);return this.items[f.id]=f},addSeparator:function(){return this.add({separator:true})},addMenu:function(f){if(!f.collapse){f=this.createMenu(f)}this.menuCount++;return this.add(f)},hasMenus:function(){return this.menuCount!==0},remove:function(f){delete this.items[f.id]},removeAll:function(){var f=this;a(f,function(g){if(g.removeAll){g.removeAll()}else{g.remove()}g.destroy()},"items",f);f.items={}},createMenu:function(g){var f=new d.ui.Menu(g.id||b.uniqueId(),g);f.onAddItem.add(this.onAddItem.dispatch,this.onAddItem);return f}})})(tinymce);(function(e){var d=e.is,c=e.DOM,f=e.each,a=e.dom.Event,b=e.dom.Element;e.create("tinymce.ui.DropMenu:tinymce.ui.Menu",{DropMenu:function(h,g){g=g||{};g.container=g.container||c.doc.body;g.offset_x=g.offset_x||0;g.offset_y=g.offset_y||0;g.vp_offset_x=g.vp_offset_x||0;g.vp_offset_y=g.vp_offset_y||0;if(d(g.icons)&&!g.icons){g["class"]+=" mceNoIcons"}this.parent(h,g);this.onShowMenu=new e.util.Dispatcher(this);this.onHideMenu=new e.util.Dispatcher(this);this.classPrefix="mceMenu"},createMenu:function(j){var h=this,i=h.settings,g;j.container=j.container||i.container;j.parent=h;j.constrain=j.constrain||i.constrain;j["class"]=j["class"]||i["class"];j.vp_offset_x=j.vp_offset_x||i.vp_offset_x;j.vp_offset_y=j.vp_offset_y||i.vp_offset_y;j.keyboard_focus=i.keyboard_focus;g=new e.ui.DropMenu(j.id||c.uniqueId(),j);g.onAddItem.add(h.onAddItem.dispatch,h.onAddItem);return g},focus:function(){var g=this;if(g.keyboardNav){g.keyboardNav.focus()}},update:function(){var i=this,j=i.settings,g=c.get("menu_"+i.id+"_tbl"),l=c.get("menu_"+i.id+"_co"),h,k;h=j.max_width?Math.min(g.clientWidth,j.max_width):g.clientWidth;k=j.max_height?Math.min(g.clientHeight,j.max_height):g.clientHeight;if(!c.boxModel){i.element.setStyles({width:h+2,height:k+2})}else{i.element.setStyles({width:h,height:k})}if(j.max_width){c.setStyle(l,"width",h)}if(j.max_height){c.setStyle(l,"height",k);if(g.clientHeight<j.max_height){c.setStyle(l,"overflow","hidden")}}},showMenu:function(p,n,r){var z=this,A=z.settings,o,g=c.getViewPort(),u,l,v,q,i=2,k,j,m=z.classPrefix;z.collapse(1);if(z.isMenuVisible){return}if(!z.rendered){o=c.add(z.settings.container,z.renderNode());f(z.items,function(h){h.postRender()});z.element=new b("menu_"+z.id,{blocker:1,container:A.container})}else{o=c.get("menu_"+z.id)}if(!e.isOpera){c.setStyles(o,{left:-65535,top:-65535})}c.show(o);z.update();p+=A.offset_x||0;n+=A.offset_y||0;g.w-=4;g.h-=4;if(A.constrain){u=o.clientWidth-i;l=o.clientHeight-i;v=g.x+g.w;q=g.y+g.h;if((p+A.vp_offset_x+u)>v){p=r?r-u:Math.max(0,(v-A.vp_offset_x)-u)}if((n+A.vp_offset_y+l)>q){n=Math.max(0,(q-A.vp_offset_y)-l)}}c.setStyles(o,{left:p,top:n});z.element.update();z.isMenuVisible=1;z.mouseClickFunc=a.add(o,"click",function(s){var h;s=s.target;if(s&&(s=c.getParent(s,"tr"))&&!c.hasClass(s,m+"ItemSub")){h=z.items[s.id];if(h.isDisabled()){return}k=z;while(k){if(k.hideMenu){k.hideMenu()}k=k.settings.parent}if(h.settings.onclick){h.settings.onclick(s)}return a.cancel(s)}});if(z.hasMenus()){z.mouseOverFunc=a.add(o,"mouseover",function(x){var h,t,s;x=x.target;if(x&&(x=c.getParent(x,"tr"))){h=z.items[x.id];if(z.lastMenu){z.lastMenu.collapse(1)}if(h.isDisabled()){return}if(x&&c.hasClass(x,m+"ItemSub")){t=c.getRect(x);h.showMenu((t.x+t.w-i),t.y-i,t.x);z.lastMenu=h;c.addClass(c.get(h.id).firstChild,m+"ItemActive")}}})}a.add(o,"keydown",z._keyHandler,z);z.onShowMenu.dispatch(z);if(A.keyboard_focus){z._setupKeyboardNav()}},hideMenu:function(j){var g=this,i=c.get("menu_"+g.id),h;if(!g.isMenuVisible){return}if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(i,"mouseover",g.mouseOverFunc);a.remove(i,"click",g.mouseClickFunc);a.remove(i,"keydown",g._keyHandler);c.hide(i);g.isMenuVisible=0;if(!j){g.collapse(1)}if(g.element){g.element.hide()}if(h=c.get(g.id)){c.removeClass(h.firstChild,g.classPrefix+"ItemActive")}g.onHideMenu.dispatch(g)},add:function(i){var g=this,h;i=g.parent(i);if(g.isRendered&&(h=c.get("menu_"+g.id))){g._add(c.select("tbody",h)[0],i)}return i},collapse:function(g){this.parent(g);this.hideMenu(1)},remove:function(g){c.remove(g.id);this.destroy();return this.parent(g)},destroy:function(){var g=this,h=c.get("menu_"+g.id);if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(h,"mouseover",g.mouseOverFunc);a.remove(c.select("a",h),"focus",g.mouseOverFunc);a.remove(h,"click",g.mouseClickFunc);a.remove(h,"keydown",g._keyHandler);if(g.element){g.element.remove()}c.remove(h)},renderNode:function(){var i=this,j=i.settings,l,h,k,g;g=c.create("div",{role:"listbox",id:"menu_"+i.id,"class":j["class"],style:"position:absolute;left:0;top:0;z-index:200000;outline:0"});if(i.settings.parent){c.setAttrib(g,"aria-parent","menu_"+i.settings.parent.id)}k=c.add(g,"div",{role:"presentation",id:"menu_"+i.id+"_co","class":i.classPrefix+(j["class"]?" "+j["class"]:"")});i.element=new b("menu_"+i.id,{blocker:1,container:j.container});if(j.menu_line){c.add(k,"span",{"class":i.classPrefix+"Line"})}l=c.add(k,"table",{role:"presentation",id:"menu_"+i.id+"_tbl",border:0,cellPadding:0,cellSpacing:0});h=c.add(l,"tbody");f(i.items,function(m){i._add(h,m)});i.rendered=true;return g},_setupKeyboardNav:function(){var i,h,g=this;i=c.select("#menu_"+g.id)[0];h=c.select("a[role=option]","menu_"+g.id);h.splice(0,0,i);g.keyboardNav=new e.ui.KeyboardNavigation({root:"menu_"+g.id,items:h,onCancel:function(){g.hideMenu()},enableUpDown:true});i.focus()},_keyHandler:function(g){var h=this,i;switch(g.keyCode){case 37:if(h.settings.parent){h.hideMenu();h.settings.parent.focus();a.cancel(g)}break;case 39:if(h.mouseOverFunc){h.mouseOverFunc(g)}break}},_add:function(j,h){var i,q=h.settings,p,l,k,m=this.classPrefix,g;if(q.separator){l=c.add(j,"tr",{id:h.id,"class":m+"ItemSeparator"});c.add(l,"td",{"class":m+"ItemSeparator"});if(i=l.previousSibling){c.addClass(i,"mceLast")}return}i=l=c.add(j,"tr",{id:h.id,"class":m+"Item "+m+"ItemEnabled"});i=k=c.add(i,q.titleItem?"th":"td");i=p=c.add(i,"a",{id:h.id+"_aria",role:q.titleItem?"presentation":"option",href:"javascript:;",onclick:"return false;",onmousedown:"return false;"});if(q.parent){c.setAttrib(p,"aria-haspopup","true");c.setAttrib(p,"aria-owns","menu_"+h.id)}c.addClass(k,q["class"]);g=c.add(i,"span",{"class":"mceIcon"+(q.icon?" mce_"+q.icon:"")});if(q.icon_src){c.add(g,"img",{src:q.icon_src})}i=c.add(i,q.element||"span",{"class":"mceText",title:h.settings.title},h.settings.title);if(h.settings.style){c.setAttrib(i,"style",h.settings.style)}if(j.childNodes.length==1){c.addClass(l,"mceFirst")}if((i=l.previousSibling)&&c.hasClass(i,m+"ItemSeparator")){c.addClass(l,"mceFirst")}if(h.collapse){c.addClass(l,m+"ItemSub")}if(i=l.previousSibling){c.removeClass(i,"mceLast")}c.addClass(l,"mceLast")}})})(tinymce);(function(b){var a=b.DOM;b.create("tinymce.ui.Button:tinymce.ui.Control",{Button:function(e,d,c){this.parent(e,d,c);this.classPrefix="mceButton"},renderHTML:function(){var f=this.classPrefix,e=this.settings,d,c;c=a.encode(e.label||"");d='<a role="button" id="'+this.id+'" href="javascript:;" class="'+f+" "+f+"Enabled "+e["class"]+(c?" "+f+"Labeled":"")+'" onmousedown="return false;" onclick="return false;" aria-labelledby="'+this.id+'_voice" title="'+a.encode(e.title)+'">';if(e.image&&!(this.editor&&this.editor.forcedHighContrastMode)){d+='<img class="mceIcon" src="'+e.image+'" alt="'+a.encode(e.title)+'" />'+c}else{d+='<span class="mceIcon '+e["class"]+'"></span>'+(c?'<span class="'+f+'Label">'+c+"</span>":"")}d+='<span class="mceVoiceLabel mceIconOnly" style="display: none;" id="'+this.id+'_voice">'+e.title+"</span>";d+="</a>";return d},postRender:function(){var c=this,d=c.settings;b.dom.Event.add(c.id,"click",function(f){if(!c.isDisabled()){return d.onclick.call(d.scope,f)}})}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.ListBox:tinymce.ui.Control",{ListBox:function(i,h,f){var g=this;g.parent(i,h,f);g.items=[];g.onChange=new a(g);g.onPostRender=new a(g);g.onAdd=new a(g);g.onRenderMenu=new d.util.Dispatcher(this);g.classPrefix="mceListBox"},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){var h=this,i,j,g;if(f!=h.selectedIndex){i=c.get(h.id+"_text");g=c.get(h.id+"_voiceDesc");j=h.items[f];if(j){h.selectedValue=j.value;h.selectedIndex=f;c.setHTML(i,c.encode(j.title));c.setHTML(g,h.settings.title+" - "+j.title);c.removeClass(i,"mceTitle");c.setAttrib(h.id,"aria-valuenow",j.title)}else{c.setHTML(i,c.encode(h.settings.title));c.setHTML(g,c.encode(h.settings.title));c.addClass(i,"mceTitle");h.selectedValue=h.selectedIndex=null;c.setAttrib(h.id,"aria-valuenow",h.settings.title)}i=0}},add:function(i,f,h){var g=this;h=h||{};h=d.extend(h,{title:i,value:f});g.items.push(h);g.onAdd.dispatch(g,h)},getLength:function(){return this.items.length},renderHTML:function(){var i="",f=this,g=f.settings,j=f.classPrefix;i='<span role="listbox" aria-haspopup="true" aria-labelledby="'+f.id+'_voiceDesc" aria-describedby="'+f.id+'_voiceDesc"><table role="presentation" tabindex="0" id="'+f.id+'" cellpadding="0" cellspacing="0" class="'+j+" "+j+"Enabled"+(g["class"]?(" "+g["class"]):"")+'"><tbody><tr>';i+="<td>"+c.createHTML("span",{id:f.id+"_voiceDesc","class":"voiceLabel",style:"display:none;"},f.settings.title);i+=c.createHTML("a",{id:f.id+"_text",tabindex:-1,href:"javascript:;","class":"mceText",onclick:"return false;",onmousedown:"return false;"},c.encode(f.settings.title))+"</td>";i+="<td>"+c.createHTML("a",{id:f.id+"_open",tabindex:-1,href:"javascript:;","class":"mceOpen",onclick:"return false;",onmousedown:"return false;"},'<span><span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span></span>')+"</td>";i+="</tr></tbody></table></span>";return i},showMenu:function(){var g=this,i,h=c.get(this.id),f;if(g.isDisabled()||g.items.length==0){return}if(g.menu&&g.menu.isMenuVisible){return g.hideMenu()}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}i=c.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.keyboard_focus=!d.isOpera;if(g.oldID){f.items[g.oldID].setSelected(0)}e(g.items,function(j){if(j.value===g.selectedValue){f.items[j.id].setSelected(1);g.oldID=j.id}});f.showMenu(0,h.clientHeight);b.add(c.doc,"mousedown",g.hideMenu,g);c.addClass(g.id,g.classPrefix+"Selected")},hideMenu:function(g){var f=this;if(f.menu&&f.menu.isMenuVisible){c.removeClass(f.id,f.classPrefix+"Selected");if(g&&g.type=="mousedown"&&(g.target.id==f.id+"_text"||g.target.id==f.id+"_open")){return}if(!g||!c.getParent(g.target,".mceMenu")){c.removeClass(f.id,f.classPrefix+"Selected");b.remove(c.doc,"mousedown",f.hideMenu,f);f.menu.hideMenu()}}},renderMenu:function(){var g=this,f;f=g.settings.control_manager.createDropMenu(g.id+"_menu",{menu_line:1,"class":g.classPrefix+"Menu mceNoIcons",max_width:150,max_height:150});f.onHideMenu.add(function(){g.hideMenu();g.focus()});f.add({title:g.settings.title,"class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}});e(g.items,function(h){if(h.value===undefined){f.add({title:h.title,role:"option","class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}})}else{h.id=c.uniqueId();h.role="option";h.onclick=function(){if(g.settings.onselect(h.value)!==false){g.select(h.value)}};f.add(h)}});g.onRenderMenu.dispatch(g,f);g.menu=f},postRender:function(){var f=this,g=f.classPrefix;b.add(f.id,"click",f.showMenu,f);b.add(f.id,"keydown",function(h){if(h.keyCode==32){f.showMenu(h);b.cancel(h)}});b.add(f.id,"focus",function(){if(!f._focused){f.keyDownHandler=b.add(f.id,"keydown",function(h){if(h.keyCode==40){f.showMenu();b.cancel(h)}});f.keyPressHandler=b.add(f.id,"keypress",function(i){var h;if(i.keyCode==13){h=f.selectedValue;f.selectedValue=null;b.cancel(i);f.settings.onselect(h)}})}f._focused=1});b.add(f.id,"blur",function(){b.remove(f.id,"keydown",f.keyDownHandler);b.remove(f.id,"keypress",f.keyPressHandler);f._focused=0});if(d.isIE6||!c.boxModel){b.add(f.id,"mouseover",function(){if(!c.hasClass(f.id,g+"Disabled")){c.addClass(f.id,g+"Hover")}});b.add(f.id,"mouseout",function(){if(!c.hasClass(f.id,g+"Disabled")){c.removeClass(f.id,g+"Hover")}})}f.onPostRender.dispatch(f,c.get(f.id))},destroy:function(){this.parent();b.clear(this.id+"_text");b.clear(this.id+"_open")}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.NativeListBox:tinymce.ui.ListBox",{NativeListBox:function(g,f){this.parent(g,f);this.classPrefix="mceNativeListBox"},setDisabled:function(f){c.get(this.id).disabled=f;this.setAriaProperty("disabled",f)},isDisabled:function(){return c.get(this.id).disabled},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){c.get(this.id).selectedIndex=f+1;this.selectedValue=this.items[f]?this.items[f].value:null},add:function(j,g,f){var i,h=this;f=f||{};f.value=g;if(h.isRendered()){c.add(c.get(this.id),"option",f,j)}i={title:j,value:g,attribs:f};h.items.push(i);h.onAdd.dispatch(h,i)},getLength:function(){return this.items.length},renderHTML:function(){var g,f=this;g=c.createHTML("option",{value:""},"-- "+f.settings.title+" --");e(f.items,function(h){g+=c.createHTML("option",{value:h.value},h.title)});g=c.createHTML("select",{id:f.id,"class":"mceNativeListBox","aria-labelledby":f.id+"_aria"},g);g+=c.createHTML("span",{id:f.id+"_aria",style:"display: none"},f.settings.title);return g},postRender:function(){var g=this,h,i=true;g.rendered=true;function f(k){var j=g.items[k.target.selectedIndex-1];if(j&&(j=j.value)){g.onChange.dispatch(g,j);if(g.settings.onselect){g.settings.onselect(j)}}}b.add(g.id,"change",f);b.add(g.id,"keydown",function(k){var j;b.remove(g.id,"change",h);i=false;j=b.add(g.id,"blur",function(){if(i){return}i=true;b.add(g.id,"change",f);b.remove(g.id,"blur",j)});if(d.isWebKit&&(k.keyCode==37||k.keyCode==39)){return b.prevent(k)}if(k.keyCode==13||k.keyCode==32){f(k);return b.cancel(k)}});g.onPostRender.dispatch(g,c.get(g.id))}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.MenuButton:tinymce.ui.Button",{MenuButton:function(g,f,e){this.parent(g,f,e);this.onRenderMenu=new c.util.Dispatcher(this);f.menu_container=f.menu_container||b.doc.body},showMenu:function(){var g=this,j,i,h=b.get(g.id),f;if(g.isDisabled()){return}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}if(g.isMenuVisible){return g.hideMenu()}j=b.getPos(g.settings.menu_container);i=b.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.vp_offset_x=i.x;f.settings.vp_offset_y=i.y;f.settings.keyboard_focus=g._focused;f.showMenu(0,h.clientHeight);a.add(b.doc,"mousedown",g.hideMenu,g);g.setState("Selected",1);g.isMenuVisible=1},renderMenu:function(){var f=this,e;e=f.settings.control_manager.createDropMenu(f.id+"_menu",{menu_line:1,"class":this.classPrefix+"Menu",icons:f.settings.icons});e.onHideMenu.add(function(){f.hideMenu();f.focus()});f.onRenderMenu.dispatch(f,e);f.menu=e},hideMenu:function(g){var f=this;if(g&&g.type=="mousedown"&&b.getParent(g.target,function(h){return h.id===f.id||h.id===f.id+"_open"})){return}if(!g||!b.getParent(g.target,".mceMenu")){f.setState("Selected",0);a.remove(b.doc,"mousedown",f.hideMenu,f);if(f.menu){f.menu.hideMenu()}}f.isMenuVisible=0},postRender:function(){var e=this,f=e.settings;a.add(e.id,"click",function(){if(!e.isDisabled()){if(f.onclick){f.onclick(e.value)}e.showMenu()}})}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.SplitButton:tinymce.ui.MenuButton",{SplitButton:function(g,f,e){this.parent(g,f,e);this.classPrefix="mceSplitButton"},renderHTML:function(){var i,f=this,g=f.settings,e;i="<tbody><tr>";if(g.image){e=b.createHTML("img ",{src:g.image,role:"presentation","class":"mceAction "+g["class"]})}else{e=b.createHTML("span",{"class":"mceAction "+g["class"]},"")}e+=b.createHTML("span",{"class":"mceVoiceLabel mceIconOnly",id:f.id+"_voice",style:"display:none;"},g.title);i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_action",tabindex:"-1",href:"javascript:;","class":"mceAction "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";e=b.createHTML("span",{"class":"mceOpen "+g["class"]},'<span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span>');i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_open",tabindex:"-1",href:"javascript:;","class":"mceOpen "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";i+="</tr></tbody>";i=b.createHTML("table",{role:"presentation","class":"mceSplitButton mceSplitButtonEnabled "+g["class"],cellpadding:"0",cellspacing:"0",title:g.title},i);return b.createHTML("div",{id:f.id,role:"button",tabindex:"0","aria-labelledby":f.id+"_voice","aria-haspopup":"true"},i)},postRender:function(){var e=this,g=e.settings,f;if(g.onclick){f=function(h){if(!e.isDisabled()){g.onclick(e.value);a.cancel(h)}};a.add(e.id+"_action","click",f);a.add(e.id,["click","keydown"],function(h){var k=32,m=14,i=13,j=38,l=40;if((h.keyCode===32||h.keyCode===13||h.keyCode===14)&&!h.altKey&&!h.ctrlKey&&!h.metaKey){f();a.cancel(h)}else{if(h.type==="click"||h.keyCode===l){e.showMenu();a.cancel(h)}}})}a.add(e.id+"_open","click",function(h){e.showMenu();a.cancel(h)});a.add([e.id,e.id+"_open"],"focus",function(){e._focused=1});a.add([e.id,e.id+"_open"],"blur",function(){e._focused=0});if(c.isIE6||!b.boxModel){a.add(e.id,"mouseover",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.addClass(e.id,"mceSplitButtonHover")}});a.add(e.id,"mouseout",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.removeClass(e.id,"mceSplitButtonHover")}})}},destroy:function(){this.parent();a.clear(this.id+"_action");a.clear(this.id+"_open");a.clear(this.id)}})})(tinymce);(function(d){var c=d.DOM,a=d.dom.Event,b=d.is,e=d.each;d.create("tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton",{ColorSplitButton:function(i,h,f){var g=this;g.parent(i,h,f);g.settings=h=d.extend({colors:"000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,008000,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF",grid_width:8,default_color:"#888888"},g.settings);g.onShowMenu=new d.util.Dispatcher(g);g.onHideMenu=new d.util.Dispatcher(g);g.value=h.default_color},showMenu:function(){var f=this,g,j,i,h;if(f.isDisabled()){return}if(!f.isMenuRendered){f.renderMenu();f.isMenuRendered=true}if(f.isMenuVisible){return f.hideMenu()}i=c.get(f.id);c.show(f.id+"_menu");c.addClass(i,"mceSplitButtonSelected");h=c.getPos(i);c.setStyles(f.id+"_menu",{left:h.x,top:h.y+i.clientHeight,zIndex:200000});i=0;a.add(c.doc,"mousedown",f.hideMenu,f);f.onShowMenu.dispatch(f);if(f._focused){f._keyHandler=a.add(f.id+"_menu","keydown",function(k){if(k.keyCode==27){f.hideMenu()}});c.select("a",f.id+"_menu")[0].focus()}f.isMenuVisible=1},hideMenu:function(g){var f=this;if(f.isMenuVisible){if(g&&g.type=="mousedown"&&c.getParent(g.target,function(h){return h.id===f.id+"_open"})){return}if(!g||!c.getParent(g.target,".mceSplitButtonMenu")){c.removeClass(f.id,"mceSplitButtonSelected");a.remove(c.doc,"mousedown",f.hideMenu,f);a.remove(f.id+"_menu","keydown",f._keyHandler);c.hide(f.id+"_menu")}f.isMenuVisible=0;f.onHideMenu.dispatch()}},renderMenu:function(){var p=this,h,k=0,q=p.settings,g,j,l,o,f;o=c.add(q.menu_container,"div",{role:"listbox",id:p.id+"_menu","class":q.menu_class+" "+q["class"],style:"position:absolute;left:0;top:-1000px;"});h=c.add(o,"div",{"class":q["class"]+" mceSplitButtonMenu"});c.add(h,"span",{"class":"mceMenuLine"});g=c.add(h,"table",{role:"presentation","class":"mceColorSplitMenu"});j=c.add(g,"tbody");k=0;e(b(q.colors,"array")?q.colors:q.colors.split(","),function(i){i=i.replace(/^#/,"");if(!k--){l=c.add(j,"tr");k=q.grid_width-1}g=c.add(l,"td");g=c.add(g,"a",{role:"option",href:"javascript:;",style:{backgroundColor:"#"+i},title:p.editor.getLang("colors."+i,i),"data-mce-color":"#"+i});if(p.editor.forcedHighContrastMode){g=c.add(g,"canvas",{width:16,height:16,"aria-hidden":"true"});if(g.getContext&&(f=g.getContext("2d"))){f.fillStyle="#"+i;f.fillRect(0,0,16,16)}else{c.remove(g)}}});if(q.more_colors_func){g=c.add(j,"tr");g=c.add(g,"td",{colspan:q.grid_width,"class":"mceMoreColors"});g=c.add(g,"a",{role:"option",id:p.id+"_more",href:"javascript:;",onclick:"return false;","class":"mceMoreColors"},q.more_colors_title);a.add(g,"click",function(i){q.more_colors_func.call(q.more_colors_scope||this);return a.cancel(i)})}c.addClass(h,"mceColorSplitMenu");new d.ui.KeyboardNavigation({root:p.id+"_menu",items:c.select("a",p.id+"_menu"),onCancel:function(){p.hideMenu();p.focus()}});a.add(p.id+"_menu","mousedown",function(i){return a.cancel(i)});a.add(p.id+"_menu","click",function(i){var m;i=c.getParent(i.target,"a",j);if(i&&i.nodeName.toLowerCase()=="a"&&(m=i.getAttribute("data-mce-color"))){p.setColor(m)}return a.cancel(i)});return o},setColor:function(f){this.displayColor(f);this.hideMenu();this.settings.onselect(f)},displayColor:function(g){var f=this;c.setStyle(f.id+"_preview","backgroundColor",g);f.value=g},postRender:function(){var f=this,g=f.id;f.parent();c.add(g+"_action","div",{id:g+"_preview","class":"mceColorPreview"});c.setStyle(f.id+"_preview","backgroundColor",f.value)},destroy:function(){this.parent();a.clear(this.id+"_menu");a.clear(this.id+"_more");c.remove(this.id+"_menu")}})})(tinymce);(function(b){var d=b.DOM,c=b.each,a=b.dom.Event;b.create("tinymce.ui.ToolbarGroup:tinymce.ui.Container",{renderHTML:function(){var f=this,i=[],e=f.controls,j=b.each,g=f.settings;i.push('<div id="'+f.id+'" role="group" aria-labelledby="'+f.id+'_voice">');i.push("<span role='application'>");i.push('<span id="'+f.id+'_voice" class="mceVoiceLabel" style="display:none;">'+d.encode(g.name)+"</span>");j(e,function(h){i.push(h.renderHTML())});i.push("</span>");i.push("</div>");return i.join("")},focus:function(){var e=this;d.get(e.id).focus()},postRender:function(){var f=this,e=[];c(f.controls,function(g){c(g.controls,function(h){if(h.id){e.push(h)}})});f.keyNav=new b.ui.KeyboardNavigation({root:f.id,items:e,onCancel:function(){if(b.isWebKit){d.get(f.editor.id+"_ifr").focus()}f.editor.focus()},excludeFromTabOrder:!f.settings.tab_focus_toolbar})},destroy:function(){var e=this;e.parent();e.keyNav.destroy();a.clear(e.id)}})})(tinymce);(function(a){var c=a.DOM,b=a.each;a.create("tinymce.ui.Toolbar:tinymce.ui.Container",{renderHTML:function(){var m=this,f="",j,k,n=m.settings,e,d,g,l;l=m.controls;for(e=0;e<l.length;e++){k=l[e];d=l[e-1];g=l[e+1];if(e===0){j="mceToolbarStart";if(k.Button){j+=" mceToolbarStartButton"}else{if(k.SplitButton){j+=" mceToolbarStartSplitButton"}else{if(k.ListBox){j+=" mceToolbarStartListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"))}if(d&&k.ListBox){if(d.Button||d.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarEnd"},c.createHTML("span",null,"<!-- IE -->"))}}if(c.stdMode){f+='<td style="position: relative">'+k.renderHTML()+"</td>"}else{f+="<td>"+k.renderHTML()+"</td>"}if(g&&k.ListBox){if(g.Button||g.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarStart"},c.createHTML("span",null,"<!-- IE -->"))}}}j="mceToolbarEnd";if(k.Button){j+=" mceToolbarEndButton"}else{if(k.SplitButton){j+=" mceToolbarEndSplitButton"}else{if(k.ListBox){j+=" mceToolbarEndListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"));return c.createHTML("table",{id:m.id,"class":"mceToolbar"+(n["class"]?" "+n["class"]:""),cellpadding:"0",cellspacing:"0",align:m.settings.align||"",role:"presentation",tabindex:"-1"},"<tbody><tr>"+f+"</tr></tbody>")}})})(tinymce);(function(b){var a=b.util.Dispatcher,c=b.each;b.create("tinymce.AddOnManager",{AddOnManager:function(){var d=this;d.items=[];d.urls={};d.lookup={};d.onAdd=new a(d)},get:function(d){if(this.lookup[d]){return this.lookup[d].instance}else{return undefined}},dependencies:function(e){var d;if(this.lookup[e]){d=this.lookup[e].dependencies}return d||[]},requireLangPack:function(e){var d=b.settings;if(d&&d.language&&d.language_load!==false){b.ScriptLoader.add(this.urls[e]+"/langs/"+d.language+".js")}},add:function(f,e,d){this.items.push(e);this.lookup[f]={instance:e,dependencies:d};this.onAdd.dispatch(this,f,e);return e},createUrl:function(d,e){if(typeof e==="object"){return e}else{return{prefix:d.prefix,resource:e,suffix:d.suffix}}},addComponents:function(f,d){var e=this.urls[f];b.each(d,function(g){b.ScriptLoader.add(e+"/"+g)})},load:function(j,f,d,h){var g=this,e=f;function i(){var k=g.dependencies(j);b.each(k,function(m){var l=g.createUrl(f,m);g.load(l.resource,l,undefined,undefined)});if(d){if(h){d.call(h)}else{d.call(b.ScriptLoader)}}}if(g.urls[j]){return}if(typeof f==="object"){e=f.prefix+f.resource+f.suffix}if(e.indexOf("/")!=0&&e.indexOf("://")==-1){e=b.baseURL+"/"+e}g.urls[j]=e.substring(0,e.lastIndexOf("/"));if(g.lookup[j]){i()}else{b.ScriptLoader.add(e,i,h)}}});b.PluginManager=new b.AddOnManager();b.ThemeManager=new b.AddOnManager()}(tinymce));(function(j){var g=j.each,d=j.extend,k=j.DOM,i=j.dom.Event,f=j.ThemeManager,b=j.PluginManager,e=j.explode,h=j.util.Dispatcher,a,c=0;j.documentBaseURL=window.location.href.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,"");if(!/[\/\\]$/.test(j.documentBaseURL)){j.documentBaseURL+="/"}j.baseURL=new j.util.URI(j.documentBaseURL).toAbsolute(j.baseURL);j.baseURI=new j.util.URI(j.baseURL);j.onBeforeUnload=new h(j);i.add(window,"beforeunload",function(l){j.onBeforeUnload.dispatch(j,l)});j.onAddEditor=new h(j);j.onRemoveEditor=new h(j);j.EditorManager=d(j,{editors:[],i18n:{},activeEditor:null,init:function(q){var n=this,p,l=j.ScriptLoader,u,o=[],m;function r(x,y,t){var v=x[y];if(!v){return}if(j.is(v,"string")){t=v.replace(/\.\w+$/,"");t=t?j.resolve(t):0;v=j.resolve(v)}return v.apply(t||this,Array.prototype.slice.call(arguments,2))}q=d({theme:"simple",language:"en"},q);n.settings=q;i.add(document,"init",function(){var s,v;r(q,"onpageload");switch(q.mode){case"exact":s=q.elements||"";if(s.length>0){g(e(s),function(x){if(k.get(x)){m=new j.Editor(x,q);o.push(m);m.render(1)}else{g(document.forms,function(y){g(y.elements,function(z){if(z.name===x){x="mce_editor_"+c++;k.setAttrib(z,"id",x);m=new j.Editor(x,q);o.push(m);m.render(1)}})})}})}break;case"textareas":case"specific_textareas":function t(y,x){return x.constructor===RegExp?x.test(y.className):k.hasClass(y,x)}g(k.select("textarea"),function(x){if(q.editor_deselector&&t(x,q.editor_deselector)){return}if(!q.editor_selector||t(x,q.editor_selector)){u=k.get(x.name);if(!x.id&&!u){x.id=x.name}if(!x.id||n.get(x.id)){x.id=k.uniqueId()}m=new j.Editor(x.id,q);o.push(m);m.render(1)}});break}if(q.oninit){s=v=0;g(o,function(x){v++;if(!x.initialized){x.onInit.add(function(){s++;if(s==v){r(q,"oninit")}})}else{s++}if(s==v){r(q,"oninit")}})}})},get:function(l){if(l===a){return this.editors}return this.editors[l]},getInstanceById:function(l){return this.get(l)},add:function(m){var l=this,n=l.editors;n[m.id]=m;n.push(m);l._setActive(m);l.onAddEditor.dispatch(l,m);return m},remove:function(n){var m=this,l,o=m.editors;if(!o[n.id]){return null}delete o[n.id];for(l=0;l<o.length;l++){if(o[l]==n){o.splice(l,1);break}}if(m.activeEditor==n){m._setActive(o[0])}n.destroy();m.onRemoveEditor.dispatch(m,n);return n},execCommand:function(r,p,o){var q=this,n=q.get(o),l;switch(r){case"mceFocus":n.focus();return true;case"mceAddEditor":case"mceAddControl":if(!q.get(o)){new j.Editor(o,q.settings).render()}return true;case"mceAddFrameControl":l=o.window;l.tinyMCE=tinyMCE;l.tinymce=j;j.DOM.doc=l.document;j.DOM.win=l;n=new j.Editor(o.element_id,o);n.render();if(j.isIE){function m(){n.destroy();l.detachEvent("onunload",m);l=l.tinyMCE=l.tinymce=null}l.attachEvent("onunload",m)}o.page_window=null;return true;case"mceRemoveEditor":case"mceRemoveControl":if(n){n.remove()}return true;case"mceToggleEditor":if(!n){q.execCommand("mceAddControl",0,o);return true}if(n.isHidden()){n.show()}else{n.hide()}return true}if(q.activeEditor){return q.activeEditor.execCommand(r,p,o)}return false},execInstanceCommand:function(p,o,n,m){var l=this.get(p);if(l){return l.execCommand(o,n,m)}return false},triggerSave:function(){g(this.editors,function(l){l.save()})},addI18n:function(n,q){var l,m=this.i18n;if(!j.is(n,"string")){g(n,function(r,p){g(r,function(t,s){g(t,function(v,u){if(s==="common"){m[p+"."+u]=v}else{m[p+"."+s+"."+u]=v}})})})}else{g(q,function(r,p){m[n+"."+p]=r})}},_setActive:function(l){this.selectedInstance=this.activeEditor=l}})})(tinymce);(function(m){var n=m.DOM,j=m.dom.Event,f=m.extend,k=m.util.Dispatcher,i=m.each,a=m.isGecko,b=m.isIE,e=m.isWebKit,d=m.is,h=m.ThemeManager,c=m.PluginManager,o=m.inArray,l=m.grep,g=m.explode;m.create("tinymce.Editor",{Editor:function(r,q){var p=this;p.id=p.editorId=r;p.execCommands={};p.queryStateCommands={};p.queryValueCommands={};p.isNotDirty=false;p.plugins={};i(["onPreInit","onBeforeRenderUI","onPostRender","onInit","onRemove","onActivate","onDeactivate","onClick","onEvent","onMouseUp","onMouseDown","onDblClick","onKeyDown","onKeyUp","onKeyPress","onContextMenu","onSubmit","onReset","onPaste","onPreProcess","onPostProcess","onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent","onLoadContent","onSaveContent","onNodeChange","onChange","onBeforeExecCommand","onExecCommand","onUndo","onRedo","onVisualAid","onSetProgressState"],function(s){p[s]=new k(p)});p.settings=q=f({id:r,language:"en",docs_language:"en",theme:"simple",skin:"default",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:m.documentBaseURL,add_form_submit_trigger:1,submit_patch:1,add_unload_trigger:1,convert_urls:1,relative_urls:1,remove_script_host:1,table_inline_editing:0,object_resizing:1,cleanup:1,accessibility_focus:1,custom_shortcuts:1,custom_undo_redo_keyboard_shortcuts:1,custom_undo_redo_restore_selection:1,custom_undo_redo:1,doctype:m.isIE6?'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">':"<!DOCTYPE>",visual_table_class:"mceItemTable",visual:1,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%",apply_source_formatting:1,directionality:"ltr",forced_root_block:"p",hidden_input:1,padd_empty_editor:1,render_ui:1,init_theme:1,force_p_newlines:1,indentation:"30px",keep_styles:1,fix_table_elements:1,inline_styles:1,convert_fonts_to_spans:true,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",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr",validate:true,entity_encoding:"named",url_converter:p.convertURL,url_converter_scope:p,ie7_compat:true},q);p.documentBaseURI=new m.util.URI(q.document_base_url||m.documentBaseURL,{base_uri:tinyMCE.baseURI});p.baseURI=m.baseURI;p.contentCSS=[];p.execCallback("setup",p)},render:function(r){var u=this,v=u.settings,x=u.id,p=m.ScriptLoader;if(!j.domLoaded){j.add(document,"init",function(){u.render()});return}tinyMCE.settings=v;if(!u.getElement()){return}if(m.isIDevice&&!m.isIOS5){return}if(!/TEXTAREA|INPUT/i.test(u.getElement().nodeName)&&v.hidden_input&&n.getParent(x,"form")){n.insertAfter(n.create("input",{type:"hidden",name:x}),x)}if(m.WindowManager){u.windowManager=new m.WindowManager(u)}if(v.encoding=="xml"){u.onGetContent.add(function(s,t){if(t.save){t.content=n.encode(t.content)}})}if(v.add_form_submit_trigger){u.onSubmit.addToTop(function(){if(u.initialized){u.save();u.isNotDirty=1}})}if(v.add_unload_trigger){u._beforeUnload=tinyMCE.onBeforeUnload.add(function(){if(u.initialized&&!u.destroyed&&!u.isHidden()){u.save({format:"raw",no_events:true})}})}m.addUnload(u.destroy,u);if(v.submit_patch){u.onBeforeRenderUI.add(function(){var s=u.getElement().form;if(!s){return}if(s._mceOldSubmit){return}if(!s.submit.nodeType&&!s.submit.length){u.formElement=s;s._mceOldSubmit=s.submit;s.submit=function(){m.triggerSave();u.isNotDirty=1;return u.formElement._mceOldSubmit(u.formElement)}}s=null})}function q(){if(v.language&&v.language_load!==false){p.add(m.baseURL+"/langs/"+v.language+".js")}if(v.theme&&v.theme.charAt(0)!="-"&&!h.urls[v.theme]){h.load(v.theme,"themes/"+v.theme+"/editor_template"+m.suffix+".js")}i(g(v.plugins),function(t){if(t&&!c.urls[t]){if(t.charAt(0)=="-"){t=t.substr(1,t.length);var s=c.dependencies(t);i(s,function(z){var y={prefix:"plugins/",resource:z,suffix:"/editor_plugin"+m.suffix+".js"};var z=c.createUrl(y,z);c.load(z.resource,z)})}else{if(t=="safari"){return}c.load(t,{prefix:"plugins/",resource:t,suffix:"/editor_plugin"+m.suffix+".js"})}}});p.loadQueue(function(){if(!u.removed){u.init()}})}q()},init:function(){var r,H=this,I=H.settings,E,A,D=H.getElement(),q,p,F,y,C,G,z,v=[];m.add(H);I.aria_label=I.aria_label||n.getAttrib(D,"aria-label",H.getLang("aria.rich_text_area"));if(I.theme){I.theme=I.theme.replace(/-/,"");q=h.get(I.theme);H.theme=new q();if(H.theme.init&&I.init_theme){H.theme.init(H,h.urls[I.theme]||m.documentBaseURL.replace(/\/$/,""))}}function B(J){var K=c.get(J),t=c.urls[J]||m.documentBaseURL.replace(/\/$/,""),s;if(K&&m.inArray(v,J)===-1){i(c.dependencies(J),function(u){B(u)});s=new K(H,t);H.plugins[J]=s;if(s.init){s.init(H,t);v.push(J)}}}i(g(I.plugins.replace(/\-/g,"")),B);if(I.popup_css!==false){if(I.popup_css){I.popup_css=H.documentBaseURI.toAbsolute(I.popup_css)}else{I.popup_css=H.baseURI.toAbsolute("themes/"+I.theme+"/skins/"+I.skin+"/dialog.css")}}if(I.popup_css_add){I.popup_css+=","+H.documentBaseURI.toAbsolute(I.popup_css_add)}H.controlManager=new m.ControlManager(H);if(I.custom_undo_redo){H.onBeforeExecCommand.add(function(t,J,u,K,s){if(J!="Undo"&&J!="Redo"&&J!="mceRepaint"&&(!s||!s.skip_undo)){H.undoManager.beforeChange()}});H.onExecCommand.add(function(t,J,u,K,s){if(J!="Undo"&&J!="Redo"&&J!="mceRepaint"&&(!s||!s.skip_undo)){H.undoManager.add()}})}H.onExecCommand.add(function(s,t){if(!/^(FontName|FontSize)$/.test(t)){H.nodeChanged()}});if(a){function x(s,t){if(!t||!t.initial){H.execCommand("mceRepaint")}}H.onUndo.add(x);H.onRedo.add(x);H.onSetContent.add(x)}H.onBeforeRenderUI.dispatch(H,H.controlManager);if(I.render_ui){E=I.width||D.style.width||D.offsetWidth;A=I.height||D.style.height||D.offsetHeight;H.orgDisplay=D.style.display;G=/^[0-9\.]+(|px)$/i;if(G.test(""+E)){E=Math.max(parseInt(E)+(q.deltaWidth||0),100)}if(G.test(""+A)){A=Math.max(parseInt(A)+(q.deltaHeight||0),100)}q=H.theme.renderUI({targetNode:D,width:E,height:A,deltaWidth:I.delta_width,deltaHeight:I.delta_height});H.editorContainer=q.editorContainer}if(document.domain&&location.hostname!=document.domain){m.relaxedDomain=document.domain}n.setStyles(q.sizeContainer||q.editorContainer,{width:E,height:A});if(I.content_css){m.each(g(I.content_css),function(s){H.contentCSS.push(H.documentBaseURI.toAbsolute(s))})}A=(q.iframeHeight||A)+(typeof(A)=="number"?(q.deltaHeight||0):"");if(A<100){A=100}H.iframeHTML=I.doctype+'<html><head xmlns="http://www.w3.org/1999/xhtml">';if(I.document_base_url!=m.documentBaseURL){H.iframeHTML+='<base href="'+H.documentBaseURI.getURI()+'" />'}if(I.ie7_compat){H.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=7" />'}else{H.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=edge" />'}H.iframeHTML+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';for(z=0;z<H.contentCSS.length;z++){H.iframeHTML+='<link type="text/css" rel="stylesheet" href="'+H.contentCSS[z]+'" />'}y=I.body_id||"tinymce";if(y.indexOf("=")!=-1){y=H.getParam("body_id","","hash");y=y[H.id]||y}C=I.body_class||"";if(C.indexOf("=")!=-1){C=H.getParam("body_class","","hash");C=C[H.id]||""}H.iframeHTML+='</head><body id="'+y+'" class="mceContentBody '+C+'"><br></body></html>';if(m.relaxedDomain&&(b||(m.isOpera&&parseFloat(opera.version())<11))){F='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinyMCE.get("'+H.id+'");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()'}r=n.add(q.iframeContainer,"iframe",{id:H.id+"_ifr",src:F||'javascript:""',frameBorder:"0",allowTransparency:"true",title:I.aria_label,style:{width:"100%",height:A,display:"block"}});H.contentAreaContainer=q.iframeContainer;n.get(q.editorContainer).style.display=H.orgDisplay;n.get(H.id).style.display="none";n.setAttrib(H.id,"aria-hidden",true);if(!m.relaxedDomain||!F){H.setupIframe()}D=r=q=null},setupIframe:function(){var q=this,v=q.settings,x=n.get(q.id),y=q.getDoc(),u,p;if(!b||!m.relaxedDomain){y.open();y.write(q.iframeHTML);y.close();if(m.relaxedDomain){y.domain=m.relaxedDomain}}p=q.getBody();p.disabled=true;if(!v.readonly){p.contentEditable=true}p.disabled=false;q.schema=new m.html.Schema(v);q.dom=new m.dom.DOMUtils(q.getDoc(),{keep_values:true,url_converter:q.convertURL,url_converter_scope:q,hex_colors:v.force_hex_style_colors,class_filter:v.class_filter,update_styles:1,fix_ie_paragraphs:1,schema:q.schema});q.parser=new m.html.DomParser(v,q.schema);if(!q.settings.allow_html_in_named_anchor){q.parser.addAttributeFilter("name",function(s,t){var A=s.length,C,z,B,D;while(A--){D=s[A];if(D.name==="a"&&D.firstChild){B=D.parent;C=D.lastChild;do{z=C.prev;B.insert(C,D);C=z}while(C)}}})}q.parser.addAttributeFilter("src,href,style",function(s,t){var z=s.length,B,D=q.dom,C,A;while(z--){B=s[z];C=B.attr(t);A="data-mce-"+t;if(!B.attributes.map[A]){if(t==="style"){B.attr(A,D.serializeStyle(D.parseStyle(C),B.name))}else{B.attr(A,q.convertURL(C,t,B.name))}}}});q.parser.addNodeFilter("script",function(s,t){var z=s.length,A;while(z--){A=s[z];A.attr("type","mce-"+(A.attr("type")||"text/javascript"))}});q.parser.addNodeFilter("#cdata",function(s,t){var z=s.length,A;while(z--){A=s[z];A.type=8;A.name="#comment";A.value="[CDATA["+A.value+"]]"}});q.parser.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(t,z){var A=t.length,B,s=q.schema.getNonEmptyElements();while(A--){B=t[A];if(B.isEmpty(s)){B.empty().append(new m.html.Node("br",1)).shortEnded=true}}});q.serializer=new m.dom.Serializer(v,q.dom,q.schema);q.selection=new m.dom.Selection(q.dom,q.getWin(),q.serializer);q.formatter=new m.Formatter(this);q.formatter.register({alignleft:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"left"}},{selector:"img,table",collapsed:false,styles:{"float":"left"}}],aligncenter:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"center"}},{selector:"img",collapsed:false,styles:{display:"block",marginLeft:"auto",marginRight:"auto"}},{selector:"table",collapsed:false,styles:{marginLeft:"auto",marginRight:"auto"}}],alignright:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"right"}},{selector:"img,table",collapsed:false,styles:{"float":"right"}}],alignfull:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"justify"}}],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:true},{inline:"u",remove:"all"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:true},{inline:"strike",remove:"all"}],forecolor:{inline:"span",styles:{color:"%value"},wrap_links:false},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},wrap_links:false},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"},link:{inline:"a",selector:"a",remove:"all",split:true,deep:true,onmatch:function(s){return true},onformat:function(z,s,t){i(t,function(B,A){q.dom.setAttrib(z,A,B)})}},removeformat:[{selector:"b,strong,em,i,font,u,strike",remove:"all",split:true,expand:false,block_expand:true,deep:true},{selector:"span",attributes:["style","class"],remove:"empty",split:true,expand:false,deep:true},{selector:"*",attributes:["style","class"],split:false,expand:false,deep:true}]});i("p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp".split(/\s/),function(s){q.formatter.register(s,{block:s,remove:"all"})});q.formatter.register(q.settings.formats);q.undoManager=new m.UndoManager(q);q.undoManager.onAdd.add(function(t,s){if(t.hasUndo()){return q.onChange.dispatch(q,s,t)}});q.undoManager.onUndo.add(function(t,s){return q.onUndo.dispatch(q,s,t)});q.undoManager.onRedo.add(function(t,s){return q.onRedo.dispatch(q,s,t)});q.forceBlocks=new m.ForceBlocks(q,{forced_root_block:v.forced_root_block});q.editorCommands=new m.EditorCommands(q);q.serializer.onPreProcess.add(function(s,t){return q.onPreProcess.dispatch(q,t,s)});q.serializer.onPostProcess.add(function(s,t){return q.onPostProcess.dispatch(q,t,s)});q.onPreInit.dispatch(q);if(!v.gecko_spellcheck){q.getBody().spellcheck=0}if(!v.readonly){q._addEvents()}q.controlManager.onPostRender.dispatch(q,q.controlManager);q.onPostRender.dispatch(q);q.quirks=new m.util.Quirks(this);if(v.directionality){q.getBody().dir=v.directionality}if(v.nowrap){q.getBody().style.whiteSpace="nowrap"}if(v.handle_node_change_callback){q.onNodeChange.add(function(t,s,z){q.execCallback("handle_node_change_callback",q.id,z,-1,-1,true,q.selection.isCollapsed())})}if(v.save_callback){q.onSaveContent.add(function(s,z){var t=q.execCallback("save_callback",q.id,z.content,q.getBody());if(t){z.content=t}})}if(v.onchange_callback){q.onChange.add(function(t,s){q.execCallback("onchange_callback",q,s)})}if(v.protect){q.onBeforeSetContent.add(function(s,t){if(v.protect){i(v.protect,function(z){t.content=t.content.replace(z,function(A){return"<!--mce:protected "+escape(A)+"-->"})})}})}if(v.convert_newlines_to_brs){q.onBeforeSetContent.add(function(s,t){if(t.initial){t.content=t.content.replace(/\r?\n/g,"<br />")}})}if(v.preformatted){q.onPostProcess.add(function(s,t){t.content=t.content.replace(/^\s*<pre.*?>/,"");t.content=t.content.replace(/<\/pre>\s*$/,"");if(t.set){t.content='<pre class="mceItemHidden">'+t.content+"</pre>"}})}if(v.verify_css_classes){q.serializer.attribValueFilter=function(B,z){var A,t;if(B=="class"){if(!q.classesRE){t=q.dom.getClasses();if(t.length>0){A="";i(t,function(s){A+=(A?"|":"")+s["class"]});q.classesRE=new RegExp("("+A+")","gi")}}return !q.classesRE||/(\bmceItem\w+\b|\bmceTemp\w+\b)/g.test(z)||q.classesRE.test(z)?z:""}return z}}if(v.cleanup_callback){q.onBeforeSetContent.add(function(s,t){t.content=q.execCallback("cleanup_callback","insert_to_editor",t.content,t)});q.onPreProcess.add(function(s,t){if(t.set){q.execCallback("cleanup_callback","insert_to_editor_dom",t.node,t)}if(t.get){q.execCallback("cleanup_callback","get_from_editor_dom",t.node,t)}});q.onPostProcess.add(function(s,t){if(t.set){t.content=q.execCallback("cleanup_callback","insert_to_editor",t.content,t)}if(t.get){t.content=q.execCallback("cleanup_callback","get_from_editor",t.content,t)}})}if(v.save_callback){q.onGetContent.add(function(s,t){if(t.save){t.content=q.execCallback("save_callback",q.id,t.content,q.getBody())}})}if(v.handle_event_callback){q.onEvent.add(function(s,t,z){if(q.execCallback("handle_event_callback",t,s,z)===false){j.cancel(t)}})}q.onSetContent.add(function(){q.addVisual(q.getBody())});if(v.padd_empty_editor){q.onPostProcess.add(function(s,t){t.content=t.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/,"")})}if(a){function r(s,t){i(s.dom.select("a"),function(A){var z=A.parentNode;if(s.dom.isBlock(z)&&z.lastChild===A){s.dom.add(z,"br",{"data-mce-bogus":1})}})}q.onExecCommand.add(function(s,t){if(t==="CreateLink"){r(s)}});q.onSetContent.add(q.selection.onSetContent.add(r))}q.load({initial:true,format:"html"});q.startContent=q.getContent({format:"raw"});q.undoManager.add();q.initialized=true;q.onInit.dispatch(q);q.execCallback("setupcontent_callback",q.id,q.getBody(),q.getDoc());q.execCallback("init_instance_callback",q);q.focus(true);q.nodeChanged({initial:1});i(q.contentCSS,function(s){q.dom.loadCSS(s)});if(v.auto_focus){setTimeout(function(){var s=m.get(v.auto_focus);s.selection.select(s.getBody(),1);s.selection.collapse(1);s.getBody().focus();s.getWin().focus()},100)}x=null},focus:function(u){var y,q=this,s=q.selection,x=q.settings.content_editable,r,p,v=q.getDoc();if(!u){r=s.getRng();if(r.item){p=r.item(0)}q._refreshContentEditable();s.normalize();if(!x){q.getWin().focus()}if(m.isGecko){q.getBody().focus()}if(p&&p.ownerDocument==v){r=v.body.createControlRange();r.addElement(p);r.select()}}if(m.activeEditor!=q){if((y=m.activeEditor)!=null){y.onDeactivate.dispatch(y,q)}q.onActivate.dispatch(q,y)}m._setActive(q)},execCallback:function(u){var p=this,r=p.settings[u],q;if(!r){return}if(p.callbackLookup&&(q=p.callbackLookup[u])){r=q.func;q=q.scope}if(d(r,"string")){q=r.replace(/\.\w+$/,"");q=q?m.resolve(q):0;r=m.resolve(r);p.callbackLookup=p.callbackLookup||{};p.callbackLookup[u]={func:r,scope:q}}return r.apply(q||p,Array.prototype.slice.call(arguments,1))},translate:function(p){var r=this.settings.language||"en",q=m.i18n;if(!p){return""}return q[r+"."+p]||p.replace(/{\#([^}]+)\}/g,function(t,s){return q[r+"."+s]||"{#"+s+"}"})},getLang:function(q,p){return m.i18n[(this.settings.language||"en")+"."+q]||(d(p)?p:"{#"+q+"}")},getParam:function(u,r,p){var s=m.trim,q=d(this.settings[u])?this.settings[u]:r,t;if(p==="hash"){t={};if(d(q,"string")){i(q.indexOf("=")>0?q.split(/[;,](?![^=;,]*(?:[;,]|$))/):q.split(","),function(x){x=x.split("=");if(x.length>1){t[s(x[0])]=s(x[1])}else{t[s(x[0])]=s(x)}})}else{t=q}return t}return q},nodeChanged:function(r){var p=this,q=p.selection,u=q.getStart()||p.getBody();if(p.initialized){r=r||{};u=b&&u.ownerDocument!=p.getDoc()?p.getBody():u;r.parents=[];p.dom.getParent(u,function(s){if(s.nodeName=="BODY"){return true}r.parents.push(s)});p.onNodeChange.dispatch(p,r?r.controlManager||p.controlManager:p.controlManager,u,q.isCollapsed(),r)}},addButton:function(r,q){var p=this;p.buttons=p.buttons||{};p.buttons[r]=q},addCommand:function(p,r,q){this.execCommands[p]={func:r,scope:q||this}},addQueryStateHandler:function(p,r,q){this.queryStateCommands[p]={func:r,scope:q||this}},addQueryValueHandler:function(p,r,q){this.queryValueCommands[p]={func:r,scope:q||this}},addShortcut:function(r,u,p,s){var q=this,v;if(!q.settings.custom_shortcuts){return false}q.shortcuts=q.shortcuts||{};if(d(p,"string")){v=p;p=function(){q.execCommand(v,false,null)}}if(d(p,"object")){v=p;p=function(){q.execCommand(v[0],v[1],v[2])}}i(g(r),function(t){var x={func:p,scope:s||this,desc:u,alt:false,ctrl:false,shift:false};i(g(t,"+"),function(y){switch(y){case"alt":case"ctrl":case"shift":x[y]=true;break;default:x.charCode=y.charCodeAt(0);x.keyCode=y.toUpperCase().charCodeAt(0)}});q.shortcuts[(x.ctrl?"ctrl":"")+","+(x.alt?"alt":"")+","+(x.shift?"shift":"")+","+x.keyCode]=x});return true},execCommand:function(x,v,z,p){var r=this,u=0,y,q;if(!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(x)&&(!p||!p.skip_focus)){r.focus()}y={};r.onBeforeExecCommand.dispatch(r,x,v,z,y);if(y.terminate){return false}if(r.execCallback("execcommand_callback",r.id,r.selection.getNode(),x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(y=r.execCommands[x]){q=y.func.call(y.scope,v,z);if(q!==true){r.onExecCommand.dispatch(r,x,v,z,p);return q}}i(r.plugins,function(s){if(s.execCommand&&s.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);u=1;return false}});if(u){return true}if(r.theme&&r.theme.execCommand&&r.theme.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(r.editorCommands.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}r.getDoc().execCommand(x,v,z);r.onExecCommand.dispatch(r,x,v,z,p)},queryCommandState:function(u){var q=this,v,r;if(q._isHidden()){return}if(v=q.queryStateCommands[u]){r=v.func.call(v.scope);if(r!==true){return r}}v=q.editorCommands.queryCommandState(u);if(v!==-1){return v}try{return this.getDoc().queryCommandState(u)}catch(p){}},queryCommandValue:function(v){var q=this,u,r;if(q._isHidden()){return}if(u=q.queryValueCommands[v]){r=u.func.call(u.scope);if(r!==true){return r}}u=q.editorCommands.queryCommandValue(v);if(d(u)){return u}try{return this.getDoc().queryCommandValue(v)}catch(p){}},show:function(){var p=this;n.show(p.getContainer());n.hide(p.id);p.load()},hide:function(){var p=this,q=p.getDoc();if(b&&q){q.execCommand("SelectAll")}p.save();n.hide(p.getContainer());n.setStyle(p.id,"display",p.orgDisplay)},isHidden:function(){return !n.isHidden(this.id)},setProgressState:function(p,q,r){this.onSetProgressState.dispatch(this,p,q,r);return p},load:function(s){var p=this,r=p.getElement(),q;if(r){s=s||{};s.load=true;q=p.setContent(d(r.value)?r.value:r.innerHTML,s);s.element=r;if(!s.no_events){p.onLoadContent.dispatch(p,s)}s.element=r=null;return q}},save:function(u){var p=this,s=p.getElement(),q,r;if(!s||!p.initialized){return}u=u||{};u.save=true;if(!u.no_events){p.undoManager.typing=false;p.undoManager.add()}u.element=s;q=u.content=p.getContent(u);if(!u.no_events){p.onSaveContent.dispatch(p,u)}q=u.content;if(!/TEXTAREA|INPUT/i.test(s.nodeName)){s.innerHTML=q;if(r=n.getParent(p.id,"form")){i(r.elements,function(t){if(t.name==p.id){t.value=q;return false}})}}else{s.value=q}u.element=s=null;return q},setContent:function(u,s){var r=this,q,p=r.getBody(),t;s=s||{};s.format=s.format||"html";s.set=true;s.content=u;if(!s.no_events){r.onBeforeSetContent.dispatch(r,s)}u=s.content;if(!m.isIE&&(u.length===0||/^\s+$/.test(u))){t=r.settings.forced_root_block;if(t){u="<"+t+'><br data-mce-bogus="1"></'+t+">"}else{u='<br data-mce-bogus="1">'}p.innerHTML=u;r.selection.select(p,true);r.selection.collapse(true);return}if(s.format!=="raw"){u=new m.html.Serializer({},r.schema).serialize(r.parser.parse(u))}s.content=m.trim(u);r.dom.setHTML(p,s.content);if(!s.no_events){r.onSetContent.dispatch(r,s)}r.selection.normalize();return s.content},getContent:function(q){var p=this,r;q=q||{};q.format=q.format||"html";q.get=true;if(!q.no_events){p.onBeforeGetContent.dispatch(p,q)}if(q.format=="raw"){r=p.getBody().innerHTML}else{r=p.serializer.serialize(p.getBody(),q)}q.content=m.trim(r);if(!q.no_events){p.onGetContent.dispatch(p,q)}return q.content},isDirty:function(){var p=this;return m.trim(p.startContent)!=m.trim(p.getContent({format:"raw",no_events:1}))&&!p.isNotDirty},getContainer:function(){var p=this;if(!p.container){p.container=n.get(p.editorContainer||p.id+"_parent")}return p.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return n.get(this.settings.content_element||this.id)},getWin:function(){var p=this,q;if(!p.contentWindow){q=n.get(p.id+"_ifr");if(q){p.contentWindow=q.contentWindow}}return p.contentWindow},getDoc:function(){var q=this,p;if(!q.contentDocument){p=q.getWin();if(p){q.contentDocument=p.document}}return q.contentDocument},getBody:function(){return this.bodyElement||this.getDoc().body},convertURL:function(p,x,v){var q=this,r=q.settings;if(r.urlconverter_callback){return q.execCallback("urlconverter_callback",p,v,true,x)}if(!r.convert_urls||(v&&v.nodeName=="LINK")||p.indexOf("file:")===0){return p}if(r.relative_urls){return q.documentBaseURI.toRelative(p)}p=q.documentBaseURI.toAbsolute(p,r.remove_script_host);return p},addVisual:function(r){var p=this,q=p.settings;r=r||p.getBody();if(!d(p.hasVisual)){p.hasVisual=q.visual}i(p.dom.select("table,a",r),function(t){var s;switch(t.nodeName){case"TABLE":s=p.dom.getAttrib(t,"border");if(!s||s=="0"){if(p.hasVisual){p.dom.addClass(t,q.visual_table_class)}else{p.dom.removeClass(t,q.visual_table_class)}}return;case"A":s=p.dom.getAttrib(t,"name");if(s){if(p.hasVisual){p.dom.addClass(t,"mceItemAnchor")}else{p.dom.removeClass(t,"mceItemAnchor")}}return}});p.onVisualAid.dispatch(p,r,p.hasVisual)},remove:function(){var p=this,q=p.getContainer();p.removed=1;p.hide();p.execCallback("remove_instance_callback",p);p.onRemove.dispatch(p);p.onExecCommand.listeners=[];m.remove(p);n.remove(q)},destroy:function(q){var p=this;if(p.destroyed){return}if(!q){m.removeUnload(p.destroy);tinyMCE.onBeforeUnload.remove(p._beforeUnload);if(p.theme&&p.theme.destroy){p.theme.destroy()}p.controlManager.destroy();p.selection.destroy();p.dom.destroy();if(!p.settings.content_editable){j.clear(p.getWin());j.clear(p.getDoc())}j.clear(p.getBody());j.clear(p.formElement)}if(p.formElement){p.formElement.submit=p.formElement._mceOldSubmit;p.formElement._mceOldSubmit=null}p.contentAreaContainer=p.formElement=p.container=p.settings.content_element=p.bodyElement=p.contentDocument=p.contentWindow=null;if(p.selection){p.selection=p.selection.win=p.selection.dom=p.selection.dom.doc=null}p.destroyed=1},_addEvents:function(){var B=this,r,C=B.settings,q=B.dom,x={mouseup:"onMouseUp",mousedown:"onMouseDown",click:"onClick",keyup:"onKeyUp",keydown:"onKeyDown",keypress:"onKeyPress",submit:"onSubmit",reset:"onReset",contextmenu:"onContextMenu",dblclick:"onDblClick",paste:"onPaste"};function p(t,D){var s=t.type;if(B.removed){return}if(B.onEvent.dispatch(B,t,D)!==false){B[x[t.fakeType||t.type]].dispatch(B,t,D)}}i(x,function(t,s){switch(s){case"contextmenu":q.bind(B.getDoc(),s,p);break;case"paste":q.bind(B.getBody(),s,function(D){p(D)});break;case"submit":case"reset":q.bind(B.getElement().form||n.getParent(B.id,"form"),s,p);break;default:q.bind(C.content_editable?B.getBody():B.getDoc(),s,p)}});q.bind(C.content_editable?B.getBody():(a?B.getDoc():B.getWin()),"focus",function(s){B.focus(true)});if(m.isGecko){q.bind(B.getDoc(),"DOMNodeInserted",function(t){var s;t=t.target;if(t.nodeType===1&&t.nodeName==="IMG"&&(s=t.getAttribute("data-mce-src"))){t.src=B.documentBaseURI.toAbsolute(s)}})}if(a){function u(){var E=this,G=E.getDoc(),F=E.settings;if(a&&!F.readonly){E._refreshContentEditable();try{G.execCommand("styleWithCSS",0,false)}catch(D){if(!E._isHidden()){try{G.execCommand("useCSS",0,true)}catch(D){}}}if(!F.table_inline_editing){try{G.execCommand("enableInlineTableEditing",false,false)}catch(D){}}if(!F.object_resizing){try{G.execCommand("enableObjectResizing",false,false)}catch(D){}}}}B.onBeforeExecCommand.add(u);B.onMouseDown.add(u)}B.onMouseUp.add(B.nodeChanged);B.onKeyUp.add(function(s,t){var D=t.keyCode;if((D>=33&&D<=36)||(D>=37&&D<=40)||D==13||D==45||D==46||D==8||(m.isMac&&(D==91||D==93))||t.ctrlKey){B.nodeChanged()}});B.onKeyDown.add(function(t,D){if(D.keyCode!=8){return}var F=t.selection.getRng().startContainer;var E=t.selection.getRng().startOffset;while(F&&F.nodeType&&F.nodeType!=1&&F.parentNode){F=F.parentNode}if(F&&F.parentNode&&F.parentNode.tagName==="BLOCKQUOTE"&&F.parentNode.firstChild==F&&E==0){t.formatter.toggle("blockquote",null,F.parentNode);var s=t.selection.getRng();s.setStart(F,0);s.setEnd(F,0);t.selection.setRng(s);t.selection.collapse(false)}});B.onReset.add(function(){B.setContent(B.startContent,{format:"raw"})});if(C.custom_shortcuts){if(C.custom_undo_redo_keyboard_shortcuts){B.addShortcut("ctrl+z",B.getLang("undo_desc"),"Undo");B.addShortcut("ctrl+y",B.getLang("redo_desc"),"Redo")}B.addShortcut("ctrl+b",B.getLang("bold_desc"),"Bold");B.addShortcut("ctrl+i",B.getLang("italic_desc"),"Italic");B.addShortcut("ctrl+u",B.getLang("underline_desc"),"Underline");for(r=1;r<=6;r++){B.addShortcut("ctrl+"+r,"",["FormatBlock",false,"h"+r])}B.addShortcut("ctrl+7","",["FormatBlock",false,"p"]);B.addShortcut("ctrl+8","",["FormatBlock",false,"div"]);B.addShortcut("ctrl+9","",["FormatBlock",false,"address"]);function v(t){var s=null;if(!t.altKey&&!t.ctrlKey&&!t.metaKey){return s}i(B.shortcuts,function(D){if(m.isMac&&D.ctrl!=t.metaKey){return}else{if(!m.isMac&&D.ctrl!=t.ctrlKey){return}}if(D.alt!=t.altKey){return}if(D.shift!=t.shiftKey){return}if(t.keyCode==D.keyCode||(t.charCode&&t.charCode==D.charCode)){s=D;return false}});return s}B.onKeyUp.add(function(s,t){var D=v(t);if(D){return j.cancel(t)}});B.onKeyPress.add(function(s,t){var D=v(t);if(D){return j.cancel(t)}});B.onKeyDown.add(function(s,t){var D=v(t);if(D){D.func.call(D.scope);return j.cancel(t)}})}if(m.isIE){q.bind(B.getDoc(),"controlselect",function(D){var t=B.resizeInfo,s;D=D.target;if(D.nodeName!=="IMG"){return}if(t){q.unbind(t.node,t.ev,t.cb)}if(!q.hasClass(D,"mceItemNoResize")){ev="resizeend";s=q.bind(D,ev,function(F){var E;F=F.target;if(E=q.getStyle(F,"width")){q.setAttrib(F,"width",E.replace(/[^0-9%]+/g,""));q.setStyle(F,"width","")}if(E=q.getStyle(F,"height")){q.setAttrib(F,"height",E.replace(/[^0-9%]+/g,""));q.setStyle(F,"height","")}})}else{ev="resizestart";s=q.bind(D,"resizestart",j.cancel,j)}t=B.resizeInfo={node:D,ev:ev,cb:s}})}if(m.isOpera){B.onClick.add(function(s,t){j.prevent(t)})}if(C.custom_undo_redo){function y(){B.undoManager.typing=false;B.undoManager.add()}q.bind(B.getDoc(),"focusout",function(s){if(!B.removed&&B.undoManager.typing){y()}});B.dom.bind(B.dom.getRoot(),"dragend",function(s){y()});B.onKeyUp.add(function(s,D){var t=D.keyCode;if((t>=33&&t<=36)||(t>=37&&t<=40)||t==13||t==45||D.ctrlKey){y()}});B.onKeyDown.add(function(s,E){var D=E.keyCode,t;if(D==8){t=B.getDoc().selection;if(t&&t.createRange&&t.createRange().item){B.undoManager.beforeChange();s.dom.remove(t.createRange().item(0));y();return j.cancel(E)}}if((D>=33&&D<=36)||(D>=37&&D<=40)||D==13||D==45){if(m.isIE&&D==13){B.undoManager.beforeChange()}if(B.undoManager.typing){y()}return}if((D<16||D>20)&&D!=224&&D!=91&&!B.undoManager.typing){B.undoManager.beforeChange();B.undoManager.typing=true;B.undoManager.add()}});B.onMouseDown.add(function(){if(B.undoManager.typing){y()}})}if(m.isGecko){function A(){var s=B.dom.getAttribs(B.selection.getStart().cloneNode(false));return function(){var t=B.selection.getStart();if(t!==B.getBody()){B.dom.setAttrib(t,"style",null);i(s,function(D){t.setAttributeNode(D.cloneNode(true))})}}}function z(){var t=B.selection;return !t.isCollapsed()&&t.getStart()!=t.getEnd()}B.onKeyPress.add(function(s,D){var t;if((D.keyCode==8||D.keyCode==46)&&z()){t=A();B.getDoc().execCommand("delete",false,null);t();return j.cancel(D)}});B.dom.bind(B.getDoc(),"cut",function(t){var s;if(z()){s=A();B.onKeyUp.addToTop(j.cancel,j);setTimeout(function(){s();B.onKeyUp.remove(j.cancel,j)},0)}})}},_refreshContentEditable:function(){var q=this,p,r;if(q._isHidden()){p=q.getBody();r=p.parentNode;r.removeChild(p);r.appendChild(p);p.focus()}},_isHidden:function(){var p;if(!a){return 0}p=this.selection.getSel();return(!p||!p.rangeCount||p.rangeCount==0)}})})(tinymce);(function(c){var d=c.each,e,a=true,b=false;c.EditorCommands=function(n){var m=n.dom,p=n.selection,j={state:{},exec:{},value:{}},k=n.settings,q=n.formatter,o;function r(z,y,x){var v;z=z.toLowerCase();if(v=j.exec[z]){v(z,y,x);return a}return b}function l(x){var v;x=x.toLowerCase();if(v=j.state[x]){return v(x)}return -1}function h(x){var v;x=x.toLowerCase();if(v=j.value[x]){return v(x)}return b}function u(v,x){x=x||"exec";d(v,function(z,y){d(y.toLowerCase().split(","),function(A){j[x][A]=z})})}c.extend(this,{execCommand:r,queryCommandState:l,queryCommandValue:h,addCommands:u});function f(y,x,v){if(x===e){x=b}if(v===e){v=null}return n.getDoc().execCommand(y,x,v)}function t(v){return q.match(v)}function s(v,x){q.toggle(v,x?{value:x}:e)}function i(v){o=p.getBookmark(v)}function g(){p.moveToBookmark(o)}u({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){n.undoManager.add()},"Cut,Copy,Paste":function(z){var y=n.getDoc(),v;try{f(z)}catch(x){v=a}if(v||!y.queryCommandSupported(z)){if(c.isGecko){n.windowManager.confirm(n.getLang("clipboard_msg"),function(A){if(A){open("http://www.mozilla.org/editor/midasdemo/securityprefs.html","_blank")}})}else{n.windowManager.alert(n.getLang("clipboard_no_support"))}}},unlink:function(v){if(p.isCollapsed()){p.select(p.getNode())}f(v);p.collapse(b)},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(v){var x=v.substring(7);d("left,center,right,full".split(","),function(y){if(x!=y){q.remove("align"+y)}});s("align"+x);r("mceRepaint")},"InsertUnorderedList,InsertOrderedList":function(y){var v,x;f(y);v=m.getParent(p.getNode(),"ol,ul");if(v){x=v.parentNode;if(/^(H[1-6]|P|ADDRESS|PRE)$/.test(x.nodeName)){i();m.split(x,v);g()}}},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(v){s(v)},"ForeColor,HiliteColor,FontName":function(y,x,v){s(y,v)},FontSize:function(z,y,x){var v,A;if(x>=1&&x<=7){A=c.explode(k.font_size_style_values);v=c.explode(k.font_size_classes);if(v){x=v[x-1]||x}else{x=A[x-1]||x}}s(z,x)},RemoveFormat:function(v){q.remove(v)},mceBlockQuote:function(v){s("blockquote")},FormatBlock:function(y,x,v){return s(v||"p")},mceCleanup:function(){var v=p.getBookmark();n.setContent(n.getContent({cleanup:a}),{cleanup:a});p.moveToBookmark(v)},mceRemoveNode:function(z,y,x){var v=x||p.getNode();if(v!=n.getBody()){i();n.dom.remove(v,a);g()}},mceSelectNodeDepth:function(z,y,x){var v=0;m.getParent(p.getNode(),function(A){if(A.nodeType==1&&v++==x){p.select(A);return b}},n.getBody())},mceSelectNode:function(y,x,v){p.select(v)},mceInsertContent:function(B,I,K){var y,J,E,z,F,G,D,C,L,x,A,M,v,H;y=n.parser;J=new c.html.Serializer({},n.schema);v='<span id="mce_marker" data-mce-type="bookmark">\uFEFF</span>';G={content:K,format:"html"};p.onBeforeSetContent.dispatch(p,G);K=G.content;if(K.indexOf("{$caret}")==-1){K+="{$caret}"}K=K.replace(/\{\$caret\}/,v);if(!p.isCollapsed()){n.getDoc().execCommand("Delete",false,null)}E=p.getNode();G={context:E.nodeName.toLowerCase()};F=y.parse(K,G);A=F.lastChild;if(A.attr("id")=="mce_marker"){D=A;for(A=A.prev;A;A=A.walk(true)){if(A.type==3||!m.isBlock(A.name)){A.parent.insert(D,A,A.name==="br");break}}}if(!G.invalid){K=J.serialize(F);A=E.firstChild;M=E.lastChild;if(!A||(A===M&&A.nodeName==="BR")){m.setHTML(E,K)}else{p.setContent(K)}}else{p.setContent(v);E=n.selection.getNode();z=n.getBody();if(E.nodeType==9){E=A=z}else{A=E}while(A!==z){E=A;A=A.parentNode}K=E==z?z.innerHTML:m.getOuterHTML(E);K=J.serialize(y.parse(K.replace(/<span (id="mce_marker"|id=mce_marker).+?<\/span>/i,function(){return J.serialize(F)})));if(E==z){m.setHTML(z,K)}else{m.setOuterHTML(E,K)}}D=m.get("mce_marker");C=m.getRect(D);L=m.getViewPort(n.getWin());if((C.y+C.h>L.y+L.h||C.y<L.y)||(C.x>L.x+L.w||C.x<L.x)){H=c.isIE?n.getDoc().documentElement:n.getBody();H.scrollLeft=C.x;H.scrollTop=C.y-L.h+25}x=m.createRng();A=D.previousSibling;if(A&&A.nodeType==3){x.setStart(A,A.nodeValue.length)}else{x.setStartBefore(D);x.setEndBefore(D)}m.remove(D);p.setRng(x);p.onSetContent.dispatch(p,G);n.addVisual()},mceInsertRawHTML:function(y,x,v){p.setContent("tiny_mce_marker");n.setContent(n.getContent().replace(/tiny_mce_marker/g,function(){return v}))},mceSetContent:function(y,x,v){n.setContent(v)},"Indent,Outdent":function(z){var x,v,y;x=k.indentation;v=/[a-z%]+$/i.exec(x);x=parseInt(x);if(!l("InsertUnorderedList")&&!l("InsertOrderedList")){d(p.getSelectedBlocks(),function(A){if(z=="outdent"){y=Math.max(0,parseInt(A.style.paddingLeft||0)-x);m.setStyle(A,"paddingLeft",y?y+v:"")}else{m.setStyle(A,"paddingLeft",(parseInt(A.style.paddingLeft||0)+x)+v)}})}else{f(z)}},mceRepaint:function(){var x;if(c.isGecko){try{i(a);if(p.getSel()){p.getSel().selectAllChildren(n.getBody())}p.collapse(a);g()}catch(v){}}},mceToggleFormat:function(y,x,v){q.toggle(v)},InsertHorizontalRule:function(){n.execCommand("mceInsertContent",false,"<hr />")},mceToggleVisualAid:function(){n.hasVisual=!n.hasVisual;n.addVisual()},mceReplaceContent:function(y,x,v){n.execCommand("mceInsertContent",false,v.replace(/\{\$selection\}/g,p.getContent({format:"text"})))},mceInsertLink:function(z,y,x){var v;if(typeof(x)=="string"){x={href:x}}v=m.getParent(p.getNode(),"a");x.href=x.href.replace(" ","%20");if(!v||!x.href){q.remove("link")}if(x.href){q.apply("link",x,v)}},selectAll:function(){var x=m.getRoot(),v=m.createRng();v.setStart(x,0);v.setEnd(x,x.childNodes.length);n.selection.setRng(v)}});u({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(v){return t("align"+v.substring(7))},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(v){return t(v)},mceBlockQuote:function(){return t("blockquote")},Outdent:function(){var v;if(k.inline_styles){if((v=m.getParent(p.getStart(),m.isBlock))&&parseInt(v.style.paddingLeft)>0){return a}if((v=m.getParent(p.getEnd(),m.isBlock))&&parseInt(v.style.paddingLeft)>0){return a}}return l("InsertUnorderedList")||l("InsertOrderedList")||(!k.inline_styles&&!!m.getParent(p.getNode(),"BLOCKQUOTE"))},"InsertUnorderedList,InsertOrderedList":function(v){return m.getParent(p.getNode(),v=="insertunorderedlist"?"UL":"OL")}},"state");u({"FontSize,FontName":function(y){var x=0,v;if(v=m.getParent(p.getNode(),"span")){if(y=="fontsize"){x=v.style.fontSize}else{x=v.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()}}return x}},"value");if(k.custom_undo_redo){u({Undo:function(){n.undoManager.undo()},Redo:function(){n.undoManager.redo()}})}}})(tinymce);(function(b){var a=b.util.Dispatcher;b.UndoManager=function(f){var d,e=0,h=[],c;function g(){return b.trim(f.getContent({format:"raw",no_events:1}))}return d={typing:false,onAdd:new a(d),onUndo:new a(d),onRedo:new a(d),beforeChange:function(){c=f.selection.getBookmark(2,true)},add:function(m){var j,k=f.settings,l;m=m||{};m.content=g();l=h[e];if(l&&l.content==m.content){return null}if(h[e]){h[e].beforeBookmark=c}if(k.custom_undo_redo_levels){if(h.length>k.custom_undo_redo_levels){for(j=0;j<h.length-1;j++){h[j]=h[j+1]}h.length--;e=h.length}}m.bookmark=f.selection.getBookmark(2,true);if(e<h.length-1){h.length=e+1}h.push(m);e=h.length-1;d.onAdd.dispatch(d,m);f.isNotDirty=0;return m},undo:function(){var k,j;if(d.typing){d.add();d.typing=false}if(e>0){k=h[--e];f.setContent(k.content,{format:"raw"});f.selection.moveToBookmark(k.beforeBookmark);d.onUndo.dispatch(d,k)}return k},redo:function(){var i;if(e<h.length-1){i=h[++e];f.setContent(i.content,{format:"raw"});f.selection.moveToBookmark(i.bookmark);d.onRedo.dispatch(d,i)}return i},clear:function(){h=[];e=0;d.typing=false},hasUndo:function(){return e>0||this.typing},hasRedo:function(){return e<h.length-1&&!this.typing}}}})(tinymce);(function(l){var j=l.dom.Event,c=l.isIE,a=l.isGecko,b=l.isOpera,i=l.each,h=l.extend,d=true,g=false;function k(o){var p,n,m;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(o.nodeName)){if(p){n=o.cloneNode(false);n.appendChild(p);p=n}else{p=m=o.cloneNode(false)}p.removeAttribute("id")}}while(o=o.parentNode);if(p){return{wrapper:p,inner:m}}}function f(n,o){var m=o.ownerDocument.createRange();m.setStart(n.endContainer,n.endOffset);m.setEndAfter(o);return m.cloneContents().textContent.length==0}function e(o,q,m){var n,p;if(q.isEmpty(m)){n=q.getParent(m,"ul,ol");if(!q.getParent(n.parentNode,"ul,ol")){q.split(n,m);p=q.create("p",0,'<br data-mce-bogus="1" />');q.replace(p,m);o.select(p,1)}return g}return d}l.create("tinymce.ForceBlocks",{ForceBlocks:function(m){var n=this,o=m.settings,p;n.editor=m;n.dom=m.dom;p=(o.forced_root_block||"p").toLowerCase();o.element=p.toUpperCase();m.onPreInit.add(n.setup,n)},setup:function(){var n=this,m=n.editor,p=m.settings,u=m.dom,o=m.selection,q=m.schema.getBlockElements();if(p.forced_root_block){function v(){var y=o.getStart(),t=m.getBody(),s,z,D,F,E,x,A,B=-16777215;if(!y||y.nodeType!==1){return}while(y!=t){if(q[y.nodeName]){return}y=y.parentNode}s=o.getRng();if(s.setStart){z=s.startContainer;D=s.startOffset;F=s.endContainer;E=s.endOffset}else{if(s.item){s=m.getDoc().body.createTextRange();s.moveToElementText(s.item(0))}tmpRng=s.duplicate();tmpRng.collapse(true);D=tmpRng.move("character",B)*-1;if(!tmpRng.collapsed){tmpRng=s.duplicate();tmpRng.collapse(false);E=(tmpRng.move("character",B)*-1)-D}}for(y=t.firstChild;y;y){if(y.nodeType===3||(y.nodeType==1&&!q[y.nodeName])){if(!x){x=u.create(p.forced_root_block);y.parentNode.insertBefore(x,y)}A=y;y=y.nextSibling;x.appendChild(A)}else{x=null;y=y.nextSibling}}if(s.setStart){s.setStart(z,D);s.setEnd(F,E);o.setRng(s)}else{try{s=m.getDoc().body.createTextRange();s.moveToElementText(t);s.collapse(true);s.moveStart("character",D);if(E>0){s.moveEnd("character",E)}s.select()}catch(C){}}m.nodeChanged()}m.onKeyUp.add(v);m.onClick.add(v)}if(p.force_br_newlines){if(c){m.onKeyPress.add(function(s,t){var x;if(t.keyCode==13&&o.getNode().nodeName!="LI"){o.setContent('<br id="__" /> ',{format:"raw"});x=u.get("__");x.removeAttribute("id");o.select(x);o.collapse();return j.cancel(t)}})}}if(p.force_p_newlines){if(!c){m.onKeyPress.add(function(s,t){if(t.keyCode==13&&!t.shiftKey&&!n.insertPara(t)){j.cancel(t)}})}else{l.addUnload(function(){n._previousFormats=0});m.onKeyPress.add(function(s,t){n._previousFormats=0;if(t.keyCode==13&&!t.shiftKey&&s.selection.isCollapsed()&&p.keep_styles){n._previousFormats=k(s.selection.getStart())}});m.onKeyUp.add(function(t,y){if(y.keyCode==13&&!y.shiftKey){var x=t.selection.getStart(),s=n._previousFormats;if(!x.hasChildNodes()&&s){x=u.getParent(x,u.isBlock);if(x&&x.nodeName!="LI"){x.innerHTML="";if(n._previousFormats){x.appendChild(s.wrapper);s.inner.innerHTML="\uFEFF"}else{x.innerHTML="\uFEFF"}o.select(x,1);o.collapse(true);t.getDoc().execCommand("Delete",false,null);n._previousFormats=0}}}})}if(a){m.onKeyDown.add(function(s,t){if((t.keyCode==8||t.keyCode==46)&&!t.shiftKey){n.backspaceDelete(t,t.keyCode==8)}})}}if(l.isWebKit){function r(t){var s=o.getRng(),x,A=u.create("div",null," "),z,y=u.getViewPort(t.getWin()).h;s.insertNode(x=u.create("br"));s.setStartAfter(x);s.setEndAfter(x);o.setRng(s);if(o.getSel().focusNode==x.previousSibling){o.select(u.insertAfter(u.doc.createTextNode("\u00a0"),x));o.collapse(d)}u.insertAfter(A,x);z=u.getPos(A).y;u.remove(A);if(z>y){t.getWin().scrollTo(0,z)}}m.onKeyPress.add(function(s,t){if(t.keyCode==13&&(t.shiftKey||(p.force_br_newlines&&!u.getParent(o.getNode(),"h1,h2,h3,h4,h5,h6,ol,ul")))){r(s);j.cancel(t)}})}if(c){if(p.element!="P"){m.onKeyPress.add(function(s,t){n.lastElm=o.getNode().nodeName});m.onKeyUp.add(function(t,x){var z,y=o.getNode(),s=t.getBody();if(s.childNodes.length===1&&y.nodeName=="P"){y=u.rename(y,p.element);o.select(y);o.collapse();t.nodeChanged()}else{if(x.keyCode==13&&!x.shiftKey&&n.lastElm!="P"){z=u.getParent(y,"p");if(z){u.rename(z,p.element);t.nodeChanged()}}}})}}},getParentBlock:function(o){var m=this.dom;return m.getParent(o,m.isBlock)},insertPara:function(Q){var E=this,v=E.editor,M=v.dom,R=v.getDoc(),V=v.settings,F=v.selection.getSel(),G=F.getRangeAt(0),U=R.body;var J,K,H,O,N,q,o,u,z,m,C,T,p,x,I,L=M.getViewPort(v.getWin()),B,D,A;v.undoManager.beforeChange();J=R.createRange();J.setStart(F.anchorNode,F.anchorOffset);J.collapse(d);K=R.createRange();K.setStart(F.focusNode,F.focusOffset);K.collapse(d);H=J.compareBoundaryPoints(J.START_TO_END,K)<0;O=H?F.anchorNode:F.focusNode;N=H?F.anchorOffset:F.focusOffset;q=H?F.focusNode:F.anchorNode;o=H?F.focusOffset:F.anchorOffset;if(O===q&&/^(TD|TH)$/.test(O.nodeName)){if(O.firstChild.nodeName=="BR"){M.remove(O.firstChild)}if(O.childNodes.length==0){v.dom.add(O,V.element,null,"<br />");T=v.dom.add(O,V.element,null,"<br />")}else{I=O.innerHTML;O.innerHTML="";v.dom.add(O,V.element,null,I);T=v.dom.add(O,V.element,null,"<br />")}G=R.createRange();G.selectNodeContents(T);G.collapse(1);v.selection.setRng(G);return g}if(O==U&&q==U&&U.firstChild&&v.dom.isBlock(U.firstChild)){O=q=O.firstChild;N=o=0;J=R.createRange();J.setStart(O,0);K=R.createRange();K.setStart(q,0)}if(!R.body.hasChildNodes()){R.body.appendChild(M.create("br"))}O=O.nodeName=="HTML"?R.body:O;O=O.nodeName=="BODY"?O.firstChild:O;q=q.nodeName=="HTML"?R.body:q;q=q.nodeName=="BODY"?q.firstChild:q;u=E.getParentBlock(O);z=E.getParentBlock(q);m=u?u.nodeName:V.element;if(I=E.dom.getParent(u,"li,pre")){if(I.nodeName=="LI"){return e(v.selection,E.dom,I)}return d}if(u&&(u.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(M.getStyle(u,"position",1)))){m=V.element;u=null}if(z&&(z.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(M.getStyle(u,"position",1)))){m=V.element;z=null}if(/(TD|TABLE|TH|CAPTION)/.test(m)||(u&&m=="DIV"&&/left|right/gi.test(M.getStyle(u,"float",1)))){m=V.element;u=z=null}C=(u&&u.nodeName==m)?u.cloneNode(0):v.dom.create(m);T=(z&&z.nodeName==m)?z.cloneNode(0):v.dom.create(m);T.removeAttribute("id");if(/^(H[1-6])$/.test(m)&&f(G,u)){T=v.dom.create(V.element)}I=p=O;do{if(I==U||I.nodeType==9||E.dom.isBlock(I)||/(TD|TABLE|TH|CAPTION)/.test(I.nodeName)){break}p=I}while((I=I.previousSibling?I.previousSibling:I.parentNode));I=x=q;do{if(I==U||I.nodeType==9||E.dom.isBlock(I)||/(TD|TABLE|TH|CAPTION)/.test(I.nodeName)){break}x=I}while((I=I.nextSibling?I.nextSibling:I.parentNode));if(p.nodeName==m){J.setStart(p,0)}else{J.setStartBefore(p)}J.setEnd(O,N);C.appendChild(J.cloneContents()||R.createTextNode(""));try{K.setEndAfter(x)}catch(P){}K.setStart(q,o);T.appendChild(K.cloneContents()||R.createTextNode(""));G=R.createRange();if(!p.previousSibling&&p.parentNode.nodeName==m){G.setStartBefore(p.parentNode)}else{if(J.startContainer.nodeName==m&&J.startOffset==0){G.setStartBefore(J.startContainer)}else{G.setStart(J.startContainer,J.startOffset)}}if(!x.nextSibling&&x.parentNode.nodeName==m){G.setEndAfter(x.parentNode)}else{G.setEnd(K.endContainer,K.endOffset)}G.deleteContents();if(b){v.getWin().scrollTo(0,L.y)}if(C.firstChild&&C.firstChild.nodeName==m){C.innerHTML=C.firstChild.innerHTML}if(T.firstChild&&T.firstChild.nodeName==m){T.innerHTML=T.firstChild.innerHTML}function S(y,s){var r=[],X,W,t;y.innerHTML="";if(V.keep_styles){W=s;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(W.nodeName)){X=W.cloneNode(g);M.setAttrib(X,"id","");r.push(X)}}while(W=W.parentNode)}if(r.length>0){for(t=r.length-1,X=y;t>=0;t--){X=X.appendChild(r[t])}r[0].innerHTML=b?"\u00a0":"<br />";return r[0]}else{y.innerHTML=b?"\u00a0":"<br />"}}if(M.isEmpty(C)){S(C,O)}if(M.isEmpty(T)){A=S(T,q)}if(b&&parseFloat(opera.version())<9.5){G.insertNode(C);G.insertNode(T)}else{G.insertNode(T);G.insertNode(C)}T.normalize();C.normalize();v.selection.select(T,true);v.selection.collapse(true);B=v.dom.getPos(T).y;if(B<L.y||B+25>L.y+L.h){v.getWin().scrollTo(0,B<L.y?B:B-L.h+25)}v.undoManager.add();return g},backspaceDelete:function(u,B){var C=this,s=C.editor,y=s.getBody(),q=s.dom,p,v=s.selection,o=v.getRng(),x=o.startContainer,p,z,A,m;if(!B&&o.collapsed&&x.nodeType==1&&o.startOffset==x.childNodes.length){m=new l.dom.TreeWalker(x.lastChild,x);for(p=x.lastChild;p;p=m.prev()){if(p.nodeType==3){o.setStart(p,p.nodeValue.length);o.collapse(true);v.setRng(o);return}}}if(x&&s.dom.isBlock(x)&&!/^(TD|TH)$/.test(x.nodeName)&&B){if(x.childNodes.length==0||(x.childNodes.length==1&&x.firstChild.nodeName=="BR")){p=x;while((p=p.previousSibling)&&!s.dom.isBlock(p)){}if(p){if(x!=y.firstChild){z=s.dom.doc.createTreeWalker(p,NodeFilter.SHOW_TEXT,null,g);while(A=z.nextNode()){p=A}o=s.getDoc().createRange();o.setStart(p,p.nodeValue?p.nodeValue.length:0);o.setEnd(p,p.nodeValue?p.nodeValue.length:0);v.setRng(o);s.dom.remove(x)}return j.cancel(u)}}}}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each,e=c.extend;c.create("tinymce.ControlManager",{ControlManager:function(f,j){var h=this,g;j=j||{};h.editor=f;h.controls={};h.onAdd=new c.util.Dispatcher(h);h.onPostRender=new c.util.Dispatcher(h);h.prefix=j.prefix||f.id+"_";h._cls={};h.onPostRender.add(function(){d(h.controls,function(i){i.postRender()})})},get:function(f){return this.controls[this.prefix+f]||this.controls[f]},setActive:function(h,f){var g=null;if(g=this.get(h)){g.setActive(f)}return g},setDisabled:function(h,f){var g=null;if(g=this.get(h)){g.setDisabled(f)}return g},add:function(g){var f=this;if(g){f.controls[g.id]=g;f.onAdd.dispatch(g,f)}return g},createControl:function(i){var h,g=this,f=g.editor;d(f.plugins,function(j){if(j.createControl){h=j.createControl(i,g);if(h){return false}}});switch(i){case"|":case"separator":return g.createSeparator()}if(!h&&f.buttons&&(h=f.buttons[i])){return g.createButton(i,h)}return g.add(h)},createDropMenu:function(f,n,h){var m=this,i=m.editor,j,g,k,l;n=e({"class":"mceDropDown",constrain:i.settings.constrain_menus},n);n["class"]=n["class"]+" "+i.getParam("skin")+"Skin";if(k=i.getParam("skin_variant")){n["class"]+=" "+i.getParam("skin")+"Skin"+k.substring(0,1).toUpperCase()+k.substring(1)}f=m.prefix+f;l=h||m._cls.dropmenu||c.ui.DropMenu;j=m.controls[f]=new l(f,n);j.onAddItem.add(function(r,q){var p=q.settings;p.title=i.getLang(p.title,p.title);if(!p.onclick){p.onclick=function(o){if(p.cmd){i.execCommand(p.cmd,p.ui||false,p.value)}}}});i.onRemove.add(function(){j.destroy()});if(c.isIE){j.onShowMenu.add(function(){i.focus();g=i.selection.getBookmark(1)});j.onHideMenu.add(function(){if(g){i.selection.moveToBookmark(g);g=0}})}return m.add(j)},createListBox:function(f,n,h){var l=this,j=l.editor,i,k,m;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,scope:n.scope,control_manager:l},n);f=l.prefix+f;function g(o){return o.settings.use_accessible_selects&&!c.isGecko}if(j.settings.use_native_selects||g(j)){k=new c.ui.NativeListBox(f,n)}else{m=h||l._cls.listbox||c.ui.ListBox;k=new m(f,n,j)}l.controls[f]=k;if(c.isWebKit){k.onPostRender.add(function(p,o){a.add(o,"mousedown",function(){j.bookmark=j.selection.getBookmark(1)});a.add(o,"focus",function(){j.selection.moveToBookmark(j.bookmark);j.bookmark=null})})}if(k.hideMenu){j.onMouseDown.add(k.hideMenu,k)}return l.add(k)},createButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.label=g.translate(i.label);i.scope=i.scope||g;if(!i.onclick&&!i.menu_button){i.onclick=function(){g.execCommand(i.cmd,i.ui||false,i.value)}}i=e({title:i.title,"class":"mce_"+m,unavailable_prefix:g.getLang("unavailable",""),scope:i.scope,control_manager:h},i);m=h.prefix+m;if(i.menu_button){f=l||h._cls.menubutton||c.ui.MenuButton;k=new f(m,i,g);g.onMouseDown.add(k.hideMenu,k)}else{f=h._cls.button||c.ui.Button;k=new f(m,i,g)}return h.add(k)},createMenuButton:function(h,f,g){f=f||{};f.menu_button=1;return this.createButton(h,f,g)},createSplitButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onclick){i.onclick=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;f=l||h._cls.splitbutton||c.ui.SplitButton;k=h.add(new f(m,i,g));g.onMouseDown.add(k.hideMenu,k);return k},createColorSplitButton:function(f,n,h){var l=this,j=l.editor,i,k,m,g;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onclick){n.onclick=function(o){if(c.isIE){g=j.selection.getBookmark(1)}j.execCommand(n.cmd,n.ui||false,o||n.value)}}if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,menu_class:j.getParam("skin")+"Skin",scope:n.scope,more_colors_title:j.getLang("more_colors")},n);f=l.prefix+f;m=h||l._cls.colorsplitbutton||c.ui.ColorSplitButton;k=new m(f,n,j);j.onMouseDown.add(k.hideMenu,k);j.onRemove.add(function(){k.destroy()});if(c.isIE){k.onShowMenu.add(function(){j.focus();g=j.selection.getBookmark(1)});k.onHideMenu.add(function(){if(g){j.selection.moveToBookmark(g);g=0}})}return l.add(k)},createToolbar:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||g._cls.toolbar||c.ui.Toolbar;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createToolbarGroup:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||this._cls.toolbarGroup||c.ui.ToolbarGroup;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createSeparator:function(g){var f=g||this._cls.separator||c.ui.Separator;return new f()},setControlType:function(g,f){return this._cls[g.toLowerCase()]=f},destroy:function(){d(this.controls,function(f){f.destroy()});this.controls=null}})})(tinymce);(function(d){var a=d.util.Dispatcher,e=d.each,c=d.isIE,b=d.isOpera;d.create("tinymce.WindowManager",{WindowManager:function(f){var g=this;g.editor=f;g.onOpen=new a(g);g.onClose=new a(g);g.params={};g.features={}},open:function(z,h){var v=this,k="",n,m,i=v.editor.settings.dialog_type=="modal",q,o,j,g=d.DOM.getViewPort(),r;z=z||{};h=h||{};o=b?g.w:screen.width;j=b?g.h:screen.height;z.name=z.name||"mc_"+new Date().getTime();z.width=parseInt(z.width||320);z.height=parseInt(z.height||240);z.resizable=true;z.left=z.left||parseInt(o/2)-(z.width/2);z.top=z.top||parseInt(j/2)-(z.height/2);h.inline=false;h.mce_width=z.width;h.mce_height=z.height;h.mce_auto_focus=z.auto_focus;if(i){if(c){z.center=true;z.help=false;z.dialogWidth=z.width+"px";z.dialogHeight=z.height+"px";z.scroll=z.scrollbars||false}}e(z,function(p,f){if(d.is(p,"boolean")){p=p?"yes":"no"}if(!/^(name|url)$/.test(f)){if(c&&i){k+=(k?";":"")+f+":"+p}else{k+=(k?",":"")+f+"="+p}}});v.features=z;v.params=h;v.onOpen.dispatch(v,z,h);r=z.url||z.file;r=d._addVer(r);try{if(c&&i){q=1;window.showModalDialog(r,window,k)}else{q=window.open(r,z.name,k)}}catch(l){}if(!q){alert(v.editor.getLang("popup_blocked"))}},close:function(f){f.close();this.onClose.dispatch(this)},createInstance:function(i,h,g,m,l,k){var j=d.resolve(i);return new j(h,g,m,l,k)},confirm:function(h,f,i,g){g=g||window;f.call(i||this,g.confirm(this._decode(this.editor.getLang(h,h))))},alert:function(h,f,j,g){var i=this;g=g||window;g.alert(i._decode(i.editor.getLang(h,h)));if(f){f.call(j||i)}},resizeBy:function(f,g,h){h.resizeBy(f,g)},_decode:function(f){return d.DOM.decode(f).replace(/\\n/g,"\n")}})}(tinymce));(function(a){a.Formatter=function(U){var M={},O=a.each,c=U.dom,q=U.selection,t=a.dom.TreeWalker,K=new a.dom.RangeUtils(c),d=U.schema.isValidChild,F=c.isBlock,l=U.settings.forced_root_block,s=c.nodeIndex,E="\uFEFF",e=/^(src|href|style)$/,R=false,B=true,p;function z(V){return V instanceof Array}function m(W,V){return c.getParents(W,V,c.getRoot())}function b(V){return V.nodeType===1&&(V.face==="mceinline"||V.style.fontFamily==="mceinline")}function Q(V){return V?M[V]:M}function k(V,W){if(V){if(typeof(V)!=="string"){O(V,function(Y,X){k(X,Y)})}else{W=W.length?W:[W];O(W,function(X){if(X.deep===p){X.deep=!X.selector}if(X.split===p){X.split=!X.selector||X.inline}if(X.remove===p&&X.selector&&!X.inline){X.remove="none"}if(X.selector&&X.inline){X.mixed=true;X.block_expand=true}if(typeof(X.classes)==="string"){X.classes=X.classes.split(/\s+/)}});M[V]=W}}}var i=function(W){var V;U.dom.getParent(W,function(X){V=U.dom.getStyle(X,"text-decoration");return V&&V!=="none"});return V};var I=function(V){var W;if(V.nodeType===1&&V.parentNode&&V.parentNode.nodeType===1){W=i(V.parentNode);if(U.dom.getStyle(V,"color")&&W){U.dom.setStyle(V,"text-decoration",W)}else{if(U.dom.getStyle(V,"textdecoration")===W){U.dom.setStyle(V,"text-decoration",null)}}}};function S(Y,ag,ab){var ac=Q(Y),ah=ac[0],af,W,ae,ad=q.isCollapsed();function Z(al){var ak=al.startContainer,ao=al.startOffset,an,am;if(ak.nodeType==1||ak.nodeValue===""){ak=ak.nodeType==1?ak.childNodes[ao]:ak;if(ak){an=new t(ak,ak.parentNode);for(am=an.current();am;am=an.next()){if(am.nodeType==3&&!f(am)){al.setStart(am,0);break}}}}return al}function V(al,ak){ak=ak||ah;if(al){if(ak.onformat){ak.onformat(al,ak,ag,ab)}O(ak.styles,function(an,am){c.setStyle(al,am,r(an,ag))});O(ak.attributes,function(an,am){c.setAttrib(al,am,r(an,ag))});O(ak.classes,function(am){am=r(am,ag);if(!c.hasClass(al,am)){c.addClass(al,am)}})}}function aa(){function am(at,aq){var ar=new t(aq);for(ab=ar.current();ab;ab=ar.prev()){if(ab.childNodes.length>1||ab==at){return ab}}}var al=U.selection.getRng();var ap=al.startContainer;var ak=al.endContainer;if(ap!=ak&&al.endOffset==0){var ao=am(ap,ak);var an=ao.nodeType==3?ao.length:ao.childNodes.length;al.setEnd(ao,an)}return al}function X(an,at,aq,ap,al){var ak=[],am=-1,ar,av=-1,ao=-1,au;O(an.childNodes,function(ax,aw){if(ax.nodeName==="UL"||ax.nodeName==="OL"){am=aw;ar=ax;return false}});O(an.childNodes,function(ax,aw){if(ax.nodeName==="SPAN"&&c.getAttrib(ax,"data-mce-type")=="bookmark"){if(ax.id==at.id+"_start"){av=aw}else{if(ax.id==at.id+"_end"){ao=aw}}}});if(am<=0||(av<am&&ao>am)){O(a.grep(an.childNodes),al);return 0}else{au=aq.cloneNode(R);O(a.grep(an.childNodes),function(ax,aw){if((av<am&&aw<am)||(av>am&&aw>am)){ak.push(ax);ax.parentNode.removeChild(ax)}});if(av<am){an.insertBefore(au,ar)}else{if(av>am){an.insertBefore(au,ar.nextSibling)}}ap.push(au);O(ak,function(aw){au.appendChild(aw)});return au}}function ai(al,an,ap){var ak=[],ao,am;ao=ah.inline||ah.block;am=c.create(ao);V(am);K.walk(al,function(aq){var ar;function at(au){var ax=au.nodeName.toLowerCase(),aw=au.parentNode.nodeName.toLowerCase(),av;if(g(ax,"br")){ar=0;if(ah.block){c.remove(au)}return}if(ah.wrapper&&x(au,Y,ag)){ar=0;return}if(ah.block&&!ah.wrapper&&G(ax)){au=c.rename(au,ao);V(au);ak.push(au);ar=0;return}if(ah.selector){O(ac,function(ay){if("collapsed" in ay&&ay.collapsed!==ad){return}if(c.is(au,ay.selector)&&!b(au)){V(au,ay);av=true}});if(!ah.inline||av){ar=0;return}}if(d(ao,ax)&&d(aw,ao)&&!(!ap&&au.nodeType===3&&au.nodeValue.length===1&&au.nodeValue.charCodeAt(0)===65279)&&au.id!=="_mce_caret"){if(!ar){ar=am.cloneNode(R);au.parentNode.insertBefore(ar,au);ak.push(ar)}ar.appendChild(au)}else{if(ax=="li"&&an){ar=X(au,an,am,ak,at)}else{ar=0;O(a.grep(au.childNodes),at);ar=0}}}O(aq,at)});if(ah.wrap_links===false){O(ak,function(aq){function ar(aw){var av,au,at;if(aw.nodeName==="A"){au=am.cloneNode(R);ak.push(au);at=a.grep(aw.childNodes);for(av=0;av<at.length;av++){au.appendChild(at[av])}aw.appendChild(au)}O(a.grep(aw.childNodes),ar)}ar(aq)})}O(ak,function(at){var aq;function au(aw){var av=0;O(aw.childNodes,function(ax){if(!f(ax)&&!H(ax)){av++}});return av}function ar(av){var ax,aw;O(av.childNodes,function(ay){if(ay.nodeType==1&&!H(ay)&&!b(ay)){ax=ay;return R}});if(ax&&h(ax,ah)){aw=ax.cloneNode(R);V(aw);c.replace(aw,av,B);c.remove(ax,1)}return aw||av}aq=au(at);if((ak.length>1||!F(at))&&aq===0){c.remove(at,1);return}if(ah.inline||ah.wrapper){if(!ah.exact&&aq===1){at=ar(at)}O(ac,function(av){O(c.select(av.inline,at),function(ax){var aw;if(av.wrap_links===false){aw=ax.parentNode;do{if(aw.nodeName==="A"){return}}while(aw=aw.parentNode)}T(av,ag,ax,av.exact?ax:null)})});if(x(at.parentNode,Y,ag)){c.remove(at,1);at=0;return B}if(ah.merge_with_parents){c.getParent(at.parentNode,function(av){if(x(av,Y,ag)){c.remove(at,1);at=0;return B}})}if(at&&ah.merge_siblings!==false){at=u(C(at),at);at=u(at,C(at,B))}}})}if(ah){if(ab){if(ab.nodeType){W=c.createRng();W.setStartBefore(ab);W.setEndAfter(ab);ai(o(W,ac),null,true)}else{ai(ab,null,true)}}else{if(!ad||!ah.inline||c.select("td.mceSelected,th.mceSelected").length){var aj=U.selection.getNode();U.selection.setRng(aa());af=q.getBookmark();ai(o(q.getRng(B),ac),af);if(ah.styles&&(ah.styles.color||ah.styles.textDecoration)){a.walk(aj,I,"childNodes");I(aj)}q.moveToBookmark(af);q.setRng(Z(q.getRng(B)));U.nodeChanged()}else{P("apply",Y,ag)}}}}function A(X,ag,aa){var ab=Q(X),ai=ab[0],af,ae,W;function Z(al){var ak=al.startContainer,aq=al.startOffset,ap,ao,am,an;if(ak.nodeType==3&&aq>=ak.nodeValue.length-1){ak=ak.parentNode;aq=s(ak)+1}if(ak.nodeType==1){am=ak.childNodes;ak=am[Math.min(aq,am.length-1)];ap=new t(ak);if(aq>am.length-1){ap.next()}for(ao=ap.current();ao;ao=ap.next()){if(ao.nodeType==3&&!f(ao)){an=c.create("a",null,E);ao.parentNode.insertBefore(an,ao);al.setStart(ao,0);q.setRng(al);c.remove(an);return}}}}function Y(an){var am,al,ak;am=a.grep(an.childNodes);for(al=0,ak=ab.length;al<ak;al++){if(T(ab[al],ag,an,an)){break}}if(ai.deep){for(al=0,ak=am.length;al<ak;al++){Y(am[al])}}}function ac(ak){var al;O(m(ak.parentNode).reverse(),function(am){var an;if(!al&&am.id!="_start"&&am.id!="_end"){an=x(am,X,ag);if(an&&an.split!==false){al=am}}});return al}function V(an,ak,ap,at){var au,ar,aq,am,ao,al;if(an){al=an.parentNode;for(au=ak.parentNode;au&&au!=al;au=au.parentNode){ar=au.cloneNode(R);for(ao=0;ao<ab.length;ao++){if(T(ab[ao],ag,ar,ar)){ar=0;break}}if(ar){if(aq){ar.appendChild(aq)}if(!am){am=ar}aq=ar}}if(at&&(!ai.mixed||!F(an))){ak=c.split(an,ak)}if(aq){ap.parentNode.insertBefore(aq,ap);am.appendChild(ap)}}return ak}function ah(ak){return V(ac(ak),ak,ak,true)}function ad(am){var al=c.get(am?"_start":"_end"),ak=al[am?"firstChild":"lastChild"];if(H(ak)){ak=ak[am?"firstChild":"lastChild"]}c.remove(al,true);return ak}function aj(ak){var al,am;ak=o(ak,ab,B);if(ai.split){al=J(ak,B);am=J(ak);if(al!=am){al=N(al,"span",{id:"_start","data-mce-type":"bookmark"});am=N(am,"span",{id:"_end","data-mce-type":"bookmark"});ah(al);ah(am);al=ad(B);am=ad()}else{al=am=ah(al)}ak.startContainer=al.parentNode;ak.startOffset=s(al);ak.endContainer=am.parentNode;ak.endOffset=s(am)+1}K.walk(ak,function(an){O(an,function(ao){Y(ao);if(ao.nodeType===1&&U.dom.getStyle(ao,"text-decoration")==="underline"&&ao.parentNode&&i(ao.parentNode)==="underline"){T({deep:false,exact:true,inline:"span",styles:{textDecoration:"underline"}},null,ao)}})})}if(aa){if(aa.nodeType){W=c.createRng();W.setStartBefore(aa);W.setEndAfter(aa);aj(W)}else{aj(aa)}return}if(!q.isCollapsed()||!ai.inline||c.select("td.mceSelected,th.mceSelected").length){af=q.getBookmark();aj(q.getRng(B));q.moveToBookmark(af);if(ai.inline&&j(X,ag,q.getStart())){Z(q.getRng(true))}U.nodeChanged()}else{P("remove",X,ag)}if(a.isWebKit){U.execCommand("mceCleanup")}}function D(W,Y,X){var V=Q(W);if(j(W,Y,X)&&(!("toggle" in V[0])||V[0]["toggle"])){A(W,Y,X)}else{S(W,Y,X)}}function x(W,V,ab,Z){var X=Q(V),ac,aa,Y;function ad(ah,aj,ak){var ag,ai,ae=aj[ak],af;if(aj.onmatch){return aj.onmatch(ah,aj,ak)}if(ae){if(ae.length===p){for(ag in ae){if(ae.hasOwnProperty(ag)){if(ak==="attributes"){ai=c.getAttrib(ah,ag)}else{ai=L(ah,ag)}if(Z&&!ai&&!aj.exact){return}if((!Z||aj.exact)&&!g(ai,r(ae[ag],ab))){return}}}}else{for(af=0;af<ae.length;af++){if(ak==="attributes"?c.getAttrib(ah,ae[af]):L(ah,ae[af])){return aj}}}}return aj}if(X&&W){for(aa=0;aa<X.length;aa++){ac=X[aa];if(h(W,ac)&&ad(W,ac,"attributes")&&ad(W,ac,"styles")){if(Y=ac.classes){for(aa=0;aa<Y.length;aa++){if(!c.hasClass(W,Y[aa])){return}}}return ac}}}}function j(X,Z,Y){var W;function V(aa){aa=c.getParent(aa,function(ab){return !!x(ab,X,Z,true)});return x(aa,X,Z)}if(Y){return V(Y)}Y=q.getNode();if(V(Y)){return B}W=q.getStart();if(W!=Y){if(V(W)){return B}}return R}function v(ac,ab){var Z,aa=[],Y={},X,W,V;Z=q.getStart();c.getParent(Z,function(af){var ae,ad;for(ae=0;ae<ac.length;ae++){ad=ac[ae];if(!Y[ad]&&x(af,ad,ab)){Y[ad]=true;aa.push(ad)}}});return aa}function y(Z){var ab=Q(Z),Y,X,aa,W,V;if(ab){Y=q.getStart();X=m(Y);for(W=ab.length-1;W>=0;W--){V=ab[W].selector;if(!V){return B}for(aa=X.length-1;aa>=0;aa--){if(c.is(X[aa],V)){return B}}}}return R}a.extend(this,{get:Q,register:k,apply:S,remove:A,toggle:D,match:j,matchAll:v,matchNode:x,canApply:y});function h(V,W){if(g(V,W.inline)){return B}if(g(V,W.block)){return B}if(W.selector){return c.is(V,W.selector)}}function g(W,V){W=W||"";V=V||"";W=""+(W.nodeName||W);V=""+(V.nodeName||V);return W.toLowerCase()==V.toLowerCase()}function L(W,V){var X=c.getStyle(W,V);if(V=="color"||V=="backgroundColor"){X=c.toHex(X)}if(V=="fontWeight"&&X==700){X="bold"}return""+X}function r(V,W){if(typeof(V)!="string"){V=V(W)}else{if(W){V=V.replace(/%(\w+)/g,function(Y,X){return W[X]||Y})}}return V}function f(V){return V&&V.nodeType===3&&/^([\t \r\n]+|)$/.test(V.nodeValue)}function N(X,W,V){var Y=c.create(W,V);X.parentNode.insertBefore(Y,X);Y.appendChild(X);return Y}function o(V,ah,Y){var X=V.startContainer,ac=V.startOffset,ak=V.endContainer,ae=V.endOffset,aj,ag,ab,af;function ai(aq){var al,ao,ap,an,am;al=ao=aq?X:ak;am=aq?"previousSibling":"nextSibling";root=c.getRoot();if(al.nodeType==3&&!f(al)){if(aq?ac>0:ae<al.nodeValue.length){return al}}for(;;){if(ao==root||(!ah[0].block_expand&&F(ao))){return ao}for(an=ao[am];an;an=an[am]){if(!H(an)&&!f(an)){return ao}}ao=ao.parentNode}return al}function aa(al,am){if(am===p){am=al.nodeType===3?al.length:al.childNodes.length}while(al&&al.hasChildNodes()){al=al.childNodes[am];if(al){am=al.nodeType===3?al.length:al.childNodes.length}}return{node:al,offset:am}}if(X.nodeType==1&&X.hasChildNodes()){ag=X.childNodes.length-1;X=X.childNodes[ac>ag?ag:ac];if(X.nodeType==3){ac=0}}if(ak.nodeType==1&&ak.hasChildNodes()){ag=ak.childNodes.length-1;ak=ak.childNodes[ae>ag?ag:ae-1];if(ak.nodeType==3){ae=ak.nodeValue.length}}if(H(X.parentNode)||H(X)){X=H(X)?X:X.parentNode;X=X.nextSibling||X;if(X.nodeType==3){ac=0}}if(H(ak.parentNode)||H(ak)){ak=H(ak)?ak:ak.parentNode;ak=ak.previousSibling||ak;if(ak.nodeType==3){ae=ak.length}}if(ah[0].inline){if(V.collapsed){function ad(am,aq,at){var ap,an,ar,al;function ao(av,ax){var ay,au,aw=av.nodeValue;if(typeof(ax)=="undefined"){ax=at?aw.length:0}if(at){ay=aw.lastIndexOf(" ",ax);au=aw.lastIndexOf("\u00a0",ax);ay=ay>au?ay:au;if(ay!==-1&&!Y){ay++}}else{ay=aw.indexOf(" ",ax);au=aw.indexOf("\u00a0",ax);ay=ay!==-1&&(au===-1||ay<au)?ay:au}return ay}if(am.nodeType===3){ar=ao(am,aq);if(ar!==-1){return{container:am,offset:ar}}al=am}ap=new t(am,c.getParent(am,F)||U.getBody());while(an=ap[at?"prev":"next"]()){if(an.nodeType===3){al=an;ar=ao(an);if(ar!==-1){return{container:an,offset:ar}}}else{if(F(an)){break}}}if(al){if(at){aq=0}else{aq=al.length}return{container:al,offset:aq}}}af=ad(X,ac,true);if(af){X=af.container;ac=af.offset}af=ad(ak,ae);if(af){ak=af.container;ae=af.offset}}ab=aa(ak,ae);if(ab.node){while(ab.node&&ab.offset===0&&ab.node.previousSibling){ab=aa(ab.node.previousSibling)}if(ab.node&&ab.offset>0&&ab.node.nodeType===3&&ab.node.nodeValue.charAt(ab.offset-1)===" "){if(ab.offset>1){ak=ab.node;ak.splitText(ab.offset-1)}else{if(ab.node.previousSibling){}}}}}if(ah[0].inline||ah[0].block_expand){if(!ah[0].inline||(X.nodeType!=3||ac===0)){X=ai(true)}if(!ah[0].inline||(ak.nodeType!=3||ae===ak.nodeValue.length)){ak=ai()}}if(ah[0].selector&&ah[0].expand!==R&&!ah[0].inline){function Z(am,al){var an,ao,aq,ap;if(am.nodeType==3&&am.nodeValue.length==0&&am[al]){am=am[al]}an=m(am);for(ao=0;ao<an.length;ao++){for(aq=0;aq<ah.length;aq++){ap=ah[aq];if("collapsed" in ap&&ap.collapsed!==V.collapsed){continue}if(c.is(an[ao],ap.selector)){return an[ao]}}}return am}X=Z(X,"previousSibling");ak=Z(ak,"nextSibling")}if(ah[0].block||ah[0].selector){function W(am,al,ao){var an;if(!ah[0].wrapper){an=c.getParent(am,ah[0].block)}if(!an){an=c.getParent(am.nodeType==3?am.parentNode:am,F)}if(an&&ah[0].wrapper){an=m(an,"ul,ol").reverse()[0]||an}if(!an){an=am;while(an[al]&&!F(an[al])){an=an[al];if(g(an,"br")){break}}}return an||am}X=W(X,"previousSibling");ak=W(ak,"nextSibling");if(ah[0].block){if(!F(X)){X=ai(true)}if(!F(ak)){ak=ai()}}}if(X.nodeType==1){ac=s(X);X=X.parentNode}if(ak.nodeType==1){ae=s(ak)+1;ak=ak.parentNode}return{startContainer:X,startOffset:ac,endContainer:ak,endOffset:ae}}function T(ab,aa,Y,V){var X,W,Z;if(!h(Y,ab)){return R}if(ab.remove!="all"){O(ab.styles,function(ad,ac){ad=r(ad,aa);if(typeof(ac)==="number"){ac=ad;V=0}if(!V||g(L(V,ac),ad)){c.setStyle(Y,ac,"")}Z=1});if(Z&&c.getAttrib(Y,"style")==""){Y.removeAttribute("style");Y.removeAttribute("data-mce-style")}O(ab.attributes,function(ae,ac){var ad;ae=r(ae,aa);if(typeof(ac)==="number"){ac=ae;V=0}if(!V||g(c.getAttrib(V,ac),ae)){if(ac=="class"){ae=c.getAttrib(Y,ac);if(ae){ad="";O(ae.split(/\s+/),function(af){if(/mce\w+/.test(af)){ad+=(ad?" ":"")+af}});if(ad){c.setAttrib(Y,ac,ad);return}}}if(ac=="class"){Y.removeAttribute("className")}if(e.test(ac)){Y.removeAttribute("data-mce-"+ac)}Y.removeAttribute(ac)}});O(ab.classes,function(ac){ac=r(ac,aa);if(!V||c.hasClass(V,ac)){c.removeClass(Y,ac)}});W=c.getAttribs(Y);for(X=0;X<W.length;X++){if(W[X].nodeName.indexOf("_")!==0){return R}}}if(ab.remove!="none"){n(Y,ab);return B}}function n(X,Y){var V=X.parentNode,W;if(Y.block){if(!l){function Z(ab,aa,ac){ab=C(ab,aa,ac);return !ab||(ab.nodeName=="BR"||F(ab))}if(F(X)&&!F(V)){if(!Z(X,R)&&!Z(X.firstChild,B,1)){X.insertBefore(c.create("br"),X.firstChild)}if(!Z(X,B)&&!Z(X.lastChild,R,1)){X.appendChild(c.create("br"))}}}else{if(V==c.getRoot()){if(!Y.list_block||!g(X,Y.list_block)){O(a.grep(X.childNodes),function(aa){if(d(l,aa.nodeName.toLowerCase())){if(!W){W=N(aa,l)}else{W.appendChild(aa)}}else{W=0}})}}}}if(Y.selector&&Y.inline&&!g(Y.inline,X)){return}c.remove(X,1)}function C(W,V,X){if(W){V=V?"nextSibling":"previousSibling";for(W=X?W:W[V];W;W=W[V]){if(W.nodeType==1||!f(W)){return W}}}}function H(V){return V&&V.nodeType==1&&V.getAttribute("data-mce-type")=="bookmark"}function u(Z,Y){var V,X,W;function ab(ae,ad){if(ae.nodeName!=ad.nodeName){return R}function ac(ag){var ah={};O(c.getAttribs(ag),function(ai){var aj=ai.nodeName.toLowerCase();if(aj.indexOf("_")!==0&&aj!=="style"){ah[aj]=c.getAttrib(ag,aj)}});return ah}function af(aj,ai){var ah,ag;for(ag in aj){if(aj.hasOwnProperty(ag)){ah=ai[ag];if(ah===p){return R}if(aj[ag]!=ah){return R}delete ai[ag]}}for(ag in ai){if(ai.hasOwnProperty(ag)){return R}}return B}if(!af(ac(ae),ac(ad))){return R}if(!af(c.parseStyle(c.getAttrib(ae,"style")),c.parseStyle(c.getAttrib(ad,"style")))){return R}return B}if(Z&&Y){function aa(ad,ac){for(X=ad;X;X=X[ac]){if(X.nodeType==3&&X.nodeValue.length!==0){return ad}if(X.nodeType==1&&!H(X)){return X}}return ad}Z=aa(Z,"previousSibling");Y=aa(Y,"nextSibling");if(ab(Z,Y)){for(X=Z.nextSibling;X&&X!=Y;){W=X;X=X.nextSibling;Z.appendChild(W)}c.remove(Y);O(a.grep(Y.childNodes),function(ac){Z.appendChild(ac)});return Z}}return Y}function G(V){return/^(h[1-6]|p|div|pre|address|dl|dt|dd)$/.test(V)}function J(W,aa){var V,Z,X,Y;V=W[aa?"startContainer":"endContainer"];Z=W[aa?"startOffset":"endOffset"];if(V.nodeType==1){X=V.childNodes.length-1;if(!aa&&Z){Z--}V=V.childNodes[Z>X?X:Z]}if(V.nodeType===3&&aa&&Z>=V.nodeValue.length){V=new t(V,U.getBody()).next()||V}if(V.nodeType===3&&!aa&&Z==0){V=new t(V,U.getBody()).prev()||V}return V}function P(ae,V,ac){var ah,af="_mce_caret",W=U.settings.caret_debug;ah=a.isGecko?"\u200B":E;function X(aj){var ai=c.create("span",{id:af,"data-mce-bogus":true,style:W?"color:red":""});if(aj){ai.appendChild(U.getDoc().createTextNode(ah))}return ai}function ad(aj,ai){while(aj){if((aj.nodeType===3&&aj.nodeValue!==ah)||aj.childNodes.length>1){return false}if(ai&&aj.nodeType===1){ai.push(aj)}aj=aj.firstChild}return true}function aa(ai){while(ai){if(ai.id===af){return ai}ai=ai.parentNode}}function Z(ai){var aj;if(ai){aj=new t(ai,ai);for(ai=aj.current();ai;ai=aj.next()){if(ai.nodeType===3){return ai}}}}function Y(ak,aj){var al,ai;if(!ak){ak=aa(q.getStart());if(!ak){while(ak=c.get(af)){Y(ak,false)}}}else{ai=q.getRng(true);if(ad(ak)){if(aj!==false){ai.setStartBefore(ak);ai.setEndBefore(ak)}c.remove(ak)}else{al=Z(ak);al=al.deleteData(0,1);c.remove(ak,1)}q.setRng(ai)}}function ab(){var ak,ai,ao,an,al,aj,am;ak=q.getRng(true);an=ak.startOffset;aj=ak.startContainer;am=aj.nodeValue;ai=aa(q.getStart());if(ai){ao=Z(ai)}if(am&&an>0&&an<am.length&&/\w/.test(am.charAt(an))&&/\w/.test(am.charAt(an-1))){al=q.getBookmark();ak.collapse(true);ak=o(ak,Q(V));ak=K.split(ak);S(V,ac,ak);q.moveToBookmark(al)}else{if(!ai||ao.nodeValue!==ah){ai=X(true);ao=ai.firstChild;ak.insertNode(ai);an=1;S(V,ac,ai)}else{S(V,ac,ai)}q.setCursorLocation(ao,an)}}function ag(){var ai=q.getRng(true),aj,al,ao,an,ak,ar,aq=[],am,ap;aj=ai.startContainer;al=ai.startOffset;ak=aj;if(aj.nodeType==3){if(al!=aj.nodeValue.length||aj.nodeValue===ah){an=true}ak=ak.parentNode}while(ak){if(x(ak,V,ac)){ar=ak;break}if(ak.nextSibling){an=true}aq.push(ak);ak=ak.parentNode}if(!ar){return}if(an){ao=q.getBookmark();ai.collapse(true);ai=o(ai,Q(V),true);ai=K.split(ai);A(V,ac,ai);q.moveToBookmark(ao)}else{ap=X();ak=ap;for(am=aq.length-1;am>=0;am--){ak.appendChild(aq[am].cloneNode(false));ak=ak.firstChild}ak.appendChild(c.doc.createTextNode(ah));ak=ak.firstChild;c.insertAfter(ap,ar);q.setCursorLocation(ak,1)}}U.onBeforeGetContent.addToTop(function(){var ai=[],aj;if(ad(aa(q.getStart()),ai)){aj=ai.length;while(aj--){c.setAttrib(ai[aj],"data-mce-bogus","1")}}});a.each("onMouseUp onKeyUp".split(" "),function(ai){U[ai].addToTop(function(){Y()})});U.onKeyDown.addToTop(function(ai,ak){var aj=ak.keyCode;if(aj==8||aj==37||aj==39){Y(aa(q.getStart()))}});if(ae=="apply"){ab()}else{ag()}}}})(tinymce);tinymce.onAddEditor.add(function(e,a){var d,h,g,c=a.settings;if(c.inline_styles){h=e.explode(c.font_size_legacy_values);function b(j,i){e.each(i,function(l,k){if(l){g.setStyle(j,k,l)}});g.rename(j,"span")}d={font:function(j,i){b(i,{backgroundColor:i.style.backgroundColor,color:i.color,fontFamily:i.face,fontSize:h[parseInt(i.size)-1]})},u:function(j,i){b(i,{textDecoration:"underline"})},strike:function(j,i){b(i,{textDecoration:"line-through"})}};function f(i,j){g=i.dom;if(c.convert_fonts_to_spans){e.each(g.select("font,u,strike",j.node),function(k){d[k.nodeName.toLowerCase()](a.dom,k)})}}a.onPreProcess.add(f);a.onSetContent.add(f);a.onInit.add(function(){a.selection.onSetContent.add(f)})}});
\ No newline at end of file
+(function(d){var a=/^\s*|\s*$/g,e,c="B".replace(/A(.)|B/,"$1")==="$1";var b={majorVersion:"3",minorVersion:"4.7",releaseDate:"2011-11-03",_init:function(){var s=this,q=document,o=navigator,g=o.userAgent,m,f,l,k,j,r;s.isOpera=d.opera&&opera.buildNumber;s.isWebKit=/WebKit/.test(g);s.isIE=!s.isWebKit&&!s.isOpera&&(/MSIE/gi).test(g)&&(/Explorer/gi).test(o.appName);s.isIE6=s.isIE&&/MSIE [56]/.test(g);s.isIE7=s.isIE&&/MSIE [7]/.test(g);s.isIE8=s.isIE&&/MSIE [8]/.test(g);s.isIE9=s.isIE&&/MSIE [9]/.test(g);s.isGecko=!s.isWebKit&&/Gecko/.test(g);s.isMac=g.indexOf("Mac")!=-1;s.isAir=/adobeair/i.test(g);s.isIDevice=/(iPad|iPhone)/.test(g);s.isIOS5=s.isIDevice&&g.match(/AppleWebKit\/(\d*)/)[1]>=534;if(d.tinyMCEPreInit){s.suffix=tinyMCEPreInit.suffix;s.baseURL=tinyMCEPreInit.base;s.query=tinyMCEPreInit.query;return}s.suffix="";f=q.getElementsByTagName("base");for(m=0;m<f.length;m++){if(r=f[m].href){if(/^https?:\/\/[^\/]+$/.test(r)){r+="/"}k=r?r.match(/.*\//)[0]:""}}function h(i){if(i.src&&/tiny_mce(|_gzip|_jquery|_prototype|_full)(_dev|_src)?.js/.test(i.src)){if(/_(src|dev)\.js/g.test(i.src)){s.suffix="_src"}if((j=i.src.indexOf("?"))!=-1){s.query=i.src.substring(j+1)}s.baseURL=i.src.substring(0,i.src.lastIndexOf("/"));if(k&&s.baseURL.indexOf("://")==-1&&s.baseURL.indexOf("/")!==0){s.baseURL=k+s.baseURL}return s.baseURL}return null}f=q.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}l=q.getElementsByTagName("head")[0];if(l){f=l.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}}return},is:function(g,f){if(!f){return g!==e}if(f=="array"&&(g.hasOwnProperty&&g instanceof Array)){return true}return typeof(g)==f},makeMap:function(f,j,h){var g;f=f||[];j=j||",";if(typeof(f)=="string"){f=f.split(j)}h=h||{};g=f.length;while(g--){h[f[g]]={}}return h},each:function(i,f,h){var j,g;if(!i){return 0}h=h||i;if(i.length!==e){for(j=0,g=i.length;j<g;j++){if(f.call(h,i[j],j,i)===false){return 0}}}else{for(j in i){if(i.hasOwnProperty(j)){if(f.call(h,i[j],j,i)===false){return 0}}}}return 1},map:function(g,h){var i=[];b.each(g,function(f){i.push(h(f))});return i},grep:function(g,h){var i=[];b.each(g,function(f){if(!h||h(f)){i.push(f)}});return i},inArray:function(g,h){var j,f;if(g){for(j=0,f=g.length;j<f;j++){if(g[j]===h){return j}}}return -1},extend:function(k,j){var h,g,f=arguments;for(h=1,g=f.length;h<g;h++){j=f[h];b.each(j,function(i,l){if(i!==e){k[l]=i}})}return k},trim:function(f){return(f?""+f:"").replace(a,"")},create:function(o,f,j){var n=this,g,i,k,l,h,m=0;o=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(o);k=o[3].match(/(^|\.)(\w+)$/i)[2];i=n.createNS(o[3].replace(/\.\w+$/,""),j);if(i[k]){return}if(o[2]=="static"){i[k]=f;if(this.onCreate){this.onCreate(o[2],o[3],i[k])}return}if(!f[k]){f[k]=function(){};m=1}i[k]=f[k];n.extend(i[k].prototype,f);if(o[5]){g=n.resolve(o[5]).prototype;l=o[5].match(/\.(\w+)$/i)[1];h=i[k];if(m){i[k]=function(){return g[l].apply(this,arguments)}}else{i[k]=function(){this.parent=g[l];return h.apply(this,arguments)}}i[k].prototype[k]=i[k];n.each(g,function(p,q){i[k].prototype[q]=g[q]});n.each(f,function(p,q){if(g[q]){i[k].prototype[q]=function(){this.parent=g[q];return p.apply(this,arguments)}}else{if(q!=k){i[k].prototype[q]=p}}})}n.each(f["static"],function(p,q){i[k][q]=p});if(this.onCreate){this.onCreate(o[2],o[3],i[k].prototype)}},walk:function(i,h,j,g){g=g||this;if(i){if(j){i=i[j]}b.each(i,function(k,f){if(h.call(g,k,f,j)===false){return false}b.walk(k,h,j,g)})}},createNS:function(j,h){var g,f;h=h||d;j=j.split(".");for(g=0;g<j.length;g++){f=j[g];if(!h[f]){h[f]={}}h=h[f]}return h},resolve:function(j,h){var g,f;h=h||d;j=j.split(".");for(g=0,f=j.length;g<f;g++){h=h[j[g]];if(!h){break}}return h},addUnload:function(j,i){var h=this;j={func:j,scope:i||this};if(!h.unloads){function g(){var f=h.unloads,l,m;if(f){for(m in f){l=f[m];if(l&&l.func){l.func.call(l.scope,1)}}if(d.detachEvent){d.detachEvent("onbeforeunload",k);d.detachEvent("onunload",g)}else{if(d.removeEventListener){d.removeEventListener("unload",g,false)}}h.unloads=l=f=w=g=0;if(d.CollectGarbage){CollectGarbage()}}}function k(){var l=document;if(l.readyState=="interactive"){function f(){l.detachEvent("onstop",f);if(g){g()}l=0}if(l){l.attachEvent("onstop",f)}d.setTimeout(function(){if(l){l.detachEvent("onstop",f)}},0)}}if(d.attachEvent){d.attachEvent("onunload",g);d.attachEvent("onbeforeunload",k)}else{if(d.addEventListener){d.addEventListener("unload",g,false)}}h.unloads=[j]}else{h.unloads.push(j)}return j},removeUnload:function(i){var g=this.unloads,h=null;b.each(g,function(j,f){if(j&&j.func==i){g.splice(f,1);h=i;return false}});return h},explode:function(f,g){return f?b.map(f.split(g||","),b.trim):f},_addVer:function(g){var f;if(!this.query){return g}f=(g.indexOf("?")==-1?"?":"&")+this.query;if(g.indexOf("#")==-1){return g+f}return g.replace("#",f+"#")},_replace:function(h,f,g){if(c){return g.replace(h,function(){var l=f,j=arguments,k;for(k=0;k<j.length-2;k++){if(j[k]===e){l=l.replace(new RegExp("\\$"+k,"g"),"")}else{l=l.replace(new RegExp("\\$"+k,"g"),j[k])}}return l})}return g.replace(h,f)}};b._init();d.tinymce=d.tinyMCE=b})(window);tinymce.create("tinymce.util.Dispatcher",{scope:null,listeners:null,Dispatcher:function(a){this.scope=a||this;this.listeners=[]},add:function(a,b){this.listeners.push({cb:a,scope:b||this.scope});return a},addToTop:function(a,b){this.listeners.unshift({cb:a,scope:b||this.scope});return a},remove:function(a){var b=this.listeners,c=null;tinymce.each(b,function(e,d){if(a==e.cb){c=a;b.splice(d,1);return false}});return c},dispatch:function(){var f,d=arguments,e,b=this.listeners,g;for(e=0;e<b.length;e++){g=b[e];f=g.cb.apply(g.scope,d);if(f===false){break}}return f}});(function(){var a=tinymce.each;tinymce.create("tinymce.util.URI",{URI:function(e,g){var f=this,i,d,c,h;e=tinymce.trim(e);g=f.settings=g||{};if(/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e)){f.source=e;return}if(e.indexOf("/")===0&&e.indexOf("//")!==0){e=(g.base_uri?g.base_uri.protocol||"http":"http")+"://mce_host"+e}if(!/^[\w-]*:?\/\//.test(e)){h=g.base_uri?g.base_uri.path:new tinymce.util.URI(location.href).directory;e=((g.base_uri&&g.base_uri.protocol)||"http")+"://mce_host"+f.toAbsPath(h,e)}e=e.replace(/@@/g,"(mce_at)");e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e);a(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],function(b,j){var k=e[j];if(k){k=k.replace(/\(mce_at\)/g,"@@")}f[b]=k});if(c=g.base_uri){if(!f.protocol){f.protocol=c.protocol}if(!f.userInfo){f.userInfo=c.userInfo}if(!f.port&&f.host=="mce_host"){f.port=c.port}if(!f.host||f.host=="mce_host"){f.host=c.host}f.source=""}},setPath:function(c){var b=this;c=/^(.*?)\/?(\w+)?$/.exec(c);b.path=c[0];b.directory=c[1];b.file=c[2];b.source="";b.getURI()},toRelative:function(b){var c=this,d;if(b==="./"){return b}b=new tinymce.util.URI(b,{base_uri:c});if((b.host!="mce_host"&&c.host!=b.host&&b.host)||c.port!=b.port||c.protocol!=b.protocol){return b.getURI()}d=c.toRelPath(c.path,b.path);if(b.query){d+="?"+b.query}if(b.anchor){d+="#"+b.anchor}return d},toAbsolute:function(b,c){var b=new tinymce.util.URI(b,{base_uri:this});return b.getURI(this.host==b.host&&this.protocol==b.protocol?c:0)},toRelPath:function(g,h){var c,f=0,d="",e,b;g=g.substring(0,g.lastIndexOf("/"));g=g.split("/");c=h.split("/");if(g.length>=c.length){for(e=0,b=g.length;e<b;e++){if(e>=c.length||g[e]!=c[e]){f=e+1;break}}}if(g.length<c.length){for(e=0,b=c.length;e<b;e++){if(e>=g.length||g[e]!=c[e]){f=e+1;break}}}if(f==1){return h}for(e=0,b=g.length-(f-1);e<b;e++){d+="../"}for(e=f-1,b=c.length;e<b;e++){if(e!=f-1){d+="/"+c[e]}else{d+=c[e]}}return d},toAbsPath:function(e,f){var c,b=0,h=[],d,g;d=/\/$/.test(f)?"/":"";e=e.split("/");f=f.split("/");a(e,function(i){if(i){h.push(i)}});e=h;for(c=f.length-1,h=[];c>=0;c--){if(f[c].length==0||f[c]=="."){continue}if(f[c]==".."){b++;continue}if(b>0){b--;continue}h.push(f[c])}c=e.length-b;if(c<=0){g=h.reverse().join("/")}else{g=e.slice(0,c).join("/")+"/"+h.reverse().join("/")}if(g.indexOf("/")!==0){g="/"+g}if(d&&g.lastIndexOf("/")!==g.length-1){g+=d}return g},getURI:function(d){var c,b=this;if(!b.source||d){c="";if(!d){if(b.protocol){c+=b.protocol+"://"}if(b.userInfo){c+=b.userInfo+"@"}if(b.host){c+=b.host}if(b.port){c+=":"+b.port}}if(b.path){c+=b.path}if(b.query){c+="?"+b.query}if(b.anchor){c+="#"+b.anchor}b.source=c}return b.source}})})();(function(){var a=tinymce.each;tinymce.create("static tinymce.util.Cookie",{getHash:function(d){var b=this.get(d),c;if(b){a(b.split("&"),function(e){e=e.split("=");c=c||{};c[unescape(e[0])]=unescape(e[1])})}return c},setHash:function(j,b,g,f,i,c){var h="";a(b,function(e,d){h+=(!h?"":"&")+escape(d)+"="+escape(e)});this.set(j,h,g,f,i,c)},get:function(i){var h=document.cookie,g,f=i+"=",d;if(!h){return}d=h.indexOf("; "+f);if(d==-1){d=h.indexOf(f);if(d!=0){return null}}else{d+=2}g=h.indexOf(";",d);if(g==-1){g=h.length}return unescape(h.substring(d+f.length,g))},set:function(i,b,g,f,h,c){document.cookie=i+"="+escape(b)+((g)?"; expires="+g.toGMTString():"")+((f)?"; path="+escape(f):"")+((h)?"; domain="+h:"")+((c)?"; secure":"")},remove:function(e,b){var c=new Date();c.setTime(c.getTime()-1000);this.set(e,"",c,b,c)}})})();(function(){function serialize(o,quote){var i,v,t;quote=quote||'"';if(o==null){return"null"}t=typeof o;if(t=="string"){v="\bb\tt\nn\ff\rr\"\"''\\\\";return quote+o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g,function(a,b){if(quote==='"'&&a==="'"){return a}i=v.indexOf(b);if(i+1){return"\\"+v.charAt(i+1)}a=b.charCodeAt().toString(16);return"\\u"+"0000".substring(a.length)+a})+quote}if(t=="object"){if(o.hasOwnProperty&&o instanceof Array){for(i=0,v="[";i<o.length;i++){v+=(i>0?",":"")+serialize(o[i],quote)}return v+"]"}v="{";for(i in o){if(o.hasOwnProperty(i)){v+=typeof o[i]!="function"?(v.length>1?","+quote:quote)+i+quote+":"+serialize(o[i],quote):""}}return v+"}"}return""+o}tinymce.util.JSON={serialize:serialize,parse:function(s){try{return eval("("+s+")")}catch(ex){}}}})();tinymce.create("static tinymce.util.XHR",{send:function(g){var a,e,b=window,h=0;g.scope=g.scope||this;g.success_scope=g.success_scope||g.scope;g.error_scope=g.error_scope||g.scope;g.async=g.async===false?false:true;g.data=g.data||"";function d(i){a=0;try{a=new ActiveXObject(i)}catch(c){}return a}a=b.XMLHttpRequest?new XMLHttpRequest():d("Microsoft.XMLHTTP")||d("Msxml2.XMLHTTP");if(a){if(a.overrideMimeType){a.overrideMimeType(g.content_type)}a.open(g.type||(g.data?"POST":"GET"),g.url,g.async);if(g.content_type){a.setRequestHeader("Content-Type",g.content_type)}a.setRequestHeader("X-Requested-With","XMLHttpRequest");a.send(g.data);function f(){if(!g.async||a.readyState==4||h++>10000){if(g.success&&h<10000&&a.status==200){g.success.call(g.success_scope,""+a.responseText,a,g)}else{if(g.error){g.error.call(g.error_scope,h>10000?"TIMED_OUT":"GENERAL",a,g)}}a=null}else{b.setTimeout(f,10)}}if(!g.async){return f()}e=b.setTimeout(f,10)}}});(function(){var c=tinymce.extend,b=tinymce.util.JSON,a=tinymce.util.XHR;tinymce.create("tinymce.util.JSONRequest",{JSONRequest:function(d){this.settings=c({},d);this.count=0},send:function(f){var e=f.error,d=f.success;f=c(this.settings,f);f.success=function(h,g){h=b.parse(h);if(typeof(h)=="undefined"){h={error:"JSON Parse error."}}if(h.error){e.call(f.error_scope||f.scope,h.error,g)}else{d.call(f.success_scope||f.scope,h.result)}};f.error=function(h,g){if(e){e.call(f.error_scope||f.scope,h,g)}};f.data=b.serialize({id:f.id||"c"+(this.count++),method:f.method,params:f.params});f.content_type="application/json";a.send(f)},"static":{sendRPC:function(d){return new tinymce.util.JSONRequest().send(d)}}})}());(function(a){a.VK={DELETE:46,BACKSPACE:8,ENTER:13,TAB:9,SPACEBAR:32,UP:38,DOWN:40}})(tinymce);(function(k){var i=k.VK,j=i.BACKSPACE,h=i.DELETE;function c(m){var o=m.dom,n=m.selection;m.onKeyDown.add(function(q,u){var p,v,s,t,r;r=u.keyCode==h;if(r||u.keyCode==j){u.preventDefault();p=n.getRng();v=o.getParent(p.startContainer,o.isBlock);if(r){v=o.getNext(v,o.isBlock)}if(v){s=v.firstChild;while(s&&s.nodeType==3&&s.nodeValue.length==0){s=s.nextSibling}if(s&&s.nodeName==="SPAN"){t=s.cloneNode(false)}}q.getDoc().execCommand(r?"ForwardDelete":"Delete",false,null);v=o.getParent(p.startContainer,o.isBlock);k.each(o.select("span.Apple-style-span,font.Apple-style-span",v),function(x){var y=n.getBookmark();if(t){o.replace(t.cloneNode(false),x,true)}else{o.remove(x,true)}n.moveToBookmark(y)})}})}function d(m){m.onKeyUp.add(function(n,p){var o=p.keyCode;if(o==h||o==j){if(n.dom.isEmpty(n.getBody())){n.setContent("",{format:"raw"});n.nodeChanged();return}}})}function b(m){m.dom.bind(m.getDoc(),"focusin",function(){m.selection.setRng(m.selection.getRng())})}function e(m){m.onKeyDown.add(function(n,q){if(q.keyCode===j){if(n.selection.isCollapsed()&&n.selection.getRng(true).startOffset===0){var p=n.selection.getNode();var o=p.previousSibling;if(o&&o.nodeName&&o.nodeName.toLowerCase()==="hr"){n.dom.remove(o);k.dom.Event.cancel(q)}}}})}function g(m){if(!Range.prototype.getClientRects){m.onMouseDown.add(function(o,p){if(p.target.nodeName==="HTML"){var n=o.getBody();n.blur();setTimeout(function(){n.focus()},0)}})}}function f(m){m.onClick.add(function(n,o){o=o.target;if(/^(IMG|HR)$/.test(o.nodeName)){n.selection.getSel().setBaseAndExtent(o,0,o,1)}if(o.nodeName=="A"&&n.dom.hasClass(o,"mceItemAnchor")){n.selection.select(o)}n.nodeChanged()})}function l(m){var o,n;m.dom.bind(m.getDoc(),"selectionchange",function(){if(n){clearTimeout(n);n=0}n=window.setTimeout(function(){var p=m.selection.getRng();if(!o||!k.dom.RangeUtils.compareRanges(p,o)){m.nodeChanged();o=p}},50)})}function a(m){document.body.setAttribute("role","application")}k.create("tinymce.util.Quirks",{Quirks:function(m){if(k.isWebKit){c(m);d(m);b(m);f(m);if(k.isIDevice){l(m)}}if(k.isIE){e(m);d(m);a(m)}if(k.isGecko){e(m);g(m)}}})})(tinymce);(function(j){var a,g,d,k=/[&<>\"\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,b=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,f=/[<>&\"\']/g,c=/&(#x|#)?([\w]+);/g,i={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"};g={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;"};d={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"};function h(l){var m;m=document.createElement("div");m.innerHTML=l;return m.textContent||m.innerText||l}function e(m,p){var n,o,l,q={};if(m){m=m.split(",");p=p||10;for(n=0;n<m.length;n+=2){o=String.fromCharCode(parseInt(m[n],p));if(!g[o]){l="&"+m[n+1]+";";q[o]=l;q[l]=o}}return q}}a=e("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);j.html=j.html||{};j.html.Entities={encodeRaw:function(m,l){return m.replace(l?k:b,function(n){return g[n]||n})},encodeAllRaw:function(l){return(""+l).replace(f,function(m){return g[m]||m})},encodeNumeric:function(m,l){return m.replace(l?k:b,function(n){if(n.length>1){return"&#"+(((n.charCodeAt(0)-55296)*1024)+(n.charCodeAt(1)-56320)+65536)+";"}return g[n]||"&#"+n.charCodeAt(0)+";"})},encodeNamed:function(n,l,m){m=m||a;return n.replace(l?k:b,function(o){return g[o]||m[o]||o})},getEncodeFunc:function(l,o){var p=j.html.Entities;o=e(o)||a;function m(r,q){return r.replace(q?k:b,function(s){return g[s]||o[s]||"&#"+s.charCodeAt(0)+";"||s})}function n(r,q){return p.encodeNamed(r,q,o)}l=j.makeMap(l.replace(/\+/g,","));if(l.named&&l.numeric){return m}if(l.named){if(o){return n}return p.encodeNamed}if(l.numeric){return p.encodeNumeric}return p.encodeRaw},decode:function(l){return l.replace(c,function(n,m,o){if(m){o=parseInt(o,m.length===2?16:10);if(o>65535){o-=65536;return String.fromCharCode(55296+(o>>10),56320+(o&1023))}else{return i[o]||String.fromCharCode(o)}}return d[n]||a[n]||h(n)})}}})(tinymce);tinymce.html.Styles=function(d,f){var k=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,h=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,b=/\s*([^:]+):\s*([^;]+);?/g,l=/\s+$/,m=/rgb/,e,g,a={},j;d=d||{};j="\\\" \\' \\; \\: ; : \uFEFF".split(" ");for(g=0;g<j.length;g++){a[j[g]]="\uFEFF"+g;a["\uFEFF"+g]=j[g]}function c(n,q,p,i){function o(r){r=parseInt(r).toString(16);return r.length>1?r:"0"+r}return"#"+o(q)+o(p)+o(i)}return{toHex:function(i){return i.replace(k,c)},parse:function(r){var y={},p,n,v,q,u=d.url_converter,x=d.url_converter_scope||this;function o(C,F){var E,B,A,D;E=y[C+"-top"+F];if(!E){return}B=y[C+"-right"+F];if(E!=B){return}A=y[C+"-bottom"+F];if(B!=A){return}D=y[C+"-left"+F];if(A!=D){return}y[C+F]=D;delete y[C+"-top"+F];delete y[C+"-right"+F];delete y[C+"-bottom"+F];delete y[C+"-left"+F]}function t(B){var C=y[B],A;if(!C||C.indexOf(" ")<0){return}C=C.split(" ");A=C.length;while(A--){if(C[A]!==C[0]){return false}}y[B]=C[0];return true}function z(C,B,A,D){if(!t(B)){return}if(!t(A)){return}if(!t(D)){return}y[C]=y[B]+" "+y[A]+" "+y[D];delete y[B];delete y[A];delete y[D]}function s(A){q=true;return a[A]}function i(B,A){if(q){B=B.replace(/\uFEFF[0-9]/g,function(C){return a[C]})}if(!A){B=B.replace(/\\([\'\";:])/g,"$1")}return B}if(r){r=r.replace(/\\[\"\';:\uFEFF]/g,s).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(A){return A.replace(/[;:]/g,s)});while(p=b.exec(r)){n=p[1].replace(l,"").toLowerCase();v=p[2].replace(l,"");if(n&&v.length>0){if(n==="font-weight"&&v==="700"){v="bold"}else{if(n==="color"||n==="background-color"){v=v.toLowerCase()}}v=v.replace(k,c);v=v.replace(h,function(B,A,E,D,F,C){F=F||C;if(F){F=i(F);return"'"+F.replace(/\'/g,"\\'")+"'"}A=i(A||E||D);if(u){A=u.call(x,A,"style")}return"url('"+A.replace(/\'/g,"\\'")+"')"});y[n]=q?i(v,true):v}b.lastIndex=p.index+p[0].length}o("border","");o("border","-width");o("border","-color");o("border","-style");o("padding","");o("margin","");z("border","border-width","border-style","border-color");if(y.border==="medium none"){delete y.border}}return y},serialize:function(p,r){var o="",n,q;function i(t){var x,u,s,v;x=f.styles[t];if(x){for(u=0,s=x.length;u<s;u++){t=x[u];v=p[t];if(v!==e&&v.length>0){o+=(o.length>0?" ":"")+t+": "+v+";"}}}}if(r&&f&&f.styles){i("*");i(r)}else{for(n in p){q=p[n];if(q!==e&&q.length>0){o+=(o.length>0?" ":"")+n+": "+q+";"}}}return o}}};(function(m){var h={},j,l,g,f,c={},b,e,d=m.makeMap,k=m.each;function i(o,n){return o.split(n||",")}function a(r,q){var o,p={};function n(s){return s.replace(/[A-Z]+/g,function(t){return n(r[t])})}for(o in r){if(r.hasOwnProperty(o)){r[o]=n(r[o])}}n(q).replace(/#/g,"#text").replace(/(\w+)\[([^\]]+)\]\[([^\]]*)\]/g,function(v,t,s,u){s=i(s,"|");p[t]={attributes:d(s),attributesOrder:s,children:d(u,"|",{"#comment":{}})}});return p}l="h1,h2,h3,h4,h5,h6,hr,p,div,address,pre,form,table,tbody,thead,tfoot,th,tr,td,li,ol,ul,caption,blockquote,center,dl,dt,dd,dir,fieldset,noscript,menu,isindex,samp,header,footer,article,section,hgroup";l=d(l,",",d(l.toUpperCase()));h=a({Z:"H|K|N|O|P",Y:"X|form|R|Q",ZG:"E|span|width|align|char|charoff|valign",X:"p|T|div|U|W|isindex|fieldset|table",ZF:"E|align|char|charoff|valign",W:"pre|hr|blockquote|address|center|noframes",ZE:"abbr|axis|headers|scope|rowspan|colspan|align|char|charoff|valign|nowrap|bgcolor|width|height",ZD:"[E][S]",U:"ul|ol|dl|menu|dir",ZC:"p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q",T:"h1|h2|h3|h4|h5|h6",ZB:"X|S|Q",S:"R|P",ZA:"a|G|J|M|O|P",R:"a|H|K|N|O",Q:"noscript|P",P:"ins|del|script",O:"input|select|textarea|label|button",N:"M|L",M:"em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym",L:"sub|sup",K:"J|I",J:"tt|i|b|u|s|strike",I:"big|small|font|basefont",H:"G|F",G:"br|span|bdo",F:"object|applet|img|map|iframe",E:"A|B|C",D:"accesskey|tabindex|onfocus|onblur",C:"onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup",B:"lang|xml:lang|dir",A:"id|class|style|title"},"script[id|charset|type|language|src|defer|xml:space][]style[B|id|type|media|title|xml:space][]object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]param[id|name|value|valuetype|type][]p[E|align][#|S]a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]br[A|clear][]span[E][#|S]bdo[A|C|B][#|S]applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]h1[E|align][#|S]img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]map[B|C|A|name][X|form|Q|area]h2[E|align][#|S]iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]h3[E|align][#|S]tt[E][#|S]i[E][#|S]b[E][#|S]u[E][#|S]s[E][#|S]strike[E][#|S]big[E][#|S]small[E][#|S]font[A|B|size|color|face][#|S]basefont[id|size|color|face][]em[E][#|S]strong[E][#|S]dfn[E][#|S]code[E][#|S]q[E|cite][#|S]samp[E][#|S]kbd[E][#|S]var[E][#|S]cite[E][#|S]abbr[E][#|S]acronym[E][#|S]sub[E][#|S]sup[E][#|S]input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]optgroup[E|disabled|label][option]option[E|selected|disabled|label|value][]textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]label[E|for|accesskey|onfocus|onblur][#|S]button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]h4[E|align][#|S]ins[E|cite|datetime][#|Y]h5[E|align][#|S]del[E|cite|datetime][#|Y]h6[E|align][#|S]div[E|align][#|Y]ul[E|type|compact][li]li[E|type|value][#|Y]ol[E|type|compact|start][li]dl[E|compact][dt|dd]dt[E][#|S]dd[E][#|Y]menu[E|compact][li]dir[E|compact][li]pre[E|width|xml:space][#|ZA]hr[E|align|noshade|size|width][]blockquote[E|cite][#|Y]address[E][#|S|p]center[E][#|Y]noframes[E][#|Y]isindex[A|B|prompt][]fieldset[E][#|legend|Y]legend[E|accesskey|align][#|S]table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]caption[E|align][#|S]col[ZG][]colgroup[ZG][col]thead[ZF][tr]tr[ZF|bgcolor][th|td]th[E|ZE][#|Y]form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]noscript[E][#|Y]td[E|ZE][#|Y]tfoot[ZF][tr]tbody[ZF][tr]area[E|D|shape|coords|href|nohref|alt|target][]base[id|href|target][]body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]");j=d("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected,autoplay,loop,controls");g=d("area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed,source");f=m.extend(d("td,th,iframe,video,audio,object"),g);b=d("pre,script,style,textarea");e=d("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");m.html.Schema=function(r){var A=this,n={},o={},y=[],q,p;r=r||{};if(r.verify_html===false){r.valid_elements="*[*]"}if(r.valid_styles){q={};k(r.valid_styles,function(C,B){q[B]=m.explode(C)})}p=r.whitespace_elements?d(r.whitespace_elements):b;function z(B){return new RegExp("^"+B.replace(/([?+*])/g,".$1")+"$")}function t(I){var H,D,W,S,X,C,F,R,U,N,V,Z,L,G,T,B,P,E,Y,aa,M,Q,K=/^([#+-])?([^\[\/]+)(?:\/([^\[]+))?(?:\[([^\]]+)\])?$/,O=/^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,J=/[*?+]/;if(I){I=i(I);if(n["@"]){P=n["@"].attributes;E=n["@"].attributesOrder}for(H=0,D=I.length;H<D;H++){C=K.exec(I[H]);if(C){T=C[1];N=C[2];B=C[3];U=C[4];L={};G=[];F={attributes:L,attributesOrder:G};if(T==="#"){F.paddEmpty=true}if(T==="-"){F.removeEmpty=true}if(P){for(aa in P){L[aa]=P[aa]}G.push.apply(G,E)}if(U){U=i(U,"|");for(W=0,S=U.length;W<S;W++){C=O.exec(U[W]);if(C){R={};Z=C[1];V=C[2].replace(/::/g,":");T=C[3];Q=C[4];if(Z==="!"){F.attributesRequired=F.attributesRequired||[];F.attributesRequired.push(V);R.required=true}if(Z==="-"){delete L[V];G.splice(m.inArray(G,V),1);continue}if(T){if(T==="="){F.attributesDefault=F.attributesDefault||[];F.attributesDefault.push({name:V,value:Q});R.defaultValue=Q}if(T===":"){F.attributesForced=F.attributesForced||[];F.attributesForced.push({name:V,value:Q});R.forcedValue=Q}if(T==="<"){R.validValues=d(Q,"?")}}if(J.test(V)){F.attributePatterns=F.attributePatterns||[];R.pattern=z(V);F.attributePatterns.push(R)}else{if(!L[V]){G.push(V)}L[V]=R}}}}if(!P&&N=="@"){P=L;E=G}if(B){F.outputName=N;n[B]=F}if(J.test(N)){F.pattern=z(N);y.push(F)}else{n[N]=F}}}}}function v(B){n={};y=[];t(B);k(h,function(D,C){o[C]=D.children})}function s(C){var B=/^(~)?(.+)$/;if(C){k(i(C),function(G){var E=B.exec(G),F=E[1]==="~",H=F?"span":"div",D=E[2];o[D]=o[H];c[D]=H;if(!F){l[D]={}}k(o,function(I,J){if(I[H]){I[D]=I[H]}})})}}function u(C){var B=/^([+\-]?)(\w+)\[([^\]]+)\]$/;if(C){k(i(C),function(G){var F=B.exec(G),D,E;if(F){E=F[1];if(E){D=o[F[2]]}else{D=o[F[2]]={"#comment":{}}}D=o[F[2]];k(i(F[3],"|"),function(H){if(E==="-"){delete D[H]}else{D[H]={}}})}})}}function x(B){var D=n[B],C;if(D){return D}C=y.length;while(C--){D=y[C];if(D.pattern.test(B)){return D}}}if(!r.valid_elements){k(h,function(C,B){n[B]={attributes:C.attributes,attributesOrder:C.attributesOrder};o[B]=C.children});k(i("strong/b,em/i"),function(B){B=i(B,"/");n[B[1]].outputName=B[0]});n.img.attributesDefault=[{name:"alt",value:""}];k(i("ol,ul,sub,sup,blockquote,span,font,a,table,tbody,tr"),function(B){n[B].removeEmpty=true});k(i("p,h1,h2,h3,h4,h5,h6,th,td,pre,div,address,caption"),function(B){n[B].paddEmpty=true})}else{v(r.valid_elements)}s(r.custom_elements);u(r.valid_children);t(r.extended_valid_elements);u("+ol[ul|ol],+ul[ul|ol]");if(!x("span")){t("span[!data-mce-type|*]")}if(r.invalid_elements){m.each(m.explode(r.invalid_elements),function(B){if(n[B]){delete n[B]}})}A.children=o;A.styles=q;A.getBoolAttrs=function(){return j};A.getBlockElements=function(){return l};A.getShortEndedElements=function(){return g};A.getSelfClosingElements=function(){return e};A.getNonEmptyElements=function(){return f};A.getWhiteSpaceElements=function(){return p};A.isValidChild=function(B,D){var C=o[B];return !!(C&&C[D])};A.getElementRule=x;A.getCustomElements=function(){return c};A.addValidElements=t;A.setValidElements=v;A.addCustomElements=s;A.addValidChildren=u};m.html.Schema.boolAttrMap=j;m.html.Schema.blockElementsMap=l})(tinymce);(function(a){a.html.SaxParser=function(c,e){var b=this,d=function(){};c=c||{};b.schema=e=e||new a.html.Schema();if(c.fix_self_closing!==false){c.fix_self_closing=true}a.each("comment cdata text start end pi doctype".split(" "),function(f){if(f){b[f]=c[f]||d}});b.parse=function(D){var n=this,g,F=0,H,A,z=[],M,P,B,q,y,r,L,G,N,u,m,k,s,Q,o,O,E,R,K,f,I,l,C,J,h,v=0,j=a.html.Entities.decode,x,p;function t(S){var U,T;U=z.length;while(U--){if(z[U].name===S){break}}if(U>=0){for(T=z.length-1;T>=U;T--){S=z[T];if(S.valid){n.end(S.name)}}z.length=U}}l=new RegExp("<(?:(?:!--([\\w\\W]*?)-->)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:!DOCTYPE([\\w\\W]*?)>)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([^>]+)>)|(?:([^\\s\\/<>]+)((?:\\s+[^\"'>]+(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>]*))*|\\/)>))","g");C=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:\\.|[^\"])*)\")|(?:\'((?:\\.|[^\'])*)\')|([^>\s]+)))?/g;J={script:/<\/script[^>]*>/gi,style:/<\/style[^>]*>/gi,noscript:/<\/noscript[^>]*>/gi};L=e.getShortEndedElements();I=e.getSelfClosingElements();G=e.getBoolAttrs();u=c.validate;r=c.remove_internals;x=c.fix_self_closing;p=a.isIE;o=/^:/;while(g=l.exec(D)){if(F<g.index){n.text(j(D.substr(F,g.index-F)))}if(H=g[6]){H=H.toLowerCase();if(p&&o.test(H)){H=H.substr(1)}t(H)}else{if(H=g[7]){H=H.toLowerCase();if(p&&o.test(H)){H=H.substr(1)}N=H in L;if(x&&I[H]&&z.length>0&&z[z.length-1].name===H){t(H)}if(!u||(m=e.getElementRule(H))){k=true;if(u){O=m.attributes;E=m.attributePatterns}if(Q=g[8]){y=Q.indexOf("data-mce-type")!==-1;if(y&&r){k=false}M=[];M.map={};Q.replace(C,function(T,S,X,W,V){var Y,U;S=S.toLowerCase();X=S in G?S:j(X||W||V||"");if(u&&!y&&S.indexOf("data-")!==0){Y=O[S];if(!Y&&E){U=E.length;while(U--){Y=E[U];if(Y.pattern.test(S)){break}}if(U===-1){Y=null}}if(!Y){return}if(Y.validValues&&!(X in Y.validValues)){return}}M.map[S]=X;M.push({name:S,value:X})})}else{M=[];M.map={}}if(u&&!y){R=m.attributesRequired;K=m.attributesDefault;f=m.attributesForced;if(f){P=f.length;while(P--){s=f[P];q=s.name;h=s.value;if(h==="{$uid}"){h="mce_"+v++}M.map[q]=h;M.push({name:q,value:h})}}if(K){P=K.length;while(P--){s=K[P];q=s.name;if(!(q in M.map)){h=s.value;if(h==="{$uid}"){h="mce_"+v++}M.map[q]=h;M.push({name:q,value:h})}}}if(R){P=R.length;while(P--){if(R[P] in M.map){break}}if(P===-1){k=false}}if(M.map["data-mce-bogus"]){k=false}}if(k){n.start(H,M,N)}}else{k=false}if(A=J[H]){A.lastIndex=F=g.index+g[0].length;if(g=A.exec(D)){if(k){B=D.substr(F,g.index-F)}F=g.index+g[0].length}else{B=D.substr(F);F=D.length}if(k&&B.length>0){n.text(B,true)}if(k){n.end(H)}l.lastIndex=F;continue}if(!N){if(!Q||Q.indexOf("/")!=Q.length-1){z.push({name:H,valid:k})}else{if(k){n.end(H)}}}}else{if(H=g[1]){n.comment(H)}else{if(H=g[2]){n.cdata(H)}else{if(H=g[3]){n.doctype(H)}else{if(H=g[4]){n.pi(H,g[5])}}}}}}F=g.index+g[0].length}if(F<D.length){n.text(j(D.substr(F)))}for(P=z.length-1;P>=0;P--){H=z[P];if(H.valid){n.end(H.name)}}}}})(tinymce);(function(d){var c=/^[ \t\r\n]*$/,e={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11};function a(k,l,j){var i,h,f=j?"lastChild":"firstChild",g=j?"prev":"next";if(k[f]){return k[f]}if(k!==l){i=k[g];if(i){return i}for(h=k.parent;h&&h!==l;h=h.parent){i=h[g];if(i){return i}}}}function b(f,g){this.name=f;this.type=g;if(g===1){this.attributes=[];this.attributes.map={}}}d.extend(b.prototype,{replace:function(g){var f=this;if(g.parent){g.remove()}f.insert(g,f);f.remove();return f},attr:function(h,l){var f=this,g,j,k;if(typeof h!=="string"){for(j in h){f.attr(j,h[j])}return f}if(g=f.attributes){if(l!==k){if(l===null){if(h in g.map){delete g.map[h];j=g.length;while(j--){if(g[j].name===h){g=g.splice(j,1);return f}}}return f}if(h in g.map){j=g.length;while(j--){if(g[j].name===h){g[j].value=l;break}}}else{g.push({name:h,value:l})}g.map[h]=l;return f}else{return g.map[h]}}},clone:function(){var g=this,n=new b(g.name,g.type),h,f,m,j,k;if(m=g.attributes){k=[];k.map={};for(h=0,f=m.length;h<f;h++){j=m[h];if(j.name!=="id"){k[k.length]={name:j.name,value:j.value};k.map[j.name]=j.value}}n.attributes=k}n.value=g.value;n.shortEnded=g.shortEnded;return n},wrap:function(g){var f=this;f.parent.insert(g,f);g.append(f);return f},unwrap:function(){var f=this,h,g;for(h=f.firstChild;h;){g=h.next;f.insert(h,f,true);h=g}f.remove()},remove:function(){var f=this,h=f.parent,g=f.next,i=f.prev;if(h){if(h.firstChild===f){h.firstChild=g;if(g){g.prev=null}}else{i.next=g}if(h.lastChild===f){h.lastChild=i;if(i){i.next=null}}else{g.prev=i}f.parent=f.next=f.prev=null}return f},append:function(h){var f=this,g;if(h.parent){h.remove()}g=f.lastChild;if(g){g.next=h;h.prev=g;f.lastChild=h}else{f.lastChild=f.firstChild=h}h.parent=f;return h},insert:function(h,f,i){var g;if(h.parent){h.remove()}g=f.parent||this;if(i){if(f===g.firstChild){g.firstChild=h}else{f.prev.next=h}h.prev=f.prev;h.next=f;f.prev=h}else{if(f===g.lastChild){g.lastChild=h}else{f.next.prev=h}h.next=f.next;h.prev=f;f.next=h}h.parent=g;return h},getAll:function(g){var f=this,h,i=[];for(h=f.firstChild;h;h=a(h,f)){if(h.name===g){i.push(h)}}return i},empty:function(){var g=this,f,h,j;if(g.firstChild){f=[];for(j=g.firstChild;j;j=a(j,g)){f.push(j)}h=f.length;while(h--){j=f[h];j.parent=j.firstChild=j.lastChild=j.next=j.prev=null}}g.firstChild=g.lastChild=null;return g},isEmpty:function(k){var f=this,j=f.firstChild,h,g;if(j){do{if(j.type===1){if(j.attributes.map["data-mce-bogus"]){continue}if(k[j.name]){return false}h=j.attributes.length;while(h--){g=j.attributes[h].name;if(g==="name"||g.indexOf("data-")===0){return false}}}if((j.type===3&&!c.test(j.value))){return false}}while(j=a(j,f))}return true},walk:function(f){return a(this,null,f)}});d.extend(b,{create:function(g,f){var i,h;i=new b(g,e[g]||1);if(f){for(h in f){i.attr(h,f[h])}}return i}});d.html.Node=b})(tinymce);(function(b){var a=b.html.Node;b.html.DomParser=function(g,h){var f=this,e={},d=[],i={},c={};g=g||{};g.validate="validate" in g?g.validate:true;g.root_name=g.root_name||"body";f.schema=h=h||new b.html.Schema();function j(m){var o,p,x,v,z,n,q,l,t,u,k,s,y,r;s=b.makeMap("tr,td,th,tbody,thead,tfoot,table");k=h.getNonEmptyElements();for(o=0;o<m.length;o++){p=m[o];if(!p.parent){continue}v=[p];for(x=p.parent;x&&!h.isValidChild(x.name,p.name)&&!s[x.name];x=x.parent){v.push(x)}if(x&&v.length>1){v.reverse();z=n=f.filterNode(v[0].clone());for(t=0;t<v.length-1;t++){if(h.isValidChild(n.name,v[t].name)){q=f.filterNode(v[t].clone());n.append(q)}else{q=n}for(l=v[t].firstChild;l&&l!=v[t+1];){r=l.next;q.append(l);l=r}n=q}if(!z.isEmpty(k)){x.insert(z,v[0],true);x.insert(p,z)}else{x.insert(p,v[0],true)}x=v[0];if(x.isEmpty(k)||x.firstChild===x.lastChild&&x.firstChild.name==="br"){x.empty().remove()}}else{if(p.parent){if(p.name==="li"){y=p.prev;if(y&&(y.name==="ul"||y.name==="ul")){y.append(p);continue}y=p.next;if(y&&(y.name==="ul"||y.name==="ul")){y.insert(p,y.firstChild,true);continue}p.wrap(f.filterNode(new a("ul",1)));continue}if(h.isValidChild(p.parent.name,"div")&&h.isValidChild("div",p.name)){p.wrap(f.filterNode(new a("div",1)))}else{if(p.name==="style"||p.name==="script"){p.empty().remove()}else{p.unwrap()}}}}}}f.filterNode=function(m){var l,k,n;if(k in e){n=i[k];if(n){n.push(m)}else{i[k]=[m]}}l=d.length;while(l--){k=d[l].name;if(k in m.attributes.map){n=c[k];if(n){n.push(m)}else{c[k]=[m]}}}return m};f.addNodeFilter=function(k,l){b.each(b.explode(k),function(m){var n=e[m];if(!n){e[m]=n=[]}n.push(l)})};f.addAttributeFilter=function(k,l){b.each(b.explode(k),function(m){var n;for(n=0;n<d.length;n++){if(d[n].name===m){d[n].callbacks.push(l);return}}d.push({name:m,callbacks:[l]})})};f.parse=function(v,m){var n,H,A,z,C,B,x,r,E,K,y,o,D,J=[],t,k,s,p,u,q;m=m||{};i={};c={};o=b.extend(b.makeMap("script,style,head,html,body,title,meta,param"),h.getBlockElements());u=h.getNonEmptyElements();p=h.children;y=g.validate;q="forced_root_block" in m?m.forced_root_block:g.forced_root_block;s=h.getWhiteSpaceElements();D=/^[ \t\r\n]+/;t=/[ \t\r\n]+$/;k=/[ \t\r\n]+/g;function F(){var L=H.firstChild,l,M;while(L){l=L.next;if(L.type==3||(L.type==1&&L.name!=="p"&&!o[L.name]&&!L.attr("data-mce-type"))){if(!M){M=I(q,1);H.insert(M,L);M.append(L)}else{M.append(L)}}else{M=null}L=l}}function I(l,L){var M=new a(l,L),N;if(l in e){N=i[l];if(N){N.push(M)}else{i[l]=[M]}}return M}function G(M){var N,l,L;for(N=M.prev;N&&N.type===3;){l=N.value.replace(t,"");if(l.length>0){N.value=l;N=N.prev}else{L=N.prev;N.remove();N=L}}}n=new b.html.SaxParser({validate:y,fix_self_closing:!y,cdata:function(l){A.append(I("#cdata",4)).value=l},text:function(M,l){var L;if(!s[A.name]){M=M.replace(k," ");if(A.lastChild&&o[A.lastChild.name]){M=M.replace(D,"")}}if(M.length!==0){L=I("#text",3);L.raw=!!l;A.append(L).value=M}},comment:function(l){A.append(I("#comment",8)).value=l},pi:function(l,L){A.append(I(l,7)).value=L;G(A)},doctype:function(L){var l;l=A.append(I("#doctype",10));l.value=L;G(A)},start:function(l,T,M){var R,O,N,L,P,U,S,Q;N=y?h.getElementRule(l):{};if(N){R=I(N.outputName||l,1);R.attributes=T;R.shortEnded=M;A.append(R);Q=p[A.name];if(Q&&p[R.name]&&!Q[R.name]){J.push(R)}O=d.length;while(O--){P=d[O].name;if(P in T.map){E=c[P];if(E){E.push(R)}else{c[P]=[R]}}}if(o[l]){G(R)}if(!M){A=R}}},end:function(l){var P,M,O,L,N;M=y?h.getElementRule(l):{};if(M){if(o[l]){if(!s[A.name]){for(P=A.firstChild;P&&P.type===3;){O=P.value.replace(D,"");if(O.length>0){P.value=O;P=P.next}else{L=P.next;P.remove();P=L}}for(P=A.lastChild;P&&P.type===3;){O=P.value.replace(t,"");if(O.length>0){P.value=O;P=P.prev}else{L=P.prev;P.remove();P=L}}}P=A.prev;if(P&&P.type===3){O=P.value.replace(D,"");if(O.length>0){P.value=O}else{P.remove()}}}if(M.removeEmpty||M.paddEmpty){if(A.isEmpty(u)){if(M.paddEmpty){A.empty().append(new a("#text","3")).value="\u00a0"}else{if(!A.attributes.map.name){N=A.parent;A.empty().remove();A=N;return}}}}A=A.parent}}},h);H=A=new a(m.context||g.root_name,11);n.parse(v);if(y&&J.length){if(!m.context){j(J)}else{m.invalid=true}}if(q&&H.name=="body"){F()}if(!m.invalid){for(K in i){E=e[K];z=i[K];x=z.length;while(x--){if(!z[x].parent){z.splice(x,1)}}for(C=0,B=E.length;C<B;C++){E[C](z,K,m)}}for(C=0,B=d.length;C<B;C++){E=d[C];if(E.name in c){z=c[E.name];x=z.length;while(x--){if(!z[x].parent){z.splice(x,1)}}for(x=0,r=E.callbacks.length;x<r;x++){E.callbacks[x](z,E.name,m)}}}}return H};if(g.remove_trailing_brs){f.addNodeFilter("br",function(n,m){var r,q=n.length,o,u=h.getBlockElements(),k=h.getNonEmptyElements(),s,p,t;u.body=1;for(r=0;r<q;r++){o=n[r];s=o.parent;if(u[o.parent.name]&&o===s.lastChild){p=o.prev;while(p){t=p.name;if(t!=="span"||p.attr("data-mce-type")!=="bookmark"){if(t!=="br"){break}if(t==="br"){o=null;break}}p=p.prev}if(o){o.remove();if(s.isEmpty(k)){elementRule=h.getElementRule(s.name);if(elementRule){if(elementRule.removeEmpty){s.remove()}else{if(elementRule.paddEmpty){s.empty().append(new b.html.Node("#text",3)).value="\u00a0"}}}}}}}})}}})(tinymce);tinymce.html.Writer=function(e){var c=[],a,b,d,f,g;e=e||{};a=e.indent;b=tinymce.makeMap(e.indent_before||"");d=tinymce.makeMap(e.indent_after||"");f=tinymce.html.Entities.getEncodeFunc(e.entity_encoding||"raw",e.entities);g=e.element_format=="html";return{start:function(m,k,p){var n,j,h,o;if(a&&b[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}c.push("<",m);if(k){for(n=0,j=k.length;n<j;n++){h=k[n];c.push(" ",h.name,'="',f(h.value,true),'"')}}if(!p||g){c[c.length]=">"}else{c[c.length]=" />"}if(p&&a&&d[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}},end:function(h){var i;c.push("</",h,">");if(a&&d[h]&&c.length>0){i=c[c.length-1];if(i.length>0&&i!=="\n"){c.push("\n")}}},text:function(i,h){if(i.length>0){c[c.length]=h?i:f(i)}},cdata:function(h){c.push("<![CDATA[",h,"]]>")},comment:function(h){c.push("<!--",h,"-->")},pi:function(h,i){if(i){c.push("<?",h," ",i,"?>")}else{c.push("<?",h,"?>")}if(a){c.push("\n")}},doctype:function(h){c.push("<!DOCTYPE",h,">",a?"\n":"")},reset:function(){c.length=0},getContent:function(){return c.join("").replace(/\n$/,"")}}};(function(a){a.html.Serializer=function(c,d){var b=this,e=new a.html.Writer(c);c=c||{};c.validate="validate" in c?c.validate:true;b.schema=d=d||new a.html.Schema();b.writer=e;b.serialize=function(h){var g,i;i=c.validate;g={3:function(k,j){e.text(k.value,k.raw)},8:function(j){e.comment(j.value)},7:function(j){e.pi(j.name,j.value)},10:function(j){e.doctype(j.value)},4:function(j){e.cdata(j.value)},11:function(j){if((j=j.firstChild)){do{f(j)}while(j=j.next)}}};e.reset();function f(k){var t=g[k.type],j,o,s,r,p,u,n,m,q;if(!t){j=k.name;o=k.shortEnded;s=k.attributes;if(i&&s&&s.length>1){u=[];u.map={};q=d.getElementRule(k.name);for(n=0,m=q.attributesOrder.length;n<m;n++){r=q.attributesOrder[n];if(r in s.map){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}for(n=0,m=s.length;n<m;n++){r=s[n].name;if(!(r in u.map)){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}s=u}e.start(k.name,s,o);if(!o){if((k=k.firstChild)){do{f(k)}while(k=k.next)}e.end(j)}}else{t(k)}}if(h.type==1&&!c.inner){f(h)}else{g[11](h)}return e.getContent()}}})(tinymce);(function(h){var f=h.each,e=h.is,d=h.isWebKit,b=h.isIE,c=h.html.Entities,a=/^([a-z0-9],?)+$/i,g=h.html.Schema.blockElementsMap,i=/^[ \t\r\n]*$/;h.create("tinymce.dom.DOMUtils",{doc:null,root:null,files:null,pixelStyles:/^(top|left|bottom|right|width|height|borderWidth)$/,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"},DOMUtils:function(o,m){var l=this,j,k;l.doc=o;l.win=window;l.files={};l.cssFlicker=false;l.counter=0;l.stdMode=!h.isIE||o.documentMode>=8;l.boxModel=!h.isIE||o.compatMode=="CSS1Compat"||l.stdMode;l.hasOuterHTML="outerHTML" in o.createElement("a");l.settings=m=h.extend({keep_values:false,hex_colors:1},m);l.schema=m.schema;l.styles=new h.html.Styles({url_converter:m.url_converter,url_converter_scope:m.url_converter_scope},m.schema);if(h.isIE6){try{o.execCommand("BackgroundImageCache",false,true)}catch(n){l.cssFlicker=true}}if(b&&m.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(p){o.createElement(p)});for(k in m.schema.getCustomElements()){o.createElement(k)}}h.addUnload(l.destroy,l)},getRoot:function(){var j=this,k=j.settings;return(k&&j.get(k.root_element))||j.doc.body},getViewPort:function(k){var l,j;k=!k?this.win:k;l=k.document;j=this.boxModel?l.documentElement:l.body;return{x:k.pageXOffset||j.scrollLeft,y:k.pageYOffset||j.scrollTop,w:k.innerWidth||j.clientWidth,h:k.innerHeight||j.clientHeight}},getRect:function(m){var l,j=this,k;m=j.get(m);l=j.getPos(m);k=j.getSize(m);return{x:l.x,y:l.y,w:k.w,h:k.h}},getSize:function(m){var k=this,j,l;m=k.get(m);j=k.getStyle(m,"width");l=k.getStyle(m,"height");if(j.indexOf("px")===-1){j=0}if(l.indexOf("px")===-1){l=0}return{w:parseInt(j)||m.offsetWidth||m.clientWidth,h:parseInt(l)||m.offsetHeight||m.clientHeight}},getParent:function(l,k,j){return this.getParents(l,k,j,false)},getParents:function(u,p,l,s){var k=this,j,m=k.settings,q=[];u=k.get(u);s=s===undefined;if(m.strict_root){l=l||k.getRoot()}if(e(p,"string")){j=p;if(p==="*"){p=function(o){return o.nodeType==1}}else{p=function(o){return k.is(o,j)}}}while(u){if(u==l||!u.nodeType||u.nodeType===9){break}if(!p||p(u)){if(s){q.push(u)}else{return u}}u=u.parentNode}return s?q:null},get:function(j){var k;if(j&&this.doc&&typeof(j)=="string"){k=j;j=this.doc.getElementById(j);if(j&&j.id!==k){return this.doc.getElementsByName(k)[1]}}return j},getNext:function(k,j){return this._findSib(k,j,"nextSibling")},getPrev:function(k,j){return this._findSib(k,j,"previousSibling")},select:function(l,k){var j=this;return h.dom.Sizzle(l,j.get(k)||j.get(j.settings.root_element)||j.doc,[])},is:function(l,j){var k;if(l.length===undefined){if(j==="*"){return l.nodeType==1}if(a.test(j)){j=j.toLowerCase().split(/,/);l=l.nodeName.toLowerCase();for(k=j.length-1;k>=0;k--){if(j[k]==l){return true}}return false}}return h.dom.Sizzle.matches(j,l.nodeType?[l]:l).length>0},add:function(m,q,j,l,o){var k=this;return this.run(m,function(s){var r,n;r=e(q,"string")?k.doc.createElement(q):q;k.setAttribs(r,j);if(l){if(l.nodeType){r.appendChild(l)}else{k.setHTML(r,l)}}return !o?s.appendChild(r):r})},create:function(l,j,k){return this.add(this.doc.createElement(l),l,j,k,1)},createHTML:function(r,j,p){var q="",m=this,l;q+="<"+r;for(l in j){if(j.hasOwnProperty(l)){q+=" "+l+'="'+m.encode(j[l])+'"'}}if(typeof(p)!="undefined"){return q+">"+p+"</"+r+">"}return q+" />"},remove:function(j,k){return this.run(j,function(m){var n,l=m.parentNode;if(!l){return null}if(k){while(n=m.firstChild){if(!h.isIE||n.nodeType!==3||n.nodeValue){l.insertBefore(n,m)}else{m.removeChild(n)}}}return l.removeChild(m)})},setStyle:function(m,j,k){var l=this;return l.run(m,function(p){var o,n;o=p.style;j=j.replace(/-(\D)/g,function(r,q){return q.toUpperCase()});if(l.pixelStyles.test(j)&&(h.is(k,"number")||/^[\-0-9\.]+$/.test(k))){k+="px"}switch(j){case"opacity":if(b){o.filter=k===""?"":"alpha(opacity="+(k*100)+")";if(!m.currentStyle||!m.currentStyle.hasLayout){o.display="inline-block"}}o[j]=o["-moz-opacity"]=o["-khtml-opacity"]=k||"";break;case"float":b?o.styleFloat=k:o.cssFloat=k;break;default:o[j]=k||""}if(l.settings.update_styles){l.setAttrib(p,"data-mce-style")}})},getStyle:function(m,j,l){m=this.get(m);if(!m){return}if(this.doc.defaultView&&l){j=j.replace(/[A-Z]/g,function(n){return"-"+n});try{return this.doc.defaultView.getComputedStyle(m,null).getPropertyValue(j)}catch(k){return null}}j=j.replace(/-(\D)/g,function(o,n){return n.toUpperCase()});if(j=="float"){j=b?"styleFloat":"cssFloat"}if(m.currentStyle&&l){return m.currentStyle[j]}return m.style?m.style[j]:undefined},setStyles:function(m,n){var k=this,l=k.settings,j;j=l.update_styles;l.update_styles=0;f(n,function(o,p){k.setStyle(m,p,o)});l.update_styles=j;if(l.update_styles){k.setAttrib(m,l.cssText)}},removeAllAttribs:function(j){return this.run(j,function(m){var l,k=m.attributes;for(l=k.length-1;l>=0;l--){m.removeAttributeNode(k.item(l))}})},setAttrib:function(l,m,j){var k=this;if(!l||!m){return}if(k.settings.strict){m=m.toLowerCase()}return this.run(l,function(o){var n=k.settings;if(j!==null){switch(m){case"style":if(!e(j,"string")){f(j,function(p,q){k.setStyle(o,q,p)});return}if(n.keep_values){if(j&&!k._isRes(j)){o.setAttribute("data-mce-style",j,2)}else{o.removeAttribute("data-mce-style",2)}}o.style.cssText=j;break;case"class":o.className=j||"";break;case"src":case"href":if(n.keep_values){if(n.url_converter){j=n.url_converter.call(n.url_converter_scope||k,j,m,o)}k.setAttrib(o,"data-mce-"+m,j,2)}break;case"shape":o.setAttribute("data-mce-style",j);break}}if(e(j)&&j!==null&&j.length!==0){o.setAttribute(m,""+j,2)}else{o.removeAttribute(m,2)}})},setAttribs:function(k,l){var j=this;return this.run(k,function(m){f(l,function(o,p){j.setAttrib(m,p,o)})})},getAttrib:function(o,p,l){var j,k=this,m;o=k.get(o);if(!o||o.nodeType!==1){return l===m?false:l}if(!e(l)){l=""}if(/^(src|href|style|coords|shape)$/.test(p)){j=o.getAttribute("data-mce-"+p);if(j){return j}}if(b&&k.props[p]){j=o[k.props[p]];j=j&&j.nodeValue?j.nodeValue:j}if(!j){j=o.getAttribute(p,2)}if(/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(p)){if(o[k.props[p]]===true&&j===""){return p}return j?p:""}if(o.nodeName==="FORM"&&o.getAttributeNode(p)){return o.getAttributeNode(p).nodeValue}if(p==="style"){j=j||o.style.cssText;if(j){j=k.serializeStyle(k.parseStyle(j),o.nodeName);if(k.settings.keep_values&&!k._isRes(j)){o.setAttribute("data-mce-style",j)}}}if(d&&p==="class"&&j){j=j.replace(/(apple|webkit)\-[a-z\-]+/gi,"")}if(b){switch(p){case"rowspan":case"colspan":if(j===1){j=""}break;case"size":if(j==="+0"||j===20||j===0){j=""}break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":if(j===0){j=""}break;case"hspace":if(j===-1){j=""}break;case"maxlength":case"tabindex":if(j===32768||j===2147483647||j==="32768"){j=""}break;case"multiple":case"compact":case"noshade":case"nowrap":if(j===65535){return p}return l;case"shape":j=j.toLowerCase();break;default:if(p.indexOf("on")===0&&j){j=h._replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/,"$1",""+j)}}}return(j!==m&&j!==null&&j!=="")?""+j:l},getPos:function(s,m){var k=this,j=0,q=0,o,p=k.doc,l;s=k.get(s);m=m||p.body;if(s){if(s.getBoundingClientRect){s=s.getBoundingClientRect();o=k.boxModel?p.documentElement:p.body;j=s.left+(p.documentElement.scrollLeft||p.body.scrollLeft)-o.clientTop;q=s.top+(p.documentElement.scrollTop||p.body.scrollTop)-o.clientLeft;return{x:j,y:q}}l=s;while(l&&l!=m&&l.nodeType){j+=l.offsetLeft||0;q+=l.offsetTop||0;l=l.offsetParent}l=s.parentNode;while(l&&l!=m&&l.nodeType){j-=l.scrollLeft||0;q-=l.scrollTop||0;l=l.parentNode}}return{x:j,y:q}},parseStyle:function(j){return this.styles.parse(j)},serializeStyle:function(k,j){return this.styles.serialize(k,j)},loadCSS:function(j){var l=this,m=l.doc,k;if(!j){j=""}k=l.select("head")[0];f(j.split(","),function(n){var o;if(l.files[n]){return}l.files[n]=true;o=l.create("link",{rel:"stylesheet",href:h._addVer(n)});if(b&&m.documentMode&&m.recalc){o.onload=function(){if(m.recalc){m.recalc()}o.onload=null}}k.appendChild(o)})},addClass:function(j,k){return this.run(j,function(l){var m;if(!k){return 0}if(this.hasClass(l,k)){return l.className}m=this.removeClass(l,k);return l.className=(m!=""?(m+" "):"")+k})},removeClass:function(l,m){var j=this,k;return j.run(l,function(o){var n;if(j.hasClass(o,m)){if(!k){k=new RegExp("(^|\\s+)"+m+"(\\s+|$)","g")}n=o.className.replace(k," ");n=h.trim(n!=" "?n:"");o.className=n;if(!n){o.removeAttribute("class");o.removeAttribute("className")}return n}return o.className})},hasClass:function(k,j){k=this.get(k);if(!k||!j){return false}return(" "+k.className+" ").indexOf(" "+j+" ")!==-1},show:function(j){return this.setStyle(j,"display","block")},hide:function(j){return this.setStyle(j,"display","none")},isHidden:function(j){j=this.get(j);return !j||j.style.display=="none"||this.getStyle(j,"display")=="none"},uniqueId:function(j){return(!j?"mce_":j)+(this.counter++)},setHTML:function(l,k){var j=this;return j.run(l,function(n){if(b){while(n.firstChild){n.removeChild(n.firstChild)}try{n.innerHTML="<br />"+k;n.removeChild(n.firstChild)}catch(m){n=j.create("div");n.innerHTML="<br />"+k;f(n.childNodes,function(p,o){if(o){n.appendChild(p)}})}}else{n.innerHTML=k}return k})},getOuterHTML:function(l){var k,j=this;l=j.get(l);if(!l){return null}if(l.nodeType===1&&j.hasOuterHTML){return l.outerHTML}k=(l.ownerDocument||j.doc).createElement("body");k.appendChild(l.cloneNode(true));return k.innerHTML},setOuterHTML:function(m,k,n){var j=this;function l(p,o,r){var s,q;q=r.createElement("body");q.innerHTML=o;s=q.lastChild;while(s){j.insertAfter(s.cloneNode(true),p);s=s.previousSibling}j.remove(p)}return this.run(m,function(p){p=j.get(p);if(p.nodeType==1){n=n||p.ownerDocument||j.doc;if(b){try{if(b&&p.nodeType==1){p.outerHTML=k}else{l(p,k,n)}}catch(o){l(p,k,n)}}else{l(p,k,n)}}})},decode:c.decode,encode:c.encodeAllRaw,insertAfter:function(j,k){k=this.get(k);return this.run(j,function(m){var l,n;l=k.parentNode;n=k.nextSibling;if(n){l.insertBefore(m,n)}else{l.appendChild(m)}return m})},isBlock:function(k){var j=k.nodeType;if(j){return !!(j===1&&g[k.nodeName])}return !!g[k]},replace:function(p,m,j){var l=this;if(e(m,"array")){p=p.cloneNode(true)}return l.run(m,function(k){if(j){f(h.grep(k.childNodes),function(n){p.appendChild(n)})}return k.parentNode.replaceChild(p,k)})},rename:function(m,j){var l=this,k;if(m.nodeName!=j.toUpperCase()){k=l.create(j);f(l.getAttribs(m),function(n){l.setAttrib(k,n.nodeName,l.getAttrib(m,n.nodeName))});l.replace(k,m,1)}return k||m},findCommonAncestor:function(l,j){var m=l,k;while(m){k=j;while(k&&m!=k){k=k.parentNode}if(m==k){break}m=m.parentNode}if(!m&&l.ownerDocument){return l.ownerDocument.documentElement}return m},toHex:function(j){var l=/^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(j);function k(m){m=parseInt(m).toString(16);return m.length>1?m:"0"+m}if(l){j="#"+k(l[1])+k(l[2])+k(l[3]);return j}return j},getClasses:function(){var n=this,j=[],m,o={},p=n.settings.class_filter,l;if(n.classes){return n.classes}function q(r){f(r.imports,function(s){q(s)});f(r.cssRules||r.rules,function(s){switch(s.type||1){case 1:if(s.selectorText){f(s.selectorText.split(","),function(t){t=t.replace(/^\s*|\s*$|^\s\./g,"");if(/\.mce/.test(t)||!/\.[\w\-]+$/.test(t)){return}l=t;t=h._replace(/.*\.([a-z0-9_\-]+).*/i,"$1",t);if(p&&!(t=p(t,l))){return}if(!o[t]){j.push({"class":t});o[t]=1}})}break;case 3:q(s.styleSheet);break}})}try{f(n.doc.styleSheets,q)}catch(k){}if(j.length>0){n.classes=j}return j},run:function(m,l,k){var j=this,n;if(j.doc&&typeof(m)==="string"){m=j.get(m)}if(!m){return false}k=k||this;if(!m.nodeType&&(m.length||m.length===0)){n=[];f(m,function(p,o){if(p){if(typeof(p)=="string"){p=j.doc.getElementById(p)}n.push(l.call(k,p,o))}});return n}return l.call(k,m)},getAttribs:function(k){var j;k=this.get(k);if(!k){return[]}if(b){j=[];if(k.nodeName=="OBJECT"){return k.attributes}if(k.nodeName==="OPTION"&&this.getAttrib(k,"selected")){j.push({specified:1,nodeName:"selected"})}k.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi,"").replace(/[\w:\-]+/gi,function(l){j.push({specified:1,nodeName:l})});return j}return k.attributes},isEmpty:function(m,k){var r=this,o,n,q,j,l,p;m=m.firstChild;if(m){j=new h.dom.TreeWalker(m);k=k||r.schema?r.schema.getNonEmptyElements():null;do{q=m.nodeType;if(q===1){if(m.getAttribute("data-mce-bogus")){continue}l=m.nodeName.toLowerCase();if(k&&k[l]){p=m.parentNode;if(l==="br"&&r.isBlock(p)&&p.firstChild===m&&p.lastChild===m){continue}return false}n=r.getAttribs(m);o=m.attributes.length;while(o--){l=m.attributes[o].nodeName;if(l==="name"||l==="data-mce-bookmark"){return false}}}if((q===3&&!i.test(m.nodeValue))){return false}}while(m=j.next())}return true},destroy:function(k){var j=this;if(j.events){j.events.destroy()}j.win=j.doc=j.root=j.events=null;if(!k){h.removeUnload(j.destroy)}},createRng:function(){var j=this.doc;return j.createRange?j.createRange():new h.dom.Range(this)},nodeIndex:function(n,o){var j=0,l,m,k;if(n){for(l=n.nodeType,n=n.previousSibling,m=n;n;n=n.previousSibling){k=n.nodeType;if(o&&k==3){if(k==l||!n.nodeValue.length){continue}}j++;l=k}}return j},split:function(n,m,q){var s=this,j=s.createRng(),o,l,p;function k(v){var t,r=v.childNodes,u=v.nodeType;if(u==1&&v.getAttribute("data-mce-type")=="bookmark"){return}for(t=r.length-1;t>=0;t--){k(r[t])}if(u!=9){if(u==3&&v.nodeValue.length>0){if(!s.isBlock(v.parentNode)||h.trim(v.nodeValue).length>0){return}}else{if(u==1){r=v.childNodes;if(r.length==1&&r[0]&&r[0].nodeType==1&&r[0].getAttribute("data-mce-type")=="bookmark"){v.parentNode.insertBefore(r[0],v)}if(r.length||/^(br|hr|input|img)$/i.test(v.nodeName)){return}}}s.remove(v)}return v}if(n&&m){j.setStart(n.parentNode,s.nodeIndex(n));j.setEnd(m.parentNode,s.nodeIndex(m));o=j.extractContents();j=s.createRng();j.setStart(m.parentNode,s.nodeIndex(m)+1);j.setEnd(n.parentNode,s.nodeIndex(n)+1);l=j.extractContents();p=n.parentNode;p.insertBefore(k(o),n);if(q){p.replaceChild(q,m)}else{p.insertBefore(m,n)}p.insertBefore(k(l),n);s.remove(n);return q||m}},bind:function(n,j,m,l){var k=this;if(!k.events){k.events=new h.dom.EventUtils()}return k.events.add(n,j,m,l||this)},unbind:function(m,j,l){var k=this;if(!k.events){k.events=new h.dom.EventUtils()}return k.events.remove(m,j,l)},_findSib:function(m,j,k){var l=this,n=j;if(m){if(e(n,"string")){n=function(o){return l.is(o,j)}}for(m=m[k];m;m=m[k]){if(n(m)){return m}}}return null},_isRes:function(j){return/^(top|left|bottom|right|width|height)/i.test(j)||/;\s*(top|left|bottom|right|width|height)/i.test(j)}});h.DOM=new h.dom.DOMUtils(document,{process_html:0})})(tinymce);(function(a){function b(c){var N=this,e=c.doc,S=0,E=1,j=2,D=true,R=false,U="startOffset",h="startContainer",P="endContainer",z="endOffset",k=tinymce.extend,n=c.nodeIndex;k(N,{startContainer:e,startOffset:0,endContainer:e,endOffset:0,collapsed:D,commonAncestorContainer:e,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:q,setEnd:s,setStartBefore:g,setStartAfter:I,setEndBefore:J,setEndAfter:u,collapse:A,selectNode:x,selectNodeContents:F,compareBoundaryPoints:v,deleteContents:p,extractContents:H,cloneContents:d,insertNode:C,surroundContents:M,cloneRange:K});function q(V,t){B(D,V,t)}function s(V,t){B(R,V,t)}function g(t){q(t.parentNode,n(t))}function I(t){q(t.parentNode,n(t)+1)}function J(t){s(t.parentNode,n(t))}function u(t){s(t.parentNode,n(t)+1)}function A(t){if(t){N[P]=N[h];N[z]=N[U]}else{N[h]=N[P];N[U]=N[z]}N.collapsed=D}function x(t){g(t);u(t)}function F(t){q(t,0);s(t,t.nodeType===1?t.childNodes.length:t.nodeValue.length)}function v(Y,t){var ab=N[h],W=N[U],aa=N[P],V=N[z],Z=t.startContainer,ad=t.startOffset,X=t.endContainer,ac=t.endOffset;if(Y===0){return G(ab,W,Z,ad)}if(Y===1){return G(aa,V,Z,ad)}if(Y===2){return G(aa,V,X,ac)}if(Y===3){return G(ab,W,X,ac)}}function p(){m(j)}function H(){return m(S)}function d(){return m(E)}function C(Y){var V=this[h],t=this[U],X,W;if((V.nodeType===3||V.nodeType===4)&&V.nodeValue){if(!t){V.parentNode.insertBefore(Y,V)}else{if(t>=V.nodeValue.length){c.insertAfter(Y,V)}else{X=V.splitText(t);V.parentNode.insertBefore(Y,X)}}}else{if(V.childNodes.length>0){W=V.childNodes[t]}if(W){V.insertBefore(Y,W)}else{V.appendChild(Y)}}}function M(V){var t=N.extractContents();N.insertNode(V);V.appendChild(t);N.selectNode(V)}function K(){return k(new b(c),{startContainer:N[h],startOffset:N[U],endContainer:N[P],endOffset:N[z],collapsed:N.collapsed,commonAncestorContainer:N.commonAncestorContainer})}function O(t,V){var W;if(t.nodeType==3){return t}if(V<0){return t}W=t.firstChild;while(W&&V>0){--V;W=W.nextSibling}if(W){return W}return t}function l(){return(N[h]==N[P]&&N[U]==N[z])}function G(X,Z,V,Y){var aa,W,t,ab,ad,ac;if(X==V){if(Z==Y){return 0}if(Z<Y){return -1}return 1}aa=V;while(aa&&aa.parentNode!=X){aa=aa.parentNode}if(aa){W=0;t=X.firstChild;while(t!=aa&&W<Z){W++;t=t.nextSibling}if(Z<=W){return -1}return 1}aa=X;while(aa&&aa.parentNode!=V){aa=aa.parentNode}if(aa){W=0;t=V.firstChild;while(t!=aa&&W<Y){W++;t=t.nextSibling}if(W<Y){return -1}return 1}ab=c.findCommonAncestor(X,V);ad=X;while(ad&&ad.parentNode!=ab){ad=ad.parentNode}if(!ad){ad=ab}ac=V;while(ac&&ac.parentNode!=ab){ac=ac.parentNode}if(!ac){ac=ab}if(ad==ac){return 0}t=ab.firstChild;while(t){if(t==ad){return -1}if(t==ac){return 1}t=t.nextSibling}}function B(V,Y,X){var t,W;if(V){N[h]=Y;N[U]=X}else{N[P]=Y;N[z]=X}t=N[P];while(t.parentNode){t=t.parentNode}W=N[h];while(W.parentNode){W=W.parentNode}if(W==t){if(G(N[h],N[U],N[P],N[z])>0){N.collapse(V)}}else{N.collapse(V)}N.collapsed=l();N.commonAncestorContainer=c.findCommonAncestor(N[h],N[P])}function m(ab){var aa,X=0,ad=0,V,Z,W,Y,t,ac;if(N[h]==N[P]){return f(ab)}for(aa=N[P],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[h]){return r(aa,ab)}++X}for(aa=N[h],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[P]){return T(aa,ab)}++ad}Z=ad-X;W=N[h];while(Z>0){W=W.parentNode;Z--}Y=N[P];while(Z<0){Y=Y.parentNode;Z++}for(t=W.parentNode,ac=Y.parentNode;t!=ac;t=t.parentNode,ac=ac.parentNode){W=t;Y=ac}return o(W,Y,ab)}function f(Z){var ab,Y,X,aa,t,W,V;if(Z!=j){ab=e.createDocumentFragment()}if(N[U]==N[z]){return ab}if(N[h].nodeType==3){Y=N[h].nodeValue;X=Y.substring(N[U],N[z]);if(Z!=E){N[h].deleteData(N[U],N[z]-N[U]);N.collapse(D)}if(Z==j){return}ab.appendChild(e.createTextNode(X));return ab}aa=O(N[h],N[U]);t=N[z]-N[U];while(t>0){W=aa.nextSibling;V=y(aa,Z);if(ab){ab.appendChild(V)}--t;aa=W}if(Z!=E){N.collapse(D)}return ab}function r(ab,Y){var aa,Z,V,t,X,W;if(Y!=j){aa=e.createDocumentFragment()}Z=i(ab,Y);if(aa){aa.appendChild(Z)}V=n(ab);t=V-N[U];if(t<=0){if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}Z=ab.previousSibling;while(t>0){X=Z.previousSibling;W=y(Z,Y);if(aa){aa.insertBefore(W,aa.firstChild)}--t;Z=X}if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}function T(Z,Y){var ab,V,aa,t,X,W;if(Y!=j){ab=e.createDocumentFragment()}aa=Q(Z,Y);if(ab){ab.appendChild(aa)}V=n(Z);++V;t=N[z]-V;aa=Z.nextSibling;while(t>0){X=aa.nextSibling;W=y(aa,Y);if(ab){ab.appendChild(W)}--t;aa=X}if(Y!=E){N.setStartAfter(Z);N.collapse(D)}return ab}function o(Z,t,ac){var W,ae,Y,aa,ab,V,ad,X;if(ac!=j){ae=e.createDocumentFragment()}W=Q(Z,ac);if(ae){ae.appendChild(W)}Y=Z.parentNode;aa=n(Z);ab=n(t);++aa;V=ab-aa;ad=Z.nextSibling;while(V>0){X=ad.nextSibling;W=y(ad,ac);if(ae){ae.appendChild(W)}ad=X;--V}W=i(t,ac);if(ae){ae.appendChild(W)}if(ac!=E){N.setStartAfter(Z);N.collapse(D)}return ae}function i(aa,ab){var W=O(N[P],N[z]-1),ac,Z,Y,t,V,X=W!=N[P];if(W==aa){return L(W,X,R,ab)}ac=W.parentNode;Z=L(ac,R,R,ab);while(ac){while(W){Y=W.previousSibling;t=L(W,X,R,ab);if(ab!=j){Z.insertBefore(t,Z.firstChild)}X=D;W=Y}if(ac==aa){return Z}W=ac.previousSibling;ac=ac.parentNode;V=L(ac,R,R,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function Q(aa,ab){var X=O(N[h],N[U]),Y=X!=N[h],ac,Z,W,t,V;if(X==aa){return L(X,Y,D,ab)}ac=X.parentNode;Z=L(ac,R,D,ab);while(ac){while(X){W=X.nextSibling;t=L(X,Y,D,ab);if(ab!=j){Z.appendChild(t)}Y=D;X=W}if(ac==aa){return Z}X=ac.nextSibling;ac=ac.parentNode;V=L(ac,R,D,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function L(t,Y,ab,ac){var X,W,Z,V,aa;if(Y){return y(t,ac)}if(t.nodeType==3){X=t.nodeValue;if(ab){V=N[U];W=X.substring(V);Z=X.substring(0,V)}else{V=N[z];W=X.substring(0,V);Z=X.substring(V)}if(ac!=E){t.nodeValue=Z}if(ac==j){return}aa=t.cloneNode(R);aa.nodeValue=W;return aa}if(ac==j){return}return t.cloneNode(R)}function y(V,t){if(t!=j){return t==E?V.cloneNode(D):V}V.parentNode.removeChild(V)}}a.Range=b})(tinymce.dom);(function(){function a(d){var b=this,h=d.dom,c=true,f=false;function e(i,j){var k,t=0,q,n,m,l,o,r,p=-1,s;k=i.duplicate();k.collapse(j);s=k.parentElement();if(s.ownerDocument!==d.dom.doc){return}while(s.contentEditable==="false"){s=s.parentNode}if(!s.hasChildNodes()){return{node:s,inside:1}}m=s.children;q=m.length-1;while(t<=q){r=Math.floor((t+q)/2);l=m[r];k.moveToElementText(l);p=k.compareEndPoints(j?"StartToStart":"EndToEnd",i);if(p>0){q=r-1}else{if(p<0){t=r+1}else{return{node:l}}}}if(p<0){if(!l){k.moveToElementText(s);k.collapse(true);l=s;n=true}else{k.collapse(false)}k.setEndPoint(j?"EndToStart":"EndToEnd",i);if(k.compareEndPoints(j?"StartToStart":"StartToEnd",i)>0){k=i.duplicate();k.collapse(j);o=-1;while(s==k.parentElement()){if(k.move("character",-1)==0){break}o++}}o=o||k.text.replace("\r\n"," ").length}else{k.collapse(true);k.setEndPoint(j?"StartToStart":"StartToEnd",i);o=k.text.replace("\r\n"," ").length}return{node:l,position:p,offset:o,inside:n}}function g(){var i=d.getRng(),r=h.createRng(),l,k,p,q,m,j;l=i.item?i.item(0):i.parentElement();if(l.ownerDocument!=h.doc){return r}k=d.isCollapsed();if(i.item){r.setStart(l.parentNode,h.nodeIndex(l));r.setEnd(r.startContainer,r.startOffset+1);return r}function o(A){var u=e(i,A),s,y,z=0,x,v,t;s=u.node;y=u.offset;if(u.inside&&!s.hasChildNodes()){r[A?"setStart":"setEnd"](s,0);return}if(y===v){r[A?"setStartBefore":"setEndAfter"](s);return}if(u.position<0){x=u.inside?s.firstChild:s.nextSibling;if(!x){r[A?"setStartAfter":"setEndAfter"](s);return}if(!y){if(x.nodeType==3){r[A?"setStart":"setEnd"](x,0)}else{r[A?"setStartBefore":"setEndBefore"](x)}return}while(x){t=x.nodeValue;z+=t.length;if(z>=y){s=x;z-=y;z=t.length-z;break}x=x.nextSibling}}else{x=s.previousSibling;if(!x){return r[A?"setStartBefore":"setEndBefore"](s)}if(!y){if(s.nodeType==3){r[A?"setStart":"setEnd"](x,s.nodeValue.length)}else{r[A?"setStartAfter":"setEndAfter"](x)}return}while(x){z+=x.nodeValue.length;if(z>=y){s=x;z-=y;break}x=x.previousSibling}}r[A?"setStart":"setEnd"](s,z)}try{o(true);if(!k){o()}}catch(n){if(n.number==-2147024809){m=b.getBookmark(2);p=i.duplicate();p.collapse(true);l=p.parentElement();if(!k){p=i.duplicate();p.collapse(false);q=p.parentElement();q.innerHTML=q.innerHTML}l.innerHTML=l.innerHTML;b.moveToBookmark(m);i=d.getRng();o(true);if(!k){o()}}else{throw n}}return r}this.getBookmark=function(m){var j=d.getRng(),o,i,l={};function n(u){var u,t,p,s,r,q=[];t=u.parentNode;p=h.getRoot().parentNode;while(t!=p&&t.nodeType!==9){s=t.children;r=s.length;while(r--){if(u===s[r]){q.push(r);break}}u=t;t=t.parentNode}return q}function k(q){var p;p=e(j,q);if(p){return{position:p.position,offset:p.offset,indexes:n(p.node),inside:p.inside}}}if(m===2){if(!j.item){l.start=k(true);if(!d.isCollapsed()){l.end=k()}}else{l.start={ctrl:true,indexes:n(j.item(0))}}}return l};this.moveToBookmark=function(k){var j,i=h.doc.body;function m(o){var r,q,n,p;r=h.getRoot();for(q=o.length-1;q>=0;q--){p=r.children;n=o[q];if(n<=p.length-1){r=p[n]}}return r}function l(r){var n=k[r?"start":"end"],q,p,o;if(n){q=n.position>0;p=i.createTextRange();p.moveToElementText(m(n.indexes));offset=n.offset;if(offset!==o){p.collapse(n.inside||q);p.moveStart("character",q?-offset:offset)}else{p.collapse(r)}j.setEndPoint(r?"StartToStart":"EndToStart",p);if(r){j.collapse(true)}}}if(k.start){if(k.start.ctrl){j=i.createControlRange();j.addElement(m(k.start.indexes));j.select()}else{j=i.createTextRange();l(true);l();j.select()}}};this.addRange=function(i){var n,l,k,p,s,q,r=d.dom.doc,m=r.body;function j(z){var u,y,t,x,v;t=h.create("a");u=z?k:s;y=z?p:q;x=n.duplicate();if(u==r||u==r.documentElement){u=m;y=0}if(u.nodeType==3){u.parentNode.insertBefore(t,u);x.moveToElementText(t);x.moveStart("character",y);h.remove(t);n.setEndPoint(z?"StartToStart":"EndToEnd",x)}else{v=u.childNodes;if(v.length){if(y>=v.length){h.insertAfter(t,v[v.length-1])}else{u.insertBefore(t,v[y])}x.moveToElementText(t)}else{t=r.createTextNode("\uFEFF");u.appendChild(t);x.moveToElementText(t.parentNode);x.collapse(c)}n.setEndPoint(z?"StartToStart":"EndToEnd",x);h.remove(t)}}k=i.startContainer;p=i.startOffset;s=i.endContainer;q=i.endOffset;n=m.createTextRange();if(k==s&&k.nodeType==1&&p==q-1){if(p==q-1){try{l=m.createControlRange();l.addElement(k.childNodes[p]);l.select();return}catch(o){}}}j(true);j();n.select()};this.getRangeAt=g}tinymce.dom.TridentSelection=a})();(function(){var p=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,j=0,d=Object.prototype.toString,o=false,i=true;[0,0].sort(function(){i=false;return 0});var b=function(v,e,z,A){z=z||[];e=e||document;var C=e;if(e.nodeType!==1&&e.nodeType!==9){return[]}if(!v||typeof v!=="string"){return z}var x=[],s,E,H,r,u=true,t=b.isXML(e),B=v,D,G,F,y;do{p.exec("");s=p.exec(B);if(s){B=s[3];x.push(s[1]);if(s[2]){r=s[3];break}}}while(s);if(x.length>1&&k.exec(v)){if(x.length===2&&f.relative[x[0]]){E=h(x[0]+x[1],e)}else{E=f.relative[x[0]]?[e]:b(x.shift(),e);while(x.length){v=x.shift();if(f.relative[v]){v+=x.shift()}E=h(v,E)}}}else{if(!A&&x.length>1&&e.nodeType===9&&!t&&f.match.ID.test(x[0])&&!f.match.ID.test(x[x.length-1])){D=b.find(x.shift(),e,t);e=D.expr?b.filter(D.expr,D.set)[0]:D.set[0]}if(e){D=A?{expr:x.pop(),set:a(A)}:b.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&e.parentNode?e.parentNode:e,t);E=D.expr?b.filter(D.expr,D.set):D.set;if(x.length>0){H=a(E)}else{u=false}while(x.length){G=x.pop();F=G;if(!f.relative[G]){G=""}else{F=x.pop()}if(F==null){F=e}f.relative[G](H,F,t)}}else{H=x=[]}}if(!H){H=E}if(!H){b.error(G||v)}if(d.call(H)==="[object Array]"){if(!u){z.push.apply(z,H)}else{if(e&&e.nodeType===1){for(y=0;H[y]!=null;y++){if(H[y]&&(H[y]===true||H[y].nodeType===1&&b.contains(e,H[y]))){z.push(E[y])}}}else{for(y=0;H[y]!=null;y++){if(H[y]&&H[y].nodeType===1){z.push(E[y])}}}}}else{a(H,z)}if(r){b(r,C,z,A);b.uniqueSort(z)}return z};b.uniqueSort=function(r){if(c){o=i;r.sort(c);if(o){for(var e=1;e<r.length;e++){if(r[e]===r[e-1]){r.splice(e--,1)}}}}return r};b.matches=function(e,r){return b(e,null,null,r)};b.find=function(y,e,z){var x;if(!y){return[]}for(var t=0,s=f.order.length;t<s;t++){var v=f.order[t],u;if((u=f.leftMatch[v].exec(y))){var r=u[1];u.splice(1,1);if(r.substr(r.length-1)!=="\\"){u[1]=(u[1]||"").replace(/\\/g,"");x=f.find[v](u,e,z);if(x!=null){y=y.replace(f.match[v],"");break}}}}if(!x){x=e.getElementsByTagName("*")}return{set:x,expr:y}};b.filter=function(C,B,F,u){var s=C,H=[],z=B,x,e,y=B&&B[0]&&b.isXML(B[0]);while(C&&B.length){for(var A in f.filter){if((x=f.leftMatch[A].exec(C))!=null&&x[2]){var r=f.filter[A],G,E,t=x[1];e=false;x.splice(1,1);if(t.substr(t.length-1)==="\\"){continue}if(z===H){H=[]}if(f.preFilter[A]){x=f.preFilter[A](x,z,F,H,u,y);if(!x){e=G=true}else{if(x===true){continue}}}if(x){for(var v=0;(E=z[v])!=null;v++){if(E){G=r(E,x,v,z);var D=u^!!G;if(F&&G!=null){if(D){e=true}else{z[v]=false}}else{if(D){H.push(E);e=true}}}}}if(G!==undefined){if(!F){z=H}C=C.replace(f.match[A],"");if(!e){return[]}break}}}if(C===s){if(e==null){b.error(C)}else{break}}s=C}return z};b.error=function(e){throw"Syntax error, unrecognized expression: "+e};var f=b.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(e){return e.getAttribute("href")}},relative:{"+":function(x,r){var t=typeof r==="string",v=t&&!/\W/.test(r),y=t&&!v;if(v){r=r.toLowerCase()}for(var s=0,e=x.length,u;s<e;s++){if((u=x[s])){while((u=u.previousSibling)&&u.nodeType!==1){}x[s]=y||u&&u.nodeName.toLowerCase()===r?u||false:u===r}}if(y){b.filter(r,x,true)}},">":function(x,r){var u=typeof r==="string",v,s=0,e=x.length;if(u&&!/\W/.test(r)){r=r.toLowerCase();for(;s<e;s++){v=x[s];if(v){var t=v.parentNode;x[s]=t.nodeName.toLowerCase()===r?t:false}}}else{for(;s<e;s++){v=x[s];if(v){x[s]=u?v.parentNode:v.parentNode===r}}if(u){b.filter(r,x,true)}}},"":function(t,r,v){var s=j++,e=q,u;if(typeof r==="string"&&!/\W/.test(r)){r=r.toLowerCase();u=r;e=n}e("parentNode",r,s,t,u,v)},"~":function(t,r,v){var s=j++,e=q,u;if(typeof r==="string"&&!/\W/.test(r)){r=r.toLowerCase();u=r;e=n}e("previousSibling",r,s,t,u,v)}},find:{ID:function(r,s,t){if(typeof s.getElementById!=="undefined"&&!t){var e=s.getElementById(r[1]);return e?[e]:[]}},NAME:function(s,v){if(typeof v.getElementsByName!=="undefined"){var r=[],u=v.getElementsByName(s[1]);for(var t=0,e=u.length;t<e;t++){if(u[t].getAttribute("name")===s[1]){r.push(u[t])}}return r.length===0?null:r}},TAG:function(e,r){return r.getElementsByTagName(e[1])}},preFilter:{CLASS:function(t,r,s,e,x,y){t=" "+t[1].replace(/\\/g,"")+" ";if(y){return t}for(var u=0,v;(v=r[u])!=null;u++){if(v){if(x^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(t)>=0)){if(!s){e.push(v)}}else{if(s){r[u]=false}}}}return false},ID:function(e){return e[1].replace(/\\/g,"")},TAG:function(r,e){return r[1].toLowerCase()},CHILD:function(e){if(e[1]==="nth"){var r=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(e[2]==="even"&&"2n"||e[2]==="odd"&&"2n+1"||!/\D/.test(e[2])&&"0n+"+e[2]||e[2]);e[2]=(r[1]+(r[2]||1))-0;e[3]=r[3]-0}e[0]=j++;return e},ATTR:function(u,r,s,e,v,x){var t=u[1].replace(/\\/g,"");if(!x&&f.attrMap[t]){u[1]=f.attrMap[t]}if(u[2]==="~="){u[4]=" "+u[4]+" "}return u},PSEUDO:function(u,r,s,e,v){if(u[1]==="not"){if((p.exec(u[3])||"").length>1||/^\w/.test(u[3])){u[3]=b(u[3],null,null,r)}else{var t=b.filter(u[3],r,s,true^v);if(!s){e.push.apply(e,t)}return false}}else{if(f.match.POS.test(u[0])||f.match.CHILD.test(u[0])){return true}}return u},POS:function(e){e.unshift(true);return e}},filters:{enabled:function(e){return e.disabled===false&&e.type!=="hidden"},disabled:function(e){return e.disabled===true},checked:function(e){return e.checked===true},selected:function(e){e.parentNode.selectedIndex;return e.selected===true},parent:function(e){return !!e.firstChild},empty:function(e){return !e.firstChild},has:function(s,r,e){return !!b(e[3],s).length},header:function(e){return(/h\d/i).test(e.nodeName)},text:function(e){return"text"===e.type},radio:function(e){return"radio"===e.type},checkbox:function(e){return"checkbox"===e.type},file:function(e){return"file"===e.type},password:function(e){return"password"===e.type},submit:function(e){return"submit"===e.type},image:function(e){return"image"===e.type},reset:function(e){return"reset"===e.type},button:function(e){return"button"===e.type||e.nodeName.toLowerCase()==="button"},input:function(e){return(/input|select|textarea|button/i).test(e.nodeName)}},setFilters:{first:function(r,e){return e===0},last:function(s,r,e,t){return r===t.length-1},even:function(r,e){return e%2===0},odd:function(r,e){return e%2===1},lt:function(s,r,e){return r<e[3]-0},gt:function(s,r,e){return r>e[3]-0},nth:function(s,r,e){return e[3]-0===r},eq:function(s,r,e){return e[3]-0===r}},filter:{PSEUDO:function(s,y,x,z){var e=y[1],r=f.filters[e];if(r){return r(s,x,y,z)}else{if(e==="contains"){return(s.textContent||s.innerText||b.getText([s])||"").indexOf(y[3])>=0}else{if(e==="not"){var t=y[3];for(var v=0,u=t.length;v<u;v++){if(t[v]===s){return false}}return true}else{b.error("Syntax error, unrecognized expression: "+e)}}}},CHILD:function(e,t){var x=t[1],r=e;switch(x){case"only":case"first":while((r=r.previousSibling)){if(r.nodeType===1){return false}}if(x==="first"){return true}r=e;case"last":while((r=r.nextSibling)){if(r.nodeType===1){return false}}return true;case"nth":var s=t[2],A=t[3];if(s===1&&A===0){return true}var v=t[0],z=e.parentNode;if(z&&(z.sizcache!==v||!e.nodeIndex)){var u=0;for(r=z.firstChild;r;r=r.nextSibling){if(r.nodeType===1){r.nodeIndex=++u}}z.sizcache=v}var y=e.nodeIndex-A;if(s===0){return y===0}else{return(y%s===0&&y/s>=0)}}},ID:function(r,e){return r.nodeType===1&&r.getAttribute("id")===e},TAG:function(r,e){return(e==="*"&&r.nodeType===1)||r.nodeName.toLowerCase()===e},CLASS:function(r,e){return(" "+(r.className||r.getAttribute("class"))+" ").indexOf(e)>-1},ATTR:function(v,t){var s=t[1],e=f.attrHandle[s]?f.attrHandle[s](v):v[s]!=null?v[s]:v.getAttribute(s),x=e+"",u=t[2],r=t[4];return e==null?u==="!=":u==="="?x===r:u==="*="?x.indexOf(r)>=0:u==="~="?(" "+x+" ").indexOf(r)>=0:!r?x&&e!==false:u==="!="?x!==r:u==="^="?x.indexOf(r)===0:u==="$="?x.substr(x.length-r.length)===r:u==="|="?x===r||x.substr(0,r.length+1)===r+"-":false},POS:function(u,r,s,v){var e=r[2],t=f.setFilters[e];if(t){return t(u,s,r,v)}}}};var k=f.match.POS,g=function(r,e){return"\\"+(e-0+1)};for(var m in f.match){f.match[m]=new RegExp(f.match[m].source+(/(?![^\[]*\])(?![^\(]*\))/.source));f.leftMatch[m]=new RegExp(/(^(?:.|\r|\n)*?)/.source+f.match[m].source.replace(/\\(\d+)/g,g))}var a=function(r,e){r=Array.prototype.slice.call(r,0);if(e){e.push.apply(e,r);return e}return r};try{Array.prototype.slice.call(document.documentElement.childNodes,0)[0].nodeType}catch(l){a=function(u,t){var r=t||[],s=0;if(d.call(u)==="[object Array]"){Array.prototype.push.apply(r,u)}else{if(typeof u.length==="number"){for(var e=u.length;s<e;s++){r.push(u[s])}}else{for(;u[s];s++){r.push(u[s])}}}return r}}var c;if(document.documentElement.compareDocumentPosition){c=function(r,e){if(!r.compareDocumentPosition||!e.compareDocumentPosition){if(r==e){o=true}return r.compareDocumentPosition?-1:1}var s=r.compareDocumentPosition(e)&4?-1:r===e?0:1;if(s===0){o=true}return s}}else{if("sourceIndex" in document.documentElement){c=function(r,e){if(!r.sourceIndex||!e.sourceIndex){if(r==e){o=true}return r.sourceIndex?-1:1}var s=r.sourceIndex-e.sourceIndex;if(s===0){o=true}return s}}else{if(document.createRange){c=function(t,r){if(!t.ownerDocument||!r.ownerDocument){if(t==r){o=true}return t.ownerDocument?-1:1}var s=t.ownerDocument.createRange(),e=r.ownerDocument.createRange();s.setStart(t,0);s.setEnd(t,0);e.setStart(r,0);e.setEnd(r,0);var u=s.compareBoundaryPoints(Range.START_TO_END,e);if(u===0){o=true}return u}}}}b.getText=function(e){var r="",t;for(var s=0;e[s];s++){t=e[s];if(t.nodeType===3||t.nodeType===4){r+=t.nodeValue}else{if(t.nodeType!==8){r+=b.getText(t.childNodes)}}}return r};(function(){var r=document.createElement("div"),s="script"+(new Date()).getTime();r.innerHTML="<a name='"+s+"'/>";var e=document.documentElement;e.insertBefore(r,e.firstChild);if(document.getElementById(s)){f.find.ID=function(u,v,x){if(typeof v.getElementById!=="undefined"&&!x){var t=v.getElementById(u[1]);return t?t.id===u[1]||typeof t.getAttributeNode!=="undefined"&&t.getAttributeNode("id").nodeValue===u[1]?[t]:undefined:[]}};f.filter.ID=function(v,t){var u=typeof v.getAttributeNode!=="undefined"&&v.getAttributeNode("id");return v.nodeType===1&&u&&u.nodeValue===t}}e.removeChild(r);e=r=null})();(function(){var e=document.createElement("div");e.appendChild(document.createComment(""));if(e.getElementsByTagName("*").length>0){f.find.TAG=function(r,v){var u=v.getElementsByTagName(r[1]);if(r[1]==="*"){var t=[];for(var s=0;u[s];s++){if(u[s].nodeType===1){t.push(u[s])}}u=t}return u}}e.innerHTML="<a href='#'></a>";if(e.firstChild&&typeof e.firstChild.getAttribute!=="undefined"&&e.firstChild.getAttribute("href")!=="#"){f.attrHandle.href=function(r){return r.getAttribute("href",2)}}e=null})();if(document.querySelectorAll){(function(){var e=b,s=document.createElement("div");s.innerHTML="<p class='TEST'></p>";if(s.querySelectorAll&&s.querySelectorAll(".TEST").length===0){return}b=function(x,v,t,u){v=v||document;if(!u&&v.nodeType===9&&!b.isXML(v)){try{return a(v.querySelectorAll(x),t)}catch(y){}}return e(x,v,t,u)};for(var r in e){b[r]=e[r]}s=null})()}(function(){var e=document.createElement("div");e.innerHTML="<div class='test e'></div><div class='test'></div>";if(!e.getElementsByClassName||e.getElementsByClassName("e").length===0){return}e.lastChild.className="e";if(e.getElementsByClassName("e").length===1){return}f.order.splice(1,0,"CLASS");f.find.CLASS=function(r,s,t){if(typeof s.getElementsByClassName!=="undefined"&&!t){return s.getElementsByClassName(r[1])}};e=null})();function n(r,x,v,A,y,z){for(var t=0,s=A.length;t<s;t++){var e=A[t];if(e){e=e[r];var u=false;while(e){if(e.sizcache===v){u=A[e.sizset];break}if(e.nodeType===1&&!z){e.sizcache=v;e.sizset=t}if(e.nodeName.toLowerCase()===x){u=e;break}e=e[r]}A[t]=u}}}function q(r,x,v,A,y,z){for(var t=0,s=A.length;t<s;t++){var e=A[t];if(e){e=e[r];var u=false;while(e){if(e.sizcache===v){u=A[e.sizset];break}if(e.nodeType===1){if(!z){e.sizcache=v;e.sizset=t}if(typeof x!=="string"){if(e===x){u=true;break}}else{if(b.filter(x,[e]).length>0){u=e;break}}}e=e[r]}A[t]=u}}}b.contains=document.compareDocumentPosition?function(r,e){return !!(r.compareDocumentPosition(e)&16)}:function(r,e){return r!==e&&(r.contains?r.contains(e):true)};b.isXML=function(e){var r=(e?e.ownerDocument||e:0).documentElement;return r?r.nodeName!=="HTML":false};var h=function(e,y){var t=[],u="",v,s=y.nodeType?[y]:y;while((v=f.match.PSEUDO.exec(e))){u+=v[0];e=e.replace(f.match.PSEUDO,"")}e=f.relative[e]?e+"*":e;for(var x=0,r=s.length;x<r;x++){b(e,s[x],t)}return b.filter(u,t)};window.tinymce.dom.Sizzle=b})();(function(d){var f=d.each,c=d.DOM,b=d.isIE,e=d.isWebKit,a;d.create("tinymce.dom.EventUtils",{EventUtils:function(){this.inits=[];this.events=[]},add:function(m,p,l,j){var g,h=this,i=h.events,k;if(p instanceof Array){k=[];f(p,function(o){k.push(h.add(m,o,l,j))});return k}if(m&&m.hasOwnProperty&&m instanceof Array){k=[];f(m,function(n){n=c.get(n);k.push(h.add(n,p,l,j))});return k}m=c.get(m);if(!m){return}g=function(n){if(h.disabled){return}n=n||window.event;if(n&&b){if(!n.target){n.target=n.srcElement}d.extend(n,h._stoppers)}if(!j){return l(n)}return l.call(j,n)};if(p=="unload"){d.unloads.unshift({func:g});return g}if(p=="init"){if(h.domLoaded){g()}else{h.inits.push(g)}return g}i.push({obj:m,name:p,func:l,cfunc:g,scope:j});h._add(m,p,g);return l},remove:function(l,m,k){var h=this,g=h.events,i=false,j;if(l&&l.hasOwnProperty&&l instanceof Array){j=[];f(l,function(n){n=c.get(n);j.push(h.remove(n,m,k))});return j}l=c.get(l);f(g,function(o,n){if(o.obj==l&&o.name==m&&(!k||(o.func==k||o.cfunc==k))){g.splice(n,1);h._remove(l,m,o.cfunc);i=true;return false}});return i},clear:function(l){var j=this,g=j.events,h,k;if(l){l=c.get(l);for(h=g.length-1;h>=0;h--){k=g[h];if(k.obj===l){j._remove(k.obj,k.name,k.cfunc);k.obj=k.cfunc=null;g.splice(h,1)}}}},cancel:function(g){if(!g){return false}this.stop(g);return this.prevent(g)},stop:function(g){if(g.stopPropagation){g.stopPropagation()}else{g.cancelBubble=true}return false},prevent:function(g){if(g.preventDefault){g.preventDefault()}else{g.returnValue=false}return false},destroy:function(){var g=this;f(g.events,function(j,h){g._remove(j.obj,j.name,j.cfunc);j.obj=j.cfunc=null});g.events=[];g=null},_add:function(h,i,g){if(h.attachEvent){h.attachEvent("on"+i,g)}else{if(h.addEventListener){h.addEventListener(i,g,false)}else{h["on"+i]=g}}},_remove:function(i,j,h){if(i){try{if(i.detachEvent){i.detachEvent("on"+j,h)}else{if(i.removeEventListener){i.removeEventListener(j,h,false)}else{i["on"+j]=null}}}catch(g){}}},_pageInit:function(h){var g=this;if(g.domLoaded){return}g.domLoaded=true;f(g.inits,function(i){i()});g.inits=[]},_wait:function(i){var g=this,h=i.document;if(i.tinyMCE_GZ&&tinyMCE_GZ.loaded){g.domLoaded=1;return}if(h.attachEvent){h.attachEvent("onreadystatechange",function(){if(h.readyState==="complete"){h.detachEvent("onreadystatechange",arguments.callee);g._pageInit(i)}});if(h.documentElement.doScroll&&i==i.top){(function(){if(g.domLoaded){return}try{h.documentElement.doScroll("left")}catch(j){setTimeout(arguments.callee,0);return}g._pageInit(i)})()}}else{if(h.addEventListener){g._add(i,"DOMContentLoaded",function(){g._pageInit(i)})}}g._add(i,"load",function(){g._pageInit(i)})},_stoppers:{preventDefault:function(){this.returnValue=false},stopPropagation:function(){this.cancelBubble=true}}});a=d.dom.Event=new d.dom.EventUtils();a._wait(window);d.addUnload(function(){a.destroy()})})(tinymce);(function(a){a.dom.Element=function(f,d){var b=this,e,c;b.settings=d=d||{};b.id=f;b.dom=e=d.dom||a.DOM;if(!a.isIE){c=e.get(b.id)}a.each(("getPos,getRect,getParent,add,setStyle,getStyle,setStyles,setAttrib,setAttribs,getAttrib,addClass,removeClass,hasClass,getOuterHTML,setOuterHTML,remove,show,hide,isHidden,setHTML,get").split(/,/),function(g){b[g]=function(){var h=[f],j;for(j=0;j<arguments.length;j++){h.push(arguments[j])}h=e[g].apply(e,h);b.update(g);return h}});a.extend(b,{on:function(i,h,g){return a.dom.Event.add(b.id,i,h,g)},getXY:function(){return{x:parseInt(b.getStyle("left")),y:parseInt(b.getStyle("top"))}},getSize:function(){var g=e.get(b.id);return{w:parseInt(b.getStyle("width")||g.clientWidth),h:parseInt(b.getStyle("height")||g.clientHeight)}},moveTo:function(g,h){b.setStyles({left:g,top:h})},moveBy:function(g,i){var h=b.getXY();b.moveTo(h.x+g,h.y+i)},resizeTo:function(g,i){b.setStyles({width:g,height:i})},resizeBy:function(g,j){var i=b.getSize();b.resizeTo(i.w+g,i.h+j)},update:function(h){var g;if(a.isIE6&&d.blocker){h=h||"";if(h.indexOf("get")===0||h.indexOf("has")===0||h.indexOf("is")===0){return}if(h=="remove"){e.remove(b.blocker);return}if(!b.blocker){b.blocker=e.uniqueId();g=e.add(d.container||e.getRoot(),"iframe",{id:b.blocker,style:"position:absolute;",frameBorder:0,src:'javascript:""'});e.setStyle(g,"opacity",0)}else{g=e.get(b.blocker)}e.setStyles(g,{left:b.getStyle("left",1),top:b.getStyle("top",1),width:b.getStyle("width",1),height:b.getStyle("height",1),display:b.getStyle("display",1),zIndex:parseInt(b.getStyle("zIndex",1)||0)-1})}}})}})(tinymce);(function(c){function e(f){return f.replace(/[\n\r]+/g,"")}var b=c.is,a=c.isIE,d=c.each;c.create("tinymce.dom.Selection",{Selection:function(i,h,g){var f=this;f.dom=i;f.win=h;f.serializer=g;d(["onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent"],function(j){f[j]=new c.util.Dispatcher(f)});if(!f.win.getSelection){f.tridentSel=new c.dom.TridentSelection(f)}if(c.isIE&&i.boxModel){this._fixIESelection()}c.addUnload(f.destroy,f)},setCursorLocation:function(h,i){var f=this;var g=f.dom.createRng();g.setStart(h,i);g.setEnd(h,i);f.setRng(g);f.collapse(false)},getContent:function(g){var f=this,h=f.getRng(),l=f.dom.create("body"),j=f.getSel(),i,k,m;g=g||{};i=k="";g.get=true;g.format=g.format||"html";g.forced_root_block="";f.onBeforeGetContent.dispatch(f,g);if(g.format=="text"){return f.isCollapsed()?"":(h.text||(j.toString?j.toString():""))}if(h.cloneContents){m=h.cloneContents();if(m){l.appendChild(m)}}else{if(b(h.item)||b(h.htmlText)){l.innerHTML="<br>"+(h.item?h.item(0).outerHTML:h.htmlText);l.removeChild(l.firstChild)}else{l.innerHTML=h.toString()}}if(/^\s/.test(l.innerHTML)){i=" "}if(/\s+$/.test(l.innerHTML)){k=" "}g.getInner=true;g.content=f.isCollapsed()?"":i+f.serializer.serialize(l,g)+k;f.onGetContent.dispatch(f,g);return g.content},setContent:function(g,i){var n=this,f=n.getRng(),j,k=n.win.document,m,l;i=i||{format:"html"};i.set=true;g=i.content=g;if(!i.no_events){n.onBeforeSetContent.dispatch(n,i)}g=i.content;if(f.insertNode){g+='<span id="__caret">_</span>';if(f.startContainer==k&&f.endContainer==k){k.body.innerHTML=g}else{f.deleteContents();if(k.body.childNodes.length==0){k.body.innerHTML=g}else{if(f.createContextualFragment){f.insertNode(f.createContextualFragment(g))}else{m=k.createDocumentFragment();l=k.createElement("div");m.appendChild(l);l.outerHTML=g;f.insertNode(m)}}}j=n.dom.get("__caret");f=k.createRange();f.setStartBefore(j);f.setEndBefore(j);n.setRng(f);n.dom.remove("__caret");try{n.setRng(f)}catch(h){}}else{if(f.item){k.execCommand("Delete",false,null);f=n.getRng()}if(/^\s+/.test(g)){f.pasteHTML('<span id="__mce_tmp">_</span>'+g);n.dom.remove("__mce_tmp")}else{f.pasteHTML(g)}}if(!i.no_events){n.onSetContent.dispatch(n,i)}},getStart:function(){var g=this.getRng(),h,f,j,i;if(g.duplicate||g.item){if(g.item){return g.item(0)}j=g.duplicate();j.collapse(1);h=j.parentElement();f=i=g.parentElement();while(i=i.parentNode){if(i==h){h=f;break}}return h}else{h=g.startContainer;if(h.nodeType==1&&h.hasChildNodes()){h=h.childNodes[Math.min(h.childNodes.length-1,g.startOffset)]}if(h&&h.nodeType==3){return h.parentNode}return h}},getEnd:function(){var g=this,h=g.getRng(),i,f;if(h.duplicate||h.item){if(h.item){return h.item(0)}h=h.duplicate();h.collapse(0);i=h.parentElement();if(i&&i.nodeName=="BODY"){return i.lastChild||i}return i}else{i=h.endContainer;f=h.endOffset;if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[f>0?f-1:f]}if(i&&i.nodeType==3){return i.parentNode}return i}},getBookmark:function(r,s){var v=this,m=v.dom,g,j,i,n,h,o,p,l="\uFEFF",u;function f(x,y){var t=0;d(m.select(x),function(A,z){if(A==y){t=z}});return t}if(r==2){function k(){var x=v.getRng(true),t=m.getRoot(),y={};function z(C,H){var B=C[H?"startContainer":"endContainer"],G=C[H?"startOffset":"endOffset"],A=[],D,F,E=0;if(B.nodeType==3){if(s){for(D=B.previousSibling;D&&D.nodeType==3;D=D.previousSibling){G+=D.nodeValue.length}}A.push(G)}else{F=B.childNodes;if(G>=F.length&&F.length){E=1;G=Math.max(0,F.length-1)}A.push(v.dom.nodeIndex(F[G],s)+E)}for(;B&&B!=t;B=B.parentNode){A.push(v.dom.nodeIndex(B,s))}return A}y.start=z(x,true);if(!v.isCollapsed()){y.end=z(x)}return y}if(v.tridentSel){return v.tridentSel.getBookmark(r)}return k()}if(r){return{rng:v.getRng()}}g=v.getRng();i=m.uniqueId();n=tinyMCE.activeEditor.selection.isCollapsed();u="overflow:hidden;line-height:0px";if(g.duplicate||g.item){if(!g.item){j=g.duplicate();try{g.collapse();g.pasteHTML('<span data-mce-type="bookmark" id="'+i+'_start" style="'+u+'">'+l+"</span>");if(!n){j.collapse(false);g.moveToElementText(j.parentElement());if(g.compareEndPoints("StartToEnd",j)==0){j.move("character",-1)}j.pasteHTML('<span data-mce-type="bookmark" id="'+i+'_end" style="'+u+'">'+l+"</span>")}}catch(q){return null}}else{o=g.item(0);h=o.nodeName;return{name:h,index:f(h,o)}}}else{o=v.getNode();h=o.nodeName;if(h=="IMG"){return{name:h,index:f(h,o)}}j=g.cloneRange();if(!n){j.collapse(false);j.insertNode(m.create("span",{"data-mce-type":"bookmark",id:i+"_end",style:u},l))}g.collapse(true);g.insertNode(m.create("span",{"data-mce-type":"bookmark",id:i+"_start",style:u},l))}v.moveToBookmark({id:i,keep:1});return{id:i}},moveToBookmark:function(n){var r=this,l=r.dom,i,h,f,q,j,s,o,p;if(n){if(n.start){f=l.createRng();q=l.getRoot();function g(z){var t=n[z?"start":"end"],v,x,y,u;if(t){y=t[0];for(x=q,v=t.length-1;v>=1;v--){u=x.childNodes;if(t[v]>u.length-1){return}x=u[t[v]]}if(x.nodeType===3){y=Math.min(t[0],x.nodeValue.length)}if(x.nodeType===1){y=Math.min(t[0],x.childNodes.length)}if(z){f.setStart(x,y)}else{f.setEnd(x,y)}}return true}if(r.tridentSel){return r.tridentSel.moveToBookmark(n)}if(g(true)&&g()){r.setRng(f)}}else{if(n.id){function k(A){var u=l.get(n.id+"_"+A),z,t,x,y,v=n.keep;if(u){z=u.parentNode;if(A=="start"){if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}j=s=z;o=p=t}else{if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}s=z;p=t}if(!v){y=u.previousSibling;x=u.nextSibling;d(c.grep(u.childNodes),function(B){if(B.nodeType==3){B.nodeValue=B.nodeValue.replace(/\uFEFF/g,"")}});while(u=l.get(n.id+"_"+A)){l.remove(u,1)}if(y&&x&&y.nodeType==x.nodeType&&y.nodeType==3&&!c.isOpera){t=y.nodeValue.length;y.appendData(x.nodeValue);l.remove(x);if(A=="start"){j=s=y;o=p=t}else{s=y;p=t}}}}}function m(t){if(l.isBlock(t)&&!t.innerHTML){t.innerHTML=!a?'<br data-mce-bogus="1" />':" "}return t}k("start");k("end");if(j){f=l.createRng();f.setStart(m(j),o);f.setEnd(m(s),p);r.setRng(f)}}else{if(n.name){r.select(l.select(n.name)[n.index])}else{if(n.rng){r.setRng(n.rng)}}}}}},select:function(k,j){var i=this,l=i.dom,g=l.createRng(),f;if(k){f=l.nodeIndex(k);g.setStart(k.parentNode,f);g.setEnd(k.parentNode,f+1);if(j){function h(m,o){var n=new c.dom.TreeWalker(m,m);do{if(m.nodeType==3&&c.trim(m.nodeValue).length!=0){if(o){g.setStart(m,0)}else{g.setEnd(m,m.nodeValue.length)}return}if(m.nodeName=="BR"){if(o){g.setStartBefore(m)}else{g.setEndBefore(m)}return}}while(m=(o?n.next():n.prev()))}h(k,1);h(k)}i.setRng(g)}return k},isCollapsed:function(){var f=this,h=f.getRng(),g=f.getSel();if(!h||h.item){return false}if(h.compareEndPoints){return h.compareEndPoints("StartToEnd",h)===0}return !g||h.collapsed},collapse:function(f){var h=this,g=h.getRng(),i;if(g.item){i=g.item(0);g=h.win.document.body.createTextRange();g.moveToElementText(i)}g.collapse(!!f);h.setRng(g)},getSel:function(){var g=this,f=this.win;return f.getSelection?f.getSelection():f.document.selection},getRng:function(l){var g=this,h,i,k,j=g.win.document;if(l&&g.tridentSel){return g.tridentSel.getRangeAt(0)}try{if(h=g.getSel()){i=h.rangeCount>0?h.getRangeAt(0):(h.createRange?h.createRange():j.createRange())}}catch(f){}if(c.isIE&&i&&i.setStart&&j.selection.createRange().item){k=j.selection.createRange().item(0);i=j.createRange();i.setStartBefore(k);i.setEndAfter(k)}if(!i){i=j.createRange?j.createRange():j.body.createTextRange()}if(g.selectedRange&&g.explicitRange){if(i.compareBoundaryPoints(i.START_TO_START,g.selectedRange)===0&&i.compareBoundaryPoints(i.END_TO_END,g.selectedRange)===0){i=g.explicitRange}else{g.selectedRange=null;g.explicitRange=null}}return i},setRng:function(i){var h,g=this;if(!g.tridentSel){h=g.getSel();if(h){g.explicitRange=i;try{h.removeAllRanges()}catch(f){}h.addRange(i);g.selectedRange=h.getRangeAt(0)}}else{if(i.cloneRange){g.tridentSel.addRange(i);return}try{i.select()}catch(f){}}},setNode:function(g){var f=this;f.setContent(f.dom.getOuterHTML(g));return g},getNode:function(){var h=this,g=h.getRng(),i=h.getSel(),l,k=g.startContainer,f=g.endContainer;if(!g){return h.dom.getRoot()}if(g.setStart){l=g.commonAncestorContainer;if(!g.collapsed){if(g.startContainer==g.endContainer){if(g.endOffset-g.startOffset<2){if(g.startContainer.hasChildNodes()){l=g.startContainer.childNodes[g.startOffset]}}}if(k.nodeType===3&&f.nodeType===3){function j(p,m){var o=p;while(p&&p.nodeType===3&&p.length===0){p=m?p.nextSibling:p.previousSibling}return p||o}if(k.length===g.startOffset){k=j(k.nextSibling,true)}else{k=k.parentNode}if(g.endOffset===0){f=j(f.previousSibling,false)}else{f=f.parentNode}if(k&&k===f){return k}}}if(l&&l.nodeType==3){return l.parentNode}return l}return g.item?g.item(0):g.parentElement()},getSelectedBlocks:function(o,g){var m=this,j=m.dom,l,k,h,i=[];l=j.getParent(o||m.getStart(),j.isBlock);k=j.getParent(g||m.getEnd(),j.isBlock);if(l){i.push(l)}if(l&&k&&l!=k){h=l;var f=new c.dom.TreeWalker(l,j.getRoot());while((h=f.next())&&h!=k){if(j.isBlock(h)){i.push(h)}}}if(k&&l!=k){i.push(k)}return i},normalize:function(){var g=this,f,i;if(c.isIE){return}function h(p){var k,o,n,m=g.dom,j=m.getRoot(),l;k=f[(p?"start":"end")+"Container"];o=f[(p?"start":"end")+"Offset"];if(k.nodeType===9){k=k.body;o=0}if(k===j){if(k.hasChildNodes()){k=k.childNodes[Math.min(!p&&o>0?o-1:o,k.childNodes.length-1)];o=0;if(k.hasChildNodes()){l=k;n=new c.dom.TreeWalker(k,j);do{if(l.nodeType===3){o=p?0:l.nodeValue.length-1;k=l;break}if(l.nodeName==="BR"){o=m.nodeIndex(l);k=l.parentNode;break}}while(l=(p?n.next():n.prev()));i=true}}}if(i){f["set"+(p?"Start":"End")](k,o)}}f=g.getRng();h(true);if(f.collapsed){h()}if(i){g.setRng(f)}},destroy:function(g){var f=this;f.win=null;if(!g){c.removeUnload(f.destroy)}},_fixIESelection:function(){var g=this.dom,m=g.doc,h=m.body,j,n,f;m.documentElement.unselectable=true;function i(o,r){var p=h.createTextRange();try{p.moveToPoint(o,r)}catch(q){p=null}return p}function l(p){var o;if(p.button){o=i(p.x,p.y);if(o){if(o.compareEndPoints("StartToStart",n)>0){o.setEndPoint("StartToStart",n)}else{o.setEndPoint("EndToEnd",n)}o.select()}}else{k()}}function k(){var o=m.selection.createRange();if(n&&!o.item&&o.compareEndPoints("StartToEnd",o)===0){n.select()}g.unbind(m,"mouseup",k);g.unbind(m,"mousemove",l);n=j=0}g.bind(m,["mousedown","contextmenu"],function(o){if(o.target.nodeName==="HTML"){if(j){k()}f=m.documentElement;if(f.scrollHeight>f.clientHeight){return}j=1;n=i(o.x,o.y);if(n){g.bind(m,"mouseup",k);g.bind(m,"mousemove",l);g.win.focus();n.select()}}})}})})(tinymce);(function(a){a.dom.Serializer=function(e,i,f){var h,b,d=a.isIE,g=a.each,c;if(!e.apply_source_formatting){e.indent=false}e.remove_trailing_brs=true;i=i||a.DOM;f=f||new a.html.Schema(e);e.entity_encoding=e.entity_encoding||"named";h=new a.util.Dispatcher(self);b=new a.util.Dispatcher(self);c=new a.html.DomParser(e,f);c.addAttributeFilter("src,href,style",function(k,j){var o=k.length,l,q,n="data-mce-"+j,p=e.url_converter,r=e.url_converter_scope,m;while(o--){l=k[o];q=l.attributes.map[n];if(q!==m){l.attr(j,q.length>0?q:null);l.attr(n,null)}else{q=l.attributes.map[j];if(j==="style"){q=i.serializeStyle(i.parseStyle(q),l.name)}else{if(p){q=p.call(r,q,j,l.name)}}l.attr(j,q.length>0?q:null)}}});c.addAttributeFilter("class",function(j,k){var l=j.length,m,n;while(l--){m=j[l];n=m.attr("class").replace(/\s*mce(Item\w+|Selected)\s*/g,"");m.attr("class",n.length>0?n:null)}});c.addAttributeFilter("data-mce-type",function(j,l,k){var m=j.length,n;while(m--){n=j[m];if(n.attributes.map["data-mce-type"]==="bookmark"&&!k.cleanup){n.remove()}}});c.addNodeFilter("script,style",function(k,l){var m=k.length,n,o;function j(p){return p.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g,"").replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g,"")}while(m--){n=k[m];o=n.firstChild?n.firstChild.value:"";if(l==="script"){n.attr("type",(n.attr("type")||"text/javascript").replace(/^mce\-/,""));if(o.length>0){n.firstChild.value="// <![CDATA[\n"+j(o)+"\n// ]]>"}}else{if(o.length>0){n.firstChild.value="<!--\n"+j(o)+"\n-->"}}}});c.addNodeFilter("#comment",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.value.indexOf("[CDATA[")===0){m.name="#cdata";m.type=4;m.value=m.value.replace(/^\[CDATA\[|\]\]$/g,"")}else{if(m.value.indexOf("mce:protected ")===0){m.name="#text";m.type=3;m.raw=true;m.value=unescape(m.value).substr(14)}}}});c.addNodeFilter("xml:namespace,input",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.type===7){m.remove()}else{if(m.type===1){if(k==="input"&&!("type" in m.attributes.map)){m.attr("type","text")}}}}});if(e.fix_list_elements){c.addNodeFilter("ul,ol",function(k,l){var m=k.length,n,j;while(m--){n=k[m];j=n.parent;if(j.name==="ul"||j.name==="ol"){if(n.prev&&n.prev.name==="li"){n.prev.append(n)}}}})}c.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style",function(j,k){var l=j.length;while(l--){j[l].attr(k,null)}});return{schema:f,addNodeFilter:c.addNodeFilter,addAttributeFilter:c.addAttributeFilter,onPreProcess:h,onPostProcess:b,serialize:function(o,m){var l,p,k,j,n;if(d&&i.select("script,style,select,map").length>0){n=o.innerHTML;o=o.cloneNode(false);i.setHTML(o,n)}else{o=o.cloneNode(true)}l=o.ownerDocument.implementation;if(l.createHTMLDocument){p=l.createHTMLDocument("");g(o.nodeName=="BODY"?o.childNodes:[o],function(q){p.body.appendChild(p.importNode(q,true))});if(o.nodeName!="BODY"){o=p.body.firstChild}else{o=p.body}k=i.doc;i.doc=p}m=m||{};m.format=m.format||"html";if(!m.no_events){m.node=o;h.dispatch(self,m)}j=new a.html.Serializer(e,f);m.content=j.serialize(c.parse(m.getInner?o.innerHTML:a.trim(i.getOuterHTML(o),m),m));if(!m.cleanup){m.content=m.content.replace(/\uFEFF|\u200B/g,"")}if(!m.no_events){b.dispatch(self,m)}if(k){i.doc=k}m.node=null;return m.content},addRules:function(j){f.addValidElements(j)},setRules:function(j){f.setValidElements(j)}}}})(tinymce);(function(a){a.dom.ScriptLoader=function(h){var c=0,k=1,i=2,l={},j=[],f={},d=[],g=0,e;function b(m,v){var x=this,q=a.DOM,s,o,r,n;function p(){q.remove(n);if(s){s.onreadystatechange=s.onload=s=null}v()}function u(){if(typeof(console)!=="undefined"&&console.log){console.log("Failed to load: "+m)}}n=q.uniqueId();if(a.isIE6){o=new a.util.URI(m);r=location;if(o.host==r.hostname&&o.port==r.port&&(o.protocol+":")==r.protocol&&o.protocol.toLowerCase()!="file"){a.util.XHR.send({url:a._addVer(o.getURI()),success:function(y){var t=q.create("script",{type:"text/javascript"});t.text=y;document.getElementsByTagName("head")[0].appendChild(t);q.remove(t);p()},error:u});return}}s=q.create("script",{id:n,type:"text/javascript",src:a._addVer(m)});if(!a.isIE){s.onload=p}s.onerror=u;if(!a.isOpera){s.onreadystatechange=function(){var t=s.readyState;if(t=="complete"||t=="loaded"){p()}}}(document.getElementsByTagName("head")[0]||document.body).appendChild(s)}this.isDone=function(m){return l[m]==i};this.markDone=function(m){l[m]=i};this.add=this.load=function(m,q,n){var o,p=l[m];if(p==e){j.push(m);l[m]=c}if(q){if(!f[m]){f[m]=[]}f[m].push({func:q,scope:n||this})}};this.loadQueue=function(n,m){this.loadScripts(j,n,m)};this.loadScripts=function(m,q,p){var o;function n(r){a.each(f[r],function(s){s.func.call(s.scope)});f[r]=e}d.push({func:q,scope:p||this});o=function(){var r=a.grep(m);m.length=0;a.each(r,function(s){if(l[s]==i){n(s);return}if(l[s]!=k){l[s]=k;g++;b(s,function(){l[s]=i;g--;n(s);o()})}});if(!g){a.each(d,function(s){s.func.call(s.scope)});d.length=0}};o()}};a.ScriptLoader=new a.dom.ScriptLoader()})(tinymce);tinymce.dom.TreeWalker=function(a,c){var b=a;function d(i,f,e,j){var h,g;if(i){if(!j&&i[f]){return i[f]}if(i!=c){h=i[e];if(h){return h}for(g=i.parentNode;g&&g!=c;g=g.parentNode){h=g[e];if(h){return h}}}}}this.current=function(){return b};this.next=function(e){return(b=d(b,"firstChild","nextSibling",e))};this.prev=function(e){return(b=d(b,"lastChild","previousSibling",e))}};(function(a){a.dom.RangeUtils=function(c){var b="\uFEFF";this.walk=function(d,s){var i=d.startContainer,l=d.startOffset,t=d.endContainer,m=d.endOffset,j,g,o,h,r,q,e;e=c.select("td.mceSelected,th.mceSelected");if(e.length>0){a.each(e,function(u){s([u])});return}function f(u){var v;v=u[0];if(v.nodeType===3&&v===i&&l>=v.nodeValue.length){u.splice(0,1)}v=u[u.length-1];if(m===0&&u.length>0&&v===t&&v.nodeType===3){u.splice(u.length-1,1)}return u}function p(x,v,u){var y=[];for(;x&&x!=u;x=x[v]){y.push(x)}return y}function n(v,u){do{if(v.parentNode==u){return v}v=v.parentNode}while(v)}function k(x,v,y){var u=y?"nextSibling":"previousSibling";for(h=x,r=h.parentNode;h&&h!=v;h=r){r=h.parentNode;q=p(h==x?h:h[u],u);if(q.length){if(!y){q.reverse()}s(f(q))}}}if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[l]}if(t.nodeType==1&&t.hasChildNodes()){t=t.childNodes[Math.min(m-1,t.childNodes.length-1)]}if(i==t){return s(f([i]))}j=c.findCommonAncestor(i,t);for(h=i;h;h=h.parentNode){if(h===t){return k(i,j,true)}if(h===j){break}}for(h=t;h;h=h.parentNode){if(h===i){return k(t,j)}if(h===j){break}}g=n(i,j)||i;o=n(t,j)||t;k(i,g,true);q=p(g==i?g:g.nextSibling,"nextSibling",o==t?o.nextSibling:o);if(q.length){s(f(q))}k(t,o)};this.split=function(e){var h=e.startContainer,d=e.startOffset,i=e.endContainer,g=e.endOffset;function f(j,k){return j.splitText(k)}if(h==i&&h.nodeType==3){if(d>0&&d<h.nodeValue.length){i=f(h,d);h=i.previousSibling;if(g>d){g=g-d;h=i=f(i,g).previousSibling;g=i.nodeValue.length;d=0}else{g=0}}}else{if(h.nodeType==3&&d>0&&d<h.nodeValue.length){h=f(h,d);d=0}if(i.nodeType==3&&g>0&&g<i.nodeValue.length){i=f(i,g).previousSibling;g=i.nodeValue.length}}return{startContainer:h,startOffset:d,endContainer:i,endOffset:g}}};a.dom.RangeUtils.compareRanges=function(c,b){if(c&&b){if(c.item||c.duplicate){if(c.item&&b.item&&c.item(0)===b.item(0)){return true}if(c.isEqual&&b.isEqual&&b.isEqual(c)){return true}}else{return c.startContainer==b.startContainer&&c.startOffset==b.startOffset}}return false}})(tinymce);(function(b){var a=b.dom.Event,c=b.each;b.create("tinymce.ui.KeyboardNavigation",{KeyboardNavigation:function(e,f){var p=this,m=e.root,l=e.items,n=e.enableUpDown,i=e.enableLeftRight||!e.enableUpDown,k=e.excludeFromTabOrder,j,h,o,d,g;f=f||b.DOM;j=function(q){g=q.target.id};h=function(q){f.setAttrib(q.target.id,"tabindex","-1")};d=function(q){var r=f.get(g);f.setAttrib(r,"tabindex","0");r.focus()};p.focus=function(){f.get(g).focus()};p.destroy=function(){c(l,function(q){f.unbind(f.get(q.id),"focus",j);f.unbind(f.get(q.id),"blur",h)});f.unbind(f.get(m),"focus",d);f.unbind(f.get(m),"keydown",o);l=f=m=p.focus=j=h=o=d=null;p.destroy=function(){}};p.moveFocus=function(u,r){var q=-1,t=p.controls,s;if(!g){return}c(l,function(x,v){if(x.id===g){q=v;return false}});q+=u;if(q<0){q=l.length-1}else{if(q>=l.length){q=0}}s=l[q];f.setAttrib(g,"tabindex","-1");f.setAttrib(s.id,"tabindex","0");f.get(s.id).focus();if(e.actOnFocus){e.onAction(s.id)}if(r){a.cancel(r)}};o=function(y){var u=37,t=39,x=38,z=40,q=27,s=14,r=13,v=32;switch(y.keyCode){case u:if(i){p.moveFocus(-1)}break;case t:if(i){p.moveFocus(1)}break;case x:if(n){p.moveFocus(-1)}break;case z:if(n){p.moveFocus(1)}break;case q:if(e.onCancel){e.onCancel();a.cancel(y)}break;case s:case r:case v:if(e.onAction){e.onAction(g);a.cancel(y)}break}};c(l,function(s,q){var r;if(!s.id){s.id=f.uniqueId("_mce_item_")}if(k){f.bind(s.id,"blur",h);r="-1"}else{r=(q===0?"0":"-1")}f.setAttrib(s.id,"tabindex",r);f.bind(f.get(s.id),"focus",j)});if(l[0]){g=l[0].id}f.setAttrib(m,"tabindex","-1");f.bind(f.get(m),"focus",d);f.bind(f.get(m),"keydown",o)}})})(tinymce);(function(c){var b=c.DOM,a=c.is;c.create("tinymce.ui.Control",{Control:function(f,e,d){this.id=f;this.settings=e=e||{};this.rendered=false;this.onRender=new c.util.Dispatcher(this);this.classPrefix="";this.scope=e.scope||this;this.disabled=0;this.active=0;this.editor=d},setAriaProperty:function(f,e){var d=b.get(this.id+"_aria")||b.get(this.id);if(d){b.setAttrib(d,"aria-"+f,!!e)}},focus:function(){b.get(this.id).focus()},setDisabled:function(d){if(d!=this.disabled){this.setAriaProperty("disabled",d);this.setState("Disabled",d);this.setState("Enabled",!d);this.disabled=d}},isDisabled:function(){return this.disabled},setActive:function(d){if(d!=this.active){this.setState("Active",d);this.active=d;this.setAriaProperty("pressed",d)}},isActive:function(){return this.active},setState:function(f,d){var e=b.get(this.id);f=this.classPrefix+f;if(d){b.addClass(e,f)}else{b.removeClass(e,f)}},isRendered:function(){return this.rendered},renderHTML:function(){},renderTo:function(d){b.setHTML(d,this.renderHTML())},postRender:function(){var e=this,d;if(a(e.disabled)){d=e.disabled;e.disabled=-1;e.setDisabled(d)}if(a(e.active)){d=e.active;e.active=-1;e.setActive(d)}},remove:function(){b.remove(this.id);this.destroy()},destroy:function(){c.dom.Event.clear(this.id)}})})(tinymce);tinymce.create("tinymce.ui.Container:tinymce.ui.Control",{Container:function(c,b,a){this.parent(c,b,a);this.controls=[];this.lookup={}},add:function(a){this.lookup[a.id]=a;this.controls.push(a);return a},get:function(a){return this.lookup[a]}});tinymce.create("tinymce.ui.Separator:tinymce.ui.Control",{Separator:function(b,a){this.parent(b,a);this.classPrefix="mceSeparator";this.setDisabled(true)},renderHTML:function(){return tinymce.DOM.createHTML("span",{"class":this.classPrefix,role:"separator","aria-orientation":"vertical",tabindex:"-1"})}});(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.MenuItem:tinymce.ui.Control",{MenuItem:function(g,f){this.parent(g,f);this.classPrefix="mceMenuItem"},setSelected:function(f){this.setState("Selected",f);this.setAriaProperty("checked",!!f);this.selected=f},isSelected:function(){return this.selected},postRender:function(){var f=this;f.parent();if(c(f.selected)){f.setSelected(f.selected)}}})})(tinymce);(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.Menu:tinymce.ui.MenuItem",{Menu:function(h,g){var f=this;f.parent(h,g);f.items={};f.collapsed=false;f.menuCount=0;f.onAddItem=new d.util.Dispatcher(this)},expand:function(g){var f=this;if(g){a(f,function(h){if(h.expand){h.expand()}},"items",f)}f.collapsed=false},collapse:function(g){var f=this;if(g){a(f,function(h){if(h.collapse){h.collapse()}},"items",f)}f.collapsed=true},isCollapsed:function(){return this.collapsed},add:function(f){if(!f.settings){f=new d.ui.MenuItem(f.id||b.uniqueId(),f)}this.onAddItem.dispatch(this,f);return this.items[f.id]=f},addSeparator:function(){return this.add({separator:true})},addMenu:function(f){if(!f.collapse){f=this.createMenu(f)}this.menuCount++;return this.add(f)},hasMenus:function(){return this.menuCount!==0},remove:function(f){delete this.items[f.id]},removeAll:function(){var f=this;a(f,function(g){if(g.removeAll){g.removeAll()}else{g.remove()}g.destroy()},"items",f);f.items={}},createMenu:function(g){var f=new d.ui.Menu(g.id||b.uniqueId(),g);f.onAddItem.add(this.onAddItem.dispatch,this.onAddItem);return f}})})(tinymce);(function(e){var d=e.is,c=e.DOM,f=e.each,a=e.dom.Event,b=e.dom.Element;e.create("tinymce.ui.DropMenu:tinymce.ui.Menu",{DropMenu:function(h,g){g=g||{};g.container=g.container||c.doc.body;g.offset_x=g.offset_x||0;g.offset_y=g.offset_y||0;g.vp_offset_x=g.vp_offset_x||0;g.vp_offset_y=g.vp_offset_y||0;if(d(g.icons)&&!g.icons){g["class"]+=" mceNoIcons"}this.parent(h,g);this.onShowMenu=new e.util.Dispatcher(this);this.onHideMenu=new e.util.Dispatcher(this);this.classPrefix="mceMenu"},createMenu:function(j){var h=this,i=h.settings,g;j.container=j.container||i.container;j.parent=h;j.constrain=j.constrain||i.constrain;j["class"]=j["class"]||i["class"];j.vp_offset_x=j.vp_offset_x||i.vp_offset_x;j.vp_offset_y=j.vp_offset_y||i.vp_offset_y;j.keyboard_focus=i.keyboard_focus;g=new e.ui.DropMenu(j.id||c.uniqueId(),j);g.onAddItem.add(h.onAddItem.dispatch,h.onAddItem);return g},focus:function(){var g=this;if(g.keyboardNav){g.keyboardNav.focus()}},update:function(){var i=this,j=i.settings,g=c.get("menu_"+i.id+"_tbl"),l=c.get("menu_"+i.id+"_co"),h,k;h=j.max_width?Math.min(g.clientWidth,j.max_width):g.clientWidth;k=j.max_height?Math.min(g.clientHeight,j.max_height):g.clientHeight;if(!c.boxModel){i.element.setStyles({width:h+2,height:k+2})}else{i.element.setStyles({width:h,height:k})}if(j.max_width){c.setStyle(l,"width",h)}if(j.max_height){c.setStyle(l,"height",k);if(g.clientHeight<j.max_height){c.setStyle(l,"overflow","hidden")}}},showMenu:function(p,n,r){var z=this,A=z.settings,o,g=c.getViewPort(),u,l,v,q,i=2,k,j,m=z.classPrefix;z.collapse(1);if(z.isMenuVisible){return}if(!z.rendered){o=c.add(z.settings.container,z.renderNode());f(z.items,function(h){h.postRender()});z.element=new b("menu_"+z.id,{blocker:1,container:A.container})}else{o=c.get("menu_"+z.id)}if(!e.isOpera){c.setStyles(o,{left:-65535,top:-65535})}c.show(o);z.update();p+=A.offset_x||0;n+=A.offset_y||0;g.w-=4;g.h-=4;if(A.constrain){u=o.clientWidth-i;l=o.clientHeight-i;v=g.x+g.w;q=g.y+g.h;if((p+A.vp_offset_x+u)>v){p=r?r-u:Math.max(0,(v-A.vp_offset_x)-u)}if((n+A.vp_offset_y+l)>q){n=Math.max(0,(q-A.vp_offset_y)-l)}}c.setStyles(o,{left:p,top:n});z.element.update();z.isMenuVisible=1;z.mouseClickFunc=a.add(o,"click",function(s){var h;s=s.target;if(s&&(s=c.getParent(s,"tr"))&&!c.hasClass(s,m+"ItemSub")){h=z.items[s.id];if(h.isDisabled()){return}k=z;while(k){if(k.hideMenu){k.hideMenu()}k=k.settings.parent}if(h.settings.onclick){h.settings.onclick(s)}return a.cancel(s)}});if(z.hasMenus()){z.mouseOverFunc=a.add(o,"mouseover",function(x){var h,t,s;x=x.target;if(x&&(x=c.getParent(x,"tr"))){h=z.items[x.id];if(z.lastMenu){z.lastMenu.collapse(1)}if(h.isDisabled()){return}if(x&&c.hasClass(x,m+"ItemSub")){t=c.getRect(x);h.showMenu((t.x+t.w-i),t.y-i,t.x);z.lastMenu=h;c.addClass(c.get(h.id).firstChild,m+"ItemActive")}}})}a.add(o,"keydown",z._keyHandler,z);z.onShowMenu.dispatch(z);if(A.keyboard_focus){z._setupKeyboardNav()}},hideMenu:function(j){var g=this,i=c.get("menu_"+g.id),h;if(!g.isMenuVisible){return}if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(i,"mouseover",g.mouseOverFunc);a.remove(i,"click",g.mouseClickFunc);a.remove(i,"keydown",g._keyHandler);c.hide(i);g.isMenuVisible=0;if(!j){g.collapse(1)}if(g.element){g.element.hide()}if(h=c.get(g.id)){c.removeClass(h.firstChild,g.classPrefix+"ItemActive")}g.onHideMenu.dispatch(g)},add:function(i){var g=this,h;i=g.parent(i);if(g.isRendered&&(h=c.get("menu_"+g.id))){g._add(c.select("tbody",h)[0],i)}return i},collapse:function(g){this.parent(g);this.hideMenu(1)},remove:function(g){c.remove(g.id);this.destroy();return this.parent(g)},destroy:function(){var g=this,h=c.get("menu_"+g.id);if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(h,"mouseover",g.mouseOverFunc);a.remove(c.select("a",h),"focus",g.mouseOverFunc);a.remove(h,"click",g.mouseClickFunc);a.remove(h,"keydown",g._keyHandler);if(g.element){g.element.remove()}c.remove(h)},renderNode:function(){var i=this,j=i.settings,l,h,k,g;g=c.create("div",{role:"listbox",id:"menu_"+i.id,"class":j["class"],style:"position:absolute;left:0;top:0;z-index:200000;outline:0"});if(i.settings.parent){c.setAttrib(g,"aria-parent","menu_"+i.settings.parent.id)}k=c.add(g,"div",{role:"presentation",id:"menu_"+i.id+"_co","class":i.classPrefix+(j["class"]?" "+j["class"]:"")});i.element=new b("menu_"+i.id,{blocker:1,container:j.container});if(j.menu_line){c.add(k,"span",{"class":i.classPrefix+"Line"})}l=c.add(k,"table",{role:"presentation",id:"menu_"+i.id+"_tbl",border:0,cellPadding:0,cellSpacing:0});h=c.add(l,"tbody");f(i.items,function(m){i._add(h,m)});i.rendered=true;return g},_setupKeyboardNav:function(){var i,h,g=this;i=c.select("#menu_"+g.id)[0];h=c.select("a[role=option]","menu_"+g.id);h.splice(0,0,i);g.keyboardNav=new e.ui.KeyboardNavigation({root:"menu_"+g.id,items:h,onCancel:function(){g.hideMenu()},enableUpDown:true});i.focus()},_keyHandler:function(g){var h=this,i;switch(g.keyCode){case 37:if(h.settings.parent){h.hideMenu();h.settings.parent.focus();a.cancel(g)}break;case 39:if(h.mouseOverFunc){h.mouseOverFunc(g)}break}},_add:function(j,h){var i,q=h.settings,p,l,k,m=this.classPrefix,g;if(q.separator){l=c.add(j,"tr",{id:h.id,"class":m+"ItemSeparator"});c.add(l,"td",{"class":m+"ItemSeparator"});if(i=l.previousSibling){c.addClass(i,"mceLast")}return}i=l=c.add(j,"tr",{id:h.id,"class":m+"Item "+m+"ItemEnabled"});i=k=c.add(i,q.titleItem?"th":"td");i=p=c.add(i,"a",{id:h.id+"_aria",role:q.titleItem?"presentation":"option",href:"javascript:;",onclick:"return false;",onmousedown:"return false;"});if(q.parent){c.setAttrib(p,"aria-haspopup","true");c.setAttrib(p,"aria-owns","menu_"+h.id)}c.addClass(k,q["class"]);g=c.add(i,"span",{"class":"mceIcon"+(q.icon?" mce_"+q.icon:"")});if(q.icon_src){c.add(g,"img",{src:q.icon_src})}i=c.add(i,q.element||"span",{"class":"mceText",title:h.settings.title},h.settings.title);if(h.settings.style){c.setAttrib(i,"style",h.settings.style)}if(j.childNodes.length==1){c.addClass(l,"mceFirst")}if((i=l.previousSibling)&&c.hasClass(i,m+"ItemSeparator")){c.addClass(l,"mceFirst")}if(h.collapse){c.addClass(l,m+"ItemSub")}if(i=l.previousSibling){c.removeClass(i,"mceLast")}c.addClass(l,"mceLast")}})})(tinymce);(function(b){var a=b.DOM;b.create("tinymce.ui.Button:tinymce.ui.Control",{Button:function(e,d,c){this.parent(e,d,c);this.classPrefix="mceButton"},renderHTML:function(){var f=this.classPrefix,e=this.settings,d,c;c=a.encode(e.label||"");d='<a role="button" id="'+this.id+'" href="javascript:;" class="'+f+" "+f+"Enabled "+e["class"]+(c?" "+f+"Labeled":"")+'" onmousedown="return false;" onclick="return false;" aria-labelledby="'+this.id+'_voice" title="'+a.encode(e.title)+'">';if(e.image&&!(this.editor&&this.editor.forcedHighContrastMode)){d+='<img class="mceIcon" src="'+e.image+'" alt="'+a.encode(e.title)+'" />'+c}else{d+='<span class="mceIcon '+e["class"]+'"></span>'+(c?'<span class="'+f+'Label">'+c+"</span>":"")}d+='<span class="mceVoiceLabel mceIconOnly" style="display: none;" id="'+this.id+'_voice">'+e.title+"</span>";d+="</a>";return d},postRender:function(){var c=this,d=c.settings;b.dom.Event.add(c.id,"click",function(f){if(!c.isDisabled()){return d.onclick.call(d.scope,f)}})}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.ListBox:tinymce.ui.Control",{ListBox:function(i,h,f){var g=this;g.parent(i,h,f);g.items=[];g.onChange=new a(g);g.onPostRender=new a(g);g.onAdd=new a(g);g.onRenderMenu=new d.util.Dispatcher(this);g.classPrefix="mceListBox"},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){var h=this,i,j,g;if(f!=h.selectedIndex){i=c.get(h.id+"_text");g=c.get(h.id+"_voiceDesc");j=h.items[f];if(j){h.selectedValue=j.value;h.selectedIndex=f;c.setHTML(i,c.encode(j.title));c.setHTML(g,h.settings.title+" - "+j.title);c.removeClass(i,"mceTitle");c.setAttrib(h.id,"aria-valuenow",j.title)}else{c.setHTML(i,c.encode(h.settings.title));c.setHTML(g,c.encode(h.settings.title));c.addClass(i,"mceTitle");h.selectedValue=h.selectedIndex=null;c.setAttrib(h.id,"aria-valuenow",h.settings.title)}i=0}},add:function(i,f,h){var g=this;h=h||{};h=d.extend(h,{title:i,value:f});g.items.push(h);g.onAdd.dispatch(g,h)},getLength:function(){return this.items.length},renderHTML:function(){var i="",f=this,g=f.settings,j=f.classPrefix;i='<span role="listbox" aria-haspopup="true" aria-labelledby="'+f.id+'_voiceDesc" aria-describedby="'+f.id+'_voiceDesc"><table role="presentation" tabindex="0" id="'+f.id+'" cellpadding="0" cellspacing="0" class="'+j+" "+j+"Enabled"+(g["class"]?(" "+g["class"]):"")+'"><tbody><tr>';i+="<td>"+c.createHTML("span",{id:f.id+"_voiceDesc","class":"voiceLabel",style:"display:none;"},f.settings.title);i+=c.createHTML("a",{id:f.id+"_text",tabindex:-1,href:"javascript:;","class":"mceText",onclick:"return false;",onmousedown:"return false;"},c.encode(f.settings.title))+"</td>";i+="<td>"+c.createHTML("a",{id:f.id+"_open",tabindex:-1,href:"javascript:;","class":"mceOpen",onclick:"return false;",onmousedown:"return false;"},'<span><span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span></span>')+"</td>";i+="</tr></tbody></table></span>";return i},showMenu:function(){var g=this,i,h=c.get(this.id),f;if(g.isDisabled()||g.items.length==0){return}if(g.menu&&g.menu.isMenuVisible){return g.hideMenu()}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}i=c.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.keyboard_focus=!d.isOpera;if(g.oldID){f.items[g.oldID].setSelected(0)}e(g.items,function(j){if(j.value===g.selectedValue){f.items[j.id].setSelected(1);g.oldID=j.id}});f.showMenu(0,h.clientHeight);b.add(c.doc,"mousedown",g.hideMenu,g);c.addClass(g.id,g.classPrefix+"Selected")},hideMenu:function(g){var f=this;if(f.menu&&f.menu.isMenuVisible){c.removeClass(f.id,f.classPrefix+"Selected");if(g&&g.type=="mousedown"&&(g.target.id==f.id+"_text"||g.target.id==f.id+"_open")){return}if(!g||!c.getParent(g.target,".mceMenu")){c.removeClass(f.id,f.classPrefix+"Selected");b.remove(c.doc,"mousedown",f.hideMenu,f);f.menu.hideMenu()}}},renderMenu:function(){var g=this,f;f=g.settings.control_manager.createDropMenu(g.id+"_menu",{menu_line:1,"class":g.classPrefix+"Menu mceNoIcons",max_width:150,max_height:150});f.onHideMenu.add(function(){g.hideMenu();g.focus()});f.add({title:g.settings.title,"class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}});e(g.items,function(h){if(h.value===undefined){f.add({title:h.title,role:"option","class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}})}else{h.id=c.uniqueId();h.role="option";h.onclick=function(){if(g.settings.onselect(h.value)!==false){g.select(h.value)}};f.add(h)}});g.onRenderMenu.dispatch(g,f);g.menu=f},postRender:function(){var f=this,g=f.classPrefix;b.add(f.id,"click",f.showMenu,f);b.add(f.id,"keydown",function(h){if(h.keyCode==32){f.showMenu(h);b.cancel(h)}});b.add(f.id,"focus",function(){if(!f._focused){f.keyDownHandler=b.add(f.id,"keydown",function(h){if(h.keyCode==40){f.showMenu();b.cancel(h)}});f.keyPressHandler=b.add(f.id,"keypress",function(i){var h;if(i.keyCode==13){h=f.selectedValue;f.selectedValue=null;b.cancel(i);f.settings.onselect(h)}})}f._focused=1});b.add(f.id,"blur",function(){b.remove(f.id,"keydown",f.keyDownHandler);b.remove(f.id,"keypress",f.keyPressHandler);f._focused=0});if(d.isIE6||!c.boxModel){b.add(f.id,"mouseover",function(){if(!c.hasClass(f.id,g+"Disabled")){c.addClass(f.id,g+"Hover")}});b.add(f.id,"mouseout",function(){if(!c.hasClass(f.id,g+"Disabled")){c.removeClass(f.id,g+"Hover")}})}f.onPostRender.dispatch(f,c.get(f.id))},destroy:function(){this.parent();b.clear(this.id+"_text");b.clear(this.id+"_open")}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.NativeListBox:tinymce.ui.ListBox",{NativeListBox:function(g,f){this.parent(g,f);this.classPrefix="mceNativeListBox"},setDisabled:function(f){c.get(this.id).disabled=f;this.setAriaProperty("disabled",f)},isDisabled:function(){return c.get(this.id).disabled},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){c.get(this.id).selectedIndex=f+1;this.selectedValue=this.items[f]?this.items[f].value:null},add:function(j,g,f){var i,h=this;f=f||{};f.value=g;if(h.isRendered()){c.add(c.get(this.id),"option",f,j)}i={title:j,value:g,attribs:f};h.items.push(i);h.onAdd.dispatch(h,i)},getLength:function(){return this.items.length},renderHTML:function(){var g,f=this;g=c.createHTML("option",{value:""},"-- "+f.settings.title+" --");e(f.items,function(h){g+=c.createHTML("option",{value:h.value},h.title)});g=c.createHTML("select",{id:f.id,"class":"mceNativeListBox","aria-labelledby":f.id+"_aria"},g);g+=c.createHTML("span",{id:f.id+"_aria",style:"display: none"},f.settings.title);return g},postRender:function(){var g=this,h,i=true;g.rendered=true;function f(k){var j=g.items[k.target.selectedIndex-1];if(j&&(j=j.value)){g.onChange.dispatch(g,j);if(g.settings.onselect){g.settings.onselect(j)}}}b.add(g.id,"change",f);b.add(g.id,"keydown",function(k){var j;b.remove(g.id,"change",h);i=false;j=b.add(g.id,"blur",function(){if(i){return}i=true;b.add(g.id,"change",f);b.remove(g.id,"blur",j)});if(d.isWebKit&&(k.keyCode==37||k.keyCode==39)){return b.prevent(k)}if(k.keyCode==13||k.keyCode==32){f(k);return b.cancel(k)}});g.onPostRender.dispatch(g,c.get(g.id))}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.MenuButton:tinymce.ui.Button",{MenuButton:function(g,f,e){this.parent(g,f,e);this.onRenderMenu=new c.util.Dispatcher(this);f.menu_container=f.menu_container||b.doc.body},showMenu:function(){var g=this,j,i,h=b.get(g.id),f;if(g.isDisabled()){return}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}if(g.isMenuVisible){return g.hideMenu()}j=b.getPos(g.settings.menu_container);i=b.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.vp_offset_x=i.x;f.settings.vp_offset_y=i.y;f.settings.keyboard_focus=g._focused;f.showMenu(0,h.clientHeight);a.add(b.doc,"mousedown",g.hideMenu,g);g.setState("Selected",1);g.isMenuVisible=1},renderMenu:function(){var f=this,e;e=f.settings.control_manager.createDropMenu(f.id+"_menu",{menu_line:1,"class":this.classPrefix+"Menu",icons:f.settings.icons});e.onHideMenu.add(function(){f.hideMenu();f.focus()});f.onRenderMenu.dispatch(f,e);f.menu=e},hideMenu:function(g){var f=this;if(g&&g.type=="mousedown"&&b.getParent(g.target,function(h){return h.id===f.id||h.id===f.id+"_open"})){return}if(!g||!b.getParent(g.target,".mceMenu")){f.setState("Selected",0);a.remove(b.doc,"mousedown",f.hideMenu,f);if(f.menu){f.menu.hideMenu()}}f.isMenuVisible=0},postRender:function(){var e=this,f=e.settings;a.add(e.id,"click",function(){if(!e.isDisabled()){if(f.onclick){f.onclick(e.value)}e.showMenu()}})}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.SplitButton:tinymce.ui.MenuButton",{SplitButton:function(g,f,e){this.parent(g,f,e);this.classPrefix="mceSplitButton"},renderHTML:function(){var i,f=this,g=f.settings,e;i="<tbody><tr>";if(g.image){e=b.createHTML("img ",{src:g.image,role:"presentation","class":"mceAction "+g["class"]})}else{e=b.createHTML("span",{"class":"mceAction "+g["class"]},"")}e+=b.createHTML("span",{"class":"mceVoiceLabel mceIconOnly",id:f.id+"_voice",style:"display:none;"},g.title);i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_action",tabindex:"-1",href:"javascript:;","class":"mceAction "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";e=b.createHTML("span",{"class":"mceOpen "+g["class"]},'<span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span>');i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_open",tabindex:"-1",href:"javascript:;","class":"mceOpen "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";i+="</tr></tbody>";i=b.createHTML("table",{role:"presentation","class":"mceSplitButton mceSplitButtonEnabled "+g["class"],cellpadding:"0",cellspacing:"0",title:g.title},i);return b.createHTML("div",{id:f.id,role:"button",tabindex:"0","aria-labelledby":f.id+"_voice","aria-haspopup":"true"},i)},postRender:function(){var e=this,g=e.settings,f;if(g.onclick){f=function(h){if(!e.isDisabled()){g.onclick(e.value);a.cancel(h)}};a.add(e.id+"_action","click",f);a.add(e.id,["click","keydown"],function(h){var k=32,m=14,i=13,j=38,l=40;if((h.keyCode===32||h.keyCode===13||h.keyCode===14)&&!h.altKey&&!h.ctrlKey&&!h.metaKey){f();a.cancel(h)}else{if(h.type==="click"||h.keyCode===l){e.showMenu();a.cancel(h)}}})}a.add(e.id+"_open","click",function(h){e.showMenu();a.cancel(h)});a.add([e.id,e.id+"_open"],"focus",function(){e._focused=1});a.add([e.id,e.id+"_open"],"blur",function(){e._focused=0});if(c.isIE6||!b.boxModel){a.add(e.id,"mouseover",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.addClass(e.id,"mceSplitButtonHover")}});a.add(e.id,"mouseout",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.removeClass(e.id,"mceSplitButtonHover")}})}},destroy:function(){this.parent();a.clear(this.id+"_action");a.clear(this.id+"_open");a.clear(this.id)}})})(tinymce);(function(d){var c=d.DOM,a=d.dom.Event,b=d.is,e=d.each;d.create("tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton",{ColorSplitButton:function(i,h,f){var g=this;g.parent(i,h,f);g.settings=h=d.extend({colors:"000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,008000,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF",grid_width:8,default_color:"#888888"},g.settings);g.onShowMenu=new d.util.Dispatcher(g);g.onHideMenu=new d.util.Dispatcher(g);g.value=h.default_color},showMenu:function(){var f=this,g,j,i,h;if(f.isDisabled()){return}if(!f.isMenuRendered){f.renderMenu();f.isMenuRendered=true}if(f.isMenuVisible){return f.hideMenu()}i=c.get(f.id);c.show(f.id+"_menu");c.addClass(i,"mceSplitButtonSelected");h=c.getPos(i);c.setStyles(f.id+"_menu",{left:h.x,top:h.y+i.clientHeight,zIndex:200000});i=0;a.add(c.doc,"mousedown",f.hideMenu,f);f.onShowMenu.dispatch(f);if(f._focused){f._keyHandler=a.add(f.id+"_menu","keydown",function(k){if(k.keyCode==27){f.hideMenu()}});c.select("a",f.id+"_menu")[0].focus()}f.isMenuVisible=1},hideMenu:function(g){var f=this;if(f.isMenuVisible){if(g&&g.type=="mousedown"&&c.getParent(g.target,function(h){return h.id===f.id+"_open"})){return}if(!g||!c.getParent(g.target,".mceSplitButtonMenu")){c.removeClass(f.id,"mceSplitButtonSelected");a.remove(c.doc,"mousedown",f.hideMenu,f);a.remove(f.id+"_menu","keydown",f._keyHandler);c.hide(f.id+"_menu")}f.isMenuVisible=0;f.onHideMenu.dispatch()}},renderMenu:function(){var p=this,h,k=0,q=p.settings,g,j,l,o,f;o=c.add(q.menu_container,"div",{role:"listbox",id:p.id+"_menu","class":q.menu_class+" "+q["class"],style:"position:absolute;left:0;top:-1000px;"});h=c.add(o,"div",{"class":q["class"]+" mceSplitButtonMenu"});c.add(h,"span",{"class":"mceMenuLine"});g=c.add(h,"table",{role:"presentation","class":"mceColorSplitMenu"});j=c.add(g,"tbody");k=0;e(b(q.colors,"array")?q.colors:q.colors.split(","),function(i){i=i.replace(/^#/,"");if(!k--){l=c.add(j,"tr");k=q.grid_width-1}g=c.add(l,"td");g=c.add(g,"a",{role:"option",href:"javascript:;",style:{backgroundColor:"#"+i},title:p.editor.getLang("colors."+i,i),"data-mce-color":"#"+i});if(p.editor.forcedHighContrastMode){g=c.add(g,"canvas",{width:16,height:16,"aria-hidden":"true"});if(g.getContext&&(f=g.getContext("2d"))){f.fillStyle="#"+i;f.fillRect(0,0,16,16)}else{c.remove(g)}}});if(q.more_colors_func){g=c.add(j,"tr");g=c.add(g,"td",{colspan:q.grid_width,"class":"mceMoreColors"});g=c.add(g,"a",{role:"option",id:p.id+"_more",href:"javascript:;",onclick:"return false;","class":"mceMoreColors"},q.more_colors_title);a.add(g,"click",function(i){q.more_colors_func.call(q.more_colors_scope||this);return a.cancel(i)})}c.addClass(h,"mceColorSplitMenu");new d.ui.KeyboardNavigation({root:p.id+"_menu",items:c.select("a",p.id+"_menu"),onCancel:function(){p.hideMenu();p.focus()}});a.add(p.id+"_menu","mousedown",function(i){return a.cancel(i)});a.add(p.id+"_menu","click",function(i){var m;i=c.getParent(i.target,"a",j);if(i&&i.nodeName.toLowerCase()=="a"&&(m=i.getAttribute("data-mce-color"))){p.setColor(m)}return a.cancel(i)});return o},setColor:function(f){this.displayColor(f);this.hideMenu();this.settings.onselect(f)},displayColor:function(g){var f=this;c.setStyle(f.id+"_preview","backgroundColor",g);f.value=g},postRender:function(){var f=this,g=f.id;f.parent();c.add(g+"_action","div",{id:g+"_preview","class":"mceColorPreview"});c.setStyle(f.id+"_preview","backgroundColor",f.value)},destroy:function(){this.parent();a.clear(this.id+"_menu");a.clear(this.id+"_more");c.remove(this.id+"_menu")}})})(tinymce);(function(b){var d=b.DOM,c=b.each,a=b.dom.Event;b.create("tinymce.ui.ToolbarGroup:tinymce.ui.Container",{renderHTML:function(){var f=this,i=[],e=f.controls,j=b.each,g=f.settings;i.push('<div id="'+f.id+'" role="group" aria-labelledby="'+f.id+'_voice">');i.push("<span role='application'>");i.push('<span id="'+f.id+'_voice" class="mceVoiceLabel" style="display:none;">'+d.encode(g.name)+"</span>");j(e,function(h){i.push(h.renderHTML())});i.push("</span>");i.push("</div>");return i.join("")},focus:function(){var e=this;d.get(e.id).focus()},postRender:function(){var f=this,e=[];c(f.controls,function(g){c(g.controls,function(h){if(h.id){e.push(h)}})});f.keyNav=new b.ui.KeyboardNavigation({root:f.id,items:e,onCancel:function(){if(b.isWebKit){d.get(f.editor.id+"_ifr").focus()}f.editor.focus()},excludeFromTabOrder:!f.settings.tab_focus_toolbar})},destroy:function(){var e=this;e.parent();e.keyNav.destroy();a.clear(e.id)}})})(tinymce);(function(a){var c=a.DOM,b=a.each;a.create("tinymce.ui.Toolbar:tinymce.ui.Container",{renderHTML:function(){var m=this,f="",j,k,n=m.settings,e,d,g,l;l=m.controls;for(e=0;e<l.length;e++){k=l[e];d=l[e-1];g=l[e+1];if(e===0){j="mceToolbarStart";if(k.Button){j+=" mceToolbarStartButton"}else{if(k.SplitButton){j+=" mceToolbarStartSplitButton"}else{if(k.ListBox){j+=" mceToolbarStartListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"))}if(d&&k.ListBox){if(d.Button||d.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarEnd"},c.createHTML("span",null,"<!-- IE -->"))}}if(c.stdMode){f+='<td style="position: relative">'+k.renderHTML()+"</td>"}else{f+="<td>"+k.renderHTML()+"</td>"}if(g&&k.ListBox){if(g.Button||g.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarStart"},c.createHTML("span",null,"<!-- IE -->"))}}}j="mceToolbarEnd";if(k.Button){j+=" mceToolbarEndButton"}else{if(k.SplitButton){j+=" mceToolbarEndSplitButton"}else{if(k.ListBox){j+=" mceToolbarEndListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"));return c.createHTML("table",{id:m.id,"class":"mceToolbar"+(n["class"]?" "+n["class"]:""),cellpadding:"0",cellspacing:"0",align:m.settings.align||"",role:"presentation",tabindex:"-1"},"<tbody><tr>"+f+"</tr></tbody>")}})})(tinymce);(function(b){var a=b.util.Dispatcher,c=b.each;b.create("tinymce.AddOnManager",{AddOnManager:function(){var d=this;d.items=[];d.urls={};d.lookup={};d.onAdd=new a(d)},get:function(d){if(this.lookup[d]){return this.lookup[d].instance}else{return undefined}},dependencies:function(e){var d;if(this.lookup[e]){d=this.lookup[e].dependencies}return d||[]},requireLangPack:function(e){var d=b.settings;if(d&&d.language&&d.language_load!==false){b.ScriptLoader.add(this.urls[e]+"/langs/"+d.language+".js")}},add:function(f,e,d){this.items.push(e);this.lookup[f]={instance:e,dependencies:d};this.onAdd.dispatch(this,f,e);return e},createUrl:function(d,e){if(typeof e==="object"){return e}else{return{prefix:d.prefix,resource:e,suffix:d.suffix}}},addComponents:function(f,d){var e=this.urls[f];b.each(d,function(g){b.ScriptLoader.add(e+"/"+g)})},load:function(j,f,d,h){var g=this,e=f;function i(){var k=g.dependencies(j);b.each(k,function(m){var l=g.createUrl(f,m);g.load(l.resource,l,undefined,undefined)});if(d){if(h){d.call(h)}else{d.call(b.ScriptLoader)}}}if(g.urls[j]){return}if(typeof f==="object"){e=f.prefix+f.resource+f.suffix}if(e.indexOf("/")!=0&&e.indexOf("://")==-1){e=b.baseURL+"/"+e}g.urls[j]=e.substring(0,e.lastIndexOf("/"));if(g.lookup[j]){i()}else{b.ScriptLoader.add(e,i,h)}}});b.PluginManager=new b.AddOnManager();b.ThemeManager=new b.AddOnManager()}(tinymce));(function(j){var g=j.each,d=j.extend,k=j.DOM,i=j.dom.Event,f=j.ThemeManager,b=j.PluginManager,e=j.explode,h=j.util.Dispatcher,a,c=0;j.documentBaseURL=window.location.href.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,"");if(!/[\/\\]$/.test(j.documentBaseURL)){j.documentBaseURL+="/"}j.baseURL=new j.util.URI(j.documentBaseURL).toAbsolute(j.baseURL);j.baseURI=new j.util.URI(j.baseURL);j.onBeforeUnload=new h(j);i.add(window,"beforeunload",function(l){j.onBeforeUnload.dispatch(j,l)});j.onAddEditor=new h(j);j.onRemoveEditor=new h(j);j.EditorManager=d(j,{editors:[],i18n:{},activeEditor:null,init:function(q){var n=this,p,l=j.ScriptLoader,u,o=[],m;function r(x,y,t){var v=x[y];if(!v){return}if(j.is(v,"string")){t=v.replace(/\.\w+$/,"");t=t?j.resolve(t):0;v=j.resolve(v)}return v.apply(t||this,Array.prototype.slice.call(arguments,2))}q=d({theme:"simple",language:"en"},q);n.settings=q;i.add(document,"init",function(){var s,v;r(q,"onpageload");switch(q.mode){case"exact":s=q.elements||"";if(s.length>0){g(e(s),function(x){if(k.get(x)){m=new j.Editor(x,q);o.push(m);m.render(1)}else{g(document.forms,function(y){g(y.elements,function(z){if(z.name===x){x="mce_editor_"+c++;k.setAttrib(z,"id",x);m=new j.Editor(x,q);o.push(m);m.render(1)}})})}})}break;case"textareas":case"specific_textareas":function t(y,x){return x.constructor===RegExp?x.test(y.className):k.hasClass(y,x)}g(k.select("textarea"),function(x){if(q.editor_deselector&&t(x,q.editor_deselector)){return}if(!q.editor_selector||t(x,q.editor_selector)){u=k.get(x.name);if(!x.id&&!u){x.id=x.name}if(!x.id||n.get(x.id)){x.id=k.uniqueId()}m=new j.Editor(x.id,q);o.push(m);m.render(1)}});break}if(q.oninit){s=v=0;g(o,function(x){v++;if(!x.initialized){x.onInit.add(function(){s++;if(s==v){r(q,"oninit")}})}else{s++}if(s==v){r(q,"oninit")}})}})},get:function(l){if(l===a){return this.editors}return this.editors[l]},getInstanceById:function(l){return this.get(l)},add:function(m){var l=this,n=l.editors;n[m.id]=m;n.push(m);l._setActive(m);l.onAddEditor.dispatch(l,m);return m},remove:function(n){var m=this,l,o=m.editors;if(!o[n.id]){return null}delete o[n.id];for(l=0;l<o.length;l++){if(o[l]==n){o.splice(l,1);break}}if(m.activeEditor==n){m._setActive(o[0])}n.destroy();m.onRemoveEditor.dispatch(m,n);return n},execCommand:function(r,p,o){var q=this,n=q.get(o),l;switch(r){case"mceFocus":n.focus();return true;case"mceAddEditor":case"mceAddControl":if(!q.get(o)){new j.Editor(o,q.settings).render()}return true;case"mceAddFrameControl":l=o.window;l.tinyMCE=tinyMCE;l.tinymce=j;j.DOM.doc=l.document;j.DOM.win=l;n=new j.Editor(o.element_id,o);n.render();if(j.isIE){function m(){n.destroy();l.detachEvent("onunload",m);l=l.tinyMCE=l.tinymce=null}l.attachEvent("onunload",m)}o.page_window=null;return true;case"mceRemoveEditor":case"mceRemoveControl":if(n){n.remove()}return true;case"mceToggleEditor":if(!n){q.execCommand("mceAddControl",0,o);return true}if(n.isHidden()){n.show()}else{n.hide()}return true}if(q.activeEditor){return q.activeEditor.execCommand(r,p,o)}return false},execInstanceCommand:function(p,o,n,m){var l=this.get(p);if(l){return l.execCommand(o,n,m)}return false},triggerSave:function(){g(this.editors,function(l){l.save()})},addI18n:function(n,q){var l,m=this.i18n;if(!j.is(n,"string")){g(n,function(r,p){g(r,function(t,s){g(t,function(v,u){if(s==="common"){m[p+"."+u]=v}else{m[p+"."+s+"."+u]=v}})})})}else{g(q,function(r,p){m[n+"."+p]=r})}},_setActive:function(l){this.selectedInstance=this.activeEditor=l}})})(tinymce);(function(m){var n=m.DOM,j=m.dom.Event,f=m.extend,k=m.util.Dispatcher,i=m.each,a=m.isGecko,b=m.isIE,e=m.isWebKit,d=m.is,h=m.ThemeManager,c=m.PluginManager,o=m.inArray,l=m.grep,g=m.explode;m.create("tinymce.Editor",{Editor:function(r,q){var p=this;p.id=p.editorId=r;p.execCommands={};p.queryStateCommands={};p.queryValueCommands={};p.isNotDirty=false;p.plugins={};i(["onPreInit","onBeforeRenderUI","onPostRender","onInit","onRemove","onActivate","onDeactivate","onClick","onEvent","onMouseUp","onMouseDown","onDblClick","onKeyDown","onKeyUp","onKeyPress","onContextMenu","onSubmit","onReset","onPaste","onPreProcess","onPostProcess","onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent","onLoadContent","onSaveContent","onNodeChange","onChange","onBeforeExecCommand","onExecCommand","onUndo","onRedo","onVisualAid","onSetProgressState"],function(s){p[s]=new k(p)});p.settings=q=f({id:r,language:"en",docs_language:"en",theme:"simple",skin:"default",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:m.documentBaseURL,add_form_submit_trigger:1,submit_patch:1,add_unload_trigger:1,convert_urls:1,relative_urls:1,remove_script_host:1,table_inline_editing:0,object_resizing:1,cleanup:1,accessibility_focus:1,custom_shortcuts:1,custom_undo_redo_keyboard_shortcuts:1,custom_undo_redo_restore_selection:1,custom_undo_redo:1,doctype:m.isIE6?'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">':"<!DOCTYPE>",visual_table_class:"mceItemTable",visual:1,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%",apply_source_formatting:1,directionality:"ltr",forced_root_block:"p",hidden_input:1,padd_empty_editor:1,render_ui:1,init_theme:1,force_p_newlines:1,indentation:"30px",keep_styles:1,fix_table_elements:1,inline_styles:1,convert_fonts_to_spans:true,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",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr",validate:true,entity_encoding:"named",url_converter:p.convertURL,url_converter_scope:p,ie7_compat:true},q);p.documentBaseURI=new m.util.URI(q.document_base_url||m.documentBaseURL,{base_uri:tinyMCE.baseURI});p.baseURI=m.baseURI;p.contentCSS=[];p.execCallback("setup",p)},render:function(r){var u=this,v=u.settings,x=u.id,p=m.ScriptLoader;if(!j.domLoaded){j.add(document,"init",function(){u.render()});return}tinyMCE.settings=v;if(!u.getElement()){return}if(m.isIDevice&&!m.isIOS5){return}if(!/TEXTAREA|INPUT/i.test(u.getElement().nodeName)&&v.hidden_input&&n.getParent(x,"form")){n.insertAfter(n.create("input",{type:"hidden",name:x}),x)}if(m.WindowManager){u.windowManager=new m.WindowManager(u)}if(v.encoding=="xml"){u.onGetContent.add(function(s,t){if(t.save){t.content=n.encode(t.content)}})}if(v.add_form_submit_trigger){u.onSubmit.addToTop(function(){if(u.initialized){u.save();u.isNotDirty=1}})}if(v.add_unload_trigger){u._beforeUnload=tinyMCE.onBeforeUnload.add(function(){if(u.initialized&&!u.destroyed&&!u.isHidden()){u.save({format:"raw",no_events:true})}})}m.addUnload(u.destroy,u);if(v.submit_patch){u.onBeforeRenderUI.add(function(){var s=u.getElement().form;if(!s){return}if(s._mceOldSubmit){return}if(!s.submit.nodeType&&!s.submit.length){u.formElement=s;s._mceOldSubmit=s.submit;s.submit=function(){m.triggerSave();u.isNotDirty=1;return u.formElement._mceOldSubmit(u.formElement)}}s=null})}function q(){if(v.language&&v.language_load!==false){p.add(m.baseURL+"/langs/"+v.language+".js")}if(v.theme&&v.theme.charAt(0)!="-"&&!h.urls[v.theme]){h.load(v.theme,"themes/"+v.theme+"/editor_template"+m.suffix+".js")}i(g(v.plugins),function(t){if(t&&!c.urls[t]){if(t.charAt(0)=="-"){t=t.substr(1,t.length);var s=c.dependencies(t);i(s,function(z){var y={prefix:"plugins/",resource:z,suffix:"/editor_plugin"+m.suffix+".js"};var z=c.createUrl(y,z);c.load(z.resource,z)})}else{if(t=="safari"){return}c.load(t,{prefix:"plugins/",resource:t,suffix:"/editor_plugin"+m.suffix+".js"})}}});p.loadQueue(function(){if(!u.removed){u.init()}})}q()},init:function(){var r,H=this,I=H.settings,E,A,D=H.getElement(),q,p,F,y,C,G,z,v=[];m.add(H);I.aria_label=I.aria_label||n.getAttrib(D,"aria-label",H.getLang("aria.rich_text_area"));if(I.theme){I.theme=I.theme.replace(/-/,"");q=h.get(I.theme);H.theme=new q();if(H.theme.init&&I.init_theme){H.theme.init(H,h.urls[I.theme]||m.documentBaseURL.replace(/\/$/,""))}}function B(J){var K=c.get(J),t=c.urls[J]||m.documentBaseURL.replace(/\/$/,""),s;if(K&&m.inArray(v,J)===-1){i(c.dependencies(J),function(u){B(u)});s=new K(H,t);H.plugins[J]=s;if(s.init){s.init(H,t);v.push(J)}}}i(g(I.plugins.replace(/\-/g,"")),B);if(I.popup_css!==false){if(I.popup_css){I.popup_css=H.documentBaseURI.toAbsolute(I.popup_css)}else{I.popup_css=H.baseURI.toAbsolute("themes/"+I.theme+"/skins/"+I.skin+"/dialog.css")}}if(I.popup_css_add){I.popup_css+=","+H.documentBaseURI.toAbsolute(I.popup_css_add)}H.controlManager=new m.ControlManager(H);if(I.custom_undo_redo){H.onBeforeExecCommand.add(function(t,J,u,K,s){if(J!="Undo"&&J!="Redo"&&J!="mceRepaint"&&(!s||!s.skip_undo)){H.undoManager.beforeChange()}});H.onExecCommand.add(function(t,J,u,K,s){if(J!="Undo"&&J!="Redo"&&J!="mceRepaint"&&(!s||!s.skip_undo)){H.undoManager.add()}})}H.onExecCommand.add(function(s,t){if(!/^(FontName|FontSize)$/.test(t)){H.nodeChanged()}});if(a){function x(s,t){if(!t||!t.initial){H.execCommand("mceRepaint")}}H.onUndo.add(x);H.onRedo.add(x);H.onSetContent.add(x)}H.onBeforeRenderUI.dispatch(H,H.controlManager);if(I.render_ui){E=I.width||D.style.width||D.offsetWidth;A=I.height||D.style.height||D.offsetHeight;H.orgDisplay=D.style.display;G=/^[0-9\.]+(|px)$/i;if(G.test(""+E)){E=Math.max(parseInt(E)+(q.deltaWidth||0),100)}if(G.test(""+A)){A=Math.max(parseInt(A)+(q.deltaHeight||0),100)}q=H.theme.renderUI({targetNode:D,width:E,height:A,deltaWidth:I.delta_width,deltaHeight:I.delta_height});H.editorContainer=q.editorContainer}if(document.domain&&location.hostname!=document.domain){m.relaxedDomain=document.domain}n.setStyles(q.sizeContainer||q.editorContainer,{width:E,height:A});if(I.content_css){m.each(g(I.content_css),function(s){H.contentCSS.push(H.documentBaseURI.toAbsolute(s))})}A=(q.iframeHeight||A)+(typeof(A)=="number"?(q.deltaHeight||0):"");if(A<100){A=100}H.iframeHTML=I.doctype+'<html><head xmlns="http://www.w3.org/1999/xhtml">';if(I.document_base_url!=m.documentBaseURL){H.iframeHTML+='<base href="'+H.documentBaseURI.getURI()+'" />'}if(I.ie7_compat){H.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=7" />'}else{H.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=edge" />'}H.iframeHTML+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';for(z=0;z<H.contentCSS.length;z++){H.iframeHTML+='<link type="text/css" rel="stylesheet" href="'+H.contentCSS[z]+'" />'}y=I.body_id||"tinymce";if(y.indexOf("=")!=-1){y=H.getParam("body_id","","hash");y=y[H.id]||y}C=I.body_class||"";if(C.indexOf("=")!=-1){C=H.getParam("body_class","","hash");C=C[H.id]||""}H.iframeHTML+='</head><body id="'+y+'" class="mceContentBody '+C+'"><br></body></html>';if(m.relaxedDomain&&(b||(m.isOpera&&parseFloat(opera.version())<11))){F='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinyMCE.get("'+H.id+'");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()'}r=n.add(q.iframeContainer,"iframe",{id:H.id+"_ifr",src:F||'javascript:""',frameBorder:"0",allowTransparency:"true",title:I.aria_label,style:{width:"100%",height:A,display:"block"}});H.contentAreaContainer=q.iframeContainer;n.get(q.editorContainer).style.display=H.orgDisplay;n.get(H.id).style.display="none";n.setAttrib(H.id,"aria-hidden",true);if(!m.relaxedDomain||!F){H.setupIframe()}D=r=q=null},setupIframe:function(){var q=this,v=q.settings,x=n.get(q.id),y=q.getDoc(),u,p;if(!b||!m.relaxedDomain){y.open();y.write(q.iframeHTML);y.close();if(m.relaxedDomain){y.domain=m.relaxedDomain}}p=q.getBody();p.disabled=true;if(!v.readonly){p.contentEditable=true}p.disabled=false;q.schema=new m.html.Schema(v);q.dom=new m.dom.DOMUtils(q.getDoc(),{keep_values:true,url_converter:q.convertURL,url_converter_scope:q,hex_colors:v.force_hex_style_colors,class_filter:v.class_filter,update_styles:1,fix_ie_paragraphs:1,schema:q.schema});q.parser=new m.html.DomParser(v,q.schema);if(!q.settings.allow_html_in_named_anchor){q.parser.addAttributeFilter("name",function(s,t){var A=s.length,C,z,B,D;while(A--){D=s[A];if(D.name==="a"&&D.firstChild){B=D.parent;C=D.lastChild;do{z=C.prev;B.insert(C,D);C=z}while(C)}}})}q.parser.addAttributeFilter("src,href,style",function(s,t){var z=s.length,B,D=q.dom,C,A;while(z--){B=s[z];C=B.attr(t);A="data-mce-"+t;if(!B.attributes.map[A]){if(t==="style"){B.attr(A,D.serializeStyle(D.parseStyle(C),B.name))}else{B.attr(A,q.convertURL(C,t,B.name))}}}});q.parser.addNodeFilter("script",function(s,t){var z=s.length,A;while(z--){A=s[z];A.attr("type","mce-"+(A.attr("type")||"text/javascript"))}});q.parser.addNodeFilter("#cdata",function(s,t){var z=s.length,A;while(z--){A=s[z];A.type=8;A.name="#comment";A.value="[CDATA["+A.value+"]]"}});q.parser.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(t,z){var A=t.length,B,s=q.schema.getNonEmptyElements();while(A--){B=t[A];if(B.isEmpty(s)){B.empty().append(new m.html.Node("br",1)).shortEnded=true}}});q.serializer=new m.dom.Serializer(v,q.dom,q.schema);q.selection=new m.dom.Selection(q.dom,q.getWin(),q.serializer);q.formatter=new m.Formatter(this);q.formatter.register({alignleft:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"left"}},{selector:"img,table",collapsed:false,styles:{"float":"left"}}],aligncenter:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"center"}},{selector:"img",collapsed:false,styles:{display:"block",marginLeft:"auto",marginRight:"auto"}},{selector:"table",collapsed:false,styles:{marginLeft:"auto",marginRight:"auto"}}],alignright:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"right"}},{selector:"img,table",collapsed:false,styles:{"float":"right"}}],alignfull:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"justify"}}],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:true},{inline:"u",remove:"all"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:true},{inline:"strike",remove:"all"}],forecolor:{inline:"span",styles:{color:"%value"},wrap_links:false},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},wrap_links:false},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"},link:{inline:"a",selector:"a",remove:"all",split:true,deep:true,onmatch:function(s){return true},onformat:function(z,s,t){i(t,function(B,A){q.dom.setAttrib(z,A,B)})}},removeformat:[{selector:"b,strong,em,i,font,u,strike",remove:"all",split:true,expand:false,block_expand:true,deep:true},{selector:"span",attributes:["style","class"],remove:"empty",split:true,expand:false,deep:true},{selector:"*",attributes:["style","class"],split:false,expand:false,deep:true}]});i("p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp".split(/\s/),function(s){q.formatter.register(s,{block:s,remove:"all"})});q.formatter.register(q.settings.formats);q.undoManager=new m.UndoManager(q);q.undoManager.onAdd.add(function(t,s){if(t.hasUndo()){return q.onChange.dispatch(q,s,t)}});q.undoManager.onUndo.add(function(t,s){return q.onUndo.dispatch(q,s,t)});q.undoManager.onRedo.add(function(t,s){return q.onRedo.dispatch(q,s,t)});q.forceBlocks=new m.ForceBlocks(q,{forced_root_block:v.forced_root_block});q.editorCommands=new m.EditorCommands(q);q.serializer.onPreProcess.add(function(s,t){return q.onPreProcess.dispatch(q,t,s)});q.serializer.onPostProcess.add(function(s,t){return q.onPostProcess.dispatch(q,t,s)});q.onPreInit.dispatch(q);if(!v.gecko_spellcheck){q.getBody().spellcheck=0}if(!v.readonly){q._addEvents()}q.controlManager.onPostRender.dispatch(q,q.controlManager);q.onPostRender.dispatch(q);q.quirks=new m.util.Quirks(this);if(v.directionality){q.getBody().dir=v.directionality}if(v.nowrap){q.getBody().style.whiteSpace="nowrap"}if(v.handle_node_change_callback){q.onNodeChange.add(function(t,s,z){q.execCallback("handle_node_change_callback",q.id,z,-1,-1,true,q.selection.isCollapsed())})}if(v.save_callback){q.onSaveContent.add(function(s,z){var t=q.execCallback("save_callback",q.id,z.content,q.getBody());if(t){z.content=t}})}if(v.onchange_callback){q.onChange.add(function(t,s){q.execCallback("onchange_callback",q,s)})}if(v.protect){q.onBeforeSetContent.add(function(s,t){if(v.protect){i(v.protect,function(z){t.content=t.content.replace(z,function(A){return"<!--mce:protected "+escape(A)+"-->"})})}})}if(v.convert_newlines_to_brs){q.onBeforeSetContent.add(function(s,t){if(t.initial){t.content=t.content.replace(/\r?\n/g,"<br />")}})}if(v.preformatted){q.onPostProcess.add(function(s,t){t.content=t.content.replace(/^\s*<pre.*?>/,"");t.content=t.content.replace(/<\/pre>\s*$/,"");if(t.set){t.content='<pre class="mceItemHidden">'+t.content+"</pre>"}})}if(v.verify_css_classes){q.serializer.attribValueFilter=function(B,z){var A,t;if(B=="class"){if(!q.classesRE){t=q.dom.getClasses();if(t.length>0){A="";i(t,function(s){A+=(A?"|":"")+s["class"]});q.classesRE=new RegExp("("+A+")","gi")}}return !q.classesRE||/(\bmceItem\w+\b|\bmceTemp\w+\b)/g.test(z)||q.classesRE.test(z)?z:""}return z}}if(v.cleanup_callback){q.onBeforeSetContent.add(function(s,t){t.content=q.execCallback("cleanup_callback","insert_to_editor",t.content,t)});q.onPreProcess.add(function(s,t){if(t.set){q.execCallback("cleanup_callback","insert_to_editor_dom",t.node,t)}if(t.get){q.execCallback("cleanup_callback","get_from_editor_dom",t.node,t)}});q.onPostProcess.add(function(s,t){if(t.set){t.content=q.execCallback("cleanup_callback","insert_to_editor",t.content,t)}if(t.get){t.content=q.execCallback("cleanup_callback","get_from_editor",t.content,t)}})}if(v.save_callback){q.onGetContent.add(function(s,t){if(t.save){t.content=q.execCallback("save_callback",q.id,t.content,q.getBody())}})}if(v.handle_event_callback){q.onEvent.add(function(s,t,z){if(q.execCallback("handle_event_callback",t,s,z)===false){j.cancel(t)}})}q.onSetContent.add(function(){q.addVisual(q.getBody())});if(v.padd_empty_editor){q.onPostProcess.add(function(s,t){t.content=t.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/,"")})}if(a){function r(s,t){i(s.dom.select("a"),function(A){var z=A.parentNode;if(s.dom.isBlock(z)&&z.lastChild===A){s.dom.add(z,"br",{"data-mce-bogus":1})}})}q.onExecCommand.add(function(s,t){if(t==="CreateLink"){r(s)}});q.onSetContent.add(q.selection.onSetContent.add(r))}q.load({initial:true,format:"html"});q.startContent=q.getContent({format:"raw"});q.undoManager.add();q.initialized=true;q.onInit.dispatch(q);q.execCallback("setupcontent_callback",q.id,q.getBody(),q.getDoc());q.execCallback("init_instance_callback",q);q.focus(true);q.nodeChanged({initial:1});i(q.contentCSS,function(s){q.dom.loadCSS(s)});if(v.auto_focus){setTimeout(function(){var s=m.get(v.auto_focus);s.selection.select(s.getBody(),1);s.selection.collapse(1);s.getBody().focus();s.getWin().focus()},100)}x=null},focus:function(u){var y,q=this,s=q.selection,x=q.settings.content_editable,r,p,v=q.getDoc();if(!u){r=s.getRng();if(r.item){p=r.item(0)}q._refreshContentEditable();s.normalize();if(!x){q.getWin().focus()}if(m.isGecko){q.getBody().focus()}if(p&&p.ownerDocument==v){r=v.body.createControlRange();r.addElement(p);r.select()}}if(m.activeEditor!=q){if((y=m.activeEditor)!=null){y.onDeactivate.dispatch(y,q)}q.onActivate.dispatch(q,y)}m._setActive(q)},execCallback:function(u){var p=this,r=p.settings[u],q;if(!r){return}if(p.callbackLookup&&(q=p.callbackLookup[u])){r=q.func;q=q.scope}if(d(r,"string")){q=r.replace(/\.\w+$/,"");q=q?m.resolve(q):0;r=m.resolve(r);p.callbackLookup=p.callbackLookup||{};p.callbackLookup[u]={func:r,scope:q}}return r.apply(q||p,Array.prototype.slice.call(arguments,1))},translate:function(p){var r=this.settings.language||"en",q=m.i18n;if(!p){return""}return q[r+"."+p]||p.replace(/{\#([^}]+)\}/g,function(t,s){return q[r+"."+s]||"{#"+s+"}"})},getLang:function(q,p){return m.i18n[(this.settings.language||"en")+"."+q]||(d(p)?p:"{#"+q+"}")},getParam:function(u,r,p){var s=m.trim,q=d(this.settings[u])?this.settings[u]:r,t;if(p==="hash"){t={};if(d(q,"string")){i(q.indexOf("=")>0?q.split(/[;,](?![^=;,]*(?:[;,]|$))/):q.split(","),function(x){x=x.split("=");if(x.length>1){t[s(x[0])]=s(x[1])}else{t[s(x[0])]=s(x)}})}else{t=q}return t}return q},nodeChanged:function(r){var p=this,q=p.selection,u=q.getStart()||p.getBody();if(p.initialized){r=r||{};u=b&&u.ownerDocument!=p.getDoc()?p.getBody():u;r.parents=[];p.dom.getParent(u,function(s){if(s.nodeName=="BODY"){return true}r.parents.push(s)});p.onNodeChange.dispatch(p,r?r.controlManager||p.controlManager:p.controlManager,u,q.isCollapsed(),r)}},addButton:function(r,q){var p=this;p.buttons=p.buttons||{};p.buttons[r]=q},addCommand:function(p,r,q){this.execCommands[p]={func:r,scope:q||this}},addQueryStateHandler:function(p,r,q){this.queryStateCommands[p]={func:r,scope:q||this}},addQueryValueHandler:function(p,r,q){this.queryValueCommands[p]={func:r,scope:q||this}},addShortcut:function(r,u,p,s){var q=this,v;if(!q.settings.custom_shortcuts){return false}q.shortcuts=q.shortcuts||{};if(d(p,"string")){v=p;p=function(){q.execCommand(v,false,null)}}if(d(p,"object")){v=p;p=function(){q.execCommand(v[0],v[1],v[2])}}i(g(r),function(t){var x={func:p,scope:s||this,desc:u,alt:false,ctrl:false,shift:false};i(g(t,"+"),function(y){switch(y){case"alt":case"ctrl":case"shift":x[y]=true;break;default:x.charCode=y.charCodeAt(0);x.keyCode=y.toUpperCase().charCodeAt(0)}});q.shortcuts[(x.ctrl?"ctrl":"")+","+(x.alt?"alt":"")+","+(x.shift?"shift":"")+","+x.keyCode]=x});return true},execCommand:function(x,v,z,p){var r=this,u=0,y,q;if(!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(x)&&(!p||!p.skip_focus)){r.focus()}y={};r.onBeforeExecCommand.dispatch(r,x,v,z,y);if(y.terminate){return false}if(r.execCallback("execcommand_callback",r.id,r.selection.getNode(),x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(y=r.execCommands[x]){q=y.func.call(y.scope,v,z);if(q!==true){r.onExecCommand.dispatch(r,x,v,z,p);return q}}i(r.plugins,function(s){if(s.execCommand&&s.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);u=1;return false}});if(u){return true}if(r.theme&&r.theme.execCommand&&r.theme.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(r.editorCommands.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}r.getDoc().execCommand(x,v,z);r.onExecCommand.dispatch(r,x,v,z,p)},queryCommandState:function(u){var q=this,v,r;if(q._isHidden()){return}if(v=q.queryStateCommands[u]){r=v.func.call(v.scope);if(r!==true){return r}}v=q.editorCommands.queryCommandState(u);if(v!==-1){return v}try{return this.getDoc().queryCommandState(u)}catch(p){}},queryCommandValue:function(v){var q=this,u,r;if(q._isHidden()){return}if(u=q.queryValueCommands[v]){r=u.func.call(u.scope);if(r!==true){return r}}u=q.editorCommands.queryCommandValue(v);if(d(u)){return u}try{return this.getDoc().queryCommandValue(v)}catch(p){}},show:function(){var p=this;n.show(p.getContainer());n.hide(p.id);p.load()},hide:function(){var p=this,q=p.getDoc();if(b&&q){q.execCommand("SelectAll")}p.save();n.hide(p.getContainer());n.setStyle(p.id,"display",p.orgDisplay)},isHidden:function(){return !n.isHidden(this.id)},setProgressState:function(p,q,r){this.onSetProgressState.dispatch(this,p,q,r);return p},load:function(s){var p=this,r=p.getElement(),q;if(r){s=s||{};s.load=true;q=p.setContent(d(r.value)?r.value:r.innerHTML,s);s.element=r;if(!s.no_events){p.onLoadContent.dispatch(p,s)}s.element=r=null;return q}},save:function(u){var p=this,s=p.getElement(),q,r;if(!s||!p.initialized){return}u=u||{};u.save=true;if(!u.no_events){p.undoManager.typing=false;p.undoManager.add()}u.element=s;q=u.content=p.getContent(u);if(!u.no_events){p.onSaveContent.dispatch(p,u)}q=u.content;if(!/TEXTAREA|INPUT/i.test(s.nodeName)){s.innerHTML=q;if(r=n.getParent(p.id,"form")){i(r.elements,function(t){if(t.name==p.id){t.value=q;return false}})}}else{s.value=q}u.element=s=null;return q},setContent:function(u,s){var r=this,q,p=r.getBody(),t;s=s||{};s.format=s.format||"html";s.set=true;s.content=u;if(!s.no_events){r.onBeforeSetContent.dispatch(r,s)}u=s.content;if(!m.isIE&&(u.length===0||/^\s+$/.test(u))){t=r.settings.forced_root_block;if(t){u="<"+t+'><br data-mce-bogus="1"></'+t+">"}else{u='<br data-mce-bogus="1">'}p.innerHTML=u;r.selection.select(p,true);r.selection.collapse(true);return}if(s.format!=="raw"){u=new m.html.Serializer({},r.schema).serialize(r.parser.parse(u))}s.content=m.trim(u);r.dom.setHTML(p,s.content);if(!s.no_events){r.onSetContent.dispatch(r,s)}r.selection.normalize();return s.content},getContent:function(q){var p=this,r;q=q||{};q.format=q.format||"html";q.get=true;if(!q.no_events){p.onBeforeGetContent.dispatch(p,q)}if(q.format=="raw"){r=p.getBody().innerHTML}else{r=p.serializer.serialize(p.getBody(),q)}q.content=m.trim(r);if(!q.no_events){p.onGetContent.dispatch(p,q)}return q.content},isDirty:function(){var p=this;return m.trim(p.startContent)!=m.trim(p.getContent({format:"raw",no_events:1}))&&!p.isNotDirty},getContainer:function(){var p=this;if(!p.container){p.container=n.get(p.editorContainer||p.id+"_parent")}return p.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return n.get(this.settings.content_element||this.id)},getWin:function(){var p=this,q;if(!p.contentWindow){q=n.get(p.id+"_ifr");if(q){p.contentWindow=q.contentWindow}}return p.contentWindow},getDoc:function(){var q=this,p;if(!q.contentDocument){p=q.getWin();if(p){q.contentDocument=p.document}}return q.contentDocument},getBody:function(){return this.bodyElement||this.getDoc().body},convertURL:function(p,x,v){var q=this,r=q.settings;if(r.urlconverter_callback){return q.execCallback("urlconverter_callback",p,v,true,x)}if(!r.convert_urls||(v&&v.nodeName=="LINK")||p.indexOf("file:")===0){return p}if(r.relative_urls){return q.documentBaseURI.toRelative(p)}p=q.documentBaseURI.toAbsolute(p,r.remove_script_host);return p},addVisual:function(r){var p=this,q=p.settings;r=r||p.getBody();if(!d(p.hasVisual)){p.hasVisual=q.visual}i(p.dom.select("table,a",r),function(t){var s;switch(t.nodeName){case"TABLE":s=p.dom.getAttrib(t,"border");if(!s||s=="0"){if(p.hasVisual){p.dom.addClass(t,q.visual_table_class)}else{p.dom.removeClass(t,q.visual_table_class)}}return;case"A":s=p.dom.getAttrib(t,"name");if(s){if(p.hasVisual){p.dom.addClass(t,"mceItemAnchor")}else{p.dom.removeClass(t,"mceItemAnchor")}}return}});p.onVisualAid.dispatch(p,r,p.hasVisual)},remove:function(){var p=this,q=p.getContainer();p.removed=1;p.hide();p.execCallback("remove_instance_callback",p);p.onRemove.dispatch(p);p.onExecCommand.listeners=[];m.remove(p);n.remove(q)},destroy:function(q){var p=this;if(p.destroyed){return}if(!q){m.removeUnload(p.destroy);tinyMCE.onBeforeUnload.remove(p._beforeUnload);if(p.theme&&p.theme.destroy){p.theme.destroy()}p.controlManager.destroy();p.selection.destroy();p.dom.destroy();if(!p.settings.content_editable){j.clear(p.getWin());j.clear(p.getDoc())}j.clear(p.getBody());j.clear(p.formElement)}if(p.formElement){p.formElement.submit=p.formElement._mceOldSubmit;p.formElement._mceOldSubmit=null}p.contentAreaContainer=p.formElement=p.container=p.settings.content_element=p.bodyElement=p.contentDocument=p.contentWindow=null;if(p.selection){p.selection=p.selection.win=p.selection.dom=p.selection.dom.doc=null}p.destroyed=1},_addEvents:function(){var B=this,r,C=B.settings,q=B.dom,x={mouseup:"onMouseUp",mousedown:"onMouseDown",click:"onClick",keyup:"onKeyUp",keydown:"onKeyDown",keypress:"onKeyPress",submit:"onSubmit",reset:"onReset",contextmenu:"onContextMenu",dblclick:"onDblClick",paste:"onPaste"};function p(t,D){var s=t.type;if(B.removed){return}if(B.onEvent.dispatch(B,t,D)!==false){B[x[t.fakeType||t.type]].dispatch(B,t,D)}}i(x,function(t,s){switch(s){case"contextmenu":q.bind(B.getDoc(),s,p);break;case"paste":q.bind(B.getBody(),s,function(D){p(D)});break;case"submit":case"reset":q.bind(B.getElement().form||n.getParent(B.id,"form"),s,p);break;default:q.bind(C.content_editable?B.getBody():B.getDoc(),s,p)}});q.bind(C.content_editable?B.getBody():(a?B.getDoc():B.getWin()),"focus",function(s){B.focus(true)});if(m.isGecko){q.bind(B.getDoc(),"DOMNodeInserted",function(t){var s;t=t.target;if(t.nodeType===1&&t.nodeName==="IMG"&&(s=t.getAttribute("data-mce-src"))){t.src=B.documentBaseURI.toAbsolute(s)}})}if(a){function u(){var E=this,G=E.getDoc(),F=E.settings;if(a&&!F.readonly){E._refreshContentEditable();try{G.execCommand("styleWithCSS",0,false)}catch(D){if(!E._isHidden()){try{G.execCommand("useCSS",0,true)}catch(D){}}}if(!F.table_inline_editing){try{G.execCommand("enableInlineTableEditing",false,false)}catch(D){}}if(!F.object_resizing){try{G.execCommand("enableObjectResizing",false,false)}catch(D){}}}}B.onBeforeExecCommand.add(u);B.onMouseDown.add(u)}B.onMouseUp.add(B.nodeChanged);B.onKeyUp.add(function(s,t){var D=t.keyCode;if((D>=33&&D<=36)||(D>=37&&D<=40)||D==13||D==45||D==46||D==8||(m.isMac&&(D==91||D==93))||t.ctrlKey){B.nodeChanged()}});B.onKeyDown.add(function(t,D){if(D.keyCode!=8){return}var F=t.selection.getRng().startContainer;var E=t.selection.getRng().startOffset;while(F&&F.nodeType&&F.nodeType!=1&&F.parentNode){F=F.parentNode}if(F&&F.parentNode&&F.parentNode.tagName==="BLOCKQUOTE"&&F.parentNode.firstChild==F&&E==0){t.formatter.toggle("blockquote",null,F.parentNode);var s=t.selection.getRng();s.setStart(F,0);s.setEnd(F,0);t.selection.setRng(s);t.selection.collapse(false)}});B.onReset.add(function(){B.setContent(B.startContent,{format:"raw"})});if(C.custom_shortcuts){if(C.custom_undo_redo_keyboard_shortcuts){B.addShortcut("ctrl+z",B.getLang("undo_desc"),"Undo");B.addShortcut("ctrl+y",B.getLang("redo_desc"),"Redo")}B.addShortcut("ctrl+b",B.getLang("bold_desc"),"Bold");B.addShortcut("ctrl+i",B.getLang("italic_desc"),"Italic");B.addShortcut("ctrl+u",B.getLang("underline_desc"),"Underline");for(r=1;r<=6;r++){B.addShortcut("ctrl+"+r,"",["FormatBlock",false,"h"+r])}B.addShortcut("ctrl+7","",["FormatBlock",false,"p"]);B.addShortcut("ctrl+8","",["FormatBlock",false,"div"]);B.addShortcut("ctrl+9","",["FormatBlock",false,"address"]);function v(t){var s=null;if(!t.altKey&&!t.ctrlKey&&!t.metaKey){return s}i(B.shortcuts,function(D){if(m.isMac&&D.ctrl!=t.metaKey){return}else{if(!m.isMac&&D.ctrl!=t.ctrlKey){return}}if(D.alt!=t.altKey){return}if(D.shift!=t.shiftKey){return}if(t.keyCode==D.keyCode||(t.charCode&&t.charCode==D.charCode)){s=D;return false}});return s}B.onKeyUp.add(function(s,t){var D=v(t);if(D){return j.cancel(t)}});B.onKeyPress.add(function(s,t){var D=v(t);if(D){return j.cancel(t)}});B.onKeyDown.add(function(s,t){var D=v(t);if(D){D.func.call(D.scope);return j.cancel(t)}})}if(m.isIE){q.bind(B.getDoc(),"controlselect",function(D){var t=B.resizeInfo,s;D=D.target;if(D.nodeName!=="IMG"){return}if(t){q.unbind(t.node,t.ev,t.cb)}if(!q.hasClass(D,"mceItemNoResize")){ev="resizeend";s=q.bind(D,ev,function(F){var E;F=F.target;if(E=q.getStyle(F,"width")){q.setAttrib(F,"width",E.replace(/[^0-9%]+/g,""));q.setStyle(F,"width","")}if(E=q.getStyle(F,"height")){q.setAttrib(F,"height",E.replace(/[^0-9%]+/g,""));q.setStyle(F,"height","")}})}else{ev="resizestart";s=q.bind(D,"resizestart",j.cancel,j)}t=B.resizeInfo={node:D,ev:ev,cb:s}})}if(m.isOpera){B.onClick.add(function(s,t){j.prevent(t)})}if(C.custom_undo_redo){function y(){B.undoManager.typing=false;B.undoManager.add()}q.bind(B.getDoc(),"focusout",function(s){if(!B.removed&&B.undoManager.typing){y()}});B.dom.bind(B.dom.getRoot(),"dragend",function(s){y()});B.onKeyUp.add(function(s,D){var t=D.keyCode;if((t>=33&&t<=36)||(t>=37&&t<=40)||t==13||t==45||D.ctrlKey){y()}});B.onKeyDown.add(function(s,E){var D=E.keyCode,t;if(D==8){t=B.getDoc().selection;if(t&&t.createRange&&t.createRange().item){B.undoManager.beforeChange();s.dom.remove(t.createRange().item(0));y();return j.cancel(E)}}if((D>=33&&D<=36)||(D>=37&&D<=40)||D==13||D==45){if(m.isIE&&D==13){B.undoManager.beforeChange()}if(B.undoManager.typing){y()}return}if((D<16||D>20)&&D!=224&&D!=91&&!B.undoManager.typing){B.undoManager.beforeChange();B.undoManager.typing=true;B.undoManager.add()}});B.onMouseDown.add(function(){if(B.undoManager.typing){y()}})}if(m.isGecko){function A(){var s=B.dom.getAttribs(B.selection.getStart().cloneNode(false));return function(){var t=B.selection.getStart();if(t!==B.getBody()){B.dom.setAttrib(t,"style",null);i(s,function(D){t.setAttributeNode(D.cloneNode(true))})}}}function z(){var t=B.selection;return !t.isCollapsed()&&t.getStart()!=t.getEnd()}B.onKeyPress.add(function(s,D){var t;if((D.keyCode==8||D.keyCode==46)&&z()){t=A();B.getDoc().execCommand("delete",false,null);t();return j.cancel(D)}});B.dom.bind(B.getDoc(),"cut",function(t){var s;if(z()){s=A();B.onKeyUp.addToTop(j.cancel,j);setTimeout(function(){s();B.onKeyUp.remove(j.cancel,j)},0)}})}},_refreshContentEditable:function(){var q=this,p,r;if(q._isHidden()){p=q.getBody();r=p.parentNode;r.removeChild(p);r.appendChild(p);p.focus()}},_isHidden:function(){var p;if(!a){return 0}p=this.selection.getSel();return(!p||!p.rangeCount||p.rangeCount==0)}})})(tinymce);(function(c){var d=c.each,e,a=true,b=false;c.EditorCommands=function(n){var m=n.dom,p=n.selection,j={state:{},exec:{},value:{}},k=n.settings,q=n.formatter,o;function r(z,y,x){var v;z=z.toLowerCase();if(v=j.exec[z]){v(z,y,x);return a}return b}function l(x){var v;x=x.toLowerCase();if(v=j.state[x]){return v(x)}return -1}function h(x){var v;x=x.toLowerCase();if(v=j.value[x]){return v(x)}return b}function u(v,x){x=x||"exec";d(v,function(z,y){d(y.toLowerCase().split(","),function(A){j[x][A]=z})})}c.extend(this,{execCommand:r,queryCommandState:l,queryCommandValue:h,addCommands:u});function f(y,x,v){if(x===e){x=b}if(v===e){v=null}return n.getDoc().execCommand(y,x,v)}function t(v){return q.match(v)}function s(v,x){q.toggle(v,x?{value:x}:e)}function i(v){o=p.getBookmark(v)}function g(){p.moveToBookmark(o)}u({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){n.undoManager.add()},"Cut,Copy,Paste":function(z){var y=n.getDoc(),v;try{f(z)}catch(x){v=a}if(v||!y.queryCommandSupported(z)){if(c.isGecko){n.windowManager.confirm(n.getLang("clipboard_msg"),function(A){if(A){open("http://www.mozilla.org/editor/midasdemo/securityprefs.html","_blank")}})}else{n.windowManager.alert(n.getLang("clipboard_no_support"))}}},unlink:function(v){if(p.isCollapsed()){p.select(p.getNode())}f(v);p.collapse(b)},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(v){var x=v.substring(7);d("left,center,right,full".split(","),function(y){if(x!=y){q.remove("align"+y)}});s("align"+x);r("mceRepaint")},"InsertUnorderedList,InsertOrderedList":function(y){var v,x;f(y);v=m.getParent(p.getNode(),"ol,ul");if(v){x=v.parentNode;if(/^(H[1-6]|P|ADDRESS|PRE)$/.test(x.nodeName)){i();m.split(x,v);g()}}},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(v){s(v)},"ForeColor,HiliteColor,FontName":function(y,x,v){s(y,v)},FontSize:function(z,y,x){var v,A;if(x>=1&&x<=7){A=c.explode(k.font_size_style_values);v=c.explode(k.font_size_classes);if(v){x=v[x-1]||x}else{x=A[x-1]||x}}s(z,x)},RemoveFormat:function(v){q.remove(v)},mceBlockQuote:function(v){s("blockquote")},FormatBlock:function(y,x,v){return s(v||"p")},mceCleanup:function(){var v=p.getBookmark();n.setContent(n.getContent({cleanup:a}),{cleanup:a});p.moveToBookmark(v)},mceRemoveNode:function(z,y,x){var v=x||p.getNode();if(v!=n.getBody()){i();n.dom.remove(v,a);g()}},mceSelectNodeDepth:function(z,y,x){var v=0;m.getParent(p.getNode(),function(A){if(A.nodeType==1&&v++==x){p.select(A);return b}},n.getBody())},mceSelectNode:function(y,x,v){p.select(v)},mceInsertContent:function(B,I,K){var y,J,E,z,F,G,D,C,L,x,A,M,v,H;y=n.parser;J=new c.html.Serializer({},n.schema);v='<span id="mce_marker" data-mce-type="bookmark">\uFEFF</span>';G={content:K,format:"html"};p.onBeforeSetContent.dispatch(p,G);K=G.content;if(K.indexOf("{$caret}")==-1){K+="{$caret}"}K=K.replace(/\{\$caret\}/,v);if(!p.isCollapsed()){n.getDoc().execCommand("Delete",false,null)}E=p.getNode();G={context:E.nodeName.toLowerCase()};F=y.parse(K,G);A=F.lastChild;if(A.attr("id")=="mce_marker"){D=A;for(A=A.prev;A;A=A.walk(true)){if(A.type==3||!m.isBlock(A.name)){A.parent.insert(D,A,A.name==="br");break}}}if(!G.invalid){K=J.serialize(F);A=E.firstChild;M=E.lastChild;if(!A||(A===M&&A.nodeName==="BR")){m.setHTML(E,K)}else{p.setContent(K)}}else{p.setContent(v);E=n.selection.getNode();z=n.getBody();if(E.nodeType==9){E=A=z}else{A=E}while(A!==z){E=A;A=A.parentNode}K=E==z?z.innerHTML:m.getOuterHTML(E);K=J.serialize(y.parse(K.replace(/<span (id="mce_marker"|id=mce_marker).+?<\/span>/i,function(){return J.serialize(F)})));if(E==z){m.setHTML(z,K)}else{m.setOuterHTML(E,K)}}D=m.get("mce_marker");C=m.getRect(D);L=m.getViewPort(n.getWin());if((C.y+C.h>L.y+L.h||C.y<L.y)||(C.x>L.x+L.w||C.x<L.x)){H=c.isIE?n.getDoc().documentElement:n.getBody();H.scrollLeft=C.x;H.scrollTop=C.y-L.h+25}x=m.createRng();A=D.previousSibling;if(A&&A.nodeType==3){x.setStart(A,A.nodeValue.length)}else{x.setStartBefore(D);x.setEndBefore(D)}m.remove(D);p.setRng(x);p.onSetContent.dispatch(p,G);n.addVisual()},mceInsertRawHTML:function(y,x,v){p.setContent("tiny_mce_marker");n.setContent(n.getContent().replace(/tiny_mce_marker/g,function(){return v}))},mceSetContent:function(y,x,v){n.setContent(v)},"Indent,Outdent":function(z){var x,v,y;x=k.indentation;v=/[a-z%]+$/i.exec(x);x=parseInt(x);if(!l("InsertUnorderedList")&&!l("InsertOrderedList")){d(p.getSelectedBlocks(),function(A){if(z=="outdent"){y=Math.max(0,parseInt(A.style.paddingLeft||0)-x);m.setStyle(A,"paddingLeft",y?y+v:"")}else{m.setStyle(A,"paddingLeft",(parseInt(A.style.paddingLeft||0)+x)+v)}})}else{f(z)}},mceRepaint:function(){var x;if(c.isGecko){try{i(a);if(p.getSel()){p.getSel().selectAllChildren(n.getBody())}p.collapse(a);g()}catch(v){}}},mceToggleFormat:function(y,x,v){q.toggle(v)},InsertHorizontalRule:function(){n.execCommand("mceInsertContent",false,"<hr />")},mceToggleVisualAid:function(){n.hasVisual=!n.hasVisual;n.addVisual()},mceReplaceContent:function(y,x,v){n.execCommand("mceInsertContent",false,v.replace(/\{\$selection\}/g,p.getContent({format:"text"})))},mceInsertLink:function(z,y,x){var v;if(typeof(x)=="string"){x={href:x}}v=m.getParent(p.getNode(),"a");x.href=x.href.replace(" ","%20");if(!v||!x.href){q.remove("link")}if(x.href){q.apply("link",x,v)}},selectAll:function(){var x=m.getRoot(),v=m.createRng();v.setStart(x,0);v.setEnd(x,x.childNodes.length);n.selection.setRng(v)}});u({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(v){return t("align"+v.substring(7))},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(v){return t(v)},mceBlockQuote:function(){return t("blockquote")},Outdent:function(){var v;if(k.inline_styles){if((v=m.getParent(p.getStart(),m.isBlock))&&parseInt(v.style.paddingLeft)>0){return a}if((v=m.getParent(p.getEnd(),m.isBlock))&&parseInt(v.style.paddingLeft)>0){return a}}return l("InsertUnorderedList")||l("InsertOrderedList")||(!k.inline_styles&&!!m.getParent(p.getNode(),"BLOCKQUOTE"))},"InsertUnorderedList,InsertOrderedList":function(v){return m.getParent(p.getNode(),v=="insertunorderedlist"?"UL":"OL")}},"state");u({"FontSize,FontName":function(y){var x=0,v;if(v=m.getParent(p.getNode(),"span")){if(y=="fontsize"){x=v.style.fontSize}else{x=v.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()}}return x}},"value");if(k.custom_undo_redo){u({Undo:function(){n.undoManager.undo()},Redo:function(){n.undoManager.redo()}})}}})(tinymce);(function(b){var a=b.util.Dispatcher;b.UndoManager=function(f){var d,e=0,h=[],c;function g(){return b.trim(f.getContent({format:"raw",no_events:1}))}return d={typing:false,onAdd:new a(d),onUndo:new a(d),onRedo:new a(d),beforeChange:function(){c=f.selection.getBookmark(2,true)},add:function(m){var j,k=f.settings,l;m=m||{};m.content=g();l=h[e];if(l&&l.content==m.content){return null}if(h[e]){h[e].beforeBookmark=c}if(k.custom_undo_redo_levels){if(h.length>k.custom_undo_redo_levels){for(j=0;j<h.length-1;j++){h[j]=h[j+1]}h.length--;e=h.length}}m.bookmark=f.selection.getBookmark(2,true);if(e<h.length-1){h.length=e+1}h.push(m);e=h.length-1;d.onAdd.dispatch(d,m);f.isNotDirty=0;return m},undo:function(){var k,j;if(d.typing){d.add();d.typing=false}if(e>0){k=h[--e];f.setContent(k.content,{format:"raw"});f.selection.moveToBookmark(k.beforeBookmark);d.onUndo.dispatch(d,k)}return k},redo:function(){var i;if(e<h.length-1){i=h[++e];f.setContent(i.content,{format:"raw"});f.selection.moveToBookmark(i.bookmark);d.onRedo.dispatch(d,i)}return i},clear:function(){h=[];e=0;d.typing=false},hasUndo:function(){return e>0||this.typing},hasRedo:function(){return e<h.length-1&&!this.typing}}}})(tinymce);(function(l){var j=l.dom.Event,c=l.isIE,a=l.isGecko,b=l.isOpera,i=l.each,h=l.extend,d=true,g=false;function k(o){var p,n,m;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(o.nodeName)){if(p){n=o.cloneNode(false);n.appendChild(p);p=n}else{p=m=o.cloneNode(false)}p.removeAttribute("id")}}while(o=o.parentNode);if(p){return{wrapper:p,inner:m}}}function f(n,o){var m=o.ownerDocument.createRange();m.setStart(n.endContainer,n.endOffset);m.setEndAfter(o);return m.cloneContents().textContent.length==0}function e(o,q,m){var n,p;if(q.isEmpty(m)){n=q.getParent(m,"ul,ol");if(!q.getParent(n.parentNode,"ul,ol")){q.split(n,m);p=q.create("p",0,'<br data-mce-bogus="1" />');q.replace(p,m);o.select(p,1)}return g}return d}l.create("tinymce.ForceBlocks",{ForceBlocks:function(m){var n=this,o=m.settings,p;n.editor=m;n.dom=m.dom;p=(o.forced_root_block||"p").toLowerCase();o.element=p.toUpperCase();m.onPreInit.add(n.setup,n)},setup:function(){var n=this,m=n.editor,p=m.settings,u=m.dom,o=m.selection,q=m.schema.getBlockElements();if(p.forced_root_block){function v(){var y=o.getStart(),t=m.getBody(),s,z,D,F,E,x,A,B=-16777215;if(!y||y.nodeType!==1){return}while(y!=t){if(q[y.nodeName]){return}y=y.parentNode}s=o.getRng();if(s.setStart){z=s.startContainer;D=s.startOffset;F=s.endContainer;E=s.endOffset}else{if(s.item){s=m.getDoc().body.createTextRange();s.moveToElementText(s.item(0))}tmpRng=s.duplicate();tmpRng.collapse(true);D=tmpRng.move("character",B)*-1;if(!tmpRng.collapsed){tmpRng=s.duplicate();tmpRng.collapse(false);E=(tmpRng.move("character",B)*-1)-D}}for(y=t.firstChild;y;y){if(y.nodeType===3||(y.nodeType==1&&!q[y.nodeName])){if(!x){x=u.create(p.forced_root_block);y.parentNode.insertBefore(x,y)}A=y;y=y.nextSibling;x.appendChild(A)}else{x=null;y=y.nextSibling}}if(s.setStart){s.setStart(z,D);s.setEnd(F,E);o.setRng(s)}else{try{s=m.getDoc().body.createTextRange();s.moveToElementText(t);s.collapse(true);s.moveStart("character",D);if(E>0){s.moveEnd("character",E)}s.select()}catch(C){}}m.nodeChanged()}m.onKeyUp.add(v);m.onClick.add(v)}if(p.force_br_newlines){if(c){m.onKeyPress.add(function(s,t){var x;if(t.keyCode==13&&o.getNode().nodeName!="LI"){o.setContent('<br id="__" /> ',{format:"raw"});x=u.get("__");x.removeAttribute("id");o.select(x);o.collapse();return j.cancel(t)}})}}if(p.force_p_newlines){if(!c){m.onKeyPress.add(function(s,t){if(t.keyCode==13&&!t.shiftKey&&!n.insertPara(t)){j.cancel(t)}})}else{l.addUnload(function(){n._previousFormats=0});m.onKeyPress.add(function(s,t){n._previousFormats=0;if(t.keyCode==13&&!t.shiftKey&&s.selection.isCollapsed()&&p.keep_styles){n._previousFormats=k(s.selection.getStart())}});m.onKeyUp.add(function(t,y){if(y.keyCode==13&&!y.shiftKey){var x=t.selection.getStart(),s=n._previousFormats;if(!x.hasChildNodes()&&s){x=u.getParent(x,u.isBlock);if(x&&x.nodeName!="LI"){x.innerHTML="";if(n._previousFormats){x.appendChild(s.wrapper);s.inner.innerHTML="\uFEFF"}else{x.innerHTML="\uFEFF"}o.select(x,1);o.collapse(true);t.getDoc().execCommand("Delete",false,null);n._previousFormats=0}}}})}if(a){m.onKeyDown.add(function(s,t){if((t.keyCode==8||t.keyCode==46)&&!t.shiftKey){n.backspaceDelete(t,t.keyCode==8)}})}}if(l.isWebKit){function r(t){var s=o.getRng(),x,A=u.create("div",null," "),z,y=u.getViewPort(t.getWin()).h;s.insertNode(x=u.create("br"));s.setStartAfter(x);s.setEndAfter(x);o.setRng(s);if(o.getSel().focusNode==x.previousSibling){o.select(u.insertAfter(u.doc.createTextNode("\u00a0"),x));o.collapse(d)}u.insertAfter(A,x);z=u.getPos(A).y;u.remove(A);if(z>y){t.getWin().scrollTo(0,z)}}m.onKeyPress.add(function(s,t){if(t.keyCode==13&&(t.shiftKey||(p.force_br_newlines&&!u.getParent(o.getNode(),"h1,h2,h3,h4,h5,h6,ol,ul")))){r(s);j.cancel(t)}})}if(c){if(p.element!="P"){m.onKeyPress.add(function(s,t){n.lastElm=o.getNode().nodeName});m.onKeyUp.add(function(t,x){var z,y=o.getNode(),s=t.getBody();if(s.childNodes.length===1&&y.nodeName=="P"){y=u.rename(y,p.element);o.select(y);o.collapse();t.nodeChanged()}else{if(x.keyCode==13&&!x.shiftKey&&n.lastElm!="P"){z=u.getParent(y,"p");if(z){u.rename(z,p.element);t.nodeChanged()}}}})}}},getParentBlock:function(o){var m=this.dom;return m.getParent(o,m.isBlock)},insertPara:function(Q){var E=this,v=E.editor,M=v.dom,R=v.getDoc(),V=v.settings,F=v.selection.getSel(),G=F.getRangeAt(0),U=R.body;var J,K,H,O,N,q,o,u,z,m,C,T,p,x,I,L=M.getViewPort(v.getWin()),B,D,A;v.undoManager.beforeChange();J=R.createRange();J.setStart(F.anchorNode,F.anchorOffset);J.collapse(d);K=R.createRange();K.setStart(F.focusNode,F.focusOffset);K.collapse(d);H=J.compareBoundaryPoints(J.START_TO_END,K)<0;O=H?F.anchorNode:F.focusNode;N=H?F.anchorOffset:F.focusOffset;q=H?F.focusNode:F.anchorNode;o=H?F.focusOffset:F.anchorOffset;if(O===q&&/^(TD|TH)$/.test(O.nodeName)){if(O.firstChild.nodeName=="BR"){M.remove(O.firstChild)}if(O.childNodes.length==0){v.dom.add(O,V.element,null,"<br />");T=v.dom.add(O,V.element,null,"<br />")}else{I=O.innerHTML;O.innerHTML="";v.dom.add(O,V.element,null,I);T=v.dom.add(O,V.element,null,"<br />")}G=R.createRange();G.selectNodeContents(T);G.collapse(1);v.selection.setRng(G);return g}if(O==U&&q==U&&U.firstChild&&v.dom.isBlock(U.firstChild)){O=q=O.firstChild;N=o=0;J=R.createRange();J.setStart(O,0);K=R.createRange();K.setStart(q,0)}if(!R.body.hasChildNodes()){R.body.appendChild(M.create("br"))}O=O.nodeName=="HTML"?R.body:O;O=O.nodeName=="BODY"?O.firstChild:O;q=q.nodeName=="HTML"?R.body:q;q=q.nodeName=="BODY"?q.firstChild:q;u=E.getParentBlock(O);z=E.getParentBlock(q);m=u?u.nodeName:V.element;if(I=E.dom.getParent(u,"li,pre")){if(I.nodeName=="LI"){return e(v.selection,E.dom,I)}return d}if(u&&(u.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(M.getStyle(u,"position",1)))){m=V.element;u=null}if(z&&(z.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(M.getStyle(u,"position",1)))){m=V.element;z=null}if(/(TD|TABLE|TH|CAPTION)/.test(m)||(u&&m=="DIV"&&/left|right/gi.test(M.getStyle(u,"float",1)))){m=V.element;u=z=null}C=(u&&u.nodeName==m)?u.cloneNode(0):v.dom.create(m);T=(z&&z.nodeName==m)?z.cloneNode(0):v.dom.create(m);T.removeAttribute("id");if(/^(H[1-6])$/.test(m)&&f(G,u)){T=v.dom.create(V.element)}I=p=O;do{if(I==U||I.nodeType==9||E.dom.isBlock(I)||/(TD|TABLE|TH|CAPTION)/.test(I.nodeName)){break}p=I}while((I=I.previousSibling?I.previousSibling:I.parentNode));I=x=q;do{if(I==U||I.nodeType==9||E.dom.isBlock(I)||/(TD|TABLE|TH|CAPTION)/.test(I.nodeName)){break}x=I}while((I=I.nextSibling?I.nextSibling:I.parentNode));if(p.nodeName==m){J.setStart(p,0)}else{J.setStartBefore(p)}J.setEnd(O,N);C.appendChild(J.cloneContents()||R.createTextNode(""));try{K.setEndAfter(x)}catch(P){}K.setStart(q,o);T.appendChild(K.cloneContents()||R.createTextNode(""));G=R.createRange();if(!p.previousSibling&&p.parentNode.nodeName==m){G.setStartBefore(p.parentNode)}else{if(J.startContainer.nodeName==m&&J.startOffset==0){G.setStartBefore(J.startContainer)}else{G.setStart(J.startContainer,J.startOffset)}}if(!x.nextSibling&&x.parentNode.nodeName==m){G.setEndAfter(x.parentNode)}else{G.setEnd(K.endContainer,K.endOffset)}G.deleteContents();if(b){v.getWin().scrollTo(0,L.y)}if(C.firstChild&&C.firstChild.nodeName==m){C.innerHTML=C.firstChild.innerHTML}if(T.firstChild&&T.firstChild.nodeName==m){T.innerHTML=T.firstChild.innerHTML}function S(y,s){var r=[],X,W,t;y.innerHTML="";if(V.keep_styles){W=s;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(W.nodeName)){X=W.cloneNode(g);M.setAttrib(X,"id","");r.push(X)}}while(W=W.parentNode)}if(r.length>0){for(t=r.length-1,X=y;t>=0;t--){X=X.appendChild(r[t])}r[0].innerHTML=b?"\u00a0":"<br />";return r[0]}else{y.innerHTML=b?"\u00a0":"<br />"}}if(M.isEmpty(C)){S(C,O)}if(M.isEmpty(T)){A=S(T,q)}if(b&&parseFloat(opera.version())<9.5){G.insertNode(C);G.insertNode(T)}else{G.insertNode(T);G.insertNode(C)}T.normalize();C.normalize();v.selection.select(T,true);v.selection.collapse(true);B=v.dom.getPos(T).y;if(B<L.y||B+25>L.y+L.h){v.getWin().scrollTo(0,B<L.y?B:B-L.h+25)}v.undoManager.add();return g},backspaceDelete:function(u,B){var C=this,s=C.editor,y=s.getBody(),q=s.dom,p,v=s.selection,o=v.getRng(),x=o.startContainer,p,z,A,m;if(!B&&o.collapsed&&x.nodeType==1&&o.startOffset==x.childNodes.length){m=new l.dom.TreeWalker(x.lastChild,x);for(p=x.lastChild;p;p=m.prev()){if(p.nodeType==3){o.setStart(p,p.nodeValue.length);o.collapse(true);v.setRng(o);return}}}if(x&&s.dom.isBlock(x)&&!/^(TD|TH)$/.test(x.nodeName)&&B){if(x.childNodes.length==0||(x.childNodes.length==1&&x.firstChild.nodeName=="BR")){p=x;while((p=p.previousSibling)&&!s.dom.isBlock(p)){}if(p){if(x!=y.firstChild){z=s.dom.doc.createTreeWalker(p,NodeFilter.SHOW_TEXT,null,g);while(A=z.nextNode()){p=A}o=s.getDoc().createRange();o.setStart(p,p.nodeValue?p.nodeValue.length:0);o.setEnd(p,p.nodeValue?p.nodeValue.length:0);v.setRng(o);s.dom.remove(x)}return j.cancel(u)}}}}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each,e=c.extend;c.create("tinymce.ControlManager",{ControlManager:function(f,j){var h=this,g;j=j||{};h.editor=f;h.controls={};h.onAdd=new c.util.Dispatcher(h);h.onPostRender=new c.util.Dispatcher(h);h.prefix=j.prefix||f.id+"_";h._cls={};h.onPostRender.add(function(){d(h.controls,function(i){i.postRender()})})},get:function(f){return this.controls[this.prefix+f]||this.controls[f]},setActive:function(h,f){var g=null;if(g=this.get(h)){g.setActive(f)}return g},setDisabled:function(h,f){var g=null;if(g=this.get(h)){g.setDisabled(f)}return g},add:function(g){var f=this;if(g){f.controls[g.id]=g;f.onAdd.dispatch(g,f)}return g},createControl:function(i){var h,g=this,f=g.editor;d(f.plugins,function(j){if(j.createControl){h=j.createControl(i,g);if(h){return false}}});switch(i){case"|":case"separator":return g.createSeparator()}if(!h&&f.buttons&&(h=f.buttons[i])){return g.createButton(i,h)}return g.add(h)},createDropMenu:function(f,n,h){var m=this,i=m.editor,j,g,k,l;n=e({"class":"mceDropDown",constrain:i.settings.constrain_menus},n);n["class"]=n["class"]+" "+i.getParam("skin")+"Skin";if(k=i.getParam("skin_variant")){n["class"]+=" "+i.getParam("skin")+"Skin"+k.substring(0,1).toUpperCase()+k.substring(1)}f=m.prefix+f;l=h||m._cls.dropmenu||c.ui.DropMenu;j=m.controls[f]=new l(f,n);j.onAddItem.add(function(r,q){var p=q.settings;p.title=i.getLang(p.title,p.title);if(!p.onclick){p.onclick=function(o){if(p.cmd){i.execCommand(p.cmd,p.ui||false,p.value)}}}});i.onRemove.add(function(){j.destroy()});if(c.isIE){j.onShowMenu.add(function(){i.focus();g=i.selection.getBookmark(1)});j.onHideMenu.add(function(){if(g){i.selection.moveToBookmark(g);g=0}})}return m.add(j)},createListBox:function(f,n,h){var l=this,j=l.editor,i,k,m;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,scope:n.scope,control_manager:l},n);f=l.prefix+f;function g(o){return o.settings.use_accessible_selects&&!c.isGecko}if(j.settings.use_native_selects||g(j)){k=new c.ui.NativeListBox(f,n)}else{m=h||l._cls.listbox||c.ui.ListBox;k=new m(f,n,j)}l.controls[f]=k;if(c.isWebKit){k.onPostRender.add(function(p,o){a.add(o,"mousedown",function(){j.bookmark=j.selection.getBookmark(1)});a.add(o,"focus",function(){j.selection.moveToBookmark(j.bookmark);j.bookmark=null})})}if(k.hideMenu){j.onMouseDown.add(k.hideMenu,k)}return l.add(k)},createButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.label=g.translate(i.label);i.scope=i.scope||g;if(!i.onclick&&!i.menu_button){i.onclick=function(){g.execCommand(i.cmd,i.ui||false,i.value)}}i=e({title:i.title,"class":"mce_"+m,unavailable_prefix:g.getLang("unavailable",""),scope:i.scope,control_manager:h},i);m=h.prefix+m;if(i.menu_button){f=l||h._cls.menubutton||c.ui.MenuButton;k=new f(m,i,g);g.onMouseDown.add(k.hideMenu,k)}else{f=h._cls.button||c.ui.Button;k=new f(m,i,g)}return h.add(k)},createMenuButton:function(h,f,g){f=f||{};f.menu_button=1;return this.createButton(h,f,g)},createSplitButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onclick){i.onclick=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;f=l||h._cls.splitbutton||c.ui.SplitButton;k=h.add(new f(m,i,g));g.onMouseDown.add(k.hideMenu,k);return k},createColorSplitButton:function(f,n,h){var l=this,j=l.editor,i,k,m,g;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onclick){n.onclick=function(o){if(c.isIE){g=j.selection.getBookmark(1)}j.execCommand(n.cmd,n.ui||false,o||n.value)}}if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,menu_class:j.getParam("skin")+"Skin",scope:n.scope,more_colors_title:j.getLang("more_colors")},n);f=l.prefix+f;m=h||l._cls.colorsplitbutton||c.ui.ColorSplitButton;k=new m(f,n,j);j.onMouseDown.add(k.hideMenu,k);j.onRemove.add(function(){k.destroy()});if(c.isIE){k.onShowMenu.add(function(){j.focus();g=j.selection.getBookmark(1)});k.onHideMenu.add(function(){if(g){j.selection.moveToBookmark(g);g=0}})}return l.add(k)},createToolbar:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||g._cls.toolbar||c.ui.Toolbar;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createToolbarGroup:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||this._cls.toolbarGroup||c.ui.ToolbarGroup;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createSeparator:function(g){var f=g||this._cls.separator||c.ui.Separator;return new f()},setControlType:function(g,f){return this._cls[g.toLowerCase()]=f},destroy:function(){d(this.controls,function(f){f.destroy()});this.controls=null}})})(tinymce);(function(d){var a=d.util.Dispatcher,e=d.each,c=d.isIE,b=d.isOpera;d.create("tinymce.WindowManager",{WindowManager:function(f){var g=this;g.editor=f;g.onOpen=new a(g);g.onClose=new a(g);g.params={};g.features={}},open:function(z,h){var v=this,k="",n,m,i=v.editor.settings.dialog_type=="modal",q,o,j,g=d.DOM.getViewPort(),r;z=z||{};h=h||{};o=b?g.w:screen.width;j=b?g.h:screen.height;z.name=z.name||"mc_"+new Date().getTime();z.width=parseInt(z.width||320);z.height=parseInt(z.height||240);z.resizable=true;z.left=z.left||parseInt(o/2)-(z.width/2);z.top=z.top||parseInt(j/2)-(z.height/2);h.inline=false;h.mce_width=z.width;h.mce_height=z.height;h.mce_auto_focus=z.auto_focus;if(i){if(c){z.center=true;z.help=false;z.dialogWidth=z.width+"px";z.dialogHeight=z.height+"px";z.scroll=z.scrollbars||false}}e(z,function(p,f){if(d.is(p,"boolean")){p=p?"yes":"no"}if(!/^(name|url)$/.test(f)){if(c&&i){k+=(k?";":"")+f+":"+p}else{k+=(k?",":"")+f+"="+p}}});v.features=z;v.params=h;v.onOpen.dispatch(v,z,h);r=z.url||z.file;r=d._addVer(r);try{if(c&&i){q=1;window.showModalDialog(r,window,k)}else{q=window.open(r,z.name,k)}}catch(l){}if(!q){alert(v.editor.getLang("popup_blocked"))}},close:function(f){f.close();this.onClose.dispatch(this)},createInstance:function(i,h,g,m,l,k){var j=d.resolve(i);return new j(h,g,m,l,k)},confirm:function(h,f,i,g){g=g||window;f.call(i||this,g.confirm(this._decode(this.editor.getLang(h,h))))},alert:function(h,f,j,g){var i=this;g=g||window;g.alert(i._decode(i.editor.getLang(h,h)));if(f){f.call(j||i)}},resizeBy:function(f,g,h){h.resizeBy(f,g)},_decode:function(f){return d.DOM.decode(f).replace(/\\n/g,"\n")}})}(tinymce));(function(a){a.Formatter=function(U){var M={},O=a.each,c=U.dom,q=U.selection,t=a.dom.TreeWalker,K=new a.dom.RangeUtils(c),d=U.schema.isValidChild,F=c.isBlock,l=U.settings.forced_root_block,s=c.nodeIndex,E="\uFEFF",e=/^(src|href|style)$/,R=false,B=true,p;function z(V){return V instanceof Array}function m(W,V){return c.getParents(W,V,c.getRoot())}function b(V){return V.nodeType===1&&(V.face==="mceinline"||V.style.fontFamily==="mceinline")}function Q(V){return V?M[V]:M}function k(V,W){if(V){if(typeof(V)!=="string"){O(V,function(Y,X){k(X,Y)})}else{W=W.length?W:[W];O(W,function(X){if(X.deep===p){X.deep=!X.selector}if(X.split===p){X.split=!X.selector||X.inline}if(X.remove===p&&X.selector&&!X.inline){X.remove="none"}if(X.selector&&X.inline){X.mixed=true;X.block_expand=true}if(typeof(X.classes)==="string"){X.classes=X.classes.split(/\s+/)}});M[V]=W}}}var i=function(W){var V;U.dom.getParent(W,function(X){V=U.dom.getStyle(X,"text-decoration");return V&&V!=="none"});return V};var I=function(V){var W;if(V.nodeType===1&&V.parentNode&&V.parentNode.nodeType===1){W=i(V.parentNode);if(U.dom.getStyle(V,"color")&&W){U.dom.setStyle(V,"text-decoration",W)}else{if(U.dom.getStyle(V,"textdecoration")===W){U.dom.setStyle(V,"text-decoration",null)}}}};function S(Y,ag,ab){var ac=Q(Y),ah=ac[0],af,W,ae,ad=q.isCollapsed();function Z(al){var ak=al.startContainer,ao=al.startOffset,an,am;if(ak.nodeType==1||ak.nodeValue===""){ak=ak.nodeType==1?ak.childNodes[ao]:ak;if(ak){an=new t(ak,ak.parentNode);for(am=an.current();am;am=an.next()){if(am.nodeType==3&&!f(am)){al.setStart(am,0);break}}}}return al}function V(al,ak){ak=ak||ah;if(al){if(ak.onformat){ak.onformat(al,ak,ag,ab)}O(ak.styles,function(an,am){c.setStyle(al,am,r(an,ag))});O(ak.attributes,function(an,am){c.setAttrib(al,am,r(an,ag))});O(ak.classes,function(am){am=r(am,ag);if(!c.hasClass(al,am)){c.addClass(al,am)}})}}function aa(){function am(at,aq){var ar=new t(aq);for(ab=ar.current();ab;ab=ar.prev()){if(ab.childNodes.length>1||ab==at){return ab}}}var al=U.selection.getRng();var ap=al.startContainer;var ak=al.endContainer;if(ap!=ak&&al.endOffset==0){var ao=am(ap,ak);var an=ao.nodeType==3?ao.length:ao.childNodes.length;al.setEnd(ao,an)}return al}function X(an,at,aq,ap,al){var ak=[],am=-1,ar,av=-1,ao=-1,au;O(an.childNodes,function(ax,aw){if(ax.nodeName==="UL"||ax.nodeName==="OL"){am=aw;ar=ax;return false}});O(an.childNodes,function(ax,aw){if(ax.nodeName==="SPAN"&&c.getAttrib(ax,"data-mce-type")=="bookmark"){if(ax.id==at.id+"_start"){av=aw}else{if(ax.id==at.id+"_end"){ao=aw}}}});if(am<=0||(av<am&&ao>am)){O(a.grep(an.childNodes),al);return 0}else{au=aq.cloneNode(R);O(a.grep(an.childNodes),function(ax,aw){if((av<am&&aw<am)||(av>am&&aw>am)){ak.push(ax);ax.parentNode.removeChild(ax)}});if(av<am){an.insertBefore(au,ar)}else{if(av>am){an.insertBefore(au,ar.nextSibling)}}ap.push(au);O(ak,function(aw){au.appendChild(aw)});return au}}function ai(al,an,ap){var ak=[],ao,am;ao=ah.inline||ah.block;am=c.create(ao);V(am);K.walk(al,function(aq){var ar;function at(au){var ax=au.nodeName.toLowerCase(),aw=au.parentNode.nodeName.toLowerCase(),av;if(g(ax,"br")){ar=0;if(ah.block){c.remove(au)}return}if(ah.wrapper&&x(au,Y,ag)){ar=0;return}if(ah.block&&!ah.wrapper&&G(ax)){au=c.rename(au,ao);V(au);ak.push(au);ar=0;return}if(ah.selector){O(ac,function(ay){if("collapsed" in ay&&ay.collapsed!==ad){return}if(c.is(au,ay.selector)&&!b(au)){V(au,ay);av=true}});if(!ah.inline||av){ar=0;return}}if(d(ao,ax)&&d(aw,ao)&&!(!ap&&au.nodeType===3&&au.nodeValue.length===1&&au.nodeValue.charCodeAt(0)===65279)&&au.id!=="_mce_caret"){if(!ar){ar=am.cloneNode(R);au.parentNode.insertBefore(ar,au);ak.push(ar)}ar.appendChild(au)}else{if(ax=="li"&&an){ar=X(au,an,am,ak,at)}else{ar=0;O(a.grep(au.childNodes),at);ar=0}}}O(aq,at)});if(ah.wrap_links===false){O(ak,function(aq){function ar(aw){var av,au,at;if(aw.nodeName==="A"){au=am.cloneNode(R);ak.push(au);at=a.grep(aw.childNodes);for(av=0;av<at.length;av++){au.appendChild(at[av])}aw.appendChild(au)}O(a.grep(aw.childNodes),ar)}ar(aq)})}O(ak,function(at){var aq;function au(aw){var av=0;O(aw.childNodes,function(ax){if(!f(ax)&&!H(ax)){av++}});return av}function ar(av){var ax,aw;O(av.childNodes,function(ay){if(ay.nodeType==1&&!H(ay)&&!b(ay)){ax=ay;return R}});if(ax&&h(ax,ah)){aw=ax.cloneNode(R);V(aw);c.replace(aw,av,B);c.remove(ax,1)}return aw||av}aq=au(at);if((ak.length>1||!F(at))&&aq===0){c.remove(at,1);return}if(ah.inline||ah.wrapper){if(!ah.exact&&aq===1){at=ar(at)}O(ac,function(av){O(c.select(av.inline,at),function(ax){var aw;if(av.wrap_links===false){aw=ax.parentNode;do{if(aw.nodeName==="A"){return}}while(aw=aw.parentNode)}T(av,ag,ax,av.exact?ax:null)})});if(x(at.parentNode,Y,ag)){c.remove(at,1);at=0;return B}if(ah.merge_with_parents){c.getParent(at.parentNode,function(av){if(x(av,Y,ag)){c.remove(at,1);at=0;return B}})}if(at&&ah.merge_siblings!==false){at=u(C(at),at);at=u(at,C(at,B))}}})}if(ah){if(ab){if(ab.nodeType){W=c.createRng();W.setStartBefore(ab);W.setEndAfter(ab);ai(o(W,ac),null,true)}else{ai(ab,null,true)}}else{if(!ad||!ah.inline||c.select("td.mceSelected,th.mceSelected").length){var aj=U.selection.getNode();U.selection.setRng(aa());af=q.getBookmark();ai(o(q.getRng(B),ac),af);if(ah.styles&&(ah.styles.color||ah.styles.textDecoration)){a.walk(aj,I,"childNodes");I(aj)}q.moveToBookmark(af);q.setRng(Z(q.getRng(B)));U.nodeChanged()}else{P("apply",Y,ag)}}}}function A(X,ag,aa){var ab=Q(X),ai=ab[0],af,ae,W;function Z(al){var ak=al.startContainer,aq=al.startOffset,ap,ao,am,an;if(ak.nodeType==3&&aq>=ak.nodeValue.length-1){ak=ak.parentNode;aq=s(ak)+1}if(ak.nodeType==1){am=ak.childNodes;ak=am[Math.min(aq,am.length-1)];ap=new t(ak);if(aq>am.length-1){ap.next()}for(ao=ap.current();ao;ao=ap.next()){if(ao.nodeType==3&&!f(ao)){an=c.create("a",null,E);ao.parentNode.insertBefore(an,ao);al.setStart(ao,0);q.setRng(al);c.remove(an);return}}}}function Y(an){var am,al,ak;am=a.grep(an.childNodes);for(al=0,ak=ab.length;al<ak;al++){if(T(ab[al],ag,an,an)){break}}if(ai.deep){for(al=0,ak=am.length;al<ak;al++){Y(am[al])}}}function ac(ak){var al;O(m(ak.parentNode).reverse(),function(am){var an;if(!al&&am.id!="_start"&&am.id!="_end"){an=x(am,X,ag);if(an&&an.split!==false){al=am}}});return al}function V(an,ak,ap,at){var au,ar,aq,am,ao,al;if(an){al=an.parentNode;for(au=ak.parentNode;au&&au!=al;au=au.parentNode){ar=au.cloneNode(R);for(ao=0;ao<ab.length;ao++){if(T(ab[ao],ag,ar,ar)){ar=0;break}}if(ar){if(aq){ar.appendChild(aq)}if(!am){am=ar}aq=ar}}if(at&&(!ai.mixed||!F(an))){ak=c.split(an,ak)}if(aq){ap.parentNode.insertBefore(aq,ap);am.appendChild(ap)}}return ak}function ah(ak){return V(ac(ak),ak,ak,true)}function ad(am){var al=c.get(am?"_start":"_end"),ak=al[am?"firstChild":"lastChild"];if(H(ak)){ak=ak[am?"firstChild":"lastChild"]}c.remove(al,true);return ak}function aj(ak){var al,am;ak=o(ak,ab,B);if(ai.split){al=J(ak,B);am=J(ak);if(al!=am){al=N(al,"span",{id:"_start","data-mce-type":"bookmark"});am=N(am,"span",{id:"_end","data-mce-type":"bookmark"});ah(al);ah(am);al=ad(B);am=ad()}else{al=am=ah(al)}ak.startContainer=al.parentNode;ak.startOffset=s(al);ak.endContainer=am.parentNode;ak.endOffset=s(am)+1}K.walk(ak,function(an){O(an,function(ao){Y(ao);if(ao.nodeType===1&&U.dom.getStyle(ao,"text-decoration")==="underline"&&ao.parentNode&&i(ao.parentNode)==="underline"){T({deep:false,exact:true,inline:"span",styles:{textDecoration:"underline"}},null,ao)}})})}if(aa){if(aa.nodeType){W=c.createRng();W.setStartBefore(aa);W.setEndAfter(aa);aj(W)}else{aj(aa)}return}if(!q.isCollapsed()||!ai.inline||c.select("td.mceSelected,th.mceSelected").length){af=q.getBookmark();aj(q.getRng(B));q.moveToBookmark(af);if(ai.inline&&j(X,ag,q.getStart())){Z(q.getRng(true))}U.nodeChanged()}else{P("remove",X,ag)}if(a.isWebKit){U.execCommand("mceCleanup")}}function D(W,Y,X){var V=Q(W);if(j(W,Y,X)&&(!("toggle" in V[0])||V[0]["toggle"])){A(W,Y,X)}else{S(W,Y,X)}}function x(W,V,ab,Z){var X=Q(V),ac,aa,Y;function ad(ah,aj,ak){var ag,ai,ae=aj[ak],af;if(aj.onmatch){return aj.onmatch(ah,aj,ak)}if(ae){if(ae.length===p){for(ag in ae){if(ae.hasOwnProperty(ag)){if(ak==="attributes"){ai=c.getAttrib(ah,ag)}else{ai=L(ah,ag)}if(Z&&!ai&&!aj.exact){return}if((!Z||aj.exact)&&!g(ai,r(ae[ag],ab))){return}}}}else{for(af=0;af<ae.length;af++){if(ak==="attributes"?c.getAttrib(ah,ae[af]):L(ah,ae[af])){return aj}}}}return aj}if(X&&W){for(aa=0;aa<X.length;aa++){ac=X[aa];if(h(W,ac)&&ad(W,ac,"attributes")&&ad(W,ac,"styles")){if(Y=ac.classes){for(aa=0;aa<Y.length;aa++){if(!c.hasClass(W,Y[aa])){return}}}return ac}}}}function j(X,Z,Y){var W;function V(aa){aa=c.getParent(aa,function(ab){return !!x(ab,X,Z,true)});return x(aa,X,Z)}if(Y){return V(Y)}Y=q.getNode();if(V(Y)){return B}W=q.getStart();if(W!=Y){if(V(W)){return B}}return R}function v(ac,ab){var Z,aa=[],Y={},X,W,V;Z=q.getStart();c.getParent(Z,function(af){var ae,ad;for(ae=0;ae<ac.length;ae++){ad=ac[ae];if(!Y[ad]&&x(af,ad,ab)){Y[ad]=true;aa.push(ad)}}});return aa}function y(Z){var ab=Q(Z),Y,X,aa,W,V;if(ab){Y=q.getStart();X=m(Y);for(W=ab.length-1;W>=0;W--){V=ab[W].selector;if(!V){return B}for(aa=X.length-1;aa>=0;aa--){if(c.is(X[aa],V)){return B}}}}return R}a.extend(this,{get:Q,register:k,apply:S,remove:A,toggle:D,match:j,matchAll:v,matchNode:x,canApply:y});function h(V,W){if(g(V,W.inline)){return B}if(g(V,W.block)){return B}if(W.selector){return c.is(V,W.selector)}}function g(W,V){W=W||"";V=V||"";W=""+(W.nodeName||W);V=""+(V.nodeName||V);return W.toLowerCase()==V.toLowerCase()}function L(W,V){var X=c.getStyle(W,V);if(V=="color"||V=="backgroundColor"){X=c.toHex(X)}if(V=="fontWeight"&&X==700){X="bold"}return""+X}function r(V,W){if(typeof(V)!="string"){V=V(W)}else{if(W){V=V.replace(/%(\w+)/g,function(Y,X){return W[X]||Y})}}return V}function f(V){return V&&V.nodeType===3&&/^([\t \r\n]+|)$/.test(V.nodeValue)}function N(X,W,V){var Y=c.create(W,V);X.parentNode.insertBefore(Y,X);Y.appendChild(X);return Y}function o(V,ah,Y){var X=V.startContainer,ac=V.startOffset,ak=V.endContainer,ae=V.endOffset,aj,ag,ab,af;function ai(aq){var al,ao,ap,an,am;al=ao=aq?X:ak;am=aq?"previousSibling":"nextSibling";root=c.getRoot();if(al.nodeType==3&&!f(al)){if(aq?ac>0:ae<al.nodeValue.length){return al}}for(;;){if(ao==root||(!ah[0].block_expand&&F(ao))){return ao}for(an=ao[am];an;an=an[am]){if(!H(an)&&!f(an)){return ao}}ao=ao.parentNode}return al}function aa(al,am){if(am===p){am=al.nodeType===3?al.length:al.childNodes.length}while(al&&al.hasChildNodes()){al=al.childNodes[am];if(al){am=al.nodeType===3?al.length:al.childNodes.length}}return{node:al,offset:am}}if(X.nodeType==1&&X.hasChildNodes()){ag=X.childNodes.length-1;X=X.childNodes[ac>ag?ag:ac];if(X.nodeType==3){ac=0}}if(ak.nodeType==1&&ak.hasChildNodes()){ag=ak.childNodes.length-1;ak=ak.childNodes[ae>ag?ag:ae-1];if(ak.nodeType==3){ae=ak.nodeValue.length}}if(H(X.parentNode)||H(X)){X=H(X)?X:X.parentNode;X=X.nextSibling||X;if(X.nodeType==3){ac=0}}if(H(ak.parentNode)||H(ak)){ak=H(ak)?ak:ak.parentNode;ak=ak.previousSibling||ak;if(ak.nodeType==3){ae=ak.length}}if(ah[0].inline){if(V.collapsed){function ad(am,aq,at){var ap,an,ar,al;function ao(av,ax){var ay,au,aw=av.nodeValue;if(typeof(ax)=="undefined"){ax=at?aw.length:0}if(at){ay=aw.lastIndexOf(" ",ax);au=aw.lastIndexOf("\u00a0",ax);ay=ay>au?ay:au;if(ay!==-1&&!Y){ay++}}else{ay=aw.indexOf(" ",ax);au=aw.indexOf("\u00a0",ax);ay=ay!==-1&&(au===-1||ay<au)?ay:au}return ay}if(am.nodeType===3){ar=ao(am,aq);if(ar!==-1){return{container:am,offset:ar}}al=am}ap=new t(am,c.getParent(am,F)||U.getBody());while(an=ap[at?"prev":"next"]()){if(an.nodeType===3){al=an;ar=ao(an);if(ar!==-1){return{container:an,offset:ar}}}else{if(F(an)){break}}}if(al){if(at){aq=0}else{aq=al.length}return{container:al,offset:aq}}}af=ad(X,ac,true);if(af){X=af.container;ac=af.offset}af=ad(ak,ae);if(af){ak=af.container;ae=af.offset}}ab=aa(ak,ae);if(ab.node){while(ab.node&&ab.offset===0&&ab.node.previousSibling){ab=aa(ab.node.previousSibling)}if(ab.node&&ab.offset>0&&ab.node.nodeType===3&&ab.node.nodeValue.charAt(ab.offset-1)===" "){if(ab.offset>1){ak=ab.node;ak.splitText(ab.offset-1)}else{if(ab.node.previousSibling){}}}}}if(ah[0].inline||ah[0].block_expand){if(!ah[0].inline||(X.nodeType!=3||ac===0)){X=ai(true)}if(!ah[0].inline||(ak.nodeType!=3||ae===ak.nodeValue.length)){ak=ai()}}if(ah[0].selector&&ah[0].expand!==R&&!ah[0].inline){function Z(am,al){var an,ao,aq,ap;if(am.nodeType==3&&am.nodeValue.length==0&&am[al]){am=am[al]}an=m(am);for(ao=0;ao<an.length;ao++){for(aq=0;aq<ah.length;aq++){ap=ah[aq];if("collapsed" in ap&&ap.collapsed!==V.collapsed){continue}if(c.is(an[ao],ap.selector)){return an[ao]}}}return am}X=Z(X,"previousSibling");ak=Z(ak,"nextSibling")}if(ah[0].block||ah[0].selector){function W(am,al,ao){var an;if(!ah[0].wrapper){an=c.getParent(am,ah[0].block)}if(!an){an=c.getParent(am.nodeType==3?am.parentNode:am,F)}if(an&&ah[0].wrapper){an=m(an,"ul,ol").reverse()[0]||an}if(!an){an=am;while(an[al]&&!F(an[al])){an=an[al];if(g(an,"br")){break}}}return an||am}X=W(X,"previousSibling");ak=W(ak,"nextSibling");if(ah[0].block){if(!F(X)){X=ai(true)}if(!F(ak)){ak=ai()}}}if(X.nodeType==1){ac=s(X);X=X.parentNode}if(ak.nodeType==1){ae=s(ak)+1;ak=ak.parentNode}return{startContainer:X,startOffset:ac,endContainer:ak,endOffset:ae}}function T(ab,aa,Y,V){var X,W,Z;if(!h(Y,ab)){return R}if(ab.remove!="all"){O(ab.styles,function(ad,ac){ad=r(ad,aa);if(typeof(ac)==="number"){ac=ad;V=0}if(!V||g(L(V,ac),ad)){c.setStyle(Y,ac,"")}Z=1});if(Z&&c.getAttrib(Y,"style")==""){Y.removeAttribute("style");Y.removeAttribute("data-mce-style")}O(ab.attributes,function(ae,ac){var ad;ae=r(ae,aa);if(typeof(ac)==="number"){ac=ae;V=0}if(!V||g(c.getAttrib(V,ac),ae)){if(ac=="class"){ae=c.getAttrib(Y,ac);if(ae){ad="";O(ae.split(/\s+/),function(af){if(/mce\w+/.test(af)){ad+=(ad?" ":"")+af}});if(ad){c.setAttrib(Y,ac,ad);return}}}if(ac=="class"){Y.removeAttribute("className")}if(e.test(ac)){Y.removeAttribute("data-mce-"+ac)}Y.removeAttribute(ac)}});O(ab.classes,function(ac){ac=r(ac,aa);if(!V||c.hasClass(V,ac)){c.removeClass(Y,ac)}});W=c.getAttribs(Y);for(X=0;X<W.length;X++){if(W[X].nodeName.indexOf("_")!==0){return R}}}if(ab.remove!="none"){n(Y,ab);return B}}function n(X,Y){var V=X.parentNode,W;if(Y.block){if(!l){function Z(ab,aa,ac){ab=C(ab,aa,ac);return !ab||(ab.nodeName=="BR"||F(ab))}if(F(X)&&!F(V)){if(!Z(X,R)&&!Z(X.firstChild,B,1)){X.insertBefore(c.create("br"),X.firstChild)}if(!Z(X,B)&&!Z(X.lastChild,R,1)){X.appendChild(c.create("br"))}}}else{if(V==c.getRoot()){if(!Y.list_block||!g(X,Y.list_block)){O(a.grep(X.childNodes),function(aa){if(d(l,aa.nodeName.toLowerCase())){if(!W){W=N(aa,l)}else{W.appendChild(aa)}}else{W=0}})}}}}if(Y.selector&&Y.inline&&!g(Y.inline,X)){return}c.remove(X,1)}function C(W,V,X){if(W){V=V?"nextSibling":"previousSibling";for(W=X?W:W[V];W;W=W[V]){if(W.nodeType==1||!f(W)){return W}}}}function H(V){return V&&V.nodeType==1&&V.getAttribute("data-mce-type")=="bookmark"}function u(Z,Y){var V,X,W;function ab(ae,ad){if(ae.nodeName!=ad.nodeName){return R}function ac(ag){var ah={};O(c.getAttribs(ag),function(ai){var aj=ai.nodeName.toLowerCase();if(aj.indexOf("_")!==0&&aj!=="style"){ah[aj]=c.getAttrib(ag,aj)}});return ah}function af(aj,ai){var ah,ag;for(ag in aj){if(aj.hasOwnProperty(ag)){ah=ai[ag];if(ah===p){return R}if(aj[ag]!=ah){return R}delete ai[ag]}}for(ag in ai){if(ai.hasOwnProperty(ag)){return R}}return B}if(!af(ac(ae),ac(ad))){return R}if(!af(c.parseStyle(c.getAttrib(ae,"style")),c.parseStyle(c.getAttrib(ad,"style")))){return R}return B}if(Z&&Y){function aa(ad,ac){for(X=ad;X;X=X[ac]){if(X.nodeType==3&&X.nodeValue.length!==0){return ad}if(X.nodeType==1&&!H(X)){return X}}return ad}Z=aa(Z,"previousSibling");Y=aa(Y,"nextSibling");if(ab(Z,Y)){for(X=Z.nextSibling;X&&X!=Y;){W=X;X=X.nextSibling;Z.appendChild(W)}c.remove(Y);O(a.grep(Y.childNodes),function(ac){Z.appendChild(ac)});return Z}}return Y}function G(V){return/^(h[1-6]|p|div|pre|address|dl|dt|dd)$/.test(V)}function J(W,aa){var V,Z,X,Y;V=W[aa?"startContainer":"endContainer"];Z=W[aa?"startOffset":"endOffset"];if(V.nodeType==1){X=V.childNodes.length-1;if(!aa&&Z){Z--}V=V.childNodes[Z>X?X:Z]}if(V.nodeType===3&&aa&&Z>=V.nodeValue.length){V=new t(V,U.getBody()).next()||V}if(V.nodeType===3&&!aa&&Z==0){V=new t(V,U.getBody()).prev()||V}return V}function P(ae,V,ac){var ah,af="_mce_caret",W=U.settings.caret_debug;ah=a.isGecko?"\u200B":E;function X(aj){var ai=c.create("span",{id:af,"data-mce-bogus":true,style:W?"color:red":""});if(aj){ai.appendChild(U.getDoc().createTextNode(ah))}return ai}function ad(aj,ai){while(aj){if((aj.nodeType===3&&aj.nodeValue!==ah)||aj.childNodes.length>1){return false}if(ai&&aj.nodeType===1){ai.push(aj)}aj=aj.firstChild}return true}function aa(ai){while(ai){if(ai.id===af){return ai}ai=ai.parentNode}}function Z(ai){var aj;if(ai){aj=new t(ai,ai);for(ai=aj.current();ai;ai=aj.next()){if(ai.nodeType===3){return ai}}}}function Y(ak,aj){var al,ai;if(!ak){ak=aa(q.getStart());if(!ak){while(ak=c.get(af)){Y(ak,false)}}}else{ai=q.getRng(true);if(ad(ak)){if(aj!==false){ai.setStartBefore(ak);ai.setEndBefore(ak)}c.remove(ak)}else{al=Z(ak);al=al.deleteData(0,1);c.remove(ak,1)}q.setRng(ai)}}function ab(){var ak,ai,ao,an,al,aj,am;ak=q.getRng(true);an=ak.startOffset;aj=ak.startContainer;am=aj.nodeValue;ai=aa(q.getStart());if(ai){ao=Z(ai)}if(am&&an>0&&an<am.length&&/\w/.test(am.charAt(an))&&/\w/.test(am.charAt(an-1))){al=q.getBookmark();ak.collapse(true);ak=o(ak,Q(V));ak=K.split(ak);S(V,ac,ak);q.moveToBookmark(al)}else{if(!ai||ao.nodeValue!==ah){ai=X(true);ao=ai.firstChild;ak.insertNode(ai);an=1;S(V,ac,ai)}else{S(V,ac,ai)}q.setCursorLocation(ao,an)}}function ag(){var ai=q.getRng(true),aj,al,ao,an,ak,ar,aq=[],am,ap;aj=ai.startContainer;al=ai.startOffset;ak=aj;if(aj.nodeType==3){if(al!=aj.nodeValue.length||aj.nodeValue===ah){an=true}ak=ak.parentNode}while(ak){if(x(ak,V,ac)){ar=ak;break}if(ak.nextSibling){an=true}aq.push(ak);ak=ak.parentNode}if(!ar){return}if(an){ao=q.getBookmark();ai.collapse(true);ai=o(ai,Q(V),true);ai=K.split(ai);A(V,ac,ai);q.moveToBookmark(ao)}else{ap=X();ak=ap;for(am=aq.length-1;am>=0;am--){ak.appendChild(aq[am].cloneNode(false));ak=ak.firstChild}ak.appendChild(c.doc.createTextNode(ah));ak=ak.firstChild;c.insertAfter(ap,ar);q.setCursorLocation(ak,1)}}U.onBeforeGetContent.addToTop(function(){var ai=[],aj;if(ad(aa(q.getStart()),ai)){aj=ai.length;while(aj--){c.setAttrib(ai[aj],"data-mce-bogus","1")}}});a.each("onMouseUp onKeyUp".split(" "),function(ai){U[ai].addToTop(function(){Y()})});U.onKeyDown.addToTop(function(ai,ak){var aj=ak.keyCode;if(aj==8||aj==37||aj==39){Y(aa(q.getStart()))}});if(ae=="apply"){ab()}else{ag()}}}})(tinymce);tinymce.onAddEditor.add(function(e,a){var d,h,g,c=a.settings;if(c.inline_styles){h=e.explode(c.font_size_legacy_values);function b(j,i){e.each(i,function(l,k){if(l){g.setStyle(j,k,l)}});g.rename(j,"span")}d={font:function(j,i){b(i,{backgroundColor:i.style.backgroundColor,color:i.color,fontFamily:i.face,fontSize:h[parseInt(i.size)-1]})},u:function(j,i){b(i,{textDecoration:"underline"})},strike:function(j,i){b(i,{textDecoration:"line-through"})}};function f(i,j){g=i.dom;if(c.convert_fonts_to_spans){e.each(g.select("font,u,strike",j.node),function(k){d[k.nodeName.toLowerCase()](a.dom,k)})}}a.onPreProcess.add(f);a.onSetContent.add(f);a.onInit.add(function(){a.selection.onSetContent.add(f)})}});
diff --git a/js/tiny_mce/tiny_mce_jquery.js b/js/tiny_mce/tiny_mce_jquery.js
index e7139c08ada..718577da2bd 100644
--- a/js/tiny_mce/tiny_mce_jquery.js
+++ b/js/tiny_mce/tiny_mce_jquery.js
@@ -1 +1 @@
-(function(d){var a=/^\s*|\s*$/g,e,c="B".replace(/A(.)|B/,"$1")==="$1";var b={majorVersion:"3",minorVersion:"4.7",releaseDate:"2011-11-03",_init:function(){var s=this,q=document,o=navigator,g=o.userAgent,m,f,l,k,j,r;s.isOpera=d.opera&&opera.buildNumber;s.isWebKit=/WebKit/.test(g);s.isIE=!s.isWebKit&&!s.isOpera&&(/MSIE/gi).test(g)&&(/Explorer/gi).test(o.appName);s.isIE6=s.isIE&&/MSIE [56]/.test(g);s.isIE7=s.isIE&&/MSIE [7]/.test(g);s.isIE8=s.isIE&&/MSIE [8]/.test(g);s.isIE9=s.isIE&&/MSIE [9]/.test(g);s.isGecko=!s.isWebKit&&/Gecko/.test(g);s.isMac=g.indexOf("Mac")!=-1;s.isAir=/adobeair/i.test(g);s.isIDevice=/(iPad|iPhone)/.test(g);s.isIOS5=s.isIDevice&&g.match(/AppleWebKit\/(\d*)/)[1]>=534;if(d.tinyMCEPreInit){s.suffix=tinyMCEPreInit.suffix;s.baseURL=tinyMCEPreInit.base;s.query=tinyMCEPreInit.query;return}s.suffix="";f=q.getElementsByTagName("base");for(m=0;m<f.length;m++){if(r=f[m].href){if(/^https?:\/\/[^\/]+$/.test(r)){r+="/"}k=r?r.match(/.*\//)[0]:""}}function h(i){if(i.src&&/tiny_mce(|_gzip|_jquery|_prototype|_full)(_dev|_src)?.js/.test(i.src)){if(/_(src|dev)\.js/g.test(i.src)){s.suffix="_src"}if((j=i.src.indexOf("?"))!=-1){s.query=i.src.substring(j+1)}s.baseURL=i.src.substring(0,i.src.lastIndexOf("/"));if(k&&s.baseURL.indexOf("://")==-1&&s.baseURL.indexOf("/")!==0){s.baseURL=k+s.baseURL}return s.baseURL}return null}f=q.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}l=q.getElementsByTagName("head")[0];if(l){f=l.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}}return},is:function(g,f){if(!f){return g!==e}if(f=="array"&&(g.hasOwnProperty&&g instanceof Array)){return true}return typeof(g)==f},makeMap:function(f,j,h){var g;f=f||[];j=j||",";if(typeof(f)=="string"){f=f.split(j)}h=h||{};g=f.length;while(g--){h[f[g]]={}}return h},each:function(i,f,h){var j,g;if(!i){return 0}h=h||i;if(i.length!==e){for(j=0,g=i.length;j<g;j++){if(f.call(h,i[j],j,i)===false){return 0}}}else{for(j in i){if(i.hasOwnProperty(j)){if(f.call(h,i[j],j,i)===false){return 0}}}}return 1},trim:function(f){return(f?""+f:"").replace(a,"")},create:function(o,f,j){var n=this,g,i,k,l,h,m=0;o=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(o);k=o[3].match(/(^|\.)(\w+)$/i)[2];i=n.createNS(o[3].replace(/\.\w+$/,""),j);if(i[k]){return}if(o[2]=="static"){i[k]=f;if(this.onCreate){this.onCreate(o[2],o[3],i[k])}return}if(!f[k]){f[k]=function(){};m=1}i[k]=f[k];n.extend(i[k].prototype,f);if(o[5]){g=n.resolve(o[5]).prototype;l=o[5].match(/\.(\w+)$/i)[1];h=i[k];if(m){i[k]=function(){return g[l].apply(this,arguments)}}else{i[k]=function(){this.parent=g[l];return h.apply(this,arguments)}}i[k].prototype[k]=i[k];n.each(g,function(p,q){i[k].prototype[q]=g[q]});n.each(f,function(p,q){if(g[q]){i[k].prototype[q]=function(){this.parent=g[q];return p.apply(this,arguments)}}else{if(q!=k){i[k].prototype[q]=p}}})}n.each(f["static"],function(p,q){i[k][q]=p});if(this.onCreate){this.onCreate(o[2],o[3],i[k].prototype)}},walk:function(i,h,j,g){g=g||this;if(i){if(j){i=i[j]}b.each(i,function(k,f){if(h.call(g,k,f,j)===false){return false}b.walk(k,h,j,g)})}},createNS:function(j,h){var g,f;h=h||d;j=j.split(".");for(g=0;g<j.length;g++){f=j[g];if(!h[f]){h[f]={}}h=h[f]}return h},resolve:function(j,h){var g,f;h=h||d;j=j.split(".");for(g=0,f=j.length;g<f;g++){h=h[j[g]];if(!h){break}}return h},addUnload:function(j,i){var h=this;j={func:j,scope:i||this};if(!h.unloads){function g(){var f=h.unloads,l,m;if(f){for(m in f){l=f[m];if(l&&l.func){l.func.call(l.scope,1)}}if(d.detachEvent){d.detachEvent("onbeforeunload",k);d.detachEvent("onunload",g)}else{if(d.removeEventListener){d.removeEventListener("unload",g,false)}}h.unloads=l=f=w=g=0;if(d.CollectGarbage){CollectGarbage()}}}function k(){var l=document;if(l.readyState=="interactive"){function f(){l.detachEvent("onstop",f);if(g){g()}l=0}if(l){l.attachEvent("onstop",f)}d.setTimeout(function(){if(l){l.detachEvent("onstop",f)}},0)}}if(d.attachEvent){d.attachEvent("onunload",g);d.attachEvent("onbeforeunload",k)}else{if(d.addEventListener){d.addEventListener("unload",g,false)}}h.unloads=[j]}else{h.unloads.push(j)}return j},removeUnload:function(i){var g=this.unloads,h=null;b.each(g,function(j,f){if(j&&j.func==i){g.splice(f,1);h=i;return false}});return h},explode:function(f,g){return f?b.map(f.split(g||","),b.trim):f},_addVer:function(g){var f;if(!this.query){return g}f=(g.indexOf("?")==-1?"?":"&")+this.query;if(g.indexOf("#")==-1){return g+f}return g.replace("#",f+"#")},_replace:function(h,f,g){if(c){return g.replace(h,function(){var l=f,j=arguments,k;for(k=0;k<j.length-2;k++){if(j[k]===e){l=l.replace(new RegExp("\\$"+k,"g"),"")}else{l=l.replace(new RegExp("\\$"+k,"g"),j[k])}}return l})}return g.replace(h,f)}};b._init();d.tinymce=d.tinyMCE=b})(window);(function(e,d){var c=d.is,b=/^(href|src|style)$/i,f;if(!e&&window.console){return console.log("Load jQuery first!")}d.$=e;d.adapter={patchEditor:function(j){var i=e.fn;function h(n,o){var m=this;if(o){m.removeAttr("data-mce-style")}return i.css.apply(m,arguments)}function g(n,o){var m=this;if(b.test(n)){if(o!==f){m.each(function(p,q){j.dom.setAttrib(q,n,o)});return m}else{return m.attr("data-mce-"+n)}}return i.attr.apply(m,arguments)}function k(m){return function(n){if(n){n=j.dom.processHTML(n)}return m.call(this,n)}}function l(m){if(m.css!==h){m.css=h;m.attr=g;m.html=k(i.html);m.append=k(i.append);m.prepend=k(i.prepend);m.after=k(i.after);m.before=k(i.before);m.replaceWith=k(i.replaceWith);m.tinymce=j;m.pushStack=function(){return l(i.pushStack.apply(this,arguments))}}return m}j.$=function(m,n){var o=j.getDoc();return l(e(m||o,o||n))}}};d.extend=e.extend;d.extend(d,{map:e.map,grep:function(g,h){return e.grep(g,h||function(){return 1})},inArray:function(g,h){return e.inArray(h,g||[])}});var a={"tinymce.dom.DOMUtils":{select:function(i,h){var g=this;return e.find(i,g.get(h)||g.get(g.settings.root_element)||g.doc,[])},is:function(h,g){return e(this.get(h)).is(g)}}};d.onCreate=function(g,i,h){d.extend(h,a[i])}})(window.jQuery,tinymce);tinymce.create("tinymce.util.Dispatcher",{scope:null,listeners:null,Dispatcher:function(a){this.scope=a||this;this.listeners=[]},add:function(a,b){this.listeners.push({cb:a,scope:b||this.scope});return a},addToTop:function(a,b){this.listeners.unshift({cb:a,scope:b||this.scope});return a},remove:function(a){var b=this.listeners,c=null;tinymce.each(b,function(e,d){if(a==e.cb){c=a;b.splice(d,1);return false}});return c},dispatch:function(){var f,d=arguments,e,b=this.listeners,g;for(e=0;e<b.length;e++){g=b[e];f=g.cb.apply(g.scope,d);if(f===false){break}}return f}});(function(){var a=tinymce.each;tinymce.create("tinymce.util.URI",{URI:function(e,g){var f=this,i,d,c,h;e=tinymce.trim(e);g=f.settings=g||{};if(/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e)){f.source=e;return}if(e.indexOf("/")===0&&e.indexOf("//")!==0){e=(g.base_uri?g.base_uri.protocol||"http":"http")+"://mce_host"+e}if(!/^[\w-]*:?\/\//.test(e)){h=g.base_uri?g.base_uri.path:new tinymce.util.URI(location.href).directory;e=((g.base_uri&&g.base_uri.protocol)||"http")+"://mce_host"+f.toAbsPath(h,e)}e=e.replace(/@@/g,"(mce_at)");e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e);a(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],function(b,j){var k=e[j];if(k){k=k.replace(/\(mce_at\)/g,"@@")}f[b]=k});if(c=g.base_uri){if(!f.protocol){f.protocol=c.protocol}if(!f.userInfo){f.userInfo=c.userInfo}if(!f.port&&f.host=="mce_host"){f.port=c.port}if(!f.host||f.host=="mce_host"){f.host=c.host}f.source=""}},setPath:function(c){var b=this;c=/^(.*?)\/?(\w+)?$/.exec(c);b.path=c[0];b.directory=c[1];b.file=c[2];b.source="";b.getURI()},toRelative:function(b){var c=this,d;if(b==="./"){return b}b=new tinymce.util.URI(b,{base_uri:c});if((b.host!="mce_host"&&c.host!=b.host&&b.host)||c.port!=b.port||c.protocol!=b.protocol){return b.getURI()}d=c.toRelPath(c.path,b.path);if(b.query){d+="?"+b.query}if(b.anchor){d+="#"+b.anchor}return d},toAbsolute:function(b,c){var b=new tinymce.util.URI(b,{base_uri:this});return b.getURI(this.host==b.host&&this.protocol==b.protocol?c:0)},toRelPath:function(g,h){var c,f=0,d="",e,b;g=g.substring(0,g.lastIndexOf("/"));g=g.split("/");c=h.split("/");if(g.length>=c.length){for(e=0,b=g.length;e<b;e++){if(e>=c.length||g[e]!=c[e]){f=e+1;break}}}if(g.length<c.length){for(e=0,b=c.length;e<b;e++){if(e>=g.length||g[e]!=c[e]){f=e+1;break}}}if(f==1){return h}for(e=0,b=g.length-(f-1);e<b;e++){d+="../"}for(e=f-1,b=c.length;e<b;e++){if(e!=f-1){d+="/"+c[e]}else{d+=c[e]}}return d},toAbsPath:function(e,f){var c,b=0,h=[],d,g;d=/\/$/.test(f)?"/":"";e=e.split("/");f=f.split("/");a(e,function(i){if(i){h.push(i)}});e=h;for(c=f.length-1,h=[];c>=0;c--){if(f[c].length==0||f[c]=="."){continue}if(f[c]==".."){b++;continue}if(b>0){b--;continue}h.push(f[c])}c=e.length-b;if(c<=0){g=h.reverse().join("/")}else{g=e.slice(0,c).join("/")+"/"+h.reverse().join("/")}if(g.indexOf("/")!==0){g="/"+g}if(d&&g.lastIndexOf("/")!==g.length-1){g+=d}return g},getURI:function(d){var c,b=this;if(!b.source||d){c="";if(!d){if(b.protocol){c+=b.protocol+"://"}if(b.userInfo){c+=b.userInfo+"@"}if(b.host){c+=b.host}if(b.port){c+=":"+b.port}}if(b.path){c+=b.path}if(b.query){c+="?"+b.query}if(b.anchor){c+="#"+b.anchor}b.source=c}return b.source}})})();(function(){var a=tinymce.each;tinymce.create("static tinymce.util.Cookie",{getHash:function(d){var b=this.get(d),c;if(b){a(b.split("&"),function(e){e=e.split("=");c=c||{};c[unescape(e[0])]=unescape(e[1])})}return c},setHash:function(j,b,g,f,i,c){var h="";a(b,function(e,d){h+=(!h?"":"&")+escape(d)+"="+escape(e)});this.set(j,h,g,f,i,c)},get:function(i){var h=document.cookie,g,f=i+"=",d;if(!h){return}d=h.indexOf("; "+f);if(d==-1){d=h.indexOf(f);if(d!=0){return null}}else{d+=2}g=h.indexOf(";",d);if(g==-1){g=h.length}return unescape(h.substring(d+f.length,g))},set:function(i,b,g,f,h,c){document.cookie=i+"="+escape(b)+((g)?"; expires="+g.toGMTString():"")+((f)?"; path="+escape(f):"")+((h)?"; domain="+h:"")+((c)?"; secure":"")},remove:function(e,b){var c=new Date();c.setTime(c.getTime()-1000);this.set(e,"",c,b,c)}})})();(function(){function serialize(o,quote){var i,v,t;quote=quote||'"';if(o==null){return"null"}t=typeof o;if(t=="string"){v="\bb\tt\nn\ff\rr\"\"''\\\\";return quote+o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g,function(a,b){if(quote==='"'&&a==="'"){return a}i=v.indexOf(b);if(i+1){return"\\"+v.charAt(i+1)}a=b.charCodeAt().toString(16);return"\\u"+"0000".substring(a.length)+a})+quote}if(t=="object"){if(o.hasOwnProperty&&o instanceof Array){for(i=0,v="[";i<o.length;i++){v+=(i>0?",":"")+serialize(o[i],quote)}return v+"]"}v="{";for(i in o){if(o.hasOwnProperty(i)){v+=typeof o[i]!="function"?(v.length>1?","+quote:quote)+i+quote+":"+serialize(o[i],quote):""}}return v+"}"}return""+o}tinymce.util.JSON={serialize:serialize,parse:function(s){try{return eval("("+s+")")}catch(ex){}}}})();tinymce.create("static tinymce.util.XHR",{send:function(g){var a,e,b=window,h=0;g.scope=g.scope||this;g.success_scope=g.success_scope||g.scope;g.error_scope=g.error_scope||g.scope;g.async=g.async===false?false:true;g.data=g.data||"";function d(i){a=0;try{a=new ActiveXObject(i)}catch(c){}return a}a=b.XMLHttpRequest?new XMLHttpRequest():d("Microsoft.XMLHTTP")||d("Msxml2.XMLHTTP");if(a){if(a.overrideMimeType){a.overrideMimeType(g.content_type)}a.open(g.type||(g.data?"POST":"GET"),g.url,g.async);if(g.content_type){a.setRequestHeader("Content-Type",g.content_type)}a.setRequestHeader("X-Requested-With","XMLHttpRequest");a.send(g.data);function f(){if(!g.async||a.readyState==4||h++>10000){if(g.success&&h<10000&&a.status==200){g.success.call(g.success_scope,""+a.responseText,a,g)}else{if(g.error){g.error.call(g.error_scope,h>10000?"TIMED_OUT":"GENERAL",a,g)}}a=null}else{b.setTimeout(f,10)}}if(!g.async){return f()}e=b.setTimeout(f,10)}}});(function(){var c=tinymce.extend,b=tinymce.util.JSON,a=tinymce.util.XHR;tinymce.create("tinymce.util.JSONRequest",{JSONRequest:function(d){this.settings=c({},d);this.count=0},send:function(f){var e=f.error,d=f.success;f=c(this.settings,f);f.success=function(h,g){h=b.parse(h);if(typeof(h)=="undefined"){h={error:"JSON Parse error."}}if(h.error){e.call(f.error_scope||f.scope,h.error,g)}else{d.call(f.success_scope||f.scope,h.result)}};f.error=function(h,g){if(e){e.call(f.error_scope||f.scope,h,g)}};f.data=b.serialize({id:f.id||"c"+(this.count++),method:f.method,params:f.params});f.content_type="application/json";a.send(f)},"static":{sendRPC:function(d){return new tinymce.util.JSONRequest().send(d)}}})}());(function(a){a.VK={DELETE:46,BACKSPACE:8,ENTER:13,TAB:9,SPACEBAR:32,UP:38,DOWN:40}})(tinymce);(function(k){var i=k.VK,j=i.BACKSPACE,h=i.DELETE;function c(m){var o=m.dom,n=m.selection;m.onKeyDown.add(function(q,u){var p,v,s,t,r;r=u.keyCode==h;if(r||u.keyCode==j){u.preventDefault();p=n.getRng();v=o.getParent(p.startContainer,o.isBlock);if(r){v=o.getNext(v,o.isBlock)}if(v){s=v.firstChild;while(s&&s.nodeType==3&&s.nodeValue.length==0){s=s.nextSibling}if(s&&s.nodeName==="SPAN"){t=s.cloneNode(false)}}q.getDoc().execCommand(r?"ForwardDelete":"Delete",false,null);v=o.getParent(p.startContainer,o.isBlock);k.each(o.select("span.Apple-style-span,font.Apple-style-span",v),function(x){var y=n.getBookmark();if(t){o.replace(t.cloneNode(false),x,true)}else{o.remove(x,true)}n.moveToBookmark(y)})}})}function d(m){m.onKeyUp.add(function(n,p){var o=p.keyCode;if(o==h||o==j){if(n.dom.isEmpty(n.getBody())){n.setContent("",{format:"raw"});n.nodeChanged();return}}})}function b(m){m.dom.bind(m.getDoc(),"focusin",function(){m.selection.setRng(m.selection.getRng())})}function e(m){m.onKeyDown.add(function(n,q){if(q.keyCode===j){if(n.selection.isCollapsed()&&n.selection.getRng(true).startOffset===0){var p=n.selection.getNode();var o=p.previousSibling;if(o&&o.nodeName&&o.nodeName.toLowerCase()==="hr"){n.dom.remove(o);k.dom.Event.cancel(q)}}}})}function g(m){if(!Range.prototype.getClientRects){m.onMouseDown.add(function(o,p){if(p.target.nodeName==="HTML"){var n=o.getBody();n.blur();setTimeout(function(){n.focus()},0)}})}}function f(m){m.onClick.add(function(n,o){o=o.target;if(/^(IMG|HR)$/.test(o.nodeName)){n.selection.getSel().setBaseAndExtent(o,0,o,1)}if(o.nodeName=="A"&&n.dom.hasClass(o,"mceItemAnchor")){n.selection.select(o)}n.nodeChanged()})}function l(m){var o,n;m.dom.bind(m.getDoc(),"selectionchange",function(){if(n){clearTimeout(n);n=0}n=window.setTimeout(function(){var p=m.selection.getRng();if(!o||!k.dom.RangeUtils.compareRanges(p,o)){m.nodeChanged();o=p}},50)})}function a(m){document.body.setAttribute("role","application")}k.create("tinymce.util.Quirks",{Quirks:function(m){if(k.isWebKit){c(m);d(m);b(m);f(m);if(k.isIDevice){l(m)}}if(k.isIE){e(m);d(m);a(m)}if(k.isGecko){e(m);g(m)}}})})(tinymce);(function(j){var a,g,d,k=/[&<>\"\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,b=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,f=/[<>&\"\']/g,c=/&(#x|#)?([\w]+);/g,i={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"};g={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;"};d={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"};function h(l){var m;m=document.createElement("div");m.innerHTML=l;return m.textContent||m.innerText||l}function e(m,p){var n,o,l,q={};if(m){m=m.split(",");p=p||10;for(n=0;n<m.length;n+=2){o=String.fromCharCode(parseInt(m[n],p));if(!g[o]){l="&"+m[n+1]+";";q[o]=l;q[l]=o}}return q}}a=e("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);j.html=j.html||{};j.html.Entities={encodeRaw:function(m,l){return m.replace(l?k:b,function(n){return g[n]||n})},encodeAllRaw:function(l){return(""+l).replace(f,function(m){return g[m]||m})},encodeNumeric:function(m,l){return m.replace(l?k:b,function(n){if(n.length>1){return"&#"+(((n.charCodeAt(0)-55296)*1024)+(n.charCodeAt(1)-56320)+65536)+";"}return g[n]||"&#"+n.charCodeAt(0)+";"})},encodeNamed:function(n,l,m){m=m||a;return n.replace(l?k:b,function(o){return g[o]||m[o]||o})},getEncodeFunc:function(l,o){var p=j.html.Entities;o=e(o)||a;function m(r,q){return r.replace(q?k:b,function(s){return g[s]||o[s]||"&#"+s.charCodeAt(0)+";"||s})}function n(r,q){return p.encodeNamed(r,q,o)}l=j.makeMap(l.replace(/\+/g,","));if(l.named&&l.numeric){return m}if(l.named){if(o){return n}return p.encodeNamed}if(l.numeric){return p.encodeNumeric}return p.encodeRaw},decode:function(l){return l.replace(c,function(n,m,o){if(m){o=parseInt(o,m.length===2?16:10);if(o>65535){o-=65536;return String.fromCharCode(55296+(o>>10),56320+(o&1023))}else{return i[o]||String.fromCharCode(o)}}return d[n]||a[n]||h(n)})}}})(tinymce);tinymce.html.Styles=function(d,f){var k=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,h=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,b=/\s*([^:]+):\s*([^;]+);?/g,l=/\s+$/,m=/rgb/,e,g,a={},j;d=d||{};j="\\\" \\' \\; \\: ; : \uFEFF".split(" ");for(g=0;g<j.length;g++){a[j[g]]="\uFEFF"+g;a["\uFEFF"+g]=j[g]}function c(n,q,p,i){function o(r){r=parseInt(r).toString(16);return r.length>1?r:"0"+r}return"#"+o(q)+o(p)+o(i)}return{toHex:function(i){return i.replace(k,c)},parse:function(r){var y={},p,n,v,q,u=d.url_converter,x=d.url_converter_scope||this;function o(C,F){var E,B,A,D;E=y[C+"-top"+F];if(!E){return}B=y[C+"-right"+F];if(E!=B){return}A=y[C+"-bottom"+F];if(B!=A){return}D=y[C+"-left"+F];if(A!=D){return}y[C+F]=D;delete y[C+"-top"+F];delete y[C+"-right"+F];delete y[C+"-bottom"+F];delete y[C+"-left"+F]}function t(B){var C=y[B],A;if(!C||C.indexOf(" ")<0){return}C=C.split(" ");A=C.length;while(A--){if(C[A]!==C[0]){return false}}y[B]=C[0];return true}function z(C,B,A,D){if(!t(B)){return}if(!t(A)){return}if(!t(D)){return}y[C]=y[B]+" "+y[A]+" "+y[D];delete y[B];delete y[A];delete y[D]}function s(A){q=true;return a[A]}function i(B,A){if(q){B=B.replace(/\uFEFF[0-9]/g,function(C){return a[C]})}if(!A){B=B.replace(/\\([\'\";:])/g,"$1")}return B}if(r){r=r.replace(/\\[\"\';:\uFEFF]/g,s).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(A){return A.replace(/[;:]/g,s)});while(p=b.exec(r)){n=p[1].replace(l,"").toLowerCase();v=p[2].replace(l,"");if(n&&v.length>0){if(n==="font-weight"&&v==="700"){v="bold"}else{if(n==="color"||n==="background-color"){v=v.toLowerCase()}}v=v.replace(k,c);v=v.replace(h,function(B,A,E,D,F,C){F=F||C;if(F){F=i(F);return"'"+F.replace(/\'/g,"\\'")+"'"}A=i(A||E||D);if(u){A=u.call(x,A,"style")}return"url('"+A.replace(/\'/g,"\\'")+"')"});y[n]=q?i(v,true):v}b.lastIndex=p.index+p[0].length}o("border","");o("border","-width");o("border","-color");o("border","-style");o("padding","");o("margin","");z("border","border-width","border-style","border-color");if(y.border==="medium none"){delete y.border}}return y},serialize:function(p,r){var o="",n,q;function i(t){var x,u,s,v;x=f.styles[t];if(x){for(u=0,s=x.length;u<s;u++){t=x[u];v=p[t];if(v!==e&&v.length>0){o+=(o.length>0?" ":"")+t+": "+v+";"}}}}if(r&&f&&f.styles){i("*");i(r)}else{for(n in p){q=p[n];if(q!==e&&q.length>0){o+=(o.length>0?" ":"")+n+": "+q+";"}}}return o}}};(function(m){var h={},j,l,g,f,c={},b,e,d=m.makeMap,k=m.each;function i(o,n){return o.split(n||",")}function a(r,q){var o,p={};function n(s){return s.replace(/[A-Z]+/g,function(t){return n(r[t])})}for(o in r){if(r.hasOwnProperty(o)){r[o]=n(r[o])}}n(q).replace(/#/g,"#text").replace(/(\w+)\[([^\]]+)\]\[([^\]]*)\]/g,function(v,t,s,u){s=i(s,"|");p[t]={attributes:d(s),attributesOrder:s,children:d(u,"|",{"#comment":{}})}});return p}l="h1,h2,h3,h4,h5,h6,hr,p,div,address,pre,form,table,tbody,thead,tfoot,th,tr,td,li,ol,ul,caption,blockquote,center,dl,dt,dd,dir,fieldset,noscript,menu,isindex,samp,header,footer,article,section,hgroup";l=d(l,",",d(l.toUpperCase()));h=a({Z:"H|K|N|O|P",Y:"X|form|R|Q",ZG:"E|span|width|align|char|charoff|valign",X:"p|T|div|U|W|isindex|fieldset|table",ZF:"E|align|char|charoff|valign",W:"pre|hr|blockquote|address|center|noframes",ZE:"abbr|axis|headers|scope|rowspan|colspan|align|char|charoff|valign|nowrap|bgcolor|width|height",ZD:"[E][S]",U:"ul|ol|dl|menu|dir",ZC:"p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q",T:"h1|h2|h3|h4|h5|h6",ZB:"X|S|Q",S:"R|P",ZA:"a|G|J|M|O|P",R:"a|H|K|N|O",Q:"noscript|P",P:"ins|del|script",O:"input|select|textarea|label|button",N:"M|L",M:"em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym",L:"sub|sup",K:"J|I",J:"tt|i|b|u|s|strike",I:"big|small|font|basefont",H:"G|F",G:"br|span|bdo",F:"object|applet|img|map|iframe",E:"A|B|C",D:"accesskey|tabindex|onfocus|onblur",C:"onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup",B:"lang|xml:lang|dir",A:"id|class|style|title"},"script[id|charset|type|language|src|defer|xml:space][]style[B|id|type|media|title|xml:space][]object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]param[id|name|value|valuetype|type][]p[E|align][#|S]a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]br[A|clear][]span[E][#|S]bdo[A|C|B][#|S]applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]h1[E|align][#|S]img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]map[B|C|A|name][X|form|Q|area]h2[E|align][#|S]iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]h3[E|align][#|S]tt[E][#|S]i[E][#|S]b[E][#|S]u[E][#|S]s[E][#|S]strike[E][#|S]big[E][#|S]small[E][#|S]font[A|B|size|color|face][#|S]basefont[id|size|color|face][]em[E][#|S]strong[E][#|S]dfn[E][#|S]code[E][#|S]q[E|cite][#|S]samp[E][#|S]kbd[E][#|S]var[E][#|S]cite[E][#|S]abbr[E][#|S]acronym[E][#|S]sub[E][#|S]sup[E][#|S]input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]optgroup[E|disabled|label][option]option[E|selected|disabled|label|value][]textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]label[E|for|accesskey|onfocus|onblur][#|S]button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]h4[E|align][#|S]ins[E|cite|datetime][#|Y]h5[E|align][#|S]del[E|cite|datetime][#|Y]h6[E|align][#|S]div[E|align][#|Y]ul[E|type|compact][li]li[E|type|value][#|Y]ol[E|type|compact|start][li]dl[E|compact][dt|dd]dt[E][#|S]dd[E][#|Y]menu[E|compact][li]dir[E|compact][li]pre[E|width|xml:space][#|ZA]hr[E|align|noshade|size|width][]blockquote[E|cite][#|Y]address[E][#|S|p]center[E][#|Y]noframes[E][#|Y]isindex[A|B|prompt][]fieldset[E][#|legend|Y]legend[E|accesskey|align][#|S]table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]caption[E|align][#|S]col[ZG][]colgroup[ZG][col]thead[ZF][tr]tr[ZF|bgcolor][th|td]th[E|ZE][#|Y]form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]noscript[E][#|Y]td[E|ZE][#|Y]tfoot[ZF][tr]tbody[ZF][tr]area[E|D|shape|coords|href|nohref|alt|target][]base[id|href|target][]body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]");j=d("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected,autoplay,loop,controls");g=d("area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed,source");f=m.extend(d("td,th,iframe,video,audio,object"),g);b=d("pre,script,style,textarea");e=d("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");m.html.Schema=function(r){var A=this,n={},o={},y=[],q,p;r=r||{};if(r.verify_html===false){r.valid_elements="*[*]"}if(r.valid_styles){q={};k(r.valid_styles,function(C,B){q[B]=m.explode(C)})}p=r.whitespace_elements?d(r.whitespace_elements):b;function z(B){return new RegExp("^"+B.replace(/([?+*])/g,".$1")+"$")}function t(I){var H,D,W,S,X,C,F,R,U,N,V,Z,L,G,T,B,P,E,Y,aa,M,Q,K=/^([#+-])?([^\[\/]+)(?:\/([^\[]+))?(?:\[([^\]]+)\])?$/,O=/^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,J=/[*?+]/;if(I){I=i(I);if(n["@"]){P=n["@"].attributes;E=n["@"].attributesOrder}for(H=0,D=I.length;H<D;H++){C=K.exec(I[H]);if(C){T=C[1];N=C[2];B=C[3];U=C[4];L={};G=[];F={attributes:L,attributesOrder:G};if(T==="#"){F.paddEmpty=true}if(T==="-"){F.removeEmpty=true}if(P){for(aa in P){L[aa]=P[aa]}G.push.apply(G,E)}if(U){U=i(U,"|");for(W=0,S=U.length;W<S;W++){C=O.exec(U[W]);if(C){R={};Z=C[1];V=C[2].replace(/::/g,":");T=C[3];Q=C[4];if(Z==="!"){F.attributesRequired=F.attributesRequired||[];F.attributesRequired.push(V);R.required=true}if(Z==="-"){delete L[V];G.splice(m.inArray(G,V),1);continue}if(T){if(T==="="){F.attributesDefault=F.attributesDefault||[];F.attributesDefault.push({name:V,value:Q});R.defaultValue=Q}if(T===":"){F.attributesForced=F.attributesForced||[];F.attributesForced.push({name:V,value:Q});R.forcedValue=Q}if(T==="<"){R.validValues=d(Q,"?")}}if(J.test(V)){F.attributePatterns=F.attributePatterns||[];R.pattern=z(V);F.attributePatterns.push(R)}else{if(!L[V]){G.push(V)}L[V]=R}}}}if(!P&&N=="@"){P=L;E=G}if(B){F.outputName=N;n[B]=F}if(J.test(N)){F.pattern=z(N);y.push(F)}else{n[N]=F}}}}}function v(B){n={};y=[];t(B);k(h,function(D,C){o[C]=D.children})}function s(C){var B=/^(~)?(.+)$/;if(C){k(i(C),function(G){var E=B.exec(G),F=E[1]==="~",H=F?"span":"div",D=E[2];o[D]=o[H];c[D]=H;if(!F){l[D]={}}k(o,function(I,J){if(I[H]){I[D]=I[H]}})})}}function u(C){var B=/^([+\-]?)(\w+)\[([^\]]+)\]$/;if(C){k(i(C),function(G){var F=B.exec(G),D,E;if(F){E=F[1];if(E){D=o[F[2]]}else{D=o[F[2]]={"#comment":{}}}D=o[F[2]];k(i(F[3],"|"),function(H){if(E==="-"){delete D[H]}else{D[H]={}}})}})}}function x(B){var D=n[B],C;if(D){return D}C=y.length;while(C--){D=y[C];if(D.pattern.test(B)){return D}}}if(!r.valid_elements){k(h,function(C,B){n[B]={attributes:C.attributes,attributesOrder:C.attributesOrder};o[B]=C.children});k(i("strong/b,em/i"),function(B){B=i(B,"/");n[B[1]].outputName=B[0]});n.img.attributesDefault=[{name:"alt",value:""}];k(i("ol,ul,sub,sup,blockquote,span,font,a,table,tbody,tr"),function(B){n[B].removeEmpty=true});k(i("p,h1,h2,h3,h4,h5,h6,th,td,pre,div,address,caption"),function(B){n[B].paddEmpty=true})}else{v(r.valid_elements)}s(r.custom_elements);u(r.valid_children);t(r.extended_valid_elements);u("+ol[ul|ol],+ul[ul|ol]");if(!x("span")){t("span[!data-mce-type|*]")}if(r.invalid_elements){m.each(m.explode(r.invalid_elements),function(B){if(n[B]){delete n[B]}})}A.children=o;A.styles=q;A.getBoolAttrs=function(){return j};A.getBlockElements=function(){return l};A.getShortEndedElements=function(){return g};A.getSelfClosingElements=function(){return e};A.getNonEmptyElements=function(){return f};A.getWhiteSpaceElements=function(){return p};A.isValidChild=function(B,D){var C=o[B];return !!(C&&C[D])};A.getElementRule=x;A.getCustomElements=function(){return c};A.addValidElements=t;A.setValidElements=v;A.addCustomElements=s;A.addValidChildren=u};m.html.Schema.boolAttrMap=j;m.html.Schema.blockElementsMap=l})(tinymce);(function(a){a.html.SaxParser=function(c,e){var b=this,d=function(){};c=c||{};b.schema=e=e||new a.html.Schema();if(c.fix_self_closing!==false){c.fix_self_closing=true}a.each("comment cdata text start end pi doctype".split(" "),function(f){if(f){b[f]=c[f]||d}});b.parse=function(D){var n=this,g,F=0,H,A,z=[],M,P,B,q,y,r,L,G,N,u,m,k,s,Q,o,O,E,R,K,f,I,l,C,J,h,v=0,j=a.html.Entities.decode,x,p;function t(S){var U,T;U=z.length;while(U--){if(z[U].name===S){break}}if(U>=0){for(T=z.length-1;T>=U;T--){S=z[T];if(S.valid){n.end(S.name)}}z.length=U}}l=new RegExp("<(?:(?:!--([\\w\\W]*?)-->)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:!DOCTYPE([\\w\\W]*?)>)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([^>]+)>)|(?:([^\\s\\/<>]+)((?:\\s+[^\"'>]+(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>]*))*|\\/)>))","g");C=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:\\.|[^\"])*)\")|(?:\'((?:\\.|[^\'])*)\')|([^>\s]+)))?/g;J={script:/<\/script[^>]*>/gi,style:/<\/style[^>]*>/gi,noscript:/<\/noscript[^>]*>/gi};L=e.getShortEndedElements();I=e.getSelfClosingElements();G=e.getBoolAttrs();u=c.validate;r=c.remove_internals;x=c.fix_self_closing;p=a.isIE;o=/^:/;while(g=l.exec(D)){if(F<g.index){n.text(j(D.substr(F,g.index-F)))}if(H=g[6]){H=H.toLowerCase();if(p&&o.test(H)){H=H.substr(1)}t(H)}else{if(H=g[7]){H=H.toLowerCase();if(p&&o.test(H)){H=H.substr(1)}N=H in L;if(x&&I[H]&&z.length>0&&z[z.length-1].name===H){t(H)}if(!u||(m=e.getElementRule(H))){k=true;if(u){O=m.attributes;E=m.attributePatterns}if(Q=g[8]){y=Q.indexOf("data-mce-type")!==-1;if(y&&r){k=false}M=[];M.map={};Q.replace(C,function(T,S,X,W,V){var Y,U;S=S.toLowerCase();X=S in G?S:j(X||W||V||"");if(u&&!y&&S.indexOf("data-")!==0){Y=O[S];if(!Y&&E){U=E.length;while(U--){Y=E[U];if(Y.pattern.test(S)){break}}if(U===-1){Y=null}}if(!Y){return}if(Y.validValues&&!(X in Y.validValues)){return}}M.map[S]=X;M.push({name:S,value:X})})}else{M=[];M.map={}}if(u&&!y){R=m.attributesRequired;K=m.attributesDefault;f=m.attributesForced;if(f){P=f.length;while(P--){s=f[P];q=s.name;h=s.value;if(h==="{$uid}"){h="mce_"+v++}M.map[q]=h;M.push({name:q,value:h})}}if(K){P=K.length;while(P--){s=K[P];q=s.name;if(!(q in M.map)){h=s.value;if(h==="{$uid}"){h="mce_"+v++}M.map[q]=h;M.push({name:q,value:h})}}}if(R){P=R.length;while(P--){if(R[P] in M.map){break}}if(P===-1){k=false}}if(M.map["data-mce-bogus"]){k=false}}if(k){n.start(H,M,N)}}else{k=false}if(A=J[H]){A.lastIndex=F=g.index+g[0].length;if(g=A.exec(D)){if(k){B=D.substr(F,g.index-F)}F=g.index+g[0].length}else{B=D.substr(F);F=D.length}if(k&&B.length>0){n.text(B,true)}if(k){n.end(H)}l.lastIndex=F;continue}if(!N){if(!Q||Q.indexOf("/")!=Q.length-1){z.push({name:H,valid:k})}else{if(k){n.end(H)}}}}else{if(H=g[1]){n.comment(H)}else{if(H=g[2]){n.cdata(H)}else{if(H=g[3]){n.doctype(H)}else{if(H=g[4]){n.pi(H,g[5])}}}}}}F=g.index+g[0].length}if(F<D.length){n.text(j(D.substr(F)))}for(P=z.length-1;P>=0;P--){H=z[P];if(H.valid){n.end(H.name)}}}}})(tinymce);(function(d){var c=/^[ \t\r\n]*$/,e={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11};function a(k,l,j){var i,h,f=j?"lastChild":"firstChild",g=j?"prev":"next";if(k[f]){return k[f]}if(k!==l){i=k[g];if(i){return i}for(h=k.parent;h&&h!==l;h=h.parent){i=h[g];if(i){return i}}}}function b(f,g){this.name=f;this.type=g;if(g===1){this.attributes=[];this.attributes.map={}}}d.extend(b.prototype,{replace:function(g){var f=this;if(g.parent){g.remove()}f.insert(g,f);f.remove();return f},attr:function(h,l){var f=this,g,j,k;if(typeof h!=="string"){for(j in h){f.attr(j,h[j])}return f}if(g=f.attributes){if(l!==k){if(l===null){if(h in g.map){delete g.map[h];j=g.length;while(j--){if(g[j].name===h){g=g.splice(j,1);return f}}}return f}if(h in g.map){j=g.length;while(j--){if(g[j].name===h){g[j].value=l;break}}}else{g.push({name:h,value:l})}g.map[h]=l;return f}else{return g.map[h]}}},clone:function(){var g=this,n=new b(g.name,g.type),h,f,m,j,k;if(m=g.attributes){k=[];k.map={};for(h=0,f=m.length;h<f;h++){j=m[h];if(j.name!=="id"){k[k.length]={name:j.name,value:j.value};k.map[j.name]=j.value}}n.attributes=k}n.value=g.value;n.shortEnded=g.shortEnded;return n},wrap:function(g){var f=this;f.parent.insert(g,f);g.append(f);return f},unwrap:function(){var f=this,h,g;for(h=f.firstChild;h;){g=h.next;f.insert(h,f,true);h=g}f.remove()},remove:function(){var f=this,h=f.parent,g=f.next,i=f.prev;if(h){if(h.firstChild===f){h.firstChild=g;if(g){g.prev=null}}else{i.next=g}if(h.lastChild===f){h.lastChild=i;if(i){i.next=null}}else{g.prev=i}f.parent=f.next=f.prev=null}return f},append:function(h){var f=this,g;if(h.parent){h.remove()}g=f.lastChild;if(g){g.next=h;h.prev=g;f.lastChild=h}else{f.lastChild=f.firstChild=h}h.parent=f;return h},insert:function(h,f,i){var g;if(h.parent){h.remove()}g=f.parent||this;if(i){if(f===g.firstChild){g.firstChild=h}else{f.prev.next=h}h.prev=f.prev;h.next=f;f.prev=h}else{if(f===g.lastChild){g.lastChild=h}else{f.next.prev=h}h.next=f.next;h.prev=f;f.next=h}h.parent=g;return h},getAll:function(g){var f=this,h,i=[];for(h=f.firstChild;h;h=a(h,f)){if(h.name===g){i.push(h)}}return i},empty:function(){var g=this,f,h,j;if(g.firstChild){f=[];for(j=g.firstChild;j;j=a(j,g)){f.push(j)}h=f.length;while(h--){j=f[h];j.parent=j.firstChild=j.lastChild=j.next=j.prev=null}}g.firstChild=g.lastChild=null;return g},isEmpty:function(k){var f=this,j=f.firstChild,h,g;if(j){do{if(j.type===1){if(j.attributes.map["data-mce-bogus"]){continue}if(k[j.name]){return false}h=j.attributes.length;while(h--){g=j.attributes[h].name;if(g==="name"||g.indexOf("data-")===0){return false}}}if((j.type===3&&!c.test(j.value))){return false}}while(j=a(j,f))}return true},walk:function(f){return a(this,null,f)}});d.extend(b,{create:function(g,f){var i,h;i=new b(g,e[g]||1);if(f){for(h in f){i.attr(h,f[h])}}return i}});d.html.Node=b})(tinymce);(function(b){var a=b.html.Node;b.html.DomParser=function(g,h){var f=this,e={},d=[],i={},c={};g=g||{};g.validate="validate" in g?g.validate:true;g.root_name=g.root_name||"body";f.schema=h=h||new b.html.Schema();function j(m){var o,p,x,v,z,n,q,l,t,u,k,s,y,r;s=b.makeMap("tr,td,th,tbody,thead,tfoot,table");k=h.getNonEmptyElements();for(o=0;o<m.length;o++){p=m[o];if(!p.parent){continue}v=[p];for(x=p.parent;x&&!h.isValidChild(x.name,p.name)&&!s[x.name];x=x.parent){v.push(x)}if(x&&v.length>1){v.reverse();z=n=f.filterNode(v[0].clone());for(t=0;t<v.length-1;t++){if(h.isValidChild(n.name,v[t].name)){q=f.filterNode(v[t].clone());n.append(q)}else{q=n}for(l=v[t].firstChild;l&&l!=v[t+1];){r=l.next;q.append(l);l=r}n=q}if(!z.isEmpty(k)){x.insert(z,v[0],true);x.insert(p,z)}else{x.insert(p,v[0],true)}x=v[0];if(x.isEmpty(k)||x.firstChild===x.lastChild&&x.firstChild.name==="br"){x.empty().remove()}}else{if(p.parent){if(p.name==="li"){y=p.prev;if(y&&(y.name==="ul"||y.name==="ul")){y.append(p);continue}y=p.next;if(y&&(y.name==="ul"||y.name==="ul")){y.insert(p,y.firstChild,true);continue}p.wrap(f.filterNode(new a("ul",1)));continue}if(h.isValidChild(p.parent.name,"div")&&h.isValidChild("div",p.name)){p.wrap(f.filterNode(new a("div",1)))}else{if(p.name==="style"||p.name==="script"){p.empty().remove()}else{p.unwrap()}}}}}}f.filterNode=function(m){var l,k,n;if(k in e){n=i[k];if(n){n.push(m)}else{i[k]=[m]}}l=d.length;while(l--){k=d[l].name;if(k in m.attributes.map){n=c[k];if(n){n.push(m)}else{c[k]=[m]}}}return m};f.addNodeFilter=function(k,l){b.each(b.explode(k),function(m){var n=e[m];if(!n){e[m]=n=[]}n.push(l)})};f.addAttributeFilter=function(k,l){b.each(b.explode(k),function(m){var n;for(n=0;n<d.length;n++){if(d[n].name===m){d[n].callbacks.push(l);return}}d.push({name:m,callbacks:[l]})})};f.parse=function(v,m){var n,H,A,z,C,B,x,r,E,K,y,o,D,J=[],t,k,s,p,u,q;m=m||{};i={};c={};o=b.extend(b.makeMap("script,style,head,html,body,title,meta,param"),h.getBlockElements());u=h.getNonEmptyElements();p=h.children;y=g.validate;q="forced_root_block" in m?m.forced_root_block:g.forced_root_block;s=h.getWhiteSpaceElements();D=/^[ \t\r\n]+/;t=/[ \t\r\n]+$/;k=/[ \t\r\n]+/g;function F(){var L=H.firstChild,l,M;while(L){l=L.next;if(L.type==3||(L.type==1&&L.name!=="p"&&!o[L.name]&&!L.attr("data-mce-type"))){if(!M){M=I(q,1);H.insert(M,L);M.append(L)}else{M.append(L)}}else{M=null}L=l}}function I(l,L){var M=new a(l,L),N;if(l in e){N=i[l];if(N){N.push(M)}else{i[l]=[M]}}return M}function G(M){var N,l,L;for(N=M.prev;N&&N.type===3;){l=N.value.replace(t,"");if(l.length>0){N.value=l;N=N.prev}else{L=N.prev;N.remove();N=L}}}n=new b.html.SaxParser({validate:y,fix_self_closing:!y,cdata:function(l){A.append(I("#cdata",4)).value=l},text:function(M,l){var L;if(!s[A.name]){M=M.replace(k," ");if(A.lastChild&&o[A.lastChild.name]){M=M.replace(D,"")}}if(M.length!==0){L=I("#text",3);L.raw=!!l;A.append(L).value=M}},comment:function(l){A.append(I("#comment",8)).value=l},pi:function(l,L){A.append(I(l,7)).value=L;G(A)},doctype:function(L){var l;l=A.append(I("#doctype",10));l.value=L;G(A)},start:function(l,T,M){var R,O,N,L,P,U,S,Q;N=y?h.getElementRule(l):{};if(N){R=I(N.outputName||l,1);R.attributes=T;R.shortEnded=M;A.append(R);Q=p[A.name];if(Q&&p[R.name]&&!Q[R.name]){J.push(R)}O=d.length;while(O--){P=d[O].name;if(P in T.map){E=c[P];if(E){E.push(R)}else{c[P]=[R]}}}if(o[l]){G(R)}if(!M){A=R}}},end:function(l){var P,M,O,L,N;M=y?h.getElementRule(l):{};if(M){if(o[l]){if(!s[A.name]){for(P=A.firstChild;P&&P.type===3;){O=P.value.replace(D,"");if(O.length>0){P.value=O;P=P.next}else{L=P.next;P.remove();P=L}}for(P=A.lastChild;P&&P.type===3;){O=P.value.replace(t,"");if(O.length>0){P.value=O;P=P.prev}else{L=P.prev;P.remove();P=L}}}P=A.prev;if(P&&P.type===3){O=P.value.replace(D,"");if(O.length>0){P.value=O}else{P.remove()}}}if(M.removeEmpty||M.paddEmpty){if(A.isEmpty(u)){if(M.paddEmpty){A.empty().append(new a("#text","3")).value="\u00a0"}else{if(!A.attributes.map.name){N=A.parent;A.empty().remove();A=N;return}}}}A=A.parent}}},h);H=A=new a(m.context||g.root_name,11);n.parse(v);if(y&&J.length){if(!m.context){j(J)}else{m.invalid=true}}if(q&&H.name=="body"){F()}if(!m.invalid){for(K in i){E=e[K];z=i[K];x=z.length;while(x--){if(!z[x].parent){z.splice(x,1)}}for(C=0,B=E.length;C<B;C++){E[C](z,K,m)}}for(C=0,B=d.length;C<B;C++){E=d[C];if(E.name in c){z=c[E.name];x=z.length;while(x--){if(!z[x].parent){z.splice(x,1)}}for(x=0,r=E.callbacks.length;x<r;x++){E.callbacks[x](z,E.name,m)}}}}return H};if(g.remove_trailing_brs){f.addNodeFilter("br",function(n,m){var r,q=n.length,o,u=h.getBlockElements(),k=h.getNonEmptyElements(),s,p,t;u.body=1;for(r=0;r<q;r++){o=n[r];s=o.parent;if(u[o.parent.name]&&o===s.lastChild){p=o.prev;while(p){t=p.name;if(t!=="span"||p.attr("data-mce-type")!=="bookmark"){if(t!=="br"){break}if(t==="br"){o=null;break}}p=p.prev}if(o){o.remove();if(s.isEmpty(k)){elementRule=h.getElementRule(s.name);if(elementRule){if(elementRule.removeEmpty){s.remove()}else{if(elementRule.paddEmpty){s.empty().append(new b.html.Node("#text",3)).value="\u00a0"}}}}}}}})}}})(tinymce);tinymce.html.Writer=function(e){var c=[],a,b,d,f,g;e=e||{};a=e.indent;b=tinymce.makeMap(e.indent_before||"");d=tinymce.makeMap(e.indent_after||"");f=tinymce.html.Entities.getEncodeFunc(e.entity_encoding||"raw",e.entities);g=e.element_format=="html";return{start:function(m,k,p){var n,j,h,o;if(a&&b[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}c.push("<",m);if(k){for(n=0,j=k.length;n<j;n++){h=k[n];c.push(" ",h.name,'="',f(h.value,true),'"')}}if(!p||g){c[c.length]=">"}else{c[c.length]=" />"}if(p&&a&&d[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}},end:function(h){var i;c.push("</",h,">");if(a&&d[h]&&c.length>0){i=c[c.length-1];if(i.length>0&&i!=="\n"){c.push("\n")}}},text:function(i,h){if(i.length>0){c[c.length]=h?i:f(i)}},cdata:function(h){c.push("<![CDATA[",h,"]]>")},comment:function(h){c.push("<!--",h,"-->")},pi:function(h,i){if(i){c.push("<?",h," ",i,"?>")}else{c.push("<?",h,"?>")}if(a){c.push("\n")}},doctype:function(h){c.push("<!DOCTYPE",h,">",a?"\n":"")},reset:function(){c.length=0},getContent:function(){return c.join("").replace(/\n$/,"")}}};(function(a){a.html.Serializer=function(c,d){var b=this,e=new a.html.Writer(c);c=c||{};c.validate="validate" in c?c.validate:true;b.schema=d=d||new a.html.Schema();b.writer=e;b.serialize=function(h){var g,i;i=c.validate;g={3:function(k,j){e.text(k.value,k.raw)},8:function(j){e.comment(j.value)},7:function(j){e.pi(j.name,j.value)},10:function(j){e.doctype(j.value)},4:function(j){e.cdata(j.value)},11:function(j){if((j=j.firstChild)){do{f(j)}while(j=j.next)}}};e.reset();function f(k){var t=g[k.type],j,o,s,r,p,u,n,m,q;if(!t){j=k.name;o=k.shortEnded;s=k.attributes;if(i&&s&&s.length>1){u=[];u.map={};q=d.getElementRule(k.name);for(n=0,m=q.attributesOrder.length;n<m;n++){r=q.attributesOrder[n];if(r in s.map){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}for(n=0,m=s.length;n<m;n++){r=s[n].name;if(!(r in u.map)){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}s=u}e.start(k.name,s,o);if(!o){if((k=k.firstChild)){do{f(k)}while(k=k.next)}e.end(j)}}else{t(k)}}if(h.type==1&&!c.inner){f(h)}else{g[11](h)}return e.getContent()}}})(tinymce);(function(h){var f=h.each,e=h.is,d=h.isWebKit,b=h.isIE,c=h.html.Entities,a=/^([a-z0-9],?)+$/i,g=h.html.Schema.blockElementsMap,i=/^[ \t\r\n]*$/;h.create("tinymce.dom.DOMUtils",{doc:null,root:null,files:null,pixelStyles:/^(top|left|bottom|right|width|height|borderWidth)$/,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"},DOMUtils:function(o,m){var l=this,j,k;l.doc=o;l.win=window;l.files={};l.cssFlicker=false;l.counter=0;l.stdMode=!h.isIE||o.documentMode>=8;l.boxModel=!h.isIE||o.compatMode=="CSS1Compat"||l.stdMode;l.hasOuterHTML="outerHTML" in o.createElement("a");l.settings=m=h.extend({keep_values:false,hex_colors:1},m);l.schema=m.schema;l.styles=new h.html.Styles({url_converter:m.url_converter,url_converter_scope:m.url_converter_scope},m.schema);if(h.isIE6){try{o.execCommand("BackgroundImageCache",false,true)}catch(n){l.cssFlicker=true}}if(b&&m.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(p){o.createElement(p)});for(k in m.schema.getCustomElements()){o.createElement(k)}}h.addUnload(l.destroy,l)},getRoot:function(){var j=this,k=j.settings;return(k&&j.get(k.root_element))||j.doc.body},getViewPort:function(k){var l,j;k=!k?this.win:k;l=k.document;j=this.boxModel?l.documentElement:l.body;return{x:k.pageXOffset||j.scrollLeft,y:k.pageYOffset||j.scrollTop,w:k.innerWidth||j.clientWidth,h:k.innerHeight||j.clientHeight}},getRect:function(m){var l,j=this,k;m=j.get(m);l=j.getPos(m);k=j.getSize(m);return{x:l.x,y:l.y,w:k.w,h:k.h}},getSize:function(m){var k=this,j,l;m=k.get(m);j=k.getStyle(m,"width");l=k.getStyle(m,"height");if(j.indexOf("px")===-1){j=0}if(l.indexOf("px")===-1){l=0}return{w:parseInt(j)||m.offsetWidth||m.clientWidth,h:parseInt(l)||m.offsetHeight||m.clientHeight}},getParent:function(l,k,j){return this.getParents(l,k,j,false)},getParents:function(u,p,l,s){var k=this,j,m=k.settings,q=[];u=k.get(u);s=s===undefined;if(m.strict_root){l=l||k.getRoot()}if(e(p,"string")){j=p;if(p==="*"){p=function(o){return o.nodeType==1}}else{p=function(o){return k.is(o,j)}}}while(u){if(u==l||!u.nodeType||u.nodeType===9){break}if(!p||p(u)){if(s){q.push(u)}else{return u}}u=u.parentNode}return s?q:null},get:function(j){var k;if(j&&this.doc&&typeof(j)=="string"){k=j;j=this.doc.getElementById(j);if(j&&j.id!==k){return this.doc.getElementsByName(k)[1]}}return j},getNext:function(k,j){return this._findSib(k,j,"nextSibling")},getPrev:function(k,j){return this._findSib(k,j,"previousSibling")},add:function(m,q,j,l,o){var k=this;return this.run(m,function(s){var r,n;r=e(q,"string")?k.doc.createElement(q):q;k.setAttribs(r,j);if(l){if(l.nodeType){r.appendChild(l)}else{k.setHTML(r,l)}}return !o?s.appendChild(r):r})},create:function(l,j,k){return this.add(this.doc.createElement(l),l,j,k,1)},createHTML:function(r,j,p){var q="",m=this,l;q+="<"+r;for(l in j){if(j.hasOwnProperty(l)){q+=" "+l+'="'+m.encode(j[l])+'"'}}if(typeof(p)!="undefined"){return q+">"+p+"</"+r+">"}return q+" />"},remove:function(j,k){return this.run(j,function(m){var n,l=m.parentNode;if(!l){return null}if(k){while(n=m.firstChild){if(!h.isIE||n.nodeType!==3||n.nodeValue){l.insertBefore(n,m)}else{m.removeChild(n)}}}return l.removeChild(m)})},setStyle:function(m,j,k){var l=this;return l.run(m,function(p){var o,n;o=p.style;j=j.replace(/-(\D)/g,function(r,q){return q.toUpperCase()});if(l.pixelStyles.test(j)&&(h.is(k,"number")||/^[\-0-9\.]+$/.test(k))){k+="px"}switch(j){case"opacity":if(b){o.filter=k===""?"":"alpha(opacity="+(k*100)+")";if(!m.currentStyle||!m.currentStyle.hasLayout){o.display="inline-block"}}o[j]=o["-moz-opacity"]=o["-khtml-opacity"]=k||"";break;case"float":b?o.styleFloat=k:o.cssFloat=k;break;default:o[j]=k||""}if(l.settings.update_styles){l.setAttrib(p,"data-mce-style")}})},getStyle:function(m,j,l){m=this.get(m);if(!m){return}if(this.doc.defaultView&&l){j=j.replace(/[A-Z]/g,function(n){return"-"+n});try{return this.doc.defaultView.getComputedStyle(m,null).getPropertyValue(j)}catch(k){return null}}j=j.replace(/-(\D)/g,function(o,n){return n.toUpperCase()});if(j=="float"){j=b?"styleFloat":"cssFloat"}if(m.currentStyle&&l){return m.currentStyle[j]}return m.style?m.style[j]:undefined},setStyles:function(m,n){var k=this,l=k.settings,j;j=l.update_styles;l.update_styles=0;f(n,function(o,p){k.setStyle(m,p,o)});l.update_styles=j;if(l.update_styles){k.setAttrib(m,l.cssText)}},removeAllAttribs:function(j){return this.run(j,function(m){var l,k=m.attributes;for(l=k.length-1;l>=0;l--){m.removeAttributeNode(k.item(l))}})},setAttrib:function(l,m,j){var k=this;if(!l||!m){return}if(k.settings.strict){m=m.toLowerCase()}return this.run(l,function(o){var n=k.settings;if(j!==null){switch(m){case"style":if(!e(j,"string")){f(j,function(p,q){k.setStyle(o,q,p)});return}if(n.keep_values){if(j&&!k._isRes(j)){o.setAttribute("data-mce-style",j,2)}else{o.removeAttribute("data-mce-style",2)}}o.style.cssText=j;break;case"class":o.className=j||"";break;case"src":case"href":if(n.keep_values){if(n.url_converter){j=n.url_converter.call(n.url_converter_scope||k,j,m,o)}k.setAttrib(o,"data-mce-"+m,j,2)}break;case"shape":o.setAttribute("data-mce-style",j);break}}if(e(j)&&j!==null&&j.length!==0){o.setAttribute(m,""+j,2)}else{o.removeAttribute(m,2)}})},setAttribs:function(k,l){var j=this;return this.run(k,function(m){f(l,function(o,p){j.setAttrib(m,p,o)})})},getAttrib:function(o,p,l){var j,k=this,m;o=k.get(o);if(!o||o.nodeType!==1){return l===m?false:l}if(!e(l)){l=""}if(/^(src|href|style|coords|shape)$/.test(p)){j=o.getAttribute("data-mce-"+p);if(j){return j}}if(b&&k.props[p]){j=o[k.props[p]];j=j&&j.nodeValue?j.nodeValue:j}if(!j){j=o.getAttribute(p,2)}if(/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(p)){if(o[k.props[p]]===true&&j===""){return p}return j?p:""}if(o.nodeName==="FORM"&&o.getAttributeNode(p)){return o.getAttributeNode(p).nodeValue}if(p==="style"){j=j||o.style.cssText;if(j){j=k.serializeStyle(k.parseStyle(j),o.nodeName);if(k.settings.keep_values&&!k._isRes(j)){o.setAttribute("data-mce-style",j)}}}if(d&&p==="class"&&j){j=j.replace(/(apple|webkit)\-[a-z\-]+/gi,"")}if(b){switch(p){case"rowspan":case"colspan":if(j===1){j=""}break;case"size":if(j==="+0"||j===20||j===0){j=""}break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":if(j===0){j=""}break;case"hspace":if(j===-1){j=""}break;case"maxlength":case"tabindex":if(j===32768||j===2147483647||j==="32768"){j=""}break;case"multiple":case"compact":case"noshade":case"nowrap":if(j===65535){return p}return l;case"shape":j=j.toLowerCase();break;default:if(p.indexOf("on")===0&&j){j=h._replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/,"$1",""+j)}}}return(j!==m&&j!==null&&j!=="")?""+j:l},getPos:function(s,m){var k=this,j=0,q=0,o,p=k.doc,l;s=k.get(s);m=m||p.body;if(s){if(s.getBoundingClientRect){s=s.getBoundingClientRect();o=k.boxModel?p.documentElement:p.body;j=s.left+(p.documentElement.scrollLeft||p.body.scrollLeft)-o.clientTop;q=s.top+(p.documentElement.scrollTop||p.body.scrollTop)-o.clientLeft;return{x:j,y:q}}l=s;while(l&&l!=m&&l.nodeType){j+=l.offsetLeft||0;q+=l.offsetTop||0;l=l.offsetParent}l=s.parentNode;while(l&&l!=m&&l.nodeType){j-=l.scrollLeft||0;q-=l.scrollTop||0;l=l.parentNode}}return{x:j,y:q}},parseStyle:function(j){return this.styles.parse(j)},serializeStyle:function(k,j){return this.styles.serialize(k,j)},loadCSS:function(j){var l=this,m=l.doc,k;if(!j){j=""}k=l.select("head")[0];f(j.split(","),function(n){var o;if(l.files[n]){return}l.files[n]=true;o=l.create("link",{rel:"stylesheet",href:h._addVer(n)});if(b&&m.documentMode&&m.recalc){o.onload=function(){if(m.recalc){m.recalc()}o.onload=null}}k.appendChild(o)})},addClass:function(j,k){return this.run(j,function(l){var m;if(!k){return 0}if(this.hasClass(l,k)){return l.className}m=this.removeClass(l,k);return l.className=(m!=""?(m+" "):"")+k})},removeClass:function(l,m){var j=this,k;return j.run(l,function(o){var n;if(j.hasClass(o,m)){if(!k){k=new RegExp("(^|\\s+)"+m+"(\\s+|$)","g")}n=o.className.replace(k," ");n=h.trim(n!=" "?n:"");o.className=n;if(!n){o.removeAttribute("class");o.removeAttribute("className")}return n}return o.className})},hasClass:function(k,j){k=this.get(k);if(!k||!j){return false}return(" "+k.className+" ").indexOf(" "+j+" ")!==-1},show:function(j){return this.setStyle(j,"display","block")},hide:function(j){return this.setStyle(j,"display","none")},isHidden:function(j){j=this.get(j);return !j||j.style.display=="none"||this.getStyle(j,"display")=="none"},uniqueId:function(j){return(!j?"mce_":j)+(this.counter++)},setHTML:function(l,k){var j=this;return j.run(l,function(n){if(b){while(n.firstChild){n.removeChild(n.firstChild)}try{n.innerHTML="<br />"+k;n.removeChild(n.firstChild)}catch(m){n=j.create("div");n.innerHTML="<br />"+k;f(n.childNodes,function(p,o){if(o){n.appendChild(p)}})}}else{n.innerHTML=k}return k})},getOuterHTML:function(l){var k,j=this;l=j.get(l);if(!l){return null}if(l.nodeType===1&&j.hasOuterHTML){return l.outerHTML}k=(l.ownerDocument||j.doc).createElement("body");k.appendChild(l.cloneNode(true));return k.innerHTML},setOuterHTML:function(m,k,n){var j=this;function l(p,o,r){var s,q;q=r.createElement("body");q.innerHTML=o;s=q.lastChild;while(s){j.insertAfter(s.cloneNode(true),p);s=s.previousSibling}j.remove(p)}return this.run(m,function(p){p=j.get(p);if(p.nodeType==1){n=n||p.ownerDocument||j.doc;if(b){try{if(b&&p.nodeType==1){p.outerHTML=k}else{l(p,k,n)}}catch(o){l(p,k,n)}}else{l(p,k,n)}}})},decode:c.decode,encode:c.encodeAllRaw,insertAfter:function(j,k){k=this.get(k);return this.run(j,function(m){var l,n;l=k.parentNode;n=k.nextSibling;if(n){l.insertBefore(m,n)}else{l.appendChild(m)}return m})},isBlock:function(k){var j=k.nodeType;if(j){return !!(j===1&&g[k.nodeName])}return !!g[k]},replace:function(p,m,j){var l=this;if(e(m,"array")){p=p.cloneNode(true)}return l.run(m,function(k){if(j){f(h.grep(k.childNodes),function(n){p.appendChild(n)})}return k.parentNode.replaceChild(p,k)})},rename:function(m,j){var l=this,k;if(m.nodeName!=j.toUpperCase()){k=l.create(j);f(l.getAttribs(m),function(n){l.setAttrib(k,n.nodeName,l.getAttrib(m,n.nodeName))});l.replace(k,m,1)}return k||m},findCommonAncestor:function(l,j){var m=l,k;while(m){k=j;while(k&&m!=k){k=k.parentNode}if(m==k){break}m=m.parentNode}if(!m&&l.ownerDocument){return l.ownerDocument.documentElement}return m},toHex:function(j){var l=/^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(j);function k(m){m=parseInt(m).toString(16);return m.length>1?m:"0"+m}if(l){j="#"+k(l[1])+k(l[2])+k(l[3]);return j}return j},getClasses:function(){var n=this,j=[],m,o={},p=n.settings.class_filter,l;if(n.classes){return n.classes}function q(r){f(r.imports,function(s){q(s)});f(r.cssRules||r.rules,function(s){switch(s.type||1){case 1:if(s.selectorText){f(s.selectorText.split(","),function(t){t=t.replace(/^\s*|\s*$|^\s\./g,"");if(/\.mce/.test(t)||!/\.[\w\-]+$/.test(t)){return}l=t;t=h._replace(/.*\.([a-z0-9_\-]+).*/i,"$1",t);if(p&&!(t=p(t,l))){return}if(!o[t]){j.push({"class":t});o[t]=1}})}break;case 3:q(s.styleSheet);break}})}try{f(n.doc.styleSheets,q)}catch(k){}if(j.length>0){n.classes=j}return j},run:function(m,l,k){var j=this,n;if(j.doc&&typeof(m)==="string"){m=j.get(m)}if(!m){return false}k=k||this;if(!m.nodeType&&(m.length||m.length===0)){n=[];f(m,function(p,o){if(p){if(typeof(p)=="string"){p=j.doc.getElementById(p)}n.push(l.call(k,p,o))}});return n}return l.call(k,m)},getAttribs:function(k){var j;k=this.get(k);if(!k){return[]}if(b){j=[];if(k.nodeName=="OBJECT"){return k.attributes}if(k.nodeName==="OPTION"&&this.getAttrib(k,"selected")){j.push({specified:1,nodeName:"selected"})}k.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi,"").replace(/[\w:\-]+/gi,function(l){j.push({specified:1,nodeName:l})});return j}return k.attributes},isEmpty:function(m,k){var r=this,o,n,q,j,l,p;m=m.firstChild;if(m){j=new h.dom.TreeWalker(m);k=k||r.schema?r.schema.getNonEmptyElements():null;do{q=m.nodeType;if(q===1){if(m.getAttribute("data-mce-bogus")){continue}l=m.nodeName.toLowerCase();if(k&&k[l]){p=m.parentNode;if(l==="br"&&r.isBlock(p)&&p.firstChild===m&&p.lastChild===m){continue}return false}n=r.getAttribs(m);o=m.attributes.length;while(o--){l=m.attributes[o].nodeName;if(l==="name"||l==="data-mce-bookmark"){return false}}}if((q===3&&!i.test(m.nodeValue))){return false}}while(m=j.next())}return true},destroy:function(k){var j=this;if(j.events){j.events.destroy()}j.win=j.doc=j.root=j.events=null;if(!k){h.removeUnload(j.destroy)}},createRng:function(){var j=this.doc;return j.createRange?j.createRange():new h.dom.Range(this)},nodeIndex:function(n,o){var j=0,l,m,k;if(n){for(l=n.nodeType,n=n.previousSibling,m=n;n;n=n.previousSibling){k=n.nodeType;if(o&&k==3){if(k==l||!n.nodeValue.length){continue}}j++;l=k}}return j},split:function(n,m,q){var s=this,j=s.createRng(),o,l,p;function k(v){var t,r=v.childNodes,u=v.nodeType;if(u==1&&v.getAttribute("data-mce-type")=="bookmark"){return}for(t=r.length-1;t>=0;t--){k(r[t])}if(u!=9){if(u==3&&v.nodeValue.length>0){if(!s.isBlock(v.parentNode)||h.trim(v.nodeValue).length>0){return}}else{if(u==1){r=v.childNodes;if(r.length==1&&r[0]&&r[0].nodeType==1&&r[0].getAttribute("data-mce-type")=="bookmark"){v.parentNode.insertBefore(r[0],v)}if(r.length||/^(br|hr|input|img)$/i.test(v.nodeName)){return}}}s.remove(v)}return v}if(n&&m){j.setStart(n.parentNode,s.nodeIndex(n));j.setEnd(m.parentNode,s.nodeIndex(m));o=j.extractContents();j=s.createRng();j.setStart(m.parentNode,s.nodeIndex(m)+1);j.setEnd(n.parentNode,s.nodeIndex(n)+1);l=j.extractContents();p=n.parentNode;p.insertBefore(k(o),n);if(q){p.replaceChild(q,m)}else{p.insertBefore(m,n)}p.insertBefore(k(l),n);s.remove(n);return q||m}},bind:function(n,j,m,l){var k=this;if(!k.events){k.events=new h.dom.EventUtils()}return k.events.add(n,j,m,l||this)},unbind:function(m,j,l){var k=this;if(!k.events){k.events=new h.dom.EventUtils()}return k.events.remove(m,j,l)},_findSib:function(m,j,k){var l=this,n=j;if(m){if(e(n,"string")){n=function(o){return l.is(o,j)}}for(m=m[k];m;m=m[k]){if(n(m)){return m}}}return null},_isRes:function(j){return/^(top|left|bottom|right|width|height)/i.test(j)||/;\s*(top|left|bottom|right|width|height)/i.test(j)}});h.DOM=new h.dom.DOMUtils(document,{process_html:0})})(tinymce);(function(a){function b(c){var N=this,e=c.doc,S=0,E=1,j=2,D=true,R=false,U="startOffset",h="startContainer",P="endContainer",z="endOffset",k=tinymce.extend,n=c.nodeIndex;k(N,{startContainer:e,startOffset:0,endContainer:e,endOffset:0,collapsed:D,commonAncestorContainer:e,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:q,setEnd:s,setStartBefore:g,setStartAfter:I,setEndBefore:J,setEndAfter:u,collapse:A,selectNode:x,selectNodeContents:F,compareBoundaryPoints:v,deleteContents:p,extractContents:H,cloneContents:d,insertNode:C,surroundContents:M,cloneRange:K});function q(V,t){B(D,V,t)}function s(V,t){B(R,V,t)}function g(t){q(t.parentNode,n(t))}function I(t){q(t.parentNode,n(t)+1)}function J(t){s(t.parentNode,n(t))}function u(t){s(t.parentNode,n(t)+1)}function A(t){if(t){N[P]=N[h];N[z]=N[U]}else{N[h]=N[P];N[U]=N[z]}N.collapsed=D}function x(t){g(t);u(t)}function F(t){q(t,0);s(t,t.nodeType===1?t.childNodes.length:t.nodeValue.length)}function v(Y,t){var ab=N[h],W=N[U],aa=N[P],V=N[z],Z=t.startContainer,ad=t.startOffset,X=t.endContainer,ac=t.endOffset;if(Y===0){return G(ab,W,Z,ad)}if(Y===1){return G(aa,V,Z,ad)}if(Y===2){return G(aa,V,X,ac)}if(Y===3){return G(ab,W,X,ac)}}function p(){m(j)}function H(){return m(S)}function d(){return m(E)}function C(Y){var V=this[h],t=this[U],X,W;if((V.nodeType===3||V.nodeType===4)&&V.nodeValue){if(!t){V.parentNode.insertBefore(Y,V)}else{if(t>=V.nodeValue.length){c.insertAfter(Y,V)}else{X=V.splitText(t);V.parentNode.insertBefore(Y,X)}}}else{if(V.childNodes.length>0){W=V.childNodes[t]}if(W){V.insertBefore(Y,W)}else{V.appendChild(Y)}}}function M(V){var t=N.extractContents();N.insertNode(V);V.appendChild(t);N.selectNode(V)}function K(){return k(new b(c),{startContainer:N[h],startOffset:N[U],endContainer:N[P],endOffset:N[z],collapsed:N.collapsed,commonAncestorContainer:N.commonAncestorContainer})}function O(t,V){var W;if(t.nodeType==3){return t}if(V<0){return t}W=t.firstChild;while(W&&V>0){--V;W=W.nextSibling}if(W){return W}return t}function l(){return(N[h]==N[P]&&N[U]==N[z])}function G(X,Z,V,Y){var aa,W,t,ab,ad,ac;if(X==V){if(Z==Y){return 0}if(Z<Y){return -1}return 1}aa=V;while(aa&&aa.parentNode!=X){aa=aa.parentNode}if(aa){W=0;t=X.firstChild;while(t!=aa&&W<Z){W++;t=t.nextSibling}if(Z<=W){return -1}return 1}aa=X;while(aa&&aa.parentNode!=V){aa=aa.parentNode}if(aa){W=0;t=V.firstChild;while(t!=aa&&W<Y){W++;t=t.nextSibling}if(W<Y){return -1}return 1}ab=c.findCommonAncestor(X,V);ad=X;while(ad&&ad.parentNode!=ab){ad=ad.parentNode}if(!ad){ad=ab}ac=V;while(ac&&ac.parentNode!=ab){ac=ac.parentNode}if(!ac){ac=ab}if(ad==ac){return 0}t=ab.firstChild;while(t){if(t==ad){return -1}if(t==ac){return 1}t=t.nextSibling}}function B(V,Y,X){var t,W;if(V){N[h]=Y;N[U]=X}else{N[P]=Y;N[z]=X}t=N[P];while(t.parentNode){t=t.parentNode}W=N[h];while(W.parentNode){W=W.parentNode}if(W==t){if(G(N[h],N[U],N[P],N[z])>0){N.collapse(V)}}else{N.collapse(V)}N.collapsed=l();N.commonAncestorContainer=c.findCommonAncestor(N[h],N[P])}function m(ab){var aa,X=0,ad=0,V,Z,W,Y,t,ac;if(N[h]==N[P]){return f(ab)}for(aa=N[P],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[h]){return r(aa,ab)}++X}for(aa=N[h],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[P]){return T(aa,ab)}++ad}Z=ad-X;W=N[h];while(Z>0){W=W.parentNode;Z--}Y=N[P];while(Z<0){Y=Y.parentNode;Z++}for(t=W.parentNode,ac=Y.parentNode;t!=ac;t=t.parentNode,ac=ac.parentNode){W=t;Y=ac}return o(W,Y,ab)}function f(Z){var ab,Y,X,aa,t,W,V;if(Z!=j){ab=e.createDocumentFragment()}if(N[U]==N[z]){return ab}if(N[h].nodeType==3){Y=N[h].nodeValue;X=Y.substring(N[U],N[z]);if(Z!=E){N[h].deleteData(N[U],N[z]-N[U]);N.collapse(D)}if(Z==j){return}ab.appendChild(e.createTextNode(X));return ab}aa=O(N[h],N[U]);t=N[z]-N[U];while(t>0){W=aa.nextSibling;V=y(aa,Z);if(ab){ab.appendChild(V)}--t;aa=W}if(Z!=E){N.collapse(D)}return ab}function r(ab,Y){var aa,Z,V,t,X,W;if(Y!=j){aa=e.createDocumentFragment()}Z=i(ab,Y);if(aa){aa.appendChild(Z)}V=n(ab);t=V-N[U];if(t<=0){if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}Z=ab.previousSibling;while(t>0){X=Z.previousSibling;W=y(Z,Y);if(aa){aa.insertBefore(W,aa.firstChild)}--t;Z=X}if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}function T(Z,Y){var ab,V,aa,t,X,W;if(Y!=j){ab=e.createDocumentFragment()}aa=Q(Z,Y);if(ab){ab.appendChild(aa)}V=n(Z);++V;t=N[z]-V;aa=Z.nextSibling;while(t>0){X=aa.nextSibling;W=y(aa,Y);if(ab){ab.appendChild(W)}--t;aa=X}if(Y!=E){N.setStartAfter(Z);N.collapse(D)}return ab}function o(Z,t,ac){var W,ae,Y,aa,ab,V,ad,X;if(ac!=j){ae=e.createDocumentFragment()}W=Q(Z,ac);if(ae){ae.appendChild(W)}Y=Z.parentNode;aa=n(Z);ab=n(t);++aa;V=ab-aa;ad=Z.nextSibling;while(V>0){X=ad.nextSibling;W=y(ad,ac);if(ae){ae.appendChild(W)}ad=X;--V}W=i(t,ac);if(ae){ae.appendChild(W)}if(ac!=E){N.setStartAfter(Z);N.collapse(D)}return ae}function i(aa,ab){var W=O(N[P],N[z]-1),ac,Z,Y,t,V,X=W!=N[P];if(W==aa){return L(W,X,R,ab)}ac=W.parentNode;Z=L(ac,R,R,ab);while(ac){while(W){Y=W.previousSibling;t=L(W,X,R,ab);if(ab!=j){Z.insertBefore(t,Z.firstChild)}X=D;W=Y}if(ac==aa){return Z}W=ac.previousSibling;ac=ac.parentNode;V=L(ac,R,R,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function Q(aa,ab){var X=O(N[h],N[U]),Y=X!=N[h],ac,Z,W,t,V;if(X==aa){return L(X,Y,D,ab)}ac=X.parentNode;Z=L(ac,R,D,ab);while(ac){while(X){W=X.nextSibling;t=L(X,Y,D,ab);if(ab!=j){Z.appendChild(t)}Y=D;X=W}if(ac==aa){return Z}X=ac.nextSibling;ac=ac.parentNode;V=L(ac,R,D,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function L(t,Y,ab,ac){var X,W,Z,V,aa;if(Y){return y(t,ac)}if(t.nodeType==3){X=t.nodeValue;if(ab){V=N[U];W=X.substring(V);Z=X.substring(0,V)}else{V=N[z];W=X.substring(0,V);Z=X.substring(V)}if(ac!=E){t.nodeValue=Z}if(ac==j){return}aa=t.cloneNode(R);aa.nodeValue=W;return aa}if(ac==j){return}return t.cloneNode(R)}function y(V,t){if(t!=j){return t==E?V.cloneNode(D):V}V.parentNode.removeChild(V)}}a.Range=b})(tinymce.dom);(function(){function a(d){var b=this,h=d.dom,c=true,f=false;function e(i,j){var k,t=0,q,n,m,l,o,r,p=-1,s;k=i.duplicate();k.collapse(j);s=k.parentElement();if(s.ownerDocument!==d.dom.doc){return}while(s.contentEditable==="false"){s=s.parentNode}if(!s.hasChildNodes()){return{node:s,inside:1}}m=s.children;q=m.length-1;while(t<=q){r=Math.floor((t+q)/2);l=m[r];k.moveToElementText(l);p=k.compareEndPoints(j?"StartToStart":"EndToEnd",i);if(p>0){q=r-1}else{if(p<0){t=r+1}else{return{node:l}}}}if(p<0){if(!l){k.moveToElementText(s);k.collapse(true);l=s;n=true}else{k.collapse(false)}k.setEndPoint(j?"EndToStart":"EndToEnd",i);if(k.compareEndPoints(j?"StartToStart":"StartToEnd",i)>0){k=i.duplicate();k.collapse(j);o=-1;while(s==k.parentElement()){if(k.move("character",-1)==0){break}o++}}o=o||k.text.replace("\r\n"," ").length}else{k.collapse(true);k.setEndPoint(j?"StartToStart":"StartToEnd",i);o=k.text.replace("\r\n"," ").length}return{node:l,position:p,offset:o,inside:n}}function g(){var i=d.getRng(),r=h.createRng(),l,k,p,q,m,j;l=i.item?i.item(0):i.parentElement();if(l.ownerDocument!=h.doc){return r}k=d.isCollapsed();if(i.item){r.setStart(l.parentNode,h.nodeIndex(l));r.setEnd(r.startContainer,r.startOffset+1);return r}function o(A){var u=e(i,A),s,y,z=0,x,v,t;s=u.node;y=u.offset;if(u.inside&&!s.hasChildNodes()){r[A?"setStart":"setEnd"](s,0);return}if(y===v){r[A?"setStartBefore":"setEndAfter"](s);return}if(u.position<0){x=u.inside?s.firstChild:s.nextSibling;if(!x){r[A?"setStartAfter":"setEndAfter"](s);return}if(!y){if(x.nodeType==3){r[A?"setStart":"setEnd"](x,0)}else{r[A?"setStartBefore":"setEndBefore"](x)}return}while(x){t=x.nodeValue;z+=t.length;if(z>=y){s=x;z-=y;z=t.length-z;break}x=x.nextSibling}}else{x=s.previousSibling;if(!x){return r[A?"setStartBefore":"setEndBefore"](s)}if(!y){if(s.nodeType==3){r[A?"setStart":"setEnd"](x,s.nodeValue.length)}else{r[A?"setStartAfter":"setEndAfter"](x)}return}while(x){z+=x.nodeValue.length;if(z>=y){s=x;z-=y;break}x=x.previousSibling}}r[A?"setStart":"setEnd"](s,z)}try{o(true);if(!k){o()}}catch(n){if(n.number==-2147024809){m=b.getBookmark(2);p=i.duplicate();p.collapse(true);l=p.parentElement();if(!k){p=i.duplicate();p.collapse(false);q=p.parentElement();q.innerHTML=q.innerHTML}l.innerHTML=l.innerHTML;b.moveToBookmark(m);i=d.getRng();o(true);if(!k){o()}}else{throw n}}return r}this.getBookmark=function(m){var j=d.getRng(),o,i,l={};function n(u){var u,t,p,s,r,q=[];t=u.parentNode;p=h.getRoot().parentNode;while(t!=p&&t.nodeType!==9){s=t.children;r=s.length;while(r--){if(u===s[r]){q.push(r);break}}u=t;t=t.parentNode}return q}function k(q){var p;p=e(j,q);if(p){return{position:p.position,offset:p.offset,indexes:n(p.node),inside:p.inside}}}if(m===2){if(!j.item){l.start=k(true);if(!d.isCollapsed()){l.end=k()}}else{l.start={ctrl:true,indexes:n(j.item(0))}}}return l};this.moveToBookmark=function(k){var j,i=h.doc.body;function m(o){var r,q,n,p;r=h.getRoot();for(q=o.length-1;q>=0;q--){p=r.children;n=o[q];if(n<=p.length-1){r=p[n]}}return r}function l(r){var n=k[r?"start":"end"],q,p,o;if(n){q=n.position>0;p=i.createTextRange();p.moveToElementText(m(n.indexes));offset=n.offset;if(offset!==o){p.collapse(n.inside||q);p.moveStart("character",q?-offset:offset)}else{p.collapse(r)}j.setEndPoint(r?"StartToStart":"EndToStart",p);if(r){j.collapse(true)}}}if(k.start){if(k.start.ctrl){j=i.createControlRange();j.addElement(m(k.start.indexes));j.select()}else{j=i.createTextRange();l(true);l();j.select()}}};this.addRange=function(i){var n,l,k,p,s,q,r=d.dom.doc,m=r.body;function j(z){var u,y,t,x,v;t=h.create("a");u=z?k:s;y=z?p:q;x=n.duplicate();if(u==r||u==r.documentElement){u=m;y=0}if(u.nodeType==3){u.parentNode.insertBefore(t,u);x.moveToElementText(t);x.moveStart("character",y);h.remove(t);n.setEndPoint(z?"StartToStart":"EndToEnd",x)}else{v=u.childNodes;if(v.length){if(y>=v.length){h.insertAfter(t,v[v.length-1])}else{u.insertBefore(t,v[y])}x.moveToElementText(t)}else{t=r.createTextNode("\uFEFF");u.appendChild(t);x.moveToElementText(t.parentNode);x.collapse(c)}n.setEndPoint(z?"StartToStart":"EndToEnd",x);h.remove(t)}}k=i.startContainer;p=i.startOffset;s=i.endContainer;q=i.endOffset;n=m.createTextRange();if(k==s&&k.nodeType==1&&p==q-1){if(p==q-1){try{l=m.createControlRange();l.addElement(k.childNodes[p]);l.select();return}catch(o){}}}j(true);j();n.select()};this.getRangeAt=g}tinymce.dom.TridentSelection=a})();(function(d){var f=d.each,c=d.DOM,b=d.isIE,e=d.isWebKit,a;d.create("tinymce.dom.EventUtils",{EventUtils:function(){this.inits=[];this.events=[]},add:function(m,p,l,j){var g,h=this,i=h.events,k;if(p instanceof Array){k=[];f(p,function(o){k.push(h.add(m,o,l,j))});return k}if(m&&m.hasOwnProperty&&m instanceof Array){k=[];f(m,function(n){n=c.get(n);k.push(h.add(n,p,l,j))});return k}m=c.get(m);if(!m){return}g=function(n){if(h.disabled){return}n=n||window.event;if(n&&b){if(!n.target){n.target=n.srcElement}d.extend(n,h._stoppers)}if(!j){return l(n)}return l.call(j,n)};if(p=="unload"){d.unloads.unshift({func:g});return g}if(p=="init"){if(h.domLoaded){g()}else{h.inits.push(g)}return g}i.push({obj:m,name:p,func:l,cfunc:g,scope:j});h._add(m,p,g);return l},remove:function(l,m,k){var h=this,g=h.events,i=false,j;if(l&&l.hasOwnProperty&&l instanceof Array){j=[];f(l,function(n){n=c.get(n);j.push(h.remove(n,m,k))});return j}l=c.get(l);f(g,function(o,n){if(o.obj==l&&o.name==m&&(!k||(o.func==k||o.cfunc==k))){g.splice(n,1);h._remove(l,m,o.cfunc);i=true;return false}});return i},clear:function(l){var j=this,g=j.events,h,k;if(l){l=c.get(l);for(h=g.length-1;h>=0;h--){k=g[h];if(k.obj===l){j._remove(k.obj,k.name,k.cfunc);k.obj=k.cfunc=null;g.splice(h,1)}}}},cancel:function(g){if(!g){return false}this.stop(g);return this.prevent(g)},stop:function(g){if(g.stopPropagation){g.stopPropagation()}else{g.cancelBubble=true}return false},prevent:function(g){if(g.preventDefault){g.preventDefault()}else{g.returnValue=false}return false},destroy:function(){var g=this;f(g.events,function(j,h){g._remove(j.obj,j.name,j.cfunc);j.obj=j.cfunc=null});g.events=[];g=null},_add:function(h,i,g){if(h.attachEvent){h.attachEvent("on"+i,g)}else{if(h.addEventListener){h.addEventListener(i,g,false)}else{h["on"+i]=g}}},_remove:function(i,j,h){if(i){try{if(i.detachEvent){i.detachEvent("on"+j,h)}else{if(i.removeEventListener){i.removeEventListener(j,h,false)}else{i["on"+j]=null}}}catch(g){}}},_pageInit:function(h){var g=this;if(g.domLoaded){return}g.domLoaded=true;f(g.inits,function(i){i()});g.inits=[]},_wait:function(i){var g=this,h=i.document;if(i.tinyMCE_GZ&&tinyMCE_GZ.loaded){g.domLoaded=1;return}if(h.attachEvent){h.attachEvent("onreadystatechange",function(){if(h.readyState==="complete"){h.detachEvent("onreadystatechange",arguments.callee);g._pageInit(i)}});if(h.documentElement.doScroll&&i==i.top){(function(){if(g.domLoaded){return}try{h.documentElement.doScroll("left")}catch(j){setTimeout(arguments.callee,0);return}g._pageInit(i)})()}}else{if(h.addEventListener){g._add(i,"DOMContentLoaded",function(){g._pageInit(i)})}}g._add(i,"load",function(){g._pageInit(i)})},_stoppers:{preventDefault:function(){this.returnValue=false},stopPropagation:function(){this.cancelBubble=true}}});a=d.dom.Event=new d.dom.EventUtils();a._wait(window);d.addUnload(function(){a.destroy()})})(tinymce);(function(a){a.dom.Element=function(f,d){var b=this,e,c;b.settings=d=d||{};b.id=f;b.dom=e=d.dom||a.DOM;if(!a.isIE){c=e.get(b.id)}a.each(("getPos,getRect,getParent,add,setStyle,getStyle,setStyles,setAttrib,setAttribs,getAttrib,addClass,removeClass,hasClass,getOuterHTML,setOuterHTML,remove,show,hide,isHidden,setHTML,get").split(/,/),function(g){b[g]=function(){var h=[f],j;for(j=0;j<arguments.length;j++){h.push(arguments[j])}h=e[g].apply(e,h);b.update(g);return h}});a.extend(b,{on:function(i,h,g){return a.dom.Event.add(b.id,i,h,g)},getXY:function(){return{x:parseInt(b.getStyle("left")),y:parseInt(b.getStyle("top"))}},getSize:function(){var g=e.get(b.id);return{w:parseInt(b.getStyle("width")||g.clientWidth),h:parseInt(b.getStyle("height")||g.clientHeight)}},moveTo:function(g,h){b.setStyles({left:g,top:h})},moveBy:function(g,i){var h=b.getXY();b.moveTo(h.x+g,h.y+i)},resizeTo:function(g,i){b.setStyles({width:g,height:i})},resizeBy:function(g,j){var i=b.getSize();b.resizeTo(i.w+g,i.h+j)},update:function(h){var g;if(a.isIE6&&d.blocker){h=h||"";if(h.indexOf("get")===0||h.indexOf("has")===0||h.indexOf("is")===0){return}if(h=="remove"){e.remove(b.blocker);return}if(!b.blocker){b.blocker=e.uniqueId();g=e.add(d.container||e.getRoot(),"iframe",{id:b.blocker,style:"position:absolute;",frameBorder:0,src:'javascript:""'});e.setStyle(g,"opacity",0)}else{g=e.get(b.blocker)}e.setStyles(g,{left:b.getStyle("left",1),top:b.getStyle("top",1),width:b.getStyle("width",1),height:b.getStyle("height",1),display:b.getStyle("display",1),zIndex:parseInt(b.getStyle("zIndex",1)||0)-1})}}})}})(tinymce);(function(c){function e(f){return f.replace(/[\n\r]+/g,"")}var b=c.is,a=c.isIE,d=c.each;c.create("tinymce.dom.Selection",{Selection:function(i,h,g){var f=this;f.dom=i;f.win=h;f.serializer=g;d(["onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent"],function(j){f[j]=new c.util.Dispatcher(f)});if(!f.win.getSelection){f.tridentSel=new c.dom.TridentSelection(f)}if(c.isIE&&i.boxModel){this._fixIESelection()}c.addUnload(f.destroy,f)},setCursorLocation:function(h,i){var f=this;var g=f.dom.createRng();g.setStart(h,i);g.setEnd(h,i);f.setRng(g);f.collapse(false)},getContent:function(g){var f=this,h=f.getRng(),l=f.dom.create("body"),j=f.getSel(),i,k,m;g=g||{};i=k="";g.get=true;g.format=g.format||"html";g.forced_root_block="";f.onBeforeGetContent.dispatch(f,g);if(g.format=="text"){return f.isCollapsed()?"":(h.text||(j.toString?j.toString():""))}if(h.cloneContents){m=h.cloneContents();if(m){l.appendChild(m)}}else{if(b(h.item)||b(h.htmlText)){l.innerHTML="<br>"+(h.item?h.item(0).outerHTML:h.htmlText);l.removeChild(l.firstChild)}else{l.innerHTML=h.toString()}}if(/^\s/.test(l.innerHTML)){i=" "}if(/\s+$/.test(l.innerHTML)){k=" "}g.getInner=true;g.content=f.isCollapsed()?"":i+f.serializer.serialize(l,g)+k;f.onGetContent.dispatch(f,g);return g.content},setContent:function(g,i){var n=this,f=n.getRng(),j,k=n.win.document,m,l;i=i||{format:"html"};i.set=true;g=i.content=g;if(!i.no_events){n.onBeforeSetContent.dispatch(n,i)}g=i.content;if(f.insertNode){g+='<span id="__caret">_</span>';if(f.startContainer==k&&f.endContainer==k){k.body.innerHTML=g}else{f.deleteContents();if(k.body.childNodes.length==0){k.body.innerHTML=g}else{if(f.createContextualFragment){f.insertNode(f.createContextualFragment(g))}else{m=k.createDocumentFragment();l=k.createElement("div");m.appendChild(l);l.outerHTML=g;f.insertNode(m)}}}j=n.dom.get("__caret");f=k.createRange();f.setStartBefore(j);f.setEndBefore(j);n.setRng(f);n.dom.remove("__caret");try{n.setRng(f)}catch(h){}}else{if(f.item){k.execCommand("Delete",false,null);f=n.getRng()}if(/^\s+/.test(g)){f.pasteHTML('<span id="__mce_tmp">_</span>'+g);n.dom.remove("__mce_tmp")}else{f.pasteHTML(g)}}if(!i.no_events){n.onSetContent.dispatch(n,i)}},getStart:function(){var g=this.getRng(),h,f,j,i;if(g.duplicate||g.item){if(g.item){return g.item(0)}j=g.duplicate();j.collapse(1);h=j.parentElement();f=i=g.parentElement();while(i=i.parentNode){if(i==h){h=f;break}}return h}else{h=g.startContainer;if(h.nodeType==1&&h.hasChildNodes()){h=h.childNodes[Math.min(h.childNodes.length-1,g.startOffset)]}if(h&&h.nodeType==3){return h.parentNode}return h}},getEnd:function(){var g=this,h=g.getRng(),i,f;if(h.duplicate||h.item){if(h.item){return h.item(0)}h=h.duplicate();h.collapse(0);i=h.parentElement();if(i&&i.nodeName=="BODY"){return i.lastChild||i}return i}else{i=h.endContainer;f=h.endOffset;if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[f>0?f-1:f]}if(i&&i.nodeType==3){return i.parentNode}return i}},getBookmark:function(r,s){var v=this,m=v.dom,g,j,i,n,h,o,p,l="\uFEFF",u;function f(x,y){var t=0;d(m.select(x),function(A,z){if(A==y){t=z}});return t}if(r==2){function k(){var x=v.getRng(true),t=m.getRoot(),y={};function z(C,H){var B=C[H?"startContainer":"endContainer"],G=C[H?"startOffset":"endOffset"],A=[],D,F,E=0;if(B.nodeType==3){if(s){for(D=B.previousSibling;D&&D.nodeType==3;D=D.previousSibling){G+=D.nodeValue.length}}A.push(G)}else{F=B.childNodes;if(G>=F.length&&F.length){E=1;G=Math.max(0,F.length-1)}A.push(v.dom.nodeIndex(F[G],s)+E)}for(;B&&B!=t;B=B.parentNode){A.push(v.dom.nodeIndex(B,s))}return A}y.start=z(x,true);if(!v.isCollapsed()){y.end=z(x)}return y}if(v.tridentSel){return v.tridentSel.getBookmark(r)}return k()}if(r){return{rng:v.getRng()}}g=v.getRng();i=m.uniqueId();n=tinyMCE.activeEditor.selection.isCollapsed();u="overflow:hidden;line-height:0px";if(g.duplicate||g.item){if(!g.item){j=g.duplicate();try{g.collapse();g.pasteHTML('<span data-mce-type="bookmark" id="'+i+'_start" style="'+u+'">'+l+"</span>");if(!n){j.collapse(false);g.moveToElementText(j.parentElement());if(g.compareEndPoints("StartToEnd",j)==0){j.move("character",-1)}j.pasteHTML('<span data-mce-type="bookmark" id="'+i+'_end" style="'+u+'">'+l+"</span>")}}catch(q){return null}}else{o=g.item(0);h=o.nodeName;return{name:h,index:f(h,o)}}}else{o=v.getNode();h=o.nodeName;if(h=="IMG"){return{name:h,index:f(h,o)}}j=g.cloneRange();if(!n){j.collapse(false);j.insertNode(m.create("span",{"data-mce-type":"bookmark",id:i+"_end",style:u},l))}g.collapse(true);g.insertNode(m.create("span",{"data-mce-type":"bookmark",id:i+"_start",style:u},l))}v.moveToBookmark({id:i,keep:1});return{id:i}},moveToBookmark:function(n){var r=this,l=r.dom,i,h,f,q,j,s,o,p;if(n){if(n.start){f=l.createRng();q=l.getRoot();function g(z){var t=n[z?"start":"end"],v,x,y,u;if(t){y=t[0];for(x=q,v=t.length-1;v>=1;v--){u=x.childNodes;if(t[v]>u.length-1){return}x=u[t[v]]}if(x.nodeType===3){y=Math.min(t[0],x.nodeValue.length)}if(x.nodeType===1){y=Math.min(t[0],x.childNodes.length)}if(z){f.setStart(x,y)}else{f.setEnd(x,y)}}return true}if(r.tridentSel){return r.tridentSel.moveToBookmark(n)}if(g(true)&&g()){r.setRng(f)}}else{if(n.id){function k(A){var u=l.get(n.id+"_"+A),z,t,x,y,v=n.keep;if(u){z=u.parentNode;if(A=="start"){if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}j=s=z;o=p=t}else{if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}s=z;p=t}if(!v){y=u.previousSibling;x=u.nextSibling;d(c.grep(u.childNodes),function(B){if(B.nodeType==3){B.nodeValue=B.nodeValue.replace(/\uFEFF/g,"")}});while(u=l.get(n.id+"_"+A)){l.remove(u,1)}if(y&&x&&y.nodeType==x.nodeType&&y.nodeType==3&&!c.isOpera){t=y.nodeValue.length;y.appendData(x.nodeValue);l.remove(x);if(A=="start"){j=s=y;o=p=t}else{s=y;p=t}}}}}function m(t){if(l.isBlock(t)&&!t.innerHTML){t.innerHTML=!a?'<br data-mce-bogus="1" />':" "}return t}k("start");k("end");if(j){f=l.createRng();f.setStart(m(j),o);f.setEnd(m(s),p);r.setRng(f)}}else{if(n.name){r.select(l.select(n.name)[n.index])}else{if(n.rng){r.setRng(n.rng)}}}}}},select:function(k,j){var i=this,l=i.dom,g=l.createRng(),f;if(k){f=l.nodeIndex(k);g.setStart(k.parentNode,f);g.setEnd(k.parentNode,f+1);if(j){function h(m,o){var n=new c.dom.TreeWalker(m,m);do{if(m.nodeType==3&&c.trim(m.nodeValue).length!=0){if(o){g.setStart(m,0)}else{g.setEnd(m,m.nodeValue.length)}return}if(m.nodeName=="BR"){if(o){g.setStartBefore(m)}else{g.setEndBefore(m)}return}}while(m=(o?n.next():n.prev()))}h(k,1);h(k)}i.setRng(g)}return k},isCollapsed:function(){var f=this,h=f.getRng(),g=f.getSel();if(!h||h.item){return false}if(h.compareEndPoints){return h.compareEndPoints("StartToEnd",h)===0}return !g||h.collapsed},collapse:function(f){var h=this,g=h.getRng(),i;if(g.item){i=g.item(0);g=h.win.document.body.createTextRange();g.moveToElementText(i)}g.collapse(!!f);h.setRng(g)},getSel:function(){var g=this,f=this.win;return f.getSelection?f.getSelection():f.document.selection},getRng:function(l){var g=this,h,i,k,j=g.win.document;if(l&&g.tridentSel){return g.tridentSel.getRangeAt(0)}try{if(h=g.getSel()){i=h.rangeCount>0?h.getRangeAt(0):(h.createRange?h.createRange():j.createRange())}}catch(f){}if(c.isIE&&i&&i.setStart&&j.selection.createRange().item){k=j.selection.createRange().item(0);i=j.createRange();i.setStartBefore(k);i.setEndAfter(k)}if(!i){i=j.createRange?j.createRange():j.body.createTextRange()}if(g.selectedRange&&g.explicitRange){if(i.compareBoundaryPoints(i.START_TO_START,g.selectedRange)===0&&i.compareBoundaryPoints(i.END_TO_END,g.selectedRange)===0){i=g.explicitRange}else{g.selectedRange=null;g.explicitRange=null}}return i},setRng:function(i){var h,g=this;if(!g.tridentSel){h=g.getSel();if(h){g.explicitRange=i;try{h.removeAllRanges()}catch(f){}h.addRange(i);g.selectedRange=h.getRangeAt(0)}}else{if(i.cloneRange){g.tridentSel.addRange(i);return}try{i.select()}catch(f){}}},setNode:function(g){var f=this;f.setContent(f.dom.getOuterHTML(g));return g},getNode:function(){var h=this,g=h.getRng(),i=h.getSel(),l,k=g.startContainer,f=g.endContainer;if(!g){return h.dom.getRoot()}if(g.setStart){l=g.commonAncestorContainer;if(!g.collapsed){if(g.startContainer==g.endContainer){if(g.endOffset-g.startOffset<2){if(g.startContainer.hasChildNodes()){l=g.startContainer.childNodes[g.startOffset]}}}if(k.nodeType===3&&f.nodeType===3){function j(p,m){var o=p;while(p&&p.nodeType===3&&p.length===0){p=m?p.nextSibling:p.previousSibling}return p||o}if(k.length===g.startOffset){k=j(k.nextSibling,true)}else{k=k.parentNode}if(g.endOffset===0){f=j(f.previousSibling,false)}else{f=f.parentNode}if(k&&k===f){return k}}}if(l&&l.nodeType==3){return l.parentNode}return l}return g.item?g.item(0):g.parentElement()},getSelectedBlocks:function(o,g){var m=this,j=m.dom,l,k,h,i=[];l=j.getParent(o||m.getStart(),j.isBlock);k=j.getParent(g||m.getEnd(),j.isBlock);if(l){i.push(l)}if(l&&k&&l!=k){h=l;var f=new c.dom.TreeWalker(l,j.getRoot());while((h=f.next())&&h!=k){if(j.isBlock(h)){i.push(h)}}}if(k&&l!=k){i.push(k)}return i},normalize:function(){var g=this,f,i;if(c.isIE){return}function h(p){var k,o,n,m=g.dom,j=m.getRoot(),l;k=f[(p?"start":"end")+"Container"];o=f[(p?"start":"end")+"Offset"];if(k.nodeType===9){k=k.body;o=0}if(k===j){if(k.hasChildNodes()){k=k.childNodes[Math.min(!p&&o>0?o-1:o,k.childNodes.length-1)];o=0;if(k.hasChildNodes()){l=k;n=new c.dom.TreeWalker(k,j);do{if(l.nodeType===3){o=p?0:l.nodeValue.length-1;k=l;break}if(l.nodeName==="BR"){o=m.nodeIndex(l);k=l.parentNode;break}}while(l=(p?n.next():n.prev()));i=true}}}if(i){f["set"+(p?"Start":"End")](k,o)}}f=g.getRng();h(true);if(f.collapsed){h()}if(i){g.setRng(f)}},destroy:function(g){var f=this;f.win=null;if(!g){c.removeUnload(f.destroy)}},_fixIESelection:function(){var g=this.dom,m=g.doc,h=m.body,j,n,f;m.documentElement.unselectable=true;function i(o,r){var p=h.createTextRange();try{p.moveToPoint(o,r)}catch(q){p=null}return p}function l(p){var o;if(p.button){o=i(p.x,p.y);if(o){if(o.compareEndPoints("StartToStart",n)>0){o.setEndPoint("StartToStart",n)}else{o.setEndPoint("EndToEnd",n)}o.select()}}else{k()}}function k(){var o=m.selection.createRange();if(n&&!o.item&&o.compareEndPoints("StartToEnd",o)===0){n.select()}g.unbind(m,"mouseup",k);g.unbind(m,"mousemove",l);n=j=0}g.bind(m,["mousedown","contextmenu"],function(o){if(o.target.nodeName==="HTML"){if(j){k()}f=m.documentElement;if(f.scrollHeight>f.clientHeight){return}j=1;n=i(o.x,o.y);if(n){g.bind(m,"mouseup",k);g.bind(m,"mousemove",l);g.win.focus();n.select()}}})}})})(tinymce);(function(a){a.dom.Serializer=function(e,i,f){var h,b,d=a.isIE,g=a.each,c;if(!e.apply_source_formatting){e.indent=false}e.remove_trailing_brs=true;i=i||a.DOM;f=f||new a.html.Schema(e);e.entity_encoding=e.entity_encoding||"named";h=new a.util.Dispatcher(self);b=new a.util.Dispatcher(self);c=new a.html.DomParser(e,f);c.addAttributeFilter("src,href,style",function(k,j){var o=k.length,l,q,n="data-mce-"+j,p=e.url_converter,r=e.url_converter_scope,m;while(o--){l=k[o];q=l.attributes.map[n];if(q!==m){l.attr(j,q.length>0?q:null);l.attr(n,null)}else{q=l.attributes.map[j];if(j==="style"){q=i.serializeStyle(i.parseStyle(q),l.name)}else{if(p){q=p.call(r,q,j,l.name)}}l.attr(j,q.length>0?q:null)}}});c.addAttributeFilter("class",function(j,k){var l=j.length,m,n;while(l--){m=j[l];n=m.attr("class").replace(/\s*mce(Item\w+|Selected)\s*/g,"");m.attr("class",n.length>0?n:null)}});c.addAttributeFilter("data-mce-type",function(j,l,k){var m=j.length,n;while(m--){n=j[m];if(n.attributes.map["data-mce-type"]==="bookmark"&&!k.cleanup){n.remove()}}});c.addNodeFilter("script,style",function(k,l){var m=k.length,n,o;function j(p){return p.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g,"").replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g,"")}while(m--){n=k[m];o=n.firstChild?n.firstChild.value:"";if(l==="script"){n.attr("type",(n.attr("type")||"text/javascript").replace(/^mce\-/,""));if(o.length>0){n.firstChild.value="// <![CDATA[\n"+j(o)+"\n// ]]>"}}else{if(o.length>0){n.firstChild.value="<!--\n"+j(o)+"\n-->"}}}});c.addNodeFilter("#comment",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.value.indexOf("[CDATA[")===0){m.name="#cdata";m.type=4;m.value=m.value.replace(/^\[CDATA\[|\]\]$/g,"")}else{if(m.value.indexOf("mce:protected ")===0){m.name="#text";m.type=3;m.raw=true;m.value=unescape(m.value).substr(14)}}}});c.addNodeFilter("xml:namespace,input",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.type===7){m.remove()}else{if(m.type===1){if(k==="input"&&!("type" in m.attributes.map)){m.attr("type","text")}}}}});if(e.fix_list_elements){c.addNodeFilter("ul,ol",function(k,l){var m=k.length,n,j;while(m--){n=k[m];j=n.parent;if(j.name==="ul"||j.name==="ol"){if(n.prev&&n.prev.name==="li"){n.prev.append(n)}}}})}c.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style",function(j,k){var l=j.length;while(l--){j[l].attr(k,null)}});return{schema:f,addNodeFilter:c.addNodeFilter,addAttributeFilter:c.addAttributeFilter,onPreProcess:h,onPostProcess:b,serialize:function(o,m){var l,p,k,j,n;if(d&&i.select("script,style,select,map").length>0){n=o.innerHTML;o=o.cloneNode(false);i.setHTML(o,n)}else{o=o.cloneNode(true)}l=o.ownerDocument.implementation;if(l.createHTMLDocument){p=l.createHTMLDocument("");g(o.nodeName=="BODY"?o.childNodes:[o],function(q){p.body.appendChild(p.importNode(q,true))});if(o.nodeName!="BODY"){o=p.body.firstChild}else{o=p.body}k=i.doc;i.doc=p}m=m||{};m.format=m.format||"html";if(!m.no_events){m.node=o;h.dispatch(self,m)}j=new a.html.Serializer(e,f);m.content=j.serialize(c.parse(m.getInner?o.innerHTML:a.trim(i.getOuterHTML(o),m),m));if(!m.cleanup){m.content=m.content.replace(/\uFEFF|\u200B/g,"")}if(!m.no_events){b.dispatch(self,m)}if(k){i.doc=k}m.node=null;return m.content},addRules:function(j){f.addValidElements(j)},setRules:function(j){f.setValidElements(j)}}}})(tinymce);(function(a){a.dom.ScriptLoader=function(h){var c=0,k=1,i=2,l={},j=[],f={},d=[],g=0,e;function b(m,v){var x=this,q=a.DOM,s,o,r,n;function p(){q.remove(n);if(s){s.onreadystatechange=s.onload=s=null}v()}function u(){if(typeof(console)!=="undefined"&&console.log){console.log("Failed to load: "+m)}}n=q.uniqueId();if(a.isIE6){o=new a.util.URI(m);r=location;if(o.host==r.hostname&&o.port==r.port&&(o.protocol+":")==r.protocol&&o.protocol.toLowerCase()!="file"){a.util.XHR.send({url:a._addVer(o.getURI()),success:function(y){var t=q.create("script",{type:"text/javascript"});t.text=y;document.getElementsByTagName("head")[0].appendChild(t);q.remove(t);p()},error:u});return}}s=q.create("script",{id:n,type:"text/javascript",src:a._addVer(m)});if(!a.isIE){s.onload=p}s.onerror=u;if(!a.isOpera){s.onreadystatechange=function(){var t=s.readyState;if(t=="complete"||t=="loaded"){p()}}}(document.getElementsByTagName("head")[0]||document.body).appendChild(s)}this.isDone=function(m){return l[m]==i};this.markDone=function(m){l[m]=i};this.add=this.load=function(m,q,n){var o,p=l[m];if(p==e){j.push(m);l[m]=c}if(q){if(!f[m]){f[m]=[]}f[m].push({func:q,scope:n||this})}};this.loadQueue=function(n,m){this.loadScripts(j,n,m)};this.loadScripts=function(m,q,p){var o;function n(r){a.each(f[r],function(s){s.func.call(s.scope)});f[r]=e}d.push({func:q,scope:p||this});o=function(){var r=a.grep(m);m.length=0;a.each(r,function(s){if(l[s]==i){n(s);return}if(l[s]!=k){l[s]=k;g++;b(s,function(){l[s]=i;g--;n(s);o()})}});if(!g){a.each(d,function(s){s.func.call(s.scope)});d.length=0}};o()}};a.ScriptLoader=new a.dom.ScriptLoader()})(tinymce);tinymce.dom.TreeWalker=function(a,c){var b=a;function d(i,f,e,j){var h,g;if(i){if(!j&&i[f]){return i[f]}if(i!=c){h=i[e];if(h){return h}for(g=i.parentNode;g&&g!=c;g=g.parentNode){h=g[e];if(h){return h}}}}}this.current=function(){return b};this.next=function(e){return(b=d(b,"firstChild","nextSibling",e))};this.prev=function(e){return(b=d(b,"lastChild","previousSibling",e))}};(function(a){a.dom.RangeUtils=function(c){var b="\uFEFF";this.walk=function(d,s){var i=d.startContainer,l=d.startOffset,t=d.endContainer,m=d.endOffset,j,g,o,h,r,q,e;e=c.select("td.mceSelected,th.mceSelected");if(e.length>0){a.each(e,function(u){s([u])});return}function f(u){var v;v=u[0];if(v.nodeType===3&&v===i&&l>=v.nodeValue.length){u.splice(0,1)}v=u[u.length-1];if(m===0&&u.length>0&&v===t&&v.nodeType===3){u.splice(u.length-1,1)}return u}function p(x,v,u){var y=[];for(;x&&x!=u;x=x[v]){y.push(x)}return y}function n(v,u){do{if(v.parentNode==u){return v}v=v.parentNode}while(v)}function k(x,v,y){var u=y?"nextSibling":"previousSibling";for(h=x,r=h.parentNode;h&&h!=v;h=r){r=h.parentNode;q=p(h==x?h:h[u],u);if(q.length){if(!y){q.reverse()}s(f(q))}}}if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[l]}if(t.nodeType==1&&t.hasChildNodes()){t=t.childNodes[Math.min(m-1,t.childNodes.length-1)]}if(i==t){return s(f([i]))}j=c.findCommonAncestor(i,t);for(h=i;h;h=h.parentNode){if(h===t){return k(i,j,true)}if(h===j){break}}for(h=t;h;h=h.parentNode){if(h===i){return k(t,j)}if(h===j){break}}g=n(i,j)||i;o=n(t,j)||t;k(i,g,true);q=p(g==i?g:g.nextSibling,"nextSibling",o==t?o.nextSibling:o);if(q.length){s(f(q))}k(t,o)};this.split=function(e){var h=e.startContainer,d=e.startOffset,i=e.endContainer,g=e.endOffset;function f(j,k){return j.splitText(k)}if(h==i&&h.nodeType==3){if(d>0&&d<h.nodeValue.length){i=f(h,d);h=i.previousSibling;if(g>d){g=g-d;h=i=f(i,g).previousSibling;g=i.nodeValue.length;d=0}else{g=0}}}else{if(h.nodeType==3&&d>0&&d<h.nodeValue.length){h=f(h,d);d=0}if(i.nodeType==3&&g>0&&g<i.nodeValue.length){i=f(i,g).previousSibling;g=i.nodeValue.length}}return{startContainer:h,startOffset:d,endContainer:i,endOffset:g}}};a.dom.RangeUtils.compareRanges=function(c,b){if(c&&b){if(c.item||c.duplicate){if(c.item&&b.item&&c.item(0)===b.item(0)){return true}if(c.isEqual&&b.isEqual&&b.isEqual(c)){return true}}else{return c.startContainer==b.startContainer&&c.startOffset==b.startOffset}}return false}})(tinymce);(function(b){var a=b.dom.Event,c=b.each;b.create("tinymce.ui.KeyboardNavigation",{KeyboardNavigation:function(e,f){var p=this,m=e.root,l=e.items,n=e.enableUpDown,i=e.enableLeftRight||!e.enableUpDown,k=e.excludeFromTabOrder,j,h,o,d,g;f=f||b.DOM;j=function(q){g=q.target.id};h=function(q){f.setAttrib(q.target.id,"tabindex","-1")};d=function(q){var r=f.get(g);f.setAttrib(r,"tabindex","0");r.focus()};p.focus=function(){f.get(g).focus()};p.destroy=function(){c(l,function(q){f.unbind(f.get(q.id),"focus",j);f.unbind(f.get(q.id),"blur",h)});f.unbind(f.get(m),"focus",d);f.unbind(f.get(m),"keydown",o);l=f=m=p.focus=j=h=o=d=null;p.destroy=function(){}};p.moveFocus=function(u,r){var q=-1,t=p.controls,s;if(!g){return}c(l,function(x,v){if(x.id===g){q=v;return false}});q+=u;if(q<0){q=l.length-1}else{if(q>=l.length){q=0}}s=l[q];f.setAttrib(g,"tabindex","-1");f.setAttrib(s.id,"tabindex","0");f.get(s.id).focus();if(e.actOnFocus){e.onAction(s.id)}if(r){a.cancel(r)}};o=function(y){var u=37,t=39,x=38,z=40,q=27,s=14,r=13,v=32;switch(y.keyCode){case u:if(i){p.moveFocus(-1)}break;case t:if(i){p.moveFocus(1)}break;case x:if(n){p.moveFocus(-1)}break;case z:if(n){p.moveFocus(1)}break;case q:if(e.onCancel){e.onCancel();a.cancel(y)}break;case s:case r:case v:if(e.onAction){e.onAction(g);a.cancel(y)}break}};c(l,function(s,q){var r;if(!s.id){s.id=f.uniqueId("_mce_item_")}if(k){f.bind(s.id,"blur",h);r="-1"}else{r=(q===0?"0":"-1")}f.setAttrib(s.id,"tabindex",r);f.bind(f.get(s.id),"focus",j)});if(l[0]){g=l[0].id}f.setAttrib(m,"tabindex","-1");f.bind(f.get(m),"focus",d);f.bind(f.get(m),"keydown",o)}})})(tinymce);(function(c){var b=c.DOM,a=c.is;c.create("tinymce.ui.Control",{Control:function(f,e,d){this.id=f;this.settings=e=e||{};this.rendered=false;this.onRender=new c.util.Dispatcher(this);this.classPrefix="";this.scope=e.scope||this;this.disabled=0;this.active=0;this.editor=d},setAriaProperty:function(f,e){var d=b.get(this.id+"_aria")||b.get(this.id);if(d){b.setAttrib(d,"aria-"+f,!!e)}},focus:function(){b.get(this.id).focus()},setDisabled:function(d){if(d!=this.disabled){this.setAriaProperty("disabled",d);this.setState("Disabled",d);this.setState("Enabled",!d);this.disabled=d}},isDisabled:function(){return this.disabled},setActive:function(d){if(d!=this.active){this.setState("Active",d);this.active=d;this.setAriaProperty("pressed",d)}},isActive:function(){return this.active},setState:function(f,d){var e=b.get(this.id);f=this.classPrefix+f;if(d){b.addClass(e,f)}else{b.removeClass(e,f)}},isRendered:function(){return this.rendered},renderHTML:function(){},renderTo:function(d){b.setHTML(d,this.renderHTML())},postRender:function(){var e=this,d;if(a(e.disabled)){d=e.disabled;e.disabled=-1;e.setDisabled(d)}if(a(e.active)){d=e.active;e.active=-1;e.setActive(d)}},remove:function(){b.remove(this.id);this.destroy()},destroy:function(){c.dom.Event.clear(this.id)}})})(tinymce);tinymce.create("tinymce.ui.Container:tinymce.ui.Control",{Container:function(c,b,a){this.parent(c,b,a);this.controls=[];this.lookup={}},add:function(a){this.lookup[a.id]=a;this.controls.push(a);return a},get:function(a){return this.lookup[a]}});tinymce.create("tinymce.ui.Separator:tinymce.ui.Control",{Separator:function(b,a){this.parent(b,a);this.classPrefix="mceSeparator";this.setDisabled(true)},renderHTML:function(){return tinymce.DOM.createHTML("span",{"class":this.classPrefix,role:"separator","aria-orientation":"vertical",tabindex:"-1"})}});(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.MenuItem:tinymce.ui.Control",{MenuItem:function(g,f){this.parent(g,f);this.classPrefix="mceMenuItem"},setSelected:function(f){this.setState("Selected",f);this.setAriaProperty("checked",!!f);this.selected=f},isSelected:function(){return this.selected},postRender:function(){var f=this;f.parent();if(c(f.selected)){f.setSelected(f.selected)}}})})(tinymce);(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.Menu:tinymce.ui.MenuItem",{Menu:function(h,g){var f=this;f.parent(h,g);f.items={};f.collapsed=false;f.menuCount=0;f.onAddItem=new d.util.Dispatcher(this)},expand:function(g){var f=this;if(g){a(f,function(h){if(h.expand){h.expand()}},"items",f)}f.collapsed=false},collapse:function(g){var f=this;if(g){a(f,function(h){if(h.collapse){h.collapse()}},"items",f)}f.collapsed=true},isCollapsed:function(){return this.collapsed},add:function(f){if(!f.settings){f=new d.ui.MenuItem(f.id||b.uniqueId(),f)}this.onAddItem.dispatch(this,f);return this.items[f.id]=f},addSeparator:function(){return this.add({separator:true})},addMenu:function(f){if(!f.collapse){f=this.createMenu(f)}this.menuCount++;return this.add(f)},hasMenus:function(){return this.menuCount!==0},remove:function(f){delete this.items[f.id]},removeAll:function(){var f=this;a(f,function(g){if(g.removeAll){g.removeAll()}else{g.remove()}g.destroy()},"items",f);f.items={}},createMenu:function(g){var f=new d.ui.Menu(g.id||b.uniqueId(),g);f.onAddItem.add(this.onAddItem.dispatch,this.onAddItem);return f}})})(tinymce);(function(e){var d=e.is,c=e.DOM,f=e.each,a=e.dom.Event,b=e.dom.Element;e.create("tinymce.ui.DropMenu:tinymce.ui.Menu",{DropMenu:function(h,g){g=g||{};g.container=g.container||c.doc.body;g.offset_x=g.offset_x||0;g.offset_y=g.offset_y||0;g.vp_offset_x=g.vp_offset_x||0;g.vp_offset_y=g.vp_offset_y||0;if(d(g.icons)&&!g.icons){g["class"]+=" mceNoIcons"}this.parent(h,g);this.onShowMenu=new e.util.Dispatcher(this);this.onHideMenu=new e.util.Dispatcher(this);this.classPrefix="mceMenu"},createMenu:function(j){var h=this,i=h.settings,g;j.container=j.container||i.container;j.parent=h;j.constrain=j.constrain||i.constrain;j["class"]=j["class"]||i["class"];j.vp_offset_x=j.vp_offset_x||i.vp_offset_x;j.vp_offset_y=j.vp_offset_y||i.vp_offset_y;j.keyboard_focus=i.keyboard_focus;g=new e.ui.DropMenu(j.id||c.uniqueId(),j);g.onAddItem.add(h.onAddItem.dispatch,h.onAddItem);return g},focus:function(){var g=this;if(g.keyboardNav){g.keyboardNav.focus()}},update:function(){var i=this,j=i.settings,g=c.get("menu_"+i.id+"_tbl"),l=c.get("menu_"+i.id+"_co"),h,k;h=j.max_width?Math.min(g.clientWidth,j.max_width):g.clientWidth;k=j.max_height?Math.min(g.clientHeight,j.max_height):g.clientHeight;if(!c.boxModel){i.element.setStyles({width:h+2,height:k+2})}else{i.element.setStyles({width:h,height:k})}if(j.max_width){c.setStyle(l,"width",h)}if(j.max_height){c.setStyle(l,"height",k);if(g.clientHeight<j.max_height){c.setStyle(l,"overflow","hidden")}}},showMenu:function(p,n,r){var z=this,A=z.settings,o,g=c.getViewPort(),u,l,v,q,i=2,k,j,m=z.classPrefix;z.collapse(1);if(z.isMenuVisible){return}if(!z.rendered){o=c.add(z.settings.container,z.renderNode());f(z.items,function(h){h.postRender()});z.element=new b("menu_"+z.id,{blocker:1,container:A.container})}else{o=c.get("menu_"+z.id)}if(!e.isOpera){c.setStyles(o,{left:-65535,top:-65535})}c.show(o);z.update();p+=A.offset_x||0;n+=A.offset_y||0;g.w-=4;g.h-=4;if(A.constrain){u=o.clientWidth-i;l=o.clientHeight-i;v=g.x+g.w;q=g.y+g.h;if((p+A.vp_offset_x+u)>v){p=r?r-u:Math.max(0,(v-A.vp_offset_x)-u)}if((n+A.vp_offset_y+l)>q){n=Math.max(0,(q-A.vp_offset_y)-l)}}c.setStyles(o,{left:p,top:n});z.element.update();z.isMenuVisible=1;z.mouseClickFunc=a.add(o,"click",function(s){var h;s=s.target;if(s&&(s=c.getParent(s,"tr"))&&!c.hasClass(s,m+"ItemSub")){h=z.items[s.id];if(h.isDisabled()){return}k=z;while(k){if(k.hideMenu){k.hideMenu()}k=k.settings.parent}if(h.settings.onclick){h.settings.onclick(s)}return a.cancel(s)}});if(z.hasMenus()){z.mouseOverFunc=a.add(o,"mouseover",function(x){var h,t,s;x=x.target;if(x&&(x=c.getParent(x,"tr"))){h=z.items[x.id];if(z.lastMenu){z.lastMenu.collapse(1)}if(h.isDisabled()){return}if(x&&c.hasClass(x,m+"ItemSub")){t=c.getRect(x);h.showMenu((t.x+t.w-i),t.y-i,t.x);z.lastMenu=h;c.addClass(c.get(h.id).firstChild,m+"ItemActive")}}})}a.add(o,"keydown",z._keyHandler,z);z.onShowMenu.dispatch(z);if(A.keyboard_focus){z._setupKeyboardNav()}},hideMenu:function(j){var g=this,i=c.get("menu_"+g.id),h;if(!g.isMenuVisible){return}if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(i,"mouseover",g.mouseOverFunc);a.remove(i,"click",g.mouseClickFunc);a.remove(i,"keydown",g._keyHandler);c.hide(i);g.isMenuVisible=0;if(!j){g.collapse(1)}if(g.element){g.element.hide()}if(h=c.get(g.id)){c.removeClass(h.firstChild,g.classPrefix+"ItemActive")}g.onHideMenu.dispatch(g)},add:function(i){var g=this,h;i=g.parent(i);if(g.isRendered&&(h=c.get("menu_"+g.id))){g._add(c.select("tbody",h)[0],i)}return i},collapse:function(g){this.parent(g);this.hideMenu(1)},remove:function(g){c.remove(g.id);this.destroy();return this.parent(g)},destroy:function(){var g=this,h=c.get("menu_"+g.id);if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(h,"mouseover",g.mouseOverFunc);a.remove(c.select("a",h),"focus",g.mouseOverFunc);a.remove(h,"click",g.mouseClickFunc);a.remove(h,"keydown",g._keyHandler);if(g.element){g.element.remove()}c.remove(h)},renderNode:function(){var i=this,j=i.settings,l,h,k,g;g=c.create("div",{role:"listbox",id:"menu_"+i.id,"class":j["class"],style:"position:absolute;left:0;top:0;z-index:200000;outline:0"});if(i.settings.parent){c.setAttrib(g,"aria-parent","menu_"+i.settings.parent.id)}k=c.add(g,"div",{role:"presentation",id:"menu_"+i.id+"_co","class":i.classPrefix+(j["class"]?" "+j["class"]:"")});i.element=new b("menu_"+i.id,{blocker:1,container:j.container});if(j.menu_line){c.add(k,"span",{"class":i.classPrefix+"Line"})}l=c.add(k,"table",{role:"presentation",id:"menu_"+i.id+"_tbl",border:0,cellPadding:0,cellSpacing:0});h=c.add(l,"tbody");f(i.items,function(m){i._add(h,m)});i.rendered=true;return g},_setupKeyboardNav:function(){var i,h,g=this;i=c.select("#menu_"+g.id)[0];h=c.select("a[role=option]","menu_"+g.id);h.splice(0,0,i);g.keyboardNav=new e.ui.KeyboardNavigation({root:"menu_"+g.id,items:h,onCancel:function(){g.hideMenu()},enableUpDown:true});i.focus()},_keyHandler:function(g){var h=this,i;switch(g.keyCode){case 37:if(h.settings.parent){h.hideMenu();h.settings.parent.focus();a.cancel(g)}break;case 39:if(h.mouseOverFunc){h.mouseOverFunc(g)}break}},_add:function(j,h){var i,q=h.settings,p,l,k,m=this.classPrefix,g;if(q.separator){l=c.add(j,"tr",{id:h.id,"class":m+"ItemSeparator"});c.add(l,"td",{"class":m+"ItemSeparator"});if(i=l.previousSibling){c.addClass(i,"mceLast")}return}i=l=c.add(j,"tr",{id:h.id,"class":m+"Item "+m+"ItemEnabled"});i=k=c.add(i,q.titleItem?"th":"td");i=p=c.add(i,"a",{id:h.id+"_aria",role:q.titleItem?"presentation":"option",href:"javascript:;",onclick:"return false;",onmousedown:"return false;"});if(q.parent){c.setAttrib(p,"aria-haspopup","true");c.setAttrib(p,"aria-owns","menu_"+h.id)}c.addClass(k,q["class"]);g=c.add(i,"span",{"class":"mceIcon"+(q.icon?" mce_"+q.icon:"")});if(q.icon_src){c.add(g,"img",{src:q.icon_src})}i=c.add(i,q.element||"span",{"class":"mceText",title:h.settings.title},h.settings.title);if(h.settings.style){c.setAttrib(i,"style",h.settings.style)}if(j.childNodes.length==1){c.addClass(l,"mceFirst")}if((i=l.previousSibling)&&c.hasClass(i,m+"ItemSeparator")){c.addClass(l,"mceFirst")}if(h.collapse){c.addClass(l,m+"ItemSub")}if(i=l.previousSibling){c.removeClass(i,"mceLast")}c.addClass(l,"mceLast")}})})(tinymce);(function(b){var a=b.DOM;b.create("tinymce.ui.Button:tinymce.ui.Control",{Button:function(e,d,c){this.parent(e,d,c);this.classPrefix="mceButton"},renderHTML:function(){var f=this.classPrefix,e=this.settings,d,c;c=a.encode(e.label||"");d='<a role="button" id="'+this.id+'" href="javascript:;" class="'+f+" "+f+"Enabled "+e["class"]+(c?" "+f+"Labeled":"")+'" onmousedown="return false;" onclick="return false;" aria-labelledby="'+this.id+'_voice" title="'+a.encode(e.title)+'">';if(e.image&&!(this.editor&&this.editor.forcedHighContrastMode)){d+='<img class="mceIcon" src="'+e.image+'" alt="'+a.encode(e.title)+'" />'+c}else{d+='<span class="mceIcon '+e["class"]+'"></span>'+(c?'<span class="'+f+'Label">'+c+"</span>":"")}d+='<span class="mceVoiceLabel mceIconOnly" style="display: none;" id="'+this.id+'_voice">'+e.title+"</span>";d+="</a>";return d},postRender:function(){var c=this,d=c.settings;b.dom.Event.add(c.id,"click",function(f){if(!c.isDisabled()){return d.onclick.call(d.scope,f)}})}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.ListBox:tinymce.ui.Control",{ListBox:function(i,h,f){var g=this;g.parent(i,h,f);g.items=[];g.onChange=new a(g);g.onPostRender=new a(g);g.onAdd=new a(g);g.onRenderMenu=new d.util.Dispatcher(this);g.classPrefix="mceListBox"},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){var h=this,i,j,g;if(f!=h.selectedIndex){i=c.get(h.id+"_text");g=c.get(h.id+"_voiceDesc");j=h.items[f];if(j){h.selectedValue=j.value;h.selectedIndex=f;c.setHTML(i,c.encode(j.title));c.setHTML(g,h.settings.title+" - "+j.title);c.removeClass(i,"mceTitle");c.setAttrib(h.id,"aria-valuenow",j.title)}else{c.setHTML(i,c.encode(h.settings.title));c.setHTML(g,c.encode(h.settings.title));c.addClass(i,"mceTitle");h.selectedValue=h.selectedIndex=null;c.setAttrib(h.id,"aria-valuenow",h.settings.title)}i=0}},add:function(i,f,h){var g=this;h=h||{};h=d.extend(h,{title:i,value:f});g.items.push(h);g.onAdd.dispatch(g,h)},getLength:function(){return this.items.length},renderHTML:function(){var i="",f=this,g=f.settings,j=f.classPrefix;i='<span role="listbox" aria-haspopup="true" aria-labelledby="'+f.id+'_voiceDesc" aria-describedby="'+f.id+'_voiceDesc"><table role="presentation" tabindex="0" id="'+f.id+'" cellpadding="0" cellspacing="0" class="'+j+" "+j+"Enabled"+(g["class"]?(" "+g["class"]):"")+'"><tbody><tr>';i+="<td>"+c.createHTML("span",{id:f.id+"_voiceDesc","class":"voiceLabel",style:"display:none;"},f.settings.title);i+=c.createHTML("a",{id:f.id+"_text",tabindex:-1,href:"javascript:;","class":"mceText",onclick:"return false;",onmousedown:"return false;"},c.encode(f.settings.title))+"</td>";i+="<td>"+c.createHTML("a",{id:f.id+"_open",tabindex:-1,href:"javascript:;","class":"mceOpen",onclick:"return false;",onmousedown:"return false;"},'<span><span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span></span>')+"</td>";i+="</tr></tbody></table></span>";return i},showMenu:function(){var g=this,i,h=c.get(this.id),f;if(g.isDisabled()||g.items.length==0){return}if(g.menu&&g.menu.isMenuVisible){return g.hideMenu()}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}i=c.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.keyboard_focus=!d.isOpera;if(g.oldID){f.items[g.oldID].setSelected(0)}e(g.items,function(j){if(j.value===g.selectedValue){f.items[j.id].setSelected(1);g.oldID=j.id}});f.showMenu(0,h.clientHeight);b.add(c.doc,"mousedown",g.hideMenu,g);c.addClass(g.id,g.classPrefix+"Selected")},hideMenu:function(g){var f=this;if(f.menu&&f.menu.isMenuVisible){c.removeClass(f.id,f.classPrefix+"Selected");if(g&&g.type=="mousedown"&&(g.target.id==f.id+"_text"||g.target.id==f.id+"_open")){return}if(!g||!c.getParent(g.target,".mceMenu")){c.removeClass(f.id,f.classPrefix+"Selected");b.remove(c.doc,"mousedown",f.hideMenu,f);f.menu.hideMenu()}}},renderMenu:function(){var g=this,f;f=g.settings.control_manager.createDropMenu(g.id+"_menu",{menu_line:1,"class":g.classPrefix+"Menu mceNoIcons",max_width:150,max_height:150});f.onHideMenu.add(function(){g.hideMenu();g.focus()});f.add({title:g.settings.title,"class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}});e(g.items,function(h){if(h.value===undefined){f.add({title:h.title,role:"option","class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}})}else{h.id=c.uniqueId();h.role="option";h.onclick=function(){if(g.settings.onselect(h.value)!==false){g.select(h.value)}};f.add(h)}});g.onRenderMenu.dispatch(g,f);g.menu=f},postRender:function(){var f=this,g=f.classPrefix;b.add(f.id,"click",f.showMenu,f);b.add(f.id,"keydown",function(h){if(h.keyCode==32){f.showMenu(h);b.cancel(h)}});b.add(f.id,"focus",function(){if(!f._focused){f.keyDownHandler=b.add(f.id,"keydown",function(h){if(h.keyCode==40){f.showMenu();b.cancel(h)}});f.keyPressHandler=b.add(f.id,"keypress",function(i){var h;if(i.keyCode==13){h=f.selectedValue;f.selectedValue=null;b.cancel(i);f.settings.onselect(h)}})}f._focused=1});b.add(f.id,"blur",function(){b.remove(f.id,"keydown",f.keyDownHandler);b.remove(f.id,"keypress",f.keyPressHandler);f._focused=0});if(d.isIE6||!c.boxModel){b.add(f.id,"mouseover",function(){if(!c.hasClass(f.id,g+"Disabled")){c.addClass(f.id,g+"Hover")}});b.add(f.id,"mouseout",function(){if(!c.hasClass(f.id,g+"Disabled")){c.removeClass(f.id,g+"Hover")}})}f.onPostRender.dispatch(f,c.get(f.id))},destroy:function(){this.parent();b.clear(this.id+"_text");b.clear(this.id+"_open")}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.NativeListBox:tinymce.ui.ListBox",{NativeListBox:function(g,f){this.parent(g,f);this.classPrefix="mceNativeListBox"},setDisabled:function(f){c.get(this.id).disabled=f;this.setAriaProperty("disabled",f)},isDisabled:function(){return c.get(this.id).disabled},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){c.get(this.id).selectedIndex=f+1;this.selectedValue=this.items[f]?this.items[f].value:null},add:function(j,g,f){var i,h=this;f=f||{};f.value=g;if(h.isRendered()){c.add(c.get(this.id),"option",f,j)}i={title:j,value:g,attribs:f};h.items.push(i);h.onAdd.dispatch(h,i)},getLength:function(){return this.items.length},renderHTML:function(){var g,f=this;g=c.createHTML("option",{value:""},"-- "+f.settings.title+" --");e(f.items,function(h){g+=c.createHTML("option",{value:h.value},h.title)});g=c.createHTML("select",{id:f.id,"class":"mceNativeListBox","aria-labelledby":f.id+"_aria"},g);g+=c.createHTML("span",{id:f.id+"_aria",style:"display: none"},f.settings.title);return g},postRender:function(){var g=this,h,i=true;g.rendered=true;function f(k){var j=g.items[k.target.selectedIndex-1];if(j&&(j=j.value)){g.onChange.dispatch(g,j);if(g.settings.onselect){g.settings.onselect(j)}}}b.add(g.id,"change",f);b.add(g.id,"keydown",function(k){var j;b.remove(g.id,"change",h);i=false;j=b.add(g.id,"blur",function(){if(i){return}i=true;b.add(g.id,"change",f);b.remove(g.id,"blur",j)});if(d.isWebKit&&(k.keyCode==37||k.keyCode==39)){return b.prevent(k)}if(k.keyCode==13||k.keyCode==32){f(k);return b.cancel(k)}});g.onPostRender.dispatch(g,c.get(g.id))}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.MenuButton:tinymce.ui.Button",{MenuButton:function(g,f,e){this.parent(g,f,e);this.onRenderMenu=new c.util.Dispatcher(this);f.menu_container=f.menu_container||b.doc.body},showMenu:function(){var g=this,j,i,h=b.get(g.id),f;if(g.isDisabled()){return}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}if(g.isMenuVisible){return g.hideMenu()}j=b.getPos(g.settings.menu_container);i=b.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.vp_offset_x=i.x;f.settings.vp_offset_y=i.y;f.settings.keyboard_focus=g._focused;f.showMenu(0,h.clientHeight);a.add(b.doc,"mousedown",g.hideMenu,g);g.setState("Selected",1);g.isMenuVisible=1},renderMenu:function(){var f=this,e;e=f.settings.control_manager.createDropMenu(f.id+"_menu",{menu_line:1,"class":this.classPrefix+"Menu",icons:f.settings.icons});e.onHideMenu.add(function(){f.hideMenu();f.focus()});f.onRenderMenu.dispatch(f,e);f.menu=e},hideMenu:function(g){var f=this;if(g&&g.type=="mousedown"&&b.getParent(g.target,function(h){return h.id===f.id||h.id===f.id+"_open"})){return}if(!g||!b.getParent(g.target,".mceMenu")){f.setState("Selected",0);a.remove(b.doc,"mousedown",f.hideMenu,f);if(f.menu){f.menu.hideMenu()}}f.isMenuVisible=0},postRender:function(){var e=this,f=e.settings;a.add(e.id,"click",function(){if(!e.isDisabled()){if(f.onclick){f.onclick(e.value)}e.showMenu()}})}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.SplitButton:tinymce.ui.MenuButton",{SplitButton:function(g,f,e){this.parent(g,f,e);this.classPrefix="mceSplitButton"},renderHTML:function(){var i,f=this,g=f.settings,e;i="<tbody><tr>";if(g.image){e=b.createHTML("img ",{src:g.image,role:"presentation","class":"mceAction "+g["class"]})}else{e=b.createHTML("span",{"class":"mceAction "+g["class"]},"")}e+=b.createHTML("span",{"class":"mceVoiceLabel mceIconOnly",id:f.id+"_voice",style:"display:none;"},g.title);i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_action",tabindex:"-1",href:"javascript:;","class":"mceAction "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";e=b.createHTML("span",{"class":"mceOpen "+g["class"]},'<span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span>');i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_open",tabindex:"-1",href:"javascript:;","class":"mceOpen "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";i+="</tr></tbody>";i=b.createHTML("table",{role:"presentation","class":"mceSplitButton mceSplitButtonEnabled "+g["class"],cellpadding:"0",cellspacing:"0",title:g.title},i);return b.createHTML("div",{id:f.id,role:"button",tabindex:"0","aria-labelledby":f.id+"_voice","aria-haspopup":"true"},i)},postRender:function(){var e=this,g=e.settings,f;if(g.onclick){f=function(h){if(!e.isDisabled()){g.onclick(e.value);a.cancel(h)}};a.add(e.id+"_action","click",f);a.add(e.id,["click","keydown"],function(h){var k=32,m=14,i=13,j=38,l=40;if((h.keyCode===32||h.keyCode===13||h.keyCode===14)&&!h.altKey&&!h.ctrlKey&&!h.metaKey){f();a.cancel(h)}else{if(h.type==="click"||h.keyCode===l){e.showMenu();a.cancel(h)}}})}a.add(e.id+"_open","click",function(h){e.showMenu();a.cancel(h)});a.add([e.id,e.id+"_open"],"focus",function(){e._focused=1});a.add([e.id,e.id+"_open"],"blur",function(){e._focused=0});if(c.isIE6||!b.boxModel){a.add(e.id,"mouseover",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.addClass(e.id,"mceSplitButtonHover")}});a.add(e.id,"mouseout",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.removeClass(e.id,"mceSplitButtonHover")}})}},destroy:function(){this.parent();a.clear(this.id+"_action");a.clear(this.id+"_open");a.clear(this.id)}})})(tinymce);(function(d){var c=d.DOM,a=d.dom.Event,b=d.is,e=d.each;d.create("tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton",{ColorSplitButton:function(i,h,f){var g=this;g.parent(i,h,f);g.settings=h=d.extend({colors:"000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,008000,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF",grid_width:8,default_color:"#888888"},g.settings);g.onShowMenu=new d.util.Dispatcher(g);g.onHideMenu=new d.util.Dispatcher(g);g.value=h.default_color},showMenu:function(){var f=this,g,j,i,h;if(f.isDisabled()){return}if(!f.isMenuRendered){f.renderMenu();f.isMenuRendered=true}if(f.isMenuVisible){return f.hideMenu()}i=c.get(f.id);c.show(f.id+"_menu");c.addClass(i,"mceSplitButtonSelected");h=c.getPos(i);c.setStyles(f.id+"_menu",{left:h.x,top:h.y+i.clientHeight,zIndex:200000});i=0;a.add(c.doc,"mousedown",f.hideMenu,f);f.onShowMenu.dispatch(f);if(f._focused){f._keyHandler=a.add(f.id+"_menu","keydown",function(k){if(k.keyCode==27){f.hideMenu()}});c.select("a",f.id+"_menu")[0].focus()}f.isMenuVisible=1},hideMenu:function(g){var f=this;if(f.isMenuVisible){if(g&&g.type=="mousedown"&&c.getParent(g.target,function(h){return h.id===f.id+"_open"})){return}if(!g||!c.getParent(g.target,".mceSplitButtonMenu")){c.removeClass(f.id,"mceSplitButtonSelected");a.remove(c.doc,"mousedown",f.hideMenu,f);a.remove(f.id+"_menu","keydown",f._keyHandler);c.hide(f.id+"_menu")}f.isMenuVisible=0;f.onHideMenu.dispatch()}},renderMenu:function(){var p=this,h,k=0,q=p.settings,g,j,l,o,f;o=c.add(q.menu_container,"div",{role:"listbox",id:p.id+"_menu","class":q.menu_class+" "+q["class"],style:"position:absolute;left:0;top:-1000px;"});h=c.add(o,"div",{"class":q["class"]+" mceSplitButtonMenu"});c.add(h,"span",{"class":"mceMenuLine"});g=c.add(h,"table",{role:"presentation","class":"mceColorSplitMenu"});j=c.add(g,"tbody");k=0;e(b(q.colors,"array")?q.colors:q.colors.split(","),function(i){i=i.replace(/^#/,"");if(!k--){l=c.add(j,"tr");k=q.grid_width-1}g=c.add(l,"td");g=c.add(g,"a",{role:"option",href:"javascript:;",style:{backgroundColor:"#"+i},title:p.editor.getLang("colors."+i,i),"data-mce-color":"#"+i});if(p.editor.forcedHighContrastMode){g=c.add(g,"canvas",{width:16,height:16,"aria-hidden":"true"});if(g.getContext&&(f=g.getContext("2d"))){f.fillStyle="#"+i;f.fillRect(0,0,16,16)}else{c.remove(g)}}});if(q.more_colors_func){g=c.add(j,"tr");g=c.add(g,"td",{colspan:q.grid_width,"class":"mceMoreColors"});g=c.add(g,"a",{role:"option",id:p.id+"_more",href:"javascript:;",onclick:"return false;","class":"mceMoreColors"},q.more_colors_title);a.add(g,"click",function(i){q.more_colors_func.call(q.more_colors_scope||this);return a.cancel(i)})}c.addClass(h,"mceColorSplitMenu");new d.ui.KeyboardNavigation({root:p.id+"_menu",items:c.select("a",p.id+"_menu"),onCancel:function(){p.hideMenu();p.focus()}});a.add(p.id+"_menu","mousedown",function(i){return a.cancel(i)});a.add(p.id+"_menu","click",function(i){var m;i=c.getParent(i.target,"a",j);if(i&&i.nodeName.toLowerCase()=="a"&&(m=i.getAttribute("data-mce-color"))){p.setColor(m)}return a.cancel(i)});return o},setColor:function(f){this.displayColor(f);this.hideMenu();this.settings.onselect(f)},displayColor:function(g){var f=this;c.setStyle(f.id+"_preview","backgroundColor",g);f.value=g},postRender:function(){var f=this,g=f.id;f.parent();c.add(g+"_action","div",{id:g+"_preview","class":"mceColorPreview"});c.setStyle(f.id+"_preview","backgroundColor",f.value)},destroy:function(){this.parent();a.clear(this.id+"_menu");a.clear(this.id+"_more");c.remove(this.id+"_menu")}})})(tinymce);(function(b){var d=b.DOM,c=b.each,a=b.dom.Event;b.create("tinymce.ui.ToolbarGroup:tinymce.ui.Container",{renderHTML:function(){var f=this,i=[],e=f.controls,j=b.each,g=f.settings;i.push('<div id="'+f.id+'" role="group" aria-labelledby="'+f.id+'_voice">');i.push("<span role='application'>");i.push('<span id="'+f.id+'_voice" class="mceVoiceLabel" style="display:none;">'+d.encode(g.name)+"</span>");j(e,function(h){i.push(h.renderHTML())});i.push("</span>");i.push("</div>");return i.join("")},focus:function(){var e=this;d.get(e.id).focus()},postRender:function(){var f=this,e=[];c(f.controls,function(g){c(g.controls,function(h){if(h.id){e.push(h)}})});f.keyNav=new b.ui.KeyboardNavigation({root:f.id,items:e,onCancel:function(){if(b.isWebKit){d.get(f.editor.id+"_ifr").focus()}f.editor.focus()},excludeFromTabOrder:!f.settings.tab_focus_toolbar})},destroy:function(){var e=this;e.parent();e.keyNav.destroy();a.clear(e.id)}})})(tinymce);(function(a){var c=a.DOM,b=a.each;a.create("tinymce.ui.Toolbar:tinymce.ui.Container",{renderHTML:function(){var m=this,f="",j,k,n=m.settings,e,d,g,l;l=m.controls;for(e=0;e<l.length;e++){k=l[e];d=l[e-1];g=l[e+1];if(e===0){j="mceToolbarStart";if(k.Button){j+=" mceToolbarStartButton"}else{if(k.SplitButton){j+=" mceToolbarStartSplitButton"}else{if(k.ListBox){j+=" mceToolbarStartListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"))}if(d&&k.ListBox){if(d.Button||d.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarEnd"},c.createHTML("span",null,"<!-- IE -->"))}}if(c.stdMode){f+='<td style="position: relative">'+k.renderHTML()+"</td>"}else{f+="<td>"+k.renderHTML()+"</td>"}if(g&&k.ListBox){if(g.Button||g.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarStart"},c.createHTML("span",null,"<!-- IE -->"))}}}j="mceToolbarEnd";if(k.Button){j+=" mceToolbarEndButton"}else{if(k.SplitButton){j+=" mceToolbarEndSplitButton"}else{if(k.ListBox){j+=" mceToolbarEndListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"));return c.createHTML("table",{id:m.id,"class":"mceToolbar"+(n["class"]?" "+n["class"]:""),cellpadding:"0",cellspacing:"0",align:m.settings.align||"",role:"presentation",tabindex:"-1"},"<tbody><tr>"+f+"</tr></tbody>")}})})(tinymce);(function(b){var a=b.util.Dispatcher,c=b.each;b.create("tinymce.AddOnManager",{AddOnManager:function(){var d=this;d.items=[];d.urls={};d.lookup={};d.onAdd=new a(d)},get:function(d){if(this.lookup[d]){return this.lookup[d].instance}else{return undefined}},dependencies:function(e){var d;if(this.lookup[e]){d=this.lookup[e].dependencies}return d||[]},requireLangPack:function(e){var d=b.settings;if(d&&d.language&&d.language_load!==false){b.ScriptLoader.add(this.urls[e]+"/langs/"+d.language+".js")}},add:function(f,e,d){this.items.push(e);this.lookup[f]={instance:e,dependencies:d};this.onAdd.dispatch(this,f,e);return e},createUrl:function(d,e){if(typeof e==="object"){return e}else{return{prefix:d.prefix,resource:e,suffix:d.suffix}}},addComponents:function(f,d){var e=this.urls[f];b.each(d,function(g){b.ScriptLoader.add(e+"/"+g)})},load:function(j,f,d,h){var g=this,e=f;function i(){var k=g.dependencies(j);b.each(k,function(m){var l=g.createUrl(f,m);g.load(l.resource,l,undefined,undefined)});if(d){if(h){d.call(h)}else{d.call(b.ScriptLoader)}}}if(g.urls[j]){return}if(typeof f==="object"){e=f.prefix+f.resource+f.suffix}if(e.indexOf("/")!=0&&e.indexOf("://")==-1){e=b.baseURL+"/"+e}g.urls[j]=e.substring(0,e.lastIndexOf("/"));if(g.lookup[j]){i()}else{b.ScriptLoader.add(e,i,h)}}});b.PluginManager=new b.AddOnManager();b.ThemeManager=new b.AddOnManager()}(tinymce));(function(j){var g=j.each,d=j.extend,k=j.DOM,i=j.dom.Event,f=j.ThemeManager,b=j.PluginManager,e=j.explode,h=j.util.Dispatcher,a,c=0;j.documentBaseURL=window.location.href.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,"");if(!/[\/\\]$/.test(j.documentBaseURL)){j.documentBaseURL+="/"}j.baseURL=new j.util.URI(j.documentBaseURL).toAbsolute(j.baseURL);j.baseURI=new j.util.URI(j.baseURL);j.onBeforeUnload=new h(j);i.add(window,"beforeunload",function(l){j.onBeforeUnload.dispatch(j,l)});j.onAddEditor=new h(j);j.onRemoveEditor=new h(j);j.EditorManager=d(j,{editors:[],i18n:{},activeEditor:null,init:function(q){var n=this,p,l=j.ScriptLoader,u,o=[],m;function r(x,y,t){var v=x[y];if(!v){return}if(j.is(v,"string")){t=v.replace(/\.\w+$/,"");t=t?j.resolve(t):0;v=j.resolve(v)}return v.apply(t||this,Array.prototype.slice.call(arguments,2))}q=d({theme:"simple",language:"en"},q);n.settings=q;i.add(document,"init",function(){var s,v;r(q,"onpageload");switch(q.mode){case"exact":s=q.elements||"";if(s.length>0){g(e(s),function(x){if(k.get(x)){m=new j.Editor(x,q);o.push(m);m.render(1)}else{g(document.forms,function(y){g(y.elements,function(z){if(z.name===x){x="mce_editor_"+c++;k.setAttrib(z,"id",x);m=new j.Editor(x,q);o.push(m);m.render(1)}})})}})}break;case"textareas":case"specific_textareas":function t(y,x){return x.constructor===RegExp?x.test(y.className):k.hasClass(y,x)}g(k.select("textarea"),function(x){if(q.editor_deselector&&t(x,q.editor_deselector)){return}if(!q.editor_selector||t(x,q.editor_selector)){u=k.get(x.name);if(!x.id&&!u){x.id=x.name}if(!x.id||n.get(x.id)){x.id=k.uniqueId()}m=new j.Editor(x.id,q);o.push(m);m.render(1)}});break}if(q.oninit){s=v=0;g(o,function(x){v++;if(!x.initialized){x.onInit.add(function(){s++;if(s==v){r(q,"oninit")}})}else{s++}if(s==v){r(q,"oninit")}})}})},get:function(l){if(l===a){return this.editors}return this.editors[l]},getInstanceById:function(l){return this.get(l)},add:function(m){var l=this,n=l.editors;n[m.id]=m;n.push(m);l._setActive(m);l.onAddEditor.dispatch(l,m);if(j.adapter){j.adapter.patchEditor(m)}return m},remove:function(n){var m=this,l,o=m.editors;if(!o[n.id]){return null}delete o[n.id];for(l=0;l<o.length;l++){if(o[l]==n){o.splice(l,1);break}}if(m.activeEditor==n){m._setActive(o[0])}n.destroy();m.onRemoveEditor.dispatch(m,n);return n},execCommand:function(r,p,o){var q=this,n=q.get(o),l;switch(r){case"mceFocus":n.focus();return true;case"mceAddEditor":case"mceAddControl":if(!q.get(o)){new j.Editor(o,q.settings).render()}return true;case"mceAddFrameControl":l=o.window;l.tinyMCE=tinyMCE;l.tinymce=j;j.DOM.doc=l.document;j.DOM.win=l;n=new j.Editor(o.element_id,o);n.render();if(j.isIE){function m(){n.destroy();l.detachEvent("onunload",m);l=l.tinyMCE=l.tinymce=null}l.attachEvent("onunload",m)}o.page_window=null;return true;case"mceRemoveEditor":case"mceRemoveControl":if(n){n.remove()}return true;case"mceToggleEditor":if(!n){q.execCommand("mceAddControl",0,o);return true}if(n.isHidden()){n.show()}else{n.hide()}return true}if(q.activeEditor){return q.activeEditor.execCommand(r,p,o)}return false},execInstanceCommand:function(p,o,n,m){var l=this.get(p);if(l){return l.execCommand(o,n,m)}return false},triggerSave:function(){g(this.editors,function(l){l.save()})},addI18n:function(n,q){var l,m=this.i18n;if(!j.is(n,"string")){g(n,function(r,p){g(r,function(t,s){g(t,function(v,u){if(s==="common"){m[p+"."+u]=v}else{m[p+"."+s+"."+u]=v}})})})}else{g(q,function(r,p){m[n+"."+p]=r})}},_setActive:function(l){this.selectedInstance=this.activeEditor=l}})})(tinymce);(function(m){var n=m.DOM,j=m.dom.Event,f=m.extend,k=m.util.Dispatcher,i=m.each,a=m.isGecko,b=m.isIE,e=m.isWebKit,d=m.is,h=m.ThemeManager,c=m.PluginManager,o=m.inArray,l=m.grep,g=m.explode;m.create("tinymce.Editor",{Editor:function(r,q){var p=this;p.id=p.editorId=r;p.execCommands={};p.queryStateCommands={};p.queryValueCommands={};p.isNotDirty=false;p.plugins={};i(["onPreInit","onBeforeRenderUI","onPostRender","onInit","onRemove","onActivate","onDeactivate","onClick","onEvent","onMouseUp","onMouseDown","onDblClick","onKeyDown","onKeyUp","onKeyPress","onContextMenu","onSubmit","onReset","onPaste","onPreProcess","onPostProcess","onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent","onLoadContent","onSaveContent","onNodeChange","onChange","onBeforeExecCommand","onExecCommand","onUndo","onRedo","onVisualAid","onSetProgressState"],function(s){p[s]=new k(p)});p.settings=q=f({id:r,language:"en",docs_language:"en",theme:"simple",skin:"default",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:m.documentBaseURL,add_form_submit_trigger:1,submit_patch:1,add_unload_trigger:1,convert_urls:1,relative_urls:1,remove_script_host:1,table_inline_editing:0,object_resizing:1,cleanup:1,accessibility_focus:1,custom_shortcuts:1,custom_undo_redo_keyboard_shortcuts:1,custom_undo_redo_restore_selection:1,custom_undo_redo:1,doctype:m.isIE6?'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">':"<!DOCTYPE>",visual_table_class:"mceItemTable",visual:1,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%",apply_source_formatting:1,directionality:"ltr",forced_root_block:"p",hidden_input:1,padd_empty_editor:1,render_ui:1,init_theme:1,force_p_newlines:1,indentation:"30px",keep_styles:1,fix_table_elements:1,inline_styles:1,convert_fonts_to_spans:true,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",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr",validate:true,entity_encoding:"named",url_converter:p.convertURL,url_converter_scope:p,ie7_compat:true},q);p.documentBaseURI=new m.util.URI(q.document_base_url||m.documentBaseURL,{base_uri:tinyMCE.baseURI});p.baseURI=m.baseURI;p.contentCSS=[];p.execCallback("setup",p)},render:function(r){var u=this,v=u.settings,x=u.id,p=m.ScriptLoader;if(!j.domLoaded){j.add(document,"init",function(){u.render()});return}tinyMCE.settings=v;if(!u.getElement()){return}if(m.isIDevice&&!m.isIOS5){return}if(!/TEXTAREA|INPUT/i.test(u.getElement().nodeName)&&v.hidden_input&&n.getParent(x,"form")){n.insertAfter(n.create("input",{type:"hidden",name:x}),x)}if(m.WindowManager){u.windowManager=new m.WindowManager(u)}if(v.encoding=="xml"){u.onGetContent.add(function(s,t){if(t.save){t.content=n.encode(t.content)}})}if(v.add_form_submit_trigger){u.onSubmit.addToTop(function(){if(u.initialized){u.save();u.isNotDirty=1}})}if(v.add_unload_trigger){u._beforeUnload=tinyMCE.onBeforeUnload.add(function(){if(u.initialized&&!u.destroyed&&!u.isHidden()){u.save({format:"raw",no_events:true})}})}m.addUnload(u.destroy,u);if(v.submit_patch){u.onBeforeRenderUI.add(function(){var s=u.getElement().form;if(!s){return}if(s._mceOldSubmit){return}if(!s.submit.nodeType&&!s.submit.length){u.formElement=s;s._mceOldSubmit=s.submit;s.submit=function(){m.triggerSave();u.isNotDirty=1;return u.formElement._mceOldSubmit(u.formElement)}}s=null})}function q(){if(v.language&&v.language_load!==false){p.add(m.baseURL+"/langs/"+v.language+".js")}if(v.theme&&v.theme.charAt(0)!="-"&&!h.urls[v.theme]){h.load(v.theme,"themes/"+v.theme+"/editor_template"+m.suffix+".js")}i(g(v.plugins),function(t){if(t&&!c.urls[t]){if(t.charAt(0)=="-"){t=t.substr(1,t.length);var s=c.dependencies(t);i(s,function(z){var y={prefix:"plugins/",resource:z,suffix:"/editor_plugin"+m.suffix+".js"};var z=c.createUrl(y,z);c.load(z.resource,z)})}else{if(t=="safari"){return}c.load(t,{prefix:"plugins/",resource:t,suffix:"/editor_plugin"+m.suffix+".js"})}}});p.loadQueue(function(){if(!u.removed){u.init()}})}q()},init:function(){var r,H=this,I=H.settings,E,A,D=H.getElement(),q,p,F,y,C,G,z,v=[];m.add(H);I.aria_label=I.aria_label||n.getAttrib(D,"aria-label",H.getLang("aria.rich_text_area"));if(I.theme){I.theme=I.theme.replace(/-/,"");q=h.get(I.theme);H.theme=new q();if(H.theme.init&&I.init_theme){H.theme.init(H,h.urls[I.theme]||m.documentBaseURL.replace(/\/$/,""))}}function B(J){var K=c.get(J),t=c.urls[J]||m.documentBaseURL.replace(/\/$/,""),s;if(K&&m.inArray(v,J)===-1){i(c.dependencies(J),function(u){B(u)});s=new K(H,t);H.plugins[J]=s;if(s.init){s.init(H,t);v.push(J)}}}i(g(I.plugins.replace(/\-/g,"")),B);if(I.popup_css!==false){if(I.popup_css){I.popup_css=H.documentBaseURI.toAbsolute(I.popup_css)}else{I.popup_css=H.baseURI.toAbsolute("themes/"+I.theme+"/skins/"+I.skin+"/dialog.css")}}if(I.popup_css_add){I.popup_css+=","+H.documentBaseURI.toAbsolute(I.popup_css_add)}H.controlManager=new m.ControlManager(H);if(I.custom_undo_redo){H.onBeforeExecCommand.add(function(t,J,u,K,s){if(J!="Undo"&&J!="Redo"&&J!="mceRepaint"&&(!s||!s.skip_undo)){H.undoManager.beforeChange()}});H.onExecCommand.add(function(t,J,u,K,s){if(J!="Undo"&&J!="Redo"&&J!="mceRepaint"&&(!s||!s.skip_undo)){H.undoManager.add()}})}H.onExecCommand.add(function(s,t){if(!/^(FontName|FontSize)$/.test(t)){H.nodeChanged()}});if(a){function x(s,t){if(!t||!t.initial){H.execCommand("mceRepaint")}}H.onUndo.add(x);H.onRedo.add(x);H.onSetContent.add(x)}H.onBeforeRenderUI.dispatch(H,H.controlManager);if(I.render_ui){E=I.width||D.style.width||D.offsetWidth;A=I.height||D.style.height||D.offsetHeight;H.orgDisplay=D.style.display;G=/^[0-9\.]+(|px)$/i;if(G.test(""+E)){E=Math.max(parseInt(E)+(q.deltaWidth||0),100)}if(G.test(""+A)){A=Math.max(parseInt(A)+(q.deltaHeight||0),100)}q=H.theme.renderUI({targetNode:D,width:E,height:A,deltaWidth:I.delta_width,deltaHeight:I.delta_height});H.editorContainer=q.editorContainer}if(document.domain&&location.hostname!=document.domain){m.relaxedDomain=document.domain}n.setStyles(q.sizeContainer||q.editorContainer,{width:E,height:A});if(I.content_css){m.each(g(I.content_css),function(s){H.contentCSS.push(H.documentBaseURI.toAbsolute(s))})}A=(q.iframeHeight||A)+(typeof(A)=="number"?(q.deltaHeight||0):"");if(A<100){A=100}H.iframeHTML=I.doctype+'<html><head xmlns="http://www.w3.org/1999/xhtml">';if(I.document_base_url!=m.documentBaseURL){H.iframeHTML+='<base href="'+H.documentBaseURI.getURI()+'" />'}if(I.ie7_compat){H.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=7" />'}else{H.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=edge" />'}H.iframeHTML+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';for(z=0;z<H.contentCSS.length;z++){H.iframeHTML+='<link type="text/css" rel="stylesheet" href="'+H.contentCSS[z]+'" />'}y=I.body_id||"tinymce";if(y.indexOf("=")!=-1){y=H.getParam("body_id","","hash");y=y[H.id]||y}C=I.body_class||"";if(C.indexOf("=")!=-1){C=H.getParam("body_class","","hash");C=C[H.id]||""}H.iframeHTML+='</head><body id="'+y+'" class="mceContentBody '+C+'"><br></body></html>';if(m.relaxedDomain&&(b||(m.isOpera&&parseFloat(opera.version())<11))){F='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinyMCE.get("'+H.id+'");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()'}r=n.add(q.iframeContainer,"iframe",{id:H.id+"_ifr",src:F||'javascript:""',frameBorder:"0",allowTransparency:"true",title:I.aria_label,style:{width:"100%",height:A,display:"block"}});H.contentAreaContainer=q.iframeContainer;n.get(q.editorContainer).style.display=H.orgDisplay;n.get(H.id).style.display="none";n.setAttrib(H.id,"aria-hidden",true);if(!m.relaxedDomain||!F){H.setupIframe()}D=r=q=null},setupIframe:function(){var q=this,v=q.settings,x=n.get(q.id),y=q.getDoc(),u,p;if(!b||!m.relaxedDomain){y.open();y.write(q.iframeHTML);y.close();if(m.relaxedDomain){y.domain=m.relaxedDomain}}p=q.getBody();p.disabled=true;if(!v.readonly){p.contentEditable=true}p.disabled=false;q.schema=new m.html.Schema(v);q.dom=new m.dom.DOMUtils(q.getDoc(),{keep_values:true,url_converter:q.convertURL,url_converter_scope:q,hex_colors:v.force_hex_style_colors,class_filter:v.class_filter,update_styles:1,fix_ie_paragraphs:1,schema:q.schema});q.parser=new m.html.DomParser(v,q.schema);if(!q.settings.allow_html_in_named_anchor){q.parser.addAttributeFilter("name",function(s,t){var A=s.length,C,z,B,D;while(A--){D=s[A];if(D.name==="a"&&D.firstChild){B=D.parent;C=D.lastChild;do{z=C.prev;B.insert(C,D);C=z}while(C)}}})}q.parser.addAttributeFilter("src,href,style",function(s,t){var z=s.length,B,D=q.dom,C,A;while(z--){B=s[z];C=B.attr(t);A="data-mce-"+t;if(!B.attributes.map[A]){if(t==="style"){B.attr(A,D.serializeStyle(D.parseStyle(C),B.name))}else{B.attr(A,q.convertURL(C,t,B.name))}}}});q.parser.addNodeFilter("script",function(s,t){var z=s.length,A;while(z--){A=s[z];A.attr("type","mce-"+(A.attr("type")||"text/javascript"))}});q.parser.addNodeFilter("#cdata",function(s,t){var z=s.length,A;while(z--){A=s[z];A.type=8;A.name="#comment";A.value="[CDATA["+A.value+"]]"}});q.parser.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(t,z){var A=t.length,B,s=q.schema.getNonEmptyElements();while(A--){B=t[A];if(B.isEmpty(s)){B.empty().append(new m.html.Node("br",1)).shortEnded=true}}});q.serializer=new m.dom.Serializer(v,q.dom,q.schema);q.selection=new m.dom.Selection(q.dom,q.getWin(),q.serializer);q.formatter=new m.Formatter(this);q.formatter.register({alignleft:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"left"}},{selector:"img,table",collapsed:false,styles:{"float":"left"}}],aligncenter:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"center"}},{selector:"img",collapsed:false,styles:{display:"block",marginLeft:"auto",marginRight:"auto"}},{selector:"table",collapsed:false,styles:{marginLeft:"auto",marginRight:"auto"}}],alignright:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"right"}},{selector:"img,table",collapsed:false,styles:{"float":"right"}}],alignfull:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"justify"}}],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:true},{inline:"u",remove:"all"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:true},{inline:"strike",remove:"all"}],forecolor:{inline:"span",styles:{color:"%value"},wrap_links:false},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},wrap_links:false},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"},link:{inline:"a",selector:"a",remove:"all",split:true,deep:true,onmatch:function(s){return true},onformat:function(z,s,t){i(t,function(B,A){q.dom.setAttrib(z,A,B)})}},removeformat:[{selector:"b,strong,em,i,font,u,strike",remove:"all",split:true,expand:false,block_expand:true,deep:true},{selector:"span",attributes:["style","class"],remove:"empty",split:true,expand:false,deep:true},{selector:"*",attributes:["style","class"],split:false,expand:false,deep:true}]});i("p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp".split(/\s/),function(s){q.formatter.register(s,{block:s,remove:"all"})});q.formatter.register(q.settings.formats);q.undoManager=new m.UndoManager(q);q.undoManager.onAdd.add(function(t,s){if(t.hasUndo()){return q.onChange.dispatch(q,s,t)}});q.undoManager.onUndo.add(function(t,s){return q.onUndo.dispatch(q,s,t)});q.undoManager.onRedo.add(function(t,s){return q.onRedo.dispatch(q,s,t)});q.forceBlocks=new m.ForceBlocks(q,{forced_root_block:v.forced_root_block});q.editorCommands=new m.EditorCommands(q);q.serializer.onPreProcess.add(function(s,t){return q.onPreProcess.dispatch(q,t,s)});q.serializer.onPostProcess.add(function(s,t){return q.onPostProcess.dispatch(q,t,s)});q.onPreInit.dispatch(q);if(!v.gecko_spellcheck){q.getBody().spellcheck=0}if(!v.readonly){q._addEvents()}q.controlManager.onPostRender.dispatch(q,q.controlManager);q.onPostRender.dispatch(q);q.quirks=new m.util.Quirks(this);if(v.directionality){q.getBody().dir=v.directionality}if(v.nowrap){q.getBody().style.whiteSpace="nowrap"}if(v.handle_node_change_callback){q.onNodeChange.add(function(t,s,z){q.execCallback("handle_node_change_callback",q.id,z,-1,-1,true,q.selection.isCollapsed())})}if(v.save_callback){q.onSaveContent.add(function(s,z){var t=q.execCallback("save_callback",q.id,z.content,q.getBody());if(t){z.content=t}})}if(v.onchange_callback){q.onChange.add(function(t,s){q.execCallback("onchange_callback",q,s)})}if(v.protect){q.onBeforeSetContent.add(function(s,t){if(v.protect){i(v.protect,function(z){t.content=t.content.replace(z,function(A){return"<!--mce:protected "+escape(A)+"-->"})})}})}if(v.convert_newlines_to_brs){q.onBeforeSetContent.add(function(s,t){if(t.initial){t.content=t.content.replace(/\r?\n/g,"<br />")}})}if(v.preformatted){q.onPostProcess.add(function(s,t){t.content=t.content.replace(/^\s*<pre.*?>/,"");t.content=t.content.replace(/<\/pre>\s*$/,"");if(t.set){t.content='<pre class="mceItemHidden">'+t.content+"</pre>"}})}if(v.verify_css_classes){q.serializer.attribValueFilter=function(B,z){var A,t;if(B=="class"){if(!q.classesRE){t=q.dom.getClasses();if(t.length>0){A="";i(t,function(s){A+=(A?"|":"")+s["class"]});q.classesRE=new RegExp("("+A+")","gi")}}return !q.classesRE||/(\bmceItem\w+\b|\bmceTemp\w+\b)/g.test(z)||q.classesRE.test(z)?z:""}return z}}if(v.cleanup_callback){q.onBeforeSetContent.add(function(s,t){t.content=q.execCallback("cleanup_callback","insert_to_editor",t.content,t)});q.onPreProcess.add(function(s,t){if(t.set){q.execCallback("cleanup_callback","insert_to_editor_dom",t.node,t)}if(t.get){q.execCallback("cleanup_callback","get_from_editor_dom",t.node,t)}});q.onPostProcess.add(function(s,t){if(t.set){t.content=q.execCallback("cleanup_callback","insert_to_editor",t.content,t)}if(t.get){t.content=q.execCallback("cleanup_callback","get_from_editor",t.content,t)}})}if(v.save_callback){q.onGetContent.add(function(s,t){if(t.save){t.content=q.execCallback("save_callback",q.id,t.content,q.getBody())}})}if(v.handle_event_callback){q.onEvent.add(function(s,t,z){if(q.execCallback("handle_event_callback",t,s,z)===false){j.cancel(t)}})}q.onSetContent.add(function(){q.addVisual(q.getBody())});if(v.padd_empty_editor){q.onPostProcess.add(function(s,t){t.content=t.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/,"")})}if(a){function r(s,t){i(s.dom.select("a"),function(A){var z=A.parentNode;if(s.dom.isBlock(z)&&z.lastChild===A){s.dom.add(z,"br",{"data-mce-bogus":1})}})}q.onExecCommand.add(function(s,t){if(t==="CreateLink"){r(s)}});q.onSetContent.add(q.selection.onSetContent.add(r))}q.load({initial:true,format:"html"});q.startContent=q.getContent({format:"raw"});q.undoManager.add();q.initialized=true;q.onInit.dispatch(q);q.execCallback("setupcontent_callback",q.id,q.getBody(),q.getDoc());q.execCallback("init_instance_callback",q);q.focus(true);q.nodeChanged({initial:1});i(q.contentCSS,function(s){q.dom.loadCSS(s)});if(v.auto_focus){setTimeout(function(){var s=m.get(v.auto_focus);s.selection.select(s.getBody(),1);s.selection.collapse(1);s.getBody().focus();s.getWin().focus()},100)}x=null},focus:function(u){var y,q=this,s=q.selection,x=q.settings.content_editable,r,p,v=q.getDoc();if(!u){r=s.getRng();if(r.item){p=r.item(0)}q._refreshContentEditable();s.normalize();if(!x){q.getWin().focus()}if(m.isGecko){q.getBody().focus()}if(p&&p.ownerDocument==v){r=v.body.createControlRange();r.addElement(p);r.select()}}if(m.activeEditor!=q){if((y=m.activeEditor)!=null){y.onDeactivate.dispatch(y,q)}q.onActivate.dispatch(q,y)}m._setActive(q)},execCallback:function(u){var p=this,r=p.settings[u],q;if(!r){return}if(p.callbackLookup&&(q=p.callbackLookup[u])){r=q.func;q=q.scope}if(d(r,"string")){q=r.replace(/\.\w+$/,"");q=q?m.resolve(q):0;r=m.resolve(r);p.callbackLookup=p.callbackLookup||{};p.callbackLookup[u]={func:r,scope:q}}return r.apply(q||p,Array.prototype.slice.call(arguments,1))},translate:function(p){var r=this.settings.language||"en",q=m.i18n;if(!p){return""}return q[r+"."+p]||p.replace(/{\#([^}]+)\}/g,function(t,s){return q[r+"."+s]||"{#"+s+"}"})},getLang:function(q,p){return m.i18n[(this.settings.language||"en")+"."+q]||(d(p)?p:"{#"+q+"}")},getParam:function(u,r,p){var s=m.trim,q=d(this.settings[u])?this.settings[u]:r,t;if(p==="hash"){t={};if(d(q,"string")){i(q.indexOf("=")>0?q.split(/[;,](?![^=;,]*(?:[;,]|$))/):q.split(","),function(x){x=x.split("=");if(x.length>1){t[s(x[0])]=s(x[1])}else{t[s(x[0])]=s(x)}})}else{t=q}return t}return q},nodeChanged:function(r){var p=this,q=p.selection,u=q.getStart()||p.getBody();if(p.initialized){r=r||{};u=b&&u.ownerDocument!=p.getDoc()?p.getBody():u;r.parents=[];p.dom.getParent(u,function(s){if(s.nodeName=="BODY"){return true}r.parents.push(s)});p.onNodeChange.dispatch(p,r?r.controlManager||p.controlManager:p.controlManager,u,q.isCollapsed(),r)}},addButton:function(r,q){var p=this;p.buttons=p.buttons||{};p.buttons[r]=q},addCommand:function(p,r,q){this.execCommands[p]={func:r,scope:q||this}},addQueryStateHandler:function(p,r,q){this.queryStateCommands[p]={func:r,scope:q||this}},addQueryValueHandler:function(p,r,q){this.queryValueCommands[p]={func:r,scope:q||this}},addShortcut:function(r,u,p,s){var q=this,v;if(!q.settings.custom_shortcuts){return false}q.shortcuts=q.shortcuts||{};if(d(p,"string")){v=p;p=function(){q.execCommand(v,false,null)}}if(d(p,"object")){v=p;p=function(){q.execCommand(v[0],v[1],v[2])}}i(g(r),function(t){var x={func:p,scope:s||this,desc:u,alt:false,ctrl:false,shift:false};i(g(t,"+"),function(y){switch(y){case"alt":case"ctrl":case"shift":x[y]=true;break;default:x.charCode=y.charCodeAt(0);x.keyCode=y.toUpperCase().charCodeAt(0)}});q.shortcuts[(x.ctrl?"ctrl":"")+","+(x.alt?"alt":"")+","+(x.shift?"shift":"")+","+x.keyCode]=x});return true},execCommand:function(x,v,z,p){var r=this,u=0,y,q;if(!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(x)&&(!p||!p.skip_focus)){r.focus()}y={};r.onBeforeExecCommand.dispatch(r,x,v,z,y);if(y.terminate){return false}if(r.execCallback("execcommand_callback",r.id,r.selection.getNode(),x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(y=r.execCommands[x]){q=y.func.call(y.scope,v,z);if(q!==true){r.onExecCommand.dispatch(r,x,v,z,p);return q}}i(r.plugins,function(s){if(s.execCommand&&s.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);u=1;return false}});if(u){return true}if(r.theme&&r.theme.execCommand&&r.theme.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(r.editorCommands.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}r.getDoc().execCommand(x,v,z);r.onExecCommand.dispatch(r,x,v,z,p)},queryCommandState:function(u){var q=this,v,r;if(q._isHidden()){return}if(v=q.queryStateCommands[u]){r=v.func.call(v.scope);if(r!==true){return r}}v=q.editorCommands.queryCommandState(u);if(v!==-1){return v}try{return this.getDoc().queryCommandState(u)}catch(p){}},queryCommandValue:function(v){var q=this,u,r;if(q._isHidden()){return}if(u=q.queryValueCommands[v]){r=u.func.call(u.scope);if(r!==true){return r}}u=q.editorCommands.queryCommandValue(v);if(d(u)){return u}try{return this.getDoc().queryCommandValue(v)}catch(p){}},show:function(){var p=this;n.show(p.getContainer());n.hide(p.id);p.load()},hide:function(){var p=this,q=p.getDoc();if(b&&q){q.execCommand("SelectAll")}p.save();n.hide(p.getContainer());n.setStyle(p.id,"display",p.orgDisplay)},isHidden:function(){return !n.isHidden(this.id)},setProgressState:function(p,q,r){this.onSetProgressState.dispatch(this,p,q,r);return p},load:function(s){var p=this,r=p.getElement(),q;if(r){s=s||{};s.load=true;q=p.setContent(d(r.value)?r.value:r.innerHTML,s);s.element=r;if(!s.no_events){p.onLoadContent.dispatch(p,s)}s.element=r=null;return q}},save:function(u){var p=this,s=p.getElement(),q,r;if(!s||!p.initialized){return}u=u||{};u.save=true;if(!u.no_events){p.undoManager.typing=false;p.undoManager.add()}u.element=s;q=u.content=p.getContent(u);if(!u.no_events){p.onSaveContent.dispatch(p,u)}q=u.content;if(!/TEXTAREA|INPUT/i.test(s.nodeName)){s.innerHTML=q;if(r=n.getParent(p.id,"form")){i(r.elements,function(t){if(t.name==p.id){t.value=q;return false}})}}else{s.value=q}u.element=s=null;return q},setContent:function(u,s){var r=this,q,p=r.getBody(),t;s=s||{};s.format=s.format||"html";s.set=true;s.content=u;if(!s.no_events){r.onBeforeSetContent.dispatch(r,s)}u=s.content;if(!m.isIE&&(u.length===0||/^\s+$/.test(u))){t=r.settings.forced_root_block;if(t){u="<"+t+'><br data-mce-bogus="1"></'+t+">"}else{u='<br data-mce-bogus="1">'}p.innerHTML=u;r.selection.select(p,true);r.selection.collapse(true);return}if(s.format!=="raw"){u=new m.html.Serializer({},r.schema).serialize(r.parser.parse(u))}s.content=m.trim(u);r.dom.setHTML(p,s.content);if(!s.no_events){r.onSetContent.dispatch(r,s)}r.selection.normalize();return s.content},getContent:function(q){var p=this,r;q=q||{};q.format=q.format||"html";q.get=true;if(!q.no_events){p.onBeforeGetContent.dispatch(p,q)}if(q.format=="raw"){r=p.getBody().innerHTML}else{r=p.serializer.serialize(p.getBody(),q)}q.content=m.trim(r);if(!q.no_events){p.onGetContent.dispatch(p,q)}return q.content},isDirty:function(){var p=this;return m.trim(p.startContent)!=m.trim(p.getContent({format:"raw",no_events:1}))&&!p.isNotDirty},getContainer:function(){var p=this;if(!p.container){p.container=n.get(p.editorContainer||p.id+"_parent")}return p.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return n.get(this.settings.content_element||this.id)},getWin:function(){var p=this,q;if(!p.contentWindow){q=n.get(p.id+"_ifr");if(q){p.contentWindow=q.contentWindow}}return p.contentWindow},getDoc:function(){var q=this,p;if(!q.contentDocument){p=q.getWin();if(p){q.contentDocument=p.document}}return q.contentDocument},getBody:function(){return this.bodyElement||this.getDoc().body},convertURL:function(p,x,v){var q=this,r=q.settings;if(r.urlconverter_callback){return q.execCallback("urlconverter_callback",p,v,true,x)}if(!r.convert_urls||(v&&v.nodeName=="LINK")||p.indexOf("file:")===0){return p}if(r.relative_urls){return q.documentBaseURI.toRelative(p)}p=q.documentBaseURI.toAbsolute(p,r.remove_script_host);return p},addVisual:function(r){var p=this,q=p.settings;r=r||p.getBody();if(!d(p.hasVisual)){p.hasVisual=q.visual}i(p.dom.select("table,a",r),function(t){var s;switch(t.nodeName){case"TABLE":s=p.dom.getAttrib(t,"border");if(!s||s=="0"){if(p.hasVisual){p.dom.addClass(t,q.visual_table_class)}else{p.dom.removeClass(t,q.visual_table_class)}}return;case"A":s=p.dom.getAttrib(t,"name");if(s){if(p.hasVisual){p.dom.addClass(t,"mceItemAnchor")}else{p.dom.removeClass(t,"mceItemAnchor")}}return}});p.onVisualAid.dispatch(p,r,p.hasVisual)},remove:function(){var p=this,q=p.getContainer();p.removed=1;p.hide();p.execCallback("remove_instance_callback",p);p.onRemove.dispatch(p);p.onExecCommand.listeners=[];m.remove(p);n.remove(q)},destroy:function(q){var p=this;if(p.destroyed){return}if(!q){m.removeUnload(p.destroy);tinyMCE.onBeforeUnload.remove(p._beforeUnload);if(p.theme&&p.theme.destroy){p.theme.destroy()}p.controlManager.destroy();p.selection.destroy();p.dom.destroy();if(!p.settings.content_editable){j.clear(p.getWin());j.clear(p.getDoc())}j.clear(p.getBody());j.clear(p.formElement)}if(p.formElement){p.formElement.submit=p.formElement._mceOldSubmit;p.formElement._mceOldSubmit=null}p.contentAreaContainer=p.formElement=p.container=p.settings.content_element=p.bodyElement=p.contentDocument=p.contentWindow=null;if(p.selection){p.selection=p.selection.win=p.selection.dom=p.selection.dom.doc=null}p.destroyed=1},_addEvents:function(){var B=this,r,C=B.settings,q=B.dom,x={mouseup:"onMouseUp",mousedown:"onMouseDown",click:"onClick",keyup:"onKeyUp",keydown:"onKeyDown",keypress:"onKeyPress",submit:"onSubmit",reset:"onReset",contextmenu:"onContextMenu",dblclick:"onDblClick",paste:"onPaste"};function p(t,D){var s=t.type;if(B.removed){return}if(B.onEvent.dispatch(B,t,D)!==false){B[x[t.fakeType||t.type]].dispatch(B,t,D)}}i(x,function(t,s){switch(s){case"contextmenu":q.bind(B.getDoc(),s,p);break;case"paste":q.bind(B.getBody(),s,function(D){p(D)});break;case"submit":case"reset":q.bind(B.getElement().form||n.getParent(B.id,"form"),s,p);break;default:q.bind(C.content_editable?B.getBody():B.getDoc(),s,p)}});q.bind(C.content_editable?B.getBody():(a?B.getDoc():B.getWin()),"focus",function(s){B.focus(true)});if(m.isGecko){q.bind(B.getDoc(),"DOMNodeInserted",function(t){var s;t=t.target;if(t.nodeType===1&&t.nodeName==="IMG"&&(s=t.getAttribute("data-mce-src"))){t.src=B.documentBaseURI.toAbsolute(s)}})}if(a){function u(){var E=this,G=E.getDoc(),F=E.settings;if(a&&!F.readonly){E._refreshContentEditable();try{G.execCommand("styleWithCSS",0,false)}catch(D){if(!E._isHidden()){try{G.execCommand("useCSS",0,true)}catch(D){}}}if(!F.table_inline_editing){try{G.execCommand("enableInlineTableEditing",false,false)}catch(D){}}if(!F.object_resizing){try{G.execCommand("enableObjectResizing",false,false)}catch(D){}}}}B.onBeforeExecCommand.add(u);B.onMouseDown.add(u)}B.onMouseUp.add(B.nodeChanged);B.onKeyUp.add(function(s,t){var D=t.keyCode;if((D>=33&&D<=36)||(D>=37&&D<=40)||D==13||D==45||D==46||D==8||(m.isMac&&(D==91||D==93))||t.ctrlKey){B.nodeChanged()}});B.onKeyDown.add(function(t,D){if(D.keyCode!=8){return}var F=t.selection.getRng().startContainer;var E=t.selection.getRng().startOffset;while(F&&F.nodeType&&F.nodeType!=1&&F.parentNode){F=F.parentNode}if(F&&F.parentNode&&F.parentNode.tagName==="BLOCKQUOTE"&&F.parentNode.firstChild==F&&E==0){t.formatter.toggle("blockquote",null,F.parentNode);var s=t.selection.getRng();s.setStart(F,0);s.setEnd(F,0);t.selection.setRng(s);t.selection.collapse(false)}});B.onReset.add(function(){B.setContent(B.startContent,{format:"raw"})});if(C.custom_shortcuts){if(C.custom_undo_redo_keyboard_shortcuts){B.addShortcut("ctrl+z",B.getLang("undo_desc"),"Undo");B.addShortcut("ctrl+y",B.getLang("redo_desc"),"Redo")}B.addShortcut("ctrl+b",B.getLang("bold_desc"),"Bold");B.addShortcut("ctrl+i",B.getLang("italic_desc"),"Italic");B.addShortcut("ctrl+u",B.getLang("underline_desc"),"Underline");for(r=1;r<=6;r++){B.addShortcut("ctrl+"+r,"",["FormatBlock",false,"h"+r])}B.addShortcut("ctrl+7","",["FormatBlock",false,"p"]);B.addShortcut("ctrl+8","",["FormatBlock",false,"div"]);B.addShortcut("ctrl+9","",["FormatBlock",false,"address"]);function v(t){var s=null;if(!t.altKey&&!t.ctrlKey&&!t.metaKey){return s}i(B.shortcuts,function(D){if(m.isMac&&D.ctrl!=t.metaKey){return}else{if(!m.isMac&&D.ctrl!=t.ctrlKey){return}}if(D.alt!=t.altKey){return}if(D.shift!=t.shiftKey){return}if(t.keyCode==D.keyCode||(t.charCode&&t.charCode==D.charCode)){s=D;return false}});return s}B.onKeyUp.add(function(s,t){var D=v(t);if(D){return j.cancel(t)}});B.onKeyPress.add(function(s,t){var D=v(t);if(D){return j.cancel(t)}});B.onKeyDown.add(function(s,t){var D=v(t);if(D){D.func.call(D.scope);return j.cancel(t)}})}if(m.isIE){q.bind(B.getDoc(),"controlselect",function(D){var t=B.resizeInfo,s;D=D.target;if(D.nodeName!=="IMG"){return}if(t){q.unbind(t.node,t.ev,t.cb)}if(!q.hasClass(D,"mceItemNoResize")){ev="resizeend";s=q.bind(D,ev,function(F){var E;F=F.target;if(E=q.getStyle(F,"width")){q.setAttrib(F,"width",E.replace(/[^0-9%]+/g,""));q.setStyle(F,"width","")}if(E=q.getStyle(F,"height")){q.setAttrib(F,"height",E.replace(/[^0-9%]+/g,""));q.setStyle(F,"height","")}})}else{ev="resizestart";s=q.bind(D,"resizestart",j.cancel,j)}t=B.resizeInfo={node:D,ev:ev,cb:s}})}if(m.isOpera){B.onClick.add(function(s,t){j.prevent(t)})}if(C.custom_undo_redo){function y(){B.undoManager.typing=false;B.undoManager.add()}q.bind(B.getDoc(),"focusout",function(s){if(!B.removed&&B.undoManager.typing){y()}});B.dom.bind(B.dom.getRoot(),"dragend",function(s){y()});B.onKeyUp.add(function(s,D){var t=D.keyCode;if((t>=33&&t<=36)||(t>=37&&t<=40)||t==13||t==45||D.ctrlKey){y()}});B.onKeyDown.add(function(s,E){var D=E.keyCode,t;if(D==8){t=B.getDoc().selection;if(t&&t.createRange&&t.createRange().item){B.undoManager.beforeChange();s.dom.remove(t.createRange().item(0));y();return j.cancel(E)}}if((D>=33&&D<=36)||(D>=37&&D<=40)||D==13||D==45){if(m.isIE&&D==13){B.undoManager.beforeChange()}if(B.undoManager.typing){y()}return}if((D<16||D>20)&&D!=224&&D!=91&&!B.undoManager.typing){B.undoManager.beforeChange();B.undoManager.typing=true;B.undoManager.add()}});B.onMouseDown.add(function(){if(B.undoManager.typing){y()}})}if(m.isGecko){function A(){var s=B.dom.getAttribs(B.selection.getStart().cloneNode(false));return function(){var t=B.selection.getStart();if(t!==B.getBody()){B.dom.setAttrib(t,"style",null);i(s,function(D){t.setAttributeNode(D.cloneNode(true))})}}}function z(){var t=B.selection;return !t.isCollapsed()&&t.getStart()!=t.getEnd()}B.onKeyPress.add(function(s,D){var t;if((D.keyCode==8||D.keyCode==46)&&z()){t=A();B.getDoc().execCommand("delete",false,null);t();return j.cancel(D)}});B.dom.bind(B.getDoc(),"cut",function(t){var s;if(z()){s=A();B.onKeyUp.addToTop(j.cancel,j);setTimeout(function(){s();B.onKeyUp.remove(j.cancel,j)},0)}})}},_refreshContentEditable:function(){var q=this,p,r;if(q._isHidden()){p=q.getBody();r=p.parentNode;r.removeChild(p);r.appendChild(p);p.focus()}},_isHidden:function(){var p;if(!a){return 0}p=this.selection.getSel();return(!p||!p.rangeCount||p.rangeCount==0)}})})(tinymce);(function(c){var d=c.each,e,a=true,b=false;c.EditorCommands=function(n){var m=n.dom,p=n.selection,j={state:{},exec:{},value:{}},k=n.settings,q=n.formatter,o;function r(z,y,x){var v;z=z.toLowerCase();if(v=j.exec[z]){v(z,y,x);return a}return b}function l(x){var v;x=x.toLowerCase();if(v=j.state[x]){return v(x)}return -1}function h(x){var v;x=x.toLowerCase();if(v=j.value[x]){return v(x)}return b}function u(v,x){x=x||"exec";d(v,function(z,y){d(y.toLowerCase().split(","),function(A){j[x][A]=z})})}c.extend(this,{execCommand:r,queryCommandState:l,queryCommandValue:h,addCommands:u});function f(y,x,v){if(x===e){x=b}if(v===e){v=null}return n.getDoc().execCommand(y,x,v)}function t(v){return q.match(v)}function s(v,x){q.toggle(v,x?{value:x}:e)}function i(v){o=p.getBookmark(v)}function g(){p.moveToBookmark(o)}u({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){n.undoManager.add()},"Cut,Copy,Paste":function(z){var y=n.getDoc(),v;try{f(z)}catch(x){v=a}if(v||!y.queryCommandSupported(z)){if(c.isGecko){n.windowManager.confirm(n.getLang("clipboard_msg"),function(A){if(A){open("http://www.mozilla.org/editor/midasdemo/securityprefs.html","_blank")}})}else{n.windowManager.alert(n.getLang("clipboard_no_support"))}}},unlink:function(v){if(p.isCollapsed()){p.select(p.getNode())}f(v);p.collapse(b)},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(v){var x=v.substring(7);d("left,center,right,full".split(","),function(y){if(x!=y){q.remove("align"+y)}});s("align"+x);r("mceRepaint")},"InsertUnorderedList,InsertOrderedList":function(y){var v,x;f(y);v=m.getParent(p.getNode(),"ol,ul");if(v){x=v.parentNode;if(/^(H[1-6]|P|ADDRESS|PRE)$/.test(x.nodeName)){i();m.split(x,v);g()}}},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(v){s(v)},"ForeColor,HiliteColor,FontName":function(y,x,v){s(y,v)},FontSize:function(z,y,x){var v,A;if(x>=1&&x<=7){A=c.explode(k.font_size_style_values);v=c.explode(k.font_size_classes);if(v){x=v[x-1]||x}else{x=A[x-1]||x}}s(z,x)},RemoveFormat:function(v){q.remove(v)},mceBlockQuote:function(v){s("blockquote")},FormatBlock:function(y,x,v){return s(v||"p")},mceCleanup:function(){var v=p.getBookmark();n.setContent(n.getContent({cleanup:a}),{cleanup:a});p.moveToBookmark(v)},mceRemoveNode:function(z,y,x){var v=x||p.getNode();if(v!=n.getBody()){i();n.dom.remove(v,a);g()}},mceSelectNodeDepth:function(z,y,x){var v=0;m.getParent(p.getNode(),function(A){if(A.nodeType==1&&v++==x){p.select(A);return b}},n.getBody())},mceSelectNode:function(y,x,v){p.select(v)},mceInsertContent:function(B,I,K){var y,J,E,z,F,G,D,C,L,x,A,M,v,H;y=n.parser;J=new c.html.Serializer({},n.schema);v='<span id="mce_marker" data-mce-type="bookmark">\uFEFF</span>';G={content:K,format:"html"};p.onBeforeSetContent.dispatch(p,G);K=G.content;if(K.indexOf("{$caret}")==-1){K+="{$caret}"}K=K.replace(/\{\$caret\}/,v);if(!p.isCollapsed()){n.getDoc().execCommand("Delete",false,null)}E=p.getNode();G={context:E.nodeName.toLowerCase()};F=y.parse(K,G);A=F.lastChild;if(A.attr("id")=="mce_marker"){D=A;for(A=A.prev;A;A=A.walk(true)){if(A.type==3||!m.isBlock(A.name)){A.parent.insert(D,A,A.name==="br");break}}}if(!G.invalid){K=J.serialize(F);A=E.firstChild;M=E.lastChild;if(!A||(A===M&&A.nodeName==="BR")){m.setHTML(E,K)}else{p.setContent(K)}}else{p.setContent(v);E=n.selection.getNode();z=n.getBody();if(E.nodeType==9){E=A=z}else{A=E}while(A!==z){E=A;A=A.parentNode}K=E==z?z.innerHTML:m.getOuterHTML(E);K=J.serialize(y.parse(K.replace(/<span (id="mce_marker"|id=mce_marker).+?<\/span>/i,function(){return J.serialize(F)})));if(E==z){m.setHTML(z,K)}else{m.setOuterHTML(E,K)}}D=m.get("mce_marker");C=m.getRect(D);L=m.getViewPort(n.getWin());if((C.y+C.h>L.y+L.h||C.y<L.y)||(C.x>L.x+L.w||C.x<L.x)){H=c.isIE?n.getDoc().documentElement:n.getBody();H.scrollLeft=C.x;H.scrollTop=C.y-L.h+25}x=m.createRng();A=D.previousSibling;if(A&&A.nodeType==3){x.setStart(A,A.nodeValue.length)}else{x.setStartBefore(D);x.setEndBefore(D)}m.remove(D);p.setRng(x);p.onSetContent.dispatch(p,G);n.addVisual()},mceInsertRawHTML:function(y,x,v){p.setContent("tiny_mce_marker");n.setContent(n.getContent().replace(/tiny_mce_marker/g,function(){return v}))},mceSetContent:function(y,x,v){n.setContent(v)},"Indent,Outdent":function(z){var x,v,y;x=k.indentation;v=/[a-z%]+$/i.exec(x);x=parseInt(x);if(!l("InsertUnorderedList")&&!l("InsertOrderedList")){d(p.getSelectedBlocks(),function(A){if(z=="outdent"){y=Math.max(0,parseInt(A.style.paddingLeft||0)-x);m.setStyle(A,"paddingLeft",y?y+v:"")}else{m.setStyle(A,"paddingLeft",(parseInt(A.style.paddingLeft||0)+x)+v)}})}else{f(z)}},mceRepaint:function(){var x;if(c.isGecko){try{i(a);if(p.getSel()){p.getSel().selectAllChildren(n.getBody())}p.collapse(a);g()}catch(v){}}},mceToggleFormat:function(y,x,v){q.toggle(v)},InsertHorizontalRule:function(){n.execCommand("mceInsertContent",false,"<hr />")},mceToggleVisualAid:function(){n.hasVisual=!n.hasVisual;n.addVisual()},mceReplaceContent:function(y,x,v){n.execCommand("mceInsertContent",false,v.replace(/\{\$selection\}/g,p.getContent({format:"text"})))},mceInsertLink:function(z,y,x){var v;if(typeof(x)=="string"){x={href:x}}v=m.getParent(p.getNode(),"a");x.href=x.href.replace(" ","%20");if(!v||!x.href){q.remove("link")}if(x.href){q.apply("link",x,v)}},selectAll:function(){var x=m.getRoot(),v=m.createRng();v.setStart(x,0);v.setEnd(x,x.childNodes.length);n.selection.setRng(v)}});u({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(v){return t("align"+v.substring(7))},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(v){return t(v)},mceBlockQuote:function(){return t("blockquote")},Outdent:function(){var v;if(k.inline_styles){if((v=m.getParent(p.getStart(),m.isBlock))&&parseInt(v.style.paddingLeft)>0){return a}if((v=m.getParent(p.getEnd(),m.isBlock))&&parseInt(v.style.paddingLeft)>0){return a}}return l("InsertUnorderedList")||l("InsertOrderedList")||(!k.inline_styles&&!!m.getParent(p.getNode(),"BLOCKQUOTE"))},"InsertUnorderedList,InsertOrderedList":function(v){return m.getParent(p.getNode(),v=="insertunorderedlist"?"UL":"OL")}},"state");u({"FontSize,FontName":function(y){var x=0,v;if(v=m.getParent(p.getNode(),"span")){if(y=="fontsize"){x=v.style.fontSize}else{x=v.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()}}return x}},"value");if(k.custom_undo_redo){u({Undo:function(){n.undoManager.undo()},Redo:function(){n.undoManager.redo()}})}}})(tinymce);(function(b){var a=b.util.Dispatcher;b.UndoManager=function(f){var d,e=0,h=[],c;function g(){return b.trim(f.getContent({format:"raw",no_events:1}))}return d={typing:false,onAdd:new a(d),onUndo:new a(d),onRedo:new a(d),beforeChange:function(){c=f.selection.getBookmark(2,true)},add:function(m){var j,k=f.settings,l;m=m||{};m.content=g();l=h[e];if(l&&l.content==m.content){return null}if(h[e]){h[e].beforeBookmark=c}if(k.custom_undo_redo_levels){if(h.length>k.custom_undo_redo_levels){for(j=0;j<h.length-1;j++){h[j]=h[j+1]}h.length--;e=h.length}}m.bookmark=f.selection.getBookmark(2,true);if(e<h.length-1){h.length=e+1}h.push(m);e=h.length-1;d.onAdd.dispatch(d,m);f.isNotDirty=0;return m},undo:function(){var k,j;if(d.typing){d.add();d.typing=false}if(e>0){k=h[--e];f.setContent(k.content,{format:"raw"});f.selection.moveToBookmark(k.beforeBookmark);d.onUndo.dispatch(d,k)}return k},redo:function(){var i;if(e<h.length-1){i=h[++e];f.setContent(i.content,{format:"raw"});f.selection.moveToBookmark(i.bookmark);d.onRedo.dispatch(d,i)}return i},clear:function(){h=[];e=0;d.typing=false},hasUndo:function(){return e>0||this.typing},hasRedo:function(){return e<h.length-1&&!this.typing}}}})(tinymce);(function(l){var j=l.dom.Event,c=l.isIE,a=l.isGecko,b=l.isOpera,i=l.each,h=l.extend,d=true,g=false;function k(o){var p,n,m;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(o.nodeName)){if(p){n=o.cloneNode(false);n.appendChild(p);p=n}else{p=m=o.cloneNode(false)}p.removeAttribute("id")}}while(o=o.parentNode);if(p){return{wrapper:p,inner:m}}}function f(n,o){var m=o.ownerDocument.createRange();m.setStart(n.endContainer,n.endOffset);m.setEndAfter(o);return m.cloneContents().textContent.length==0}function e(o,q,m){var n,p;if(q.isEmpty(m)){n=q.getParent(m,"ul,ol");if(!q.getParent(n.parentNode,"ul,ol")){q.split(n,m);p=q.create("p",0,'<br data-mce-bogus="1" />');q.replace(p,m);o.select(p,1)}return g}return d}l.create("tinymce.ForceBlocks",{ForceBlocks:function(m){var n=this,o=m.settings,p;n.editor=m;n.dom=m.dom;p=(o.forced_root_block||"p").toLowerCase();o.element=p.toUpperCase();m.onPreInit.add(n.setup,n)},setup:function(){var n=this,m=n.editor,p=m.settings,u=m.dom,o=m.selection,q=m.schema.getBlockElements();if(p.forced_root_block){function v(){var y=o.getStart(),t=m.getBody(),s,z,D,F,E,x,A,B=-16777215;if(!y||y.nodeType!==1){return}while(y!=t){if(q[y.nodeName]){return}y=y.parentNode}s=o.getRng();if(s.setStart){z=s.startContainer;D=s.startOffset;F=s.endContainer;E=s.endOffset}else{if(s.item){s=m.getDoc().body.createTextRange();s.moveToElementText(s.item(0))}tmpRng=s.duplicate();tmpRng.collapse(true);D=tmpRng.move("character",B)*-1;if(!tmpRng.collapsed){tmpRng=s.duplicate();tmpRng.collapse(false);E=(tmpRng.move("character",B)*-1)-D}}for(y=t.firstChild;y;y){if(y.nodeType===3||(y.nodeType==1&&!q[y.nodeName])){if(!x){x=u.create(p.forced_root_block);y.parentNode.insertBefore(x,y)}A=y;y=y.nextSibling;x.appendChild(A)}else{x=null;y=y.nextSibling}}if(s.setStart){s.setStart(z,D);s.setEnd(F,E);o.setRng(s)}else{try{s=m.getDoc().body.createTextRange();s.moveToElementText(t);s.collapse(true);s.moveStart("character",D);if(E>0){s.moveEnd("character",E)}s.select()}catch(C){}}m.nodeChanged()}m.onKeyUp.add(v);m.onClick.add(v)}if(p.force_br_newlines){if(c){m.onKeyPress.add(function(s,t){var x;if(t.keyCode==13&&o.getNode().nodeName!="LI"){o.setContent('<br id="__" /> ',{format:"raw"});x=u.get("__");x.removeAttribute("id");o.select(x);o.collapse();return j.cancel(t)}})}}if(p.force_p_newlines){if(!c){m.onKeyPress.add(function(s,t){if(t.keyCode==13&&!t.shiftKey&&!n.insertPara(t)){j.cancel(t)}})}else{l.addUnload(function(){n._previousFormats=0});m.onKeyPress.add(function(s,t){n._previousFormats=0;if(t.keyCode==13&&!t.shiftKey&&s.selection.isCollapsed()&&p.keep_styles){n._previousFormats=k(s.selection.getStart())}});m.onKeyUp.add(function(t,y){if(y.keyCode==13&&!y.shiftKey){var x=t.selection.getStart(),s=n._previousFormats;if(!x.hasChildNodes()&&s){x=u.getParent(x,u.isBlock);if(x&&x.nodeName!="LI"){x.innerHTML="";if(n._previousFormats){x.appendChild(s.wrapper);s.inner.innerHTML="\uFEFF"}else{x.innerHTML="\uFEFF"}o.select(x,1);o.collapse(true);t.getDoc().execCommand("Delete",false,null);n._previousFormats=0}}}})}if(a){m.onKeyDown.add(function(s,t){if((t.keyCode==8||t.keyCode==46)&&!t.shiftKey){n.backspaceDelete(t,t.keyCode==8)}})}}if(l.isWebKit){function r(t){var s=o.getRng(),x,A=u.create("div",null," "),z,y=u.getViewPort(t.getWin()).h;s.insertNode(x=u.create("br"));s.setStartAfter(x);s.setEndAfter(x);o.setRng(s);if(o.getSel().focusNode==x.previousSibling){o.select(u.insertAfter(u.doc.createTextNode("\u00a0"),x));o.collapse(d)}u.insertAfter(A,x);z=u.getPos(A).y;u.remove(A);if(z>y){t.getWin().scrollTo(0,z)}}m.onKeyPress.add(function(s,t){if(t.keyCode==13&&(t.shiftKey||(p.force_br_newlines&&!u.getParent(o.getNode(),"h1,h2,h3,h4,h5,h6,ol,ul")))){r(s);j.cancel(t)}})}if(c){if(p.element!="P"){m.onKeyPress.add(function(s,t){n.lastElm=o.getNode().nodeName});m.onKeyUp.add(function(t,x){var z,y=o.getNode(),s=t.getBody();if(s.childNodes.length===1&&y.nodeName=="P"){y=u.rename(y,p.element);o.select(y);o.collapse();t.nodeChanged()}else{if(x.keyCode==13&&!x.shiftKey&&n.lastElm!="P"){z=u.getParent(y,"p");if(z){u.rename(z,p.element);t.nodeChanged()}}}})}}},getParentBlock:function(o){var m=this.dom;return m.getParent(o,m.isBlock)},insertPara:function(Q){var E=this,v=E.editor,M=v.dom,R=v.getDoc(),V=v.settings,F=v.selection.getSel(),G=F.getRangeAt(0),U=R.body;var J,K,H,O,N,q,o,u,z,m,C,T,p,x,I,L=M.getViewPort(v.getWin()),B,D,A;v.undoManager.beforeChange();J=R.createRange();J.setStart(F.anchorNode,F.anchorOffset);J.collapse(d);K=R.createRange();K.setStart(F.focusNode,F.focusOffset);K.collapse(d);H=J.compareBoundaryPoints(J.START_TO_END,K)<0;O=H?F.anchorNode:F.focusNode;N=H?F.anchorOffset:F.focusOffset;q=H?F.focusNode:F.anchorNode;o=H?F.focusOffset:F.anchorOffset;if(O===q&&/^(TD|TH)$/.test(O.nodeName)){if(O.firstChild.nodeName=="BR"){M.remove(O.firstChild)}if(O.childNodes.length==0){v.dom.add(O,V.element,null,"<br />");T=v.dom.add(O,V.element,null,"<br />")}else{I=O.innerHTML;O.innerHTML="";v.dom.add(O,V.element,null,I);T=v.dom.add(O,V.element,null,"<br />")}G=R.createRange();G.selectNodeContents(T);G.collapse(1);v.selection.setRng(G);return g}if(O==U&&q==U&&U.firstChild&&v.dom.isBlock(U.firstChild)){O=q=O.firstChild;N=o=0;J=R.createRange();J.setStart(O,0);K=R.createRange();K.setStart(q,0)}if(!R.body.hasChildNodes()){R.body.appendChild(M.create("br"))}O=O.nodeName=="HTML"?R.body:O;O=O.nodeName=="BODY"?O.firstChild:O;q=q.nodeName=="HTML"?R.body:q;q=q.nodeName=="BODY"?q.firstChild:q;u=E.getParentBlock(O);z=E.getParentBlock(q);m=u?u.nodeName:V.element;if(I=E.dom.getParent(u,"li,pre")){if(I.nodeName=="LI"){return e(v.selection,E.dom,I)}return d}if(u&&(u.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(M.getStyle(u,"position",1)))){m=V.element;u=null}if(z&&(z.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(M.getStyle(u,"position",1)))){m=V.element;z=null}if(/(TD|TABLE|TH|CAPTION)/.test(m)||(u&&m=="DIV"&&/left|right/gi.test(M.getStyle(u,"float",1)))){m=V.element;u=z=null}C=(u&&u.nodeName==m)?u.cloneNode(0):v.dom.create(m);T=(z&&z.nodeName==m)?z.cloneNode(0):v.dom.create(m);T.removeAttribute("id");if(/^(H[1-6])$/.test(m)&&f(G,u)){T=v.dom.create(V.element)}I=p=O;do{if(I==U||I.nodeType==9||E.dom.isBlock(I)||/(TD|TABLE|TH|CAPTION)/.test(I.nodeName)){break}p=I}while((I=I.previousSibling?I.previousSibling:I.parentNode));I=x=q;do{if(I==U||I.nodeType==9||E.dom.isBlock(I)||/(TD|TABLE|TH|CAPTION)/.test(I.nodeName)){break}x=I}while((I=I.nextSibling?I.nextSibling:I.parentNode));if(p.nodeName==m){J.setStart(p,0)}else{J.setStartBefore(p)}J.setEnd(O,N);C.appendChild(J.cloneContents()||R.createTextNode(""));try{K.setEndAfter(x)}catch(P){}K.setStart(q,o);T.appendChild(K.cloneContents()||R.createTextNode(""));G=R.createRange();if(!p.previousSibling&&p.parentNode.nodeName==m){G.setStartBefore(p.parentNode)}else{if(J.startContainer.nodeName==m&&J.startOffset==0){G.setStartBefore(J.startContainer)}else{G.setStart(J.startContainer,J.startOffset)}}if(!x.nextSibling&&x.parentNode.nodeName==m){G.setEndAfter(x.parentNode)}else{G.setEnd(K.endContainer,K.endOffset)}G.deleteContents();if(b){v.getWin().scrollTo(0,L.y)}if(C.firstChild&&C.firstChild.nodeName==m){C.innerHTML=C.firstChild.innerHTML}if(T.firstChild&&T.firstChild.nodeName==m){T.innerHTML=T.firstChild.innerHTML}function S(y,s){var r=[],X,W,t;y.innerHTML="";if(V.keep_styles){W=s;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(W.nodeName)){X=W.cloneNode(g);M.setAttrib(X,"id","");r.push(X)}}while(W=W.parentNode)}if(r.length>0){for(t=r.length-1,X=y;t>=0;t--){X=X.appendChild(r[t])}r[0].innerHTML=b?"\u00a0":"<br />";return r[0]}else{y.innerHTML=b?"\u00a0":"<br />"}}if(M.isEmpty(C)){S(C,O)}if(M.isEmpty(T)){A=S(T,q)}if(b&&parseFloat(opera.version())<9.5){G.insertNode(C);G.insertNode(T)}else{G.insertNode(T);G.insertNode(C)}T.normalize();C.normalize();v.selection.select(T,true);v.selection.collapse(true);B=v.dom.getPos(T).y;if(B<L.y||B+25>L.y+L.h){v.getWin().scrollTo(0,B<L.y?B:B-L.h+25)}v.undoManager.add();return g},backspaceDelete:function(u,B){var C=this,s=C.editor,y=s.getBody(),q=s.dom,p,v=s.selection,o=v.getRng(),x=o.startContainer,p,z,A,m;if(!B&&o.collapsed&&x.nodeType==1&&o.startOffset==x.childNodes.length){m=new l.dom.TreeWalker(x.lastChild,x);for(p=x.lastChild;p;p=m.prev()){if(p.nodeType==3){o.setStart(p,p.nodeValue.length);o.collapse(true);v.setRng(o);return}}}if(x&&s.dom.isBlock(x)&&!/^(TD|TH)$/.test(x.nodeName)&&B){if(x.childNodes.length==0||(x.childNodes.length==1&&x.firstChild.nodeName=="BR")){p=x;while((p=p.previousSibling)&&!s.dom.isBlock(p)){}if(p){if(x!=y.firstChild){z=s.dom.doc.createTreeWalker(p,NodeFilter.SHOW_TEXT,null,g);while(A=z.nextNode()){p=A}o=s.getDoc().createRange();o.setStart(p,p.nodeValue?p.nodeValue.length:0);o.setEnd(p,p.nodeValue?p.nodeValue.length:0);v.setRng(o);s.dom.remove(x)}return j.cancel(u)}}}}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each,e=c.extend;c.create("tinymce.ControlManager",{ControlManager:function(f,j){var h=this,g;j=j||{};h.editor=f;h.controls={};h.onAdd=new c.util.Dispatcher(h);h.onPostRender=new c.util.Dispatcher(h);h.prefix=j.prefix||f.id+"_";h._cls={};h.onPostRender.add(function(){d(h.controls,function(i){i.postRender()})})},get:function(f){return this.controls[this.prefix+f]||this.controls[f]},setActive:function(h,f){var g=null;if(g=this.get(h)){g.setActive(f)}return g},setDisabled:function(h,f){var g=null;if(g=this.get(h)){g.setDisabled(f)}return g},add:function(g){var f=this;if(g){f.controls[g.id]=g;f.onAdd.dispatch(g,f)}return g},createControl:function(i){var h,g=this,f=g.editor;d(f.plugins,function(j){if(j.createControl){h=j.createControl(i,g);if(h){return false}}});switch(i){case"|":case"separator":return g.createSeparator()}if(!h&&f.buttons&&(h=f.buttons[i])){return g.createButton(i,h)}return g.add(h)},createDropMenu:function(f,n,h){var m=this,i=m.editor,j,g,k,l;n=e({"class":"mceDropDown",constrain:i.settings.constrain_menus},n);n["class"]=n["class"]+" "+i.getParam("skin")+"Skin";if(k=i.getParam("skin_variant")){n["class"]+=" "+i.getParam("skin")+"Skin"+k.substring(0,1).toUpperCase()+k.substring(1)}f=m.prefix+f;l=h||m._cls.dropmenu||c.ui.DropMenu;j=m.controls[f]=new l(f,n);j.onAddItem.add(function(r,q){var p=q.settings;p.title=i.getLang(p.title,p.title);if(!p.onclick){p.onclick=function(o){if(p.cmd){i.execCommand(p.cmd,p.ui||false,p.value)}}}});i.onRemove.add(function(){j.destroy()});if(c.isIE){j.onShowMenu.add(function(){i.focus();g=i.selection.getBookmark(1)});j.onHideMenu.add(function(){if(g){i.selection.moveToBookmark(g);g=0}})}return m.add(j)},createListBox:function(f,n,h){var l=this,j=l.editor,i,k,m;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,scope:n.scope,control_manager:l},n);f=l.prefix+f;function g(o){return o.settings.use_accessible_selects&&!c.isGecko}if(j.settings.use_native_selects||g(j)){k=new c.ui.NativeListBox(f,n)}else{m=h||l._cls.listbox||c.ui.ListBox;k=new m(f,n,j)}l.controls[f]=k;if(c.isWebKit){k.onPostRender.add(function(p,o){a.add(o,"mousedown",function(){j.bookmark=j.selection.getBookmark(1)});a.add(o,"focus",function(){j.selection.moveToBookmark(j.bookmark);j.bookmark=null})})}if(k.hideMenu){j.onMouseDown.add(k.hideMenu,k)}return l.add(k)},createButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.label=g.translate(i.label);i.scope=i.scope||g;if(!i.onclick&&!i.menu_button){i.onclick=function(){g.execCommand(i.cmd,i.ui||false,i.value)}}i=e({title:i.title,"class":"mce_"+m,unavailable_prefix:g.getLang("unavailable",""),scope:i.scope,control_manager:h},i);m=h.prefix+m;if(i.menu_button){f=l||h._cls.menubutton||c.ui.MenuButton;k=new f(m,i,g);g.onMouseDown.add(k.hideMenu,k)}else{f=h._cls.button||c.ui.Button;k=new f(m,i,g)}return h.add(k)},createMenuButton:function(h,f,g){f=f||{};f.menu_button=1;return this.createButton(h,f,g)},createSplitButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onclick){i.onclick=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;f=l||h._cls.splitbutton||c.ui.SplitButton;k=h.add(new f(m,i,g));g.onMouseDown.add(k.hideMenu,k);return k},createColorSplitButton:function(f,n,h){var l=this,j=l.editor,i,k,m,g;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onclick){n.onclick=function(o){if(c.isIE){g=j.selection.getBookmark(1)}j.execCommand(n.cmd,n.ui||false,o||n.value)}}if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,menu_class:j.getParam("skin")+"Skin",scope:n.scope,more_colors_title:j.getLang("more_colors")},n);f=l.prefix+f;m=h||l._cls.colorsplitbutton||c.ui.ColorSplitButton;k=new m(f,n,j);j.onMouseDown.add(k.hideMenu,k);j.onRemove.add(function(){k.destroy()});if(c.isIE){k.onShowMenu.add(function(){j.focus();g=j.selection.getBookmark(1)});k.onHideMenu.add(function(){if(g){j.selection.moveToBookmark(g);g=0}})}return l.add(k)},createToolbar:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||g._cls.toolbar||c.ui.Toolbar;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createToolbarGroup:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||this._cls.toolbarGroup||c.ui.ToolbarGroup;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createSeparator:function(g){var f=g||this._cls.separator||c.ui.Separator;return new f()},setControlType:function(g,f){return this._cls[g.toLowerCase()]=f},destroy:function(){d(this.controls,function(f){f.destroy()});this.controls=null}})})(tinymce);(function(d){var a=d.util.Dispatcher,e=d.each,c=d.isIE,b=d.isOpera;d.create("tinymce.WindowManager",{WindowManager:function(f){var g=this;g.editor=f;g.onOpen=new a(g);g.onClose=new a(g);g.params={};g.features={}},open:function(z,h){var v=this,k="",n,m,i=v.editor.settings.dialog_type=="modal",q,o,j,g=d.DOM.getViewPort(),r;z=z||{};h=h||{};o=b?g.w:screen.width;j=b?g.h:screen.height;z.name=z.name||"mc_"+new Date().getTime();z.width=parseInt(z.width||320);z.height=parseInt(z.height||240);z.resizable=true;z.left=z.left||parseInt(o/2)-(z.width/2);z.top=z.top||parseInt(j/2)-(z.height/2);h.inline=false;h.mce_width=z.width;h.mce_height=z.height;h.mce_auto_focus=z.auto_focus;if(i){if(c){z.center=true;z.help=false;z.dialogWidth=z.width+"px";z.dialogHeight=z.height+"px";z.scroll=z.scrollbars||false}}e(z,function(p,f){if(d.is(p,"boolean")){p=p?"yes":"no"}if(!/^(name|url)$/.test(f)){if(c&&i){k+=(k?";":"")+f+":"+p}else{k+=(k?",":"")+f+"="+p}}});v.features=z;v.params=h;v.onOpen.dispatch(v,z,h);r=z.url||z.file;r=d._addVer(r);try{if(c&&i){q=1;window.showModalDialog(r,window,k)}else{q=window.open(r,z.name,k)}}catch(l){}if(!q){alert(v.editor.getLang("popup_blocked"))}},close:function(f){f.close();this.onClose.dispatch(this)},createInstance:function(i,h,g,m,l,k){var j=d.resolve(i);return new j(h,g,m,l,k)},confirm:function(h,f,i,g){g=g||window;f.call(i||this,g.confirm(this._decode(this.editor.getLang(h,h))))},alert:function(h,f,j,g){var i=this;g=g||window;g.alert(i._decode(i.editor.getLang(h,h)));if(f){f.call(j||i)}},resizeBy:function(f,g,h){h.resizeBy(f,g)},_decode:function(f){return d.DOM.decode(f).replace(/\\n/g,"\n")}})}(tinymce));(function(a){a.Formatter=function(U){var M={},O=a.each,c=U.dom,q=U.selection,t=a.dom.TreeWalker,K=new a.dom.RangeUtils(c),d=U.schema.isValidChild,F=c.isBlock,l=U.settings.forced_root_block,s=c.nodeIndex,E="\uFEFF",e=/^(src|href|style)$/,R=false,B=true,p;function z(V){return V instanceof Array}function m(W,V){return c.getParents(W,V,c.getRoot())}function b(V){return V.nodeType===1&&(V.face==="mceinline"||V.style.fontFamily==="mceinline")}function Q(V){return V?M[V]:M}function k(V,W){if(V){if(typeof(V)!=="string"){O(V,function(Y,X){k(X,Y)})}else{W=W.length?W:[W];O(W,function(X){if(X.deep===p){X.deep=!X.selector}if(X.split===p){X.split=!X.selector||X.inline}if(X.remove===p&&X.selector&&!X.inline){X.remove="none"}if(X.selector&&X.inline){X.mixed=true;X.block_expand=true}if(typeof(X.classes)==="string"){X.classes=X.classes.split(/\s+/)}});M[V]=W}}}var i=function(W){var V;U.dom.getParent(W,function(X){V=U.dom.getStyle(X,"text-decoration");return V&&V!=="none"});return V};var I=function(V){var W;if(V.nodeType===1&&V.parentNode&&V.parentNode.nodeType===1){W=i(V.parentNode);if(U.dom.getStyle(V,"color")&&W){U.dom.setStyle(V,"text-decoration",W)}else{if(U.dom.getStyle(V,"textdecoration")===W){U.dom.setStyle(V,"text-decoration",null)}}}};function S(Y,ag,ab){var ac=Q(Y),ah=ac[0],af,W,ae,ad=q.isCollapsed();function Z(al){var ak=al.startContainer,ao=al.startOffset,an,am;if(ak.nodeType==1||ak.nodeValue===""){ak=ak.nodeType==1?ak.childNodes[ao]:ak;if(ak){an=new t(ak,ak.parentNode);for(am=an.current();am;am=an.next()){if(am.nodeType==3&&!f(am)){al.setStart(am,0);break}}}}return al}function V(al,ak){ak=ak||ah;if(al){if(ak.onformat){ak.onformat(al,ak,ag,ab)}O(ak.styles,function(an,am){c.setStyle(al,am,r(an,ag))});O(ak.attributes,function(an,am){c.setAttrib(al,am,r(an,ag))});O(ak.classes,function(am){am=r(am,ag);if(!c.hasClass(al,am)){c.addClass(al,am)}})}}function aa(){function am(at,aq){var ar=new t(aq);for(ab=ar.current();ab;ab=ar.prev()){if(ab.childNodes.length>1||ab==at){return ab}}}var al=U.selection.getRng();var ap=al.startContainer;var ak=al.endContainer;if(ap!=ak&&al.endOffset==0){var ao=am(ap,ak);var an=ao.nodeType==3?ao.length:ao.childNodes.length;al.setEnd(ao,an)}return al}function X(an,at,aq,ap,al){var ak=[],am=-1,ar,av=-1,ao=-1,au;O(an.childNodes,function(ax,aw){if(ax.nodeName==="UL"||ax.nodeName==="OL"){am=aw;ar=ax;return false}});O(an.childNodes,function(ax,aw){if(ax.nodeName==="SPAN"&&c.getAttrib(ax,"data-mce-type")=="bookmark"){if(ax.id==at.id+"_start"){av=aw}else{if(ax.id==at.id+"_end"){ao=aw}}}});if(am<=0||(av<am&&ao>am)){O(a.grep(an.childNodes),al);return 0}else{au=aq.cloneNode(R);O(a.grep(an.childNodes),function(ax,aw){if((av<am&&aw<am)||(av>am&&aw>am)){ak.push(ax);ax.parentNode.removeChild(ax)}});if(av<am){an.insertBefore(au,ar)}else{if(av>am){an.insertBefore(au,ar.nextSibling)}}ap.push(au);O(ak,function(aw){au.appendChild(aw)});return au}}function ai(al,an,ap){var ak=[],ao,am;ao=ah.inline||ah.block;am=c.create(ao);V(am);K.walk(al,function(aq){var ar;function at(au){var ax=au.nodeName.toLowerCase(),aw=au.parentNode.nodeName.toLowerCase(),av;if(g(ax,"br")){ar=0;if(ah.block){c.remove(au)}return}if(ah.wrapper&&x(au,Y,ag)){ar=0;return}if(ah.block&&!ah.wrapper&&G(ax)){au=c.rename(au,ao);V(au);ak.push(au);ar=0;return}if(ah.selector){O(ac,function(ay){if("collapsed" in ay&&ay.collapsed!==ad){return}if(c.is(au,ay.selector)&&!b(au)){V(au,ay);av=true}});if(!ah.inline||av){ar=0;return}}if(d(ao,ax)&&d(aw,ao)&&!(!ap&&au.nodeType===3&&au.nodeValue.length===1&&au.nodeValue.charCodeAt(0)===65279)&&au.id!=="_mce_caret"){if(!ar){ar=am.cloneNode(R);au.parentNode.insertBefore(ar,au);ak.push(ar)}ar.appendChild(au)}else{if(ax=="li"&&an){ar=X(au,an,am,ak,at)}else{ar=0;O(a.grep(au.childNodes),at);ar=0}}}O(aq,at)});if(ah.wrap_links===false){O(ak,function(aq){function ar(aw){var av,au,at;if(aw.nodeName==="A"){au=am.cloneNode(R);ak.push(au);at=a.grep(aw.childNodes);for(av=0;av<at.length;av++){au.appendChild(at[av])}aw.appendChild(au)}O(a.grep(aw.childNodes),ar)}ar(aq)})}O(ak,function(at){var aq;function au(aw){var av=0;O(aw.childNodes,function(ax){if(!f(ax)&&!H(ax)){av++}});return av}function ar(av){var ax,aw;O(av.childNodes,function(ay){if(ay.nodeType==1&&!H(ay)&&!b(ay)){ax=ay;return R}});if(ax&&h(ax,ah)){aw=ax.cloneNode(R);V(aw);c.replace(aw,av,B);c.remove(ax,1)}return aw||av}aq=au(at);if((ak.length>1||!F(at))&&aq===0){c.remove(at,1);return}if(ah.inline||ah.wrapper){if(!ah.exact&&aq===1){at=ar(at)}O(ac,function(av){O(c.select(av.inline,at),function(ax){var aw;if(av.wrap_links===false){aw=ax.parentNode;do{if(aw.nodeName==="A"){return}}while(aw=aw.parentNode)}T(av,ag,ax,av.exact?ax:null)})});if(x(at.parentNode,Y,ag)){c.remove(at,1);at=0;return B}if(ah.merge_with_parents){c.getParent(at.parentNode,function(av){if(x(av,Y,ag)){c.remove(at,1);at=0;return B}})}if(at&&ah.merge_siblings!==false){at=u(C(at),at);at=u(at,C(at,B))}}})}if(ah){if(ab){if(ab.nodeType){W=c.createRng();W.setStartBefore(ab);W.setEndAfter(ab);ai(o(W,ac),null,true)}else{ai(ab,null,true)}}else{if(!ad||!ah.inline||c.select("td.mceSelected,th.mceSelected").length){var aj=U.selection.getNode();U.selection.setRng(aa());af=q.getBookmark();ai(o(q.getRng(B),ac),af);if(ah.styles&&(ah.styles.color||ah.styles.textDecoration)){a.walk(aj,I,"childNodes");I(aj)}q.moveToBookmark(af);q.setRng(Z(q.getRng(B)));U.nodeChanged()}else{P("apply",Y,ag)}}}}function A(X,ag,aa){var ab=Q(X),ai=ab[0],af,ae,W;function Z(al){var ak=al.startContainer,aq=al.startOffset,ap,ao,am,an;if(ak.nodeType==3&&aq>=ak.nodeValue.length-1){ak=ak.parentNode;aq=s(ak)+1}if(ak.nodeType==1){am=ak.childNodes;ak=am[Math.min(aq,am.length-1)];ap=new t(ak);if(aq>am.length-1){ap.next()}for(ao=ap.current();ao;ao=ap.next()){if(ao.nodeType==3&&!f(ao)){an=c.create("a",null,E);ao.parentNode.insertBefore(an,ao);al.setStart(ao,0);q.setRng(al);c.remove(an);return}}}}function Y(an){var am,al,ak;am=a.grep(an.childNodes);for(al=0,ak=ab.length;al<ak;al++){if(T(ab[al],ag,an,an)){break}}if(ai.deep){for(al=0,ak=am.length;al<ak;al++){Y(am[al])}}}function ac(ak){var al;O(m(ak.parentNode).reverse(),function(am){var an;if(!al&&am.id!="_start"&&am.id!="_end"){an=x(am,X,ag);if(an&&an.split!==false){al=am}}});return al}function V(an,ak,ap,at){var au,ar,aq,am,ao,al;if(an){al=an.parentNode;for(au=ak.parentNode;au&&au!=al;au=au.parentNode){ar=au.cloneNode(R);for(ao=0;ao<ab.length;ao++){if(T(ab[ao],ag,ar,ar)){ar=0;break}}if(ar){if(aq){ar.appendChild(aq)}if(!am){am=ar}aq=ar}}if(at&&(!ai.mixed||!F(an))){ak=c.split(an,ak)}if(aq){ap.parentNode.insertBefore(aq,ap);am.appendChild(ap)}}return ak}function ah(ak){return V(ac(ak),ak,ak,true)}function ad(am){var al=c.get(am?"_start":"_end"),ak=al[am?"firstChild":"lastChild"];if(H(ak)){ak=ak[am?"firstChild":"lastChild"]}c.remove(al,true);return ak}function aj(ak){var al,am;ak=o(ak,ab,B);if(ai.split){al=J(ak,B);am=J(ak);if(al!=am){al=N(al,"span",{id:"_start","data-mce-type":"bookmark"});am=N(am,"span",{id:"_end","data-mce-type":"bookmark"});ah(al);ah(am);al=ad(B);am=ad()}else{al=am=ah(al)}ak.startContainer=al.parentNode;ak.startOffset=s(al);ak.endContainer=am.parentNode;ak.endOffset=s(am)+1}K.walk(ak,function(an){O(an,function(ao){Y(ao);if(ao.nodeType===1&&U.dom.getStyle(ao,"text-decoration")==="underline"&&ao.parentNode&&i(ao.parentNode)==="underline"){T({deep:false,exact:true,inline:"span",styles:{textDecoration:"underline"}},null,ao)}})})}if(aa){if(aa.nodeType){W=c.createRng();W.setStartBefore(aa);W.setEndAfter(aa);aj(W)}else{aj(aa)}return}if(!q.isCollapsed()||!ai.inline||c.select("td.mceSelected,th.mceSelected").length){af=q.getBookmark();aj(q.getRng(B));q.moveToBookmark(af);if(ai.inline&&j(X,ag,q.getStart())){Z(q.getRng(true))}U.nodeChanged()}else{P("remove",X,ag)}if(a.isWebKit){U.execCommand("mceCleanup")}}function D(W,Y,X){var V=Q(W);if(j(W,Y,X)&&(!("toggle" in V[0])||V[0]["toggle"])){A(W,Y,X)}else{S(W,Y,X)}}function x(W,V,ab,Z){var X=Q(V),ac,aa,Y;function ad(ah,aj,ak){var ag,ai,ae=aj[ak],af;if(aj.onmatch){return aj.onmatch(ah,aj,ak)}if(ae){if(ae.length===p){for(ag in ae){if(ae.hasOwnProperty(ag)){if(ak==="attributes"){ai=c.getAttrib(ah,ag)}else{ai=L(ah,ag)}if(Z&&!ai&&!aj.exact){return}if((!Z||aj.exact)&&!g(ai,r(ae[ag],ab))){return}}}}else{for(af=0;af<ae.length;af++){if(ak==="attributes"?c.getAttrib(ah,ae[af]):L(ah,ae[af])){return aj}}}}return aj}if(X&&W){for(aa=0;aa<X.length;aa++){ac=X[aa];if(h(W,ac)&&ad(W,ac,"attributes")&&ad(W,ac,"styles")){if(Y=ac.classes){for(aa=0;aa<Y.length;aa++){if(!c.hasClass(W,Y[aa])){return}}}return ac}}}}function j(X,Z,Y){var W;function V(aa){aa=c.getParent(aa,function(ab){return !!x(ab,X,Z,true)});return x(aa,X,Z)}if(Y){return V(Y)}Y=q.getNode();if(V(Y)){return B}W=q.getStart();if(W!=Y){if(V(W)){return B}}return R}function v(ac,ab){var Z,aa=[],Y={},X,W,V;Z=q.getStart();c.getParent(Z,function(af){var ae,ad;for(ae=0;ae<ac.length;ae++){ad=ac[ae];if(!Y[ad]&&x(af,ad,ab)){Y[ad]=true;aa.push(ad)}}});return aa}function y(Z){var ab=Q(Z),Y,X,aa,W,V;if(ab){Y=q.getStart();X=m(Y);for(W=ab.length-1;W>=0;W--){V=ab[W].selector;if(!V){return B}for(aa=X.length-1;aa>=0;aa--){if(c.is(X[aa],V)){return B}}}}return R}a.extend(this,{get:Q,register:k,apply:S,remove:A,toggle:D,match:j,matchAll:v,matchNode:x,canApply:y});function h(V,W){if(g(V,W.inline)){return B}if(g(V,W.block)){return B}if(W.selector){return c.is(V,W.selector)}}function g(W,V){W=W||"";V=V||"";W=""+(W.nodeName||W);V=""+(V.nodeName||V);return W.toLowerCase()==V.toLowerCase()}function L(W,V){var X=c.getStyle(W,V);if(V=="color"||V=="backgroundColor"){X=c.toHex(X)}if(V=="fontWeight"&&X==700){X="bold"}return""+X}function r(V,W){if(typeof(V)!="string"){V=V(W)}else{if(W){V=V.replace(/%(\w+)/g,function(Y,X){return W[X]||Y})}}return V}function f(V){return V&&V.nodeType===3&&/^([\t \r\n]+|)$/.test(V.nodeValue)}function N(X,W,V){var Y=c.create(W,V);X.parentNode.insertBefore(Y,X);Y.appendChild(X);return Y}function o(V,ah,Y){var X=V.startContainer,ac=V.startOffset,ak=V.endContainer,ae=V.endOffset,aj,ag,ab,af;function ai(aq){var al,ao,ap,an,am;al=ao=aq?X:ak;am=aq?"previousSibling":"nextSibling";root=c.getRoot();if(al.nodeType==3&&!f(al)){if(aq?ac>0:ae<al.nodeValue.length){return al}}for(;;){if(ao==root||(!ah[0].block_expand&&F(ao))){return ao}for(an=ao[am];an;an=an[am]){if(!H(an)&&!f(an)){return ao}}ao=ao.parentNode}return al}function aa(al,am){if(am===p){am=al.nodeType===3?al.length:al.childNodes.length}while(al&&al.hasChildNodes()){al=al.childNodes[am];if(al){am=al.nodeType===3?al.length:al.childNodes.length}}return{node:al,offset:am}}if(X.nodeType==1&&X.hasChildNodes()){ag=X.childNodes.length-1;X=X.childNodes[ac>ag?ag:ac];if(X.nodeType==3){ac=0}}if(ak.nodeType==1&&ak.hasChildNodes()){ag=ak.childNodes.length-1;ak=ak.childNodes[ae>ag?ag:ae-1];if(ak.nodeType==3){ae=ak.nodeValue.length}}if(H(X.parentNode)||H(X)){X=H(X)?X:X.parentNode;X=X.nextSibling||X;if(X.nodeType==3){ac=0}}if(H(ak.parentNode)||H(ak)){ak=H(ak)?ak:ak.parentNode;ak=ak.previousSibling||ak;if(ak.nodeType==3){ae=ak.length}}if(ah[0].inline){if(V.collapsed){function ad(am,aq,at){var ap,an,ar,al;function ao(av,ax){var ay,au,aw=av.nodeValue;if(typeof(ax)=="undefined"){ax=at?aw.length:0}if(at){ay=aw.lastIndexOf(" ",ax);au=aw.lastIndexOf("\u00a0",ax);ay=ay>au?ay:au;if(ay!==-1&&!Y){ay++}}else{ay=aw.indexOf(" ",ax);au=aw.indexOf("\u00a0",ax);ay=ay!==-1&&(au===-1||ay<au)?ay:au}return ay}if(am.nodeType===3){ar=ao(am,aq);if(ar!==-1){return{container:am,offset:ar}}al=am}ap=new t(am,c.getParent(am,F)||U.getBody());while(an=ap[at?"prev":"next"]()){if(an.nodeType===3){al=an;ar=ao(an);if(ar!==-1){return{container:an,offset:ar}}}else{if(F(an)){break}}}if(al){if(at){aq=0}else{aq=al.length}return{container:al,offset:aq}}}af=ad(X,ac,true);if(af){X=af.container;ac=af.offset}af=ad(ak,ae);if(af){ak=af.container;ae=af.offset}}ab=aa(ak,ae);if(ab.node){while(ab.node&&ab.offset===0&&ab.node.previousSibling){ab=aa(ab.node.previousSibling)}if(ab.node&&ab.offset>0&&ab.node.nodeType===3&&ab.node.nodeValue.charAt(ab.offset-1)===" "){if(ab.offset>1){ak=ab.node;ak.splitText(ab.offset-1)}else{if(ab.node.previousSibling){}}}}}if(ah[0].inline||ah[0].block_expand){if(!ah[0].inline||(X.nodeType!=3||ac===0)){X=ai(true)}if(!ah[0].inline||(ak.nodeType!=3||ae===ak.nodeValue.length)){ak=ai()}}if(ah[0].selector&&ah[0].expand!==R&&!ah[0].inline){function Z(am,al){var an,ao,aq,ap;if(am.nodeType==3&&am.nodeValue.length==0&&am[al]){am=am[al]}an=m(am);for(ao=0;ao<an.length;ao++){for(aq=0;aq<ah.length;aq++){ap=ah[aq];if("collapsed" in ap&&ap.collapsed!==V.collapsed){continue}if(c.is(an[ao],ap.selector)){return an[ao]}}}return am}X=Z(X,"previousSibling");ak=Z(ak,"nextSibling")}if(ah[0].block||ah[0].selector){function W(am,al,ao){var an;if(!ah[0].wrapper){an=c.getParent(am,ah[0].block)}if(!an){an=c.getParent(am.nodeType==3?am.parentNode:am,F)}if(an&&ah[0].wrapper){an=m(an,"ul,ol").reverse()[0]||an}if(!an){an=am;while(an[al]&&!F(an[al])){an=an[al];if(g(an,"br")){break}}}return an||am}X=W(X,"previousSibling");ak=W(ak,"nextSibling");if(ah[0].block){if(!F(X)){X=ai(true)}if(!F(ak)){ak=ai()}}}if(X.nodeType==1){ac=s(X);X=X.parentNode}if(ak.nodeType==1){ae=s(ak)+1;ak=ak.parentNode}return{startContainer:X,startOffset:ac,endContainer:ak,endOffset:ae}}function T(ab,aa,Y,V){var X,W,Z;if(!h(Y,ab)){return R}if(ab.remove!="all"){O(ab.styles,function(ad,ac){ad=r(ad,aa);if(typeof(ac)==="number"){ac=ad;V=0}if(!V||g(L(V,ac),ad)){c.setStyle(Y,ac,"")}Z=1});if(Z&&c.getAttrib(Y,"style")==""){Y.removeAttribute("style");Y.removeAttribute("data-mce-style")}O(ab.attributes,function(ae,ac){var ad;ae=r(ae,aa);if(typeof(ac)==="number"){ac=ae;V=0}if(!V||g(c.getAttrib(V,ac),ae)){if(ac=="class"){ae=c.getAttrib(Y,ac);if(ae){ad="";O(ae.split(/\s+/),function(af){if(/mce\w+/.test(af)){ad+=(ad?" ":"")+af}});if(ad){c.setAttrib(Y,ac,ad);return}}}if(ac=="class"){Y.removeAttribute("className")}if(e.test(ac)){Y.removeAttribute("data-mce-"+ac)}Y.removeAttribute(ac)}});O(ab.classes,function(ac){ac=r(ac,aa);if(!V||c.hasClass(V,ac)){c.removeClass(Y,ac)}});W=c.getAttribs(Y);for(X=0;X<W.length;X++){if(W[X].nodeName.indexOf("_")!==0){return R}}}if(ab.remove!="none"){n(Y,ab);return B}}function n(X,Y){var V=X.parentNode,W;if(Y.block){if(!l){function Z(ab,aa,ac){ab=C(ab,aa,ac);return !ab||(ab.nodeName=="BR"||F(ab))}if(F(X)&&!F(V)){if(!Z(X,R)&&!Z(X.firstChild,B,1)){X.insertBefore(c.create("br"),X.firstChild)}if(!Z(X,B)&&!Z(X.lastChild,R,1)){X.appendChild(c.create("br"))}}}else{if(V==c.getRoot()){if(!Y.list_block||!g(X,Y.list_block)){O(a.grep(X.childNodes),function(aa){if(d(l,aa.nodeName.toLowerCase())){if(!W){W=N(aa,l)}else{W.appendChild(aa)}}else{W=0}})}}}}if(Y.selector&&Y.inline&&!g(Y.inline,X)){return}c.remove(X,1)}function C(W,V,X){if(W){V=V?"nextSibling":"previousSibling";for(W=X?W:W[V];W;W=W[V]){if(W.nodeType==1||!f(W)){return W}}}}function H(V){return V&&V.nodeType==1&&V.getAttribute("data-mce-type")=="bookmark"}function u(Z,Y){var V,X,W;function ab(ae,ad){if(ae.nodeName!=ad.nodeName){return R}function ac(ag){var ah={};O(c.getAttribs(ag),function(ai){var aj=ai.nodeName.toLowerCase();if(aj.indexOf("_")!==0&&aj!=="style"){ah[aj]=c.getAttrib(ag,aj)}});return ah}function af(aj,ai){var ah,ag;for(ag in aj){if(aj.hasOwnProperty(ag)){ah=ai[ag];if(ah===p){return R}if(aj[ag]!=ah){return R}delete ai[ag]}}for(ag in ai){if(ai.hasOwnProperty(ag)){return R}}return B}if(!af(ac(ae),ac(ad))){return R}if(!af(c.parseStyle(c.getAttrib(ae,"style")),c.parseStyle(c.getAttrib(ad,"style")))){return R}return B}if(Z&&Y){function aa(ad,ac){for(X=ad;X;X=X[ac]){if(X.nodeType==3&&X.nodeValue.length!==0){return ad}if(X.nodeType==1&&!H(X)){return X}}return ad}Z=aa(Z,"previousSibling");Y=aa(Y,"nextSibling");if(ab(Z,Y)){for(X=Z.nextSibling;X&&X!=Y;){W=X;X=X.nextSibling;Z.appendChild(W)}c.remove(Y);O(a.grep(Y.childNodes),function(ac){Z.appendChild(ac)});return Z}}return Y}function G(V){return/^(h[1-6]|p|div|pre|address|dl|dt|dd)$/.test(V)}function J(W,aa){var V,Z,X,Y;V=W[aa?"startContainer":"endContainer"];Z=W[aa?"startOffset":"endOffset"];if(V.nodeType==1){X=V.childNodes.length-1;if(!aa&&Z){Z--}V=V.childNodes[Z>X?X:Z]}if(V.nodeType===3&&aa&&Z>=V.nodeValue.length){V=new t(V,U.getBody()).next()||V}if(V.nodeType===3&&!aa&&Z==0){V=new t(V,U.getBody()).prev()||V}return V}function P(ae,V,ac){var ah,af="_mce_caret",W=U.settings.caret_debug;ah=a.isGecko?"\u200B":E;function X(aj){var ai=c.create("span",{id:af,"data-mce-bogus":true,style:W?"color:red":""});if(aj){ai.appendChild(U.getDoc().createTextNode(ah))}return ai}function ad(aj,ai){while(aj){if((aj.nodeType===3&&aj.nodeValue!==ah)||aj.childNodes.length>1){return false}if(ai&&aj.nodeType===1){ai.push(aj)}aj=aj.firstChild}return true}function aa(ai){while(ai){if(ai.id===af){return ai}ai=ai.parentNode}}function Z(ai){var aj;if(ai){aj=new t(ai,ai);for(ai=aj.current();ai;ai=aj.next()){if(ai.nodeType===3){return ai}}}}function Y(ak,aj){var al,ai;if(!ak){ak=aa(q.getStart());if(!ak){while(ak=c.get(af)){Y(ak,false)}}}else{ai=q.getRng(true);if(ad(ak)){if(aj!==false){ai.setStartBefore(ak);ai.setEndBefore(ak)}c.remove(ak)}else{al=Z(ak);al=al.deleteData(0,1);c.remove(ak,1)}q.setRng(ai)}}function ab(){var ak,ai,ao,an,al,aj,am;ak=q.getRng(true);an=ak.startOffset;aj=ak.startContainer;am=aj.nodeValue;ai=aa(q.getStart());if(ai){ao=Z(ai)}if(am&&an>0&&an<am.length&&/\w/.test(am.charAt(an))&&/\w/.test(am.charAt(an-1))){al=q.getBookmark();ak.collapse(true);ak=o(ak,Q(V));ak=K.split(ak);S(V,ac,ak);q.moveToBookmark(al)}else{if(!ai||ao.nodeValue!==ah){ai=X(true);ao=ai.firstChild;ak.insertNode(ai);an=1;S(V,ac,ai)}else{S(V,ac,ai)}q.setCursorLocation(ao,an)}}function ag(){var ai=q.getRng(true),aj,al,ao,an,ak,ar,aq=[],am,ap;aj=ai.startContainer;al=ai.startOffset;ak=aj;if(aj.nodeType==3){if(al!=aj.nodeValue.length||aj.nodeValue===ah){an=true}ak=ak.parentNode}while(ak){if(x(ak,V,ac)){ar=ak;break}if(ak.nextSibling){an=true}aq.push(ak);ak=ak.parentNode}if(!ar){return}if(an){ao=q.getBookmark();ai.collapse(true);ai=o(ai,Q(V),true);ai=K.split(ai);A(V,ac,ai);q.moveToBookmark(ao)}else{ap=X();ak=ap;for(am=aq.length-1;am>=0;am--){ak.appendChild(aq[am].cloneNode(false));ak=ak.firstChild}ak.appendChild(c.doc.createTextNode(ah));ak=ak.firstChild;c.insertAfter(ap,ar);q.setCursorLocation(ak,1)}}U.onBeforeGetContent.addToTop(function(){var ai=[],aj;if(ad(aa(q.getStart()),ai)){aj=ai.length;while(aj--){c.setAttrib(ai[aj],"data-mce-bogus","1")}}});a.each("onMouseUp onKeyUp".split(" "),function(ai){U[ai].addToTop(function(){Y()})});U.onKeyDown.addToTop(function(ai,ak){var aj=ak.keyCode;if(aj==8||aj==37||aj==39){Y(aa(q.getStart()))}});if(ae=="apply"){ab()}else{ag()}}}})(tinymce);tinymce.onAddEditor.add(function(e,a){var d,h,g,c=a.settings;if(c.inline_styles){h=e.explode(c.font_size_legacy_values);function b(j,i){e.each(i,function(l,k){if(l){g.setStyle(j,k,l)}});g.rename(j,"span")}d={font:function(j,i){b(i,{backgroundColor:i.style.backgroundColor,color:i.color,fontFamily:i.face,fontSize:h[parseInt(i.size)-1]})},u:function(j,i){b(i,{textDecoration:"underline"})},strike:function(j,i){b(i,{textDecoration:"line-through"})}};function f(i,j){g=i.dom;if(c.convert_fonts_to_spans){e.each(g.select("font,u,strike",j.node),function(k){d[k.nodeName.toLowerCase()](a.dom,k)})}}a.onPreProcess.add(f);a.onSetContent.add(f);a.onInit.add(function(){a.selection.onSetContent.add(f)})}});
\ No newline at end of file
+(function(d){var a=/^\s*|\s*$/g,e,c="B".replace(/A(.)|B/,"$1")==="$1";var b={majorVersion:"3",minorVersion:"4.7",releaseDate:"2011-11-03",_init:function(){var s=this,q=document,o=navigator,g=o.userAgent,m,f,l,k,j,r;s.isOpera=d.opera&&opera.buildNumber;s.isWebKit=/WebKit/.test(g);s.isIE=!s.isWebKit&&!s.isOpera&&(/MSIE/gi).test(g)&&(/Explorer/gi).test(o.appName);s.isIE6=s.isIE&&/MSIE [56]/.test(g);s.isIE7=s.isIE&&/MSIE [7]/.test(g);s.isIE8=s.isIE&&/MSIE [8]/.test(g);s.isIE9=s.isIE&&/MSIE [9]/.test(g);s.isGecko=!s.isWebKit&&/Gecko/.test(g);s.isMac=g.indexOf("Mac")!=-1;s.isAir=/adobeair/i.test(g);s.isIDevice=/(iPad|iPhone)/.test(g);s.isIOS5=s.isIDevice&&g.match(/AppleWebKit\/(\d*)/)[1]>=534;if(d.tinyMCEPreInit){s.suffix=tinyMCEPreInit.suffix;s.baseURL=tinyMCEPreInit.base;s.query=tinyMCEPreInit.query;return}s.suffix="";f=q.getElementsByTagName("base");for(m=0;m<f.length;m++){if(r=f[m].href){if(/^https?:\/\/[^\/]+$/.test(r)){r+="/"}k=r?r.match(/.*\//)[0]:""}}function h(i){if(i.src&&/tiny_mce(|_gzip|_jquery|_prototype|_full)(_dev|_src)?.js/.test(i.src)){if(/_(src|dev)\.js/g.test(i.src)){s.suffix="_src"}if((j=i.src.indexOf("?"))!=-1){s.query=i.src.substring(j+1)}s.baseURL=i.src.substring(0,i.src.lastIndexOf("/"));if(k&&s.baseURL.indexOf("://")==-1&&s.baseURL.indexOf("/")!==0){s.baseURL=k+s.baseURL}return s.baseURL}return null}f=q.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}l=q.getElementsByTagName("head")[0];if(l){f=l.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}}return},is:function(g,f){if(!f){return g!==e}if(f=="array"&&(g.hasOwnProperty&&g instanceof Array)){return true}return typeof(g)==f},makeMap:function(f,j,h){var g;f=f||[];j=j||",";if(typeof(f)=="string"){f=f.split(j)}h=h||{};g=f.length;while(g--){h[f[g]]={}}return h},each:function(i,f,h){var j,g;if(!i){return 0}h=h||i;if(i.length!==e){for(j=0,g=i.length;j<g;j++){if(f.call(h,i[j],j,i)===false){return 0}}}else{for(j in i){if(i.hasOwnProperty(j)){if(f.call(h,i[j],j,i)===false){return 0}}}}return 1},trim:function(f){return(f?""+f:"").replace(a,"")},create:function(o,f,j){var n=this,g,i,k,l,h,m=0;o=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(o);k=o[3].match(/(^|\.)(\w+)$/i)[2];i=n.createNS(o[3].replace(/\.\w+$/,""),j);if(i[k]){return}if(o[2]=="static"){i[k]=f;if(this.onCreate){this.onCreate(o[2],o[3],i[k])}return}if(!f[k]){f[k]=function(){};m=1}i[k]=f[k];n.extend(i[k].prototype,f);if(o[5]){g=n.resolve(o[5]).prototype;l=o[5].match(/\.(\w+)$/i)[1];h=i[k];if(m){i[k]=function(){return g[l].apply(this,arguments)}}else{i[k]=function(){this.parent=g[l];return h.apply(this,arguments)}}i[k].prototype[k]=i[k];n.each(g,function(p,q){i[k].prototype[q]=g[q]});n.each(f,function(p,q){if(g[q]){i[k].prototype[q]=function(){this.parent=g[q];return p.apply(this,arguments)}}else{if(q!=k){i[k].prototype[q]=p}}})}n.each(f["static"],function(p,q){i[k][q]=p});if(this.onCreate){this.onCreate(o[2],o[3],i[k].prototype)}},walk:function(i,h,j,g){g=g||this;if(i){if(j){i=i[j]}b.each(i,function(k,f){if(h.call(g,k,f,j)===false){return false}b.walk(k,h,j,g)})}},createNS:function(j,h){var g,f;h=h||d;j=j.split(".");for(g=0;g<j.length;g++){f=j[g];if(!h[f]){h[f]={}}h=h[f]}return h},resolve:function(j,h){var g,f;h=h||d;j=j.split(".");for(g=0,f=j.length;g<f;g++){h=h[j[g]];if(!h){break}}return h},addUnload:function(j,i){var h=this;j={func:j,scope:i||this};if(!h.unloads){function g(){var f=h.unloads,l,m;if(f){for(m in f){l=f[m];if(l&&l.func){l.func.call(l.scope,1)}}if(d.detachEvent){d.detachEvent("onbeforeunload",k);d.detachEvent("onunload",g)}else{if(d.removeEventListener){d.removeEventListener("unload",g,false)}}h.unloads=l=f=w=g=0;if(d.CollectGarbage){CollectGarbage()}}}function k(){var l=document;if(l.readyState=="interactive"){function f(){l.detachEvent("onstop",f);if(g){g()}l=0}if(l){l.attachEvent("onstop",f)}d.setTimeout(function(){if(l){l.detachEvent("onstop",f)}},0)}}if(d.attachEvent){d.attachEvent("onunload",g);d.attachEvent("onbeforeunload",k)}else{if(d.addEventListener){d.addEventListener("unload",g,false)}}h.unloads=[j]}else{h.unloads.push(j)}return j},removeUnload:function(i){var g=this.unloads,h=null;b.each(g,function(j,f){if(j&&j.func==i){g.splice(f,1);h=i;return false}});return h},explode:function(f,g){return f?b.map(f.split(g||","),b.trim):f},_addVer:function(g){var f;if(!this.query){return g}f=(g.indexOf("?")==-1?"?":"&")+this.query;if(g.indexOf("#")==-1){return g+f}return g.replace("#",f+"#")},_replace:function(h,f,g){if(c){return g.replace(h,function(){var l=f,j=arguments,k;for(k=0;k<j.length-2;k++){if(j[k]===e){l=l.replace(new RegExp("\\$"+k,"g"),"")}else{l=l.replace(new RegExp("\\$"+k,"g"),j[k])}}return l})}return g.replace(h,f)}};b._init();d.tinymce=d.tinyMCE=b})(window);(function(e,d){var c=d.is,b=/^(href|src|style)$/i,f;if(!e&&window.console){return console.log("Load jQuery first!")}d.$=e;d.adapter={patchEditor:function(j){var i=e.fn;function h(n,o){var m=this;if(o){m.removeAttr("data-mce-style")}return i.css.apply(m,arguments)}function g(n,o){var m=this;if(b.test(n)){if(o!==f){m.each(function(p,q){j.dom.setAttrib(q,n,o)});return m}else{return m.attr("data-mce-"+n)}}return i.attr.apply(m,arguments)}function k(m){return function(n){if(n){n=j.dom.processHTML(n)}return m.call(this,n)}}function l(m){if(m.css!==h){m.css=h;m.attr=g;m.html=k(i.html);m.append=k(i.append);m.prepend=k(i.prepend);m.after=k(i.after);m.before=k(i.before);m.replaceWith=k(i.replaceWith);m.tinymce=j;m.pushStack=function(){return l(i.pushStack.apply(this,arguments))}}return m}j.$=function(m,n){var o=j.getDoc();return l(e(m||o,o||n))}}};d.extend=e.extend;d.extend(d,{map:e.map,grep:function(g,h){return e.grep(g,h||function(){return 1})},inArray:function(g,h){return e.inArray(h,g||[])}});var a={"tinymce.dom.DOMUtils":{select:function(i,h){var g=this;return e.find(i,g.get(h)||g.get(g.settings.root_element)||g.doc,[])},is:function(h,g){return e(this.get(h)).is(g)}}};d.onCreate=function(g,i,h){d.extend(h,a[i])}})(window.jQuery,tinymce);tinymce.create("tinymce.util.Dispatcher",{scope:null,listeners:null,Dispatcher:function(a){this.scope=a||this;this.listeners=[]},add:function(a,b){this.listeners.push({cb:a,scope:b||this.scope});return a},addToTop:function(a,b){this.listeners.unshift({cb:a,scope:b||this.scope});return a},remove:function(a){var b=this.listeners,c=null;tinymce.each(b,function(e,d){if(a==e.cb){c=a;b.splice(d,1);return false}});return c},dispatch:function(){var f,d=arguments,e,b=this.listeners,g;for(e=0;e<b.length;e++){g=b[e];f=g.cb.apply(g.scope,d);if(f===false){break}}return f}});(function(){var a=tinymce.each;tinymce.create("tinymce.util.URI",{URI:function(e,g){var f=this,i,d,c,h;e=tinymce.trim(e);g=f.settings=g||{};if(/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e)){f.source=e;return}if(e.indexOf("/")===0&&e.indexOf("//")!==0){e=(g.base_uri?g.base_uri.protocol||"http":"http")+"://mce_host"+e}if(!/^[\w-]*:?\/\//.test(e)){h=g.base_uri?g.base_uri.path:new tinymce.util.URI(location.href).directory;e=((g.base_uri&&g.base_uri.protocol)||"http")+"://mce_host"+f.toAbsPath(h,e)}e=e.replace(/@@/g,"(mce_at)");e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e);a(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],function(b,j){var k=e[j];if(k){k=k.replace(/\(mce_at\)/g,"@@")}f[b]=k});if(c=g.base_uri){if(!f.protocol){f.protocol=c.protocol}if(!f.userInfo){f.userInfo=c.userInfo}if(!f.port&&f.host=="mce_host"){f.port=c.port}if(!f.host||f.host=="mce_host"){f.host=c.host}f.source=""}},setPath:function(c){var b=this;c=/^(.*?)\/?(\w+)?$/.exec(c);b.path=c[0];b.directory=c[1];b.file=c[2];b.source="";b.getURI()},toRelative:function(b){var c=this,d;if(b==="./"){return b}b=new tinymce.util.URI(b,{base_uri:c});if((b.host!="mce_host"&&c.host!=b.host&&b.host)||c.port!=b.port||c.protocol!=b.protocol){return b.getURI()}d=c.toRelPath(c.path,b.path);if(b.query){d+="?"+b.query}if(b.anchor){d+="#"+b.anchor}return d},toAbsolute:function(b,c){var b=new tinymce.util.URI(b,{base_uri:this});return b.getURI(this.host==b.host&&this.protocol==b.protocol?c:0)},toRelPath:function(g,h){var c,f=0,d="",e,b;g=g.substring(0,g.lastIndexOf("/"));g=g.split("/");c=h.split("/");if(g.length>=c.length){for(e=0,b=g.length;e<b;e++){if(e>=c.length||g[e]!=c[e]){f=e+1;break}}}if(g.length<c.length){for(e=0,b=c.length;e<b;e++){if(e>=g.length||g[e]!=c[e]){f=e+1;break}}}if(f==1){return h}for(e=0,b=g.length-(f-1);e<b;e++){d+="../"}for(e=f-1,b=c.length;e<b;e++){if(e!=f-1){d+="/"+c[e]}else{d+=c[e]}}return d},toAbsPath:function(e,f){var c,b=0,h=[],d,g;d=/\/$/.test(f)?"/":"";e=e.split("/");f=f.split("/");a(e,function(i){if(i){h.push(i)}});e=h;for(c=f.length-1,h=[];c>=0;c--){if(f[c].length==0||f[c]=="."){continue}if(f[c]==".."){b++;continue}if(b>0){b--;continue}h.push(f[c])}c=e.length-b;if(c<=0){g=h.reverse().join("/")}else{g=e.slice(0,c).join("/")+"/"+h.reverse().join("/")}if(g.indexOf("/")!==0){g="/"+g}if(d&&g.lastIndexOf("/")!==g.length-1){g+=d}return g},getURI:function(d){var c,b=this;if(!b.source||d){c="";if(!d){if(b.protocol){c+=b.protocol+"://"}if(b.userInfo){c+=b.userInfo+"@"}if(b.host){c+=b.host}if(b.port){c+=":"+b.port}}if(b.path){c+=b.path}if(b.query){c+="?"+b.query}if(b.anchor){c+="#"+b.anchor}b.source=c}return b.source}})})();(function(){var a=tinymce.each;tinymce.create("static tinymce.util.Cookie",{getHash:function(d){var b=this.get(d),c;if(b){a(b.split("&"),function(e){e=e.split("=");c=c||{};c[unescape(e[0])]=unescape(e[1])})}return c},setHash:function(j,b,g,f,i,c){var h="";a(b,function(e,d){h+=(!h?"":"&")+escape(d)+"="+escape(e)});this.set(j,h,g,f,i,c)},get:function(i){var h=document.cookie,g,f=i+"=",d;if(!h){return}d=h.indexOf("; "+f);if(d==-1){d=h.indexOf(f);if(d!=0){return null}}else{d+=2}g=h.indexOf(";",d);if(g==-1){g=h.length}return unescape(h.substring(d+f.length,g))},set:function(i,b,g,f,h,c){document.cookie=i+"="+escape(b)+((g)?"; expires="+g.toGMTString():"")+((f)?"; path="+escape(f):"")+((h)?"; domain="+h:"")+((c)?"; secure":"")},remove:function(e,b){var c=new Date();c.setTime(c.getTime()-1000);this.set(e,"",c,b,c)}})})();(function(){function serialize(o,quote){var i,v,t;quote=quote||'"';if(o==null){return"null"}t=typeof o;if(t=="string"){v="\bb\tt\nn\ff\rr\"\"''\\\\";return quote+o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g,function(a,b){if(quote==='"'&&a==="'"){return a}i=v.indexOf(b);if(i+1){return"\\"+v.charAt(i+1)}a=b.charCodeAt().toString(16);return"\\u"+"0000".substring(a.length)+a})+quote}if(t=="object"){if(o.hasOwnProperty&&o instanceof Array){for(i=0,v="[";i<o.length;i++){v+=(i>0?",":"")+serialize(o[i],quote)}return v+"]"}v="{";for(i in o){if(o.hasOwnProperty(i)){v+=typeof o[i]!="function"?(v.length>1?","+quote:quote)+i+quote+":"+serialize(o[i],quote):""}}return v+"}"}return""+o}tinymce.util.JSON={serialize:serialize,parse:function(s){try{return eval("("+s+")")}catch(ex){}}}})();tinymce.create("static tinymce.util.XHR",{send:function(g){var a,e,b=window,h=0;g.scope=g.scope||this;g.success_scope=g.success_scope||g.scope;g.error_scope=g.error_scope||g.scope;g.async=g.async===false?false:true;g.data=g.data||"";function d(i){a=0;try{a=new ActiveXObject(i)}catch(c){}return a}a=b.XMLHttpRequest?new XMLHttpRequest():d("Microsoft.XMLHTTP")||d("Msxml2.XMLHTTP");if(a){if(a.overrideMimeType){a.overrideMimeType(g.content_type)}a.open(g.type||(g.data?"POST":"GET"),g.url,g.async);if(g.content_type){a.setRequestHeader("Content-Type",g.content_type)}a.setRequestHeader("X-Requested-With","XMLHttpRequest");a.send(g.data);function f(){if(!g.async||a.readyState==4||h++>10000){if(g.success&&h<10000&&a.status==200){g.success.call(g.success_scope,""+a.responseText,a,g)}else{if(g.error){g.error.call(g.error_scope,h>10000?"TIMED_OUT":"GENERAL",a,g)}}a=null}else{b.setTimeout(f,10)}}if(!g.async){return f()}e=b.setTimeout(f,10)}}});(function(){var c=tinymce.extend,b=tinymce.util.JSON,a=tinymce.util.XHR;tinymce.create("tinymce.util.JSONRequest",{JSONRequest:function(d){this.settings=c({},d);this.count=0},send:function(f){var e=f.error,d=f.success;f=c(this.settings,f);f.success=function(h,g){h=b.parse(h);if(typeof(h)=="undefined"){h={error:"JSON Parse error."}}if(h.error){e.call(f.error_scope||f.scope,h.error,g)}else{d.call(f.success_scope||f.scope,h.result)}};f.error=function(h,g){if(e){e.call(f.error_scope||f.scope,h,g)}};f.data=b.serialize({id:f.id||"c"+(this.count++),method:f.method,params:f.params});f.content_type="application/json";a.send(f)},"static":{sendRPC:function(d){return new tinymce.util.JSONRequest().send(d)}}})}());(function(a){a.VK={DELETE:46,BACKSPACE:8,ENTER:13,TAB:9,SPACEBAR:32,UP:38,DOWN:40}})(tinymce);(function(k){var i=k.VK,j=i.BACKSPACE,h=i.DELETE;function c(m){var o=m.dom,n=m.selection;m.onKeyDown.add(function(q,u){var p,v,s,t,r;r=u.keyCode==h;if(r||u.keyCode==j){u.preventDefault();p=n.getRng();v=o.getParent(p.startContainer,o.isBlock);if(r){v=o.getNext(v,o.isBlock)}if(v){s=v.firstChild;while(s&&s.nodeType==3&&s.nodeValue.length==0){s=s.nextSibling}if(s&&s.nodeName==="SPAN"){t=s.cloneNode(false)}}q.getDoc().execCommand(r?"ForwardDelete":"Delete",false,null);v=o.getParent(p.startContainer,o.isBlock);k.each(o.select("span.Apple-style-span,font.Apple-style-span",v),function(x){var y=n.getBookmark();if(t){o.replace(t.cloneNode(false),x,true)}else{o.remove(x,true)}n.moveToBookmark(y)})}})}function d(m){m.onKeyUp.add(function(n,p){var o=p.keyCode;if(o==h||o==j){if(n.dom.isEmpty(n.getBody())){n.setContent("",{format:"raw"});n.nodeChanged();return}}})}function b(m){m.dom.bind(m.getDoc(),"focusin",function(){m.selection.setRng(m.selection.getRng())})}function e(m){m.onKeyDown.add(function(n,q){if(q.keyCode===j){if(n.selection.isCollapsed()&&n.selection.getRng(true).startOffset===0){var p=n.selection.getNode();var o=p.previousSibling;if(o&&o.nodeName&&o.nodeName.toLowerCase()==="hr"){n.dom.remove(o);k.dom.Event.cancel(q)}}}})}function g(m){if(!Range.prototype.getClientRects){m.onMouseDown.add(function(o,p){if(p.target.nodeName==="HTML"){var n=o.getBody();n.blur();setTimeout(function(){n.focus()},0)}})}}function f(m){m.onClick.add(function(n,o){o=o.target;if(/^(IMG|HR)$/.test(o.nodeName)){n.selection.getSel().setBaseAndExtent(o,0,o,1)}if(o.nodeName=="A"&&n.dom.hasClass(o,"mceItemAnchor")){n.selection.select(o)}n.nodeChanged()})}function l(m){var o,n;m.dom.bind(m.getDoc(),"selectionchange",function(){if(n){clearTimeout(n);n=0}n=window.setTimeout(function(){var p=m.selection.getRng();if(!o||!k.dom.RangeUtils.compareRanges(p,o)){m.nodeChanged();o=p}},50)})}function a(m){document.body.setAttribute("role","application")}k.create("tinymce.util.Quirks",{Quirks:function(m){if(k.isWebKit){c(m);d(m);b(m);f(m);if(k.isIDevice){l(m)}}if(k.isIE){e(m);d(m);a(m)}if(k.isGecko){e(m);g(m)}}})})(tinymce);(function(j){var a,g,d,k=/[&<>\"\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,b=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,f=/[<>&\"\']/g,c=/&(#x|#)?([\w]+);/g,i={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"};g={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;"};d={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"};function h(l){var m;m=document.createElement("div");m.innerHTML=l;return m.textContent||m.innerText||l}function e(m,p){var n,o,l,q={};if(m){m=m.split(",");p=p||10;for(n=0;n<m.length;n+=2){o=String.fromCharCode(parseInt(m[n],p));if(!g[o]){l="&"+m[n+1]+";";q[o]=l;q[l]=o}}return q}}a=e("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);j.html=j.html||{};j.html.Entities={encodeRaw:function(m,l){return m.replace(l?k:b,function(n){return g[n]||n})},encodeAllRaw:function(l){return(""+l).replace(f,function(m){return g[m]||m})},encodeNumeric:function(m,l){return m.replace(l?k:b,function(n){if(n.length>1){return"&#"+(((n.charCodeAt(0)-55296)*1024)+(n.charCodeAt(1)-56320)+65536)+";"}return g[n]||"&#"+n.charCodeAt(0)+";"})},encodeNamed:function(n,l,m){m=m||a;return n.replace(l?k:b,function(o){return g[o]||m[o]||o})},getEncodeFunc:function(l,o){var p=j.html.Entities;o=e(o)||a;function m(r,q){return r.replace(q?k:b,function(s){return g[s]||o[s]||"&#"+s.charCodeAt(0)+";"||s})}function n(r,q){return p.encodeNamed(r,q,o)}l=j.makeMap(l.replace(/\+/g,","));if(l.named&&l.numeric){return m}if(l.named){if(o){return n}return p.encodeNamed}if(l.numeric){return p.encodeNumeric}return p.encodeRaw},decode:function(l){return l.replace(c,function(n,m,o){if(m){o=parseInt(o,m.length===2?16:10);if(o>65535){o-=65536;return String.fromCharCode(55296+(o>>10),56320+(o&1023))}else{return i[o]||String.fromCharCode(o)}}return d[n]||a[n]||h(n)})}}})(tinymce);tinymce.html.Styles=function(d,f){var k=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,h=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,b=/\s*([^:]+):\s*([^;]+);?/g,l=/\s+$/,m=/rgb/,e,g,a={},j;d=d||{};j="\\\" \\' \\; \\: ; : \uFEFF".split(" ");for(g=0;g<j.length;g++){a[j[g]]="\uFEFF"+g;a["\uFEFF"+g]=j[g]}function c(n,q,p,i){function o(r){r=parseInt(r).toString(16);return r.length>1?r:"0"+r}return"#"+o(q)+o(p)+o(i)}return{toHex:function(i){return i.replace(k,c)},parse:function(r){var y={},p,n,v,q,u=d.url_converter,x=d.url_converter_scope||this;function o(C,F){var E,B,A,D;E=y[C+"-top"+F];if(!E){return}B=y[C+"-right"+F];if(E!=B){return}A=y[C+"-bottom"+F];if(B!=A){return}D=y[C+"-left"+F];if(A!=D){return}y[C+F]=D;delete y[C+"-top"+F];delete y[C+"-right"+F];delete y[C+"-bottom"+F];delete y[C+"-left"+F]}function t(B){var C=y[B],A;if(!C||C.indexOf(" ")<0){return}C=C.split(" ");A=C.length;while(A--){if(C[A]!==C[0]){return false}}y[B]=C[0];return true}function z(C,B,A,D){if(!t(B)){return}if(!t(A)){return}if(!t(D)){return}y[C]=y[B]+" "+y[A]+" "+y[D];delete y[B];delete y[A];delete y[D]}function s(A){q=true;return a[A]}function i(B,A){if(q){B=B.replace(/\uFEFF[0-9]/g,function(C){return a[C]})}if(!A){B=B.replace(/\\([\'\";:])/g,"$1")}return B}if(r){r=r.replace(/\\[\"\';:\uFEFF]/g,s).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(A){return A.replace(/[;:]/g,s)});while(p=b.exec(r)){n=p[1].replace(l,"").toLowerCase();v=p[2].replace(l,"");if(n&&v.length>0){if(n==="font-weight"&&v==="700"){v="bold"}else{if(n==="color"||n==="background-color"){v=v.toLowerCase()}}v=v.replace(k,c);v=v.replace(h,function(B,A,E,D,F,C){F=F||C;if(F){F=i(F);return"'"+F.replace(/\'/g,"\\'")+"'"}A=i(A||E||D);if(u){A=u.call(x,A,"style")}return"url('"+A.replace(/\'/g,"\\'")+"')"});y[n]=q?i(v,true):v}b.lastIndex=p.index+p[0].length}o("border","");o("border","-width");o("border","-color");o("border","-style");o("padding","");o("margin","");z("border","border-width","border-style","border-color");if(y.border==="medium none"){delete y.border}}return y},serialize:function(p,r){var o="",n,q;function i(t){var x,u,s,v;x=f.styles[t];if(x){for(u=0,s=x.length;u<s;u++){t=x[u];v=p[t];if(v!==e&&v.length>0){o+=(o.length>0?" ":"")+t+": "+v+";"}}}}if(r&&f&&f.styles){i("*");i(r)}else{for(n in p){q=p[n];if(q!==e&&q.length>0){o+=(o.length>0?" ":"")+n+": "+q+";"}}}return o}}};(function(m){var h={},j,l,g,f,c={},b,e,d=m.makeMap,k=m.each;function i(o,n){return o.split(n||",")}function a(r,q){var o,p={};function n(s){return s.replace(/[A-Z]+/g,function(t){return n(r[t])})}for(o in r){if(r.hasOwnProperty(o)){r[o]=n(r[o])}}n(q).replace(/#/g,"#text").replace(/(\w+)\[([^\]]+)\]\[([^\]]*)\]/g,function(v,t,s,u){s=i(s,"|");p[t]={attributes:d(s),attributesOrder:s,children:d(u,"|",{"#comment":{}})}});return p}l="h1,h2,h3,h4,h5,h6,hr,p,div,address,pre,form,table,tbody,thead,tfoot,th,tr,td,li,ol,ul,caption,blockquote,center,dl,dt,dd,dir,fieldset,noscript,menu,isindex,samp,header,footer,article,section,hgroup";l=d(l,",",d(l.toUpperCase()));h=a({Z:"H|K|N|O|P",Y:"X|form|R|Q",ZG:"E|span|width|align|char|charoff|valign",X:"p|T|div|U|W|isindex|fieldset|table",ZF:"E|align|char|charoff|valign",W:"pre|hr|blockquote|address|center|noframes",ZE:"abbr|axis|headers|scope|rowspan|colspan|align|char|charoff|valign|nowrap|bgcolor|width|height",ZD:"[E][S]",U:"ul|ol|dl|menu|dir",ZC:"p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q",T:"h1|h2|h3|h4|h5|h6",ZB:"X|S|Q",S:"R|P",ZA:"a|G|J|M|O|P",R:"a|H|K|N|O",Q:"noscript|P",P:"ins|del|script",O:"input|select|textarea|label|button",N:"M|L",M:"em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym",L:"sub|sup",K:"J|I",J:"tt|i|b|u|s|strike",I:"big|small|font|basefont",H:"G|F",G:"br|span|bdo",F:"object|applet|img|map|iframe",E:"A|B|C",D:"accesskey|tabindex|onfocus|onblur",C:"onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup",B:"lang|xml:lang|dir",A:"id|class|style|title"},"script[id|charset|type|language|src|defer|xml:space][]style[B|id|type|media|title|xml:space][]object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]param[id|name|value|valuetype|type][]p[E|align][#|S]a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]br[A|clear][]span[E][#|S]bdo[A|C|B][#|S]applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]h1[E|align][#|S]img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]map[B|C|A|name][X|form|Q|area]h2[E|align][#|S]iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]h3[E|align][#|S]tt[E][#|S]i[E][#|S]b[E][#|S]u[E][#|S]s[E][#|S]strike[E][#|S]big[E][#|S]small[E][#|S]font[A|B|size|color|face][#|S]basefont[id|size|color|face][]em[E][#|S]strong[E][#|S]dfn[E][#|S]code[E][#|S]q[E|cite][#|S]samp[E][#|S]kbd[E][#|S]var[E][#|S]cite[E][#|S]abbr[E][#|S]acronym[E][#|S]sub[E][#|S]sup[E][#|S]input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]optgroup[E|disabled|label][option]option[E|selected|disabled|label|value][]textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]label[E|for|accesskey|onfocus|onblur][#|S]button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]h4[E|align][#|S]ins[E|cite|datetime][#|Y]h5[E|align][#|S]del[E|cite|datetime][#|Y]h6[E|align][#|S]div[E|align][#|Y]ul[E|type|compact][li]li[E|type|value][#|Y]ol[E|type|compact|start][li]dl[E|compact][dt|dd]dt[E][#|S]dd[E][#|Y]menu[E|compact][li]dir[E|compact][li]pre[E|width|xml:space][#|ZA]hr[E|align|noshade|size|width][]blockquote[E|cite][#|Y]address[E][#|S|p]center[E][#|Y]noframes[E][#|Y]isindex[A|B|prompt][]fieldset[E][#|legend|Y]legend[E|accesskey|align][#|S]table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]caption[E|align][#|S]col[ZG][]colgroup[ZG][col]thead[ZF][tr]tr[ZF|bgcolor][th|td]th[E|ZE][#|Y]form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]noscript[E][#|Y]td[E|ZE][#|Y]tfoot[ZF][tr]tbody[ZF][tr]area[E|D|shape|coords|href|nohref|alt|target][]base[id|href|target][]body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]");j=d("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected,autoplay,loop,controls");g=d("area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed,source");f=m.extend(d("td,th,iframe,video,audio,object"),g);b=d("pre,script,style,textarea");e=d("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");m.html.Schema=function(r){var A=this,n={},o={},y=[],q,p;r=r||{};if(r.verify_html===false){r.valid_elements="*[*]"}if(r.valid_styles){q={};k(r.valid_styles,function(C,B){q[B]=m.explode(C)})}p=r.whitespace_elements?d(r.whitespace_elements):b;function z(B){return new RegExp("^"+B.replace(/([?+*])/g,".$1")+"$")}function t(I){var H,D,W,S,X,C,F,R,U,N,V,Z,L,G,T,B,P,E,Y,aa,M,Q,K=/^([#+-])?([^\[\/]+)(?:\/([^\[]+))?(?:\[([^\]]+)\])?$/,O=/^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,J=/[*?+]/;if(I){I=i(I);if(n["@"]){P=n["@"].attributes;E=n["@"].attributesOrder}for(H=0,D=I.length;H<D;H++){C=K.exec(I[H]);if(C){T=C[1];N=C[2];B=C[3];U=C[4];L={};G=[];F={attributes:L,attributesOrder:G};if(T==="#"){F.paddEmpty=true}if(T==="-"){F.removeEmpty=true}if(P){for(aa in P){L[aa]=P[aa]}G.push.apply(G,E)}if(U){U=i(U,"|");for(W=0,S=U.length;W<S;W++){C=O.exec(U[W]);if(C){R={};Z=C[1];V=C[2].replace(/::/g,":");T=C[3];Q=C[4];if(Z==="!"){F.attributesRequired=F.attributesRequired||[];F.attributesRequired.push(V);R.required=true}if(Z==="-"){delete L[V];G.splice(m.inArray(G,V),1);continue}if(T){if(T==="="){F.attributesDefault=F.attributesDefault||[];F.attributesDefault.push({name:V,value:Q});R.defaultValue=Q}if(T===":"){F.attributesForced=F.attributesForced||[];F.attributesForced.push({name:V,value:Q});R.forcedValue=Q}if(T==="<"){R.validValues=d(Q,"?")}}if(J.test(V)){F.attributePatterns=F.attributePatterns||[];R.pattern=z(V);F.attributePatterns.push(R)}else{if(!L[V]){G.push(V)}L[V]=R}}}}if(!P&&N=="@"){P=L;E=G}if(B){F.outputName=N;n[B]=F}if(J.test(N)){F.pattern=z(N);y.push(F)}else{n[N]=F}}}}}function v(B){n={};y=[];t(B);k(h,function(D,C){o[C]=D.children})}function s(C){var B=/^(~)?(.+)$/;if(C){k(i(C),function(G){var E=B.exec(G),F=E[1]==="~",H=F?"span":"div",D=E[2];o[D]=o[H];c[D]=H;if(!F){l[D]={}}k(o,function(I,J){if(I[H]){I[D]=I[H]}})})}}function u(C){var B=/^([+\-]?)(\w+)\[([^\]]+)\]$/;if(C){k(i(C),function(G){var F=B.exec(G),D,E;if(F){E=F[1];if(E){D=o[F[2]]}else{D=o[F[2]]={"#comment":{}}}D=o[F[2]];k(i(F[3],"|"),function(H){if(E==="-"){delete D[H]}else{D[H]={}}})}})}}function x(B){var D=n[B],C;if(D){return D}C=y.length;while(C--){D=y[C];if(D.pattern.test(B)){return D}}}if(!r.valid_elements){k(h,function(C,B){n[B]={attributes:C.attributes,attributesOrder:C.attributesOrder};o[B]=C.children});k(i("strong/b,em/i"),function(B){B=i(B,"/");n[B[1]].outputName=B[0]});n.img.attributesDefault=[{name:"alt",value:""}];k(i("ol,ul,sub,sup,blockquote,span,font,a,table,tbody,tr"),function(B){n[B].removeEmpty=true});k(i("p,h1,h2,h3,h4,h5,h6,th,td,pre,div,address,caption"),function(B){n[B].paddEmpty=true})}else{v(r.valid_elements)}s(r.custom_elements);u(r.valid_children);t(r.extended_valid_elements);u("+ol[ul|ol],+ul[ul|ol]");if(!x("span")){t("span[!data-mce-type|*]")}if(r.invalid_elements){m.each(m.explode(r.invalid_elements),function(B){if(n[B]){delete n[B]}})}A.children=o;A.styles=q;A.getBoolAttrs=function(){return j};A.getBlockElements=function(){return l};A.getShortEndedElements=function(){return g};A.getSelfClosingElements=function(){return e};A.getNonEmptyElements=function(){return f};A.getWhiteSpaceElements=function(){return p};A.isValidChild=function(B,D){var C=o[B];return !!(C&&C[D])};A.getElementRule=x;A.getCustomElements=function(){return c};A.addValidElements=t;A.setValidElements=v;A.addCustomElements=s;A.addValidChildren=u};m.html.Schema.boolAttrMap=j;m.html.Schema.blockElementsMap=l})(tinymce);(function(a){a.html.SaxParser=function(c,e){var b=this,d=function(){};c=c||{};b.schema=e=e||new a.html.Schema();if(c.fix_self_closing!==false){c.fix_self_closing=true}a.each("comment cdata text start end pi doctype".split(" "),function(f){if(f){b[f]=c[f]||d}});b.parse=function(D){var n=this,g,F=0,H,A,z=[],M,P,B,q,y,r,L,G,N,u,m,k,s,Q,o,O,E,R,K,f,I,l,C,J,h,v=0,j=a.html.Entities.decode,x,p;function t(S){var U,T;U=z.length;while(U--){if(z[U].name===S){break}}if(U>=0){for(T=z.length-1;T>=U;T--){S=z[T];if(S.valid){n.end(S.name)}}z.length=U}}l=new RegExp("<(?:(?:!--([\\w\\W]*?)-->)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:!DOCTYPE([\\w\\W]*?)>)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([^>]+)>)|(?:([^\\s\\/<>]+)((?:\\s+[^\"'>]+(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>]*))*|\\/)>))","g");C=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:\\.|[^\"])*)\")|(?:\'((?:\\.|[^\'])*)\')|([^>\s]+)))?/g;J={script:/<\/script[^>]*>/gi,style:/<\/style[^>]*>/gi,noscript:/<\/noscript[^>]*>/gi};L=e.getShortEndedElements();I=e.getSelfClosingElements();G=e.getBoolAttrs();u=c.validate;r=c.remove_internals;x=c.fix_self_closing;p=a.isIE;o=/^:/;while(g=l.exec(D)){if(F<g.index){n.text(j(D.substr(F,g.index-F)))}if(H=g[6]){H=H.toLowerCase();if(p&&o.test(H)){H=H.substr(1)}t(H)}else{if(H=g[7]){H=H.toLowerCase();if(p&&o.test(H)){H=H.substr(1)}N=H in L;if(x&&I[H]&&z.length>0&&z[z.length-1].name===H){t(H)}if(!u||(m=e.getElementRule(H))){k=true;if(u){O=m.attributes;E=m.attributePatterns}if(Q=g[8]){y=Q.indexOf("data-mce-type")!==-1;if(y&&r){k=false}M=[];M.map={};Q.replace(C,function(T,S,X,W,V){var Y,U;S=S.toLowerCase();X=S in G?S:j(X||W||V||"");if(u&&!y&&S.indexOf("data-")!==0){Y=O[S];if(!Y&&E){U=E.length;while(U--){Y=E[U];if(Y.pattern.test(S)){break}}if(U===-1){Y=null}}if(!Y){return}if(Y.validValues&&!(X in Y.validValues)){return}}M.map[S]=X;M.push({name:S,value:X})})}else{M=[];M.map={}}if(u&&!y){R=m.attributesRequired;K=m.attributesDefault;f=m.attributesForced;if(f){P=f.length;while(P--){s=f[P];q=s.name;h=s.value;if(h==="{$uid}"){h="mce_"+v++}M.map[q]=h;M.push({name:q,value:h})}}if(K){P=K.length;while(P--){s=K[P];q=s.name;if(!(q in M.map)){h=s.value;if(h==="{$uid}"){h="mce_"+v++}M.map[q]=h;M.push({name:q,value:h})}}}if(R){P=R.length;while(P--){if(R[P] in M.map){break}}if(P===-1){k=false}}if(M.map["data-mce-bogus"]){k=false}}if(k){n.start(H,M,N)}}else{k=false}if(A=J[H]){A.lastIndex=F=g.index+g[0].length;if(g=A.exec(D)){if(k){B=D.substr(F,g.index-F)}F=g.index+g[0].length}else{B=D.substr(F);F=D.length}if(k&&B.length>0){n.text(B,true)}if(k){n.end(H)}l.lastIndex=F;continue}if(!N){if(!Q||Q.indexOf("/")!=Q.length-1){z.push({name:H,valid:k})}else{if(k){n.end(H)}}}}else{if(H=g[1]){n.comment(H)}else{if(H=g[2]){n.cdata(H)}else{if(H=g[3]){n.doctype(H)}else{if(H=g[4]){n.pi(H,g[5])}}}}}}F=g.index+g[0].length}if(F<D.length){n.text(j(D.substr(F)))}for(P=z.length-1;P>=0;P--){H=z[P];if(H.valid){n.end(H.name)}}}}})(tinymce);(function(d){var c=/^[ \t\r\n]*$/,e={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11};function a(k,l,j){var i,h,f=j?"lastChild":"firstChild",g=j?"prev":"next";if(k[f]){return k[f]}if(k!==l){i=k[g];if(i){return i}for(h=k.parent;h&&h!==l;h=h.parent){i=h[g];if(i){return i}}}}function b(f,g){this.name=f;this.type=g;if(g===1){this.attributes=[];this.attributes.map={}}}d.extend(b.prototype,{replace:function(g){var f=this;if(g.parent){g.remove()}f.insert(g,f);f.remove();return f},attr:function(h,l){var f=this,g,j,k;if(typeof h!=="string"){for(j in h){f.attr(j,h[j])}return f}if(g=f.attributes){if(l!==k){if(l===null){if(h in g.map){delete g.map[h];j=g.length;while(j--){if(g[j].name===h){g=g.splice(j,1);return f}}}return f}if(h in g.map){j=g.length;while(j--){if(g[j].name===h){g[j].value=l;break}}}else{g.push({name:h,value:l})}g.map[h]=l;return f}else{return g.map[h]}}},clone:function(){var g=this,n=new b(g.name,g.type),h,f,m,j,k;if(m=g.attributes){k=[];k.map={};for(h=0,f=m.length;h<f;h++){j=m[h];if(j.name!=="id"){k[k.length]={name:j.name,value:j.value};k.map[j.name]=j.value}}n.attributes=k}n.value=g.value;n.shortEnded=g.shortEnded;return n},wrap:function(g){var f=this;f.parent.insert(g,f);g.append(f);return f},unwrap:function(){var f=this,h,g;for(h=f.firstChild;h;){g=h.next;f.insert(h,f,true);h=g}f.remove()},remove:function(){var f=this,h=f.parent,g=f.next,i=f.prev;if(h){if(h.firstChild===f){h.firstChild=g;if(g){g.prev=null}}else{i.next=g}if(h.lastChild===f){h.lastChild=i;if(i){i.next=null}}else{g.prev=i}f.parent=f.next=f.prev=null}return f},append:function(h){var f=this,g;if(h.parent){h.remove()}g=f.lastChild;if(g){g.next=h;h.prev=g;f.lastChild=h}else{f.lastChild=f.firstChild=h}h.parent=f;return h},insert:function(h,f,i){var g;if(h.parent){h.remove()}g=f.parent||this;if(i){if(f===g.firstChild){g.firstChild=h}else{f.prev.next=h}h.prev=f.prev;h.next=f;f.prev=h}else{if(f===g.lastChild){g.lastChild=h}else{f.next.prev=h}h.next=f.next;h.prev=f;f.next=h}h.parent=g;return h},getAll:function(g){var f=this,h,i=[];for(h=f.firstChild;h;h=a(h,f)){if(h.name===g){i.push(h)}}return i},empty:function(){var g=this,f,h,j;if(g.firstChild){f=[];for(j=g.firstChild;j;j=a(j,g)){f.push(j)}h=f.length;while(h--){j=f[h];j.parent=j.firstChild=j.lastChild=j.next=j.prev=null}}g.firstChild=g.lastChild=null;return g},isEmpty:function(k){var f=this,j=f.firstChild,h,g;if(j){do{if(j.type===1){if(j.attributes.map["data-mce-bogus"]){continue}if(k[j.name]){return false}h=j.attributes.length;while(h--){g=j.attributes[h].name;if(g==="name"||g.indexOf("data-")===0){return false}}}if((j.type===3&&!c.test(j.value))){return false}}while(j=a(j,f))}return true},walk:function(f){return a(this,null,f)}});d.extend(b,{create:function(g,f){var i,h;i=new b(g,e[g]||1);if(f){for(h in f){i.attr(h,f[h])}}return i}});d.html.Node=b})(tinymce);(function(b){var a=b.html.Node;b.html.DomParser=function(g,h){var f=this,e={},d=[],i={},c={};g=g||{};g.validate="validate" in g?g.validate:true;g.root_name=g.root_name||"body";f.schema=h=h||new b.html.Schema();function j(m){var o,p,x,v,z,n,q,l,t,u,k,s,y,r;s=b.makeMap("tr,td,th,tbody,thead,tfoot,table");k=h.getNonEmptyElements();for(o=0;o<m.length;o++){p=m[o];if(!p.parent){continue}v=[p];for(x=p.parent;x&&!h.isValidChild(x.name,p.name)&&!s[x.name];x=x.parent){v.push(x)}if(x&&v.length>1){v.reverse();z=n=f.filterNode(v[0].clone());for(t=0;t<v.length-1;t++){if(h.isValidChild(n.name,v[t].name)){q=f.filterNode(v[t].clone());n.append(q)}else{q=n}for(l=v[t].firstChild;l&&l!=v[t+1];){r=l.next;q.append(l);l=r}n=q}if(!z.isEmpty(k)){x.insert(z,v[0],true);x.insert(p,z)}else{x.insert(p,v[0],true)}x=v[0];if(x.isEmpty(k)||x.firstChild===x.lastChild&&x.firstChild.name==="br"){x.empty().remove()}}else{if(p.parent){if(p.name==="li"){y=p.prev;if(y&&(y.name==="ul"||y.name==="ul")){y.append(p);continue}y=p.next;if(y&&(y.name==="ul"||y.name==="ul")){y.insert(p,y.firstChild,true);continue}p.wrap(f.filterNode(new a("ul",1)));continue}if(h.isValidChild(p.parent.name,"div")&&h.isValidChild("div",p.name)){p.wrap(f.filterNode(new a("div",1)))}else{if(p.name==="style"||p.name==="script"){p.empty().remove()}else{p.unwrap()}}}}}}f.filterNode=function(m){var l,k,n;if(k in e){n=i[k];if(n){n.push(m)}else{i[k]=[m]}}l=d.length;while(l--){k=d[l].name;if(k in m.attributes.map){n=c[k];if(n){n.push(m)}else{c[k]=[m]}}}return m};f.addNodeFilter=function(k,l){b.each(b.explode(k),function(m){var n=e[m];if(!n){e[m]=n=[]}n.push(l)})};f.addAttributeFilter=function(k,l){b.each(b.explode(k),function(m){var n;for(n=0;n<d.length;n++){if(d[n].name===m){d[n].callbacks.push(l);return}}d.push({name:m,callbacks:[l]})})};f.parse=function(v,m){var n,H,A,z,C,B,x,r,E,K,y,o,D,J=[],t,k,s,p,u,q;m=m||{};i={};c={};o=b.extend(b.makeMap("script,style,head,html,body,title,meta,param"),h.getBlockElements());u=h.getNonEmptyElements();p=h.children;y=g.validate;q="forced_root_block" in m?m.forced_root_block:g.forced_root_block;s=h.getWhiteSpaceElements();D=/^[ \t\r\n]+/;t=/[ \t\r\n]+$/;k=/[ \t\r\n]+/g;function F(){var L=H.firstChild,l,M;while(L){l=L.next;if(L.type==3||(L.type==1&&L.name!=="p"&&!o[L.name]&&!L.attr("data-mce-type"))){if(!M){M=I(q,1);H.insert(M,L);M.append(L)}else{M.append(L)}}else{M=null}L=l}}function I(l,L){var M=new a(l,L),N;if(l in e){N=i[l];if(N){N.push(M)}else{i[l]=[M]}}return M}function G(M){var N,l,L;for(N=M.prev;N&&N.type===3;){l=N.value.replace(t,"");if(l.length>0){N.value=l;N=N.prev}else{L=N.prev;N.remove();N=L}}}n=new b.html.SaxParser({validate:y,fix_self_closing:!y,cdata:function(l){A.append(I("#cdata",4)).value=l},text:function(M,l){var L;if(!s[A.name]){M=M.replace(k," ");if(A.lastChild&&o[A.lastChild.name]){M=M.replace(D,"")}}if(M.length!==0){L=I("#text",3);L.raw=!!l;A.append(L).value=M}},comment:function(l){A.append(I("#comment",8)).value=l},pi:function(l,L){A.append(I(l,7)).value=L;G(A)},doctype:function(L){var l;l=A.append(I("#doctype",10));l.value=L;G(A)},start:function(l,T,M){var R,O,N,L,P,U,S,Q;N=y?h.getElementRule(l):{};if(N){R=I(N.outputName||l,1);R.attributes=T;R.shortEnded=M;A.append(R);Q=p[A.name];if(Q&&p[R.name]&&!Q[R.name]){J.push(R)}O=d.length;while(O--){P=d[O].name;if(P in T.map){E=c[P];if(E){E.push(R)}else{c[P]=[R]}}}if(o[l]){G(R)}if(!M){A=R}}},end:function(l){var P,M,O,L,N;M=y?h.getElementRule(l):{};if(M){if(o[l]){if(!s[A.name]){for(P=A.firstChild;P&&P.type===3;){O=P.value.replace(D,"");if(O.length>0){P.value=O;P=P.next}else{L=P.next;P.remove();P=L}}for(P=A.lastChild;P&&P.type===3;){O=P.value.replace(t,"");if(O.length>0){P.value=O;P=P.prev}else{L=P.prev;P.remove();P=L}}}P=A.prev;if(P&&P.type===3){O=P.value.replace(D,"");if(O.length>0){P.value=O}else{P.remove()}}}if(M.removeEmpty||M.paddEmpty){if(A.isEmpty(u)){if(M.paddEmpty){A.empty().append(new a("#text","3")).value="\u00a0"}else{if(!A.attributes.map.name){N=A.parent;A.empty().remove();A=N;return}}}}A=A.parent}}},h);H=A=new a(m.context||g.root_name,11);n.parse(v);if(y&&J.length){if(!m.context){j(J)}else{m.invalid=true}}if(q&&H.name=="body"){F()}if(!m.invalid){for(K in i){E=e[K];z=i[K];x=z.length;while(x--){if(!z[x].parent){z.splice(x,1)}}for(C=0,B=E.length;C<B;C++){E[C](z,K,m)}}for(C=0,B=d.length;C<B;C++){E=d[C];if(E.name in c){z=c[E.name];x=z.length;while(x--){if(!z[x].parent){z.splice(x,1)}}for(x=0,r=E.callbacks.length;x<r;x++){E.callbacks[x](z,E.name,m)}}}}return H};if(g.remove_trailing_brs){f.addNodeFilter("br",function(n,m){var r,q=n.length,o,u=h.getBlockElements(),k=h.getNonEmptyElements(),s,p,t;u.body=1;for(r=0;r<q;r++){o=n[r];s=o.parent;if(u[o.parent.name]&&o===s.lastChild){p=o.prev;while(p){t=p.name;if(t!=="span"||p.attr("data-mce-type")!=="bookmark"){if(t!=="br"){break}if(t==="br"){o=null;break}}p=p.prev}if(o){o.remove();if(s.isEmpty(k)){elementRule=h.getElementRule(s.name);if(elementRule){if(elementRule.removeEmpty){s.remove()}else{if(elementRule.paddEmpty){s.empty().append(new b.html.Node("#text",3)).value="\u00a0"}}}}}}}})}}})(tinymce);tinymce.html.Writer=function(e){var c=[],a,b,d,f,g;e=e||{};a=e.indent;b=tinymce.makeMap(e.indent_before||"");d=tinymce.makeMap(e.indent_after||"");f=tinymce.html.Entities.getEncodeFunc(e.entity_encoding||"raw",e.entities);g=e.element_format=="html";return{start:function(m,k,p){var n,j,h,o;if(a&&b[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}c.push("<",m);if(k){for(n=0,j=k.length;n<j;n++){h=k[n];c.push(" ",h.name,'="',f(h.value,true),'"')}}if(!p||g){c[c.length]=">"}else{c[c.length]=" />"}if(p&&a&&d[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}},end:function(h){var i;c.push("</",h,">");if(a&&d[h]&&c.length>0){i=c[c.length-1];if(i.length>0&&i!=="\n"){c.push("\n")}}},text:function(i,h){if(i.length>0){c[c.length]=h?i:f(i)}},cdata:function(h){c.push("<![CDATA[",h,"]]>")},comment:function(h){c.push("<!--",h,"-->")},pi:function(h,i){if(i){c.push("<?",h," ",i,"?>")}else{c.push("<?",h,"?>")}if(a){c.push("\n")}},doctype:function(h){c.push("<!DOCTYPE",h,">",a?"\n":"")},reset:function(){c.length=0},getContent:function(){return c.join("").replace(/\n$/,"")}}};(function(a){a.html.Serializer=function(c,d){var b=this,e=new a.html.Writer(c);c=c||{};c.validate="validate" in c?c.validate:true;b.schema=d=d||new a.html.Schema();b.writer=e;b.serialize=function(h){var g,i;i=c.validate;g={3:function(k,j){e.text(k.value,k.raw)},8:function(j){e.comment(j.value)},7:function(j){e.pi(j.name,j.value)},10:function(j){e.doctype(j.value)},4:function(j){e.cdata(j.value)},11:function(j){if((j=j.firstChild)){do{f(j)}while(j=j.next)}}};e.reset();function f(k){var t=g[k.type],j,o,s,r,p,u,n,m,q;if(!t){j=k.name;o=k.shortEnded;s=k.attributes;if(i&&s&&s.length>1){u=[];u.map={};q=d.getElementRule(k.name);for(n=0,m=q.attributesOrder.length;n<m;n++){r=q.attributesOrder[n];if(r in s.map){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}for(n=0,m=s.length;n<m;n++){r=s[n].name;if(!(r in u.map)){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}s=u}e.start(k.name,s,o);if(!o){if((k=k.firstChild)){do{f(k)}while(k=k.next)}e.end(j)}}else{t(k)}}if(h.type==1&&!c.inner){f(h)}else{g[11](h)}return e.getContent()}}})(tinymce);(function(h){var f=h.each,e=h.is,d=h.isWebKit,b=h.isIE,c=h.html.Entities,a=/^([a-z0-9],?)+$/i,g=h.html.Schema.blockElementsMap,i=/^[ \t\r\n]*$/;h.create("tinymce.dom.DOMUtils",{doc:null,root:null,files:null,pixelStyles:/^(top|left|bottom|right|width|height|borderWidth)$/,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"},DOMUtils:function(o,m){var l=this,j,k;l.doc=o;l.win=window;l.files={};l.cssFlicker=false;l.counter=0;l.stdMode=!h.isIE||o.documentMode>=8;l.boxModel=!h.isIE||o.compatMode=="CSS1Compat"||l.stdMode;l.hasOuterHTML="outerHTML" in o.createElement("a");l.settings=m=h.extend({keep_values:false,hex_colors:1},m);l.schema=m.schema;l.styles=new h.html.Styles({url_converter:m.url_converter,url_converter_scope:m.url_converter_scope},m.schema);if(h.isIE6){try{o.execCommand("BackgroundImageCache",false,true)}catch(n){l.cssFlicker=true}}if(b&&m.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(p){o.createElement(p)});for(k in m.schema.getCustomElements()){o.createElement(k)}}h.addUnload(l.destroy,l)},getRoot:function(){var j=this,k=j.settings;return(k&&j.get(k.root_element))||j.doc.body},getViewPort:function(k){var l,j;k=!k?this.win:k;l=k.document;j=this.boxModel?l.documentElement:l.body;return{x:k.pageXOffset||j.scrollLeft,y:k.pageYOffset||j.scrollTop,w:k.innerWidth||j.clientWidth,h:k.innerHeight||j.clientHeight}},getRect:function(m){var l,j=this,k;m=j.get(m);l=j.getPos(m);k=j.getSize(m);return{x:l.x,y:l.y,w:k.w,h:k.h}},getSize:function(m){var k=this,j,l;m=k.get(m);j=k.getStyle(m,"width");l=k.getStyle(m,"height");if(j.indexOf("px")===-1){j=0}if(l.indexOf("px")===-1){l=0}return{w:parseInt(j)||m.offsetWidth||m.clientWidth,h:parseInt(l)||m.offsetHeight||m.clientHeight}},getParent:function(l,k,j){return this.getParents(l,k,j,false)},getParents:function(u,p,l,s){var k=this,j,m=k.settings,q=[];u=k.get(u);s=s===undefined;if(m.strict_root){l=l||k.getRoot()}if(e(p,"string")){j=p;if(p==="*"){p=function(o){return o.nodeType==1}}else{p=function(o){return k.is(o,j)}}}while(u){if(u==l||!u.nodeType||u.nodeType===9){break}if(!p||p(u)){if(s){q.push(u)}else{return u}}u=u.parentNode}return s?q:null},get:function(j){var k;if(j&&this.doc&&typeof(j)=="string"){k=j;j=this.doc.getElementById(j);if(j&&j.id!==k){return this.doc.getElementsByName(k)[1]}}return j},getNext:function(k,j){return this._findSib(k,j,"nextSibling")},getPrev:function(k,j){return this._findSib(k,j,"previousSibling")},add:function(m,q,j,l,o){var k=this;return this.run(m,function(s){var r,n;r=e(q,"string")?k.doc.createElement(q):q;k.setAttribs(r,j);if(l){if(l.nodeType){r.appendChild(l)}else{k.setHTML(r,l)}}return !o?s.appendChild(r):r})},create:function(l,j,k){return this.add(this.doc.createElement(l),l,j,k,1)},createHTML:function(r,j,p){var q="",m=this,l;q+="<"+r;for(l in j){if(j.hasOwnProperty(l)){q+=" "+l+'="'+m.encode(j[l])+'"'}}if(typeof(p)!="undefined"){return q+">"+p+"</"+r+">"}return q+" />"},remove:function(j,k){return this.run(j,function(m){var n,l=m.parentNode;if(!l){return null}if(k){while(n=m.firstChild){if(!h.isIE||n.nodeType!==3||n.nodeValue){l.insertBefore(n,m)}else{m.removeChild(n)}}}return l.removeChild(m)})},setStyle:function(m,j,k){var l=this;return l.run(m,function(p){var o,n;o=p.style;j=j.replace(/-(\D)/g,function(r,q){return q.toUpperCase()});if(l.pixelStyles.test(j)&&(h.is(k,"number")||/^[\-0-9\.]+$/.test(k))){k+="px"}switch(j){case"opacity":if(b){o.filter=k===""?"":"alpha(opacity="+(k*100)+")";if(!m.currentStyle||!m.currentStyle.hasLayout){o.display="inline-block"}}o[j]=o["-moz-opacity"]=o["-khtml-opacity"]=k||"";break;case"float":b?o.styleFloat=k:o.cssFloat=k;break;default:o[j]=k||""}if(l.settings.update_styles){l.setAttrib(p,"data-mce-style")}})},getStyle:function(m,j,l){m=this.get(m);if(!m){return}if(this.doc.defaultView&&l){j=j.replace(/[A-Z]/g,function(n){return"-"+n});try{return this.doc.defaultView.getComputedStyle(m,null).getPropertyValue(j)}catch(k){return null}}j=j.replace(/-(\D)/g,function(o,n){return n.toUpperCase()});if(j=="float"){j=b?"styleFloat":"cssFloat"}if(m.currentStyle&&l){return m.currentStyle[j]}return m.style?m.style[j]:undefined},setStyles:function(m,n){var k=this,l=k.settings,j;j=l.update_styles;l.update_styles=0;f(n,function(o,p){k.setStyle(m,p,o)});l.update_styles=j;if(l.update_styles){k.setAttrib(m,l.cssText)}},removeAllAttribs:function(j){return this.run(j,function(m){var l,k=m.attributes;for(l=k.length-1;l>=0;l--){m.removeAttributeNode(k.item(l))}})},setAttrib:function(l,m,j){var k=this;if(!l||!m){return}if(k.settings.strict){m=m.toLowerCase()}return this.run(l,function(o){var n=k.settings;if(j!==null){switch(m){case"style":if(!e(j,"string")){f(j,function(p,q){k.setStyle(o,q,p)});return}if(n.keep_values){if(j&&!k._isRes(j)){o.setAttribute("data-mce-style",j,2)}else{o.removeAttribute("data-mce-style",2)}}o.style.cssText=j;break;case"class":o.className=j||"";break;case"src":case"href":if(n.keep_values){if(n.url_converter){j=n.url_converter.call(n.url_converter_scope||k,j,m,o)}k.setAttrib(o,"data-mce-"+m,j,2)}break;case"shape":o.setAttribute("data-mce-style",j);break}}if(e(j)&&j!==null&&j.length!==0){o.setAttribute(m,""+j,2)}else{o.removeAttribute(m,2)}})},setAttribs:function(k,l){var j=this;return this.run(k,function(m){f(l,function(o,p){j.setAttrib(m,p,o)})})},getAttrib:function(o,p,l){var j,k=this,m;o=k.get(o);if(!o||o.nodeType!==1){return l===m?false:l}if(!e(l)){l=""}if(/^(src|href|style|coords|shape)$/.test(p)){j=o.getAttribute("data-mce-"+p);if(j){return j}}if(b&&k.props[p]){j=o[k.props[p]];j=j&&j.nodeValue?j.nodeValue:j}if(!j){j=o.getAttribute(p,2)}if(/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(p)){if(o[k.props[p]]===true&&j===""){return p}return j?p:""}if(o.nodeName==="FORM"&&o.getAttributeNode(p)){return o.getAttributeNode(p).nodeValue}if(p==="style"){j=j||o.style.cssText;if(j){j=k.serializeStyle(k.parseStyle(j),o.nodeName);if(k.settings.keep_values&&!k._isRes(j)){o.setAttribute("data-mce-style",j)}}}if(d&&p==="class"&&j){j=j.replace(/(apple|webkit)\-[a-z\-]+/gi,"")}if(b){switch(p){case"rowspan":case"colspan":if(j===1){j=""}break;case"size":if(j==="+0"||j===20||j===0){j=""}break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":if(j===0){j=""}break;case"hspace":if(j===-1){j=""}break;case"maxlength":case"tabindex":if(j===32768||j===2147483647||j==="32768"){j=""}break;case"multiple":case"compact":case"noshade":case"nowrap":if(j===65535){return p}return l;case"shape":j=j.toLowerCase();break;default:if(p.indexOf("on")===0&&j){j=h._replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/,"$1",""+j)}}}return(j!==m&&j!==null&&j!=="")?""+j:l},getPos:function(s,m){var k=this,j=0,q=0,o,p=k.doc,l;s=k.get(s);m=m||p.body;if(s){if(s.getBoundingClientRect){s=s.getBoundingClientRect();o=k.boxModel?p.documentElement:p.body;j=s.left+(p.documentElement.scrollLeft||p.body.scrollLeft)-o.clientTop;q=s.top+(p.documentElement.scrollTop||p.body.scrollTop)-o.clientLeft;return{x:j,y:q}}l=s;while(l&&l!=m&&l.nodeType){j+=l.offsetLeft||0;q+=l.offsetTop||0;l=l.offsetParent}l=s.parentNode;while(l&&l!=m&&l.nodeType){j-=l.scrollLeft||0;q-=l.scrollTop||0;l=l.parentNode}}return{x:j,y:q}},parseStyle:function(j){return this.styles.parse(j)},serializeStyle:function(k,j){return this.styles.serialize(k,j)},loadCSS:function(j){var l=this,m=l.doc,k;if(!j){j=""}k=l.select("head")[0];f(j.split(","),function(n){var o;if(l.files[n]){return}l.files[n]=true;o=l.create("link",{rel:"stylesheet",href:h._addVer(n)});if(b&&m.documentMode&&m.recalc){o.onload=function(){if(m.recalc){m.recalc()}o.onload=null}}k.appendChild(o)})},addClass:function(j,k){return this.run(j,function(l){var m;if(!k){return 0}if(this.hasClass(l,k)){return l.className}m=this.removeClass(l,k);return l.className=(m!=""?(m+" "):"")+k})},removeClass:function(l,m){var j=this,k;return j.run(l,function(o){var n;if(j.hasClass(o,m)){if(!k){k=new RegExp("(^|\\s+)"+m+"(\\s+|$)","g")}n=o.className.replace(k," ");n=h.trim(n!=" "?n:"");o.className=n;if(!n){o.removeAttribute("class");o.removeAttribute("className")}return n}return o.className})},hasClass:function(k,j){k=this.get(k);if(!k||!j){return false}return(" "+k.className+" ").indexOf(" "+j+" ")!==-1},show:function(j){return this.setStyle(j,"display","block")},hide:function(j){return this.setStyle(j,"display","none")},isHidden:function(j){j=this.get(j);return !j||j.style.display=="none"||this.getStyle(j,"display")=="none"},uniqueId:function(j){return(!j?"mce_":j)+(this.counter++)},setHTML:function(l,k){var j=this;return j.run(l,function(n){if(b){while(n.firstChild){n.removeChild(n.firstChild)}try{n.innerHTML="<br />"+k;n.removeChild(n.firstChild)}catch(m){n=j.create("div");n.innerHTML="<br />"+k;f(n.childNodes,function(p,o){if(o){n.appendChild(p)}})}}else{n.innerHTML=k}return k})},getOuterHTML:function(l){var k,j=this;l=j.get(l);if(!l){return null}if(l.nodeType===1&&j.hasOuterHTML){return l.outerHTML}k=(l.ownerDocument||j.doc).createElement("body");k.appendChild(l.cloneNode(true));return k.innerHTML},setOuterHTML:function(m,k,n){var j=this;function l(p,o,r){var s,q;q=r.createElement("body");q.innerHTML=o;s=q.lastChild;while(s){j.insertAfter(s.cloneNode(true),p);s=s.previousSibling}j.remove(p)}return this.run(m,function(p){p=j.get(p);if(p.nodeType==1){n=n||p.ownerDocument||j.doc;if(b){try{if(b&&p.nodeType==1){p.outerHTML=k}else{l(p,k,n)}}catch(o){l(p,k,n)}}else{l(p,k,n)}}})},decode:c.decode,encode:c.encodeAllRaw,insertAfter:function(j,k){k=this.get(k);return this.run(j,function(m){var l,n;l=k.parentNode;n=k.nextSibling;if(n){l.insertBefore(m,n)}else{l.appendChild(m)}return m})},isBlock:function(k){var j=k.nodeType;if(j){return !!(j===1&&g[k.nodeName])}return !!g[k]},replace:function(p,m,j){var l=this;if(e(m,"array")){p=p.cloneNode(true)}return l.run(m,function(k){if(j){f(h.grep(k.childNodes),function(n){p.appendChild(n)})}return k.parentNode.replaceChild(p,k)})},rename:function(m,j){var l=this,k;if(m.nodeName!=j.toUpperCase()){k=l.create(j);f(l.getAttribs(m),function(n){l.setAttrib(k,n.nodeName,l.getAttrib(m,n.nodeName))});l.replace(k,m,1)}return k||m},findCommonAncestor:function(l,j){var m=l,k;while(m){k=j;while(k&&m!=k){k=k.parentNode}if(m==k){break}m=m.parentNode}if(!m&&l.ownerDocument){return l.ownerDocument.documentElement}return m},toHex:function(j){var l=/^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(j);function k(m){m=parseInt(m).toString(16);return m.length>1?m:"0"+m}if(l){j="#"+k(l[1])+k(l[2])+k(l[3]);return j}return j},getClasses:function(){var n=this,j=[],m,o={},p=n.settings.class_filter,l;if(n.classes){return n.classes}function q(r){f(r.imports,function(s){q(s)});f(r.cssRules||r.rules,function(s){switch(s.type||1){case 1:if(s.selectorText){f(s.selectorText.split(","),function(t){t=t.replace(/^\s*|\s*$|^\s\./g,"");if(/\.mce/.test(t)||!/\.[\w\-]+$/.test(t)){return}l=t;t=h._replace(/.*\.([a-z0-9_\-]+).*/i,"$1",t);if(p&&!(t=p(t,l))){return}if(!o[t]){j.push({"class":t});o[t]=1}})}break;case 3:q(s.styleSheet);break}})}try{f(n.doc.styleSheets,q)}catch(k){}if(j.length>0){n.classes=j}return j},run:function(m,l,k){var j=this,n;if(j.doc&&typeof(m)==="string"){m=j.get(m)}if(!m){return false}k=k||this;if(!m.nodeType&&(m.length||m.length===0)){n=[];f(m,function(p,o){if(p){if(typeof(p)=="string"){p=j.doc.getElementById(p)}n.push(l.call(k,p,o))}});return n}return l.call(k,m)},getAttribs:function(k){var j;k=this.get(k);if(!k){return[]}if(b){j=[];if(k.nodeName=="OBJECT"){return k.attributes}if(k.nodeName==="OPTION"&&this.getAttrib(k,"selected")){j.push({specified:1,nodeName:"selected"})}k.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi,"").replace(/[\w:\-]+/gi,function(l){j.push({specified:1,nodeName:l})});return j}return k.attributes},isEmpty:function(m,k){var r=this,o,n,q,j,l,p;m=m.firstChild;if(m){j=new h.dom.TreeWalker(m);k=k||r.schema?r.schema.getNonEmptyElements():null;do{q=m.nodeType;if(q===1){if(m.getAttribute("data-mce-bogus")){continue}l=m.nodeName.toLowerCase();if(k&&k[l]){p=m.parentNode;if(l==="br"&&r.isBlock(p)&&p.firstChild===m&&p.lastChild===m){continue}return false}n=r.getAttribs(m);o=m.attributes.length;while(o--){l=m.attributes[o].nodeName;if(l==="name"||l==="data-mce-bookmark"){return false}}}if((q===3&&!i.test(m.nodeValue))){return false}}while(m=j.next())}return true},destroy:function(k){var j=this;if(j.events){j.events.destroy()}j.win=j.doc=j.root=j.events=null;if(!k){h.removeUnload(j.destroy)}},createRng:function(){var j=this.doc;return j.createRange?j.createRange():new h.dom.Range(this)},nodeIndex:function(n,o){var j=0,l,m,k;if(n){for(l=n.nodeType,n=n.previousSibling,m=n;n;n=n.previousSibling){k=n.nodeType;if(o&&k==3){if(k==l||!n.nodeValue.length){continue}}j++;l=k}}return j},split:function(n,m,q){var s=this,j=s.createRng(),o,l,p;function k(v){var t,r=v.childNodes,u=v.nodeType;if(u==1&&v.getAttribute("data-mce-type")=="bookmark"){return}for(t=r.length-1;t>=0;t--){k(r[t])}if(u!=9){if(u==3&&v.nodeValue.length>0){if(!s.isBlock(v.parentNode)||h.trim(v.nodeValue).length>0){return}}else{if(u==1){r=v.childNodes;if(r.length==1&&r[0]&&r[0].nodeType==1&&r[0].getAttribute("data-mce-type")=="bookmark"){v.parentNode.insertBefore(r[0],v)}if(r.length||/^(br|hr|input|img)$/i.test(v.nodeName)){return}}}s.remove(v)}return v}if(n&&m){j.setStart(n.parentNode,s.nodeIndex(n));j.setEnd(m.parentNode,s.nodeIndex(m));o=j.extractContents();j=s.createRng();j.setStart(m.parentNode,s.nodeIndex(m)+1);j.setEnd(n.parentNode,s.nodeIndex(n)+1);l=j.extractContents();p=n.parentNode;p.insertBefore(k(o),n);if(q){p.replaceChild(q,m)}else{p.insertBefore(m,n)}p.insertBefore(k(l),n);s.remove(n);return q||m}},bind:function(n,j,m,l){var k=this;if(!k.events){k.events=new h.dom.EventUtils()}return k.events.add(n,j,m,l||this)},unbind:function(m,j,l){var k=this;if(!k.events){k.events=new h.dom.EventUtils()}return k.events.remove(m,j,l)},_findSib:function(m,j,k){var l=this,n=j;if(m){if(e(n,"string")){n=function(o){return l.is(o,j)}}for(m=m[k];m;m=m[k]){if(n(m)){return m}}}return null},_isRes:function(j){return/^(top|left|bottom|right|width|height)/i.test(j)||/;\s*(top|left|bottom|right|width|height)/i.test(j)}});h.DOM=new h.dom.DOMUtils(document,{process_html:0})})(tinymce);(function(a){function b(c){var N=this,e=c.doc,S=0,E=1,j=2,D=true,R=false,U="startOffset",h="startContainer",P="endContainer",z="endOffset",k=tinymce.extend,n=c.nodeIndex;k(N,{startContainer:e,startOffset:0,endContainer:e,endOffset:0,collapsed:D,commonAncestorContainer:e,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:q,setEnd:s,setStartBefore:g,setStartAfter:I,setEndBefore:J,setEndAfter:u,collapse:A,selectNode:x,selectNodeContents:F,compareBoundaryPoints:v,deleteContents:p,extractContents:H,cloneContents:d,insertNode:C,surroundContents:M,cloneRange:K});function q(V,t){B(D,V,t)}function s(V,t){B(R,V,t)}function g(t){q(t.parentNode,n(t))}function I(t){q(t.parentNode,n(t)+1)}function J(t){s(t.parentNode,n(t))}function u(t){s(t.parentNode,n(t)+1)}function A(t){if(t){N[P]=N[h];N[z]=N[U]}else{N[h]=N[P];N[U]=N[z]}N.collapsed=D}function x(t){g(t);u(t)}function F(t){q(t,0);s(t,t.nodeType===1?t.childNodes.length:t.nodeValue.length)}function v(Y,t){var ab=N[h],W=N[U],aa=N[P],V=N[z],Z=t.startContainer,ad=t.startOffset,X=t.endContainer,ac=t.endOffset;if(Y===0){return G(ab,W,Z,ad)}if(Y===1){return G(aa,V,Z,ad)}if(Y===2){return G(aa,V,X,ac)}if(Y===3){return G(ab,W,X,ac)}}function p(){m(j)}function H(){return m(S)}function d(){return m(E)}function C(Y){var V=this[h],t=this[U],X,W;if((V.nodeType===3||V.nodeType===4)&&V.nodeValue){if(!t){V.parentNode.insertBefore(Y,V)}else{if(t>=V.nodeValue.length){c.insertAfter(Y,V)}else{X=V.splitText(t);V.parentNode.insertBefore(Y,X)}}}else{if(V.childNodes.length>0){W=V.childNodes[t]}if(W){V.insertBefore(Y,W)}else{V.appendChild(Y)}}}function M(V){var t=N.extractContents();N.insertNode(V);V.appendChild(t);N.selectNode(V)}function K(){return k(new b(c),{startContainer:N[h],startOffset:N[U],endContainer:N[P],endOffset:N[z],collapsed:N.collapsed,commonAncestorContainer:N.commonAncestorContainer})}function O(t,V){var W;if(t.nodeType==3){return t}if(V<0){return t}W=t.firstChild;while(W&&V>0){--V;W=W.nextSibling}if(W){return W}return t}function l(){return(N[h]==N[P]&&N[U]==N[z])}function G(X,Z,V,Y){var aa,W,t,ab,ad,ac;if(X==V){if(Z==Y){return 0}if(Z<Y){return -1}return 1}aa=V;while(aa&&aa.parentNode!=X){aa=aa.parentNode}if(aa){W=0;t=X.firstChild;while(t!=aa&&W<Z){W++;t=t.nextSibling}if(Z<=W){return -1}return 1}aa=X;while(aa&&aa.parentNode!=V){aa=aa.parentNode}if(aa){W=0;t=V.firstChild;while(t!=aa&&W<Y){W++;t=t.nextSibling}if(W<Y){return -1}return 1}ab=c.findCommonAncestor(X,V);ad=X;while(ad&&ad.parentNode!=ab){ad=ad.parentNode}if(!ad){ad=ab}ac=V;while(ac&&ac.parentNode!=ab){ac=ac.parentNode}if(!ac){ac=ab}if(ad==ac){return 0}t=ab.firstChild;while(t){if(t==ad){return -1}if(t==ac){return 1}t=t.nextSibling}}function B(V,Y,X){var t,W;if(V){N[h]=Y;N[U]=X}else{N[P]=Y;N[z]=X}t=N[P];while(t.parentNode){t=t.parentNode}W=N[h];while(W.parentNode){W=W.parentNode}if(W==t){if(G(N[h],N[U],N[P],N[z])>0){N.collapse(V)}}else{N.collapse(V)}N.collapsed=l();N.commonAncestorContainer=c.findCommonAncestor(N[h],N[P])}function m(ab){var aa,X=0,ad=0,V,Z,W,Y,t,ac;if(N[h]==N[P]){return f(ab)}for(aa=N[P],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[h]){return r(aa,ab)}++X}for(aa=N[h],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[P]){return T(aa,ab)}++ad}Z=ad-X;W=N[h];while(Z>0){W=W.parentNode;Z--}Y=N[P];while(Z<0){Y=Y.parentNode;Z++}for(t=W.parentNode,ac=Y.parentNode;t!=ac;t=t.parentNode,ac=ac.parentNode){W=t;Y=ac}return o(W,Y,ab)}function f(Z){var ab,Y,X,aa,t,W,V;if(Z!=j){ab=e.createDocumentFragment()}if(N[U]==N[z]){return ab}if(N[h].nodeType==3){Y=N[h].nodeValue;X=Y.substring(N[U],N[z]);if(Z!=E){N[h].deleteData(N[U],N[z]-N[U]);N.collapse(D)}if(Z==j){return}ab.appendChild(e.createTextNode(X));return ab}aa=O(N[h],N[U]);t=N[z]-N[U];while(t>0){W=aa.nextSibling;V=y(aa,Z);if(ab){ab.appendChild(V)}--t;aa=W}if(Z!=E){N.collapse(D)}return ab}function r(ab,Y){var aa,Z,V,t,X,W;if(Y!=j){aa=e.createDocumentFragment()}Z=i(ab,Y);if(aa){aa.appendChild(Z)}V=n(ab);t=V-N[U];if(t<=0){if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}Z=ab.previousSibling;while(t>0){X=Z.previousSibling;W=y(Z,Y);if(aa){aa.insertBefore(W,aa.firstChild)}--t;Z=X}if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}function T(Z,Y){var ab,V,aa,t,X,W;if(Y!=j){ab=e.createDocumentFragment()}aa=Q(Z,Y);if(ab){ab.appendChild(aa)}V=n(Z);++V;t=N[z]-V;aa=Z.nextSibling;while(t>0){X=aa.nextSibling;W=y(aa,Y);if(ab){ab.appendChild(W)}--t;aa=X}if(Y!=E){N.setStartAfter(Z);N.collapse(D)}return ab}function o(Z,t,ac){var W,ae,Y,aa,ab,V,ad,X;if(ac!=j){ae=e.createDocumentFragment()}W=Q(Z,ac);if(ae){ae.appendChild(W)}Y=Z.parentNode;aa=n(Z);ab=n(t);++aa;V=ab-aa;ad=Z.nextSibling;while(V>0){X=ad.nextSibling;W=y(ad,ac);if(ae){ae.appendChild(W)}ad=X;--V}W=i(t,ac);if(ae){ae.appendChild(W)}if(ac!=E){N.setStartAfter(Z);N.collapse(D)}return ae}function i(aa,ab){var W=O(N[P],N[z]-1),ac,Z,Y,t,V,X=W!=N[P];if(W==aa){return L(W,X,R,ab)}ac=W.parentNode;Z=L(ac,R,R,ab);while(ac){while(W){Y=W.previousSibling;t=L(W,X,R,ab);if(ab!=j){Z.insertBefore(t,Z.firstChild)}X=D;W=Y}if(ac==aa){return Z}W=ac.previousSibling;ac=ac.parentNode;V=L(ac,R,R,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function Q(aa,ab){var X=O(N[h],N[U]),Y=X!=N[h],ac,Z,W,t,V;if(X==aa){return L(X,Y,D,ab)}ac=X.parentNode;Z=L(ac,R,D,ab);while(ac){while(X){W=X.nextSibling;t=L(X,Y,D,ab);if(ab!=j){Z.appendChild(t)}Y=D;X=W}if(ac==aa){return Z}X=ac.nextSibling;ac=ac.parentNode;V=L(ac,R,D,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function L(t,Y,ab,ac){var X,W,Z,V,aa;if(Y){return y(t,ac)}if(t.nodeType==3){X=t.nodeValue;if(ab){V=N[U];W=X.substring(V);Z=X.substring(0,V)}else{V=N[z];W=X.substring(0,V);Z=X.substring(V)}if(ac!=E){t.nodeValue=Z}if(ac==j){return}aa=t.cloneNode(R);aa.nodeValue=W;return aa}if(ac==j){return}return t.cloneNode(R)}function y(V,t){if(t!=j){return t==E?V.cloneNode(D):V}V.parentNode.removeChild(V)}}a.Range=b})(tinymce.dom);(function(){function a(d){var b=this,h=d.dom,c=true,f=false;function e(i,j){var k,t=0,q,n,m,l,o,r,p=-1,s;k=i.duplicate();k.collapse(j);s=k.parentElement();if(s.ownerDocument!==d.dom.doc){return}while(s.contentEditable==="false"){s=s.parentNode}if(!s.hasChildNodes()){return{node:s,inside:1}}m=s.children;q=m.length-1;while(t<=q){r=Math.floor((t+q)/2);l=m[r];k.moveToElementText(l);p=k.compareEndPoints(j?"StartToStart":"EndToEnd",i);if(p>0){q=r-1}else{if(p<0){t=r+1}else{return{node:l}}}}if(p<0){if(!l){k.moveToElementText(s);k.collapse(true);l=s;n=true}else{k.collapse(false)}k.setEndPoint(j?"EndToStart":"EndToEnd",i);if(k.compareEndPoints(j?"StartToStart":"StartToEnd",i)>0){k=i.duplicate();k.collapse(j);o=-1;while(s==k.parentElement()){if(k.move("character",-1)==0){break}o++}}o=o||k.text.replace("\r\n"," ").length}else{k.collapse(true);k.setEndPoint(j?"StartToStart":"StartToEnd",i);o=k.text.replace("\r\n"," ").length}return{node:l,position:p,offset:o,inside:n}}function g(){var i=d.getRng(),r=h.createRng(),l,k,p,q,m,j;l=i.item?i.item(0):i.parentElement();if(l.ownerDocument!=h.doc){return r}k=d.isCollapsed();if(i.item){r.setStart(l.parentNode,h.nodeIndex(l));r.setEnd(r.startContainer,r.startOffset+1);return r}function o(A){var u=e(i,A),s,y,z=0,x,v,t;s=u.node;y=u.offset;if(u.inside&&!s.hasChildNodes()){r[A?"setStart":"setEnd"](s,0);return}if(y===v){r[A?"setStartBefore":"setEndAfter"](s);return}if(u.position<0){x=u.inside?s.firstChild:s.nextSibling;if(!x){r[A?"setStartAfter":"setEndAfter"](s);return}if(!y){if(x.nodeType==3){r[A?"setStart":"setEnd"](x,0)}else{r[A?"setStartBefore":"setEndBefore"](x)}return}while(x){t=x.nodeValue;z+=t.length;if(z>=y){s=x;z-=y;z=t.length-z;break}x=x.nextSibling}}else{x=s.previousSibling;if(!x){return r[A?"setStartBefore":"setEndBefore"](s)}if(!y){if(s.nodeType==3){r[A?"setStart":"setEnd"](x,s.nodeValue.length)}else{r[A?"setStartAfter":"setEndAfter"](x)}return}while(x){z+=x.nodeValue.length;if(z>=y){s=x;z-=y;break}x=x.previousSibling}}r[A?"setStart":"setEnd"](s,z)}try{o(true);if(!k){o()}}catch(n){if(n.number==-2147024809){m=b.getBookmark(2);p=i.duplicate();p.collapse(true);l=p.parentElement();if(!k){p=i.duplicate();p.collapse(false);q=p.parentElement();q.innerHTML=q.innerHTML}l.innerHTML=l.innerHTML;b.moveToBookmark(m);i=d.getRng();o(true);if(!k){o()}}else{throw n}}return r}this.getBookmark=function(m){var j=d.getRng(),o,i,l={};function n(u){var u,t,p,s,r,q=[];t=u.parentNode;p=h.getRoot().parentNode;while(t!=p&&t.nodeType!==9){s=t.children;r=s.length;while(r--){if(u===s[r]){q.push(r);break}}u=t;t=t.parentNode}return q}function k(q){var p;p=e(j,q);if(p){return{position:p.position,offset:p.offset,indexes:n(p.node),inside:p.inside}}}if(m===2){if(!j.item){l.start=k(true);if(!d.isCollapsed()){l.end=k()}}else{l.start={ctrl:true,indexes:n(j.item(0))}}}return l};this.moveToBookmark=function(k){var j,i=h.doc.body;function m(o){var r,q,n,p;r=h.getRoot();for(q=o.length-1;q>=0;q--){p=r.children;n=o[q];if(n<=p.length-1){r=p[n]}}return r}function l(r){var n=k[r?"start":"end"],q,p,o;if(n){q=n.position>0;p=i.createTextRange();p.moveToElementText(m(n.indexes));offset=n.offset;if(offset!==o){p.collapse(n.inside||q);p.moveStart("character",q?-offset:offset)}else{p.collapse(r)}j.setEndPoint(r?"StartToStart":"EndToStart",p);if(r){j.collapse(true)}}}if(k.start){if(k.start.ctrl){j=i.createControlRange();j.addElement(m(k.start.indexes));j.select()}else{j=i.createTextRange();l(true);l();j.select()}}};this.addRange=function(i){var n,l,k,p,s,q,r=d.dom.doc,m=r.body;function j(z){var u,y,t,x,v;t=h.create("a");u=z?k:s;y=z?p:q;x=n.duplicate();if(u==r||u==r.documentElement){u=m;y=0}if(u.nodeType==3){u.parentNode.insertBefore(t,u);x.moveToElementText(t);x.moveStart("character",y);h.remove(t);n.setEndPoint(z?"StartToStart":"EndToEnd",x)}else{v=u.childNodes;if(v.length){if(y>=v.length){h.insertAfter(t,v[v.length-1])}else{u.insertBefore(t,v[y])}x.moveToElementText(t)}else{t=r.createTextNode("\uFEFF");u.appendChild(t);x.moveToElementText(t.parentNode);x.collapse(c)}n.setEndPoint(z?"StartToStart":"EndToEnd",x);h.remove(t)}}k=i.startContainer;p=i.startOffset;s=i.endContainer;q=i.endOffset;n=m.createTextRange();if(k==s&&k.nodeType==1&&p==q-1){if(p==q-1){try{l=m.createControlRange();l.addElement(k.childNodes[p]);l.select();return}catch(o){}}}j(true);j();n.select()};this.getRangeAt=g}tinymce.dom.TridentSelection=a})();(function(d){var f=d.each,c=d.DOM,b=d.isIE,e=d.isWebKit,a;d.create("tinymce.dom.EventUtils",{EventUtils:function(){this.inits=[];this.events=[]},add:function(m,p,l,j){var g,h=this,i=h.events,k;if(p instanceof Array){k=[];f(p,function(o){k.push(h.add(m,o,l,j))});return k}if(m&&m.hasOwnProperty&&m instanceof Array){k=[];f(m,function(n){n=c.get(n);k.push(h.add(n,p,l,j))});return k}m=c.get(m);if(!m){return}g=function(n){if(h.disabled){return}n=n||window.event;if(n&&b){if(!n.target){n.target=n.srcElement}d.extend(n,h._stoppers)}if(!j){return l(n)}return l.call(j,n)};if(p=="unload"){d.unloads.unshift({func:g});return g}if(p=="init"){if(h.domLoaded){g()}else{h.inits.push(g)}return g}i.push({obj:m,name:p,func:l,cfunc:g,scope:j});h._add(m,p,g);return l},remove:function(l,m,k){var h=this,g=h.events,i=false,j;if(l&&l.hasOwnProperty&&l instanceof Array){j=[];f(l,function(n){n=c.get(n);j.push(h.remove(n,m,k))});return j}l=c.get(l);f(g,function(o,n){if(o.obj==l&&o.name==m&&(!k||(o.func==k||o.cfunc==k))){g.splice(n,1);h._remove(l,m,o.cfunc);i=true;return false}});return i},clear:function(l){var j=this,g=j.events,h,k;if(l){l=c.get(l);for(h=g.length-1;h>=0;h--){k=g[h];if(k.obj===l){j._remove(k.obj,k.name,k.cfunc);k.obj=k.cfunc=null;g.splice(h,1)}}}},cancel:function(g){if(!g){return false}this.stop(g);return this.prevent(g)},stop:function(g){if(g.stopPropagation){g.stopPropagation()}else{g.cancelBubble=true}return false},prevent:function(g){if(g.preventDefault){g.preventDefault()}else{g.returnValue=false}return false},destroy:function(){var g=this;f(g.events,function(j,h){g._remove(j.obj,j.name,j.cfunc);j.obj=j.cfunc=null});g.events=[];g=null},_add:function(h,i,g){if(h.attachEvent){h.attachEvent("on"+i,g)}else{if(h.addEventListener){h.addEventListener(i,g,false)}else{h["on"+i]=g}}},_remove:function(i,j,h){if(i){try{if(i.detachEvent){i.detachEvent("on"+j,h)}else{if(i.removeEventListener){i.removeEventListener(j,h,false)}else{i["on"+j]=null}}}catch(g){}}},_pageInit:function(h){var g=this;if(g.domLoaded){return}g.domLoaded=true;f(g.inits,function(i){i()});g.inits=[]},_wait:function(i){var g=this,h=i.document;if(i.tinyMCE_GZ&&tinyMCE_GZ.loaded){g.domLoaded=1;return}if(h.attachEvent){h.attachEvent("onreadystatechange",function(){if(h.readyState==="complete"){h.detachEvent("onreadystatechange",arguments.callee);g._pageInit(i)}});if(h.documentElement.doScroll&&i==i.top){(function(){if(g.domLoaded){return}try{h.documentElement.doScroll("left")}catch(j){setTimeout(arguments.callee,0);return}g._pageInit(i)})()}}else{if(h.addEventListener){g._add(i,"DOMContentLoaded",function(){g._pageInit(i)})}}g._add(i,"load",function(){g._pageInit(i)})},_stoppers:{preventDefault:function(){this.returnValue=false},stopPropagation:function(){this.cancelBubble=true}}});a=d.dom.Event=new d.dom.EventUtils();a._wait(window);d.addUnload(function(){a.destroy()})})(tinymce);(function(a){a.dom.Element=function(f,d){var b=this,e,c;b.settings=d=d||{};b.id=f;b.dom=e=d.dom||a.DOM;if(!a.isIE){c=e.get(b.id)}a.each(("getPos,getRect,getParent,add,setStyle,getStyle,setStyles,setAttrib,setAttribs,getAttrib,addClass,removeClass,hasClass,getOuterHTML,setOuterHTML,remove,show,hide,isHidden,setHTML,get").split(/,/),function(g){b[g]=function(){var h=[f],j;for(j=0;j<arguments.length;j++){h.push(arguments[j])}h=e[g].apply(e,h);b.update(g);return h}});a.extend(b,{on:function(i,h,g){return a.dom.Event.add(b.id,i,h,g)},getXY:function(){return{x:parseInt(b.getStyle("left")),y:parseInt(b.getStyle("top"))}},getSize:function(){var g=e.get(b.id);return{w:parseInt(b.getStyle("width")||g.clientWidth),h:parseInt(b.getStyle("height")||g.clientHeight)}},moveTo:function(g,h){b.setStyles({left:g,top:h})},moveBy:function(g,i){var h=b.getXY();b.moveTo(h.x+g,h.y+i)},resizeTo:function(g,i){b.setStyles({width:g,height:i})},resizeBy:function(g,j){var i=b.getSize();b.resizeTo(i.w+g,i.h+j)},update:function(h){var g;if(a.isIE6&&d.blocker){h=h||"";if(h.indexOf("get")===0||h.indexOf("has")===0||h.indexOf("is")===0){return}if(h=="remove"){e.remove(b.blocker);return}if(!b.blocker){b.blocker=e.uniqueId();g=e.add(d.container||e.getRoot(),"iframe",{id:b.blocker,style:"position:absolute;",frameBorder:0,src:'javascript:""'});e.setStyle(g,"opacity",0)}else{g=e.get(b.blocker)}e.setStyles(g,{left:b.getStyle("left",1),top:b.getStyle("top",1),width:b.getStyle("width",1),height:b.getStyle("height",1),display:b.getStyle("display",1),zIndex:parseInt(b.getStyle("zIndex",1)||0)-1})}}})}})(tinymce);(function(c){function e(f){return f.replace(/[\n\r]+/g,"")}var b=c.is,a=c.isIE,d=c.each;c.create("tinymce.dom.Selection",{Selection:function(i,h,g){var f=this;f.dom=i;f.win=h;f.serializer=g;d(["onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent"],function(j){f[j]=new c.util.Dispatcher(f)});if(!f.win.getSelection){f.tridentSel=new c.dom.TridentSelection(f)}if(c.isIE&&i.boxModel){this._fixIESelection()}c.addUnload(f.destroy,f)},setCursorLocation:function(h,i){var f=this;var g=f.dom.createRng();g.setStart(h,i);g.setEnd(h,i);f.setRng(g);f.collapse(false)},getContent:function(g){var f=this,h=f.getRng(),l=f.dom.create("body"),j=f.getSel(),i,k,m;g=g||{};i=k="";g.get=true;g.format=g.format||"html";g.forced_root_block="";f.onBeforeGetContent.dispatch(f,g);if(g.format=="text"){return f.isCollapsed()?"":(h.text||(j.toString?j.toString():""))}if(h.cloneContents){m=h.cloneContents();if(m){l.appendChild(m)}}else{if(b(h.item)||b(h.htmlText)){l.innerHTML="<br>"+(h.item?h.item(0).outerHTML:h.htmlText);l.removeChild(l.firstChild)}else{l.innerHTML=h.toString()}}if(/^\s/.test(l.innerHTML)){i=" "}if(/\s+$/.test(l.innerHTML)){k=" "}g.getInner=true;g.content=f.isCollapsed()?"":i+f.serializer.serialize(l,g)+k;f.onGetContent.dispatch(f,g);return g.content},setContent:function(g,i){var n=this,f=n.getRng(),j,k=n.win.document,m,l;i=i||{format:"html"};i.set=true;g=i.content=g;if(!i.no_events){n.onBeforeSetContent.dispatch(n,i)}g=i.content;if(f.insertNode){g+='<span id="__caret">_</span>';if(f.startContainer==k&&f.endContainer==k){k.body.innerHTML=g}else{f.deleteContents();if(k.body.childNodes.length==0){k.body.innerHTML=g}else{if(f.createContextualFragment){f.insertNode(f.createContextualFragment(g))}else{m=k.createDocumentFragment();l=k.createElement("div");m.appendChild(l);l.outerHTML=g;f.insertNode(m)}}}j=n.dom.get("__caret");f=k.createRange();f.setStartBefore(j);f.setEndBefore(j);n.setRng(f);n.dom.remove("__caret");try{n.setRng(f)}catch(h){}}else{if(f.item){k.execCommand("Delete",false,null);f=n.getRng()}if(/^\s+/.test(g)){f.pasteHTML('<span id="__mce_tmp">_</span>'+g);n.dom.remove("__mce_tmp")}else{f.pasteHTML(g)}}if(!i.no_events){n.onSetContent.dispatch(n,i)}},getStart:function(){var g=this.getRng(),h,f,j,i;if(g.duplicate||g.item){if(g.item){return g.item(0)}j=g.duplicate();j.collapse(1);h=j.parentElement();f=i=g.parentElement();while(i=i.parentNode){if(i==h){h=f;break}}return h}else{h=g.startContainer;if(h.nodeType==1&&h.hasChildNodes()){h=h.childNodes[Math.min(h.childNodes.length-1,g.startOffset)]}if(h&&h.nodeType==3){return h.parentNode}return h}},getEnd:function(){var g=this,h=g.getRng(),i,f;if(h.duplicate||h.item){if(h.item){return h.item(0)}h=h.duplicate();h.collapse(0);i=h.parentElement();if(i&&i.nodeName=="BODY"){return i.lastChild||i}return i}else{i=h.endContainer;f=h.endOffset;if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[f>0?f-1:f]}if(i&&i.nodeType==3){return i.parentNode}return i}},getBookmark:function(r,s){var v=this,m=v.dom,g,j,i,n,h,o,p,l="\uFEFF",u;function f(x,y){var t=0;d(m.select(x),function(A,z){if(A==y){t=z}});return t}if(r==2){function k(){var x=v.getRng(true),t=m.getRoot(),y={};function z(C,H){var B=C[H?"startContainer":"endContainer"],G=C[H?"startOffset":"endOffset"],A=[],D,F,E=0;if(B.nodeType==3){if(s){for(D=B.previousSibling;D&&D.nodeType==3;D=D.previousSibling){G+=D.nodeValue.length}}A.push(G)}else{F=B.childNodes;if(G>=F.length&&F.length){E=1;G=Math.max(0,F.length-1)}A.push(v.dom.nodeIndex(F[G],s)+E)}for(;B&&B!=t;B=B.parentNode){A.push(v.dom.nodeIndex(B,s))}return A}y.start=z(x,true);if(!v.isCollapsed()){y.end=z(x)}return y}if(v.tridentSel){return v.tridentSel.getBookmark(r)}return k()}if(r){return{rng:v.getRng()}}g=v.getRng();i=m.uniqueId();n=tinyMCE.activeEditor.selection.isCollapsed();u="overflow:hidden;line-height:0px";if(g.duplicate||g.item){if(!g.item){j=g.duplicate();try{g.collapse();g.pasteHTML('<span data-mce-type="bookmark" id="'+i+'_start" style="'+u+'">'+l+"</span>");if(!n){j.collapse(false);g.moveToElementText(j.parentElement());if(g.compareEndPoints("StartToEnd",j)==0){j.move("character",-1)}j.pasteHTML('<span data-mce-type="bookmark" id="'+i+'_end" style="'+u+'">'+l+"</span>")}}catch(q){return null}}else{o=g.item(0);h=o.nodeName;return{name:h,index:f(h,o)}}}else{o=v.getNode();h=o.nodeName;if(h=="IMG"){return{name:h,index:f(h,o)}}j=g.cloneRange();if(!n){j.collapse(false);j.insertNode(m.create("span",{"data-mce-type":"bookmark",id:i+"_end",style:u},l))}g.collapse(true);g.insertNode(m.create("span",{"data-mce-type":"bookmark",id:i+"_start",style:u},l))}v.moveToBookmark({id:i,keep:1});return{id:i}},moveToBookmark:function(n){var r=this,l=r.dom,i,h,f,q,j,s,o,p;if(n){if(n.start){f=l.createRng();q=l.getRoot();function g(z){var t=n[z?"start":"end"],v,x,y,u;if(t){y=t[0];for(x=q,v=t.length-1;v>=1;v--){u=x.childNodes;if(t[v]>u.length-1){return}x=u[t[v]]}if(x.nodeType===3){y=Math.min(t[0],x.nodeValue.length)}if(x.nodeType===1){y=Math.min(t[0],x.childNodes.length)}if(z){f.setStart(x,y)}else{f.setEnd(x,y)}}return true}if(r.tridentSel){return r.tridentSel.moveToBookmark(n)}if(g(true)&&g()){r.setRng(f)}}else{if(n.id){function k(A){var u=l.get(n.id+"_"+A),z,t,x,y,v=n.keep;if(u){z=u.parentNode;if(A=="start"){if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}j=s=z;o=p=t}else{if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}s=z;p=t}if(!v){y=u.previousSibling;x=u.nextSibling;d(c.grep(u.childNodes),function(B){if(B.nodeType==3){B.nodeValue=B.nodeValue.replace(/\uFEFF/g,"")}});while(u=l.get(n.id+"_"+A)){l.remove(u,1)}if(y&&x&&y.nodeType==x.nodeType&&y.nodeType==3&&!c.isOpera){t=y.nodeValue.length;y.appendData(x.nodeValue);l.remove(x);if(A=="start"){j=s=y;o=p=t}else{s=y;p=t}}}}}function m(t){if(l.isBlock(t)&&!t.innerHTML){t.innerHTML=!a?'<br data-mce-bogus="1" />':" "}return t}k("start");k("end");if(j){f=l.createRng();f.setStart(m(j),o);f.setEnd(m(s),p);r.setRng(f)}}else{if(n.name){r.select(l.select(n.name)[n.index])}else{if(n.rng){r.setRng(n.rng)}}}}}},select:function(k,j){var i=this,l=i.dom,g=l.createRng(),f;if(k){f=l.nodeIndex(k);g.setStart(k.parentNode,f);g.setEnd(k.parentNode,f+1);if(j){function h(m,o){var n=new c.dom.TreeWalker(m,m);do{if(m.nodeType==3&&c.trim(m.nodeValue).length!=0){if(o){g.setStart(m,0)}else{g.setEnd(m,m.nodeValue.length)}return}if(m.nodeName=="BR"){if(o){g.setStartBefore(m)}else{g.setEndBefore(m)}return}}while(m=(o?n.next():n.prev()))}h(k,1);h(k)}i.setRng(g)}return k},isCollapsed:function(){var f=this,h=f.getRng(),g=f.getSel();if(!h||h.item){return false}if(h.compareEndPoints){return h.compareEndPoints("StartToEnd",h)===0}return !g||h.collapsed},collapse:function(f){var h=this,g=h.getRng(),i;if(g.item){i=g.item(0);g=h.win.document.body.createTextRange();g.moveToElementText(i)}g.collapse(!!f);h.setRng(g)},getSel:function(){var g=this,f=this.win;return f.getSelection?f.getSelection():f.document.selection},getRng:function(l){var g=this,h,i,k,j=g.win.document;if(l&&g.tridentSel){return g.tridentSel.getRangeAt(0)}try{if(h=g.getSel()){i=h.rangeCount>0?h.getRangeAt(0):(h.createRange?h.createRange():j.createRange())}}catch(f){}if(c.isIE&&i&&i.setStart&&j.selection.createRange().item){k=j.selection.createRange().item(0);i=j.createRange();i.setStartBefore(k);i.setEndAfter(k)}if(!i){i=j.createRange?j.createRange():j.body.createTextRange()}if(g.selectedRange&&g.explicitRange){if(i.compareBoundaryPoints(i.START_TO_START,g.selectedRange)===0&&i.compareBoundaryPoints(i.END_TO_END,g.selectedRange)===0){i=g.explicitRange}else{g.selectedRange=null;g.explicitRange=null}}return i},setRng:function(i){var h,g=this;if(!g.tridentSel){h=g.getSel();if(h){g.explicitRange=i;try{h.removeAllRanges()}catch(f){}h.addRange(i);g.selectedRange=h.getRangeAt(0)}}else{if(i.cloneRange){g.tridentSel.addRange(i);return}try{i.select()}catch(f){}}},setNode:function(g){var f=this;f.setContent(f.dom.getOuterHTML(g));return g},getNode:function(){var h=this,g=h.getRng(),i=h.getSel(),l,k=g.startContainer,f=g.endContainer;if(!g){return h.dom.getRoot()}if(g.setStart){l=g.commonAncestorContainer;if(!g.collapsed){if(g.startContainer==g.endContainer){if(g.endOffset-g.startOffset<2){if(g.startContainer.hasChildNodes()){l=g.startContainer.childNodes[g.startOffset]}}}if(k.nodeType===3&&f.nodeType===3){function j(p,m){var o=p;while(p&&p.nodeType===3&&p.length===0){p=m?p.nextSibling:p.previousSibling}return p||o}if(k.length===g.startOffset){k=j(k.nextSibling,true)}else{k=k.parentNode}if(g.endOffset===0){f=j(f.previousSibling,false)}else{f=f.parentNode}if(k&&k===f){return k}}}if(l&&l.nodeType==3){return l.parentNode}return l}return g.item?g.item(0):g.parentElement()},getSelectedBlocks:function(o,g){var m=this,j=m.dom,l,k,h,i=[];l=j.getParent(o||m.getStart(),j.isBlock);k=j.getParent(g||m.getEnd(),j.isBlock);if(l){i.push(l)}if(l&&k&&l!=k){h=l;var f=new c.dom.TreeWalker(l,j.getRoot());while((h=f.next())&&h!=k){if(j.isBlock(h)){i.push(h)}}}if(k&&l!=k){i.push(k)}return i},normalize:function(){var g=this,f,i;if(c.isIE){return}function h(p){var k,o,n,m=g.dom,j=m.getRoot(),l;k=f[(p?"start":"end")+"Container"];o=f[(p?"start":"end")+"Offset"];if(k.nodeType===9){k=k.body;o=0}if(k===j){if(k.hasChildNodes()){k=k.childNodes[Math.min(!p&&o>0?o-1:o,k.childNodes.length-1)];o=0;if(k.hasChildNodes()){l=k;n=new c.dom.TreeWalker(k,j);do{if(l.nodeType===3){o=p?0:l.nodeValue.length-1;k=l;break}if(l.nodeName==="BR"){o=m.nodeIndex(l);k=l.parentNode;break}}while(l=(p?n.next():n.prev()));i=true}}}if(i){f["set"+(p?"Start":"End")](k,o)}}f=g.getRng();h(true);if(f.collapsed){h()}if(i){g.setRng(f)}},destroy:function(g){var f=this;f.win=null;if(!g){c.removeUnload(f.destroy)}},_fixIESelection:function(){var g=this.dom,m=g.doc,h=m.body,j,n,f;m.documentElement.unselectable=true;function i(o,r){var p=h.createTextRange();try{p.moveToPoint(o,r)}catch(q){p=null}return p}function l(p){var o;if(p.button){o=i(p.x,p.y);if(o){if(o.compareEndPoints("StartToStart",n)>0){o.setEndPoint("StartToStart",n)}else{o.setEndPoint("EndToEnd",n)}o.select()}}else{k()}}function k(){var o=m.selection.createRange();if(n&&!o.item&&o.compareEndPoints("StartToEnd",o)===0){n.select()}g.unbind(m,"mouseup",k);g.unbind(m,"mousemove",l);n=j=0}g.bind(m,["mousedown","contextmenu"],function(o){if(o.target.nodeName==="HTML"){if(j){k()}f=m.documentElement;if(f.scrollHeight>f.clientHeight){return}j=1;n=i(o.x,o.y);if(n){g.bind(m,"mouseup",k);g.bind(m,"mousemove",l);g.win.focus();n.select()}}})}})})(tinymce);(function(a){a.dom.Serializer=function(e,i,f){var h,b,d=a.isIE,g=a.each,c;if(!e.apply_source_formatting){e.indent=false}e.remove_trailing_brs=true;i=i||a.DOM;f=f||new a.html.Schema(e);e.entity_encoding=e.entity_encoding||"named";h=new a.util.Dispatcher(self);b=new a.util.Dispatcher(self);c=new a.html.DomParser(e,f);c.addAttributeFilter("src,href,style",function(k,j){var o=k.length,l,q,n="data-mce-"+j,p=e.url_converter,r=e.url_converter_scope,m;while(o--){l=k[o];q=l.attributes.map[n];if(q!==m){l.attr(j,q.length>0?q:null);l.attr(n,null)}else{q=l.attributes.map[j];if(j==="style"){q=i.serializeStyle(i.parseStyle(q),l.name)}else{if(p){q=p.call(r,q,j,l.name)}}l.attr(j,q.length>0?q:null)}}});c.addAttributeFilter("class",function(j,k){var l=j.length,m,n;while(l--){m=j[l];n=m.attr("class").replace(/\s*mce(Item\w+|Selected)\s*/g,"");m.attr("class",n.length>0?n:null)}});c.addAttributeFilter("data-mce-type",function(j,l,k){var m=j.length,n;while(m--){n=j[m];if(n.attributes.map["data-mce-type"]==="bookmark"&&!k.cleanup){n.remove()}}});c.addNodeFilter("script,style",function(k,l){var m=k.length,n,o;function j(p){return p.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g,"").replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g,"")}while(m--){n=k[m];o=n.firstChild?n.firstChild.value:"";if(l==="script"){n.attr("type",(n.attr("type")||"text/javascript").replace(/^mce\-/,""));if(o.length>0){n.firstChild.value="// <![CDATA[\n"+j(o)+"\n// ]]>"}}else{if(o.length>0){n.firstChild.value="<!--\n"+j(o)+"\n-->"}}}});c.addNodeFilter("#comment",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.value.indexOf("[CDATA[")===0){m.name="#cdata";m.type=4;m.value=m.value.replace(/^\[CDATA\[|\]\]$/g,"")}else{if(m.value.indexOf("mce:protected ")===0){m.name="#text";m.type=3;m.raw=true;m.value=unescape(m.value).substr(14)}}}});c.addNodeFilter("xml:namespace,input",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.type===7){m.remove()}else{if(m.type===1){if(k==="input"&&!("type" in m.attributes.map)){m.attr("type","text")}}}}});if(e.fix_list_elements){c.addNodeFilter("ul,ol",function(k,l){var m=k.length,n,j;while(m--){n=k[m];j=n.parent;if(j.name==="ul"||j.name==="ol"){if(n.prev&&n.prev.name==="li"){n.prev.append(n)}}}})}c.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style",function(j,k){var l=j.length;while(l--){j[l].attr(k,null)}});return{schema:f,addNodeFilter:c.addNodeFilter,addAttributeFilter:c.addAttributeFilter,onPreProcess:h,onPostProcess:b,serialize:function(o,m){var l,p,k,j,n;if(d&&i.select("script,style,select,map").length>0){n=o.innerHTML;o=o.cloneNode(false);i.setHTML(o,n)}else{o=o.cloneNode(true)}l=o.ownerDocument.implementation;if(l.createHTMLDocument){p=l.createHTMLDocument("");g(o.nodeName=="BODY"?o.childNodes:[o],function(q){p.body.appendChild(p.importNode(q,true))});if(o.nodeName!="BODY"){o=p.body.firstChild}else{o=p.body}k=i.doc;i.doc=p}m=m||{};m.format=m.format||"html";if(!m.no_events){m.node=o;h.dispatch(self,m)}j=new a.html.Serializer(e,f);m.content=j.serialize(c.parse(m.getInner?o.innerHTML:a.trim(i.getOuterHTML(o),m),m));if(!m.cleanup){m.content=m.content.replace(/\uFEFF|\u200B/g,"")}if(!m.no_events){b.dispatch(self,m)}if(k){i.doc=k}m.node=null;return m.content},addRules:function(j){f.addValidElements(j)},setRules:function(j){f.setValidElements(j)}}}})(tinymce);(function(a){a.dom.ScriptLoader=function(h){var c=0,k=1,i=2,l={},j=[],f={},d=[],g=0,e;function b(m,v){var x=this,q=a.DOM,s,o,r,n;function p(){q.remove(n);if(s){s.onreadystatechange=s.onload=s=null}v()}function u(){if(typeof(console)!=="undefined"&&console.log){console.log("Failed to load: "+m)}}n=q.uniqueId();if(a.isIE6){o=new a.util.URI(m);r=location;if(o.host==r.hostname&&o.port==r.port&&(o.protocol+":")==r.protocol&&o.protocol.toLowerCase()!="file"){a.util.XHR.send({url:a._addVer(o.getURI()),success:function(y){var t=q.create("script",{type:"text/javascript"});t.text=y;document.getElementsByTagName("head")[0].appendChild(t);q.remove(t);p()},error:u});return}}s=q.create("script",{id:n,type:"text/javascript",src:a._addVer(m)});if(!a.isIE){s.onload=p}s.onerror=u;if(!a.isOpera){s.onreadystatechange=function(){var t=s.readyState;if(t=="complete"||t=="loaded"){p()}}}(document.getElementsByTagName("head")[0]||document.body).appendChild(s)}this.isDone=function(m){return l[m]==i};this.markDone=function(m){l[m]=i};this.add=this.load=function(m,q,n){var o,p=l[m];if(p==e){j.push(m);l[m]=c}if(q){if(!f[m]){f[m]=[]}f[m].push({func:q,scope:n||this})}};this.loadQueue=function(n,m){this.loadScripts(j,n,m)};this.loadScripts=function(m,q,p){var o;function n(r){a.each(f[r],function(s){s.func.call(s.scope)});f[r]=e}d.push({func:q,scope:p||this});o=function(){var r=a.grep(m);m.length=0;a.each(r,function(s){if(l[s]==i){n(s);return}if(l[s]!=k){l[s]=k;g++;b(s,function(){l[s]=i;g--;n(s);o()})}});if(!g){a.each(d,function(s){s.func.call(s.scope)});d.length=0}};o()}};a.ScriptLoader=new a.dom.ScriptLoader()})(tinymce);tinymce.dom.TreeWalker=function(a,c){var b=a;function d(i,f,e,j){var h,g;if(i){if(!j&&i[f]){return i[f]}if(i!=c){h=i[e];if(h){return h}for(g=i.parentNode;g&&g!=c;g=g.parentNode){h=g[e];if(h){return h}}}}}this.current=function(){return b};this.next=function(e){return(b=d(b,"firstChild","nextSibling",e))};this.prev=function(e){return(b=d(b,"lastChild","previousSibling",e))}};(function(a){a.dom.RangeUtils=function(c){var b="\uFEFF";this.walk=function(d,s){var i=d.startContainer,l=d.startOffset,t=d.endContainer,m=d.endOffset,j,g,o,h,r,q,e;e=c.select("td.mceSelected,th.mceSelected");if(e.length>0){a.each(e,function(u){s([u])});return}function f(u){var v;v=u[0];if(v.nodeType===3&&v===i&&l>=v.nodeValue.length){u.splice(0,1)}v=u[u.length-1];if(m===0&&u.length>0&&v===t&&v.nodeType===3){u.splice(u.length-1,1)}return u}function p(x,v,u){var y=[];for(;x&&x!=u;x=x[v]){y.push(x)}return y}function n(v,u){do{if(v.parentNode==u){return v}v=v.parentNode}while(v)}function k(x,v,y){var u=y?"nextSibling":"previousSibling";for(h=x,r=h.parentNode;h&&h!=v;h=r){r=h.parentNode;q=p(h==x?h:h[u],u);if(q.length){if(!y){q.reverse()}s(f(q))}}}if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[l]}if(t.nodeType==1&&t.hasChildNodes()){t=t.childNodes[Math.min(m-1,t.childNodes.length-1)]}if(i==t){return s(f([i]))}j=c.findCommonAncestor(i,t);for(h=i;h;h=h.parentNode){if(h===t){return k(i,j,true)}if(h===j){break}}for(h=t;h;h=h.parentNode){if(h===i){return k(t,j)}if(h===j){break}}g=n(i,j)||i;o=n(t,j)||t;k(i,g,true);q=p(g==i?g:g.nextSibling,"nextSibling",o==t?o.nextSibling:o);if(q.length){s(f(q))}k(t,o)};this.split=function(e){var h=e.startContainer,d=e.startOffset,i=e.endContainer,g=e.endOffset;function f(j,k){return j.splitText(k)}if(h==i&&h.nodeType==3){if(d>0&&d<h.nodeValue.length){i=f(h,d);h=i.previousSibling;if(g>d){g=g-d;h=i=f(i,g).previousSibling;g=i.nodeValue.length;d=0}else{g=0}}}else{if(h.nodeType==3&&d>0&&d<h.nodeValue.length){h=f(h,d);d=0}if(i.nodeType==3&&g>0&&g<i.nodeValue.length){i=f(i,g).previousSibling;g=i.nodeValue.length}}return{startContainer:h,startOffset:d,endContainer:i,endOffset:g}}};a.dom.RangeUtils.compareRanges=function(c,b){if(c&&b){if(c.item||c.duplicate){if(c.item&&b.item&&c.item(0)===b.item(0)){return true}if(c.isEqual&&b.isEqual&&b.isEqual(c)){return true}}else{return c.startContainer==b.startContainer&&c.startOffset==b.startOffset}}return false}})(tinymce);(function(b){var a=b.dom.Event,c=b.each;b.create("tinymce.ui.KeyboardNavigation",{KeyboardNavigation:function(e,f){var p=this,m=e.root,l=e.items,n=e.enableUpDown,i=e.enableLeftRight||!e.enableUpDown,k=e.excludeFromTabOrder,j,h,o,d,g;f=f||b.DOM;j=function(q){g=q.target.id};h=function(q){f.setAttrib(q.target.id,"tabindex","-1")};d=function(q){var r=f.get(g);f.setAttrib(r,"tabindex","0");r.focus()};p.focus=function(){f.get(g).focus()};p.destroy=function(){c(l,function(q){f.unbind(f.get(q.id),"focus",j);f.unbind(f.get(q.id),"blur",h)});f.unbind(f.get(m),"focus",d);f.unbind(f.get(m),"keydown",o);l=f=m=p.focus=j=h=o=d=null;p.destroy=function(){}};p.moveFocus=function(u,r){var q=-1,t=p.controls,s;if(!g){return}c(l,function(x,v){if(x.id===g){q=v;return false}});q+=u;if(q<0){q=l.length-1}else{if(q>=l.length){q=0}}s=l[q];f.setAttrib(g,"tabindex","-1");f.setAttrib(s.id,"tabindex","0");f.get(s.id).focus();if(e.actOnFocus){e.onAction(s.id)}if(r){a.cancel(r)}};o=function(y){var u=37,t=39,x=38,z=40,q=27,s=14,r=13,v=32;switch(y.keyCode){case u:if(i){p.moveFocus(-1)}break;case t:if(i){p.moveFocus(1)}break;case x:if(n){p.moveFocus(-1)}break;case z:if(n){p.moveFocus(1)}break;case q:if(e.onCancel){e.onCancel();a.cancel(y)}break;case s:case r:case v:if(e.onAction){e.onAction(g);a.cancel(y)}break}};c(l,function(s,q){var r;if(!s.id){s.id=f.uniqueId("_mce_item_")}if(k){f.bind(s.id,"blur",h);r="-1"}else{r=(q===0?"0":"-1")}f.setAttrib(s.id,"tabindex",r);f.bind(f.get(s.id),"focus",j)});if(l[0]){g=l[0].id}f.setAttrib(m,"tabindex","-1");f.bind(f.get(m),"focus",d);f.bind(f.get(m),"keydown",o)}})})(tinymce);(function(c){var b=c.DOM,a=c.is;c.create("tinymce.ui.Control",{Control:function(f,e,d){this.id=f;this.settings=e=e||{};this.rendered=false;this.onRender=new c.util.Dispatcher(this);this.classPrefix="";this.scope=e.scope||this;this.disabled=0;this.active=0;this.editor=d},setAriaProperty:function(f,e){var d=b.get(this.id+"_aria")||b.get(this.id);if(d){b.setAttrib(d,"aria-"+f,!!e)}},focus:function(){b.get(this.id).focus()},setDisabled:function(d){if(d!=this.disabled){this.setAriaProperty("disabled",d);this.setState("Disabled",d);this.setState("Enabled",!d);this.disabled=d}},isDisabled:function(){return this.disabled},setActive:function(d){if(d!=this.active){this.setState("Active",d);this.active=d;this.setAriaProperty("pressed",d)}},isActive:function(){return this.active},setState:function(f,d){var e=b.get(this.id);f=this.classPrefix+f;if(d){b.addClass(e,f)}else{b.removeClass(e,f)}},isRendered:function(){return this.rendered},renderHTML:function(){},renderTo:function(d){b.setHTML(d,this.renderHTML())},postRender:function(){var e=this,d;if(a(e.disabled)){d=e.disabled;e.disabled=-1;e.setDisabled(d)}if(a(e.active)){d=e.active;e.active=-1;e.setActive(d)}},remove:function(){b.remove(this.id);this.destroy()},destroy:function(){c.dom.Event.clear(this.id)}})})(tinymce);tinymce.create("tinymce.ui.Container:tinymce.ui.Control",{Container:function(c,b,a){this.parent(c,b,a);this.controls=[];this.lookup={}},add:function(a){this.lookup[a.id]=a;this.controls.push(a);return a},get:function(a){return this.lookup[a]}});tinymce.create("tinymce.ui.Separator:tinymce.ui.Control",{Separator:function(b,a){this.parent(b,a);this.classPrefix="mceSeparator";this.setDisabled(true)},renderHTML:function(){return tinymce.DOM.createHTML("span",{"class":this.classPrefix,role:"separator","aria-orientation":"vertical",tabindex:"-1"})}});(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.MenuItem:tinymce.ui.Control",{MenuItem:function(g,f){this.parent(g,f);this.classPrefix="mceMenuItem"},setSelected:function(f){this.setState("Selected",f);this.setAriaProperty("checked",!!f);this.selected=f},isSelected:function(){return this.selected},postRender:function(){var f=this;f.parent();if(c(f.selected)){f.setSelected(f.selected)}}})})(tinymce);(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.Menu:tinymce.ui.MenuItem",{Menu:function(h,g){var f=this;f.parent(h,g);f.items={};f.collapsed=false;f.menuCount=0;f.onAddItem=new d.util.Dispatcher(this)},expand:function(g){var f=this;if(g){a(f,function(h){if(h.expand){h.expand()}},"items",f)}f.collapsed=false},collapse:function(g){var f=this;if(g){a(f,function(h){if(h.collapse){h.collapse()}},"items",f)}f.collapsed=true},isCollapsed:function(){return this.collapsed},add:function(f){if(!f.settings){f=new d.ui.MenuItem(f.id||b.uniqueId(),f)}this.onAddItem.dispatch(this,f);return this.items[f.id]=f},addSeparator:function(){return this.add({separator:true})},addMenu:function(f){if(!f.collapse){f=this.createMenu(f)}this.menuCount++;return this.add(f)},hasMenus:function(){return this.menuCount!==0},remove:function(f){delete this.items[f.id]},removeAll:function(){var f=this;a(f,function(g){if(g.removeAll){g.removeAll()}else{g.remove()}g.destroy()},"items",f);f.items={}},createMenu:function(g){var f=new d.ui.Menu(g.id||b.uniqueId(),g);f.onAddItem.add(this.onAddItem.dispatch,this.onAddItem);return f}})})(tinymce);(function(e){var d=e.is,c=e.DOM,f=e.each,a=e.dom.Event,b=e.dom.Element;e.create("tinymce.ui.DropMenu:tinymce.ui.Menu",{DropMenu:function(h,g){g=g||{};g.container=g.container||c.doc.body;g.offset_x=g.offset_x||0;g.offset_y=g.offset_y||0;g.vp_offset_x=g.vp_offset_x||0;g.vp_offset_y=g.vp_offset_y||0;if(d(g.icons)&&!g.icons){g["class"]+=" mceNoIcons"}this.parent(h,g);this.onShowMenu=new e.util.Dispatcher(this);this.onHideMenu=new e.util.Dispatcher(this);this.classPrefix="mceMenu"},createMenu:function(j){var h=this,i=h.settings,g;j.container=j.container||i.container;j.parent=h;j.constrain=j.constrain||i.constrain;j["class"]=j["class"]||i["class"];j.vp_offset_x=j.vp_offset_x||i.vp_offset_x;j.vp_offset_y=j.vp_offset_y||i.vp_offset_y;j.keyboard_focus=i.keyboard_focus;g=new e.ui.DropMenu(j.id||c.uniqueId(),j);g.onAddItem.add(h.onAddItem.dispatch,h.onAddItem);return g},focus:function(){var g=this;if(g.keyboardNav){g.keyboardNav.focus()}},update:function(){var i=this,j=i.settings,g=c.get("menu_"+i.id+"_tbl"),l=c.get("menu_"+i.id+"_co"),h,k;h=j.max_width?Math.min(g.clientWidth,j.max_width):g.clientWidth;k=j.max_height?Math.min(g.clientHeight,j.max_height):g.clientHeight;if(!c.boxModel){i.element.setStyles({width:h+2,height:k+2})}else{i.element.setStyles({width:h,height:k})}if(j.max_width){c.setStyle(l,"width",h)}if(j.max_height){c.setStyle(l,"height",k);if(g.clientHeight<j.max_height){c.setStyle(l,"overflow","hidden")}}},showMenu:function(p,n,r){var z=this,A=z.settings,o,g=c.getViewPort(),u,l,v,q,i=2,k,j,m=z.classPrefix;z.collapse(1);if(z.isMenuVisible){return}if(!z.rendered){o=c.add(z.settings.container,z.renderNode());f(z.items,function(h){h.postRender()});z.element=new b("menu_"+z.id,{blocker:1,container:A.container})}else{o=c.get("menu_"+z.id)}if(!e.isOpera){c.setStyles(o,{left:-65535,top:-65535})}c.show(o);z.update();p+=A.offset_x||0;n+=A.offset_y||0;g.w-=4;g.h-=4;if(A.constrain){u=o.clientWidth-i;l=o.clientHeight-i;v=g.x+g.w;q=g.y+g.h;if((p+A.vp_offset_x+u)>v){p=r?r-u:Math.max(0,(v-A.vp_offset_x)-u)}if((n+A.vp_offset_y+l)>q){n=Math.max(0,(q-A.vp_offset_y)-l)}}c.setStyles(o,{left:p,top:n});z.element.update();z.isMenuVisible=1;z.mouseClickFunc=a.add(o,"click",function(s){var h;s=s.target;if(s&&(s=c.getParent(s,"tr"))&&!c.hasClass(s,m+"ItemSub")){h=z.items[s.id];if(h.isDisabled()){return}k=z;while(k){if(k.hideMenu){k.hideMenu()}k=k.settings.parent}if(h.settings.onclick){h.settings.onclick(s)}return a.cancel(s)}});if(z.hasMenus()){z.mouseOverFunc=a.add(o,"mouseover",function(x){var h,t,s;x=x.target;if(x&&(x=c.getParent(x,"tr"))){h=z.items[x.id];if(z.lastMenu){z.lastMenu.collapse(1)}if(h.isDisabled()){return}if(x&&c.hasClass(x,m+"ItemSub")){t=c.getRect(x);h.showMenu((t.x+t.w-i),t.y-i,t.x);z.lastMenu=h;c.addClass(c.get(h.id).firstChild,m+"ItemActive")}}})}a.add(o,"keydown",z._keyHandler,z);z.onShowMenu.dispatch(z);if(A.keyboard_focus){z._setupKeyboardNav()}},hideMenu:function(j){var g=this,i=c.get("menu_"+g.id),h;if(!g.isMenuVisible){return}if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(i,"mouseover",g.mouseOverFunc);a.remove(i,"click",g.mouseClickFunc);a.remove(i,"keydown",g._keyHandler);c.hide(i);g.isMenuVisible=0;if(!j){g.collapse(1)}if(g.element){g.element.hide()}if(h=c.get(g.id)){c.removeClass(h.firstChild,g.classPrefix+"ItemActive")}g.onHideMenu.dispatch(g)},add:function(i){var g=this,h;i=g.parent(i);if(g.isRendered&&(h=c.get("menu_"+g.id))){g._add(c.select("tbody",h)[0],i)}return i},collapse:function(g){this.parent(g);this.hideMenu(1)},remove:function(g){c.remove(g.id);this.destroy();return this.parent(g)},destroy:function(){var g=this,h=c.get("menu_"+g.id);if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(h,"mouseover",g.mouseOverFunc);a.remove(c.select("a",h),"focus",g.mouseOverFunc);a.remove(h,"click",g.mouseClickFunc);a.remove(h,"keydown",g._keyHandler);if(g.element){g.element.remove()}c.remove(h)},renderNode:function(){var i=this,j=i.settings,l,h,k,g;g=c.create("div",{role:"listbox",id:"menu_"+i.id,"class":j["class"],style:"position:absolute;left:0;top:0;z-index:200000;outline:0"});if(i.settings.parent){c.setAttrib(g,"aria-parent","menu_"+i.settings.parent.id)}k=c.add(g,"div",{role:"presentation",id:"menu_"+i.id+"_co","class":i.classPrefix+(j["class"]?" "+j["class"]:"")});i.element=new b("menu_"+i.id,{blocker:1,container:j.container});if(j.menu_line){c.add(k,"span",{"class":i.classPrefix+"Line"})}l=c.add(k,"table",{role:"presentation",id:"menu_"+i.id+"_tbl",border:0,cellPadding:0,cellSpacing:0});h=c.add(l,"tbody");f(i.items,function(m){i._add(h,m)});i.rendered=true;return g},_setupKeyboardNav:function(){var i,h,g=this;i=c.select("#menu_"+g.id)[0];h=c.select("a[role=option]","menu_"+g.id);h.splice(0,0,i);g.keyboardNav=new e.ui.KeyboardNavigation({root:"menu_"+g.id,items:h,onCancel:function(){g.hideMenu()},enableUpDown:true});i.focus()},_keyHandler:function(g){var h=this,i;switch(g.keyCode){case 37:if(h.settings.parent){h.hideMenu();h.settings.parent.focus();a.cancel(g)}break;case 39:if(h.mouseOverFunc){h.mouseOverFunc(g)}break}},_add:function(j,h){var i,q=h.settings,p,l,k,m=this.classPrefix,g;if(q.separator){l=c.add(j,"tr",{id:h.id,"class":m+"ItemSeparator"});c.add(l,"td",{"class":m+"ItemSeparator"});if(i=l.previousSibling){c.addClass(i,"mceLast")}return}i=l=c.add(j,"tr",{id:h.id,"class":m+"Item "+m+"ItemEnabled"});i=k=c.add(i,q.titleItem?"th":"td");i=p=c.add(i,"a",{id:h.id+"_aria",role:q.titleItem?"presentation":"option",href:"javascript:;",onclick:"return false;",onmousedown:"return false;"});if(q.parent){c.setAttrib(p,"aria-haspopup","true");c.setAttrib(p,"aria-owns","menu_"+h.id)}c.addClass(k,q["class"]);g=c.add(i,"span",{"class":"mceIcon"+(q.icon?" mce_"+q.icon:"")});if(q.icon_src){c.add(g,"img",{src:q.icon_src})}i=c.add(i,q.element||"span",{"class":"mceText",title:h.settings.title},h.settings.title);if(h.settings.style){c.setAttrib(i,"style",h.settings.style)}if(j.childNodes.length==1){c.addClass(l,"mceFirst")}if((i=l.previousSibling)&&c.hasClass(i,m+"ItemSeparator")){c.addClass(l,"mceFirst")}if(h.collapse){c.addClass(l,m+"ItemSub")}if(i=l.previousSibling){c.removeClass(i,"mceLast")}c.addClass(l,"mceLast")}})})(tinymce);(function(b){var a=b.DOM;b.create("tinymce.ui.Button:tinymce.ui.Control",{Button:function(e,d,c){this.parent(e,d,c);this.classPrefix="mceButton"},renderHTML:function(){var f=this.classPrefix,e=this.settings,d,c;c=a.encode(e.label||"");d='<a role="button" id="'+this.id+'" href="javascript:;" class="'+f+" "+f+"Enabled "+e["class"]+(c?" "+f+"Labeled":"")+'" onmousedown="return false;" onclick="return false;" aria-labelledby="'+this.id+'_voice" title="'+a.encode(e.title)+'">';if(e.image&&!(this.editor&&this.editor.forcedHighContrastMode)){d+='<img class="mceIcon" src="'+e.image+'" alt="'+a.encode(e.title)+'" />'+c}else{d+='<span class="mceIcon '+e["class"]+'"></span>'+(c?'<span class="'+f+'Label">'+c+"</span>":"")}d+='<span class="mceVoiceLabel mceIconOnly" style="display: none;" id="'+this.id+'_voice">'+e.title+"</span>";d+="</a>";return d},postRender:function(){var c=this,d=c.settings;b.dom.Event.add(c.id,"click",function(f){if(!c.isDisabled()){return d.onclick.call(d.scope,f)}})}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.ListBox:tinymce.ui.Control",{ListBox:function(i,h,f){var g=this;g.parent(i,h,f);g.items=[];g.onChange=new a(g);g.onPostRender=new a(g);g.onAdd=new a(g);g.onRenderMenu=new d.util.Dispatcher(this);g.classPrefix="mceListBox"},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){var h=this,i,j,g;if(f!=h.selectedIndex){i=c.get(h.id+"_text");g=c.get(h.id+"_voiceDesc");j=h.items[f];if(j){h.selectedValue=j.value;h.selectedIndex=f;c.setHTML(i,c.encode(j.title));c.setHTML(g,h.settings.title+" - "+j.title);c.removeClass(i,"mceTitle");c.setAttrib(h.id,"aria-valuenow",j.title)}else{c.setHTML(i,c.encode(h.settings.title));c.setHTML(g,c.encode(h.settings.title));c.addClass(i,"mceTitle");h.selectedValue=h.selectedIndex=null;c.setAttrib(h.id,"aria-valuenow",h.settings.title)}i=0}},add:function(i,f,h){var g=this;h=h||{};h=d.extend(h,{title:i,value:f});g.items.push(h);g.onAdd.dispatch(g,h)},getLength:function(){return this.items.length},renderHTML:function(){var i="",f=this,g=f.settings,j=f.classPrefix;i='<span role="listbox" aria-haspopup="true" aria-labelledby="'+f.id+'_voiceDesc" aria-describedby="'+f.id+'_voiceDesc"><table role="presentation" tabindex="0" id="'+f.id+'" cellpadding="0" cellspacing="0" class="'+j+" "+j+"Enabled"+(g["class"]?(" "+g["class"]):"")+'"><tbody><tr>';i+="<td>"+c.createHTML("span",{id:f.id+"_voiceDesc","class":"voiceLabel",style:"display:none;"},f.settings.title);i+=c.createHTML("a",{id:f.id+"_text",tabindex:-1,href:"javascript:;","class":"mceText",onclick:"return false;",onmousedown:"return false;"},c.encode(f.settings.title))+"</td>";i+="<td>"+c.createHTML("a",{id:f.id+"_open",tabindex:-1,href:"javascript:;","class":"mceOpen",onclick:"return false;",onmousedown:"return false;"},'<span><span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span></span>')+"</td>";i+="</tr></tbody></table></span>";return i},showMenu:function(){var g=this,i,h=c.get(this.id),f;if(g.isDisabled()||g.items.length==0){return}if(g.menu&&g.menu.isMenuVisible){return g.hideMenu()}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}i=c.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.keyboard_focus=!d.isOpera;if(g.oldID){f.items[g.oldID].setSelected(0)}e(g.items,function(j){if(j.value===g.selectedValue){f.items[j.id].setSelected(1);g.oldID=j.id}});f.showMenu(0,h.clientHeight);b.add(c.doc,"mousedown",g.hideMenu,g);c.addClass(g.id,g.classPrefix+"Selected")},hideMenu:function(g){var f=this;if(f.menu&&f.menu.isMenuVisible){c.removeClass(f.id,f.classPrefix+"Selected");if(g&&g.type=="mousedown"&&(g.target.id==f.id+"_text"||g.target.id==f.id+"_open")){return}if(!g||!c.getParent(g.target,".mceMenu")){c.removeClass(f.id,f.classPrefix+"Selected");b.remove(c.doc,"mousedown",f.hideMenu,f);f.menu.hideMenu()}}},renderMenu:function(){var g=this,f;f=g.settings.control_manager.createDropMenu(g.id+"_menu",{menu_line:1,"class":g.classPrefix+"Menu mceNoIcons",max_width:150,max_height:150});f.onHideMenu.add(function(){g.hideMenu();g.focus()});f.add({title:g.settings.title,"class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}});e(g.items,function(h){if(h.value===undefined){f.add({title:h.title,role:"option","class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}})}else{h.id=c.uniqueId();h.role="option";h.onclick=function(){if(g.settings.onselect(h.value)!==false){g.select(h.value)}};f.add(h)}});g.onRenderMenu.dispatch(g,f);g.menu=f},postRender:function(){var f=this,g=f.classPrefix;b.add(f.id,"click",f.showMenu,f);b.add(f.id,"keydown",function(h){if(h.keyCode==32){f.showMenu(h);b.cancel(h)}});b.add(f.id,"focus",function(){if(!f._focused){f.keyDownHandler=b.add(f.id,"keydown",function(h){if(h.keyCode==40){f.showMenu();b.cancel(h)}});f.keyPressHandler=b.add(f.id,"keypress",function(i){var h;if(i.keyCode==13){h=f.selectedValue;f.selectedValue=null;b.cancel(i);f.settings.onselect(h)}})}f._focused=1});b.add(f.id,"blur",function(){b.remove(f.id,"keydown",f.keyDownHandler);b.remove(f.id,"keypress",f.keyPressHandler);f._focused=0});if(d.isIE6||!c.boxModel){b.add(f.id,"mouseover",function(){if(!c.hasClass(f.id,g+"Disabled")){c.addClass(f.id,g+"Hover")}});b.add(f.id,"mouseout",function(){if(!c.hasClass(f.id,g+"Disabled")){c.removeClass(f.id,g+"Hover")}})}f.onPostRender.dispatch(f,c.get(f.id))},destroy:function(){this.parent();b.clear(this.id+"_text");b.clear(this.id+"_open")}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.NativeListBox:tinymce.ui.ListBox",{NativeListBox:function(g,f){this.parent(g,f);this.classPrefix="mceNativeListBox"},setDisabled:function(f){c.get(this.id).disabled=f;this.setAriaProperty("disabled",f)},isDisabled:function(){return c.get(this.id).disabled},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){c.get(this.id).selectedIndex=f+1;this.selectedValue=this.items[f]?this.items[f].value:null},add:function(j,g,f){var i,h=this;f=f||{};f.value=g;if(h.isRendered()){c.add(c.get(this.id),"option",f,j)}i={title:j,value:g,attribs:f};h.items.push(i);h.onAdd.dispatch(h,i)},getLength:function(){return this.items.length},renderHTML:function(){var g,f=this;g=c.createHTML("option",{value:""},"-- "+f.settings.title+" --");e(f.items,function(h){g+=c.createHTML("option",{value:h.value},h.title)});g=c.createHTML("select",{id:f.id,"class":"mceNativeListBox","aria-labelledby":f.id+"_aria"},g);g+=c.createHTML("span",{id:f.id+"_aria",style:"display: none"},f.settings.title);return g},postRender:function(){var g=this,h,i=true;g.rendered=true;function f(k){var j=g.items[k.target.selectedIndex-1];if(j&&(j=j.value)){g.onChange.dispatch(g,j);if(g.settings.onselect){g.settings.onselect(j)}}}b.add(g.id,"change",f);b.add(g.id,"keydown",function(k){var j;b.remove(g.id,"change",h);i=false;j=b.add(g.id,"blur",function(){if(i){return}i=true;b.add(g.id,"change",f);b.remove(g.id,"blur",j)});if(d.isWebKit&&(k.keyCode==37||k.keyCode==39)){return b.prevent(k)}if(k.keyCode==13||k.keyCode==32){f(k);return b.cancel(k)}});g.onPostRender.dispatch(g,c.get(g.id))}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.MenuButton:tinymce.ui.Button",{MenuButton:function(g,f,e){this.parent(g,f,e);this.onRenderMenu=new c.util.Dispatcher(this);f.menu_container=f.menu_container||b.doc.body},showMenu:function(){var g=this,j,i,h=b.get(g.id),f;if(g.isDisabled()){return}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}if(g.isMenuVisible){return g.hideMenu()}j=b.getPos(g.settings.menu_container);i=b.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.vp_offset_x=i.x;f.settings.vp_offset_y=i.y;f.settings.keyboard_focus=g._focused;f.showMenu(0,h.clientHeight);a.add(b.doc,"mousedown",g.hideMenu,g);g.setState("Selected",1);g.isMenuVisible=1},renderMenu:function(){var f=this,e;e=f.settings.control_manager.createDropMenu(f.id+"_menu",{menu_line:1,"class":this.classPrefix+"Menu",icons:f.settings.icons});e.onHideMenu.add(function(){f.hideMenu();f.focus()});f.onRenderMenu.dispatch(f,e);f.menu=e},hideMenu:function(g){var f=this;if(g&&g.type=="mousedown"&&b.getParent(g.target,function(h){return h.id===f.id||h.id===f.id+"_open"})){return}if(!g||!b.getParent(g.target,".mceMenu")){f.setState("Selected",0);a.remove(b.doc,"mousedown",f.hideMenu,f);if(f.menu){f.menu.hideMenu()}}f.isMenuVisible=0},postRender:function(){var e=this,f=e.settings;a.add(e.id,"click",function(){if(!e.isDisabled()){if(f.onclick){f.onclick(e.value)}e.showMenu()}})}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.SplitButton:tinymce.ui.MenuButton",{SplitButton:function(g,f,e){this.parent(g,f,e);this.classPrefix="mceSplitButton"},renderHTML:function(){var i,f=this,g=f.settings,e;i="<tbody><tr>";if(g.image){e=b.createHTML("img ",{src:g.image,role:"presentation","class":"mceAction "+g["class"]})}else{e=b.createHTML("span",{"class":"mceAction "+g["class"]},"")}e+=b.createHTML("span",{"class":"mceVoiceLabel mceIconOnly",id:f.id+"_voice",style:"display:none;"},g.title);i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_action",tabindex:"-1",href:"javascript:;","class":"mceAction "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";e=b.createHTML("span",{"class":"mceOpen "+g["class"]},'<span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span>');i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_open",tabindex:"-1",href:"javascript:;","class":"mceOpen "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";i+="</tr></tbody>";i=b.createHTML("table",{role:"presentation","class":"mceSplitButton mceSplitButtonEnabled "+g["class"],cellpadding:"0",cellspacing:"0",title:g.title},i);return b.createHTML("div",{id:f.id,role:"button",tabindex:"0","aria-labelledby":f.id+"_voice","aria-haspopup":"true"},i)},postRender:function(){var e=this,g=e.settings,f;if(g.onclick){f=function(h){if(!e.isDisabled()){g.onclick(e.value);a.cancel(h)}};a.add(e.id+"_action","click",f);a.add(e.id,["click","keydown"],function(h){var k=32,m=14,i=13,j=38,l=40;if((h.keyCode===32||h.keyCode===13||h.keyCode===14)&&!h.altKey&&!h.ctrlKey&&!h.metaKey){f();a.cancel(h)}else{if(h.type==="click"||h.keyCode===l){e.showMenu();a.cancel(h)}}})}a.add(e.id+"_open","click",function(h){e.showMenu();a.cancel(h)});a.add([e.id,e.id+"_open"],"focus",function(){e._focused=1});a.add([e.id,e.id+"_open"],"blur",function(){e._focused=0});if(c.isIE6||!b.boxModel){a.add(e.id,"mouseover",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.addClass(e.id,"mceSplitButtonHover")}});a.add(e.id,"mouseout",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.removeClass(e.id,"mceSplitButtonHover")}})}},destroy:function(){this.parent();a.clear(this.id+"_action");a.clear(this.id+"_open");a.clear(this.id)}})})(tinymce);(function(d){var c=d.DOM,a=d.dom.Event,b=d.is,e=d.each;d.create("tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton",{ColorSplitButton:function(i,h,f){var g=this;g.parent(i,h,f);g.settings=h=d.extend({colors:"000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,008000,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF",grid_width:8,default_color:"#888888"},g.settings);g.onShowMenu=new d.util.Dispatcher(g);g.onHideMenu=new d.util.Dispatcher(g);g.value=h.default_color},showMenu:function(){var f=this,g,j,i,h;if(f.isDisabled()){return}if(!f.isMenuRendered){f.renderMenu();f.isMenuRendered=true}if(f.isMenuVisible){return f.hideMenu()}i=c.get(f.id);c.show(f.id+"_menu");c.addClass(i,"mceSplitButtonSelected");h=c.getPos(i);c.setStyles(f.id+"_menu",{left:h.x,top:h.y+i.clientHeight,zIndex:200000});i=0;a.add(c.doc,"mousedown",f.hideMenu,f);f.onShowMenu.dispatch(f);if(f._focused){f._keyHandler=a.add(f.id+"_menu","keydown",function(k){if(k.keyCode==27){f.hideMenu()}});c.select("a",f.id+"_menu")[0].focus()}f.isMenuVisible=1},hideMenu:function(g){var f=this;if(f.isMenuVisible){if(g&&g.type=="mousedown"&&c.getParent(g.target,function(h){return h.id===f.id+"_open"})){return}if(!g||!c.getParent(g.target,".mceSplitButtonMenu")){c.removeClass(f.id,"mceSplitButtonSelected");a.remove(c.doc,"mousedown",f.hideMenu,f);a.remove(f.id+"_menu","keydown",f._keyHandler);c.hide(f.id+"_menu")}f.isMenuVisible=0;f.onHideMenu.dispatch()}},renderMenu:function(){var p=this,h,k=0,q=p.settings,g,j,l,o,f;o=c.add(q.menu_container,"div",{role:"listbox",id:p.id+"_menu","class":q.menu_class+" "+q["class"],style:"position:absolute;left:0;top:-1000px;"});h=c.add(o,"div",{"class":q["class"]+" mceSplitButtonMenu"});c.add(h,"span",{"class":"mceMenuLine"});g=c.add(h,"table",{role:"presentation","class":"mceColorSplitMenu"});j=c.add(g,"tbody");k=0;e(b(q.colors,"array")?q.colors:q.colors.split(","),function(i){i=i.replace(/^#/,"");if(!k--){l=c.add(j,"tr");k=q.grid_width-1}g=c.add(l,"td");g=c.add(g,"a",{role:"option",href:"javascript:;",style:{backgroundColor:"#"+i},title:p.editor.getLang("colors."+i,i),"data-mce-color":"#"+i});if(p.editor.forcedHighContrastMode){g=c.add(g,"canvas",{width:16,height:16,"aria-hidden":"true"});if(g.getContext&&(f=g.getContext("2d"))){f.fillStyle="#"+i;f.fillRect(0,0,16,16)}else{c.remove(g)}}});if(q.more_colors_func){g=c.add(j,"tr");g=c.add(g,"td",{colspan:q.grid_width,"class":"mceMoreColors"});g=c.add(g,"a",{role:"option",id:p.id+"_more",href:"javascript:;",onclick:"return false;","class":"mceMoreColors"},q.more_colors_title);a.add(g,"click",function(i){q.more_colors_func.call(q.more_colors_scope||this);return a.cancel(i)})}c.addClass(h,"mceColorSplitMenu");new d.ui.KeyboardNavigation({root:p.id+"_menu",items:c.select("a",p.id+"_menu"),onCancel:function(){p.hideMenu();p.focus()}});a.add(p.id+"_menu","mousedown",function(i){return a.cancel(i)});a.add(p.id+"_menu","click",function(i){var m;i=c.getParent(i.target,"a",j);if(i&&i.nodeName.toLowerCase()=="a"&&(m=i.getAttribute("data-mce-color"))){p.setColor(m)}return a.cancel(i)});return o},setColor:function(f){this.displayColor(f);this.hideMenu();this.settings.onselect(f)},displayColor:function(g){var f=this;c.setStyle(f.id+"_preview","backgroundColor",g);f.value=g},postRender:function(){var f=this,g=f.id;f.parent();c.add(g+"_action","div",{id:g+"_preview","class":"mceColorPreview"});c.setStyle(f.id+"_preview","backgroundColor",f.value)},destroy:function(){this.parent();a.clear(this.id+"_menu");a.clear(this.id+"_more");c.remove(this.id+"_menu")}})})(tinymce);(function(b){var d=b.DOM,c=b.each,a=b.dom.Event;b.create("tinymce.ui.ToolbarGroup:tinymce.ui.Container",{renderHTML:function(){var f=this,i=[],e=f.controls,j=b.each,g=f.settings;i.push('<div id="'+f.id+'" role="group" aria-labelledby="'+f.id+'_voice">');i.push("<span role='application'>");i.push('<span id="'+f.id+'_voice" class="mceVoiceLabel" style="display:none;">'+d.encode(g.name)+"</span>");j(e,function(h){i.push(h.renderHTML())});i.push("</span>");i.push("</div>");return i.join("")},focus:function(){var e=this;d.get(e.id).focus()},postRender:function(){var f=this,e=[];c(f.controls,function(g){c(g.controls,function(h){if(h.id){e.push(h)}})});f.keyNav=new b.ui.KeyboardNavigation({root:f.id,items:e,onCancel:function(){if(b.isWebKit){d.get(f.editor.id+"_ifr").focus()}f.editor.focus()},excludeFromTabOrder:!f.settings.tab_focus_toolbar})},destroy:function(){var e=this;e.parent();e.keyNav.destroy();a.clear(e.id)}})})(tinymce);(function(a){var c=a.DOM,b=a.each;a.create("tinymce.ui.Toolbar:tinymce.ui.Container",{renderHTML:function(){var m=this,f="",j,k,n=m.settings,e,d,g,l;l=m.controls;for(e=0;e<l.length;e++){k=l[e];d=l[e-1];g=l[e+1];if(e===0){j="mceToolbarStart";if(k.Button){j+=" mceToolbarStartButton"}else{if(k.SplitButton){j+=" mceToolbarStartSplitButton"}else{if(k.ListBox){j+=" mceToolbarStartListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"))}if(d&&k.ListBox){if(d.Button||d.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarEnd"},c.createHTML("span",null,"<!-- IE -->"))}}if(c.stdMode){f+='<td style="position: relative">'+k.renderHTML()+"</td>"}else{f+="<td>"+k.renderHTML()+"</td>"}if(g&&k.ListBox){if(g.Button||g.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarStart"},c.createHTML("span",null,"<!-- IE -->"))}}}j="mceToolbarEnd";if(k.Button){j+=" mceToolbarEndButton"}else{if(k.SplitButton){j+=" mceToolbarEndSplitButton"}else{if(k.ListBox){j+=" mceToolbarEndListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"));return c.createHTML("table",{id:m.id,"class":"mceToolbar"+(n["class"]?" "+n["class"]:""),cellpadding:"0",cellspacing:"0",align:m.settings.align||"",role:"presentation",tabindex:"-1"},"<tbody><tr>"+f+"</tr></tbody>")}})})(tinymce);(function(b){var a=b.util.Dispatcher,c=b.each;b.create("tinymce.AddOnManager",{AddOnManager:function(){var d=this;d.items=[];d.urls={};d.lookup={};d.onAdd=new a(d)},get:function(d){if(this.lookup[d]){return this.lookup[d].instance}else{return undefined}},dependencies:function(e){var d;if(this.lookup[e]){d=this.lookup[e].dependencies}return d||[]},requireLangPack:function(e){var d=b.settings;if(d&&d.language&&d.language_load!==false){b.ScriptLoader.add(this.urls[e]+"/langs/"+d.language+".js")}},add:function(f,e,d){this.items.push(e);this.lookup[f]={instance:e,dependencies:d};this.onAdd.dispatch(this,f,e);return e},createUrl:function(d,e){if(typeof e==="object"){return e}else{return{prefix:d.prefix,resource:e,suffix:d.suffix}}},addComponents:function(f,d){var e=this.urls[f];b.each(d,function(g){b.ScriptLoader.add(e+"/"+g)})},load:function(j,f,d,h){var g=this,e=f;function i(){var k=g.dependencies(j);b.each(k,function(m){var l=g.createUrl(f,m);g.load(l.resource,l,undefined,undefined)});if(d){if(h){d.call(h)}else{d.call(b.ScriptLoader)}}}if(g.urls[j]){return}if(typeof f==="object"){e=f.prefix+f.resource+f.suffix}if(e.indexOf("/")!=0&&e.indexOf("://")==-1){e=b.baseURL+"/"+e}g.urls[j]=e.substring(0,e.lastIndexOf("/"));if(g.lookup[j]){i()}else{b.ScriptLoader.add(e,i,h)}}});b.PluginManager=new b.AddOnManager();b.ThemeManager=new b.AddOnManager()}(tinymce));(function(j){var g=j.each,d=j.extend,k=j.DOM,i=j.dom.Event,f=j.ThemeManager,b=j.PluginManager,e=j.explode,h=j.util.Dispatcher,a,c=0;j.documentBaseURL=window.location.href.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,"");if(!/[\/\\]$/.test(j.documentBaseURL)){j.documentBaseURL+="/"}j.baseURL=new j.util.URI(j.documentBaseURL).toAbsolute(j.baseURL);j.baseURI=new j.util.URI(j.baseURL);j.onBeforeUnload=new h(j);i.add(window,"beforeunload",function(l){j.onBeforeUnload.dispatch(j,l)});j.onAddEditor=new h(j);j.onRemoveEditor=new h(j);j.EditorManager=d(j,{editors:[],i18n:{},activeEditor:null,init:function(q){var n=this,p,l=j.ScriptLoader,u,o=[],m;function r(x,y,t){var v=x[y];if(!v){return}if(j.is(v,"string")){t=v.replace(/\.\w+$/,"");t=t?j.resolve(t):0;v=j.resolve(v)}return v.apply(t||this,Array.prototype.slice.call(arguments,2))}q=d({theme:"simple",language:"en"},q);n.settings=q;i.add(document,"init",function(){var s,v;r(q,"onpageload");switch(q.mode){case"exact":s=q.elements||"";if(s.length>0){g(e(s),function(x){if(k.get(x)){m=new j.Editor(x,q);o.push(m);m.render(1)}else{g(document.forms,function(y){g(y.elements,function(z){if(z.name===x){x="mce_editor_"+c++;k.setAttrib(z,"id",x);m=new j.Editor(x,q);o.push(m);m.render(1)}})})}})}break;case"textareas":case"specific_textareas":function t(y,x){return x.constructor===RegExp?x.test(y.className):k.hasClass(y,x)}g(k.select("textarea"),function(x){if(q.editor_deselector&&t(x,q.editor_deselector)){return}if(!q.editor_selector||t(x,q.editor_selector)){u=k.get(x.name);if(!x.id&&!u){x.id=x.name}if(!x.id||n.get(x.id)){x.id=k.uniqueId()}m=new j.Editor(x.id,q);o.push(m);m.render(1)}});break}if(q.oninit){s=v=0;g(o,function(x){v++;if(!x.initialized){x.onInit.add(function(){s++;if(s==v){r(q,"oninit")}})}else{s++}if(s==v){r(q,"oninit")}})}})},get:function(l){if(l===a){return this.editors}return this.editors[l]},getInstanceById:function(l){return this.get(l)},add:function(m){var l=this,n=l.editors;n[m.id]=m;n.push(m);l._setActive(m);l.onAddEditor.dispatch(l,m);if(j.adapter){j.adapter.patchEditor(m)}return m},remove:function(n){var m=this,l,o=m.editors;if(!o[n.id]){return null}delete o[n.id];for(l=0;l<o.length;l++){if(o[l]==n){o.splice(l,1);break}}if(m.activeEditor==n){m._setActive(o[0])}n.destroy();m.onRemoveEditor.dispatch(m,n);return n},execCommand:function(r,p,o){var q=this,n=q.get(o),l;switch(r){case"mceFocus":n.focus();return true;case"mceAddEditor":case"mceAddControl":if(!q.get(o)){new j.Editor(o,q.settings).render()}return true;case"mceAddFrameControl":l=o.window;l.tinyMCE=tinyMCE;l.tinymce=j;j.DOM.doc=l.document;j.DOM.win=l;n=new j.Editor(o.element_id,o);n.render();if(j.isIE){function m(){n.destroy();l.detachEvent("onunload",m);l=l.tinyMCE=l.tinymce=null}l.attachEvent("onunload",m)}o.page_window=null;return true;case"mceRemoveEditor":case"mceRemoveControl":if(n){n.remove()}return true;case"mceToggleEditor":if(!n){q.execCommand("mceAddControl",0,o);return true}if(n.isHidden()){n.show()}else{n.hide()}return true}if(q.activeEditor){return q.activeEditor.execCommand(r,p,o)}return false},execInstanceCommand:function(p,o,n,m){var l=this.get(p);if(l){return l.execCommand(o,n,m)}return false},triggerSave:function(){g(this.editors,function(l){l.save()})},addI18n:function(n,q){var l,m=this.i18n;if(!j.is(n,"string")){g(n,function(r,p){g(r,function(t,s){g(t,function(v,u){if(s==="common"){m[p+"."+u]=v}else{m[p+"."+s+"."+u]=v}})})})}else{g(q,function(r,p){m[n+"."+p]=r})}},_setActive:function(l){this.selectedInstance=this.activeEditor=l}})})(tinymce);(function(m){var n=m.DOM,j=m.dom.Event,f=m.extend,k=m.util.Dispatcher,i=m.each,a=m.isGecko,b=m.isIE,e=m.isWebKit,d=m.is,h=m.ThemeManager,c=m.PluginManager,o=m.inArray,l=m.grep,g=m.explode;m.create("tinymce.Editor",{Editor:function(r,q){var p=this;p.id=p.editorId=r;p.execCommands={};p.queryStateCommands={};p.queryValueCommands={};p.isNotDirty=false;p.plugins={};i(["onPreInit","onBeforeRenderUI","onPostRender","onInit","onRemove","onActivate","onDeactivate","onClick","onEvent","onMouseUp","onMouseDown","onDblClick","onKeyDown","onKeyUp","onKeyPress","onContextMenu","onSubmit","onReset","onPaste","onPreProcess","onPostProcess","onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent","onLoadContent","onSaveContent","onNodeChange","onChange","onBeforeExecCommand","onExecCommand","onUndo","onRedo","onVisualAid","onSetProgressState"],function(s){p[s]=new k(p)});p.settings=q=f({id:r,language:"en",docs_language:"en",theme:"simple",skin:"default",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:m.documentBaseURL,add_form_submit_trigger:1,submit_patch:1,add_unload_trigger:1,convert_urls:1,relative_urls:1,remove_script_host:1,table_inline_editing:0,object_resizing:1,cleanup:1,accessibility_focus:1,custom_shortcuts:1,custom_undo_redo_keyboard_shortcuts:1,custom_undo_redo_restore_selection:1,custom_undo_redo:1,doctype:m.isIE6?'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">':"<!DOCTYPE>",visual_table_class:"mceItemTable",visual:1,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%",apply_source_formatting:1,directionality:"ltr",forced_root_block:"p",hidden_input:1,padd_empty_editor:1,render_ui:1,init_theme:1,force_p_newlines:1,indentation:"30px",keep_styles:1,fix_table_elements:1,inline_styles:1,convert_fonts_to_spans:true,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",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr",validate:true,entity_encoding:"named",url_converter:p.convertURL,url_converter_scope:p,ie7_compat:true},q);p.documentBaseURI=new m.util.URI(q.document_base_url||m.documentBaseURL,{base_uri:tinyMCE.baseURI});p.baseURI=m.baseURI;p.contentCSS=[];p.execCallback("setup",p)},render:function(r){var u=this,v=u.settings,x=u.id,p=m.ScriptLoader;if(!j.domLoaded){j.add(document,"init",function(){u.render()});return}tinyMCE.settings=v;if(!u.getElement()){return}if(m.isIDevice&&!m.isIOS5){return}if(!/TEXTAREA|INPUT/i.test(u.getElement().nodeName)&&v.hidden_input&&n.getParent(x,"form")){n.insertAfter(n.create("input",{type:"hidden",name:x}),x)}if(m.WindowManager){u.windowManager=new m.WindowManager(u)}if(v.encoding=="xml"){u.onGetContent.add(function(s,t){if(t.save){t.content=n.encode(t.content)}})}if(v.add_form_submit_trigger){u.onSubmit.addToTop(function(){if(u.initialized){u.save();u.isNotDirty=1}})}if(v.add_unload_trigger){u._beforeUnload=tinyMCE.onBeforeUnload.add(function(){if(u.initialized&&!u.destroyed&&!u.isHidden()){u.save({format:"raw",no_events:true})}})}m.addUnload(u.destroy,u);if(v.submit_patch){u.onBeforeRenderUI.add(function(){var s=u.getElement().form;if(!s){return}if(s._mceOldSubmit){return}if(!s.submit.nodeType&&!s.submit.length){u.formElement=s;s._mceOldSubmit=s.submit;s.submit=function(){m.triggerSave();u.isNotDirty=1;return u.formElement._mceOldSubmit(u.formElement)}}s=null})}function q(){if(v.language&&v.language_load!==false){p.add(m.baseURL+"/langs/"+v.language+".js")}if(v.theme&&v.theme.charAt(0)!="-"&&!h.urls[v.theme]){h.load(v.theme,"themes/"+v.theme+"/editor_template"+m.suffix+".js")}i(g(v.plugins),function(t){if(t&&!c.urls[t]){if(t.charAt(0)=="-"){t=t.substr(1,t.length);var s=c.dependencies(t);i(s,function(z){var y={prefix:"plugins/",resource:z,suffix:"/editor_plugin"+m.suffix+".js"};var z=c.createUrl(y,z);c.load(z.resource,z)})}else{if(t=="safari"){return}c.load(t,{prefix:"plugins/",resource:t,suffix:"/editor_plugin"+m.suffix+".js"})}}});p.loadQueue(function(){if(!u.removed){u.init()}})}q()},init:function(){var r,H=this,I=H.settings,E,A,D=H.getElement(),q,p,F,y,C,G,z,v=[];m.add(H);I.aria_label=I.aria_label||n.getAttrib(D,"aria-label",H.getLang("aria.rich_text_area"));if(I.theme){I.theme=I.theme.replace(/-/,"");q=h.get(I.theme);H.theme=new q();if(H.theme.init&&I.init_theme){H.theme.init(H,h.urls[I.theme]||m.documentBaseURL.replace(/\/$/,""))}}function B(J){var K=c.get(J),t=c.urls[J]||m.documentBaseURL.replace(/\/$/,""),s;if(K&&m.inArray(v,J)===-1){i(c.dependencies(J),function(u){B(u)});s=new K(H,t);H.plugins[J]=s;if(s.init){s.init(H,t);v.push(J)}}}i(g(I.plugins.replace(/\-/g,"")),B);if(I.popup_css!==false){if(I.popup_css){I.popup_css=H.documentBaseURI.toAbsolute(I.popup_css)}else{I.popup_css=H.baseURI.toAbsolute("themes/"+I.theme+"/skins/"+I.skin+"/dialog.css")}}if(I.popup_css_add){I.popup_css+=","+H.documentBaseURI.toAbsolute(I.popup_css_add)}H.controlManager=new m.ControlManager(H);if(I.custom_undo_redo){H.onBeforeExecCommand.add(function(t,J,u,K,s){if(J!="Undo"&&J!="Redo"&&J!="mceRepaint"&&(!s||!s.skip_undo)){H.undoManager.beforeChange()}});H.onExecCommand.add(function(t,J,u,K,s){if(J!="Undo"&&J!="Redo"&&J!="mceRepaint"&&(!s||!s.skip_undo)){H.undoManager.add()}})}H.onExecCommand.add(function(s,t){if(!/^(FontName|FontSize)$/.test(t)){H.nodeChanged()}});if(a){function x(s,t){if(!t||!t.initial){H.execCommand("mceRepaint")}}H.onUndo.add(x);H.onRedo.add(x);H.onSetContent.add(x)}H.onBeforeRenderUI.dispatch(H,H.controlManager);if(I.render_ui){E=I.width||D.style.width||D.offsetWidth;A=I.height||D.style.height||D.offsetHeight;H.orgDisplay=D.style.display;G=/^[0-9\.]+(|px)$/i;if(G.test(""+E)){E=Math.max(parseInt(E)+(q.deltaWidth||0),100)}if(G.test(""+A)){A=Math.max(parseInt(A)+(q.deltaHeight||0),100)}q=H.theme.renderUI({targetNode:D,width:E,height:A,deltaWidth:I.delta_width,deltaHeight:I.delta_height});H.editorContainer=q.editorContainer}if(document.domain&&location.hostname!=document.domain){m.relaxedDomain=document.domain}n.setStyles(q.sizeContainer||q.editorContainer,{width:E,height:A});if(I.content_css){m.each(g(I.content_css),function(s){H.contentCSS.push(H.documentBaseURI.toAbsolute(s))})}A=(q.iframeHeight||A)+(typeof(A)=="number"?(q.deltaHeight||0):"");if(A<100){A=100}H.iframeHTML=I.doctype+'<html><head xmlns="http://www.w3.org/1999/xhtml">';if(I.document_base_url!=m.documentBaseURL){H.iframeHTML+='<base href="'+H.documentBaseURI.getURI()+'" />'}if(I.ie7_compat){H.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=7" />'}else{H.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=edge" />'}H.iframeHTML+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';for(z=0;z<H.contentCSS.length;z++){H.iframeHTML+='<link type="text/css" rel="stylesheet" href="'+H.contentCSS[z]+'" />'}y=I.body_id||"tinymce";if(y.indexOf("=")!=-1){y=H.getParam("body_id","","hash");y=y[H.id]||y}C=I.body_class||"";if(C.indexOf("=")!=-1){C=H.getParam("body_class","","hash");C=C[H.id]||""}H.iframeHTML+='</head><body id="'+y+'" class="mceContentBody '+C+'"><br></body></html>';if(m.relaxedDomain&&(b||(m.isOpera&&parseFloat(opera.version())<11))){F='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinyMCE.get("'+H.id+'");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()'}r=n.add(q.iframeContainer,"iframe",{id:H.id+"_ifr",src:F||'javascript:""',frameBorder:"0",allowTransparency:"true",title:I.aria_label,style:{width:"100%",height:A,display:"block"}});H.contentAreaContainer=q.iframeContainer;n.get(q.editorContainer).style.display=H.orgDisplay;n.get(H.id).style.display="none";n.setAttrib(H.id,"aria-hidden",true);if(!m.relaxedDomain||!F){H.setupIframe()}D=r=q=null},setupIframe:function(){var q=this,v=q.settings,x=n.get(q.id),y=q.getDoc(),u,p;if(!b||!m.relaxedDomain){y.open();y.write(q.iframeHTML);y.close();if(m.relaxedDomain){y.domain=m.relaxedDomain}}p=q.getBody();p.disabled=true;if(!v.readonly){p.contentEditable=true}p.disabled=false;q.schema=new m.html.Schema(v);q.dom=new m.dom.DOMUtils(q.getDoc(),{keep_values:true,url_converter:q.convertURL,url_converter_scope:q,hex_colors:v.force_hex_style_colors,class_filter:v.class_filter,update_styles:1,fix_ie_paragraphs:1,schema:q.schema});q.parser=new m.html.DomParser(v,q.schema);if(!q.settings.allow_html_in_named_anchor){q.parser.addAttributeFilter("name",function(s,t){var A=s.length,C,z,B,D;while(A--){D=s[A];if(D.name==="a"&&D.firstChild){B=D.parent;C=D.lastChild;do{z=C.prev;B.insert(C,D);C=z}while(C)}}})}q.parser.addAttributeFilter("src,href,style",function(s,t){var z=s.length,B,D=q.dom,C,A;while(z--){B=s[z];C=B.attr(t);A="data-mce-"+t;if(!B.attributes.map[A]){if(t==="style"){B.attr(A,D.serializeStyle(D.parseStyle(C),B.name))}else{B.attr(A,q.convertURL(C,t,B.name))}}}});q.parser.addNodeFilter("script",function(s,t){var z=s.length,A;while(z--){A=s[z];A.attr("type","mce-"+(A.attr("type")||"text/javascript"))}});q.parser.addNodeFilter("#cdata",function(s,t){var z=s.length,A;while(z--){A=s[z];A.type=8;A.name="#comment";A.value="[CDATA["+A.value+"]]"}});q.parser.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(t,z){var A=t.length,B,s=q.schema.getNonEmptyElements();while(A--){B=t[A];if(B.isEmpty(s)){B.empty().append(new m.html.Node("br",1)).shortEnded=true}}});q.serializer=new m.dom.Serializer(v,q.dom,q.schema);q.selection=new m.dom.Selection(q.dom,q.getWin(),q.serializer);q.formatter=new m.Formatter(this);q.formatter.register({alignleft:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"left"}},{selector:"img,table",collapsed:false,styles:{"float":"left"}}],aligncenter:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"center"}},{selector:"img",collapsed:false,styles:{display:"block",marginLeft:"auto",marginRight:"auto"}},{selector:"table",collapsed:false,styles:{marginLeft:"auto",marginRight:"auto"}}],alignright:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"right"}},{selector:"img,table",collapsed:false,styles:{"float":"right"}}],alignfull:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"justify"}}],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:true},{inline:"u",remove:"all"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:true},{inline:"strike",remove:"all"}],forecolor:{inline:"span",styles:{color:"%value"},wrap_links:false},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},wrap_links:false},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"},link:{inline:"a",selector:"a",remove:"all",split:true,deep:true,onmatch:function(s){return true},onformat:function(z,s,t){i(t,function(B,A){q.dom.setAttrib(z,A,B)})}},removeformat:[{selector:"b,strong,em,i,font,u,strike",remove:"all",split:true,expand:false,block_expand:true,deep:true},{selector:"span",attributes:["style","class"],remove:"empty",split:true,expand:false,deep:true},{selector:"*",attributes:["style","class"],split:false,expand:false,deep:true}]});i("p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp".split(/\s/),function(s){q.formatter.register(s,{block:s,remove:"all"})});q.formatter.register(q.settings.formats);q.undoManager=new m.UndoManager(q);q.undoManager.onAdd.add(function(t,s){if(t.hasUndo()){return q.onChange.dispatch(q,s,t)}});q.undoManager.onUndo.add(function(t,s){return q.onUndo.dispatch(q,s,t)});q.undoManager.onRedo.add(function(t,s){return q.onRedo.dispatch(q,s,t)});q.forceBlocks=new m.ForceBlocks(q,{forced_root_block:v.forced_root_block});q.editorCommands=new m.EditorCommands(q);q.serializer.onPreProcess.add(function(s,t){return q.onPreProcess.dispatch(q,t,s)});q.serializer.onPostProcess.add(function(s,t){return q.onPostProcess.dispatch(q,t,s)});q.onPreInit.dispatch(q);if(!v.gecko_spellcheck){q.getBody().spellcheck=0}if(!v.readonly){q._addEvents()}q.controlManager.onPostRender.dispatch(q,q.controlManager);q.onPostRender.dispatch(q);q.quirks=new m.util.Quirks(this);if(v.directionality){q.getBody().dir=v.directionality}if(v.nowrap){q.getBody().style.whiteSpace="nowrap"}if(v.handle_node_change_callback){q.onNodeChange.add(function(t,s,z){q.execCallback("handle_node_change_callback",q.id,z,-1,-1,true,q.selection.isCollapsed())})}if(v.save_callback){q.onSaveContent.add(function(s,z){var t=q.execCallback("save_callback",q.id,z.content,q.getBody());if(t){z.content=t}})}if(v.onchange_callback){q.onChange.add(function(t,s){q.execCallback("onchange_callback",q,s)})}if(v.protect){q.onBeforeSetContent.add(function(s,t){if(v.protect){i(v.protect,function(z){t.content=t.content.replace(z,function(A){return"<!--mce:protected "+escape(A)+"-->"})})}})}if(v.convert_newlines_to_brs){q.onBeforeSetContent.add(function(s,t){if(t.initial){t.content=t.content.replace(/\r?\n/g,"<br />")}})}if(v.preformatted){q.onPostProcess.add(function(s,t){t.content=t.content.replace(/^\s*<pre.*?>/,"");t.content=t.content.replace(/<\/pre>\s*$/,"");if(t.set){t.content='<pre class="mceItemHidden">'+t.content+"</pre>"}})}if(v.verify_css_classes){q.serializer.attribValueFilter=function(B,z){var A,t;if(B=="class"){if(!q.classesRE){t=q.dom.getClasses();if(t.length>0){A="";i(t,function(s){A+=(A?"|":"")+s["class"]});q.classesRE=new RegExp("("+A+")","gi")}}return !q.classesRE||/(\bmceItem\w+\b|\bmceTemp\w+\b)/g.test(z)||q.classesRE.test(z)?z:""}return z}}if(v.cleanup_callback){q.onBeforeSetContent.add(function(s,t){t.content=q.execCallback("cleanup_callback","insert_to_editor",t.content,t)});q.onPreProcess.add(function(s,t){if(t.set){q.execCallback("cleanup_callback","insert_to_editor_dom",t.node,t)}if(t.get){q.execCallback("cleanup_callback","get_from_editor_dom",t.node,t)}});q.onPostProcess.add(function(s,t){if(t.set){t.content=q.execCallback("cleanup_callback","insert_to_editor",t.content,t)}if(t.get){t.content=q.execCallback("cleanup_callback","get_from_editor",t.content,t)}})}if(v.save_callback){q.onGetContent.add(function(s,t){if(t.save){t.content=q.execCallback("save_callback",q.id,t.content,q.getBody())}})}if(v.handle_event_callback){q.onEvent.add(function(s,t,z){if(q.execCallback("handle_event_callback",t,s,z)===false){j.cancel(t)}})}q.onSetContent.add(function(){q.addVisual(q.getBody())});if(v.padd_empty_editor){q.onPostProcess.add(function(s,t){t.content=t.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/,"")})}if(a){function r(s,t){i(s.dom.select("a"),function(A){var z=A.parentNode;if(s.dom.isBlock(z)&&z.lastChild===A){s.dom.add(z,"br",{"data-mce-bogus":1})}})}q.onExecCommand.add(function(s,t){if(t==="CreateLink"){r(s)}});q.onSetContent.add(q.selection.onSetContent.add(r))}q.load({initial:true,format:"html"});q.startContent=q.getContent({format:"raw"});q.undoManager.add();q.initialized=true;q.onInit.dispatch(q);q.execCallback("setupcontent_callback",q.id,q.getBody(),q.getDoc());q.execCallback("init_instance_callback",q);q.focus(true);q.nodeChanged({initial:1});i(q.contentCSS,function(s){q.dom.loadCSS(s)});if(v.auto_focus){setTimeout(function(){var s=m.get(v.auto_focus);s.selection.select(s.getBody(),1);s.selection.collapse(1);s.getBody().focus();s.getWin().focus()},100)}x=null},focus:function(u){var y,q=this,s=q.selection,x=q.settings.content_editable,r,p,v=q.getDoc();if(!u){r=s.getRng();if(r.item){p=r.item(0)}q._refreshContentEditable();s.normalize();if(!x){q.getWin().focus()}if(m.isGecko){q.getBody().focus()}if(p&&p.ownerDocument==v){r=v.body.createControlRange();r.addElement(p);r.select()}}if(m.activeEditor!=q){if((y=m.activeEditor)!=null){y.onDeactivate.dispatch(y,q)}q.onActivate.dispatch(q,y)}m._setActive(q)},execCallback:function(u){var p=this,r=p.settings[u],q;if(!r){return}if(p.callbackLookup&&(q=p.callbackLookup[u])){r=q.func;q=q.scope}if(d(r,"string")){q=r.replace(/\.\w+$/,"");q=q?m.resolve(q):0;r=m.resolve(r);p.callbackLookup=p.callbackLookup||{};p.callbackLookup[u]={func:r,scope:q}}return r.apply(q||p,Array.prototype.slice.call(arguments,1))},translate:function(p){var r=this.settings.language||"en",q=m.i18n;if(!p){return""}return q[r+"."+p]||p.replace(/{\#([^}]+)\}/g,function(t,s){return q[r+"."+s]||"{#"+s+"}"})},getLang:function(q,p){return m.i18n[(this.settings.language||"en")+"."+q]||(d(p)?p:"{#"+q+"}")},getParam:function(u,r,p){var s=m.trim,q=d(this.settings[u])?this.settings[u]:r,t;if(p==="hash"){t={};if(d(q,"string")){i(q.indexOf("=")>0?q.split(/[;,](?![^=;,]*(?:[;,]|$))/):q.split(","),function(x){x=x.split("=");if(x.length>1){t[s(x[0])]=s(x[1])}else{t[s(x[0])]=s(x)}})}else{t=q}return t}return q},nodeChanged:function(r){var p=this,q=p.selection,u=q.getStart()||p.getBody();if(p.initialized){r=r||{};u=b&&u.ownerDocument!=p.getDoc()?p.getBody():u;r.parents=[];p.dom.getParent(u,function(s){if(s.nodeName=="BODY"){return true}r.parents.push(s)});p.onNodeChange.dispatch(p,r?r.controlManager||p.controlManager:p.controlManager,u,q.isCollapsed(),r)}},addButton:function(r,q){var p=this;p.buttons=p.buttons||{};p.buttons[r]=q},addCommand:function(p,r,q){this.execCommands[p]={func:r,scope:q||this}},addQueryStateHandler:function(p,r,q){this.queryStateCommands[p]={func:r,scope:q||this}},addQueryValueHandler:function(p,r,q){this.queryValueCommands[p]={func:r,scope:q||this}},addShortcut:function(r,u,p,s){var q=this,v;if(!q.settings.custom_shortcuts){return false}q.shortcuts=q.shortcuts||{};if(d(p,"string")){v=p;p=function(){q.execCommand(v,false,null)}}if(d(p,"object")){v=p;p=function(){q.execCommand(v[0],v[1],v[2])}}i(g(r),function(t){var x={func:p,scope:s||this,desc:u,alt:false,ctrl:false,shift:false};i(g(t,"+"),function(y){switch(y){case"alt":case"ctrl":case"shift":x[y]=true;break;default:x.charCode=y.charCodeAt(0);x.keyCode=y.toUpperCase().charCodeAt(0)}});q.shortcuts[(x.ctrl?"ctrl":"")+","+(x.alt?"alt":"")+","+(x.shift?"shift":"")+","+x.keyCode]=x});return true},execCommand:function(x,v,z,p){var r=this,u=0,y,q;if(!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(x)&&(!p||!p.skip_focus)){r.focus()}y={};r.onBeforeExecCommand.dispatch(r,x,v,z,y);if(y.terminate){return false}if(r.execCallback("execcommand_callback",r.id,r.selection.getNode(),x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(y=r.execCommands[x]){q=y.func.call(y.scope,v,z);if(q!==true){r.onExecCommand.dispatch(r,x,v,z,p);return q}}i(r.plugins,function(s){if(s.execCommand&&s.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);u=1;return false}});if(u){return true}if(r.theme&&r.theme.execCommand&&r.theme.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(r.editorCommands.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}r.getDoc().execCommand(x,v,z);r.onExecCommand.dispatch(r,x,v,z,p)},queryCommandState:function(u){var q=this,v,r;if(q._isHidden()){return}if(v=q.queryStateCommands[u]){r=v.func.call(v.scope);if(r!==true){return r}}v=q.editorCommands.queryCommandState(u);if(v!==-1){return v}try{return this.getDoc().queryCommandState(u)}catch(p){}},queryCommandValue:function(v){var q=this,u,r;if(q._isHidden()){return}if(u=q.queryValueCommands[v]){r=u.func.call(u.scope);if(r!==true){return r}}u=q.editorCommands.queryCommandValue(v);if(d(u)){return u}try{return this.getDoc().queryCommandValue(v)}catch(p){}},show:function(){var p=this;n.show(p.getContainer());n.hide(p.id);p.load()},hide:function(){var p=this,q=p.getDoc();if(b&&q){q.execCommand("SelectAll")}p.save();n.hide(p.getContainer());n.setStyle(p.id,"display",p.orgDisplay)},isHidden:function(){return !n.isHidden(this.id)},setProgressState:function(p,q,r){this.onSetProgressState.dispatch(this,p,q,r);return p},load:function(s){var p=this,r=p.getElement(),q;if(r){s=s||{};s.load=true;q=p.setContent(d(r.value)?r.value:r.innerHTML,s);s.element=r;if(!s.no_events){p.onLoadContent.dispatch(p,s)}s.element=r=null;return q}},save:function(u){var p=this,s=p.getElement(),q,r;if(!s||!p.initialized){return}u=u||{};u.save=true;if(!u.no_events){p.undoManager.typing=false;p.undoManager.add()}u.element=s;q=u.content=p.getContent(u);if(!u.no_events){p.onSaveContent.dispatch(p,u)}q=u.content;if(!/TEXTAREA|INPUT/i.test(s.nodeName)){s.innerHTML=q;if(r=n.getParent(p.id,"form")){i(r.elements,function(t){if(t.name==p.id){t.value=q;return false}})}}else{s.value=q}u.element=s=null;return q},setContent:function(u,s){var r=this,q,p=r.getBody(),t;s=s||{};s.format=s.format||"html";s.set=true;s.content=u;if(!s.no_events){r.onBeforeSetContent.dispatch(r,s)}u=s.content;if(!m.isIE&&(u.length===0||/^\s+$/.test(u))){t=r.settings.forced_root_block;if(t){u="<"+t+'><br data-mce-bogus="1"></'+t+">"}else{u='<br data-mce-bogus="1">'}p.innerHTML=u;r.selection.select(p,true);r.selection.collapse(true);return}if(s.format!=="raw"){u=new m.html.Serializer({},r.schema).serialize(r.parser.parse(u))}s.content=m.trim(u);r.dom.setHTML(p,s.content);if(!s.no_events){r.onSetContent.dispatch(r,s)}r.selection.normalize();return s.content},getContent:function(q){var p=this,r;q=q||{};q.format=q.format||"html";q.get=true;if(!q.no_events){p.onBeforeGetContent.dispatch(p,q)}if(q.format=="raw"){r=p.getBody().innerHTML}else{r=p.serializer.serialize(p.getBody(),q)}q.content=m.trim(r);if(!q.no_events){p.onGetContent.dispatch(p,q)}return q.content},isDirty:function(){var p=this;return m.trim(p.startContent)!=m.trim(p.getContent({format:"raw",no_events:1}))&&!p.isNotDirty},getContainer:function(){var p=this;if(!p.container){p.container=n.get(p.editorContainer||p.id+"_parent")}return p.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return n.get(this.settings.content_element||this.id)},getWin:function(){var p=this,q;if(!p.contentWindow){q=n.get(p.id+"_ifr");if(q){p.contentWindow=q.contentWindow}}return p.contentWindow},getDoc:function(){var q=this,p;if(!q.contentDocument){p=q.getWin();if(p){q.contentDocument=p.document}}return q.contentDocument},getBody:function(){return this.bodyElement||this.getDoc().body},convertURL:function(p,x,v){var q=this,r=q.settings;if(r.urlconverter_callback){return q.execCallback("urlconverter_callback",p,v,true,x)}if(!r.convert_urls||(v&&v.nodeName=="LINK")||p.indexOf("file:")===0){return p}if(r.relative_urls){return q.documentBaseURI.toRelative(p)}p=q.documentBaseURI.toAbsolute(p,r.remove_script_host);return p},addVisual:function(r){var p=this,q=p.settings;r=r||p.getBody();if(!d(p.hasVisual)){p.hasVisual=q.visual}i(p.dom.select("table,a",r),function(t){var s;switch(t.nodeName){case"TABLE":s=p.dom.getAttrib(t,"border");if(!s||s=="0"){if(p.hasVisual){p.dom.addClass(t,q.visual_table_class)}else{p.dom.removeClass(t,q.visual_table_class)}}return;case"A":s=p.dom.getAttrib(t,"name");if(s){if(p.hasVisual){p.dom.addClass(t,"mceItemAnchor")}else{p.dom.removeClass(t,"mceItemAnchor")}}return}});p.onVisualAid.dispatch(p,r,p.hasVisual)},remove:function(){var p=this,q=p.getContainer();p.removed=1;p.hide();p.execCallback("remove_instance_callback",p);p.onRemove.dispatch(p);p.onExecCommand.listeners=[];m.remove(p);n.remove(q)},destroy:function(q){var p=this;if(p.destroyed){return}if(!q){m.removeUnload(p.destroy);tinyMCE.onBeforeUnload.remove(p._beforeUnload);if(p.theme&&p.theme.destroy){p.theme.destroy()}p.controlManager.destroy();p.selection.destroy();p.dom.destroy();if(!p.settings.content_editable){j.clear(p.getWin());j.clear(p.getDoc())}j.clear(p.getBody());j.clear(p.formElement)}if(p.formElement){p.formElement.submit=p.formElement._mceOldSubmit;p.formElement._mceOldSubmit=null}p.contentAreaContainer=p.formElement=p.container=p.settings.content_element=p.bodyElement=p.contentDocument=p.contentWindow=null;if(p.selection){p.selection=p.selection.win=p.selection.dom=p.selection.dom.doc=null}p.destroyed=1},_addEvents:function(){var B=this,r,C=B.settings,q=B.dom,x={mouseup:"onMouseUp",mousedown:"onMouseDown",click:"onClick",keyup:"onKeyUp",keydown:"onKeyDown",keypress:"onKeyPress",submit:"onSubmit",reset:"onReset",contextmenu:"onContextMenu",dblclick:"onDblClick",paste:"onPaste"};function p(t,D){var s=t.type;if(B.removed){return}if(B.onEvent.dispatch(B,t,D)!==false){B[x[t.fakeType||t.type]].dispatch(B,t,D)}}i(x,function(t,s){switch(s){case"contextmenu":q.bind(B.getDoc(),s,p);break;case"paste":q.bind(B.getBody(),s,function(D){p(D)});break;case"submit":case"reset":q.bind(B.getElement().form||n.getParent(B.id,"form"),s,p);break;default:q.bind(C.content_editable?B.getBody():B.getDoc(),s,p)}});q.bind(C.content_editable?B.getBody():(a?B.getDoc():B.getWin()),"focus",function(s){B.focus(true)});if(m.isGecko){q.bind(B.getDoc(),"DOMNodeInserted",function(t){var s;t=t.target;if(t.nodeType===1&&t.nodeName==="IMG"&&(s=t.getAttribute("data-mce-src"))){t.src=B.documentBaseURI.toAbsolute(s)}})}if(a){function u(){var E=this,G=E.getDoc(),F=E.settings;if(a&&!F.readonly){E._refreshContentEditable();try{G.execCommand("styleWithCSS",0,false)}catch(D){if(!E._isHidden()){try{G.execCommand("useCSS",0,true)}catch(D){}}}if(!F.table_inline_editing){try{G.execCommand("enableInlineTableEditing",false,false)}catch(D){}}if(!F.object_resizing){try{G.execCommand("enableObjectResizing",false,false)}catch(D){}}}}B.onBeforeExecCommand.add(u);B.onMouseDown.add(u)}B.onMouseUp.add(B.nodeChanged);B.onKeyUp.add(function(s,t){var D=t.keyCode;if((D>=33&&D<=36)||(D>=37&&D<=40)||D==13||D==45||D==46||D==8||(m.isMac&&(D==91||D==93))||t.ctrlKey){B.nodeChanged()}});B.onKeyDown.add(function(t,D){if(D.keyCode!=8){return}var F=t.selection.getRng().startContainer;var E=t.selection.getRng().startOffset;while(F&&F.nodeType&&F.nodeType!=1&&F.parentNode){F=F.parentNode}if(F&&F.parentNode&&F.parentNode.tagName==="BLOCKQUOTE"&&F.parentNode.firstChild==F&&E==0){t.formatter.toggle("blockquote",null,F.parentNode);var s=t.selection.getRng();s.setStart(F,0);s.setEnd(F,0);t.selection.setRng(s);t.selection.collapse(false)}});B.onReset.add(function(){B.setContent(B.startContent,{format:"raw"})});if(C.custom_shortcuts){if(C.custom_undo_redo_keyboard_shortcuts){B.addShortcut("ctrl+z",B.getLang("undo_desc"),"Undo");B.addShortcut("ctrl+y",B.getLang("redo_desc"),"Redo")}B.addShortcut("ctrl+b",B.getLang("bold_desc"),"Bold");B.addShortcut("ctrl+i",B.getLang("italic_desc"),"Italic");B.addShortcut("ctrl+u",B.getLang("underline_desc"),"Underline");for(r=1;r<=6;r++){B.addShortcut("ctrl+"+r,"",["FormatBlock",false,"h"+r])}B.addShortcut("ctrl+7","",["FormatBlock",false,"p"]);B.addShortcut("ctrl+8","",["FormatBlock",false,"div"]);B.addShortcut("ctrl+9","",["FormatBlock",false,"address"]);function v(t){var s=null;if(!t.altKey&&!t.ctrlKey&&!t.metaKey){return s}i(B.shortcuts,function(D){if(m.isMac&&D.ctrl!=t.metaKey){return}else{if(!m.isMac&&D.ctrl!=t.ctrlKey){return}}if(D.alt!=t.altKey){return}if(D.shift!=t.shiftKey){return}if(t.keyCode==D.keyCode||(t.charCode&&t.charCode==D.charCode)){s=D;return false}});return s}B.onKeyUp.add(function(s,t){var D=v(t);if(D){return j.cancel(t)}});B.onKeyPress.add(function(s,t){var D=v(t);if(D){return j.cancel(t)}});B.onKeyDown.add(function(s,t){var D=v(t);if(D){D.func.call(D.scope);return j.cancel(t)}})}if(m.isIE){q.bind(B.getDoc(),"controlselect",function(D){var t=B.resizeInfo,s;D=D.target;if(D.nodeName!=="IMG"){return}if(t){q.unbind(t.node,t.ev,t.cb)}if(!q.hasClass(D,"mceItemNoResize")){ev="resizeend";s=q.bind(D,ev,function(F){var E;F=F.target;if(E=q.getStyle(F,"width")){q.setAttrib(F,"width",E.replace(/[^0-9%]+/g,""));q.setStyle(F,"width","")}if(E=q.getStyle(F,"height")){q.setAttrib(F,"height",E.replace(/[^0-9%]+/g,""));q.setStyle(F,"height","")}})}else{ev="resizestart";s=q.bind(D,"resizestart",j.cancel,j)}t=B.resizeInfo={node:D,ev:ev,cb:s}})}if(m.isOpera){B.onClick.add(function(s,t){j.prevent(t)})}if(C.custom_undo_redo){function y(){B.undoManager.typing=false;B.undoManager.add()}q.bind(B.getDoc(),"focusout",function(s){if(!B.removed&&B.undoManager.typing){y()}});B.dom.bind(B.dom.getRoot(),"dragend",function(s){y()});B.onKeyUp.add(function(s,D){var t=D.keyCode;if((t>=33&&t<=36)||(t>=37&&t<=40)||t==13||t==45||D.ctrlKey){y()}});B.onKeyDown.add(function(s,E){var D=E.keyCode,t;if(D==8){t=B.getDoc().selection;if(t&&t.createRange&&t.createRange().item){B.undoManager.beforeChange();s.dom.remove(t.createRange().item(0));y();return j.cancel(E)}}if((D>=33&&D<=36)||(D>=37&&D<=40)||D==13||D==45){if(m.isIE&&D==13){B.undoManager.beforeChange()}if(B.undoManager.typing){y()}return}if((D<16||D>20)&&D!=224&&D!=91&&!B.undoManager.typing){B.undoManager.beforeChange();B.undoManager.typing=true;B.undoManager.add()}});B.onMouseDown.add(function(){if(B.undoManager.typing){y()}})}if(m.isGecko){function A(){var s=B.dom.getAttribs(B.selection.getStart().cloneNode(false));return function(){var t=B.selection.getStart();if(t!==B.getBody()){B.dom.setAttrib(t,"style",null);i(s,function(D){t.setAttributeNode(D.cloneNode(true))})}}}function z(){var t=B.selection;return !t.isCollapsed()&&t.getStart()!=t.getEnd()}B.onKeyPress.add(function(s,D){var t;if((D.keyCode==8||D.keyCode==46)&&z()){t=A();B.getDoc().execCommand("delete",false,null);t();return j.cancel(D)}});B.dom.bind(B.getDoc(),"cut",function(t){var s;if(z()){s=A();B.onKeyUp.addToTop(j.cancel,j);setTimeout(function(){s();B.onKeyUp.remove(j.cancel,j)},0)}})}},_refreshContentEditable:function(){var q=this,p,r;if(q._isHidden()){p=q.getBody();r=p.parentNode;r.removeChild(p);r.appendChild(p);p.focus()}},_isHidden:function(){var p;if(!a){return 0}p=this.selection.getSel();return(!p||!p.rangeCount||p.rangeCount==0)}})})(tinymce);(function(c){var d=c.each,e,a=true,b=false;c.EditorCommands=function(n){var m=n.dom,p=n.selection,j={state:{},exec:{},value:{}},k=n.settings,q=n.formatter,o;function r(z,y,x){var v;z=z.toLowerCase();if(v=j.exec[z]){v(z,y,x);return a}return b}function l(x){var v;x=x.toLowerCase();if(v=j.state[x]){return v(x)}return -1}function h(x){var v;x=x.toLowerCase();if(v=j.value[x]){return v(x)}return b}function u(v,x){x=x||"exec";d(v,function(z,y){d(y.toLowerCase().split(","),function(A){j[x][A]=z})})}c.extend(this,{execCommand:r,queryCommandState:l,queryCommandValue:h,addCommands:u});function f(y,x,v){if(x===e){x=b}if(v===e){v=null}return n.getDoc().execCommand(y,x,v)}function t(v){return q.match(v)}function s(v,x){q.toggle(v,x?{value:x}:e)}function i(v){o=p.getBookmark(v)}function g(){p.moveToBookmark(o)}u({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){n.undoManager.add()},"Cut,Copy,Paste":function(z){var y=n.getDoc(),v;try{f(z)}catch(x){v=a}if(v||!y.queryCommandSupported(z)){if(c.isGecko){n.windowManager.confirm(n.getLang("clipboard_msg"),function(A){if(A){open("http://www.mozilla.org/editor/midasdemo/securityprefs.html","_blank")}})}else{n.windowManager.alert(n.getLang("clipboard_no_support"))}}},unlink:function(v){if(p.isCollapsed()){p.select(p.getNode())}f(v);p.collapse(b)},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(v){var x=v.substring(7);d("left,center,right,full".split(","),function(y){if(x!=y){q.remove("align"+y)}});s("align"+x);r("mceRepaint")},"InsertUnorderedList,InsertOrderedList":function(y){var v,x;f(y);v=m.getParent(p.getNode(),"ol,ul");if(v){x=v.parentNode;if(/^(H[1-6]|P|ADDRESS|PRE)$/.test(x.nodeName)){i();m.split(x,v);g()}}},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(v){s(v)},"ForeColor,HiliteColor,FontName":function(y,x,v){s(y,v)},FontSize:function(z,y,x){var v,A;if(x>=1&&x<=7){A=c.explode(k.font_size_style_values);v=c.explode(k.font_size_classes);if(v){x=v[x-1]||x}else{x=A[x-1]||x}}s(z,x)},RemoveFormat:function(v){q.remove(v)},mceBlockQuote:function(v){s("blockquote")},FormatBlock:function(y,x,v){return s(v||"p")},mceCleanup:function(){var v=p.getBookmark();n.setContent(n.getContent({cleanup:a}),{cleanup:a});p.moveToBookmark(v)},mceRemoveNode:function(z,y,x){var v=x||p.getNode();if(v!=n.getBody()){i();n.dom.remove(v,a);g()}},mceSelectNodeDepth:function(z,y,x){var v=0;m.getParent(p.getNode(),function(A){if(A.nodeType==1&&v++==x){p.select(A);return b}},n.getBody())},mceSelectNode:function(y,x,v){p.select(v)},mceInsertContent:function(B,I,K){var y,J,E,z,F,G,D,C,L,x,A,M,v,H;y=n.parser;J=new c.html.Serializer({},n.schema);v='<span id="mce_marker" data-mce-type="bookmark">\uFEFF</span>';G={content:K,format:"html"};p.onBeforeSetContent.dispatch(p,G);K=G.content;if(K.indexOf("{$caret}")==-1){K+="{$caret}"}K=K.replace(/\{\$caret\}/,v);if(!p.isCollapsed()){n.getDoc().execCommand("Delete",false,null)}E=p.getNode();G={context:E.nodeName.toLowerCase()};F=y.parse(K,G);A=F.lastChild;if(A.attr("id")=="mce_marker"){D=A;for(A=A.prev;A;A=A.walk(true)){if(A.type==3||!m.isBlock(A.name)){A.parent.insert(D,A,A.name==="br");break}}}if(!G.invalid){K=J.serialize(F);A=E.firstChild;M=E.lastChild;if(!A||(A===M&&A.nodeName==="BR")){m.setHTML(E,K)}else{p.setContent(K)}}else{p.setContent(v);E=n.selection.getNode();z=n.getBody();if(E.nodeType==9){E=A=z}else{A=E}while(A!==z){E=A;A=A.parentNode}K=E==z?z.innerHTML:m.getOuterHTML(E);K=J.serialize(y.parse(K.replace(/<span (id="mce_marker"|id=mce_marker).+?<\/span>/i,function(){return J.serialize(F)})));if(E==z){m.setHTML(z,K)}else{m.setOuterHTML(E,K)}}D=m.get("mce_marker");C=m.getRect(D);L=m.getViewPort(n.getWin());if((C.y+C.h>L.y+L.h||C.y<L.y)||(C.x>L.x+L.w||C.x<L.x)){H=c.isIE?n.getDoc().documentElement:n.getBody();H.scrollLeft=C.x;H.scrollTop=C.y-L.h+25}x=m.createRng();A=D.previousSibling;if(A&&A.nodeType==3){x.setStart(A,A.nodeValue.length)}else{x.setStartBefore(D);x.setEndBefore(D)}m.remove(D);p.setRng(x);p.onSetContent.dispatch(p,G);n.addVisual()},mceInsertRawHTML:function(y,x,v){p.setContent("tiny_mce_marker");n.setContent(n.getContent().replace(/tiny_mce_marker/g,function(){return v}))},mceSetContent:function(y,x,v){n.setContent(v)},"Indent,Outdent":function(z){var x,v,y;x=k.indentation;v=/[a-z%]+$/i.exec(x);x=parseInt(x);if(!l("InsertUnorderedList")&&!l("InsertOrderedList")){d(p.getSelectedBlocks(),function(A){if(z=="outdent"){y=Math.max(0,parseInt(A.style.paddingLeft||0)-x);m.setStyle(A,"paddingLeft",y?y+v:"")}else{m.setStyle(A,"paddingLeft",(parseInt(A.style.paddingLeft||0)+x)+v)}})}else{f(z)}},mceRepaint:function(){var x;if(c.isGecko){try{i(a);if(p.getSel()){p.getSel().selectAllChildren(n.getBody())}p.collapse(a);g()}catch(v){}}},mceToggleFormat:function(y,x,v){q.toggle(v)},InsertHorizontalRule:function(){n.execCommand("mceInsertContent",false,"<hr />")},mceToggleVisualAid:function(){n.hasVisual=!n.hasVisual;n.addVisual()},mceReplaceContent:function(y,x,v){n.execCommand("mceInsertContent",false,v.replace(/\{\$selection\}/g,p.getContent({format:"text"})))},mceInsertLink:function(z,y,x){var v;if(typeof(x)=="string"){x={href:x}}v=m.getParent(p.getNode(),"a");x.href=x.href.replace(" ","%20");if(!v||!x.href){q.remove("link")}if(x.href){q.apply("link",x,v)}},selectAll:function(){var x=m.getRoot(),v=m.createRng();v.setStart(x,0);v.setEnd(x,x.childNodes.length);n.selection.setRng(v)}});u({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(v){return t("align"+v.substring(7))},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(v){return t(v)},mceBlockQuote:function(){return t("blockquote")},Outdent:function(){var v;if(k.inline_styles){if((v=m.getParent(p.getStart(),m.isBlock))&&parseInt(v.style.paddingLeft)>0){return a}if((v=m.getParent(p.getEnd(),m.isBlock))&&parseInt(v.style.paddingLeft)>0){return a}}return l("InsertUnorderedList")||l("InsertOrderedList")||(!k.inline_styles&&!!m.getParent(p.getNode(),"BLOCKQUOTE"))},"InsertUnorderedList,InsertOrderedList":function(v){return m.getParent(p.getNode(),v=="insertunorderedlist"?"UL":"OL")}},"state");u({"FontSize,FontName":function(y){var x=0,v;if(v=m.getParent(p.getNode(),"span")){if(y=="fontsize"){x=v.style.fontSize}else{x=v.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()}}return x}},"value");if(k.custom_undo_redo){u({Undo:function(){n.undoManager.undo()},Redo:function(){n.undoManager.redo()}})}}})(tinymce);(function(b){var a=b.util.Dispatcher;b.UndoManager=function(f){var d,e=0,h=[],c;function g(){return b.trim(f.getContent({format:"raw",no_events:1}))}return d={typing:false,onAdd:new a(d),onUndo:new a(d),onRedo:new a(d),beforeChange:function(){c=f.selection.getBookmark(2,true)},add:function(m){var j,k=f.settings,l;m=m||{};m.content=g();l=h[e];if(l&&l.content==m.content){return null}if(h[e]){h[e].beforeBookmark=c}if(k.custom_undo_redo_levels){if(h.length>k.custom_undo_redo_levels){for(j=0;j<h.length-1;j++){h[j]=h[j+1]}h.length--;e=h.length}}m.bookmark=f.selection.getBookmark(2,true);if(e<h.length-1){h.length=e+1}h.push(m);e=h.length-1;d.onAdd.dispatch(d,m);f.isNotDirty=0;return m},undo:function(){var k,j;if(d.typing){d.add();d.typing=false}if(e>0){k=h[--e];f.setContent(k.content,{format:"raw"});f.selection.moveToBookmark(k.beforeBookmark);d.onUndo.dispatch(d,k)}return k},redo:function(){var i;if(e<h.length-1){i=h[++e];f.setContent(i.content,{format:"raw"});f.selection.moveToBookmark(i.bookmark);d.onRedo.dispatch(d,i)}return i},clear:function(){h=[];e=0;d.typing=false},hasUndo:function(){return e>0||this.typing},hasRedo:function(){return e<h.length-1&&!this.typing}}}})(tinymce);(function(l){var j=l.dom.Event,c=l.isIE,a=l.isGecko,b=l.isOpera,i=l.each,h=l.extend,d=true,g=false;function k(o){var p,n,m;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(o.nodeName)){if(p){n=o.cloneNode(false);n.appendChild(p);p=n}else{p=m=o.cloneNode(false)}p.removeAttribute("id")}}while(o=o.parentNode);if(p){return{wrapper:p,inner:m}}}function f(n,o){var m=o.ownerDocument.createRange();m.setStart(n.endContainer,n.endOffset);m.setEndAfter(o);return m.cloneContents().textContent.length==0}function e(o,q,m){var n,p;if(q.isEmpty(m)){n=q.getParent(m,"ul,ol");if(!q.getParent(n.parentNode,"ul,ol")){q.split(n,m);p=q.create("p",0,'<br data-mce-bogus="1" />');q.replace(p,m);o.select(p,1)}return g}return d}l.create("tinymce.ForceBlocks",{ForceBlocks:function(m){var n=this,o=m.settings,p;n.editor=m;n.dom=m.dom;p=(o.forced_root_block||"p").toLowerCase();o.element=p.toUpperCase();m.onPreInit.add(n.setup,n)},setup:function(){var n=this,m=n.editor,p=m.settings,u=m.dom,o=m.selection,q=m.schema.getBlockElements();if(p.forced_root_block){function v(){var y=o.getStart(),t=m.getBody(),s,z,D,F,E,x,A,B=-16777215;if(!y||y.nodeType!==1){return}while(y!=t){if(q[y.nodeName]){return}y=y.parentNode}s=o.getRng();if(s.setStart){z=s.startContainer;D=s.startOffset;F=s.endContainer;E=s.endOffset}else{if(s.item){s=m.getDoc().body.createTextRange();s.moveToElementText(s.item(0))}tmpRng=s.duplicate();tmpRng.collapse(true);D=tmpRng.move("character",B)*-1;if(!tmpRng.collapsed){tmpRng=s.duplicate();tmpRng.collapse(false);E=(tmpRng.move("character",B)*-1)-D}}for(y=t.firstChild;y;y){if(y.nodeType===3||(y.nodeType==1&&!q[y.nodeName])){if(!x){x=u.create(p.forced_root_block);y.parentNode.insertBefore(x,y)}A=y;y=y.nextSibling;x.appendChild(A)}else{x=null;y=y.nextSibling}}if(s.setStart){s.setStart(z,D);s.setEnd(F,E);o.setRng(s)}else{try{s=m.getDoc().body.createTextRange();s.moveToElementText(t);s.collapse(true);s.moveStart("character",D);if(E>0){s.moveEnd("character",E)}s.select()}catch(C){}}m.nodeChanged()}m.onKeyUp.add(v);m.onClick.add(v)}if(p.force_br_newlines){if(c){m.onKeyPress.add(function(s,t){var x;if(t.keyCode==13&&o.getNode().nodeName!="LI"){o.setContent('<br id="__" /> ',{format:"raw"});x=u.get("__");x.removeAttribute("id");o.select(x);o.collapse();return j.cancel(t)}})}}if(p.force_p_newlines){if(!c){m.onKeyPress.add(function(s,t){if(t.keyCode==13&&!t.shiftKey&&!n.insertPara(t)){j.cancel(t)}})}else{l.addUnload(function(){n._previousFormats=0});m.onKeyPress.add(function(s,t){n._previousFormats=0;if(t.keyCode==13&&!t.shiftKey&&s.selection.isCollapsed()&&p.keep_styles){n._previousFormats=k(s.selection.getStart())}});m.onKeyUp.add(function(t,y){if(y.keyCode==13&&!y.shiftKey){var x=t.selection.getStart(),s=n._previousFormats;if(!x.hasChildNodes()&&s){x=u.getParent(x,u.isBlock);if(x&&x.nodeName!="LI"){x.innerHTML="";if(n._previousFormats){x.appendChild(s.wrapper);s.inner.innerHTML="\uFEFF"}else{x.innerHTML="\uFEFF"}o.select(x,1);o.collapse(true);t.getDoc().execCommand("Delete",false,null);n._previousFormats=0}}}})}if(a){m.onKeyDown.add(function(s,t){if((t.keyCode==8||t.keyCode==46)&&!t.shiftKey){n.backspaceDelete(t,t.keyCode==8)}})}}if(l.isWebKit){function r(t){var s=o.getRng(),x,A=u.create("div",null," "),z,y=u.getViewPort(t.getWin()).h;s.insertNode(x=u.create("br"));s.setStartAfter(x);s.setEndAfter(x);o.setRng(s);if(o.getSel().focusNode==x.previousSibling){o.select(u.insertAfter(u.doc.createTextNode("\u00a0"),x));o.collapse(d)}u.insertAfter(A,x);z=u.getPos(A).y;u.remove(A);if(z>y){t.getWin().scrollTo(0,z)}}m.onKeyPress.add(function(s,t){if(t.keyCode==13&&(t.shiftKey||(p.force_br_newlines&&!u.getParent(o.getNode(),"h1,h2,h3,h4,h5,h6,ol,ul")))){r(s);j.cancel(t)}})}if(c){if(p.element!="P"){m.onKeyPress.add(function(s,t){n.lastElm=o.getNode().nodeName});m.onKeyUp.add(function(t,x){var z,y=o.getNode(),s=t.getBody();if(s.childNodes.length===1&&y.nodeName=="P"){y=u.rename(y,p.element);o.select(y);o.collapse();t.nodeChanged()}else{if(x.keyCode==13&&!x.shiftKey&&n.lastElm!="P"){z=u.getParent(y,"p");if(z){u.rename(z,p.element);t.nodeChanged()}}}})}}},getParentBlock:function(o){var m=this.dom;return m.getParent(o,m.isBlock)},insertPara:function(Q){var E=this,v=E.editor,M=v.dom,R=v.getDoc(),V=v.settings,F=v.selection.getSel(),G=F.getRangeAt(0),U=R.body;var J,K,H,O,N,q,o,u,z,m,C,T,p,x,I,L=M.getViewPort(v.getWin()),B,D,A;v.undoManager.beforeChange();J=R.createRange();J.setStart(F.anchorNode,F.anchorOffset);J.collapse(d);K=R.createRange();K.setStart(F.focusNode,F.focusOffset);K.collapse(d);H=J.compareBoundaryPoints(J.START_TO_END,K)<0;O=H?F.anchorNode:F.focusNode;N=H?F.anchorOffset:F.focusOffset;q=H?F.focusNode:F.anchorNode;o=H?F.focusOffset:F.anchorOffset;if(O===q&&/^(TD|TH)$/.test(O.nodeName)){if(O.firstChild.nodeName=="BR"){M.remove(O.firstChild)}if(O.childNodes.length==0){v.dom.add(O,V.element,null,"<br />");T=v.dom.add(O,V.element,null,"<br />")}else{I=O.innerHTML;O.innerHTML="";v.dom.add(O,V.element,null,I);T=v.dom.add(O,V.element,null,"<br />")}G=R.createRange();G.selectNodeContents(T);G.collapse(1);v.selection.setRng(G);return g}if(O==U&&q==U&&U.firstChild&&v.dom.isBlock(U.firstChild)){O=q=O.firstChild;N=o=0;J=R.createRange();J.setStart(O,0);K=R.createRange();K.setStart(q,0)}if(!R.body.hasChildNodes()){R.body.appendChild(M.create("br"))}O=O.nodeName=="HTML"?R.body:O;O=O.nodeName=="BODY"?O.firstChild:O;q=q.nodeName=="HTML"?R.body:q;q=q.nodeName=="BODY"?q.firstChild:q;u=E.getParentBlock(O);z=E.getParentBlock(q);m=u?u.nodeName:V.element;if(I=E.dom.getParent(u,"li,pre")){if(I.nodeName=="LI"){return e(v.selection,E.dom,I)}return d}if(u&&(u.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(M.getStyle(u,"position",1)))){m=V.element;u=null}if(z&&(z.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(M.getStyle(u,"position",1)))){m=V.element;z=null}if(/(TD|TABLE|TH|CAPTION)/.test(m)||(u&&m=="DIV"&&/left|right/gi.test(M.getStyle(u,"float",1)))){m=V.element;u=z=null}C=(u&&u.nodeName==m)?u.cloneNode(0):v.dom.create(m);T=(z&&z.nodeName==m)?z.cloneNode(0):v.dom.create(m);T.removeAttribute("id");if(/^(H[1-6])$/.test(m)&&f(G,u)){T=v.dom.create(V.element)}I=p=O;do{if(I==U||I.nodeType==9||E.dom.isBlock(I)||/(TD|TABLE|TH|CAPTION)/.test(I.nodeName)){break}p=I}while((I=I.previousSibling?I.previousSibling:I.parentNode));I=x=q;do{if(I==U||I.nodeType==9||E.dom.isBlock(I)||/(TD|TABLE|TH|CAPTION)/.test(I.nodeName)){break}x=I}while((I=I.nextSibling?I.nextSibling:I.parentNode));if(p.nodeName==m){J.setStart(p,0)}else{J.setStartBefore(p)}J.setEnd(O,N);C.appendChild(J.cloneContents()||R.createTextNode(""));try{K.setEndAfter(x)}catch(P){}K.setStart(q,o);T.appendChild(K.cloneContents()||R.createTextNode(""));G=R.createRange();if(!p.previousSibling&&p.parentNode.nodeName==m){G.setStartBefore(p.parentNode)}else{if(J.startContainer.nodeName==m&&J.startOffset==0){G.setStartBefore(J.startContainer)}else{G.setStart(J.startContainer,J.startOffset)}}if(!x.nextSibling&&x.parentNode.nodeName==m){G.setEndAfter(x.parentNode)}else{G.setEnd(K.endContainer,K.endOffset)}G.deleteContents();if(b){v.getWin().scrollTo(0,L.y)}if(C.firstChild&&C.firstChild.nodeName==m){C.innerHTML=C.firstChild.innerHTML}if(T.firstChild&&T.firstChild.nodeName==m){T.innerHTML=T.firstChild.innerHTML}function S(y,s){var r=[],X,W,t;y.innerHTML="";if(V.keep_styles){W=s;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(W.nodeName)){X=W.cloneNode(g);M.setAttrib(X,"id","");r.push(X)}}while(W=W.parentNode)}if(r.length>0){for(t=r.length-1,X=y;t>=0;t--){X=X.appendChild(r[t])}r[0].innerHTML=b?"\u00a0":"<br />";return r[0]}else{y.innerHTML=b?"\u00a0":"<br />"}}if(M.isEmpty(C)){S(C,O)}if(M.isEmpty(T)){A=S(T,q)}if(b&&parseFloat(opera.version())<9.5){G.insertNode(C);G.insertNode(T)}else{G.insertNode(T);G.insertNode(C)}T.normalize();C.normalize();v.selection.select(T,true);v.selection.collapse(true);B=v.dom.getPos(T).y;if(B<L.y||B+25>L.y+L.h){v.getWin().scrollTo(0,B<L.y?B:B-L.h+25)}v.undoManager.add();return g},backspaceDelete:function(u,B){var C=this,s=C.editor,y=s.getBody(),q=s.dom,p,v=s.selection,o=v.getRng(),x=o.startContainer,p,z,A,m;if(!B&&o.collapsed&&x.nodeType==1&&o.startOffset==x.childNodes.length){m=new l.dom.TreeWalker(x.lastChild,x);for(p=x.lastChild;p;p=m.prev()){if(p.nodeType==3){o.setStart(p,p.nodeValue.length);o.collapse(true);v.setRng(o);return}}}if(x&&s.dom.isBlock(x)&&!/^(TD|TH)$/.test(x.nodeName)&&B){if(x.childNodes.length==0||(x.childNodes.length==1&&x.firstChild.nodeName=="BR")){p=x;while((p=p.previousSibling)&&!s.dom.isBlock(p)){}if(p){if(x!=y.firstChild){z=s.dom.doc.createTreeWalker(p,NodeFilter.SHOW_TEXT,null,g);while(A=z.nextNode()){p=A}o=s.getDoc().createRange();o.setStart(p,p.nodeValue?p.nodeValue.length:0);o.setEnd(p,p.nodeValue?p.nodeValue.length:0);v.setRng(o);s.dom.remove(x)}return j.cancel(u)}}}}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each,e=c.extend;c.create("tinymce.ControlManager",{ControlManager:function(f,j){var h=this,g;j=j||{};h.editor=f;h.controls={};h.onAdd=new c.util.Dispatcher(h);h.onPostRender=new c.util.Dispatcher(h);h.prefix=j.prefix||f.id+"_";h._cls={};h.onPostRender.add(function(){d(h.controls,function(i){i.postRender()})})},get:function(f){return this.controls[this.prefix+f]||this.controls[f]},setActive:function(h,f){var g=null;if(g=this.get(h)){g.setActive(f)}return g},setDisabled:function(h,f){var g=null;if(g=this.get(h)){g.setDisabled(f)}return g},add:function(g){var f=this;if(g){f.controls[g.id]=g;f.onAdd.dispatch(g,f)}return g},createControl:function(i){var h,g=this,f=g.editor;d(f.plugins,function(j){if(j.createControl){h=j.createControl(i,g);if(h){return false}}});switch(i){case"|":case"separator":return g.createSeparator()}if(!h&&f.buttons&&(h=f.buttons[i])){return g.createButton(i,h)}return g.add(h)},createDropMenu:function(f,n,h){var m=this,i=m.editor,j,g,k,l;n=e({"class":"mceDropDown",constrain:i.settings.constrain_menus},n);n["class"]=n["class"]+" "+i.getParam("skin")+"Skin";if(k=i.getParam("skin_variant")){n["class"]+=" "+i.getParam("skin")+"Skin"+k.substring(0,1).toUpperCase()+k.substring(1)}f=m.prefix+f;l=h||m._cls.dropmenu||c.ui.DropMenu;j=m.controls[f]=new l(f,n);j.onAddItem.add(function(r,q){var p=q.settings;p.title=i.getLang(p.title,p.title);if(!p.onclick){p.onclick=function(o){if(p.cmd){i.execCommand(p.cmd,p.ui||false,p.value)}}}});i.onRemove.add(function(){j.destroy()});if(c.isIE){j.onShowMenu.add(function(){i.focus();g=i.selection.getBookmark(1)});j.onHideMenu.add(function(){if(g){i.selection.moveToBookmark(g);g=0}})}return m.add(j)},createListBox:function(f,n,h){var l=this,j=l.editor,i,k,m;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,scope:n.scope,control_manager:l},n);f=l.prefix+f;function g(o){return o.settings.use_accessible_selects&&!c.isGecko}if(j.settings.use_native_selects||g(j)){k=new c.ui.NativeListBox(f,n)}else{m=h||l._cls.listbox||c.ui.ListBox;k=new m(f,n,j)}l.controls[f]=k;if(c.isWebKit){k.onPostRender.add(function(p,o){a.add(o,"mousedown",function(){j.bookmark=j.selection.getBookmark(1)});a.add(o,"focus",function(){j.selection.moveToBookmark(j.bookmark);j.bookmark=null})})}if(k.hideMenu){j.onMouseDown.add(k.hideMenu,k)}return l.add(k)},createButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.label=g.translate(i.label);i.scope=i.scope||g;if(!i.onclick&&!i.menu_button){i.onclick=function(){g.execCommand(i.cmd,i.ui||false,i.value)}}i=e({title:i.title,"class":"mce_"+m,unavailable_prefix:g.getLang("unavailable",""),scope:i.scope,control_manager:h},i);m=h.prefix+m;if(i.menu_button){f=l||h._cls.menubutton||c.ui.MenuButton;k=new f(m,i,g);g.onMouseDown.add(k.hideMenu,k)}else{f=h._cls.button||c.ui.Button;k=new f(m,i,g)}return h.add(k)},createMenuButton:function(h,f,g){f=f||{};f.menu_button=1;return this.createButton(h,f,g)},createSplitButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onclick){i.onclick=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;f=l||h._cls.splitbutton||c.ui.SplitButton;k=h.add(new f(m,i,g));g.onMouseDown.add(k.hideMenu,k);return k},createColorSplitButton:function(f,n,h){var l=this,j=l.editor,i,k,m,g;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onclick){n.onclick=function(o){if(c.isIE){g=j.selection.getBookmark(1)}j.execCommand(n.cmd,n.ui||false,o||n.value)}}if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,menu_class:j.getParam("skin")+"Skin",scope:n.scope,more_colors_title:j.getLang("more_colors")},n);f=l.prefix+f;m=h||l._cls.colorsplitbutton||c.ui.ColorSplitButton;k=new m(f,n,j);j.onMouseDown.add(k.hideMenu,k);j.onRemove.add(function(){k.destroy()});if(c.isIE){k.onShowMenu.add(function(){j.focus();g=j.selection.getBookmark(1)});k.onHideMenu.add(function(){if(g){j.selection.moveToBookmark(g);g=0}})}return l.add(k)},createToolbar:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||g._cls.toolbar||c.ui.Toolbar;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createToolbarGroup:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||this._cls.toolbarGroup||c.ui.ToolbarGroup;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createSeparator:function(g){var f=g||this._cls.separator||c.ui.Separator;return new f()},setControlType:function(g,f){return this._cls[g.toLowerCase()]=f},destroy:function(){d(this.controls,function(f){f.destroy()});this.controls=null}})})(tinymce);(function(d){var a=d.util.Dispatcher,e=d.each,c=d.isIE,b=d.isOpera;d.create("tinymce.WindowManager",{WindowManager:function(f){var g=this;g.editor=f;g.onOpen=new a(g);g.onClose=new a(g);g.params={};g.features={}},open:function(z,h){var v=this,k="",n,m,i=v.editor.settings.dialog_type=="modal",q,o,j,g=d.DOM.getViewPort(),r;z=z||{};h=h||{};o=b?g.w:screen.width;j=b?g.h:screen.height;z.name=z.name||"mc_"+new Date().getTime();z.width=parseInt(z.width||320);z.height=parseInt(z.height||240);z.resizable=true;z.left=z.left||parseInt(o/2)-(z.width/2);z.top=z.top||parseInt(j/2)-(z.height/2);h.inline=false;h.mce_width=z.width;h.mce_height=z.height;h.mce_auto_focus=z.auto_focus;if(i){if(c){z.center=true;z.help=false;z.dialogWidth=z.width+"px";z.dialogHeight=z.height+"px";z.scroll=z.scrollbars||false}}e(z,function(p,f){if(d.is(p,"boolean")){p=p?"yes":"no"}if(!/^(name|url)$/.test(f)){if(c&&i){k+=(k?";":"")+f+":"+p}else{k+=(k?",":"")+f+"="+p}}});v.features=z;v.params=h;v.onOpen.dispatch(v,z,h);r=z.url||z.file;r=d._addVer(r);try{if(c&&i){q=1;window.showModalDialog(r,window,k)}else{q=window.open(r,z.name,k)}}catch(l){}if(!q){alert(v.editor.getLang("popup_blocked"))}},close:function(f){f.close();this.onClose.dispatch(this)},createInstance:function(i,h,g,m,l,k){var j=d.resolve(i);return new j(h,g,m,l,k)},confirm:function(h,f,i,g){g=g||window;f.call(i||this,g.confirm(this._decode(this.editor.getLang(h,h))))},alert:function(h,f,j,g){var i=this;g=g||window;g.alert(i._decode(i.editor.getLang(h,h)));if(f){f.call(j||i)}},resizeBy:function(f,g,h){h.resizeBy(f,g)},_decode:function(f){return d.DOM.decode(f).replace(/\\n/g,"\n")}})}(tinymce));(function(a){a.Formatter=function(U){var M={},O=a.each,c=U.dom,q=U.selection,t=a.dom.TreeWalker,K=new a.dom.RangeUtils(c),d=U.schema.isValidChild,F=c.isBlock,l=U.settings.forced_root_block,s=c.nodeIndex,E="\uFEFF",e=/^(src|href|style)$/,R=false,B=true,p;function z(V){return V instanceof Array}function m(W,V){return c.getParents(W,V,c.getRoot())}function b(V){return V.nodeType===1&&(V.face==="mceinline"||V.style.fontFamily==="mceinline")}function Q(V){return V?M[V]:M}function k(V,W){if(V){if(typeof(V)!=="string"){O(V,function(Y,X){k(X,Y)})}else{W=W.length?W:[W];O(W,function(X){if(X.deep===p){X.deep=!X.selector}if(X.split===p){X.split=!X.selector||X.inline}if(X.remove===p&&X.selector&&!X.inline){X.remove="none"}if(X.selector&&X.inline){X.mixed=true;X.block_expand=true}if(typeof(X.classes)==="string"){X.classes=X.classes.split(/\s+/)}});M[V]=W}}}var i=function(W){var V;U.dom.getParent(W,function(X){V=U.dom.getStyle(X,"text-decoration");return V&&V!=="none"});return V};var I=function(V){var W;if(V.nodeType===1&&V.parentNode&&V.parentNode.nodeType===1){W=i(V.parentNode);if(U.dom.getStyle(V,"color")&&W){U.dom.setStyle(V,"text-decoration",W)}else{if(U.dom.getStyle(V,"textdecoration")===W){U.dom.setStyle(V,"text-decoration",null)}}}};function S(Y,ag,ab){var ac=Q(Y),ah=ac[0],af,W,ae,ad=q.isCollapsed();function Z(al){var ak=al.startContainer,ao=al.startOffset,an,am;if(ak.nodeType==1||ak.nodeValue===""){ak=ak.nodeType==1?ak.childNodes[ao]:ak;if(ak){an=new t(ak,ak.parentNode);for(am=an.current();am;am=an.next()){if(am.nodeType==3&&!f(am)){al.setStart(am,0);break}}}}return al}function V(al,ak){ak=ak||ah;if(al){if(ak.onformat){ak.onformat(al,ak,ag,ab)}O(ak.styles,function(an,am){c.setStyle(al,am,r(an,ag))});O(ak.attributes,function(an,am){c.setAttrib(al,am,r(an,ag))});O(ak.classes,function(am){am=r(am,ag);if(!c.hasClass(al,am)){c.addClass(al,am)}})}}function aa(){function am(at,aq){var ar=new t(aq);for(ab=ar.current();ab;ab=ar.prev()){if(ab.childNodes.length>1||ab==at){return ab}}}var al=U.selection.getRng();var ap=al.startContainer;var ak=al.endContainer;if(ap!=ak&&al.endOffset==0){var ao=am(ap,ak);var an=ao.nodeType==3?ao.length:ao.childNodes.length;al.setEnd(ao,an)}return al}function X(an,at,aq,ap,al){var ak=[],am=-1,ar,av=-1,ao=-1,au;O(an.childNodes,function(ax,aw){if(ax.nodeName==="UL"||ax.nodeName==="OL"){am=aw;ar=ax;return false}});O(an.childNodes,function(ax,aw){if(ax.nodeName==="SPAN"&&c.getAttrib(ax,"data-mce-type")=="bookmark"){if(ax.id==at.id+"_start"){av=aw}else{if(ax.id==at.id+"_end"){ao=aw}}}});if(am<=0||(av<am&&ao>am)){O(a.grep(an.childNodes),al);return 0}else{au=aq.cloneNode(R);O(a.grep(an.childNodes),function(ax,aw){if((av<am&&aw<am)||(av>am&&aw>am)){ak.push(ax);ax.parentNode.removeChild(ax)}});if(av<am){an.insertBefore(au,ar)}else{if(av>am){an.insertBefore(au,ar.nextSibling)}}ap.push(au);O(ak,function(aw){au.appendChild(aw)});return au}}function ai(al,an,ap){var ak=[],ao,am;ao=ah.inline||ah.block;am=c.create(ao);V(am);K.walk(al,function(aq){var ar;function at(au){var ax=au.nodeName.toLowerCase(),aw=au.parentNode.nodeName.toLowerCase(),av;if(g(ax,"br")){ar=0;if(ah.block){c.remove(au)}return}if(ah.wrapper&&x(au,Y,ag)){ar=0;return}if(ah.block&&!ah.wrapper&&G(ax)){au=c.rename(au,ao);V(au);ak.push(au);ar=0;return}if(ah.selector){O(ac,function(ay){if("collapsed" in ay&&ay.collapsed!==ad){return}if(c.is(au,ay.selector)&&!b(au)){V(au,ay);av=true}});if(!ah.inline||av){ar=0;return}}if(d(ao,ax)&&d(aw,ao)&&!(!ap&&au.nodeType===3&&au.nodeValue.length===1&&au.nodeValue.charCodeAt(0)===65279)&&au.id!=="_mce_caret"){if(!ar){ar=am.cloneNode(R);au.parentNode.insertBefore(ar,au);ak.push(ar)}ar.appendChild(au)}else{if(ax=="li"&&an){ar=X(au,an,am,ak,at)}else{ar=0;O(a.grep(au.childNodes),at);ar=0}}}O(aq,at)});if(ah.wrap_links===false){O(ak,function(aq){function ar(aw){var av,au,at;if(aw.nodeName==="A"){au=am.cloneNode(R);ak.push(au);at=a.grep(aw.childNodes);for(av=0;av<at.length;av++){au.appendChild(at[av])}aw.appendChild(au)}O(a.grep(aw.childNodes),ar)}ar(aq)})}O(ak,function(at){var aq;function au(aw){var av=0;O(aw.childNodes,function(ax){if(!f(ax)&&!H(ax)){av++}});return av}function ar(av){var ax,aw;O(av.childNodes,function(ay){if(ay.nodeType==1&&!H(ay)&&!b(ay)){ax=ay;return R}});if(ax&&h(ax,ah)){aw=ax.cloneNode(R);V(aw);c.replace(aw,av,B);c.remove(ax,1)}return aw||av}aq=au(at);if((ak.length>1||!F(at))&&aq===0){c.remove(at,1);return}if(ah.inline||ah.wrapper){if(!ah.exact&&aq===1){at=ar(at)}O(ac,function(av){O(c.select(av.inline,at),function(ax){var aw;if(av.wrap_links===false){aw=ax.parentNode;do{if(aw.nodeName==="A"){return}}while(aw=aw.parentNode)}T(av,ag,ax,av.exact?ax:null)})});if(x(at.parentNode,Y,ag)){c.remove(at,1);at=0;return B}if(ah.merge_with_parents){c.getParent(at.parentNode,function(av){if(x(av,Y,ag)){c.remove(at,1);at=0;return B}})}if(at&&ah.merge_siblings!==false){at=u(C(at),at);at=u(at,C(at,B))}}})}if(ah){if(ab){if(ab.nodeType){W=c.createRng();W.setStartBefore(ab);W.setEndAfter(ab);ai(o(W,ac),null,true)}else{ai(ab,null,true)}}else{if(!ad||!ah.inline||c.select("td.mceSelected,th.mceSelected").length){var aj=U.selection.getNode();U.selection.setRng(aa());af=q.getBookmark();ai(o(q.getRng(B),ac),af);if(ah.styles&&(ah.styles.color||ah.styles.textDecoration)){a.walk(aj,I,"childNodes");I(aj)}q.moveToBookmark(af);q.setRng(Z(q.getRng(B)));U.nodeChanged()}else{P("apply",Y,ag)}}}}function A(X,ag,aa){var ab=Q(X),ai=ab[0],af,ae,W;function Z(al){var ak=al.startContainer,aq=al.startOffset,ap,ao,am,an;if(ak.nodeType==3&&aq>=ak.nodeValue.length-1){ak=ak.parentNode;aq=s(ak)+1}if(ak.nodeType==1){am=ak.childNodes;ak=am[Math.min(aq,am.length-1)];ap=new t(ak);if(aq>am.length-1){ap.next()}for(ao=ap.current();ao;ao=ap.next()){if(ao.nodeType==3&&!f(ao)){an=c.create("a",null,E);ao.parentNode.insertBefore(an,ao);al.setStart(ao,0);q.setRng(al);c.remove(an);return}}}}function Y(an){var am,al,ak;am=a.grep(an.childNodes);for(al=0,ak=ab.length;al<ak;al++){if(T(ab[al],ag,an,an)){break}}if(ai.deep){for(al=0,ak=am.length;al<ak;al++){Y(am[al])}}}function ac(ak){var al;O(m(ak.parentNode).reverse(),function(am){var an;if(!al&&am.id!="_start"&&am.id!="_end"){an=x(am,X,ag);if(an&&an.split!==false){al=am}}});return al}function V(an,ak,ap,at){var au,ar,aq,am,ao,al;if(an){al=an.parentNode;for(au=ak.parentNode;au&&au!=al;au=au.parentNode){ar=au.cloneNode(R);for(ao=0;ao<ab.length;ao++){if(T(ab[ao],ag,ar,ar)){ar=0;break}}if(ar){if(aq){ar.appendChild(aq)}if(!am){am=ar}aq=ar}}if(at&&(!ai.mixed||!F(an))){ak=c.split(an,ak)}if(aq){ap.parentNode.insertBefore(aq,ap);am.appendChild(ap)}}return ak}function ah(ak){return V(ac(ak),ak,ak,true)}function ad(am){var al=c.get(am?"_start":"_end"),ak=al[am?"firstChild":"lastChild"];if(H(ak)){ak=ak[am?"firstChild":"lastChild"]}c.remove(al,true);return ak}function aj(ak){var al,am;ak=o(ak,ab,B);if(ai.split){al=J(ak,B);am=J(ak);if(al!=am){al=N(al,"span",{id:"_start","data-mce-type":"bookmark"});am=N(am,"span",{id:"_end","data-mce-type":"bookmark"});ah(al);ah(am);al=ad(B);am=ad()}else{al=am=ah(al)}ak.startContainer=al.parentNode;ak.startOffset=s(al);ak.endContainer=am.parentNode;ak.endOffset=s(am)+1}K.walk(ak,function(an){O(an,function(ao){Y(ao);if(ao.nodeType===1&&U.dom.getStyle(ao,"text-decoration")==="underline"&&ao.parentNode&&i(ao.parentNode)==="underline"){T({deep:false,exact:true,inline:"span",styles:{textDecoration:"underline"}},null,ao)}})})}if(aa){if(aa.nodeType){W=c.createRng();W.setStartBefore(aa);W.setEndAfter(aa);aj(W)}else{aj(aa)}return}if(!q.isCollapsed()||!ai.inline||c.select("td.mceSelected,th.mceSelected").length){af=q.getBookmark();aj(q.getRng(B));q.moveToBookmark(af);if(ai.inline&&j(X,ag,q.getStart())){Z(q.getRng(true))}U.nodeChanged()}else{P("remove",X,ag)}if(a.isWebKit){U.execCommand("mceCleanup")}}function D(W,Y,X){var V=Q(W);if(j(W,Y,X)&&(!("toggle" in V[0])||V[0]["toggle"])){A(W,Y,X)}else{S(W,Y,X)}}function x(W,V,ab,Z){var X=Q(V),ac,aa,Y;function ad(ah,aj,ak){var ag,ai,ae=aj[ak],af;if(aj.onmatch){return aj.onmatch(ah,aj,ak)}if(ae){if(ae.length===p){for(ag in ae){if(ae.hasOwnProperty(ag)){if(ak==="attributes"){ai=c.getAttrib(ah,ag)}else{ai=L(ah,ag)}if(Z&&!ai&&!aj.exact){return}if((!Z||aj.exact)&&!g(ai,r(ae[ag],ab))){return}}}}else{for(af=0;af<ae.length;af++){if(ak==="attributes"?c.getAttrib(ah,ae[af]):L(ah,ae[af])){return aj}}}}return aj}if(X&&W){for(aa=0;aa<X.length;aa++){ac=X[aa];if(h(W,ac)&&ad(W,ac,"attributes")&&ad(W,ac,"styles")){if(Y=ac.classes){for(aa=0;aa<Y.length;aa++){if(!c.hasClass(W,Y[aa])){return}}}return ac}}}}function j(X,Z,Y){var W;function V(aa){aa=c.getParent(aa,function(ab){return !!x(ab,X,Z,true)});return x(aa,X,Z)}if(Y){return V(Y)}Y=q.getNode();if(V(Y)){return B}W=q.getStart();if(W!=Y){if(V(W)){return B}}return R}function v(ac,ab){var Z,aa=[],Y={},X,W,V;Z=q.getStart();c.getParent(Z,function(af){var ae,ad;for(ae=0;ae<ac.length;ae++){ad=ac[ae];if(!Y[ad]&&x(af,ad,ab)){Y[ad]=true;aa.push(ad)}}});return aa}function y(Z){var ab=Q(Z),Y,X,aa,W,V;if(ab){Y=q.getStart();X=m(Y);for(W=ab.length-1;W>=0;W--){V=ab[W].selector;if(!V){return B}for(aa=X.length-1;aa>=0;aa--){if(c.is(X[aa],V)){return B}}}}return R}a.extend(this,{get:Q,register:k,apply:S,remove:A,toggle:D,match:j,matchAll:v,matchNode:x,canApply:y});function h(V,W){if(g(V,W.inline)){return B}if(g(V,W.block)){return B}if(W.selector){return c.is(V,W.selector)}}function g(W,V){W=W||"";V=V||"";W=""+(W.nodeName||W);V=""+(V.nodeName||V);return W.toLowerCase()==V.toLowerCase()}function L(W,V){var X=c.getStyle(W,V);if(V=="color"||V=="backgroundColor"){X=c.toHex(X)}if(V=="fontWeight"&&X==700){X="bold"}return""+X}function r(V,W){if(typeof(V)!="string"){V=V(W)}else{if(W){V=V.replace(/%(\w+)/g,function(Y,X){return W[X]||Y})}}return V}function f(V){return V&&V.nodeType===3&&/^([\t \r\n]+|)$/.test(V.nodeValue)}function N(X,W,V){var Y=c.create(W,V);X.parentNode.insertBefore(Y,X);Y.appendChild(X);return Y}function o(V,ah,Y){var X=V.startContainer,ac=V.startOffset,ak=V.endContainer,ae=V.endOffset,aj,ag,ab,af;function ai(aq){var al,ao,ap,an,am;al=ao=aq?X:ak;am=aq?"previousSibling":"nextSibling";root=c.getRoot();if(al.nodeType==3&&!f(al)){if(aq?ac>0:ae<al.nodeValue.length){return al}}for(;;){if(ao==root||(!ah[0].block_expand&&F(ao))){return ao}for(an=ao[am];an;an=an[am]){if(!H(an)&&!f(an)){return ao}}ao=ao.parentNode}return al}function aa(al,am){if(am===p){am=al.nodeType===3?al.length:al.childNodes.length}while(al&&al.hasChildNodes()){al=al.childNodes[am];if(al){am=al.nodeType===3?al.length:al.childNodes.length}}return{node:al,offset:am}}if(X.nodeType==1&&X.hasChildNodes()){ag=X.childNodes.length-1;X=X.childNodes[ac>ag?ag:ac];if(X.nodeType==3){ac=0}}if(ak.nodeType==1&&ak.hasChildNodes()){ag=ak.childNodes.length-1;ak=ak.childNodes[ae>ag?ag:ae-1];if(ak.nodeType==3){ae=ak.nodeValue.length}}if(H(X.parentNode)||H(X)){X=H(X)?X:X.parentNode;X=X.nextSibling||X;if(X.nodeType==3){ac=0}}if(H(ak.parentNode)||H(ak)){ak=H(ak)?ak:ak.parentNode;ak=ak.previousSibling||ak;if(ak.nodeType==3){ae=ak.length}}if(ah[0].inline){if(V.collapsed){function ad(am,aq,at){var ap,an,ar,al;function ao(av,ax){var ay,au,aw=av.nodeValue;if(typeof(ax)=="undefined"){ax=at?aw.length:0}if(at){ay=aw.lastIndexOf(" ",ax);au=aw.lastIndexOf("\u00a0",ax);ay=ay>au?ay:au;if(ay!==-1&&!Y){ay++}}else{ay=aw.indexOf(" ",ax);au=aw.indexOf("\u00a0",ax);ay=ay!==-1&&(au===-1||ay<au)?ay:au}return ay}if(am.nodeType===3){ar=ao(am,aq);if(ar!==-1){return{container:am,offset:ar}}al=am}ap=new t(am,c.getParent(am,F)||U.getBody());while(an=ap[at?"prev":"next"]()){if(an.nodeType===3){al=an;ar=ao(an);if(ar!==-1){return{container:an,offset:ar}}}else{if(F(an)){break}}}if(al){if(at){aq=0}else{aq=al.length}return{container:al,offset:aq}}}af=ad(X,ac,true);if(af){X=af.container;ac=af.offset}af=ad(ak,ae);if(af){ak=af.container;ae=af.offset}}ab=aa(ak,ae);if(ab.node){while(ab.node&&ab.offset===0&&ab.node.previousSibling){ab=aa(ab.node.previousSibling)}if(ab.node&&ab.offset>0&&ab.node.nodeType===3&&ab.node.nodeValue.charAt(ab.offset-1)===" "){if(ab.offset>1){ak=ab.node;ak.splitText(ab.offset-1)}else{if(ab.node.previousSibling){}}}}}if(ah[0].inline||ah[0].block_expand){if(!ah[0].inline||(X.nodeType!=3||ac===0)){X=ai(true)}if(!ah[0].inline||(ak.nodeType!=3||ae===ak.nodeValue.length)){ak=ai()}}if(ah[0].selector&&ah[0].expand!==R&&!ah[0].inline){function Z(am,al){var an,ao,aq,ap;if(am.nodeType==3&&am.nodeValue.length==0&&am[al]){am=am[al]}an=m(am);for(ao=0;ao<an.length;ao++){for(aq=0;aq<ah.length;aq++){ap=ah[aq];if("collapsed" in ap&&ap.collapsed!==V.collapsed){continue}if(c.is(an[ao],ap.selector)){return an[ao]}}}return am}X=Z(X,"previousSibling");ak=Z(ak,"nextSibling")}if(ah[0].block||ah[0].selector){function W(am,al,ao){var an;if(!ah[0].wrapper){an=c.getParent(am,ah[0].block)}if(!an){an=c.getParent(am.nodeType==3?am.parentNode:am,F)}if(an&&ah[0].wrapper){an=m(an,"ul,ol").reverse()[0]||an}if(!an){an=am;while(an[al]&&!F(an[al])){an=an[al];if(g(an,"br")){break}}}return an||am}X=W(X,"previousSibling");ak=W(ak,"nextSibling");if(ah[0].block){if(!F(X)){X=ai(true)}if(!F(ak)){ak=ai()}}}if(X.nodeType==1){ac=s(X);X=X.parentNode}if(ak.nodeType==1){ae=s(ak)+1;ak=ak.parentNode}return{startContainer:X,startOffset:ac,endContainer:ak,endOffset:ae}}function T(ab,aa,Y,V){var X,W,Z;if(!h(Y,ab)){return R}if(ab.remove!="all"){O(ab.styles,function(ad,ac){ad=r(ad,aa);if(typeof(ac)==="number"){ac=ad;V=0}if(!V||g(L(V,ac),ad)){c.setStyle(Y,ac,"")}Z=1});if(Z&&c.getAttrib(Y,"style")==""){Y.removeAttribute("style");Y.removeAttribute("data-mce-style")}O(ab.attributes,function(ae,ac){var ad;ae=r(ae,aa);if(typeof(ac)==="number"){ac=ae;V=0}if(!V||g(c.getAttrib(V,ac),ae)){if(ac=="class"){ae=c.getAttrib(Y,ac);if(ae){ad="";O(ae.split(/\s+/),function(af){if(/mce\w+/.test(af)){ad+=(ad?" ":"")+af}});if(ad){c.setAttrib(Y,ac,ad);return}}}if(ac=="class"){Y.removeAttribute("className")}if(e.test(ac)){Y.removeAttribute("data-mce-"+ac)}Y.removeAttribute(ac)}});O(ab.classes,function(ac){ac=r(ac,aa);if(!V||c.hasClass(V,ac)){c.removeClass(Y,ac)}});W=c.getAttribs(Y);for(X=0;X<W.length;X++){if(W[X].nodeName.indexOf("_")!==0){return R}}}if(ab.remove!="none"){n(Y,ab);return B}}function n(X,Y){var V=X.parentNode,W;if(Y.block){if(!l){function Z(ab,aa,ac){ab=C(ab,aa,ac);return !ab||(ab.nodeName=="BR"||F(ab))}if(F(X)&&!F(V)){if(!Z(X,R)&&!Z(X.firstChild,B,1)){X.insertBefore(c.create("br"),X.firstChild)}if(!Z(X,B)&&!Z(X.lastChild,R,1)){X.appendChild(c.create("br"))}}}else{if(V==c.getRoot()){if(!Y.list_block||!g(X,Y.list_block)){O(a.grep(X.childNodes),function(aa){if(d(l,aa.nodeName.toLowerCase())){if(!W){W=N(aa,l)}else{W.appendChild(aa)}}else{W=0}})}}}}if(Y.selector&&Y.inline&&!g(Y.inline,X)){return}c.remove(X,1)}function C(W,V,X){if(W){V=V?"nextSibling":"previousSibling";for(W=X?W:W[V];W;W=W[V]){if(W.nodeType==1||!f(W)){return W}}}}function H(V){return V&&V.nodeType==1&&V.getAttribute("data-mce-type")=="bookmark"}function u(Z,Y){var V,X,W;function ab(ae,ad){if(ae.nodeName!=ad.nodeName){return R}function ac(ag){var ah={};O(c.getAttribs(ag),function(ai){var aj=ai.nodeName.toLowerCase();if(aj.indexOf("_")!==0&&aj!=="style"){ah[aj]=c.getAttrib(ag,aj)}});return ah}function af(aj,ai){var ah,ag;for(ag in aj){if(aj.hasOwnProperty(ag)){ah=ai[ag];if(ah===p){return R}if(aj[ag]!=ah){return R}delete ai[ag]}}for(ag in ai){if(ai.hasOwnProperty(ag)){return R}}return B}if(!af(ac(ae),ac(ad))){return R}if(!af(c.parseStyle(c.getAttrib(ae,"style")),c.parseStyle(c.getAttrib(ad,"style")))){return R}return B}if(Z&&Y){function aa(ad,ac){for(X=ad;X;X=X[ac]){if(X.nodeType==3&&X.nodeValue.length!==0){return ad}if(X.nodeType==1&&!H(X)){return X}}return ad}Z=aa(Z,"previousSibling");Y=aa(Y,"nextSibling");if(ab(Z,Y)){for(X=Z.nextSibling;X&&X!=Y;){W=X;X=X.nextSibling;Z.appendChild(W)}c.remove(Y);O(a.grep(Y.childNodes),function(ac){Z.appendChild(ac)});return Z}}return Y}function G(V){return/^(h[1-6]|p|div|pre|address|dl|dt|dd)$/.test(V)}function J(W,aa){var V,Z,X,Y;V=W[aa?"startContainer":"endContainer"];Z=W[aa?"startOffset":"endOffset"];if(V.nodeType==1){X=V.childNodes.length-1;if(!aa&&Z){Z--}V=V.childNodes[Z>X?X:Z]}if(V.nodeType===3&&aa&&Z>=V.nodeValue.length){V=new t(V,U.getBody()).next()||V}if(V.nodeType===3&&!aa&&Z==0){V=new t(V,U.getBody()).prev()||V}return V}function P(ae,V,ac){var ah,af="_mce_caret",W=U.settings.caret_debug;ah=a.isGecko?"\u200B":E;function X(aj){var ai=c.create("span",{id:af,"data-mce-bogus":true,style:W?"color:red":""});if(aj){ai.appendChild(U.getDoc().createTextNode(ah))}return ai}function ad(aj,ai){while(aj){if((aj.nodeType===3&&aj.nodeValue!==ah)||aj.childNodes.length>1){return false}if(ai&&aj.nodeType===1){ai.push(aj)}aj=aj.firstChild}return true}function aa(ai){while(ai){if(ai.id===af){return ai}ai=ai.parentNode}}function Z(ai){var aj;if(ai){aj=new t(ai,ai);for(ai=aj.current();ai;ai=aj.next()){if(ai.nodeType===3){return ai}}}}function Y(ak,aj){var al,ai;if(!ak){ak=aa(q.getStart());if(!ak){while(ak=c.get(af)){Y(ak,false)}}}else{ai=q.getRng(true);if(ad(ak)){if(aj!==false){ai.setStartBefore(ak);ai.setEndBefore(ak)}c.remove(ak)}else{al=Z(ak);al=al.deleteData(0,1);c.remove(ak,1)}q.setRng(ai)}}function ab(){var ak,ai,ao,an,al,aj,am;ak=q.getRng(true);an=ak.startOffset;aj=ak.startContainer;am=aj.nodeValue;ai=aa(q.getStart());if(ai){ao=Z(ai)}if(am&&an>0&&an<am.length&&/\w/.test(am.charAt(an))&&/\w/.test(am.charAt(an-1))){al=q.getBookmark();ak.collapse(true);ak=o(ak,Q(V));ak=K.split(ak);S(V,ac,ak);q.moveToBookmark(al)}else{if(!ai||ao.nodeValue!==ah){ai=X(true);ao=ai.firstChild;ak.insertNode(ai);an=1;S(V,ac,ai)}else{S(V,ac,ai)}q.setCursorLocation(ao,an)}}function ag(){var ai=q.getRng(true),aj,al,ao,an,ak,ar,aq=[],am,ap;aj=ai.startContainer;al=ai.startOffset;ak=aj;if(aj.nodeType==3){if(al!=aj.nodeValue.length||aj.nodeValue===ah){an=true}ak=ak.parentNode}while(ak){if(x(ak,V,ac)){ar=ak;break}if(ak.nextSibling){an=true}aq.push(ak);ak=ak.parentNode}if(!ar){return}if(an){ao=q.getBookmark();ai.collapse(true);ai=o(ai,Q(V),true);ai=K.split(ai);A(V,ac,ai);q.moveToBookmark(ao)}else{ap=X();ak=ap;for(am=aq.length-1;am>=0;am--){ak.appendChild(aq[am].cloneNode(false));ak=ak.firstChild}ak.appendChild(c.doc.createTextNode(ah));ak=ak.firstChild;c.insertAfter(ap,ar);q.setCursorLocation(ak,1)}}U.onBeforeGetContent.addToTop(function(){var ai=[],aj;if(ad(aa(q.getStart()),ai)){aj=ai.length;while(aj--){c.setAttrib(ai[aj],"data-mce-bogus","1")}}});a.each("onMouseUp onKeyUp".split(" "),function(ai){U[ai].addToTop(function(){Y()})});U.onKeyDown.addToTop(function(ai,ak){var aj=ak.keyCode;if(aj==8||aj==37||aj==39){Y(aa(q.getStart()))}});if(ae=="apply"){ab()}else{ag()}}}})(tinymce);tinymce.onAddEditor.add(function(e,a){var d,h,g,c=a.settings;if(c.inline_styles){h=e.explode(c.font_size_legacy_values);function b(j,i){e.each(i,function(l,k){if(l){g.setStyle(j,k,l)}});g.rename(j,"span")}d={font:function(j,i){b(i,{backgroundColor:i.style.backgroundColor,color:i.color,fontFamily:i.face,fontSize:h[parseInt(i.size)-1]})},u:function(j,i){b(i,{textDecoration:"underline"})},strike:function(j,i){b(i,{textDecoration:"line-through"})}};function f(i,j){g=i.dom;if(c.convert_fonts_to_spans){e.each(g.select("font,u,strike",j.node),function(k){d[k.nodeName.toLowerCase()](a.dom,k)})}}a.onPreProcess.add(f);a.onSetContent.add(f);a.onInit.add(function(){a.selection.onSetContent.add(f)})}});
diff --git a/js/tiny_mce/tiny_mce_popup.js b/js/tiny_mce/tiny_mce_popup.js
index f859d24e6a6..5169a9ccbd0 100644
--- a/js/tiny_mce/tiny_mce_popup.js
+++ b/js/tiny_mce/tiny_mce_popup.js
@@ -2,4 +2,4 @@
 // Uncomment and change this document.domain value if you are loading the script cross subdomains
 // document.domain = 'moxiecode.com';
 
-var tinymce=null,tinyMCEPopup,tinyMCE;tinyMCEPopup={init:function(){var b=this,a,c;a=b.getWin();tinymce=a.tinymce;tinyMCE=a.tinyMCE;b.editor=tinymce.EditorManager.activeEditor;b.params=b.editor.windowManager.params;b.features=b.editor.windowManager.features;b.dom=b.editor.windowManager.createInstance("tinymce.dom.DOMUtils",document);if(b.features.popup_css!==false){b.dom.loadCSS(b.features.popup_css||b.editor.settings.popup_css)}b.listeners=[];b.onInit={add:function(e,d){b.listeners.push({func:e,scope:d})}};b.isWindow=!b.getWindowArg("mce_inline");b.id=b.getWindowArg("mce_window_id");b.editor.windowManager.onOpen.dispatch(b.editor.windowManager,window)},getWin:function(){return(!window.frameElement&&window.dialogArguments)||opener||parent||top},getWindowArg:function(c,b){var a=this.params[c];return tinymce.is(a)?a:b},getParam:function(b,a){return this.editor.getParam(b,a)},getLang:function(b,a){return this.editor.getLang(b,a)},execCommand:function(d,c,e,b){b=b||{};b.skip_focus=1;this.restoreSelection();return this.editor.execCommand(d,c,e,b)},resizeToInnerSize:function(){var a=this;setTimeout(function(){var b=a.dom.getViewPort(window);a.editor.windowManager.resizeBy(a.getWindowArg("mce_width")-b.w,a.getWindowArg("mce_height")-b.h,a.id||window)},10)},executeOnLoad:function(s){this.onInit.add(function(){eval(s)})},storeSelection:function(){this.editor.windowManager.bookmark=tinyMCEPopup.editor.selection.getBookmark(1)},restoreSelection:function(){var a=tinyMCEPopup;if(!a.isWindow&&tinymce.isIE){a.editor.selection.moveToBookmark(a.editor.windowManager.bookmark)}},requireLangPack:function(){var b=this,a=b.getWindowArg("plugin_url")||b.getWindowArg("theme_url");if(a&&b.editor.settings.language&&b.features.translate_i18n!==false&&b.editor.settings.language_load!==false){a+="/langs/"+b.editor.settings.language+"_dlg.js";if(!tinymce.ScriptLoader.isDone(a)){document.write('<script type="text/javascript" src="'+tinymce._addVer(a)+'"><\/script>');tinymce.ScriptLoader.markDone(a)}}},pickColor:function(b,a){this.execCommand("mceColorPicker",true,{color:document.getElementById(a).value,func:function(e){document.getElementById(a).value=e;try{document.getElementById(a).onchange()}catch(d){}}})},openBrowser:function(a,c,b){tinyMCEPopup.restoreSelection();this.editor.execCallback("file_browser_callback",a,document.getElementById(a).value,c,window)},confirm:function(b,a,c){this.editor.windowManager.confirm(b,a,c,window)},alert:function(b,a,c){this.editor.windowManager.alert(b,a,c,window)},close:function(){var a=this;function b(){a.editor.windowManager.close(window);tinymce=tinyMCE=a.editor=a.params=a.dom=a.dom.doc=null}if(tinymce.isOpera){a.getWin().setTimeout(b,0)}else{b()}},_restoreSelection:function(){var a=window.event.srcElement;if(a.nodeName=="INPUT"&&(a.type=="submit"||a.type=="button")){tinyMCEPopup.restoreSelection()}},_onDOMLoaded:function(){var b=tinyMCEPopup,d=document.title,e,c,a;if(b.domLoaded){return}b.domLoaded=1;if(b.features.translate_i18n!==false){c=document.body.innerHTML;if(tinymce.isIE){c=c.replace(/ (value|title|alt)=([^"][^\s>]+)/gi,' $1="$2"')}document.dir=b.editor.getParam("directionality","");if((a=b.editor.translate(c))&&a!=c){document.body.innerHTML=a}if((a=b.editor.translate(d))&&a!=d){document.title=d=a}}if(!b.editor.getParam("browser_preferred_colors",false)||!b.isWindow){b.dom.addClass(document.body,"forceColors")}document.body.style.display="";if(tinymce.isIE){document.attachEvent("onmouseup",tinyMCEPopup._restoreSelection);b.dom.add(b.dom.select("head")[0],"base",{target:"_self"})}b.restoreSelection();b.resizeToInnerSize();if(!b.isWindow){b.editor.windowManager.setTitle(window,d)}else{window.focus()}if(!tinymce.isIE&&!b.isWindow){tinymce.dom.Event._add(document,"focus",function(){b.editor.windowManager.focus(b.id)})}tinymce.each(b.dom.select("select"),function(f){f.onkeydown=tinyMCEPopup._accessHandler});tinymce.each(b.listeners,function(f){f.func.call(f.scope,b.editor)});if(b.getWindowArg("mce_auto_focus",true)){window.focus();tinymce.each(document.forms,function(g){tinymce.each(g.elements,function(f){if(b.dom.hasClass(f,"mceFocus")&&!f.disabled){f.focus();return false}})})}document.onkeyup=tinyMCEPopup._closeWinKeyHandler},_accessHandler:function(a){a=a||window.event;if(a.keyCode==13||a.keyCode==32){a=a.target||a.srcElement;if(a.onchange){a.onchange()}return tinymce.dom.Event.cancel(a)}},_closeWinKeyHandler:function(a){a=a||window.event;if(a.keyCode==27){tinyMCEPopup.close()}},_wait:function(){if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);tinyMCEPopup._onDOMLoaded()}});if(document.documentElement.doScroll&&window==window.top){(function(){if(tinyMCEPopup.domLoaded){return}try{document.documentElement.doScroll("left")}catch(a){setTimeout(arguments.callee,0);return}tinyMCEPopup._onDOMLoaded()})()}document.attachEvent("onload",tinyMCEPopup._onDOMLoaded)}else{if(document.addEventListener){window.addEventListener("DOMContentLoaded",tinyMCEPopup._onDOMLoaded,false);window.addEventListener("load",tinyMCEPopup._onDOMLoaded,false)}}}};tinyMCEPopup.init();tinyMCEPopup._wait();
\ No newline at end of file
+var tinymce=null,tinyMCEPopup,tinyMCE;tinyMCEPopup={init:function(){var b=this,a,c;a=b.getWin();tinymce=a.tinymce;tinyMCE=a.tinyMCE;b.editor=tinymce.EditorManager.activeEditor;b.params=b.editor.windowManager.params;b.features=b.editor.windowManager.features;b.dom=b.editor.windowManager.createInstance("tinymce.dom.DOMUtils",document);if(b.features.popup_css!==false){b.dom.loadCSS(b.features.popup_css||b.editor.settings.popup_css)}b.listeners=[];b.onInit={add:function(e,d){b.listeners.push({func:e,scope:d})}};b.isWindow=!b.getWindowArg("mce_inline");b.id=b.getWindowArg("mce_window_id");b.editor.windowManager.onOpen.dispatch(b.editor.windowManager,window)},getWin:function(){return(!window.frameElement&&window.dialogArguments)||opener||parent||top},getWindowArg:function(c,b){var a=this.params[c];return tinymce.is(a)?a:b},getParam:function(b,a){return this.editor.getParam(b,a)},getLang:function(b,a){return this.editor.getLang(b,a)},execCommand:function(d,c,e,b){b=b||{};b.skip_focus=1;this.restoreSelection();return this.editor.execCommand(d,c,e,b)},resizeToInnerSize:function(){var a=this;setTimeout(function(){var b=a.dom.getViewPort(window);a.editor.windowManager.resizeBy(a.getWindowArg("mce_width")-b.w,a.getWindowArg("mce_height")-b.h,a.id||window)},10)},executeOnLoad:function(s){this.onInit.add(function(){eval(s)})},storeSelection:function(){this.editor.windowManager.bookmark=tinyMCEPopup.editor.selection.getBookmark(1)},restoreSelection:function(){var a=tinyMCEPopup;if(!a.isWindow&&tinymce.isIE){a.editor.selection.moveToBookmark(a.editor.windowManager.bookmark)}},requireLangPack:function(){var b=this,a=b.getWindowArg("plugin_url")||b.getWindowArg("theme_url");if(a&&b.editor.settings.language&&b.features.translate_i18n!==false&&b.editor.settings.language_load!==false){a+="/langs/"+b.editor.settings.language+"_dlg.js";if(!tinymce.ScriptLoader.isDone(a)){document.write('<script type="text/javascript" src="'+tinymce._addVer(a)+'"><\/script>');tinymce.ScriptLoader.markDone(a)}}},pickColor:function(b,a){this.execCommand("mceColorPicker",true,{color:document.getElementById(a).value,func:function(e){document.getElementById(a).value=e;try{document.getElementById(a).onchange()}catch(d){}}})},openBrowser:function(a,c,b){tinyMCEPopup.restoreSelection();this.editor.execCallback("file_browser_callback",a,document.getElementById(a).value,c,window)},confirm:function(b,a,c){this.editor.windowManager.confirm(b,a,c,window)},alert:function(b,a,c){this.editor.windowManager.alert(b,a,c,window)},close:function(){var a=this;function b(){a.editor.windowManager.close(window);tinymce=tinyMCE=a.editor=a.params=a.dom=a.dom.doc=null}if(tinymce.isOpera){a.getWin().setTimeout(b,0)}else{b()}},_restoreSelection:function(){var a=window.event.srcElement;if(a.nodeName=="INPUT"&&(a.type=="submit"||a.type=="button")){tinyMCEPopup.restoreSelection()}},_onDOMLoaded:function(){var b=tinyMCEPopup,d=document.title,e,c,a;if(b.domLoaded){return}b.domLoaded=1;if(b.features.translate_i18n!==false){c=document.body.innerHTML;if(tinymce.isIE){c=c.replace(/ (value|title|alt)=([^"][^\s>]+)/gi,' $1="$2"')}document.dir=b.editor.getParam("directionality","");if((a=b.editor.translate(c))&&a!=c){document.body.innerHTML=a}if((a=b.editor.translate(d))&&a!=d){document.title=d=a}}if(!b.editor.getParam("browser_preferred_colors",false)||!b.isWindow){b.dom.addClass(document.body,"forceColors")}document.body.style.display="";if(tinymce.isIE){document.attachEvent("onmouseup",tinyMCEPopup._restoreSelection);b.dom.add(b.dom.select("head")[0],"base",{target:"_self"})}b.restoreSelection();b.resizeToInnerSize();if(!b.isWindow){b.editor.windowManager.setTitle(window,d)}else{window.focus()}if(!tinymce.isIE&&!b.isWindow){tinymce.dom.Event._add(document,"focus",function(){b.editor.windowManager.focus(b.id)})}tinymce.each(b.dom.select("select"),function(f){f.onkeydown=tinyMCEPopup._accessHandler});tinymce.each(b.listeners,function(f){f.func.call(f.scope,b.editor)});if(b.getWindowArg("mce_auto_focus",true)){window.focus();tinymce.each(document.forms,function(g){tinymce.each(g.elements,function(f){if(b.dom.hasClass(f,"mceFocus")&&!f.disabled){f.focus();return false}})})}document.onkeyup=tinyMCEPopup._closeWinKeyHandler},_accessHandler:function(a){a=a||window.event;if(a.keyCode==13||a.keyCode==32){a=a.target||a.srcElement;if(a.onchange){a.onchange()}return tinymce.dom.Event.cancel(a)}},_closeWinKeyHandler:function(a){a=a||window.event;if(a.keyCode==27){tinyMCEPopup.close()}},_wait:function(){if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);tinyMCEPopup._onDOMLoaded()}});if(document.documentElement.doScroll&&window==window.top){(function(){if(tinyMCEPopup.domLoaded){return}try{document.documentElement.doScroll("left")}catch(a){setTimeout(arguments.callee,0);return}tinyMCEPopup._onDOMLoaded()})()}document.attachEvent("onload",tinyMCEPopup._onDOMLoaded)}else{if(document.addEventListener){window.addEventListener("DOMContentLoaded",tinyMCEPopup._onDOMLoaded,false);window.addEventListener("load",tinyMCEPopup._onDOMLoaded,false)}}}};tinyMCEPopup.init();tinyMCEPopup._wait();
diff --git a/js/tiny_mce/tiny_mce_prototype.js b/js/tiny_mce/tiny_mce_prototype.js
index d86c5a7dea5..7f59b1ec2db 100644
--- a/js/tiny_mce/tiny_mce_prototype.js
+++ b/js/tiny_mce/tiny_mce_prototype.js
@@ -1 +1 @@
-(function(d){var a=/^\s*|\s*$/g,e,c="B".replace(/A(.)|B/,"$1")==="$1";var b={majorVersion:"3",minorVersion:"4.7",releaseDate:"2011-11-03",_init:function(){var s=this,q=document,o=navigator,g=o.userAgent,m,f,l,k,j,r;s.isOpera=d.opera&&opera.buildNumber;s.isWebKit=/WebKit/.test(g);s.isIE=!s.isWebKit&&!s.isOpera&&(/MSIE/gi).test(g)&&(/Explorer/gi).test(o.appName);s.isIE6=s.isIE&&/MSIE [56]/.test(g);s.isIE7=s.isIE&&/MSIE [7]/.test(g);s.isIE8=s.isIE&&/MSIE [8]/.test(g);s.isIE9=s.isIE&&/MSIE [9]/.test(g);s.isGecko=!s.isWebKit&&/Gecko/.test(g);s.isMac=g.indexOf("Mac")!=-1;s.isAir=/adobeair/i.test(g);s.isIDevice=/(iPad|iPhone)/.test(g);s.isIOS5=s.isIDevice&&g.match(/AppleWebKit\/(\d*)/)[1]>=534;if(d.tinyMCEPreInit){s.suffix=tinyMCEPreInit.suffix;s.baseURL=tinyMCEPreInit.base;s.query=tinyMCEPreInit.query;return}s.suffix="";f=q.getElementsByTagName("base");for(m=0;m<f.length;m++){if(r=f[m].href){if(/^https?:\/\/[^\/]+$/.test(r)){r+="/"}k=r?r.match(/.*\//)[0]:""}}function h(i){if(i.src&&/tiny_mce(|_gzip|_jquery|_prototype|_full)(_dev|_src)?.js/.test(i.src)){if(/_(src|dev)\.js/g.test(i.src)){s.suffix="_src"}if((j=i.src.indexOf("?"))!=-1){s.query=i.src.substring(j+1)}s.baseURL=i.src.substring(0,i.src.lastIndexOf("/"));if(k&&s.baseURL.indexOf("://")==-1&&s.baseURL.indexOf("/")!==0){s.baseURL=k+s.baseURL}return s.baseURL}return null}f=q.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}l=q.getElementsByTagName("head")[0];if(l){f=l.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}}return},is:function(g,f){if(!f){return g!==e}if(f=="array"&&(g.hasOwnProperty&&g instanceof Array)){return true}return typeof(g)==f},makeMap:function(f,j,h){var g;f=f||[];j=j||",";if(typeof(f)=="string"){f=f.split(j)}h=h||{};g=f.length;while(g--){h[f[g]]={}}return h},each:function(i,f,h){var j,g;if(!i){return 0}h=h||i;if(i.length!==e){for(j=0,g=i.length;j<g;j++){if(f.call(h,i[j],j,i)===false){return 0}}}else{for(j in i){if(i.hasOwnProperty(j)){if(f.call(h,i[j],j,i)===false){return 0}}}}return 1},map:function(g,h){var i=[];b.each(g,function(f){i.push(h(f))});return i},grep:function(g,h){var i=[];b.each(g,function(f){if(!h||h(f)){i.push(f)}});return i},inArray:function(g,h){var j,f;if(g){for(j=0,f=g.length;j<f;j++){if(g[j]===h){return j}}}return -1},extend:function(k,j){var h,g,f=arguments;for(h=1,g=f.length;h<g;h++){j=f[h];b.each(j,function(i,l){if(i!==e){k[l]=i}})}return k},trim:function(f){return(f?""+f:"").replace(a,"")},create:function(o,f,j){var n=this,g,i,k,l,h,m=0;o=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(o);k=o[3].match(/(^|\.)(\w+)$/i)[2];i=n.createNS(o[3].replace(/\.\w+$/,""),j);if(i[k]){return}if(o[2]=="static"){i[k]=f;if(this.onCreate){this.onCreate(o[2],o[3],i[k])}return}if(!f[k]){f[k]=function(){};m=1}i[k]=f[k];n.extend(i[k].prototype,f);if(o[5]){g=n.resolve(o[5]).prototype;l=o[5].match(/\.(\w+)$/i)[1];h=i[k];if(m){i[k]=function(){return g[l].apply(this,arguments)}}else{i[k]=function(){this.parent=g[l];return h.apply(this,arguments)}}i[k].prototype[k]=i[k];n.each(g,function(p,q){i[k].prototype[q]=g[q]});n.each(f,function(p,q){if(g[q]){i[k].prototype[q]=function(){this.parent=g[q];return p.apply(this,arguments)}}else{if(q!=k){i[k].prototype[q]=p}}})}n.each(f["static"],function(p,q){i[k][q]=p});if(this.onCreate){this.onCreate(o[2],o[3],i[k].prototype)}},walk:function(i,h,j,g){g=g||this;if(i){if(j){i=i[j]}b.each(i,function(k,f){if(h.call(g,k,f,j)===false){return false}b.walk(k,h,j,g)})}},createNS:function(j,h){var g,f;h=h||d;j=j.split(".");for(g=0;g<j.length;g++){f=j[g];if(!h[f]){h[f]={}}h=h[f]}return h},resolve:function(j,h){var g,f;h=h||d;j=j.split(".");for(g=0,f=j.length;g<f;g++){h=h[j[g]];if(!h){break}}return h},addUnload:function(j,i){var h=this;j={func:j,scope:i||this};if(!h.unloads){function g(){var f=h.unloads,l,m;if(f){for(m in f){l=f[m];if(l&&l.func){l.func.call(l.scope,1)}}if(d.detachEvent){d.detachEvent("onbeforeunload",k);d.detachEvent("onunload",g)}else{if(d.removeEventListener){d.removeEventListener("unload",g,false)}}h.unloads=l=f=w=g=0;if(d.CollectGarbage){CollectGarbage()}}}function k(){var l=document;if(l.readyState=="interactive"){function f(){l.detachEvent("onstop",f);if(g){g()}l=0}if(l){l.attachEvent("onstop",f)}d.setTimeout(function(){if(l){l.detachEvent("onstop",f)}},0)}}if(d.attachEvent){d.attachEvent("onunload",g);d.attachEvent("onbeforeunload",k)}else{if(d.addEventListener){d.addEventListener("unload",g,false)}}h.unloads=[j]}else{h.unloads.push(j)}return j},removeUnload:function(i){var g=this.unloads,h=null;b.each(g,function(j,f){if(j&&j.func==i){g.splice(f,1);h=i;return false}});return h},explode:function(f,g){return f?b.map(f.split(g||","),b.trim):f},_addVer:function(g){var f;if(!this.query){return g}f=(g.indexOf("?")==-1?"?":"&")+this.query;if(g.indexOf("#")==-1){return g+f}return g.replace("#",f+"#")},_replace:function(h,f,g){if(c){return g.replace(h,function(){var l=f,j=arguments,k;for(k=0;k<j.length-2;k++){if(j[k]===e){l=l.replace(new RegExp("\\$"+k,"g"),"")}else{l=l.replace(new RegExp("\\$"+k,"g"),j[k])}}return l})}return g.replace(h,f)}};b._init();d.tinymce=d.tinyMCE=b})(window);(function(){if(!window.Prototype){return alert("Load prototype first!")}tinymce.extend(tinymce,{trim:function(b){return b?b.strip():""},inArray:function(b,c){return b&&b.indexOf?b.indexOf(c):-1}});var a={"tinymce.util.JSON":{},};tinymce.onCreate=function(b,e,d){tinymce.extend(d,a[e])}})();tinymce.create("tinymce.util.Dispatcher",{scope:null,listeners:null,Dispatcher:function(a){this.scope=a||this;this.listeners=[]},add:function(a,b){this.listeners.push({cb:a,scope:b||this.scope});return a},addToTop:function(a,b){this.listeners.unshift({cb:a,scope:b||this.scope});return a},remove:function(a){var b=this.listeners,c=null;tinymce.each(b,function(e,d){if(a==e.cb){c=a;b.splice(d,1);return false}});return c},dispatch:function(){var f,d=arguments,e,b=this.listeners,g;for(e=0;e<b.length;e++){g=b[e];f=g.cb.apply(g.scope,d);if(f===false){break}}return f}});(function(){var a=tinymce.each;tinymce.create("tinymce.util.URI",{URI:function(e,g){var f=this,i,d,c,h;e=tinymce.trim(e);g=f.settings=g||{};if(/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e)){f.source=e;return}if(e.indexOf("/")===0&&e.indexOf("//")!==0){e=(g.base_uri?g.base_uri.protocol||"http":"http")+"://mce_host"+e}if(!/^[\w-]*:?\/\//.test(e)){h=g.base_uri?g.base_uri.path:new tinymce.util.URI(location.href).directory;e=((g.base_uri&&g.base_uri.protocol)||"http")+"://mce_host"+f.toAbsPath(h,e)}e=e.replace(/@@/g,"(mce_at)");e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e);a(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],function(b,j){var k=e[j];if(k){k=k.replace(/\(mce_at\)/g,"@@")}f[b]=k});if(c=g.base_uri){if(!f.protocol){f.protocol=c.protocol}if(!f.userInfo){f.userInfo=c.userInfo}if(!f.port&&f.host=="mce_host"){f.port=c.port}if(!f.host||f.host=="mce_host"){f.host=c.host}f.source=""}},setPath:function(c){var b=this;c=/^(.*?)\/?(\w+)?$/.exec(c);b.path=c[0];b.directory=c[1];b.file=c[2];b.source="";b.getURI()},toRelative:function(b){var c=this,d;if(b==="./"){return b}b=new tinymce.util.URI(b,{base_uri:c});if((b.host!="mce_host"&&c.host!=b.host&&b.host)||c.port!=b.port||c.protocol!=b.protocol){return b.getURI()}d=c.toRelPath(c.path,b.path);if(b.query){d+="?"+b.query}if(b.anchor){d+="#"+b.anchor}return d},toAbsolute:function(b,c){var b=new tinymce.util.URI(b,{base_uri:this});return b.getURI(this.host==b.host&&this.protocol==b.protocol?c:0)},toRelPath:function(g,h){var c,f=0,d="",e,b;g=g.substring(0,g.lastIndexOf("/"));g=g.split("/");c=h.split("/");if(g.length>=c.length){for(e=0,b=g.length;e<b;e++){if(e>=c.length||g[e]!=c[e]){f=e+1;break}}}if(g.length<c.length){for(e=0,b=c.length;e<b;e++){if(e>=g.length||g[e]!=c[e]){f=e+1;break}}}if(f==1){return h}for(e=0,b=g.length-(f-1);e<b;e++){d+="../"}for(e=f-1,b=c.length;e<b;e++){if(e!=f-1){d+="/"+c[e]}else{d+=c[e]}}return d},toAbsPath:function(e,f){var c,b=0,h=[],d,g;d=/\/$/.test(f)?"/":"";e=e.split("/");f=f.split("/");a(e,function(i){if(i){h.push(i)}});e=h;for(c=f.length-1,h=[];c>=0;c--){if(f[c].length==0||f[c]=="."){continue}if(f[c]==".."){b++;continue}if(b>0){b--;continue}h.push(f[c])}c=e.length-b;if(c<=0){g=h.reverse().join("/")}else{g=e.slice(0,c).join("/")+"/"+h.reverse().join("/")}if(g.indexOf("/")!==0){g="/"+g}if(d&&g.lastIndexOf("/")!==g.length-1){g+=d}return g},getURI:function(d){var c,b=this;if(!b.source||d){c="";if(!d){if(b.protocol){c+=b.protocol+"://"}if(b.userInfo){c+=b.userInfo+"@"}if(b.host){c+=b.host}if(b.port){c+=":"+b.port}}if(b.path){c+=b.path}if(b.query){c+="?"+b.query}if(b.anchor){c+="#"+b.anchor}b.source=c}return b.source}})})();(function(){var a=tinymce.each;tinymce.create("static tinymce.util.Cookie",{getHash:function(d){var b=this.get(d),c;if(b){a(b.split("&"),function(e){e=e.split("=");c=c||{};c[unescape(e[0])]=unescape(e[1])})}return c},setHash:function(j,b,g,f,i,c){var h="";a(b,function(e,d){h+=(!h?"":"&")+escape(d)+"="+escape(e)});this.set(j,h,g,f,i,c)},get:function(i){var h=document.cookie,g,f=i+"=",d;if(!h){return}d=h.indexOf("; "+f);if(d==-1){d=h.indexOf(f);if(d!=0){return null}}else{d+=2}g=h.indexOf(";",d);if(g==-1){g=h.length}return unescape(h.substring(d+f.length,g))},set:function(i,b,g,f,h,c){document.cookie=i+"="+escape(b)+((g)?"; expires="+g.toGMTString():"")+((f)?"; path="+escape(f):"")+((h)?"; domain="+h:"")+((c)?"; secure":"")},remove:function(e,b){var c=new Date();c.setTime(c.getTime()-1000);this.set(e,"",c,b,c)}})})();(function(){function serialize(o,quote){var i,v,t;quote=quote||'"';if(o==null){return"null"}t=typeof o;if(t=="string"){v="\bb\tt\nn\ff\rr\"\"''\\\\";return quote+o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g,function(a,b){if(quote==='"'&&a==="'"){return a}i=v.indexOf(b);if(i+1){return"\\"+v.charAt(i+1)}a=b.charCodeAt().toString(16);return"\\u"+"0000".substring(a.length)+a})+quote}if(t=="object"){if(o.hasOwnProperty&&o instanceof Array){for(i=0,v="[";i<o.length;i++){v+=(i>0?",":"")+serialize(o[i],quote)}return v+"]"}v="{";for(i in o){if(o.hasOwnProperty(i)){v+=typeof o[i]!="function"?(v.length>1?","+quote:quote)+i+quote+":"+serialize(o[i],quote):""}}return v+"}"}return""+o}tinymce.util.JSON={serialize:serialize,parse:function(s){try{return eval("("+s+")")}catch(ex){}}}})();tinymce.create("static tinymce.util.XHR",{send:function(g){var a,e,b=window,h=0;g.scope=g.scope||this;g.success_scope=g.success_scope||g.scope;g.error_scope=g.error_scope||g.scope;g.async=g.async===false?false:true;g.data=g.data||"";function d(i){a=0;try{a=new ActiveXObject(i)}catch(c){}return a}a=b.XMLHttpRequest?new XMLHttpRequest():d("Microsoft.XMLHTTP")||d("Msxml2.XMLHTTP");if(a){if(a.overrideMimeType){a.overrideMimeType(g.content_type)}a.open(g.type||(g.data?"POST":"GET"),g.url,g.async);if(g.content_type){a.setRequestHeader("Content-Type",g.content_type)}a.setRequestHeader("X-Requested-With","XMLHttpRequest");a.send(g.data);function f(){if(!g.async||a.readyState==4||h++>10000){if(g.success&&h<10000&&a.status==200){g.success.call(g.success_scope,""+a.responseText,a,g)}else{if(g.error){g.error.call(g.error_scope,h>10000?"TIMED_OUT":"GENERAL",a,g)}}a=null}else{b.setTimeout(f,10)}}if(!g.async){return f()}e=b.setTimeout(f,10)}}});(function(){var c=tinymce.extend,b=tinymce.util.JSON,a=tinymce.util.XHR;tinymce.create("tinymce.util.JSONRequest",{JSONRequest:function(d){this.settings=c({},d);this.count=0},send:function(f){var e=f.error,d=f.success;f=c(this.settings,f);f.success=function(h,g){h=b.parse(h);if(typeof(h)=="undefined"){h={error:"JSON Parse error."}}if(h.error){e.call(f.error_scope||f.scope,h.error,g)}else{d.call(f.success_scope||f.scope,h.result)}};f.error=function(h,g){if(e){e.call(f.error_scope||f.scope,h,g)}};f.data=b.serialize({id:f.id||"c"+(this.count++),method:f.method,params:f.params});f.content_type="application/json";a.send(f)},"static":{sendRPC:function(d){return new tinymce.util.JSONRequest().send(d)}}})}());(function(a){a.VK={DELETE:46,BACKSPACE:8,ENTER:13,TAB:9,SPACEBAR:32,UP:38,DOWN:40}})(tinymce);(function(k){var i=k.VK,j=i.BACKSPACE,h=i.DELETE;function c(m){var o=m.dom,n=m.selection;m.onKeyDown.add(function(q,u){var p,v,s,t,r;r=u.keyCode==h;if(r||u.keyCode==j){u.preventDefault();p=n.getRng();v=o.getParent(p.startContainer,o.isBlock);if(r){v=o.getNext(v,o.isBlock)}if(v){s=v.firstChild;while(s&&s.nodeType==3&&s.nodeValue.length==0){s=s.nextSibling}if(s&&s.nodeName==="SPAN"){t=s.cloneNode(false)}}q.getDoc().execCommand(r?"ForwardDelete":"Delete",false,null);v=o.getParent(p.startContainer,o.isBlock);k.each(o.select("span.Apple-style-span,font.Apple-style-span",v),function(x){var y=n.getBookmark();if(t){o.replace(t.cloneNode(false),x,true)}else{o.remove(x,true)}n.moveToBookmark(y)})}})}function d(m){m.onKeyUp.add(function(n,p){var o=p.keyCode;if(o==h||o==j){if(n.dom.isEmpty(n.getBody())){n.setContent("",{format:"raw"});n.nodeChanged();return}}})}function b(m){m.dom.bind(m.getDoc(),"focusin",function(){m.selection.setRng(m.selection.getRng())})}function e(m){m.onKeyDown.add(function(n,q){if(q.keyCode===j){if(n.selection.isCollapsed()&&n.selection.getRng(true).startOffset===0){var p=n.selection.getNode();var o=p.previousSibling;if(o&&o.nodeName&&o.nodeName.toLowerCase()==="hr"){n.dom.remove(o);k.dom.Event.cancel(q)}}}})}function g(m){if(!Range.prototype.getClientRects){m.onMouseDown.add(function(o,p){if(p.target.nodeName==="HTML"){var n=o.getBody();n.blur();setTimeout(function(){n.focus()},0)}})}}function f(m){m.onClick.add(function(n,o){o=o.target;if(/^(IMG|HR)$/.test(o.nodeName)){n.selection.getSel().setBaseAndExtent(o,0,o,1)}if(o.nodeName=="A"&&n.dom.hasClass(o,"mceItemAnchor")){n.selection.select(o)}n.nodeChanged()})}function l(m){var o,n;m.dom.bind(m.getDoc(),"selectionchange",function(){if(n){clearTimeout(n);n=0}n=window.setTimeout(function(){var p=m.selection.getRng();if(!o||!k.dom.RangeUtils.compareRanges(p,o)){m.nodeChanged();o=p}},50)})}function a(m){document.body.setAttribute("role","application")}k.create("tinymce.util.Quirks",{Quirks:function(m){if(k.isWebKit){c(m);d(m);b(m);f(m);if(k.isIDevice){l(m)}}if(k.isIE){e(m);d(m);a(m)}if(k.isGecko){e(m);g(m)}}})})(tinymce);(function(j){var a,g,d,k=/[&<>\"\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,b=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,f=/[<>&\"\']/g,c=/&(#x|#)?([\w]+);/g,i={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"};g={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;"};d={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"};function h(l){var m;m=document.createElement("div");m.innerHTML=l;return m.textContent||m.innerText||l}function e(m,p){var n,o,l,q={};if(m){m=m.split(",");p=p||10;for(n=0;n<m.length;n+=2){o=String.fromCharCode(parseInt(m[n],p));if(!g[o]){l="&"+m[n+1]+";";q[o]=l;q[l]=o}}return q}}a=e("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);j.html=j.html||{};j.html.Entities={encodeRaw:function(m,l){return m.replace(l?k:b,function(n){return g[n]||n})},encodeAllRaw:function(l){return(""+l).replace(f,function(m){return g[m]||m})},encodeNumeric:function(m,l){return m.replace(l?k:b,function(n){if(n.length>1){return"&#"+(((n.charCodeAt(0)-55296)*1024)+(n.charCodeAt(1)-56320)+65536)+";"}return g[n]||"&#"+n.charCodeAt(0)+";"})},encodeNamed:function(n,l,m){m=m||a;return n.replace(l?k:b,function(o){return g[o]||m[o]||o})},getEncodeFunc:function(l,o){var p=j.html.Entities;o=e(o)||a;function m(r,q){return r.replace(q?k:b,function(s){return g[s]||o[s]||"&#"+s.charCodeAt(0)+";"||s})}function n(r,q){return p.encodeNamed(r,q,o)}l=j.makeMap(l.replace(/\+/g,","));if(l.named&&l.numeric){return m}if(l.named){if(o){return n}return p.encodeNamed}if(l.numeric){return p.encodeNumeric}return p.encodeRaw},decode:function(l){return l.replace(c,function(n,m,o){if(m){o=parseInt(o,m.length===2?16:10);if(o>65535){o-=65536;return String.fromCharCode(55296+(o>>10),56320+(o&1023))}else{return i[o]||String.fromCharCode(o)}}return d[n]||a[n]||h(n)})}}})(tinymce);tinymce.html.Styles=function(d,f){var k=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,h=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,b=/\s*([^:]+):\s*([^;]+);?/g,l=/\s+$/,m=/rgb/,e,g,a={},j;d=d||{};j="\\\" \\' \\; \\: ; : \uFEFF".split(" ");for(g=0;g<j.length;g++){a[j[g]]="\uFEFF"+g;a["\uFEFF"+g]=j[g]}function c(n,q,p,i){function o(r){r=parseInt(r).toString(16);return r.length>1?r:"0"+r}return"#"+o(q)+o(p)+o(i)}return{toHex:function(i){return i.replace(k,c)},parse:function(r){var y={},p,n,v,q,u=d.url_converter,x=d.url_converter_scope||this;function o(C,F){var E,B,A,D;E=y[C+"-top"+F];if(!E){return}B=y[C+"-right"+F];if(E!=B){return}A=y[C+"-bottom"+F];if(B!=A){return}D=y[C+"-left"+F];if(A!=D){return}y[C+F]=D;delete y[C+"-top"+F];delete y[C+"-right"+F];delete y[C+"-bottom"+F];delete y[C+"-left"+F]}function t(B){var C=y[B],A;if(!C||C.indexOf(" ")<0){return}C=C.split(" ");A=C.length;while(A--){if(C[A]!==C[0]){return false}}y[B]=C[0];return true}function z(C,B,A,D){if(!t(B)){return}if(!t(A)){return}if(!t(D)){return}y[C]=y[B]+" "+y[A]+" "+y[D];delete y[B];delete y[A];delete y[D]}function s(A){q=true;return a[A]}function i(B,A){if(q){B=B.replace(/\uFEFF[0-9]/g,function(C){return a[C]})}if(!A){B=B.replace(/\\([\'\";:])/g,"$1")}return B}if(r){r=r.replace(/\\[\"\';:\uFEFF]/g,s).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(A){return A.replace(/[;:]/g,s)});while(p=b.exec(r)){n=p[1].replace(l,"").toLowerCase();v=p[2].replace(l,"");if(n&&v.length>0){if(n==="font-weight"&&v==="700"){v="bold"}else{if(n==="color"||n==="background-color"){v=v.toLowerCase()}}v=v.replace(k,c);v=v.replace(h,function(B,A,E,D,F,C){F=F||C;if(F){F=i(F);return"'"+F.replace(/\'/g,"\\'")+"'"}A=i(A||E||D);if(u){A=u.call(x,A,"style")}return"url('"+A.replace(/\'/g,"\\'")+"')"});y[n]=q?i(v,true):v}b.lastIndex=p.index+p[0].length}o("border","");o("border","-width");o("border","-color");o("border","-style");o("padding","");o("margin","");z("border","border-width","border-style","border-color");if(y.border==="medium none"){delete y.border}}return y},serialize:function(p,r){var o="",n,q;function i(t){var x,u,s,v;x=f.styles[t];if(x){for(u=0,s=x.length;u<s;u++){t=x[u];v=p[t];if(v!==e&&v.length>0){o+=(o.length>0?" ":"")+t+": "+v+";"}}}}if(r&&f&&f.styles){i("*");i(r)}else{for(n in p){q=p[n];if(q!==e&&q.length>0){o+=(o.length>0?" ":"")+n+": "+q+";"}}}return o}}};(function(m){var h={},j,l,g,f,c={},b,e,d=m.makeMap,k=m.each;function i(o,n){return o.split(n||",")}function a(r,q){var o,p={};function n(s){return s.replace(/[A-Z]+/g,function(t){return n(r[t])})}for(o in r){if(r.hasOwnProperty(o)){r[o]=n(r[o])}}n(q).replace(/#/g,"#text").replace(/(\w+)\[([^\]]+)\]\[([^\]]*)\]/g,function(v,t,s,u){s=i(s,"|");p[t]={attributes:d(s),attributesOrder:s,children:d(u,"|",{"#comment":{}})}});return p}l="h1,h2,h3,h4,h5,h6,hr,p,div,address,pre,form,table,tbody,thead,tfoot,th,tr,td,li,ol,ul,caption,blockquote,center,dl,dt,dd,dir,fieldset,noscript,menu,isindex,samp,header,footer,article,section,hgroup";l=d(l,",",d(l.toUpperCase()));h=a({Z:"H|K|N|O|P",Y:"X|form|R|Q",ZG:"E|span|width|align|char|charoff|valign",X:"p|T|div|U|W|isindex|fieldset|table",ZF:"E|align|char|charoff|valign",W:"pre|hr|blockquote|address|center|noframes",ZE:"abbr|axis|headers|scope|rowspan|colspan|align|char|charoff|valign|nowrap|bgcolor|width|height",ZD:"[E][S]",U:"ul|ol|dl|menu|dir",ZC:"p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q",T:"h1|h2|h3|h4|h5|h6",ZB:"X|S|Q",S:"R|P",ZA:"a|G|J|M|O|P",R:"a|H|K|N|O",Q:"noscript|P",P:"ins|del|script",O:"input|select|textarea|label|button",N:"M|L",M:"em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym",L:"sub|sup",K:"J|I",J:"tt|i|b|u|s|strike",I:"big|small|font|basefont",H:"G|F",G:"br|span|bdo",F:"object|applet|img|map|iframe",E:"A|B|C",D:"accesskey|tabindex|onfocus|onblur",C:"onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup",B:"lang|xml:lang|dir",A:"id|class|style|title"},"script[id|charset|type|language|src|defer|xml:space][]style[B|id|type|media|title|xml:space][]object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]param[id|name|value|valuetype|type][]p[E|align][#|S]a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]br[A|clear][]span[E][#|S]bdo[A|C|B][#|S]applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]h1[E|align][#|S]img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]map[B|C|A|name][X|form|Q|area]h2[E|align][#|S]iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]h3[E|align][#|S]tt[E][#|S]i[E][#|S]b[E][#|S]u[E][#|S]s[E][#|S]strike[E][#|S]big[E][#|S]small[E][#|S]font[A|B|size|color|face][#|S]basefont[id|size|color|face][]em[E][#|S]strong[E][#|S]dfn[E][#|S]code[E][#|S]q[E|cite][#|S]samp[E][#|S]kbd[E][#|S]var[E][#|S]cite[E][#|S]abbr[E][#|S]acronym[E][#|S]sub[E][#|S]sup[E][#|S]input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]optgroup[E|disabled|label][option]option[E|selected|disabled|label|value][]textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]label[E|for|accesskey|onfocus|onblur][#|S]button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]h4[E|align][#|S]ins[E|cite|datetime][#|Y]h5[E|align][#|S]del[E|cite|datetime][#|Y]h6[E|align][#|S]div[E|align][#|Y]ul[E|type|compact][li]li[E|type|value][#|Y]ol[E|type|compact|start][li]dl[E|compact][dt|dd]dt[E][#|S]dd[E][#|Y]menu[E|compact][li]dir[E|compact][li]pre[E|width|xml:space][#|ZA]hr[E|align|noshade|size|width][]blockquote[E|cite][#|Y]address[E][#|S|p]center[E][#|Y]noframes[E][#|Y]isindex[A|B|prompt][]fieldset[E][#|legend|Y]legend[E|accesskey|align][#|S]table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]caption[E|align][#|S]col[ZG][]colgroup[ZG][col]thead[ZF][tr]tr[ZF|bgcolor][th|td]th[E|ZE][#|Y]form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]noscript[E][#|Y]td[E|ZE][#|Y]tfoot[ZF][tr]tbody[ZF][tr]area[E|D|shape|coords|href|nohref|alt|target][]base[id|href|target][]body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]");j=d("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected,autoplay,loop,controls");g=d("area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed,source");f=m.extend(d("td,th,iframe,video,audio,object"),g);b=d("pre,script,style,textarea");e=d("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");m.html.Schema=function(r){var A=this,n={},o={},y=[],q,p;r=r||{};if(r.verify_html===false){r.valid_elements="*[*]"}if(r.valid_styles){q={};k(r.valid_styles,function(C,B){q[B]=m.explode(C)})}p=r.whitespace_elements?d(r.whitespace_elements):b;function z(B){return new RegExp("^"+B.replace(/([?+*])/g,".$1")+"$")}function t(I){var H,D,W,S,X,C,F,R,U,N,V,Z,L,G,T,B,P,E,Y,aa,M,Q,K=/^([#+-])?([^\[\/]+)(?:\/([^\[]+))?(?:\[([^\]]+)\])?$/,O=/^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,J=/[*?+]/;if(I){I=i(I);if(n["@"]){P=n["@"].attributes;E=n["@"].attributesOrder}for(H=0,D=I.length;H<D;H++){C=K.exec(I[H]);if(C){T=C[1];N=C[2];B=C[3];U=C[4];L={};G=[];F={attributes:L,attributesOrder:G};if(T==="#"){F.paddEmpty=true}if(T==="-"){F.removeEmpty=true}if(P){for(aa in P){L[aa]=P[aa]}G.push.apply(G,E)}if(U){U=i(U,"|");for(W=0,S=U.length;W<S;W++){C=O.exec(U[W]);if(C){R={};Z=C[1];V=C[2].replace(/::/g,":");T=C[3];Q=C[4];if(Z==="!"){F.attributesRequired=F.attributesRequired||[];F.attributesRequired.push(V);R.required=true}if(Z==="-"){delete L[V];G.splice(m.inArray(G,V),1);continue}if(T){if(T==="="){F.attributesDefault=F.attributesDefault||[];F.attributesDefault.push({name:V,value:Q});R.defaultValue=Q}if(T===":"){F.attributesForced=F.attributesForced||[];F.attributesForced.push({name:V,value:Q});R.forcedValue=Q}if(T==="<"){R.validValues=d(Q,"?")}}if(J.test(V)){F.attributePatterns=F.attributePatterns||[];R.pattern=z(V);F.attributePatterns.push(R)}else{if(!L[V]){G.push(V)}L[V]=R}}}}if(!P&&N=="@"){P=L;E=G}if(B){F.outputName=N;n[B]=F}if(J.test(N)){F.pattern=z(N);y.push(F)}else{n[N]=F}}}}}function v(B){n={};y=[];t(B);k(h,function(D,C){o[C]=D.children})}function s(C){var B=/^(~)?(.+)$/;if(C){k(i(C),function(G){var E=B.exec(G),F=E[1]==="~",H=F?"span":"div",D=E[2];o[D]=o[H];c[D]=H;if(!F){l[D]={}}k(o,function(I,J){if(I[H]){I[D]=I[H]}})})}}function u(C){var B=/^([+\-]?)(\w+)\[([^\]]+)\]$/;if(C){k(i(C),function(G){var F=B.exec(G),D,E;if(F){E=F[1];if(E){D=o[F[2]]}else{D=o[F[2]]={"#comment":{}}}D=o[F[2]];k(i(F[3],"|"),function(H){if(E==="-"){delete D[H]}else{D[H]={}}})}})}}function x(B){var D=n[B],C;if(D){return D}C=y.length;while(C--){D=y[C];if(D.pattern.test(B)){return D}}}if(!r.valid_elements){k(h,function(C,B){n[B]={attributes:C.attributes,attributesOrder:C.attributesOrder};o[B]=C.children});k(i("strong/b,em/i"),function(B){B=i(B,"/");n[B[1]].outputName=B[0]});n.img.attributesDefault=[{name:"alt",value:""}];k(i("ol,ul,sub,sup,blockquote,span,font,a,table,tbody,tr"),function(B){n[B].removeEmpty=true});k(i("p,h1,h2,h3,h4,h5,h6,th,td,pre,div,address,caption"),function(B){n[B].paddEmpty=true})}else{v(r.valid_elements)}s(r.custom_elements);u(r.valid_children);t(r.extended_valid_elements);u("+ol[ul|ol],+ul[ul|ol]");if(!x("span")){t("span[!data-mce-type|*]")}if(r.invalid_elements){m.each(m.explode(r.invalid_elements),function(B){if(n[B]){delete n[B]}})}A.children=o;A.styles=q;A.getBoolAttrs=function(){return j};A.getBlockElements=function(){return l};A.getShortEndedElements=function(){return g};A.getSelfClosingElements=function(){return e};A.getNonEmptyElements=function(){return f};A.getWhiteSpaceElements=function(){return p};A.isValidChild=function(B,D){var C=o[B];return !!(C&&C[D])};A.getElementRule=x;A.getCustomElements=function(){return c};A.addValidElements=t;A.setValidElements=v;A.addCustomElements=s;A.addValidChildren=u};m.html.Schema.boolAttrMap=j;m.html.Schema.blockElementsMap=l})(tinymce);(function(a){a.html.SaxParser=function(c,e){var b=this,d=function(){};c=c||{};b.schema=e=e||new a.html.Schema();if(c.fix_self_closing!==false){c.fix_self_closing=true}a.each("comment cdata text start end pi doctype".split(" "),function(f){if(f){b[f]=c[f]||d}});b.parse=function(D){var n=this,g,F=0,H,A,z=[],M,P,B,q,y,r,L,G,N,u,m,k,s,Q,o,O,E,R,K,f,I,l,C,J,h,v=0,j=a.html.Entities.decode,x,p;function t(S){var U,T;U=z.length;while(U--){if(z[U].name===S){break}}if(U>=0){for(T=z.length-1;T>=U;T--){S=z[T];if(S.valid){n.end(S.name)}}z.length=U}}l=new RegExp("<(?:(?:!--([\\w\\W]*?)-->)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:!DOCTYPE([\\w\\W]*?)>)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([^>]+)>)|(?:([^\\s\\/<>]+)((?:\\s+[^\"'>]+(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>]*))*|\\/)>))","g");C=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:\\.|[^\"])*)\")|(?:\'((?:\\.|[^\'])*)\')|([^>\s]+)))?/g;J={script:/<\/script[^>]*>/gi,style:/<\/style[^>]*>/gi,noscript:/<\/noscript[^>]*>/gi};L=e.getShortEndedElements();I=e.getSelfClosingElements();G=e.getBoolAttrs();u=c.validate;r=c.remove_internals;x=c.fix_self_closing;p=a.isIE;o=/^:/;while(g=l.exec(D)){if(F<g.index){n.text(j(D.substr(F,g.index-F)))}if(H=g[6]){H=H.toLowerCase();if(p&&o.test(H)){H=H.substr(1)}t(H)}else{if(H=g[7]){H=H.toLowerCase();if(p&&o.test(H)){H=H.substr(1)}N=H in L;if(x&&I[H]&&z.length>0&&z[z.length-1].name===H){t(H)}if(!u||(m=e.getElementRule(H))){k=true;if(u){O=m.attributes;E=m.attributePatterns}if(Q=g[8]){y=Q.indexOf("data-mce-type")!==-1;if(y&&r){k=false}M=[];M.map={};Q.replace(C,function(T,S,X,W,V){var Y,U;S=S.toLowerCase();X=S in G?S:j(X||W||V||"");if(u&&!y&&S.indexOf("data-")!==0){Y=O[S];if(!Y&&E){U=E.length;while(U--){Y=E[U];if(Y.pattern.test(S)){break}}if(U===-1){Y=null}}if(!Y){return}if(Y.validValues&&!(X in Y.validValues)){return}}M.map[S]=X;M.push({name:S,value:X})})}else{M=[];M.map={}}if(u&&!y){R=m.attributesRequired;K=m.attributesDefault;f=m.attributesForced;if(f){P=f.length;while(P--){s=f[P];q=s.name;h=s.value;if(h==="{$uid}"){h="mce_"+v++}M.map[q]=h;M.push({name:q,value:h})}}if(K){P=K.length;while(P--){s=K[P];q=s.name;if(!(q in M.map)){h=s.value;if(h==="{$uid}"){h="mce_"+v++}M.map[q]=h;M.push({name:q,value:h})}}}if(R){P=R.length;while(P--){if(R[P] in M.map){break}}if(P===-1){k=false}}if(M.map["data-mce-bogus"]){k=false}}if(k){n.start(H,M,N)}}else{k=false}if(A=J[H]){A.lastIndex=F=g.index+g[0].length;if(g=A.exec(D)){if(k){B=D.substr(F,g.index-F)}F=g.index+g[0].length}else{B=D.substr(F);F=D.length}if(k&&B.length>0){n.text(B,true)}if(k){n.end(H)}l.lastIndex=F;continue}if(!N){if(!Q||Q.indexOf("/")!=Q.length-1){z.push({name:H,valid:k})}else{if(k){n.end(H)}}}}else{if(H=g[1]){n.comment(H)}else{if(H=g[2]){n.cdata(H)}else{if(H=g[3]){n.doctype(H)}else{if(H=g[4]){n.pi(H,g[5])}}}}}}F=g.index+g[0].length}if(F<D.length){n.text(j(D.substr(F)))}for(P=z.length-1;P>=0;P--){H=z[P];if(H.valid){n.end(H.name)}}}}})(tinymce);(function(d){var c=/^[ \t\r\n]*$/,e={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11};function a(k,l,j){var i,h,f=j?"lastChild":"firstChild",g=j?"prev":"next";if(k[f]){return k[f]}if(k!==l){i=k[g];if(i){return i}for(h=k.parent;h&&h!==l;h=h.parent){i=h[g];if(i){return i}}}}function b(f,g){this.name=f;this.type=g;if(g===1){this.attributes=[];this.attributes.map={}}}d.extend(b.prototype,{replace:function(g){var f=this;if(g.parent){g.remove()}f.insert(g,f);f.remove();return f},attr:function(h,l){var f=this,g,j,k;if(typeof h!=="string"){for(j in h){f.attr(j,h[j])}return f}if(g=f.attributes){if(l!==k){if(l===null){if(h in g.map){delete g.map[h];j=g.length;while(j--){if(g[j].name===h){g=g.splice(j,1);return f}}}return f}if(h in g.map){j=g.length;while(j--){if(g[j].name===h){g[j].value=l;break}}}else{g.push({name:h,value:l})}g.map[h]=l;return f}else{return g.map[h]}}},clone:function(){var g=this,n=new b(g.name,g.type),h,f,m,j,k;if(m=g.attributes){k=[];k.map={};for(h=0,f=m.length;h<f;h++){j=m[h];if(j.name!=="id"){k[k.length]={name:j.name,value:j.value};k.map[j.name]=j.value}}n.attributes=k}n.value=g.value;n.shortEnded=g.shortEnded;return n},wrap:function(g){var f=this;f.parent.insert(g,f);g.append(f);return f},unwrap:function(){var f=this,h,g;for(h=f.firstChild;h;){g=h.next;f.insert(h,f,true);h=g}f.remove()},remove:function(){var f=this,h=f.parent,g=f.next,i=f.prev;if(h){if(h.firstChild===f){h.firstChild=g;if(g){g.prev=null}}else{i.next=g}if(h.lastChild===f){h.lastChild=i;if(i){i.next=null}}else{g.prev=i}f.parent=f.next=f.prev=null}return f},append:function(h){var f=this,g;if(h.parent){h.remove()}g=f.lastChild;if(g){g.next=h;h.prev=g;f.lastChild=h}else{f.lastChild=f.firstChild=h}h.parent=f;return h},insert:function(h,f,i){var g;if(h.parent){h.remove()}g=f.parent||this;if(i){if(f===g.firstChild){g.firstChild=h}else{f.prev.next=h}h.prev=f.prev;h.next=f;f.prev=h}else{if(f===g.lastChild){g.lastChild=h}else{f.next.prev=h}h.next=f.next;h.prev=f;f.next=h}h.parent=g;return h},getAll:function(g){var f=this,h,i=[];for(h=f.firstChild;h;h=a(h,f)){if(h.name===g){i.push(h)}}return i},empty:function(){var g=this,f,h,j;if(g.firstChild){f=[];for(j=g.firstChild;j;j=a(j,g)){f.push(j)}h=f.length;while(h--){j=f[h];j.parent=j.firstChild=j.lastChild=j.next=j.prev=null}}g.firstChild=g.lastChild=null;return g},isEmpty:function(k){var f=this,j=f.firstChild,h,g;if(j){do{if(j.type===1){if(j.attributes.map["data-mce-bogus"]){continue}if(k[j.name]){return false}h=j.attributes.length;while(h--){g=j.attributes[h].name;if(g==="name"||g.indexOf("data-")===0){return false}}}if((j.type===3&&!c.test(j.value))){return false}}while(j=a(j,f))}return true},walk:function(f){return a(this,null,f)}});d.extend(b,{create:function(g,f){var i,h;i=new b(g,e[g]||1);if(f){for(h in f){i.attr(h,f[h])}}return i}});d.html.Node=b})(tinymce);(function(b){var a=b.html.Node;b.html.DomParser=function(g,h){var f=this,e={},d=[],i={},c={};g=g||{};g.validate="validate" in g?g.validate:true;g.root_name=g.root_name||"body";f.schema=h=h||new b.html.Schema();function j(m){var o,p,x,v,z,n,q,l,t,u,k,s,y,r;s=b.makeMap("tr,td,th,tbody,thead,tfoot,table");k=h.getNonEmptyElements();for(o=0;o<m.length;o++){p=m[o];if(!p.parent){continue}v=[p];for(x=p.parent;x&&!h.isValidChild(x.name,p.name)&&!s[x.name];x=x.parent){v.push(x)}if(x&&v.length>1){v.reverse();z=n=f.filterNode(v[0].clone());for(t=0;t<v.length-1;t++){if(h.isValidChild(n.name,v[t].name)){q=f.filterNode(v[t].clone());n.append(q)}else{q=n}for(l=v[t].firstChild;l&&l!=v[t+1];){r=l.next;q.append(l);l=r}n=q}if(!z.isEmpty(k)){x.insert(z,v[0],true);x.insert(p,z)}else{x.insert(p,v[0],true)}x=v[0];if(x.isEmpty(k)||x.firstChild===x.lastChild&&x.firstChild.name==="br"){x.empty().remove()}}else{if(p.parent){if(p.name==="li"){y=p.prev;if(y&&(y.name==="ul"||y.name==="ul")){y.append(p);continue}y=p.next;if(y&&(y.name==="ul"||y.name==="ul")){y.insert(p,y.firstChild,true);continue}p.wrap(f.filterNode(new a("ul",1)));continue}if(h.isValidChild(p.parent.name,"div")&&h.isValidChild("div",p.name)){p.wrap(f.filterNode(new a("div",1)))}else{if(p.name==="style"||p.name==="script"){p.empty().remove()}else{p.unwrap()}}}}}}f.filterNode=function(m){var l,k,n;if(k in e){n=i[k];if(n){n.push(m)}else{i[k]=[m]}}l=d.length;while(l--){k=d[l].name;if(k in m.attributes.map){n=c[k];if(n){n.push(m)}else{c[k]=[m]}}}return m};f.addNodeFilter=function(k,l){b.each(b.explode(k),function(m){var n=e[m];if(!n){e[m]=n=[]}n.push(l)})};f.addAttributeFilter=function(k,l){b.each(b.explode(k),function(m){var n;for(n=0;n<d.length;n++){if(d[n].name===m){d[n].callbacks.push(l);return}}d.push({name:m,callbacks:[l]})})};f.parse=function(v,m){var n,H,A,z,C,B,x,r,E,K,y,o,D,J=[],t,k,s,p,u,q;m=m||{};i={};c={};o=b.extend(b.makeMap("script,style,head,html,body,title,meta,param"),h.getBlockElements());u=h.getNonEmptyElements();p=h.children;y=g.validate;q="forced_root_block" in m?m.forced_root_block:g.forced_root_block;s=h.getWhiteSpaceElements();D=/^[ \t\r\n]+/;t=/[ \t\r\n]+$/;k=/[ \t\r\n]+/g;function F(){var L=H.firstChild,l,M;while(L){l=L.next;if(L.type==3||(L.type==1&&L.name!=="p"&&!o[L.name]&&!L.attr("data-mce-type"))){if(!M){M=I(q,1);H.insert(M,L);M.append(L)}else{M.append(L)}}else{M=null}L=l}}function I(l,L){var M=new a(l,L),N;if(l in e){N=i[l];if(N){N.push(M)}else{i[l]=[M]}}return M}function G(M){var N,l,L;for(N=M.prev;N&&N.type===3;){l=N.value.replace(t,"");if(l.length>0){N.value=l;N=N.prev}else{L=N.prev;N.remove();N=L}}}n=new b.html.SaxParser({validate:y,fix_self_closing:!y,cdata:function(l){A.append(I("#cdata",4)).value=l},text:function(M,l){var L;if(!s[A.name]){M=M.replace(k," ");if(A.lastChild&&o[A.lastChild.name]){M=M.replace(D,"")}}if(M.length!==0){L=I("#text",3);L.raw=!!l;A.append(L).value=M}},comment:function(l){A.append(I("#comment",8)).value=l},pi:function(l,L){A.append(I(l,7)).value=L;G(A)},doctype:function(L){var l;l=A.append(I("#doctype",10));l.value=L;G(A)},start:function(l,T,M){var R,O,N,L,P,U,S,Q;N=y?h.getElementRule(l):{};if(N){R=I(N.outputName||l,1);R.attributes=T;R.shortEnded=M;A.append(R);Q=p[A.name];if(Q&&p[R.name]&&!Q[R.name]){J.push(R)}O=d.length;while(O--){P=d[O].name;if(P in T.map){E=c[P];if(E){E.push(R)}else{c[P]=[R]}}}if(o[l]){G(R)}if(!M){A=R}}},end:function(l){var P,M,O,L,N;M=y?h.getElementRule(l):{};if(M){if(o[l]){if(!s[A.name]){for(P=A.firstChild;P&&P.type===3;){O=P.value.replace(D,"");if(O.length>0){P.value=O;P=P.next}else{L=P.next;P.remove();P=L}}for(P=A.lastChild;P&&P.type===3;){O=P.value.replace(t,"");if(O.length>0){P.value=O;P=P.prev}else{L=P.prev;P.remove();P=L}}}P=A.prev;if(P&&P.type===3){O=P.value.replace(D,"");if(O.length>0){P.value=O}else{P.remove()}}}if(M.removeEmpty||M.paddEmpty){if(A.isEmpty(u)){if(M.paddEmpty){A.empty().append(new a("#text","3")).value="\u00a0"}else{if(!A.attributes.map.name){N=A.parent;A.empty().remove();A=N;return}}}}A=A.parent}}},h);H=A=new a(m.context||g.root_name,11);n.parse(v);if(y&&J.length){if(!m.context){j(J)}else{m.invalid=true}}if(q&&H.name=="body"){F()}if(!m.invalid){for(K in i){E=e[K];z=i[K];x=z.length;while(x--){if(!z[x].parent){z.splice(x,1)}}for(C=0,B=E.length;C<B;C++){E[C](z,K,m)}}for(C=0,B=d.length;C<B;C++){E=d[C];if(E.name in c){z=c[E.name];x=z.length;while(x--){if(!z[x].parent){z.splice(x,1)}}for(x=0,r=E.callbacks.length;x<r;x++){E.callbacks[x](z,E.name,m)}}}}return H};if(g.remove_trailing_brs){f.addNodeFilter("br",function(n,m){var r,q=n.length,o,u=h.getBlockElements(),k=h.getNonEmptyElements(),s,p,t;u.body=1;for(r=0;r<q;r++){o=n[r];s=o.parent;if(u[o.parent.name]&&o===s.lastChild){p=o.prev;while(p){t=p.name;if(t!=="span"||p.attr("data-mce-type")!=="bookmark"){if(t!=="br"){break}if(t==="br"){o=null;break}}p=p.prev}if(o){o.remove();if(s.isEmpty(k)){elementRule=h.getElementRule(s.name);if(elementRule){if(elementRule.removeEmpty){s.remove()}else{if(elementRule.paddEmpty){s.empty().append(new b.html.Node("#text",3)).value="\u00a0"}}}}}}}})}}})(tinymce);tinymce.html.Writer=function(e){var c=[],a,b,d,f,g;e=e||{};a=e.indent;b=tinymce.makeMap(e.indent_before||"");d=tinymce.makeMap(e.indent_after||"");f=tinymce.html.Entities.getEncodeFunc(e.entity_encoding||"raw",e.entities);g=e.element_format=="html";return{start:function(m,k,p){var n,j,h,o;if(a&&b[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}c.push("<",m);if(k){for(n=0,j=k.length;n<j;n++){h=k[n];c.push(" ",h.name,'="',f(h.value,true),'"')}}if(!p||g){c[c.length]=">"}else{c[c.length]=" />"}if(p&&a&&d[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}},end:function(h){var i;c.push("</",h,">");if(a&&d[h]&&c.length>0){i=c[c.length-1];if(i.length>0&&i!=="\n"){c.push("\n")}}},text:function(i,h){if(i.length>0){c[c.length]=h?i:f(i)}},cdata:function(h){c.push("<![CDATA[",h,"]]>")},comment:function(h){c.push("<!--",h,"-->")},pi:function(h,i){if(i){c.push("<?",h," ",i,"?>")}else{c.push("<?",h,"?>")}if(a){c.push("\n")}},doctype:function(h){c.push("<!DOCTYPE",h,">",a?"\n":"")},reset:function(){c.length=0},getContent:function(){return c.join("").replace(/\n$/,"")}}};(function(a){a.html.Serializer=function(c,d){var b=this,e=new a.html.Writer(c);c=c||{};c.validate="validate" in c?c.validate:true;b.schema=d=d||new a.html.Schema();b.writer=e;b.serialize=function(h){var g,i;i=c.validate;g={3:function(k,j){e.text(k.value,k.raw)},8:function(j){e.comment(j.value)},7:function(j){e.pi(j.name,j.value)},10:function(j){e.doctype(j.value)},4:function(j){e.cdata(j.value)},11:function(j){if((j=j.firstChild)){do{f(j)}while(j=j.next)}}};e.reset();function f(k){var t=g[k.type],j,o,s,r,p,u,n,m,q;if(!t){j=k.name;o=k.shortEnded;s=k.attributes;if(i&&s&&s.length>1){u=[];u.map={};q=d.getElementRule(k.name);for(n=0,m=q.attributesOrder.length;n<m;n++){r=q.attributesOrder[n];if(r in s.map){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}for(n=0,m=s.length;n<m;n++){r=s[n].name;if(!(r in u.map)){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}s=u}e.start(k.name,s,o);if(!o){if((k=k.firstChild)){do{f(k)}while(k=k.next)}e.end(j)}}else{t(k)}}if(h.type==1&&!c.inner){f(h)}else{g[11](h)}return e.getContent()}}})(tinymce);(function(h){var f=h.each,e=h.is,d=h.isWebKit,b=h.isIE,c=h.html.Entities,a=/^([a-z0-9],?)+$/i,g=h.html.Schema.blockElementsMap,i=/^[ \t\r\n]*$/;h.create("tinymce.dom.DOMUtils",{doc:null,root:null,files:null,pixelStyles:/^(top|left|bottom|right|width|height|borderWidth)$/,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"},DOMUtils:function(o,m){var l=this,j,k;l.doc=o;l.win=window;l.files={};l.cssFlicker=false;l.counter=0;l.stdMode=!h.isIE||o.documentMode>=8;l.boxModel=!h.isIE||o.compatMode=="CSS1Compat"||l.stdMode;l.hasOuterHTML="outerHTML" in o.createElement("a");l.settings=m=h.extend({keep_values:false,hex_colors:1},m);l.schema=m.schema;l.styles=new h.html.Styles({url_converter:m.url_converter,url_converter_scope:m.url_converter_scope},m.schema);if(h.isIE6){try{o.execCommand("BackgroundImageCache",false,true)}catch(n){l.cssFlicker=true}}if(b&&m.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(p){o.createElement(p)});for(k in m.schema.getCustomElements()){o.createElement(k)}}h.addUnload(l.destroy,l)},getRoot:function(){var j=this,k=j.settings;return(k&&j.get(k.root_element))||j.doc.body},getViewPort:function(k){var l,j;k=!k?this.win:k;l=k.document;j=this.boxModel?l.documentElement:l.body;return{x:k.pageXOffset||j.scrollLeft,y:k.pageYOffset||j.scrollTop,w:k.innerWidth||j.clientWidth,h:k.innerHeight||j.clientHeight}},getRect:function(m){var l,j=this,k;m=j.get(m);l=j.getPos(m);k=j.getSize(m);return{x:l.x,y:l.y,w:k.w,h:k.h}},getSize:function(m){var k=this,j,l;m=k.get(m);j=k.getStyle(m,"width");l=k.getStyle(m,"height");if(j.indexOf("px")===-1){j=0}if(l.indexOf("px")===-1){l=0}return{w:parseInt(j)||m.offsetWidth||m.clientWidth,h:parseInt(l)||m.offsetHeight||m.clientHeight}},getParent:function(l,k,j){return this.getParents(l,k,j,false)},getParents:function(u,p,l,s){var k=this,j,m=k.settings,q=[];u=k.get(u);s=s===undefined;if(m.strict_root){l=l||k.getRoot()}if(e(p,"string")){j=p;if(p==="*"){p=function(o){return o.nodeType==1}}else{p=function(o){return k.is(o,j)}}}while(u){if(u==l||!u.nodeType||u.nodeType===9){break}if(!p||p(u)){if(s){q.push(u)}else{return u}}u=u.parentNode}return s?q:null},get:function(j){var k;if(j&&this.doc&&typeof(j)=="string"){k=j;j=this.doc.getElementById(j);if(j&&j.id!==k){return this.doc.getElementsByName(k)[1]}}return j},getNext:function(k,j){return this._findSib(k,j,"nextSibling")},getPrev:function(k,j){return this._findSib(k,j,"previousSibling")},select:function(l,k){var j=this;return h.dom.Sizzle(l,j.get(k)||j.get(j.settings.root_element)||j.doc,[])},is:function(l,j){var k;if(l.length===undefined){if(j==="*"){return l.nodeType==1}if(a.test(j)){j=j.toLowerCase().split(/,/);l=l.nodeName.toLowerCase();for(k=j.length-1;k>=0;k--){if(j[k]==l){return true}}return false}}return h.dom.Sizzle.matches(j,l.nodeType?[l]:l).length>0},add:function(m,q,j,l,o){var k=this;return this.run(m,function(s){var r,n;r=e(q,"string")?k.doc.createElement(q):q;k.setAttribs(r,j);if(l){if(l.nodeType){r.appendChild(l)}else{k.setHTML(r,l)}}return !o?s.appendChild(r):r})},create:function(l,j,k){return this.add(this.doc.createElement(l),l,j,k,1)},createHTML:function(r,j,p){var q="",m=this,l;q+="<"+r;for(l in j){if(j.hasOwnProperty(l)){q+=" "+l+'="'+m.encode(j[l])+'"'}}if(typeof(p)!="undefined"){return q+">"+p+"</"+r+">"}return q+" />"},remove:function(j,k){return this.run(j,function(m){var n,l=m.parentNode;if(!l){return null}if(k){while(n=m.firstChild){if(!h.isIE||n.nodeType!==3||n.nodeValue){l.insertBefore(n,m)}else{m.removeChild(n)}}}return l.removeChild(m)})},setStyle:function(m,j,k){var l=this;return l.run(m,function(p){var o,n;o=p.style;j=j.replace(/-(\D)/g,function(r,q){return q.toUpperCase()});if(l.pixelStyles.test(j)&&(h.is(k,"number")||/^[\-0-9\.]+$/.test(k))){k+="px"}switch(j){case"opacity":if(b){o.filter=k===""?"":"alpha(opacity="+(k*100)+")";if(!m.currentStyle||!m.currentStyle.hasLayout){o.display="inline-block"}}o[j]=o["-moz-opacity"]=o["-khtml-opacity"]=k||"";break;case"float":b?o.styleFloat=k:o.cssFloat=k;break;default:o[j]=k||""}if(l.settings.update_styles){l.setAttrib(p,"data-mce-style")}})},getStyle:function(m,j,l){m=this.get(m);if(!m){return}if(this.doc.defaultView&&l){j=j.replace(/[A-Z]/g,function(n){return"-"+n});try{return this.doc.defaultView.getComputedStyle(m,null).getPropertyValue(j)}catch(k){return null}}j=j.replace(/-(\D)/g,function(o,n){return n.toUpperCase()});if(j=="float"){j=b?"styleFloat":"cssFloat"}if(m.currentStyle&&l){return m.currentStyle[j]}return m.style?m.style[j]:undefined},setStyles:function(m,n){var k=this,l=k.settings,j;j=l.update_styles;l.update_styles=0;f(n,function(o,p){k.setStyle(m,p,o)});l.update_styles=j;if(l.update_styles){k.setAttrib(m,l.cssText)}},removeAllAttribs:function(j){return this.run(j,function(m){var l,k=m.attributes;for(l=k.length-1;l>=0;l--){m.removeAttributeNode(k.item(l))}})},setAttrib:function(l,m,j){var k=this;if(!l||!m){return}if(k.settings.strict){m=m.toLowerCase()}return this.run(l,function(o){var n=k.settings;if(j!==null){switch(m){case"style":if(!e(j,"string")){f(j,function(p,q){k.setStyle(o,q,p)});return}if(n.keep_values){if(j&&!k._isRes(j)){o.setAttribute("data-mce-style",j,2)}else{o.removeAttribute("data-mce-style",2)}}o.style.cssText=j;break;case"class":o.className=j||"";break;case"src":case"href":if(n.keep_values){if(n.url_converter){j=n.url_converter.call(n.url_converter_scope||k,j,m,o)}k.setAttrib(o,"data-mce-"+m,j,2)}break;case"shape":o.setAttribute("data-mce-style",j);break}}if(e(j)&&j!==null&&j.length!==0){o.setAttribute(m,""+j,2)}else{o.removeAttribute(m,2)}})},setAttribs:function(k,l){var j=this;return this.run(k,function(m){f(l,function(o,p){j.setAttrib(m,p,o)})})},getAttrib:function(o,p,l){var j,k=this,m;o=k.get(o);if(!o||o.nodeType!==1){return l===m?false:l}if(!e(l)){l=""}if(/^(src|href|style|coords|shape)$/.test(p)){j=o.getAttribute("data-mce-"+p);if(j){return j}}if(b&&k.props[p]){j=o[k.props[p]];j=j&&j.nodeValue?j.nodeValue:j}if(!j){j=o.getAttribute(p,2)}if(/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(p)){if(o[k.props[p]]===true&&j===""){return p}return j?p:""}if(o.nodeName==="FORM"&&o.getAttributeNode(p)){return o.getAttributeNode(p).nodeValue}if(p==="style"){j=j||o.style.cssText;if(j){j=k.serializeStyle(k.parseStyle(j),o.nodeName);if(k.settings.keep_values&&!k._isRes(j)){o.setAttribute("data-mce-style",j)}}}if(d&&p==="class"&&j){j=j.replace(/(apple|webkit)\-[a-z\-]+/gi,"")}if(b){switch(p){case"rowspan":case"colspan":if(j===1){j=""}break;case"size":if(j==="+0"||j===20||j===0){j=""}break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":if(j===0){j=""}break;case"hspace":if(j===-1){j=""}break;case"maxlength":case"tabindex":if(j===32768||j===2147483647||j==="32768"){j=""}break;case"multiple":case"compact":case"noshade":case"nowrap":if(j===65535){return p}return l;case"shape":j=j.toLowerCase();break;default:if(p.indexOf("on")===0&&j){j=h._replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/,"$1",""+j)}}}return(j!==m&&j!==null&&j!=="")?""+j:l},getPos:function(s,m){var k=this,j=0,q=0,o,p=k.doc,l;s=k.get(s);m=m||p.body;if(s){if(s.getBoundingClientRect){s=s.getBoundingClientRect();o=k.boxModel?p.documentElement:p.body;j=s.left+(p.documentElement.scrollLeft||p.body.scrollLeft)-o.clientTop;q=s.top+(p.documentElement.scrollTop||p.body.scrollTop)-o.clientLeft;return{x:j,y:q}}l=s;while(l&&l!=m&&l.nodeType){j+=l.offsetLeft||0;q+=l.offsetTop||0;l=l.offsetParent}l=s.parentNode;while(l&&l!=m&&l.nodeType){j-=l.scrollLeft||0;q-=l.scrollTop||0;l=l.parentNode}}return{x:j,y:q}},parseStyle:function(j){return this.styles.parse(j)},serializeStyle:function(k,j){return this.styles.serialize(k,j)},loadCSS:function(j){var l=this,m=l.doc,k;if(!j){j=""}k=l.select("head")[0];f(j.split(","),function(n){var o;if(l.files[n]){return}l.files[n]=true;o=l.create("link",{rel:"stylesheet",href:h._addVer(n)});if(b&&m.documentMode&&m.recalc){o.onload=function(){if(m.recalc){m.recalc()}o.onload=null}}k.appendChild(o)})},addClass:function(j,k){return this.run(j,function(l){var m;if(!k){return 0}if(this.hasClass(l,k)){return l.className}m=this.removeClass(l,k);return l.className=(m!=""?(m+" "):"")+k})},removeClass:function(l,m){var j=this,k;return j.run(l,function(o){var n;if(j.hasClass(o,m)){if(!k){k=new RegExp("(^|\\s+)"+m+"(\\s+|$)","g")}n=o.className.replace(k," ");n=h.trim(n!=" "?n:"");o.className=n;if(!n){o.removeAttribute("class");o.removeAttribute("className")}return n}return o.className})},hasClass:function(k,j){k=this.get(k);if(!k||!j){return false}return(" "+k.className+" ").indexOf(" "+j+" ")!==-1},show:function(j){return this.setStyle(j,"display","block")},hide:function(j){return this.setStyle(j,"display","none")},isHidden:function(j){j=this.get(j);return !j||j.style.display=="none"||this.getStyle(j,"display")=="none"},uniqueId:function(j){return(!j?"mce_":j)+(this.counter++)},setHTML:function(l,k){var j=this;return j.run(l,function(n){if(b){while(n.firstChild){n.removeChild(n.firstChild)}try{n.innerHTML="<br />"+k;n.removeChild(n.firstChild)}catch(m){n=j.create("div");n.innerHTML="<br />"+k;f(n.childNodes,function(p,o){if(o){n.appendChild(p)}})}}else{n.innerHTML=k}return k})},getOuterHTML:function(l){var k,j=this;l=j.get(l);if(!l){return null}if(l.nodeType===1&&j.hasOuterHTML){return l.outerHTML}k=(l.ownerDocument||j.doc).createElement("body");k.appendChild(l.cloneNode(true));return k.innerHTML},setOuterHTML:function(m,k,n){var j=this;function l(p,o,r){var s,q;q=r.createElement("body");q.innerHTML=o;s=q.lastChild;while(s){j.insertAfter(s.cloneNode(true),p);s=s.previousSibling}j.remove(p)}return this.run(m,function(p){p=j.get(p);if(p.nodeType==1){n=n||p.ownerDocument||j.doc;if(b){try{if(b&&p.nodeType==1){p.outerHTML=k}else{l(p,k,n)}}catch(o){l(p,k,n)}}else{l(p,k,n)}}})},decode:c.decode,encode:c.encodeAllRaw,insertAfter:function(j,k){k=this.get(k);return this.run(j,function(m){var l,n;l=k.parentNode;n=k.nextSibling;if(n){l.insertBefore(m,n)}else{l.appendChild(m)}return m})},isBlock:function(k){var j=k.nodeType;if(j){return !!(j===1&&g[k.nodeName])}return !!g[k]},replace:function(p,m,j){var l=this;if(e(m,"array")){p=p.cloneNode(true)}return l.run(m,function(k){if(j){f(h.grep(k.childNodes),function(n){p.appendChild(n)})}return k.parentNode.replaceChild(p,k)})},rename:function(m,j){var l=this,k;if(m.nodeName!=j.toUpperCase()){k=l.create(j);f(l.getAttribs(m),function(n){l.setAttrib(k,n.nodeName,l.getAttrib(m,n.nodeName))});l.replace(k,m,1)}return k||m},findCommonAncestor:function(l,j){var m=l,k;while(m){k=j;while(k&&m!=k){k=k.parentNode}if(m==k){break}m=m.parentNode}if(!m&&l.ownerDocument){return l.ownerDocument.documentElement}return m},toHex:function(j){var l=/^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(j);function k(m){m=parseInt(m).toString(16);return m.length>1?m:"0"+m}if(l){j="#"+k(l[1])+k(l[2])+k(l[3]);return j}return j},getClasses:function(){var n=this,j=[],m,o={},p=n.settings.class_filter,l;if(n.classes){return n.classes}function q(r){f(r.imports,function(s){q(s)});f(r.cssRules||r.rules,function(s){switch(s.type||1){case 1:if(s.selectorText){f(s.selectorText.split(","),function(t){t=t.replace(/^\s*|\s*$|^\s\./g,"");if(/\.mce/.test(t)||!/\.[\w\-]+$/.test(t)){return}l=t;t=h._replace(/.*\.([a-z0-9_\-]+).*/i,"$1",t);if(p&&!(t=p(t,l))){return}if(!o[t]){j.push({"class":t});o[t]=1}})}break;case 3:q(s.styleSheet);break}})}try{f(n.doc.styleSheets,q)}catch(k){}if(j.length>0){n.classes=j}return j},run:function(m,l,k){var j=this,n;if(j.doc&&typeof(m)==="string"){m=j.get(m)}if(!m){return false}k=k||this;if(!m.nodeType&&(m.length||m.length===0)){n=[];f(m,function(p,o){if(p){if(typeof(p)=="string"){p=j.doc.getElementById(p)}n.push(l.call(k,p,o))}});return n}return l.call(k,m)},getAttribs:function(k){var j;k=this.get(k);if(!k){return[]}if(b){j=[];if(k.nodeName=="OBJECT"){return k.attributes}if(k.nodeName==="OPTION"&&this.getAttrib(k,"selected")){j.push({specified:1,nodeName:"selected"})}k.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi,"").replace(/[\w:\-]+/gi,function(l){j.push({specified:1,nodeName:l})});return j}return k.attributes},isEmpty:function(m,k){var r=this,o,n,q,j,l,p;m=m.firstChild;if(m){j=new h.dom.TreeWalker(m);k=k||r.schema?r.schema.getNonEmptyElements():null;do{q=m.nodeType;if(q===1){if(m.getAttribute("data-mce-bogus")){continue}l=m.nodeName.toLowerCase();if(k&&k[l]){p=m.parentNode;if(l==="br"&&r.isBlock(p)&&p.firstChild===m&&p.lastChild===m){continue}return false}n=r.getAttribs(m);o=m.attributes.length;while(o--){l=m.attributes[o].nodeName;if(l==="name"||l==="data-mce-bookmark"){return false}}}if((q===3&&!i.test(m.nodeValue))){return false}}while(m=j.next())}return true},destroy:function(k){var j=this;if(j.events){j.events.destroy()}j.win=j.doc=j.root=j.events=null;if(!k){h.removeUnload(j.destroy)}},createRng:function(){var j=this.doc;return j.createRange?j.createRange():new h.dom.Range(this)},nodeIndex:function(n,o){var j=0,l,m,k;if(n){for(l=n.nodeType,n=n.previousSibling,m=n;n;n=n.previousSibling){k=n.nodeType;if(o&&k==3){if(k==l||!n.nodeValue.length){continue}}j++;l=k}}return j},split:function(n,m,q){var s=this,j=s.createRng(),o,l,p;function k(v){var t,r=v.childNodes,u=v.nodeType;if(u==1&&v.getAttribute("data-mce-type")=="bookmark"){return}for(t=r.length-1;t>=0;t--){k(r[t])}if(u!=9){if(u==3&&v.nodeValue.length>0){if(!s.isBlock(v.parentNode)||h.trim(v.nodeValue).length>0){return}}else{if(u==1){r=v.childNodes;if(r.length==1&&r[0]&&r[0].nodeType==1&&r[0].getAttribute("data-mce-type")=="bookmark"){v.parentNode.insertBefore(r[0],v)}if(r.length||/^(br|hr|input|img)$/i.test(v.nodeName)){return}}}s.remove(v)}return v}if(n&&m){j.setStart(n.parentNode,s.nodeIndex(n));j.setEnd(m.parentNode,s.nodeIndex(m));o=j.extractContents();j=s.createRng();j.setStart(m.parentNode,s.nodeIndex(m)+1);j.setEnd(n.parentNode,s.nodeIndex(n)+1);l=j.extractContents();p=n.parentNode;p.insertBefore(k(o),n);if(q){p.replaceChild(q,m)}else{p.insertBefore(m,n)}p.insertBefore(k(l),n);s.remove(n);return q||m}},bind:function(n,j,m,l){var k=this;if(!k.events){k.events=new h.dom.EventUtils()}return k.events.add(n,j,m,l||this)},unbind:function(m,j,l){var k=this;if(!k.events){k.events=new h.dom.EventUtils()}return k.events.remove(m,j,l)},_findSib:function(m,j,k){var l=this,n=j;if(m){if(e(n,"string")){n=function(o){return l.is(o,j)}}for(m=m[k];m;m=m[k]){if(n(m)){return m}}}return null},_isRes:function(j){return/^(top|left|bottom|right|width|height)/i.test(j)||/;\s*(top|left|bottom|right|width|height)/i.test(j)}});h.DOM=new h.dom.DOMUtils(document,{process_html:0})})(tinymce);(function(a){function b(c){var N=this,e=c.doc,S=0,E=1,j=2,D=true,R=false,U="startOffset",h="startContainer",P="endContainer",z="endOffset",k=tinymce.extend,n=c.nodeIndex;k(N,{startContainer:e,startOffset:0,endContainer:e,endOffset:0,collapsed:D,commonAncestorContainer:e,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:q,setEnd:s,setStartBefore:g,setStartAfter:I,setEndBefore:J,setEndAfter:u,collapse:A,selectNode:x,selectNodeContents:F,compareBoundaryPoints:v,deleteContents:p,extractContents:H,cloneContents:d,insertNode:C,surroundContents:M,cloneRange:K});function q(V,t){B(D,V,t)}function s(V,t){B(R,V,t)}function g(t){q(t.parentNode,n(t))}function I(t){q(t.parentNode,n(t)+1)}function J(t){s(t.parentNode,n(t))}function u(t){s(t.parentNode,n(t)+1)}function A(t){if(t){N[P]=N[h];N[z]=N[U]}else{N[h]=N[P];N[U]=N[z]}N.collapsed=D}function x(t){g(t);u(t)}function F(t){q(t,0);s(t,t.nodeType===1?t.childNodes.length:t.nodeValue.length)}function v(Y,t){var ab=N[h],W=N[U],aa=N[P],V=N[z],Z=t.startContainer,ad=t.startOffset,X=t.endContainer,ac=t.endOffset;if(Y===0){return G(ab,W,Z,ad)}if(Y===1){return G(aa,V,Z,ad)}if(Y===2){return G(aa,V,X,ac)}if(Y===3){return G(ab,W,X,ac)}}function p(){m(j)}function H(){return m(S)}function d(){return m(E)}function C(Y){var V=this[h],t=this[U],X,W;if((V.nodeType===3||V.nodeType===4)&&V.nodeValue){if(!t){V.parentNode.insertBefore(Y,V)}else{if(t>=V.nodeValue.length){c.insertAfter(Y,V)}else{X=V.splitText(t);V.parentNode.insertBefore(Y,X)}}}else{if(V.childNodes.length>0){W=V.childNodes[t]}if(W){V.insertBefore(Y,W)}else{V.appendChild(Y)}}}function M(V){var t=N.extractContents();N.insertNode(V);V.appendChild(t);N.selectNode(V)}function K(){return k(new b(c),{startContainer:N[h],startOffset:N[U],endContainer:N[P],endOffset:N[z],collapsed:N.collapsed,commonAncestorContainer:N.commonAncestorContainer})}function O(t,V){var W;if(t.nodeType==3){return t}if(V<0){return t}W=t.firstChild;while(W&&V>0){--V;W=W.nextSibling}if(W){return W}return t}function l(){return(N[h]==N[P]&&N[U]==N[z])}function G(X,Z,V,Y){var aa,W,t,ab,ad,ac;if(X==V){if(Z==Y){return 0}if(Z<Y){return -1}return 1}aa=V;while(aa&&aa.parentNode!=X){aa=aa.parentNode}if(aa){W=0;t=X.firstChild;while(t!=aa&&W<Z){W++;t=t.nextSibling}if(Z<=W){return -1}return 1}aa=X;while(aa&&aa.parentNode!=V){aa=aa.parentNode}if(aa){W=0;t=V.firstChild;while(t!=aa&&W<Y){W++;t=t.nextSibling}if(W<Y){return -1}return 1}ab=c.findCommonAncestor(X,V);ad=X;while(ad&&ad.parentNode!=ab){ad=ad.parentNode}if(!ad){ad=ab}ac=V;while(ac&&ac.parentNode!=ab){ac=ac.parentNode}if(!ac){ac=ab}if(ad==ac){return 0}t=ab.firstChild;while(t){if(t==ad){return -1}if(t==ac){return 1}t=t.nextSibling}}function B(V,Y,X){var t,W;if(V){N[h]=Y;N[U]=X}else{N[P]=Y;N[z]=X}t=N[P];while(t.parentNode){t=t.parentNode}W=N[h];while(W.parentNode){W=W.parentNode}if(W==t){if(G(N[h],N[U],N[P],N[z])>0){N.collapse(V)}}else{N.collapse(V)}N.collapsed=l();N.commonAncestorContainer=c.findCommonAncestor(N[h],N[P])}function m(ab){var aa,X=0,ad=0,V,Z,W,Y,t,ac;if(N[h]==N[P]){return f(ab)}for(aa=N[P],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[h]){return r(aa,ab)}++X}for(aa=N[h],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[P]){return T(aa,ab)}++ad}Z=ad-X;W=N[h];while(Z>0){W=W.parentNode;Z--}Y=N[P];while(Z<0){Y=Y.parentNode;Z++}for(t=W.parentNode,ac=Y.parentNode;t!=ac;t=t.parentNode,ac=ac.parentNode){W=t;Y=ac}return o(W,Y,ab)}function f(Z){var ab,Y,X,aa,t,W,V;if(Z!=j){ab=e.createDocumentFragment()}if(N[U]==N[z]){return ab}if(N[h].nodeType==3){Y=N[h].nodeValue;X=Y.substring(N[U],N[z]);if(Z!=E){N[h].deleteData(N[U],N[z]-N[U]);N.collapse(D)}if(Z==j){return}ab.appendChild(e.createTextNode(X));return ab}aa=O(N[h],N[U]);t=N[z]-N[U];while(t>0){W=aa.nextSibling;V=y(aa,Z);if(ab){ab.appendChild(V)}--t;aa=W}if(Z!=E){N.collapse(D)}return ab}function r(ab,Y){var aa,Z,V,t,X,W;if(Y!=j){aa=e.createDocumentFragment()}Z=i(ab,Y);if(aa){aa.appendChild(Z)}V=n(ab);t=V-N[U];if(t<=0){if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}Z=ab.previousSibling;while(t>0){X=Z.previousSibling;W=y(Z,Y);if(aa){aa.insertBefore(W,aa.firstChild)}--t;Z=X}if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}function T(Z,Y){var ab,V,aa,t,X,W;if(Y!=j){ab=e.createDocumentFragment()}aa=Q(Z,Y);if(ab){ab.appendChild(aa)}V=n(Z);++V;t=N[z]-V;aa=Z.nextSibling;while(t>0){X=aa.nextSibling;W=y(aa,Y);if(ab){ab.appendChild(W)}--t;aa=X}if(Y!=E){N.setStartAfter(Z);N.collapse(D)}return ab}function o(Z,t,ac){var W,ae,Y,aa,ab,V,ad,X;if(ac!=j){ae=e.createDocumentFragment()}W=Q(Z,ac);if(ae){ae.appendChild(W)}Y=Z.parentNode;aa=n(Z);ab=n(t);++aa;V=ab-aa;ad=Z.nextSibling;while(V>0){X=ad.nextSibling;W=y(ad,ac);if(ae){ae.appendChild(W)}ad=X;--V}W=i(t,ac);if(ae){ae.appendChild(W)}if(ac!=E){N.setStartAfter(Z);N.collapse(D)}return ae}function i(aa,ab){var W=O(N[P],N[z]-1),ac,Z,Y,t,V,X=W!=N[P];if(W==aa){return L(W,X,R,ab)}ac=W.parentNode;Z=L(ac,R,R,ab);while(ac){while(W){Y=W.previousSibling;t=L(W,X,R,ab);if(ab!=j){Z.insertBefore(t,Z.firstChild)}X=D;W=Y}if(ac==aa){return Z}W=ac.previousSibling;ac=ac.parentNode;V=L(ac,R,R,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function Q(aa,ab){var X=O(N[h],N[U]),Y=X!=N[h],ac,Z,W,t,V;if(X==aa){return L(X,Y,D,ab)}ac=X.parentNode;Z=L(ac,R,D,ab);while(ac){while(X){W=X.nextSibling;t=L(X,Y,D,ab);if(ab!=j){Z.appendChild(t)}Y=D;X=W}if(ac==aa){return Z}X=ac.nextSibling;ac=ac.parentNode;V=L(ac,R,D,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function L(t,Y,ab,ac){var X,W,Z,V,aa;if(Y){return y(t,ac)}if(t.nodeType==3){X=t.nodeValue;if(ab){V=N[U];W=X.substring(V);Z=X.substring(0,V)}else{V=N[z];W=X.substring(0,V);Z=X.substring(V)}if(ac!=E){t.nodeValue=Z}if(ac==j){return}aa=t.cloneNode(R);aa.nodeValue=W;return aa}if(ac==j){return}return t.cloneNode(R)}function y(V,t){if(t!=j){return t==E?V.cloneNode(D):V}V.parentNode.removeChild(V)}}a.Range=b})(tinymce.dom);(function(){function a(d){var b=this,h=d.dom,c=true,f=false;function e(i,j){var k,t=0,q,n,m,l,o,r,p=-1,s;k=i.duplicate();k.collapse(j);s=k.parentElement();if(s.ownerDocument!==d.dom.doc){return}while(s.contentEditable==="false"){s=s.parentNode}if(!s.hasChildNodes()){return{node:s,inside:1}}m=s.children;q=m.length-1;while(t<=q){r=Math.floor((t+q)/2);l=m[r];k.moveToElementText(l);p=k.compareEndPoints(j?"StartToStart":"EndToEnd",i);if(p>0){q=r-1}else{if(p<0){t=r+1}else{return{node:l}}}}if(p<0){if(!l){k.moveToElementText(s);k.collapse(true);l=s;n=true}else{k.collapse(false)}k.setEndPoint(j?"EndToStart":"EndToEnd",i);if(k.compareEndPoints(j?"StartToStart":"StartToEnd",i)>0){k=i.duplicate();k.collapse(j);o=-1;while(s==k.parentElement()){if(k.move("character",-1)==0){break}o++}}o=o||k.text.replace("\r\n"," ").length}else{k.collapse(true);k.setEndPoint(j?"StartToStart":"StartToEnd",i);o=k.text.replace("\r\n"," ").length}return{node:l,position:p,offset:o,inside:n}}function g(){var i=d.getRng(),r=h.createRng(),l,k,p,q,m,j;l=i.item?i.item(0):i.parentElement();if(l.ownerDocument!=h.doc){return r}k=d.isCollapsed();if(i.item){r.setStart(l.parentNode,h.nodeIndex(l));r.setEnd(r.startContainer,r.startOffset+1);return r}function o(A){var u=e(i,A),s,y,z=0,x,v,t;s=u.node;y=u.offset;if(u.inside&&!s.hasChildNodes()){r[A?"setStart":"setEnd"](s,0);return}if(y===v){r[A?"setStartBefore":"setEndAfter"](s);return}if(u.position<0){x=u.inside?s.firstChild:s.nextSibling;if(!x){r[A?"setStartAfter":"setEndAfter"](s);return}if(!y){if(x.nodeType==3){r[A?"setStart":"setEnd"](x,0)}else{r[A?"setStartBefore":"setEndBefore"](x)}return}while(x){t=x.nodeValue;z+=t.length;if(z>=y){s=x;z-=y;z=t.length-z;break}x=x.nextSibling}}else{x=s.previousSibling;if(!x){return r[A?"setStartBefore":"setEndBefore"](s)}if(!y){if(s.nodeType==3){r[A?"setStart":"setEnd"](x,s.nodeValue.length)}else{r[A?"setStartAfter":"setEndAfter"](x)}return}while(x){z+=x.nodeValue.length;if(z>=y){s=x;z-=y;break}x=x.previousSibling}}r[A?"setStart":"setEnd"](s,z)}try{o(true);if(!k){o()}}catch(n){if(n.number==-2147024809){m=b.getBookmark(2);p=i.duplicate();p.collapse(true);l=p.parentElement();if(!k){p=i.duplicate();p.collapse(false);q=p.parentElement();q.innerHTML=q.innerHTML}l.innerHTML=l.innerHTML;b.moveToBookmark(m);i=d.getRng();o(true);if(!k){o()}}else{throw n}}return r}this.getBookmark=function(m){var j=d.getRng(),o,i,l={};function n(u){var u,t,p,s,r,q=[];t=u.parentNode;p=h.getRoot().parentNode;while(t!=p&&t.nodeType!==9){s=t.children;r=s.length;while(r--){if(u===s[r]){q.push(r);break}}u=t;t=t.parentNode}return q}function k(q){var p;p=e(j,q);if(p){return{position:p.position,offset:p.offset,indexes:n(p.node),inside:p.inside}}}if(m===2){if(!j.item){l.start=k(true);if(!d.isCollapsed()){l.end=k()}}else{l.start={ctrl:true,indexes:n(j.item(0))}}}return l};this.moveToBookmark=function(k){var j,i=h.doc.body;function m(o){var r,q,n,p;r=h.getRoot();for(q=o.length-1;q>=0;q--){p=r.children;n=o[q];if(n<=p.length-1){r=p[n]}}return r}function l(r){var n=k[r?"start":"end"],q,p,o;if(n){q=n.position>0;p=i.createTextRange();p.moveToElementText(m(n.indexes));offset=n.offset;if(offset!==o){p.collapse(n.inside||q);p.moveStart("character",q?-offset:offset)}else{p.collapse(r)}j.setEndPoint(r?"StartToStart":"EndToStart",p);if(r){j.collapse(true)}}}if(k.start){if(k.start.ctrl){j=i.createControlRange();j.addElement(m(k.start.indexes));j.select()}else{j=i.createTextRange();l(true);l();j.select()}}};this.addRange=function(i){var n,l,k,p,s,q,r=d.dom.doc,m=r.body;function j(z){var u,y,t,x,v;t=h.create("a");u=z?k:s;y=z?p:q;x=n.duplicate();if(u==r||u==r.documentElement){u=m;y=0}if(u.nodeType==3){u.parentNode.insertBefore(t,u);x.moveToElementText(t);x.moveStart("character",y);h.remove(t);n.setEndPoint(z?"StartToStart":"EndToEnd",x)}else{v=u.childNodes;if(v.length){if(y>=v.length){h.insertAfter(t,v[v.length-1])}else{u.insertBefore(t,v[y])}x.moveToElementText(t)}else{t=r.createTextNode("\uFEFF");u.appendChild(t);x.moveToElementText(t.parentNode);x.collapse(c)}n.setEndPoint(z?"StartToStart":"EndToEnd",x);h.remove(t)}}k=i.startContainer;p=i.startOffset;s=i.endContainer;q=i.endOffset;n=m.createTextRange();if(k==s&&k.nodeType==1&&p==q-1){if(p==q-1){try{l=m.createControlRange();l.addElement(k.childNodes[p]);l.select();return}catch(o){}}}j(true);j();n.select()};this.getRangeAt=g}tinymce.dom.TridentSelection=a})();(function(){var p=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,j=0,d=Object.prototype.toString,o=false,i=true;[0,0].sort(function(){i=false;return 0});var b=function(v,e,z,A){z=z||[];e=e||document;var C=e;if(e.nodeType!==1&&e.nodeType!==9){return[]}if(!v||typeof v!=="string"){return z}var x=[],s,E,H,r,u=true,t=b.isXML(e),B=v,D,G,F,y;do{p.exec("");s=p.exec(B);if(s){B=s[3];x.push(s[1]);if(s[2]){r=s[3];break}}}while(s);if(x.length>1&&k.exec(v)){if(x.length===2&&f.relative[x[0]]){E=h(x[0]+x[1],e)}else{E=f.relative[x[0]]?[e]:b(x.shift(),e);while(x.length){v=x.shift();if(f.relative[v]){v+=x.shift()}E=h(v,E)}}}else{if(!A&&x.length>1&&e.nodeType===9&&!t&&f.match.ID.test(x[0])&&!f.match.ID.test(x[x.length-1])){D=b.find(x.shift(),e,t);e=D.expr?b.filter(D.expr,D.set)[0]:D.set[0]}if(e){D=A?{expr:x.pop(),set:a(A)}:b.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&e.parentNode?e.parentNode:e,t);E=D.expr?b.filter(D.expr,D.set):D.set;if(x.length>0){H=a(E)}else{u=false}while(x.length){G=x.pop();F=G;if(!f.relative[G]){G=""}else{F=x.pop()}if(F==null){F=e}f.relative[G](H,F,t)}}else{H=x=[]}}if(!H){H=E}if(!H){b.error(G||v)}if(d.call(H)==="[object Array]"){if(!u){z.push.apply(z,H)}else{if(e&&e.nodeType===1){for(y=0;H[y]!=null;y++){if(H[y]&&(H[y]===true||H[y].nodeType===1&&b.contains(e,H[y]))){z.push(E[y])}}}else{for(y=0;H[y]!=null;y++){if(H[y]&&H[y].nodeType===1){z.push(E[y])}}}}}else{a(H,z)}if(r){b(r,C,z,A);b.uniqueSort(z)}return z};b.uniqueSort=function(r){if(c){o=i;r.sort(c);if(o){for(var e=1;e<r.length;e++){if(r[e]===r[e-1]){r.splice(e--,1)}}}}return r};b.matches=function(e,r){return b(e,null,null,r)};b.find=function(y,e,z){var x;if(!y){return[]}for(var t=0,s=f.order.length;t<s;t++){var v=f.order[t],u;if((u=f.leftMatch[v].exec(y))){var r=u[1];u.splice(1,1);if(r.substr(r.length-1)!=="\\"){u[1]=(u[1]||"").replace(/\\/g,"");x=f.find[v](u,e,z);if(x!=null){y=y.replace(f.match[v],"");break}}}}if(!x){x=e.getElementsByTagName("*")}return{set:x,expr:y}};b.filter=function(C,B,F,u){var s=C,H=[],z=B,x,e,y=B&&B[0]&&b.isXML(B[0]);while(C&&B.length){for(var A in f.filter){if((x=f.leftMatch[A].exec(C))!=null&&x[2]){var r=f.filter[A],G,E,t=x[1];e=false;x.splice(1,1);if(t.substr(t.length-1)==="\\"){continue}if(z===H){H=[]}if(f.preFilter[A]){x=f.preFilter[A](x,z,F,H,u,y);if(!x){e=G=true}else{if(x===true){continue}}}if(x){for(var v=0;(E=z[v])!=null;v++){if(E){G=r(E,x,v,z);var D=u^!!G;if(F&&G!=null){if(D){e=true}else{z[v]=false}}else{if(D){H.push(E);e=true}}}}}if(G!==undefined){if(!F){z=H}C=C.replace(f.match[A],"");if(!e){return[]}break}}}if(C===s){if(e==null){b.error(C)}else{break}}s=C}return z};b.error=function(e){throw"Syntax error, unrecognized expression: "+e};var f=b.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(e){return e.getAttribute("href")}},relative:{"+":function(x,r){var t=typeof r==="string",v=t&&!/\W/.test(r),y=t&&!v;if(v){r=r.toLowerCase()}for(var s=0,e=x.length,u;s<e;s++){if((u=x[s])){while((u=u.previousSibling)&&u.nodeType!==1){}x[s]=y||u&&u.nodeName.toLowerCase()===r?u||false:u===r}}if(y){b.filter(r,x,true)}},">":function(x,r){var u=typeof r==="string",v,s=0,e=x.length;if(u&&!/\W/.test(r)){r=r.toLowerCase();for(;s<e;s++){v=x[s];if(v){var t=v.parentNode;x[s]=t.nodeName.toLowerCase()===r?t:false}}}else{for(;s<e;s++){v=x[s];if(v){x[s]=u?v.parentNode:v.parentNode===r}}if(u){b.filter(r,x,true)}}},"":function(t,r,v){var s=j++,e=q,u;if(typeof r==="string"&&!/\W/.test(r)){r=r.toLowerCase();u=r;e=n}e("parentNode",r,s,t,u,v)},"~":function(t,r,v){var s=j++,e=q,u;if(typeof r==="string"&&!/\W/.test(r)){r=r.toLowerCase();u=r;e=n}e("previousSibling",r,s,t,u,v)}},find:{ID:function(r,s,t){if(typeof s.getElementById!=="undefined"&&!t){var e=s.getElementById(r[1]);return e?[e]:[]}},NAME:function(s,v){if(typeof v.getElementsByName!=="undefined"){var r=[],u=v.getElementsByName(s[1]);for(var t=0,e=u.length;t<e;t++){if(u[t].getAttribute("name")===s[1]){r.push(u[t])}}return r.length===0?null:r}},TAG:function(e,r){return r.getElementsByTagName(e[1])}},preFilter:{CLASS:function(t,r,s,e,x,y){t=" "+t[1].replace(/\\/g,"")+" ";if(y){return t}for(var u=0,v;(v=r[u])!=null;u++){if(v){if(x^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(t)>=0)){if(!s){e.push(v)}}else{if(s){r[u]=false}}}}return false},ID:function(e){return e[1].replace(/\\/g,"")},TAG:function(r,e){return r[1].toLowerCase()},CHILD:function(e){if(e[1]==="nth"){var r=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(e[2]==="even"&&"2n"||e[2]==="odd"&&"2n+1"||!/\D/.test(e[2])&&"0n+"+e[2]||e[2]);e[2]=(r[1]+(r[2]||1))-0;e[3]=r[3]-0}e[0]=j++;return e},ATTR:function(u,r,s,e,v,x){var t=u[1].replace(/\\/g,"");if(!x&&f.attrMap[t]){u[1]=f.attrMap[t]}if(u[2]==="~="){u[4]=" "+u[4]+" "}return u},PSEUDO:function(u,r,s,e,v){if(u[1]==="not"){if((p.exec(u[3])||"").length>1||/^\w/.test(u[3])){u[3]=b(u[3],null,null,r)}else{var t=b.filter(u[3],r,s,true^v);if(!s){e.push.apply(e,t)}return false}}else{if(f.match.POS.test(u[0])||f.match.CHILD.test(u[0])){return true}}return u},POS:function(e){e.unshift(true);return e}},filters:{enabled:function(e){return e.disabled===false&&e.type!=="hidden"},disabled:function(e){return e.disabled===true},checked:function(e){return e.checked===true},selected:function(e){e.parentNode.selectedIndex;return e.selected===true},parent:function(e){return !!e.firstChild},empty:function(e){return !e.firstChild},has:function(s,r,e){return !!b(e[3],s).length},header:function(e){return(/h\d/i).test(e.nodeName)},text:function(e){return"text"===e.type},radio:function(e){return"radio"===e.type},checkbox:function(e){return"checkbox"===e.type},file:function(e){return"file"===e.type},password:function(e){return"password"===e.type},submit:function(e){return"submit"===e.type},image:function(e){return"image"===e.type},reset:function(e){return"reset"===e.type},button:function(e){return"button"===e.type||e.nodeName.toLowerCase()==="button"},input:function(e){return(/input|select|textarea|button/i).test(e.nodeName)}},setFilters:{first:function(r,e){return e===0},last:function(s,r,e,t){return r===t.length-1},even:function(r,e){return e%2===0},odd:function(r,e){return e%2===1},lt:function(s,r,e){return r<e[3]-0},gt:function(s,r,e){return r>e[3]-0},nth:function(s,r,e){return e[3]-0===r},eq:function(s,r,e){return e[3]-0===r}},filter:{PSEUDO:function(s,y,x,z){var e=y[1],r=f.filters[e];if(r){return r(s,x,y,z)}else{if(e==="contains"){return(s.textContent||s.innerText||b.getText([s])||"").indexOf(y[3])>=0}else{if(e==="not"){var t=y[3];for(var v=0,u=t.length;v<u;v++){if(t[v]===s){return false}}return true}else{b.error("Syntax error, unrecognized expression: "+e)}}}},CHILD:function(e,t){var x=t[1],r=e;switch(x){case"only":case"first":while((r=r.previousSibling)){if(r.nodeType===1){return false}}if(x==="first"){return true}r=e;case"last":while((r=r.nextSibling)){if(r.nodeType===1){return false}}return true;case"nth":var s=t[2],A=t[3];if(s===1&&A===0){return true}var v=t[0],z=e.parentNode;if(z&&(z.sizcache!==v||!e.nodeIndex)){var u=0;for(r=z.firstChild;r;r=r.nextSibling){if(r.nodeType===1){r.nodeIndex=++u}}z.sizcache=v}var y=e.nodeIndex-A;if(s===0){return y===0}else{return(y%s===0&&y/s>=0)}}},ID:function(r,e){return r.nodeType===1&&r.getAttribute("id")===e},TAG:function(r,e){return(e==="*"&&r.nodeType===1)||r.nodeName.toLowerCase()===e},CLASS:function(r,e){return(" "+(r.className||r.getAttribute("class"))+" ").indexOf(e)>-1},ATTR:function(v,t){var s=t[1],e=f.attrHandle[s]?f.attrHandle[s](v):v[s]!=null?v[s]:v.getAttribute(s),x=e+"",u=t[2],r=t[4];return e==null?u==="!=":u==="="?x===r:u==="*="?x.indexOf(r)>=0:u==="~="?(" "+x+" ").indexOf(r)>=0:!r?x&&e!==false:u==="!="?x!==r:u==="^="?x.indexOf(r)===0:u==="$="?x.substr(x.length-r.length)===r:u==="|="?x===r||x.substr(0,r.length+1)===r+"-":false},POS:function(u,r,s,v){var e=r[2],t=f.setFilters[e];if(t){return t(u,s,r,v)}}}};var k=f.match.POS,g=function(r,e){return"\\"+(e-0+1)};for(var m in f.match){f.match[m]=new RegExp(f.match[m].source+(/(?![^\[]*\])(?![^\(]*\))/.source));f.leftMatch[m]=new RegExp(/(^(?:.|\r|\n)*?)/.source+f.match[m].source.replace(/\\(\d+)/g,g))}var a=function(r,e){r=Array.prototype.slice.call(r,0);if(e){e.push.apply(e,r);return e}return r};try{Array.prototype.slice.call(document.documentElement.childNodes,0)[0].nodeType}catch(l){a=function(u,t){var r=t||[],s=0;if(d.call(u)==="[object Array]"){Array.prototype.push.apply(r,u)}else{if(typeof u.length==="number"){for(var e=u.length;s<e;s++){r.push(u[s])}}else{for(;u[s];s++){r.push(u[s])}}}return r}}var c;if(document.documentElement.compareDocumentPosition){c=function(r,e){if(!r.compareDocumentPosition||!e.compareDocumentPosition){if(r==e){o=true}return r.compareDocumentPosition?-1:1}var s=r.compareDocumentPosition(e)&4?-1:r===e?0:1;if(s===0){o=true}return s}}else{if("sourceIndex" in document.documentElement){c=function(r,e){if(!r.sourceIndex||!e.sourceIndex){if(r==e){o=true}return r.sourceIndex?-1:1}var s=r.sourceIndex-e.sourceIndex;if(s===0){o=true}return s}}else{if(document.createRange){c=function(t,r){if(!t.ownerDocument||!r.ownerDocument){if(t==r){o=true}return t.ownerDocument?-1:1}var s=t.ownerDocument.createRange(),e=r.ownerDocument.createRange();s.setStart(t,0);s.setEnd(t,0);e.setStart(r,0);e.setEnd(r,0);var u=s.compareBoundaryPoints(Range.START_TO_END,e);if(u===0){o=true}return u}}}}b.getText=function(e){var r="",t;for(var s=0;e[s];s++){t=e[s];if(t.nodeType===3||t.nodeType===4){r+=t.nodeValue}else{if(t.nodeType!==8){r+=b.getText(t.childNodes)}}}return r};(function(){var r=document.createElement("div"),s="script"+(new Date()).getTime();r.innerHTML="<a name='"+s+"'/>";var e=document.documentElement;e.insertBefore(r,e.firstChild);if(document.getElementById(s)){f.find.ID=function(u,v,x){if(typeof v.getElementById!=="undefined"&&!x){var t=v.getElementById(u[1]);return t?t.id===u[1]||typeof t.getAttributeNode!=="undefined"&&t.getAttributeNode("id").nodeValue===u[1]?[t]:undefined:[]}};f.filter.ID=function(v,t){var u=typeof v.getAttributeNode!=="undefined"&&v.getAttributeNode("id");return v.nodeType===1&&u&&u.nodeValue===t}}e.removeChild(r);e=r=null})();(function(){var e=document.createElement("div");e.appendChild(document.createComment(""));if(e.getElementsByTagName("*").length>0){f.find.TAG=function(r,v){var u=v.getElementsByTagName(r[1]);if(r[1]==="*"){var t=[];for(var s=0;u[s];s++){if(u[s].nodeType===1){t.push(u[s])}}u=t}return u}}e.innerHTML="<a href='#'></a>";if(e.firstChild&&typeof e.firstChild.getAttribute!=="undefined"&&e.firstChild.getAttribute("href")!=="#"){f.attrHandle.href=function(r){return r.getAttribute("href",2)}}e=null})();if(document.querySelectorAll){(function(){var e=b,s=document.createElement("div");s.innerHTML="<p class='TEST'></p>";if(s.querySelectorAll&&s.querySelectorAll(".TEST").length===0){return}b=function(x,v,t,u){v=v||document;if(!u&&v.nodeType===9&&!b.isXML(v)){try{return a(v.querySelectorAll(x),t)}catch(y){}}return e(x,v,t,u)};for(var r in e){b[r]=e[r]}s=null})()}(function(){var e=document.createElement("div");e.innerHTML="<div class='test e'></div><div class='test'></div>";if(!e.getElementsByClassName||e.getElementsByClassName("e").length===0){return}e.lastChild.className="e";if(e.getElementsByClassName("e").length===1){return}f.order.splice(1,0,"CLASS");f.find.CLASS=function(r,s,t){if(typeof s.getElementsByClassName!=="undefined"&&!t){return s.getElementsByClassName(r[1])}};e=null})();function n(r,x,v,A,y,z){for(var t=0,s=A.length;t<s;t++){var e=A[t];if(e){e=e[r];var u=false;while(e){if(e.sizcache===v){u=A[e.sizset];break}if(e.nodeType===1&&!z){e.sizcache=v;e.sizset=t}if(e.nodeName.toLowerCase()===x){u=e;break}e=e[r]}A[t]=u}}}function q(r,x,v,A,y,z){for(var t=0,s=A.length;t<s;t++){var e=A[t];if(e){e=e[r];var u=false;while(e){if(e.sizcache===v){u=A[e.sizset];break}if(e.nodeType===1){if(!z){e.sizcache=v;e.sizset=t}if(typeof x!=="string"){if(e===x){u=true;break}}else{if(b.filter(x,[e]).length>0){u=e;break}}}e=e[r]}A[t]=u}}}b.contains=document.compareDocumentPosition?function(r,e){return !!(r.compareDocumentPosition(e)&16)}:function(r,e){return r!==e&&(r.contains?r.contains(e):true)};b.isXML=function(e){var r=(e?e.ownerDocument||e:0).documentElement;return r?r.nodeName!=="HTML":false};var h=function(e,y){var t=[],u="",v,s=y.nodeType?[y]:y;while((v=f.match.PSEUDO.exec(e))){u+=v[0];e=e.replace(f.match.PSEUDO,"")}e=f.relative[e]?e+"*":e;for(var x=0,r=s.length;x<r;x++){b(e,s[x],t)}return b.filter(u,t)};window.tinymce.dom.Sizzle=b})();(function(d){var f=d.each,c=d.DOM,b=d.isIE,e=d.isWebKit,a;d.create("tinymce.dom.EventUtils",{EventUtils:function(){this.inits=[];this.events=[]},add:function(m,p,l,j){var g,h=this,i=h.events,k;if(p instanceof Array){k=[];f(p,function(o){k.push(h.add(m,o,l,j))});return k}if(m&&m.hasOwnProperty&&m instanceof Array){k=[];f(m,function(n){n=c.get(n);k.push(h.add(n,p,l,j))});return k}m=c.get(m);if(!m){return}g=function(n){if(h.disabled){return}n=n||window.event;if(n&&b){if(!n.target){n.target=n.srcElement}d.extend(n,h._stoppers)}if(!j){return l(n)}return l.call(j,n)};if(p=="unload"){d.unloads.unshift({func:g});return g}if(p=="init"){if(h.domLoaded){g()}else{h.inits.push(g)}return g}i.push({obj:m,name:p,func:l,cfunc:g,scope:j});h._add(m,p,g);return l},remove:function(l,m,k){var h=this,g=h.events,i=false,j;if(l&&l.hasOwnProperty&&l instanceof Array){j=[];f(l,function(n){n=c.get(n);j.push(h.remove(n,m,k))});return j}l=c.get(l);f(g,function(o,n){if(o.obj==l&&o.name==m&&(!k||(o.func==k||o.cfunc==k))){g.splice(n,1);h._remove(l,m,o.cfunc);i=true;return false}});return i},clear:function(l){var j=this,g=j.events,h,k;if(l){l=c.get(l);for(h=g.length-1;h>=0;h--){k=g[h];if(k.obj===l){j._remove(k.obj,k.name,k.cfunc);k.obj=k.cfunc=null;g.splice(h,1)}}}},cancel:function(g){if(!g){return false}this.stop(g);return this.prevent(g)},stop:function(g){if(g.stopPropagation){g.stopPropagation()}else{g.cancelBubble=true}return false},prevent:function(g){if(g.preventDefault){g.preventDefault()}else{g.returnValue=false}return false},destroy:function(){var g=this;f(g.events,function(j,h){g._remove(j.obj,j.name,j.cfunc);j.obj=j.cfunc=null});g.events=[];g=null},_add:function(h,i,g){if(h.attachEvent){h.attachEvent("on"+i,g)}else{if(h.addEventListener){h.addEventListener(i,g,false)}else{h["on"+i]=g}}},_remove:function(i,j,h){if(i){try{if(i.detachEvent){i.detachEvent("on"+j,h)}else{if(i.removeEventListener){i.removeEventListener(j,h,false)}else{i["on"+j]=null}}}catch(g){}}},_pageInit:function(h){var g=this;if(g.domLoaded){return}g.domLoaded=true;f(g.inits,function(i){i()});g.inits=[]},_wait:function(i){var g=this,h=i.document;if(i.tinyMCE_GZ&&tinyMCE_GZ.loaded){g.domLoaded=1;return}if(h.attachEvent){h.attachEvent("onreadystatechange",function(){if(h.readyState==="complete"){h.detachEvent("onreadystatechange",arguments.callee);g._pageInit(i)}});if(h.documentElement.doScroll&&i==i.top){(function(){if(g.domLoaded){return}try{h.documentElement.doScroll("left")}catch(j){setTimeout(arguments.callee,0);return}g._pageInit(i)})()}}else{if(h.addEventListener){g._add(i,"DOMContentLoaded",function(){g._pageInit(i)})}}g._add(i,"load",function(){g._pageInit(i)})},_stoppers:{preventDefault:function(){this.returnValue=false},stopPropagation:function(){this.cancelBubble=true}}});a=d.dom.Event=new d.dom.EventUtils();a._wait(window);d.addUnload(function(){a.destroy()})})(tinymce);(function(a){a.dom.Element=function(f,d){var b=this,e,c;b.settings=d=d||{};b.id=f;b.dom=e=d.dom||a.DOM;if(!a.isIE){c=e.get(b.id)}a.each(("getPos,getRect,getParent,add,setStyle,getStyle,setStyles,setAttrib,setAttribs,getAttrib,addClass,removeClass,hasClass,getOuterHTML,setOuterHTML,remove,show,hide,isHidden,setHTML,get").split(/,/),function(g){b[g]=function(){var h=[f],j;for(j=0;j<arguments.length;j++){h.push(arguments[j])}h=e[g].apply(e,h);b.update(g);return h}});a.extend(b,{on:function(i,h,g){return a.dom.Event.add(b.id,i,h,g)},getXY:function(){return{x:parseInt(b.getStyle("left")),y:parseInt(b.getStyle("top"))}},getSize:function(){var g=e.get(b.id);return{w:parseInt(b.getStyle("width")||g.clientWidth),h:parseInt(b.getStyle("height")||g.clientHeight)}},moveTo:function(g,h){b.setStyles({left:g,top:h})},moveBy:function(g,i){var h=b.getXY();b.moveTo(h.x+g,h.y+i)},resizeTo:function(g,i){b.setStyles({width:g,height:i})},resizeBy:function(g,j){var i=b.getSize();b.resizeTo(i.w+g,i.h+j)},update:function(h){var g;if(a.isIE6&&d.blocker){h=h||"";if(h.indexOf("get")===0||h.indexOf("has")===0||h.indexOf("is")===0){return}if(h=="remove"){e.remove(b.blocker);return}if(!b.blocker){b.blocker=e.uniqueId();g=e.add(d.container||e.getRoot(),"iframe",{id:b.blocker,style:"position:absolute;",frameBorder:0,src:'javascript:""'});e.setStyle(g,"opacity",0)}else{g=e.get(b.blocker)}e.setStyles(g,{left:b.getStyle("left",1),top:b.getStyle("top",1),width:b.getStyle("width",1),height:b.getStyle("height",1),display:b.getStyle("display",1),zIndex:parseInt(b.getStyle("zIndex",1)||0)-1})}}})}})(tinymce);(function(c){function e(f){return f.replace(/[\n\r]+/g,"")}var b=c.is,a=c.isIE,d=c.each;c.create("tinymce.dom.Selection",{Selection:function(i,h,g){var f=this;f.dom=i;f.win=h;f.serializer=g;d(["onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent"],function(j){f[j]=new c.util.Dispatcher(f)});if(!f.win.getSelection){f.tridentSel=new c.dom.TridentSelection(f)}if(c.isIE&&i.boxModel){this._fixIESelection()}c.addUnload(f.destroy,f)},setCursorLocation:function(h,i){var f=this;var g=f.dom.createRng();g.setStart(h,i);g.setEnd(h,i);f.setRng(g);f.collapse(false)},getContent:function(g){var f=this,h=f.getRng(),l=f.dom.create("body"),j=f.getSel(),i,k,m;g=g||{};i=k="";g.get=true;g.format=g.format||"html";g.forced_root_block="";f.onBeforeGetContent.dispatch(f,g);if(g.format=="text"){return f.isCollapsed()?"":(h.text||(j.toString?j.toString():""))}if(h.cloneContents){m=h.cloneContents();if(m){l.appendChild(m)}}else{if(b(h.item)||b(h.htmlText)){l.innerHTML="<br>"+(h.item?h.item(0).outerHTML:h.htmlText);l.removeChild(l.firstChild)}else{l.innerHTML=h.toString()}}if(/^\s/.test(l.innerHTML)){i=" "}if(/\s+$/.test(l.innerHTML)){k=" "}g.getInner=true;g.content=f.isCollapsed()?"":i+f.serializer.serialize(l,g)+k;f.onGetContent.dispatch(f,g);return g.content},setContent:function(g,i){var n=this,f=n.getRng(),j,k=n.win.document,m,l;i=i||{format:"html"};i.set=true;g=i.content=g;if(!i.no_events){n.onBeforeSetContent.dispatch(n,i)}g=i.content;if(f.insertNode){g+='<span id="__caret">_</span>';if(f.startContainer==k&&f.endContainer==k){k.body.innerHTML=g}else{f.deleteContents();if(k.body.childNodes.length==0){k.body.innerHTML=g}else{if(f.createContextualFragment){f.insertNode(f.createContextualFragment(g))}else{m=k.createDocumentFragment();l=k.createElement("div");m.appendChild(l);l.outerHTML=g;f.insertNode(m)}}}j=n.dom.get("__caret");f=k.createRange();f.setStartBefore(j);f.setEndBefore(j);n.setRng(f);n.dom.remove("__caret");try{n.setRng(f)}catch(h){}}else{if(f.item){k.execCommand("Delete",false,null);f=n.getRng()}if(/^\s+/.test(g)){f.pasteHTML('<span id="__mce_tmp">_</span>'+g);n.dom.remove("__mce_tmp")}else{f.pasteHTML(g)}}if(!i.no_events){n.onSetContent.dispatch(n,i)}},getStart:function(){var g=this.getRng(),h,f,j,i;if(g.duplicate||g.item){if(g.item){return g.item(0)}j=g.duplicate();j.collapse(1);h=j.parentElement();f=i=g.parentElement();while(i=i.parentNode){if(i==h){h=f;break}}return h}else{h=g.startContainer;if(h.nodeType==1&&h.hasChildNodes()){h=h.childNodes[Math.min(h.childNodes.length-1,g.startOffset)]}if(h&&h.nodeType==3){return h.parentNode}return h}},getEnd:function(){var g=this,h=g.getRng(),i,f;if(h.duplicate||h.item){if(h.item){return h.item(0)}h=h.duplicate();h.collapse(0);i=h.parentElement();if(i&&i.nodeName=="BODY"){return i.lastChild||i}return i}else{i=h.endContainer;f=h.endOffset;if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[f>0?f-1:f]}if(i&&i.nodeType==3){return i.parentNode}return i}},getBookmark:function(r,s){var v=this,m=v.dom,g,j,i,n,h,o,p,l="\uFEFF",u;function f(x,y){var t=0;d(m.select(x),function(A,z){if(A==y){t=z}});return t}if(r==2){function k(){var x=v.getRng(true),t=m.getRoot(),y={};function z(C,H){var B=C[H?"startContainer":"endContainer"],G=C[H?"startOffset":"endOffset"],A=[],D,F,E=0;if(B.nodeType==3){if(s){for(D=B.previousSibling;D&&D.nodeType==3;D=D.previousSibling){G+=D.nodeValue.length}}A.push(G)}else{F=B.childNodes;if(G>=F.length&&F.length){E=1;G=Math.max(0,F.length-1)}A.push(v.dom.nodeIndex(F[G],s)+E)}for(;B&&B!=t;B=B.parentNode){A.push(v.dom.nodeIndex(B,s))}return A}y.start=z(x,true);if(!v.isCollapsed()){y.end=z(x)}return y}if(v.tridentSel){return v.tridentSel.getBookmark(r)}return k()}if(r){return{rng:v.getRng()}}g=v.getRng();i=m.uniqueId();n=tinyMCE.activeEditor.selection.isCollapsed();u="overflow:hidden;line-height:0px";if(g.duplicate||g.item){if(!g.item){j=g.duplicate();try{g.collapse();g.pasteHTML('<span data-mce-type="bookmark" id="'+i+'_start" style="'+u+'">'+l+"</span>");if(!n){j.collapse(false);g.moveToElementText(j.parentElement());if(g.compareEndPoints("StartToEnd",j)==0){j.move("character",-1)}j.pasteHTML('<span data-mce-type="bookmark" id="'+i+'_end" style="'+u+'">'+l+"</span>")}}catch(q){return null}}else{o=g.item(0);h=o.nodeName;return{name:h,index:f(h,o)}}}else{o=v.getNode();h=o.nodeName;if(h=="IMG"){return{name:h,index:f(h,o)}}j=g.cloneRange();if(!n){j.collapse(false);j.insertNode(m.create("span",{"data-mce-type":"bookmark",id:i+"_end",style:u},l))}g.collapse(true);g.insertNode(m.create("span",{"data-mce-type":"bookmark",id:i+"_start",style:u},l))}v.moveToBookmark({id:i,keep:1});return{id:i}},moveToBookmark:function(n){var r=this,l=r.dom,i,h,f,q,j,s,o,p;if(n){if(n.start){f=l.createRng();q=l.getRoot();function g(z){var t=n[z?"start":"end"],v,x,y,u;if(t){y=t[0];for(x=q,v=t.length-1;v>=1;v--){u=x.childNodes;if(t[v]>u.length-1){return}x=u[t[v]]}if(x.nodeType===3){y=Math.min(t[0],x.nodeValue.length)}if(x.nodeType===1){y=Math.min(t[0],x.childNodes.length)}if(z){f.setStart(x,y)}else{f.setEnd(x,y)}}return true}if(r.tridentSel){return r.tridentSel.moveToBookmark(n)}if(g(true)&&g()){r.setRng(f)}}else{if(n.id){function k(A){var u=l.get(n.id+"_"+A),z,t,x,y,v=n.keep;if(u){z=u.parentNode;if(A=="start"){if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}j=s=z;o=p=t}else{if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}s=z;p=t}if(!v){y=u.previousSibling;x=u.nextSibling;d(c.grep(u.childNodes),function(B){if(B.nodeType==3){B.nodeValue=B.nodeValue.replace(/\uFEFF/g,"")}});while(u=l.get(n.id+"_"+A)){l.remove(u,1)}if(y&&x&&y.nodeType==x.nodeType&&y.nodeType==3&&!c.isOpera){t=y.nodeValue.length;y.appendData(x.nodeValue);l.remove(x);if(A=="start"){j=s=y;o=p=t}else{s=y;p=t}}}}}function m(t){if(l.isBlock(t)&&!t.innerHTML){t.innerHTML=!a?'<br data-mce-bogus="1" />':" "}return t}k("start");k("end");if(j){f=l.createRng();f.setStart(m(j),o);f.setEnd(m(s),p);r.setRng(f)}}else{if(n.name){r.select(l.select(n.name)[n.index])}else{if(n.rng){r.setRng(n.rng)}}}}}},select:function(k,j){var i=this,l=i.dom,g=l.createRng(),f;if(k){f=l.nodeIndex(k);g.setStart(k.parentNode,f);g.setEnd(k.parentNode,f+1);if(j){function h(m,o){var n=new c.dom.TreeWalker(m,m);do{if(m.nodeType==3&&c.trim(m.nodeValue).length!=0){if(o){g.setStart(m,0)}else{g.setEnd(m,m.nodeValue.length)}return}if(m.nodeName=="BR"){if(o){g.setStartBefore(m)}else{g.setEndBefore(m)}return}}while(m=(o?n.next():n.prev()))}h(k,1);h(k)}i.setRng(g)}return k},isCollapsed:function(){var f=this,h=f.getRng(),g=f.getSel();if(!h||h.item){return false}if(h.compareEndPoints){return h.compareEndPoints("StartToEnd",h)===0}return !g||h.collapsed},collapse:function(f){var h=this,g=h.getRng(),i;if(g.item){i=g.item(0);g=h.win.document.body.createTextRange();g.moveToElementText(i)}g.collapse(!!f);h.setRng(g)},getSel:function(){var g=this,f=this.win;return f.getSelection?f.getSelection():f.document.selection},getRng:function(l){var g=this,h,i,k,j=g.win.document;if(l&&g.tridentSel){return g.tridentSel.getRangeAt(0)}try{if(h=g.getSel()){i=h.rangeCount>0?h.getRangeAt(0):(h.createRange?h.createRange():j.createRange())}}catch(f){}if(c.isIE&&i&&i.setStart&&j.selection.createRange().item){k=j.selection.createRange().item(0);i=j.createRange();i.setStartBefore(k);i.setEndAfter(k)}if(!i){i=j.createRange?j.createRange():j.body.createTextRange()}if(g.selectedRange&&g.explicitRange){if(i.compareBoundaryPoints(i.START_TO_START,g.selectedRange)===0&&i.compareBoundaryPoints(i.END_TO_END,g.selectedRange)===0){i=g.explicitRange}else{g.selectedRange=null;g.explicitRange=null}}return i},setRng:function(i){var h,g=this;if(!g.tridentSel){h=g.getSel();if(h){g.explicitRange=i;try{h.removeAllRanges()}catch(f){}h.addRange(i);g.selectedRange=h.getRangeAt(0)}}else{if(i.cloneRange){g.tridentSel.addRange(i);return}try{i.select()}catch(f){}}},setNode:function(g){var f=this;f.setContent(f.dom.getOuterHTML(g));return g},getNode:function(){var h=this,g=h.getRng(),i=h.getSel(),l,k=g.startContainer,f=g.endContainer;if(!g){return h.dom.getRoot()}if(g.setStart){l=g.commonAncestorContainer;if(!g.collapsed){if(g.startContainer==g.endContainer){if(g.endOffset-g.startOffset<2){if(g.startContainer.hasChildNodes()){l=g.startContainer.childNodes[g.startOffset]}}}if(k.nodeType===3&&f.nodeType===3){function j(p,m){var o=p;while(p&&p.nodeType===3&&p.length===0){p=m?p.nextSibling:p.previousSibling}return p||o}if(k.length===g.startOffset){k=j(k.nextSibling,true)}else{k=k.parentNode}if(g.endOffset===0){f=j(f.previousSibling,false)}else{f=f.parentNode}if(k&&k===f){return k}}}if(l&&l.nodeType==3){return l.parentNode}return l}return g.item?g.item(0):g.parentElement()},getSelectedBlocks:function(o,g){var m=this,j=m.dom,l,k,h,i=[];l=j.getParent(o||m.getStart(),j.isBlock);k=j.getParent(g||m.getEnd(),j.isBlock);if(l){i.push(l)}if(l&&k&&l!=k){h=l;var f=new c.dom.TreeWalker(l,j.getRoot());while((h=f.next())&&h!=k){if(j.isBlock(h)){i.push(h)}}}if(k&&l!=k){i.push(k)}return i},normalize:function(){var g=this,f,i;if(c.isIE){return}function h(p){var k,o,n,m=g.dom,j=m.getRoot(),l;k=f[(p?"start":"end")+"Container"];o=f[(p?"start":"end")+"Offset"];if(k.nodeType===9){k=k.body;o=0}if(k===j){if(k.hasChildNodes()){k=k.childNodes[Math.min(!p&&o>0?o-1:o,k.childNodes.length-1)];o=0;if(k.hasChildNodes()){l=k;n=new c.dom.TreeWalker(k,j);do{if(l.nodeType===3){o=p?0:l.nodeValue.length-1;k=l;break}if(l.nodeName==="BR"){o=m.nodeIndex(l);k=l.parentNode;break}}while(l=(p?n.next():n.prev()));i=true}}}if(i){f["set"+(p?"Start":"End")](k,o)}}f=g.getRng();h(true);if(f.collapsed){h()}if(i){g.setRng(f)}},destroy:function(g){var f=this;f.win=null;if(!g){c.removeUnload(f.destroy)}},_fixIESelection:function(){var g=this.dom,m=g.doc,h=m.body,j,n,f;m.documentElement.unselectable=true;function i(o,r){var p=h.createTextRange();try{p.moveToPoint(o,r)}catch(q){p=null}return p}function l(p){var o;if(p.button){o=i(p.x,p.y);if(o){if(o.compareEndPoints("StartToStart",n)>0){o.setEndPoint("StartToStart",n)}else{o.setEndPoint("EndToEnd",n)}o.select()}}else{k()}}function k(){var o=m.selection.createRange();if(n&&!o.item&&o.compareEndPoints("StartToEnd",o)===0){n.select()}g.unbind(m,"mouseup",k);g.unbind(m,"mousemove",l);n=j=0}g.bind(m,["mousedown","contextmenu"],function(o){if(o.target.nodeName==="HTML"){if(j){k()}f=m.documentElement;if(f.scrollHeight>f.clientHeight){return}j=1;n=i(o.x,o.y);if(n){g.bind(m,"mouseup",k);g.bind(m,"mousemove",l);g.win.focus();n.select()}}})}})})(tinymce);(function(a){a.dom.Serializer=function(e,i,f){var h,b,d=a.isIE,g=a.each,c;if(!e.apply_source_formatting){e.indent=false}e.remove_trailing_brs=true;i=i||a.DOM;f=f||new a.html.Schema(e);e.entity_encoding=e.entity_encoding||"named";h=new a.util.Dispatcher(self);b=new a.util.Dispatcher(self);c=new a.html.DomParser(e,f);c.addAttributeFilter("src,href,style",function(k,j){var o=k.length,l,q,n="data-mce-"+j,p=e.url_converter,r=e.url_converter_scope,m;while(o--){l=k[o];q=l.attributes.map[n];if(q!==m){l.attr(j,q.length>0?q:null);l.attr(n,null)}else{q=l.attributes.map[j];if(j==="style"){q=i.serializeStyle(i.parseStyle(q),l.name)}else{if(p){q=p.call(r,q,j,l.name)}}l.attr(j,q.length>0?q:null)}}});c.addAttributeFilter("class",function(j,k){var l=j.length,m,n;while(l--){m=j[l];n=m.attr("class").replace(/\s*mce(Item\w+|Selected)\s*/g,"");m.attr("class",n.length>0?n:null)}});c.addAttributeFilter("data-mce-type",function(j,l,k){var m=j.length,n;while(m--){n=j[m];if(n.attributes.map["data-mce-type"]==="bookmark"&&!k.cleanup){n.remove()}}});c.addNodeFilter("script,style",function(k,l){var m=k.length,n,o;function j(p){return p.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g,"").replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g,"")}while(m--){n=k[m];o=n.firstChild?n.firstChild.value:"";if(l==="script"){n.attr("type",(n.attr("type")||"text/javascript").replace(/^mce\-/,""));if(o.length>0){n.firstChild.value="// <![CDATA[\n"+j(o)+"\n// ]]>"}}else{if(o.length>0){n.firstChild.value="<!--\n"+j(o)+"\n-->"}}}});c.addNodeFilter("#comment",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.value.indexOf("[CDATA[")===0){m.name="#cdata";m.type=4;m.value=m.value.replace(/^\[CDATA\[|\]\]$/g,"")}else{if(m.value.indexOf("mce:protected ")===0){m.name="#text";m.type=3;m.raw=true;m.value=unescape(m.value).substr(14)}}}});c.addNodeFilter("xml:namespace,input",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.type===7){m.remove()}else{if(m.type===1){if(k==="input"&&!("type" in m.attributes.map)){m.attr("type","text")}}}}});if(e.fix_list_elements){c.addNodeFilter("ul,ol",function(k,l){var m=k.length,n,j;while(m--){n=k[m];j=n.parent;if(j.name==="ul"||j.name==="ol"){if(n.prev&&n.prev.name==="li"){n.prev.append(n)}}}})}c.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style",function(j,k){var l=j.length;while(l--){j[l].attr(k,null)}});return{schema:f,addNodeFilter:c.addNodeFilter,addAttributeFilter:c.addAttributeFilter,onPreProcess:h,onPostProcess:b,serialize:function(o,m){var l,p,k,j,n;if(d&&i.select("script,style,select,map").length>0){n=o.innerHTML;o=o.cloneNode(false);i.setHTML(o,n)}else{o=o.cloneNode(true)}l=o.ownerDocument.implementation;if(l.createHTMLDocument){p=l.createHTMLDocument("");g(o.nodeName=="BODY"?o.childNodes:[o],function(q){p.body.appendChild(p.importNode(q,true))});if(o.nodeName!="BODY"){o=p.body.firstChild}else{o=p.body}k=i.doc;i.doc=p}m=m||{};m.format=m.format||"html";if(!m.no_events){m.node=o;h.dispatch(self,m)}j=new a.html.Serializer(e,f);m.content=j.serialize(c.parse(m.getInner?o.innerHTML:a.trim(i.getOuterHTML(o),m),m));if(!m.cleanup){m.content=m.content.replace(/\uFEFF|\u200B/g,"")}if(!m.no_events){b.dispatch(self,m)}if(k){i.doc=k}m.node=null;return m.content},addRules:function(j){f.addValidElements(j)},setRules:function(j){f.setValidElements(j)}}}})(tinymce);(function(a){a.dom.ScriptLoader=function(h){var c=0,k=1,i=2,l={},j=[],f={},d=[],g=0,e;function b(m,v){var x=this,q=a.DOM,s,o,r,n;function p(){q.remove(n);if(s){s.onreadystatechange=s.onload=s=null}v()}function u(){if(typeof(console)!=="undefined"&&console.log){console.log("Failed to load: "+m)}}n=q.uniqueId();if(a.isIE6){o=new a.util.URI(m);r=location;if(o.host==r.hostname&&o.port==r.port&&(o.protocol+":")==r.protocol&&o.protocol.toLowerCase()!="file"){a.util.XHR.send({url:a._addVer(o.getURI()),success:function(y){var t=q.create("script",{type:"text/javascript"});t.text=y;document.getElementsByTagName("head")[0].appendChild(t);q.remove(t);p()},error:u});return}}s=q.create("script",{id:n,type:"text/javascript",src:a._addVer(m)});if(!a.isIE){s.onload=p}s.onerror=u;if(!a.isOpera){s.onreadystatechange=function(){var t=s.readyState;if(t=="complete"||t=="loaded"){p()}}}(document.getElementsByTagName("head")[0]||document.body).appendChild(s)}this.isDone=function(m){return l[m]==i};this.markDone=function(m){l[m]=i};this.add=this.load=function(m,q,n){var o,p=l[m];if(p==e){j.push(m);l[m]=c}if(q){if(!f[m]){f[m]=[]}f[m].push({func:q,scope:n||this})}};this.loadQueue=function(n,m){this.loadScripts(j,n,m)};this.loadScripts=function(m,q,p){var o;function n(r){a.each(f[r],function(s){s.func.call(s.scope)});f[r]=e}d.push({func:q,scope:p||this});o=function(){var r=a.grep(m);m.length=0;a.each(r,function(s){if(l[s]==i){n(s);return}if(l[s]!=k){l[s]=k;g++;b(s,function(){l[s]=i;g--;n(s);o()})}});if(!g){a.each(d,function(s){s.func.call(s.scope)});d.length=0}};o()}};a.ScriptLoader=new a.dom.ScriptLoader()})(tinymce);tinymce.dom.TreeWalker=function(a,c){var b=a;function d(i,f,e,j){var h,g;if(i){if(!j&&i[f]){return i[f]}if(i!=c){h=i[e];if(h){return h}for(g=i.parentNode;g&&g!=c;g=g.parentNode){h=g[e];if(h){return h}}}}}this.current=function(){return b};this.next=function(e){return(b=d(b,"firstChild","nextSibling",e))};this.prev=function(e){return(b=d(b,"lastChild","previousSibling",e))}};(function(a){a.dom.RangeUtils=function(c){var b="\uFEFF";this.walk=function(d,s){var i=d.startContainer,l=d.startOffset,t=d.endContainer,m=d.endOffset,j,g,o,h,r,q,e;e=c.select("td.mceSelected,th.mceSelected");if(e.length>0){a.each(e,function(u){s([u])});return}function f(u){var v;v=u[0];if(v.nodeType===3&&v===i&&l>=v.nodeValue.length){u.splice(0,1)}v=u[u.length-1];if(m===0&&u.length>0&&v===t&&v.nodeType===3){u.splice(u.length-1,1)}return u}function p(x,v,u){var y=[];for(;x&&x!=u;x=x[v]){y.push(x)}return y}function n(v,u){do{if(v.parentNode==u){return v}v=v.parentNode}while(v)}function k(x,v,y){var u=y?"nextSibling":"previousSibling";for(h=x,r=h.parentNode;h&&h!=v;h=r){r=h.parentNode;q=p(h==x?h:h[u],u);if(q.length){if(!y){q.reverse()}s(f(q))}}}if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[l]}if(t.nodeType==1&&t.hasChildNodes()){t=t.childNodes[Math.min(m-1,t.childNodes.length-1)]}if(i==t){return s(f([i]))}j=c.findCommonAncestor(i,t);for(h=i;h;h=h.parentNode){if(h===t){return k(i,j,true)}if(h===j){break}}for(h=t;h;h=h.parentNode){if(h===i){return k(t,j)}if(h===j){break}}g=n(i,j)||i;o=n(t,j)||t;k(i,g,true);q=p(g==i?g:g.nextSibling,"nextSibling",o==t?o.nextSibling:o);if(q.length){s(f(q))}k(t,o)};this.split=function(e){var h=e.startContainer,d=e.startOffset,i=e.endContainer,g=e.endOffset;function f(j,k){return j.splitText(k)}if(h==i&&h.nodeType==3){if(d>0&&d<h.nodeValue.length){i=f(h,d);h=i.previousSibling;if(g>d){g=g-d;h=i=f(i,g).previousSibling;g=i.nodeValue.length;d=0}else{g=0}}}else{if(h.nodeType==3&&d>0&&d<h.nodeValue.length){h=f(h,d);d=0}if(i.nodeType==3&&g>0&&g<i.nodeValue.length){i=f(i,g).previousSibling;g=i.nodeValue.length}}return{startContainer:h,startOffset:d,endContainer:i,endOffset:g}}};a.dom.RangeUtils.compareRanges=function(c,b){if(c&&b){if(c.item||c.duplicate){if(c.item&&b.item&&c.item(0)===b.item(0)){return true}if(c.isEqual&&b.isEqual&&b.isEqual(c)){return true}}else{return c.startContainer==b.startContainer&&c.startOffset==b.startOffset}}return false}})(tinymce);(function(b){var a=b.dom.Event,c=b.each;b.create("tinymce.ui.KeyboardNavigation",{KeyboardNavigation:function(e,f){var p=this,m=e.root,l=e.items,n=e.enableUpDown,i=e.enableLeftRight||!e.enableUpDown,k=e.excludeFromTabOrder,j,h,o,d,g;f=f||b.DOM;j=function(q){g=q.target.id};h=function(q){f.setAttrib(q.target.id,"tabindex","-1")};d=function(q){var r=f.get(g);f.setAttrib(r,"tabindex","0");r.focus()};p.focus=function(){f.get(g).focus()};p.destroy=function(){c(l,function(q){f.unbind(f.get(q.id),"focus",j);f.unbind(f.get(q.id),"blur",h)});f.unbind(f.get(m),"focus",d);f.unbind(f.get(m),"keydown",o);l=f=m=p.focus=j=h=o=d=null;p.destroy=function(){}};p.moveFocus=function(u,r){var q=-1,t=p.controls,s;if(!g){return}c(l,function(x,v){if(x.id===g){q=v;return false}});q+=u;if(q<0){q=l.length-1}else{if(q>=l.length){q=0}}s=l[q];f.setAttrib(g,"tabindex","-1");f.setAttrib(s.id,"tabindex","0");f.get(s.id).focus();if(e.actOnFocus){e.onAction(s.id)}if(r){a.cancel(r)}};o=function(y){var u=37,t=39,x=38,z=40,q=27,s=14,r=13,v=32;switch(y.keyCode){case u:if(i){p.moveFocus(-1)}break;case t:if(i){p.moveFocus(1)}break;case x:if(n){p.moveFocus(-1)}break;case z:if(n){p.moveFocus(1)}break;case q:if(e.onCancel){e.onCancel();a.cancel(y)}break;case s:case r:case v:if(e.onAction){e.onAction(g);a.cancel(y)}break}};c(l,function(s,q){var r;if(!s.id){s.id=f.uniqueId("_mce_item_")}if(k){f.bind(s.id,"blur",h);r="-1"}else{r=(q===0?"0":"-1")}f.setAttrib(s.id,"tabindex",r);f.bind(f.get(s.id),"focus",j)});if(l[0]){g=l[0].id}f.setAttrib(m,"tabindex","-1");f.bind(f.get(m),"focus",d);f.bind(f.get(m),"keydown",o)}})})(tinymce);(function(c){var b=c.DOM,a=c.is;c.create("tinymce.ui.Control",{Control:function(f,e,d){this.id=f;this.settings=e=e||{};this.rendered=false;this.onRender=new c.util.Dispatcher(this);this.classPrefix="";this.scope=e.scope||this;this.disabled=0;this.active=0;this.editor=d},setAriaProperty:function(f,e){var d=b.get(this.id+"_aria")||b.get(this.id);if(d){b.setAttrib(d,"aria-"+f,!!e)}},focus:function(){b.get(this.id).focus()},setDisabled:function(d){if(d!=this.disabled){this.setAriaProperty("disabled",d);this.setState("Disabled",d);this.setState("Enabled",!d);this.disabled=d}},isDisabled:function(){return this.disabled},setActive:function(d){if(d!=this.active){this.setState("Active",d);this.active=d;this.setAriaProperty("pressed",d)}},isActive:function(){return this.active},setState:function(f,d){var e=b.get(this.id);f=this.classPrefix+f;if(d){b.addClass(e,f)}else{b.removeClass(e,f)}},isRendered:function(){return this.rendered},renderHTML:function(){},renderTo:function(d){b.setHTML(d,this.renderHTML())},postRender:function(){var e=this,d;if(a(e.disabled)){d=e.disabled;e.disabled=-1;e.setDisabled(d)}if(a(e.active)){d=e.active;e.active=-1;e.setActive(d)}},remove:function(){b.remove(this.id);this.destroy()},destroy:function(){c.dom.Event.clear(this.id)}})})(tinymce);tinymce.create("tinymce.ui.Container:tinymce.ui.Control",{Container:function(c,b,a){this.parent(c,b,a);this.controls=[];this.lookup={}},add:function(a){this.lookup[a.id]=a;this.controls.push(a);return a},get:function(a){return this.lookup[a]}});tinymce.create("tinymce.ui.Separator:tinymce.ui.Control",{Separator:function(b,a){this.parent(b,a);this.classPrefix="mceSeparator";this.setDisabled(true)},renderHTML:function(){return tinymce.DOM.createHTML("span",{"class":this.classPrefix,role:"separator","aria-orientation":"vertical",tabindex:"-1"})}});(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.MenuItem:tinymce.ui.Control",{MenuItem:function(g,f){this.parent(g,f);this.classPrefix="mceMenuItem"},setSelected:function(f){this.setState("Selected",f);this.setAriaProperty("checked",!!f);this.selected=f},isSelected:function(){return this.selected},postRender:function(){var f=this;f.parent();if(c(f.selected)){f.setSelected(f.selected)}}})})(tinymce);(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.Menu:tinymce.ui.MenuItem",{Menu:function(h,g){var f=this;f.parent(h,g);f.items={};f.collapsed=false;f.menuCount=0;f.onAddItem=new d.util.Dispatcher(this)},expand:function(g){var f=this;if(g){a(f,function(h){if(h.expand){h.expand()}},"items",f)}f.collapsed=false},collapse:function(g){var f=this;if(g){a(f,function(h){if(h.collapse){h.collapse()}},"items",f)}f.collapsed=true},isCollapsed:function(){return this.collapsed},add:function(f){if(!f.settings){f=new d.ui.MenuItem(f.id||b.uniqueId(),f)}this.onAddItem.dispatch(this,f);return this.items[f.id]=f},addSeparator:function(){return this.add({separator:true})},addMenu:function(f){if(!f.collapse){f=this.createMenu(f)}this.menuCount++;return this.add(f)},hasMenus:function(){return this.menuCount!==0},remove:function(f){delete this.items[f.id]},removeAll:function(){var f=this;a(f,function(g){if(g.removeAll){g.removeAll()}else{g.remove()}g.destroy()},"items",f);f.items={}},createMenu:function(g){var f=new d.ui.Menu(g.id||b.uniqueId(),g);f.onAddItem.add(this.onAddItem.dispatch,this.onAddItem);return f}})})(tinymce);(function(e){var d=e.is,c=e.DOM,f=e.each,a=e.dom.Event,b=e.dom.Element;e.create("tinymce.ui.DropMenu:tinymce.ui.Menu",{DropMenu:function(h,g){g=g||{};g.container=g.container||c.doc.body;g.offset_x=g.offset_x||0;g.offset_y=g.offset_y||0;g.vp_offset_x=g.vp_offset_x||0;g.vp_offset_y=g.vp_offset_y||0;if(d(g.icons)&&!g.icons){g["class"]+=" mceNoIcons"}this.parent(h,g);this.onShowMenu=new e.util.Dispatcher(this);this.onHideMenu=new e.util.Dispatcher(this);this.classPrefix="mceMenu"},createMenu:function(j){var h=this,i=h.settings,g;j.container=j.container||i.container;j.parent=h;j.constrain=j.constrain||i.constrain;j["class"]=j["class"]||i["class"];j.vp_offset_x=j.vp_offset_x||i.vp_offset_x;j.vp_offset_y=j.vp_offset_y||i.vp_offset_y;j.keyboard_focus=i.keyboard_focus;g=new e.ui.DropMenu(j.id||c.uniqueId(),j);g.onAddItem.add(h.onAddItem.dispatch,h.onAddItem);return g},focus:function(){var g=this;if(g.keyboardNav){g.keyboardNav.focus()}},update:function(){var i=this,j=i.settings,g=c.get("menu_"+i.id+"_tbl"),l=c.get("menu_"+i.id+"_co"),h,k;h=j.max_width?Math.min(g.clientWidth,j.max_width):g.clientWidth;k=j.max_height?Math.min(g.clientHeight,j.max_height):g.clientHeight;if(!c.boxModel){i.element.setStyles({width:h+2,height:k+2})}else{i.element.setStyles({width:h,height:k})}if(j.max_width){c.setStyle(l,"width",h)}if(j.max_height){c.setStyle(l,"height",k);if(g.clientHeight<j.max_height){c.setStyle(l,"overflow","hidden")}}},showMenu:function(p,n,r){var z=this,A=z.settings,o,g=c.getViewPort(),u,l,v,q,i=2,k,j,m=z.classPrefix;z.collapse(1);if(z.isMenuVisible){return}if(!z.rendered){o=c.add(z.settings.container,z.renderNode());f(z.items,function(h){h.postRender()});z.element=new b("menu_"+z.id,{blocker:1,container:A.container})}else{o=c.get("menu_"+z.id)}if(!e.isOpera){c.setStyles(o,{left:-65535,top:-65535})}c.show(o);z.update();p+=A.offset_x||0;n+=A.offset_y||0;g.w-=4;g.h-=4;if(A.constrain){u=o.clientWidth-i;l=o.clientHeight-i;v=g.x+g.w;q=g.y+g.h;if((p+A.vp_offset_x+u)>v){p=r?r-u:Math.max(0,(v-A.vp_offset_x)-u)}if((n+A.vp_offset_y+l)>q){n=Math.max(0,(q-A.vp_offset_y)-l)}}c.setStyles(o,{left:p,top:n});z.element.update();z.isMenuVisible=1;z.mouseClickFunc=a.add(o,"click",function(s){var h;s=s.target;if(s&&(s=c.getParent(s,"tr"))&&!c.hasClass(s,m+"ItemSub")){h=z.items[s.id];if(h.isDisabled()){return}k=z;while(k){if(k.hideMenu){k.hideMenu()}k=k.settings.parent}if(h.settings.onclick){h.settings.onclick(s)}return a.cancel(s)}});if(z.hasMenus()){z.mouseOverFunc=a.add(o,"mouseover",function(x){var h,t,s;x=x.target;if(x&&(x=c.getParent(x,"tr"))){h=z.items[x.id];if(z.lastMenu){z.lastMenu.collapse(1)}if(h.isDisabled()){return}if(x&&c.hasClass(x,m+"ItemSub")){t=c.getRect(x);h.showMenu((t.x+t.w-i),t.y-i,t.x);z.lastMenu=h;c.addClass(c.get(h.id).firstChild,m+"ItemActive")}}})}a.add(o,"keydown",z._keyHandler,z);z.onShowMenu.dispatch(z);if(A.keyboard_focus){z._setupKeyboardNav()}},hideMenu:function(j){var g=this,i=c.get("menu_"+g.id),h;if(!g.isMenuVisible){return}if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(i,"mouseover",g.mouseOverFunc);a.remove(i,"click",g.mouseClickFunc);a.remove(i,"keydown",g._keyHandler);c.hide(i);g.isMenuVisible=0;if(!j){g.collapse(1)}if(g.element){g.element.hide()}if(h=c.get(g.id)){c.removeClass(h.firstChild,g.classPrefix+"ItemActive")}g.onHideMenu.dispatch(g)},add:function(i){var g=this,h;i=g.parent(i);if(g.isRendered&&(h=c.get("menu_"+g.id))){g._add(c.select("tbody",h)[0],i)}return i},collapse:function(g){this.parent(g);this.hideMenu(1)},remove:function(g){c.remove(g.id);this.destroy();return this.parent(g)},destroy:function(){var g=this,h=c.get("menu_"+g.id);if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(h,"mouseover",g.mouseOverFunc);a.remove(c.select("a",h),"focus",g.mouseOverFunc);a.remove(h,"click",g.mouseClickFunc);a.remove(h,"keydown",g._keyHandler);if(g.element){g.element.remove()}c.remove(h)},renderNode:function(){var i=this,j=i.settings,l,h,k,g;g=c.create("div",{role:"listbox",id:"menu_"+i.id,"class":j["class"],style:"position:absolute;left:0;top:0;z-index:200000;outline:0"});if(i.settings.parent){c.setAttrib(g,"aria-parent","menu_"+i.settings.parent.id)}k=c.add(g,"div",{role:"presentation",id:"menu_"+i.id+"_co","class":i.classPrefix+(j["class"]?" "+j["class"]:"")});i.element=new b("menu_"+i.id,{blocker:1,container:j.container});if(j.menu_line){c.add(k,"span",{"class":i.classPrefix+"Line"})}l=c.add(k,"table",{role:"presentation",id:"menu_"+i.id+"_tbl",border:0,cellPadding:0,cellSpacing:0});h=c.add(l,"tbody");f(i.items,function(m){i._add(h,m)});i.rendered=true;return g},_setupKeyboardNav:function(){var i,h,g=this;i=c.select("#menu_"+g.id)[0];h=c.select("a[role=option]","menu_"+g.id);h.splice(0,0,i);g.keyboardNav=new e.ui.KeyboardNavigation({root:"menu_"+g.id,items:h,onCancel:function(){g.hideMenu()},enableUpDown:true});i.focus()},_keyHandler:function(g){var h=this,i;switch(g.keyCode){case 37:if(h.settings.parent){h.hideMenu();h.settings.parent.focus();a.cancel(g)}break;case 39:if(h.mouseOverFunc){h.mouseOverFunc(g)}break}},_add:function(j,h){var i,q=h.settings,p,l,k,m=this.classPrefix,g;if(q.separator){l=c.add(j,"tr",{id:h.id,"class":m+"ItemSeparator"});c.add(l,"td",{"class":m+"ItemSeparator"});if(i=l.previousSibling){c.addClass(i,"mceLast")}return}i=l=c.add(j,"tr",{id:h.id,"class":m+"Item "+m+"ItemEnabled"});i=k=c.add(i,q.titleItem?"th":"td");i=p=c.add(i,"a",{id:h.id+"_aria",role:q.titleItem?"presentation":"option",href:"javascript:;",onclick:"return false;",onmousedown:"return false;"});if(q.parent){c.setAttrib(p,"aria-haspopup","true");c.setAttrib(p,"aria-owns","menu_"+h.id)}c.addClass(k,q["class"]);g=c.add(i,"span",{"class":"mceIcon"+(q.icon?" mce_"+q.icon:"")});if(q.icon_src){c.add(g,"img",{src:q.icon_src})}i=c.add(i,q.element||"span",{"class":"mceText",title:h.settings.title},h.settings.title);if(h.settings.style){c.setAttrib(i,"style",h.settings.style)}if(j.childNodes.length==1){c.addClass(l,"mceFirst")}if((i=l.previousSibling)&&c.hasClass(i,m+"ItemSeparator")){c.addClass(l,"mceFirst")}if(h.collapse){c.addClass(l,m+"ItemSub")}if(i=l.previousSibling){c.removeClass(i,"mceLast")}c.addClass(l,"mceLast")}})})(tinymce);(function(b){var a=b.DOM;b.create("tinymce.ui.Button:tinymce.ui.Control",{Button:function(e,d,c){this.parent(e,d,c);this.classPrefix="mceButton"},renderHTML:function(){var f=this.classPrefix,e=this.settings,d,c;c=a.encode(e.label||"");d='<a role="button" id="'+this.id+'" href="javascript:;" class="'+f+" "+f+"Enabled "+e["class"]+(c?" "+f+"Labeled":"")+'" onmousedown="return false;" onclick="return false;" aria-labelledby="'+this.id+'_voice" title="'+a.encode(e.title)+'">';if(e.image&&!(this.editor&&this.editor.forcedHighContrastMode)){d+='<img class="mceIcon" src="'+e.image+'" alt="'+a.encode(e.title)+'" />'+c}else{d+='<span class="mceIcon '+e["class"]+'"></span>'+(c?'<span class="'+f+'Label">'+c+"</span>":"")}d+='<span class="mceVoiceLabel mceIconOnly" style="display: none;" id="'+this.id+'_voice">'+e.title+"</span>";d+="</a>";return d},postRender:function(){var c=this,d=c.settings;b.dom.Event.add(c.id,"click",function(f){if(!c.isDisabled()){return d.onclick.call(d.scope,f)}})}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.ListBox:tinymce.ui.Control",{ListBox:function(i,h,f){var g=this;g.parent(i,h,f);g.items=[];g.onChange=new a(g);g.onPostRender=new a(g);g.onAdd=new a(g);g.onRenderMenu=new d.util.Dispatcher(this);g.classPrefix="mceListBox"},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){var h=this,i,j,g;if(f!=h.selectedIndex){i=c.get(h.id+"_text");g=c.get(h.id+"_voiceDesc");j=h.items[f];if(j){h.selectedValue=j.value;h.selectedIndex=f;c.setHTML(i,c.encode(j.title));c.setHTML(g,h.settings.title+" - "+j.title);c.removeClass(i,"mceTitle");c.setAttrib(h.id,"aria-valuenow",j.title)}else{c.setHTML(i,c.encode(h.settings.title));c.setHTML(g,c.encode(h.settings.title));c.addClass(i,"mceTitle");h.selectedValue=h.selectedIndex=null;c.setAttrib(h.id,"aria-valuenow",h.settings.title)}i=0}},add:function(i,f,h){var g=this;h=h||{};h=d.extend(h,{title:i,value:f});g.items.push(h);g.onAdd.dispatch(g,h)},getLength:function(){return this.items.length},renderHTML:function(){var i="",f=this,g=f.settings,j=f.classPrefix;i='<span role="listbox" aria-haspopup="true" aria-labelledby="'+f.id+'_voiceDesc" aria-describedby="'+f.id+'_voiceDesc"><table role="presentation" tabindex="0" id="'+f.id+'" cellpadding="0" cellspacing="0" class="'+j+" "+j+"Enabled"+(g["class"]?(" "+g["class"]):"")+'"><tbody><tr>';i+="<td>"+c.createHTML("span",{id:f.id+"_voiceDesc","class":"voiceLabel",style:"display:none;"},f.settings.title);i+=c.createHTML("a",{id:f.id+"_text",tabindex:-1,href:"javascript:;","class":"mceText",onclick:"return false;",onmousedown:"return false;"},c.encode(f.settings.title))+"</td>";i+="<td>"+c.createHTML("a",{id:f.id+"_open",tabindex:-1,href:"javascript:;","class":"mceOpen",onclick:"return false;",onmousedown:"return false;"},'<span><span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span></span>')+"</td>";i+="</tr></tbody></table></span>";return i},showMenu:function(){var g=this,i,h=c.get(this.id),f;if(g.isDisabled()||g.items.length==0){return}if(g.menu&&g.menu.isMenuVisible){return g.hideMenu()}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}i=c.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.keyboard_focus=!d.isOpera;if(g.oldID){f.items[g.oldID].setSelected(0)}e(g.items,function(j){if(j.value===g.selectedValue){f.items[j.id].setSelected(1);g.oldID=j.id}});f.showMenu(0,h.clientHeight);b.add(c.doc,"mousedown",g.hideMenu,g);c.addClass(g.id,g.classPrefix+"Selected")},hideMenu:function(g){var f=this;if(f.menu&&f.menu.isMenuVisible){c.removeClass(f.id,f.classPrefix+"Selected");if(g&&g.type=="mousedown"&&(g.target.id==f.id+"_text"||g.target.id==f.id+"_open")){return}if(!g||!c.getParent(g.target,".mceMenu")){c.removeClass(f.id,f.classPrefix+"Selected");b.remove(c.doc,"mousedown",f.hideMenu,f);f.menu.hideMenu()}}},renderMenu:function(){var g=this,f;f=g.settings.control_manager.createDropMenu(g.id+"_menu",{menu_line:1,"class":g.classPrefix+"Menu mceNoIcons",max_width:150,max_height:150});f.onHideMenu.add(function(){g.hideMenu();g.focus()});f.add({title:g.settings.title,"class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}});e(g.items,function(h){if(h.value===undefined){f.add({title:h.title,role:"option","class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}})}else{h.id=c.uniqueId();h.role="option";h.onclick=function(){if(g.settings.onselect(h.value)!==false){g.select(h.value)}};f.add(h)}});g.onRenderMenu.dispatch(g,f);g.menu=f},postRender:function(){var f=this,g=f.classPrefix;b.add(f.id,"click",f.showMenu,f);b.add(f.id,"keydown",function(h){if(h.keyCode==32){f.showMenu(h);b.cancel(h)}});b.add(f.id,"focus",function(){if(!f._focused){f.keyDownHandler=b.add(f.id,"keydown",function(h){if(h.keyCode==40){f.showMenu();b.cancel(h)}});f.keyPressHandler=b.add(f.id,"keypress",function(i){var h;if(i.keyCode==13){h=f.selectedValue;f.selectedValue=null;b.cancel(i);f.settings.onselect(h)}})}f._focused=1});b.add(f.id,"blur",function(){b.remove(f.id,"keydown",f.keyDownHandler);b.remove(f.id,"keypress",f.keyPressHandler);f._focused=0});if(d.isIE6||!c.boxModel){b.add(f.id,"mouseover",function(){if(!c.hasClass(f.id,g+"Disabled")){c.addClass(f.id,g+"Hover")}});b.add(f.id,"mouseout",function(){if(!c.hasClass(f.id,g+"Disabled")){c.removeClass(f.id,g+"Hover")}})}f.onPostRender.dispatch(f,c.get(f.id))},destroy:function(){this.parent();b.clear(this.id+"_text");b.clear(this.id+"_open")}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.NativeListBox:tinymce.ui.ListBox",{NativeListBox:function(g,f){this.parent(g,f);this.classPrefix="mceNativeListBox"},setDisabled:function(f){c.get(this.id).disabled=f;this.setAriaProperty("disabled",f)},isDisabled:function(){return c.get(this.id).disabled},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){c.get(this.id).selectedIndex=f+1;this.selectedValue=this.items[f]?this.items[f].value:null},add:function(j,g,f){var i,h=this;f=f||{};f.value=g;if(h.isRendered()){c.add(c.get(this.id),"option",f,j)}i={title:j,value:g,attribs:f};h.items.push(i);h.onAdd.dispatch(h,i)},getLength:function(){return this.items.length},renderHTML:function(){var g,f=this;g=c.createHTML("option",{value:""},"-- "+f.settings.title+" --");e(f.items,function(h){g+=c.createHTML("option",{value:h.value},h.title)});g=c.createHTML("select",{id:f.id,"class":"mceNativeListBox","aria-labelledby":f.id+"_aria"},g);g+=c.createHTML("span",{id:f.id+"_aria",style:"display: none"},f.settings.title);return g},postRender:function(){var g=this,h,i=true;g.rendered=true;function f(k){var j=g.items[k.target.selectedIndex-1];if(j&&(j=j.value)){g.onChange.dispatch(g,j);if(g.settings.onselect){g.settings.onselect(j)}}}b.add(g.id,"change",f);b.add(g.id,"keydown",function(k){var j;b.remove(g.id,"change",h);i=false;j=b.add(g.id,"blur",function(){if(i){return}i=true;b.add(g.id,"change",f);b.remove(g.id,"blur",j)});if(d.isWebKit&&(k.keyCode==37||k.keyCode==39)){return b.prevent(k)}if(k.keyCode==13||k.keyCode==32){f(k);return b.cancel(k)}});g.onPostRender.dispatch(g,c.get(g.id))}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.MenuButton:tinymce.ui.Button",{MenuButton:function(g,f,e){this.parent(g,f,e);this.onRenderMenu=new c.util.Dispatcher(this);f.menu_container=f.menu_container||b.doc.body},showMenu:function(){var g=this,j,i,h=b.get(g.id),f;if(g.isDisabled()){return}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}if(g.isMenuVisible){return g.hideMenu()}j=b.getPos(g.settings.menu_container);i=b.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.vp_offset_x=i.x;f.settings.vp_offset_y=i.y;f.settings.keyboard_focus=g._focused;f.showMenu(0,h.clientHeight);a.add(b.doc,"mousedown",g.hideMenu,g);g.setState("Selected",1);g.isMenuVisible=1},renderMenu:function(){var f=this,e;e=f.settings.control_manager.createDropMenu(f.id+"_menu",{menu_line:1,"class":this.classPrefix+"Menu",icons:f.settings.icons});e.onHideMenu.add(function(){f.hideMenu();f.focus()});f.onRenderMenu.dispatch(f,e);f.menu=e},hideMenu:function(g){var f=this;if(g&&g.type=="mousedown"&&b.getParent(g.target,function(h){return h.id===f.id||h.id===f.id+"_open"})){return}if(!g||!b.getParent(g.target,".mceMenu")){f.setState("Selected",0);a.remove(b.doc,"mousedown",f.hideMenu,f);if(f.menu){f.menu.hideMenu()}}f.isMenuVisible=0},postRender:function(){var e=this,f=e.settings;a.add(e.id,"click",function(){if(!e.isDisabled()){if(f.onclick){f.onclick(e.value)}e.showMenu()}})}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.SplitButton:tinymce.ui.MenuButton",{SplitButton:function(g,f,e){this.parent(g,f,e);this.classPrefix="mceSplitButton"},renderHTML:function(){var i,f=this,g=f.settings,e;i="<tbody><tr>";if(g.image){e=b.createHTML("img ",{src:g.image,role:"presentation","class":"mceAction "+g["class"]})}else{e=b.createHTML("span",{"class":"mceAction "+g["class"]},"")}e+=b.createHTML("span",{"class":"mceVoiceLabel mceIconOnly",id:f.id+"_voice",style:"display:none;"},g.title);i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_action",tabindex:"-1",href:"javascript:;","class":"mceAction "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";e=b.createHTML("span",{"class":"mceOpen "+g["class"]},'<span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span>');i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_open",tabindex:"-1",href:"javascript:;","class":"mceOpen "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";i+="</tr></tbody>";i=b.createHTML("table",{role:"presentation","class":"mceSplitButton mceSplitButtonEnabled "+g["class"],cellpadding:"0",cellspacing:"0",title:g.title},i);return b.createHTML("div",{id:f.id,role:"button",tabindex:"0","aria-labelledby":f.id+"_voice","aria-haspopup":"true"},i)},postRender:function(){var e=this,g=e.settings,f;if(g.onclick){f=function(h){if(!e.isDisabled()){g.onclick(e.value);a.cancel(h)}};a.add(e.id+"_action","click",f);a.add(e.id,["click","keydown"],function(h){var k=32,m=14,i=13,j=38,l=40;if((h.keyCode===32||h.keyCode===13||h.keyCode===14)&&!h.altKey&&!h.ctrlKey&&!h.metaKey){f();a.cancel(h)}else{if(h.type==="click"||h.keyCode===l){e.showMenu();a.cancel(h)}}})}a.add(e.id+"_open","click",function(h){e.showMenu();a.cancel(h)});a.add([e.id,e.id+"_open"],"focus",function(){e._focused=1});a.add([e.id,e.id+"_open"],"blur",function(){e._focused=0});if(c.isIE6||!b.boxModel){a.add(e.id,"mouseover",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.addClass(e.id,"mceSplitButtonHover")}});a.add(e.id,"mouseout",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.removeClass(e.id,"mceSplitButtonHover")}})}},destroy:function(){this.parent();a.clear(this.id+"_action");a.clear(this.id+"_open");a.clear(this.id)}})})(tinymce);(function(d){var c=d.DOM,a=d.dom.Event,b=d.is,e=d.each;d.create("tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton",{ColorSplitButton:function(i,h,f){var g=this;g.parent(i,h,f);g.settings=h=d.extend({colors:"000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,008000,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF",grid_width:8,default_color:"#888888"},g.settings);g.onShowMenu=new d.util.Dispatcher(g);g.onHideMenu=new d.util.Dispatcher(g);g.value=h.default_color},showMenu:function(){var f=this,g,j,i,h;if(f.isDisabled()){return}if(!f.isMenuRendered){f.renderMenu();f.isMenuRendered=true}if(f.isMenuVisible){return f.hideMenu()}i=c.get(f.id);c.show(f.id+"_menu");c.addClass(i,"mceSplitButtonSelected");h=c.getPos(i);c.setStyles(f.id+"_menu",{left:h.x,top:h.y+i.clientHeight,zIndex:200000});i=0;a.add(c.doc,"mousedown",f.hideMenu,f);f.onShowMenu.dispatch(f);if(f._focused){f._keyHandler=a.add(f.id+"_menu","keydown",function(k){if(k.keyCode==27){f.hideMenu()}});c.select("a",f.id+"_menu")[0].focus()}f.isMenuVisible=1},hideMenu:function(g){var f=this;if(f.isMenuVisible){if(g&&g.type=="mousedown"&&c.getParent(g.target,function(h){return h.id===f.id+"_open"})){return}if(!g||!c.getParent(g.target,".mceSplitButtonMenu")){c.removeClass(f.id,"mceSplitButtonSelected");a.remove(c.doc,"mousedown",f.hideMenu,f);a.remove(f.id+"_menu","keydown",f._keyHandler);c.hide(f.id+"_menu")}f.isMenuVisible=0;f.onHideMenu.dispatch()}},renderMenu:function(){var p=this,h,k=0,q=p.settings,g,j,l,o,f;o=c.add(q.menu_container,"div",{role:"listbox",id:p.id+"_menu","class":q.menu_class+" "+q["class"],style:"position:absolute;left:0;top:-1000px;"});h=c.add(o,"div",{"class":q["class"]+" mceSplitButtonMenu"});c.add(h,"span",{"class":"mceMenuLine"});g=c.add(h,"table",{role:"presentation","class":"mceColorSplitMenu"});j=c.add(g,"tbody");k=0;e(b(q.colors,"array")?q.colors:q.colors.split(","),function(i){i=i.replace(/^#/,"");if(!k--){l=c.add(j,"tr");k=q.grid_width-1}g=c.add(l,"td");g=c.add(g,"a",{role:"option",href:"javascript:;",style:{backgroundColor:"#"+i},title:p.editor.getLang("colors."+i,i),"data-mce-color":"#"+i});if(p.editor.forcedHighContrastMode){g=c.add(g,"canvas",{width:16,height:16,"aria-hidden":"true"});if(g.getContext&&(f=g.getContext("2d"))){f.fillStyle="#"+i;f.fillRect(0,0,16,16)}else{c.remove(g)}}});if(q.more_colors_func){g=c.add(j,"tr");g=c.add(g,"td",{colspan:q.grid_width,"class":"mceMoreColors"});g=c.add(g,"a",{role:"option",id:p.id+"_more",href:"javascript:;",onclick:"return false;","class":"mceMoreColors"},q.more_colors_title);a.add(g,"click",function(i){q.more_colors_func.call(q.more_colors_scope||this);return a.cancel(i)})}c.addClass(h,"mceColorSplitMenu");new d.ui.KeyboardNavigation({root:p.id+"_menu",items:c.select("a",p.id+"_menu"),onCancel:function(){p.hideMenu();p.focus()}});a.add(p.id+"_menu","mousedown",function(i){return a.cancel(i)});a.add(p.id+"_menu","click",function(i){var m;i=c.getParent(i.target,"a",j);if(i&&i.nodeName.toLowerCase()=="a"&&(m=i.getAttribute("data-mce-color"))){p.setColor(m)}return a.cancel(i)});return o},setColor:function(f){this.displayColor(f);this.hideMenu();this.settings.onselect(f)},displayColor:function(g){var f=this;c.setStyle(f.id+"_preview","backgroundColor",g);f.value=g},postRender:function(){var f=this,g=f.id;f.parent();c.add(g+"_action","div",{id:g+"_preview","class":"mceColorPreview"});c.setStyle(f.id+"_preview","backgroundColor",f.value)},destroy:function(){this.parent();a.clear(this.id+"_menu");a.clear(this.id+"_more");c.remove(this.id+"_menu")}})})(tinymce);(function(b){var d=b.DOM,c=b.each,a=b.dom.Event;b.create("tinymce.ui.ToolbarGroup:tinymce.ui.Container",{renderHTML:function(){var f=this,i=[],e=f.controls,j=b.each,g=f.settings;i.push('<div id="'+f.id+'" role="group" aria-labelledby="'+f.id+'_voice">');i.push("<span role='application'>");i.push('<span id="'+f.id+'_voice" class="mceVoiceLabel" style="display:none;">'+d.encode(g.name)+"</span>");j(e,function(h){i.push(h.renderHTML())});i.push("</span>");i.push("</div>");return i.join("")},focus:function(){var e=this;d.get(e.id).focus()},postRender:function(){var f=this,e=[];c(f.controls,function(g){c(g.controls,function(h){if(h.id){e.push(h)}})});f.keyNav=new b.ui.KeyboardNavigation({root:f.id,items:e,onCancel:function(){if(b.isWebKit){d.get(f.editor.id+"_ifr").focus()}f.editor.focus()},excludeFromTabOrder:!f.settings.tab_focus_toolbar})},destroy:function(){var e=this;e.parent();e.keyNav.destroy();a.clear(e.id)}})})(tinymce);(function(a){var c=a.DOM,b=a.each;a.create("tinymce.ui.Toolbar:tinymce.ui.Container",{renderHTML:function(){var m=this,f="",j,k,n=m.settings,e,d,g,l;l=m.controls;for(e=0;e<l.length;e++){k=l[e];d=l[e-1];g=l[e+1];if(e===0){j="mceToolbarStart";if(k.Button){j+=" mceToolbarStartButton"}else{if(k.SplitButton){j+=" mceToolbarStartSplitButton"}else{if(k.ListBox){j+=" mceToolbarStartListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"))}if(d&&k.ListBox){if(d.Button||d.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarEnd"},c.createHTML("span",null,"<!-- IE -->"))}}if(c.stdMode){f+='<td style="position: relative">'+k.renderHTML()+"</td>"}else{f+="<td>"+k.renderHTML()+"</td>"}if(g&&k.ListBox){if(g.Button||g.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarStart"},c.createHTML("span",null,"<!-- IE -->"))}}}j="mceToolbarEnd";if(k.Button){j+=" mceToolbarEndButton"}else{if(k.SplitButton){j+=" mceToolbarEndSplitButton"}else{if(k.ListBox){j+=" mceToolbarEndListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"));return c.createHTML("table",{id:m.id,"class":"mceToolbar"+(n["class"]?" "+n["class"]:""),cellpadding:"0",cellspacing:"0",align:m.settings.align||"",role:"presentation",tabindex:"-1"},"<tbody><tr>"+f+"</tr></tbody>")}})})(tinymce);(function(b){var a=b.util.Dispatcher,c=b.each;b.create("tinymce.AddOnManager",{AddOnManager:function(){var d=this;d.items=[];d.urls={};d.lookup={};d.onAdd=new a(d)},get:function(d){if(this.lookup[d]){return this.lookup[d].instance}else{return undefined}},dependencies:function(e){var d;if(this.lookup[e]){d=this.lookup[e].dependencies}return d||[]},requireLangPack:function(e){var d=b.settings;if(d&&d.language&&d.language_load!==false){b.ScriptLoader.add(this.urls[e]+"/langs/"+d.language+".js")}},add:function(f,e,d){this.items.push(e);this.lookup[f]={instance:e,dependencies:d};this.onAdd.dispatch(this,f,e);return e},createUrl:function(d,e){if(typeof e==="object"){return e}else{return{prefix:d.prefix,resource:e,suffix:d.suffix}}},addComponents:function(f,d){var e=this.urls[f];b.each(d,function(g){b.ScriptLoader.add(e+"/"+g)})},load:function(j,f,d,h){var g=this,e=f;function i(){var k=g.dependencies(j);b.each(k,function(m){var l=g.createUrl(f,m);g.load(l.resource,l,undefined,undefined)});if(d){if(h){d.call(h)}else{d.call(b.ScriptLoader)}}}if(g.urls[j]){return}if(typeof f==="object"){e=f.prefix+f.resource+f.suffix}if(e.indexOf("/")!=0&&e.indexOf("://")==-1){e=b.baseURL+"/"+e}g.urls[j]=e.substring(0,e.lastIndexOf("/"));if(g.lookup[j]){i()}else{b.ScriptLoader.add(e,i,h)}}});b.PluginManager=new b.AddOnManager();b.ThemeManager=new b.AddOnManager()}(tinymce));(function(j){var g=j.each,d=j.extend,k=j.DOM,i=j.dom.Event,f=j.ThemeManager,b=j.PluginManager,e=j.explode,h=j.util.Dispatcher,a,c=0;j.documentBaseURL=window.location.href.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,"");if(!/[\/\\]$/.test(j.documentBaseURL)){j.documentBaseURL+="/"}j.baseURL=new j.util.URI(j.documentBaseURL).toAbsolute(j.baseURL);j.baseURI=new j.util.URI(j.baseURL);j.onBeforeUnload=new h(j);i.add(window,"beforeunload",function(l){j.onBeforeUnload.dispatch(j,l)});j.onAddEditor=new h(j);j.onRemoveEditor=new h(j);j.EditorManager=d(j,{editors:[],i18n:{},activeEditor:null,init:function(q){var n=this,p,l=j.ScriptLoader,u,o=[],m;function r(x,y,t){var v=x[y];if(!v){return}if(j.is(v,"string")){t=v.replace(/\.\w+$/,"");t=t?j.resolve(t):0;v=j.resolve(v)}return v.apply(t||this,Array.prototype.slice.call(arguments,2))}q=d({theme:"simple",language:"en"},q);n.settings=q;i.add(document,"init",function(){var s,v;r(q,"onpageload");switch(q.mode){case"exact":s=q.elements||"";if(s.length>0){g(e(s),function(x){if(k.get(x)){m=new j.Editor(x,q);o.push(m);m.render(1)}else{g(document.forms,function(y){g(y.elements,function(z){if(z.name===x){x="mce_editor_"+c++;k.setAttrib(z,"id",x);m=new j.Editor(x,q);o.push(m);m.render(1)}})})}})}break;case"textareas":case"specific_textareas":function t(y,x){return x.constructor===RegExp?x.test(y.className):k.hasClass(y,x)}g(k.select("textarea"),function(x){if(q.editor_deselector&&t(x,q.editor_deselector)){return}if(!q.editor_selector||t(x,q.editor_selector)){u=k.get(x.name);if(!x.id&&!u){x.id=x.name}if(!x.id||n.get(x.id)){x.id=k.uniqueId()}m=new j.Editor(x.id,q);o.push(m);m.render(1)}});break}if(q.oninit){s=v=0;g(o,function(x){v++;if(!x.initialized){x.onInit.add(function(){s++;if(s==v){r(q,"oninit")}})}else{s++}if(s==v){r(q,"oninit")}})}})},get:function(l){if(l===a){return this.editors}return this.editors[l]},getInstanceById:function(l){return this.get(l)},add:function(m){var l=this,n=l.editors;n[m.id]=m;n.push(m);l._setActive(m);l.onAddEditor.dispatch(l,m);return m},remove:function(n){var m=this,l,o=m.editors;if(!o[n.id]){return null}delete o[n.id];for(l=0;l<o.length;l++){if(o[l]==n){o.splice(l,1);break}}if(m.activeEditor==n){m._setActive(o[0])}n.destroy();m.onRemoveEditor.dispatch(m,n);return n},execCommand:function(r,p,o){var q=this,n=q.get(o),l;switch(r){case"mceFocus":n.focus();return true;case"mceAddEditor":case"mceAddControl":if(!q.get(o)){new j.Editor(o,q.settings).render()}return true;case"mceAddFrameControl":l=o.window;l.tinyMCE=tinyMCE;l.tinymce=j;j.DOM.doc=l.document;j.DOM.win=l;n=new j.Editor(o.element_id,o);n.render();if(j.isIE){function m(){n.destroy();l.detachEvent("onunload",m);l=l.tinyMCE=l.tinymce=null}l.attachEvent("onunload",m)}o.page_window=null;return true;case"mceRemoveEditor":case"mceRemoveControl":if(n){n.remove()}return true;case"mceToggleEditor":if(!n){q.execCommand("mceAddControl",0,o);return true}if(n.isHidden()){n.show()}else{n.hide()}return true}if(q.activeEditor){return q.activeEditor.execCommand(r,p,o)}return false},execInstanceCommand:function(p,o,n,m){var l=this.get(p);if(l){return l.execCommand(o,n,m)}return false},triggerSave:function(){g(this.editors,function(l){l.save()})},addI18n:function(n,q){var l,m=this.i18n;if(!j.is(n,"string")){g(n,function(r,p){g(r,function(t,s){g(t,function(v,u){if(s==="common"){m[p+"."+u]=v}else{m[p+"."+s+"."+u]=v}})})})}else{g(q,function(r,p){m[n+"."+p]=r})}},_setActive:function(l){this.selectedInstance=this.activeEditor=l}})})(tinymce);(function(m){var n=m.DOM,j=m.dom.Event,f=m.extend,k=m.util.Dispatcher,i=m.each,a=m.isGecko,b=m.isIE,e=m.isWebKit,d=m.is,h=m.ThemeManager,c=m.PluginManager,o=m.inArray,l=m.grep,g=m.explode;m.create("tinymce.Editor",{Editor:function(r,q){var p=this;p.id=p.editorId=r;p.execCommands={};p.queryStateCommands={};p.queryValueCommands={};p.isNotDirty=false;p.plugins={};i(["onPreInit","onBeforeRenderUI","onPostRender","onInit","onRemove","onActivate","onDeactivate","onClick","onEvent","onMouseUp","onMouseDown","onDblClick","onKeyDown","onKeyUp","onKeyPress","onContextMenu","onSubmit","onReset","onPaste","onPreProcess","onPostProcess","onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent","onLoadContent","onSaveContent","onNodeChange","onChange","onBeforeExecCommand","onExecCommand","onUndo","onRedo","onVisualAid","onSetProgressState"],function(s){p[s]=new k(p)});p.settings=q=f({id:r,language:"en",docs_language:"en",theme:"simple",skin:"default",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:m.documentBaseURL,add_form_submit_trigger:1,submit_patch:1,add_unload_trigger:1,convert_urls:1,relative_urls:1,remove_script_host:1,table_inline_editing:0,object_resizing:1,cleanup:1,accessibility_focus:1,custom_shortcuts:1,custom_undo_redo_keyboard_shortcuts:1,custom_undo_redo_restore_selection:1,custom_undo_redo:1,doctype:m.isIE6?'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">':"<!DOCTYPE>",visual_table_class:"mceItemTable",visual:1,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%",apply_source_formatting:1,directionality:"ltr",forced_root_block:"p",hidden_input:1,padd_empty_editor:1,render_ui:1,init_theme:1,force_p_newlines:1,indentation:"30px",keep_styles:1,fix_table_elements:1,inline_styles:1,convert_fonts_to_spans:true,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",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr",validate:true,entity_encoding:"named",url_converter:p.convertURL,url_converter_scope:p,ie7_compat:true},q);p.documentBaseURI=new m.util.URI(q.document_base_url||m.documentBaseURL,{base_uri:tinyMCE.baseURI});p.baseURI=m.baseURI;p.contentCSS=[];p.execCallback("setup",p)},render:function(r){var u=this,v=u.settings,x=u.id,p=m.ScriptLoader;if(!j.domLoaded){j.add(document,"init",function(){u.render()});return}tinyMCE.settings=v;if(!u.getElement()){return}if(m.isIDevice&&!m.isIOS5){return}if(!/TEXTAREA|INPUT/i.test(u.getElement().nodeName)&&v.hidden_input&&n.getParent(x,"form")){n.insertAfter(n.create("input",{type:"hidden",name:x}),x)}if(m.WindowManager){u.windowManager=new m.WindowManager(u)}if(v.encoding=="xml"){u.onGetContent.add(function(s,t){if(t.save){t.content=n.encode(t.content)}})}if(v.add_form_submit_trigger){u.onSubmit.addToTop(function(){if(u.initialized){u.save();u.isNotDirty=1}})}if(v.add_unload_trigger){u._beforeUnload=tinyMCE.onBeforeUnload.add(function(){if(u.initialized&&!u.destroyed&&!u.isHidden()){u.save({format:"raw",no_events:true})}})}m.addUnload(u.destroy,u);if(v.submit_patch){u.onBeforeRenderUI.add(function(){var s=u.getElement().form;if(!s){return}if(s._mceOldSubmit){return}if(!s.submit.nodeType&&!s.submit.length){u.formElement=s;s._mceOldSubmit=s.submit;s.submit=function(){m.triggerSave();u.isNotDirty=1;return u.formElement._mceOldSubmit(u.formElement)}}s=null})}function q(){if(v.language&&v.language_load!==false){p.add(m.baseURL+"/langs/"+v.language+".js")}if(v.theme&&v.theme.charAt(0)!="-"&&!h.urls[v.theme]){h.load(v.theme,"themes/"+v.theme+"/editor_template"+m.suffix+".js")}i(g(v.plugins),function(t){if(t&&!c.urls[t]){if(t.charAt(0)=="-"){t=t.substr(1,t.length);var s=c.dependencies(t);i(s,function(z){var y={prefix:"plugins/",resource:z,suffix:"/editor_plugin"+m.suffix+".js"};var z=c.createUrl(y,z);c.load(z.resource,z)})}else{if(t=="safari"){return}c.load(t,{prefix:"plugins/",resource:t,suffix:"/editor_plugin"+m.suffix+".js"})}}});p.loadQueue(function(){if(!u.removed){u.init()}})}q()},init:function(){var r,H=this,I=H.settings,E,A,D=H.getElement(),q,p,F,y,C,G,z,v=[];m.add(H);I.aria_label=I.aria_label||n.getAttrib(D,"aria-label",H.getLang("aria.rich_text_area"));if(I.theme){I.theme=I.theme.replace(/-/,"");q=h.get(I.theme);H.theme=new q();if(H.theme.init&&I.init_theme){H.theme.init(H,h.urls[I.theme]||m.documentBaseURL.replace(/\/$/,""))}}function B(J){var K=c.get(J),t=c.urls[J]||m.documentBaseURL.replace(/\/$/,""),s;if(K&&m.inArray(v,J)===-1){i(c.dependencies(J),function(u){B(u)});s=new K(H,t);H.plugins[J]=s;if(s.init){s.init(H,t);v.push(J)}}}i(g(I.plugins.replace(/\-/g,"")),B);if(I.popup_css!==false){if(I.popup_css){I.popup_css=H.documentBaseURI.toAbsolute(I.popup_css)}else{I.popup_css=H.baseURI.toAbsolute("themes/"+I.theme+"/skins/"+I.skin+"/dialog.css")}}if(I.popup_css_add){I.popup_css+=","+H.documentBaseURI.toAbsolute(I.popup_css_add)}H.controlManager=new m.ControlManager(H);if(I.custom_undo_redo){H.onBeforeExecCommand.add(function(t,J,u,K,s){if(J!="Undo"&&J!="Redo"&&J!="mceRepaint"&&(!s||!s.skip_undo)){H.undoManager.beforeChange()}});H.onExecCommand.add(function(t,J,u,K,s){if(J!="Undo"&&J!="Redo"&&J!="mceRepaint"&&(!s||!s.skip_undo)){H.undoManager.add()}})}H.onExecCommand.add(function(s,t){if(!/^(FontName|FontSize)$/.test(t)){H.nodeChanged()}});if(a){function x(s,t){if(!t||!t.initial){H.execCommand("mceRepaint")}}H.onUndo.add(x);H.onRedo.add(x);H.onSetContent.add(x)}H.onBeforeRenderUI.dispatch(H,H.controlManager);if(I.render_ui){E=I.width||D.style.width||D.offsetWidth;A=I.height||D.style.height||D.offsetHeight;H.orgDisplay=D.style.display;G=/^[0-9\.]+(|px)$/i;if(G.test(""+E)){E=Math.max(parseInt(E)+(q.deltaWidth||0),100)}if(G.test(""+A)){A=Math.max(parseInt(A)+(q.deltaHeight||0),100)}q=H.theme.renderUI({targetNode:D,width:E,height:A,deltaWidth:I.delta_width,deltaHeight:I.delta_height});H.editorContainer=q.editorContainer}if(document.domain&&location.hostname!=document.domain){m.relaxedDomain=document.domain}n.setStyles(q.sizeContainer||q.editorContainer,{width:E,height:A});if(I.content_css){m.each(g(I.content_css),function(s){H.contentCSS.push(H.documentBaseURI.toAbsolute(s))})}A=(q.iframeHeight||A)+(typeof(A)=="number"?(q.deltaHeight||0):"");if(A<100){A=100}H.iframeHTML=I.doctype+'<html><head xmlns="http://www.w3.org/1999/xhtml">';if(I.document_base_url!=m.documentBaseURL){H.iframeHTML+='<base href="'+H.documentBaseURI.getURI()+'" />'}if(I.ie7_compat){H.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=7" />'}else{H.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=edge" />'}H.iframeHTML+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';for(z=0;z<H.contentCSS.length;z++){H.iframeHTML+='<link type="text/css" rel="stylesheet" href="'+H.contentCSS[z]+'" />'}y=I.body_id||"tinymce";if(y.indexOf("=")!=-1){y=H.getParam("body_id","","hash");y=y[H.id]||y}C=I.body_class||"";if(C.indexOf("=")!=-1){C=H.getParam("body_class","","hash");C=C[H.id]||""}H.iframeHTML+='</head><body id="'+y+'" class="mceContentBody '+C+'"><br></body></html>';if(m.relaxedDomain&&(b||(m.isOpera&&parseFloat(opera.version())<11))){F='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinyMCE.get("'+H.id+'");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()'}r=n.add(q.iframeContainer,"iframe",{id:H.id+"_ifr",src:F||'javascript:""',frameBorder:"0",allowTransparency:"true",title:I.aria_label,style:{width:"100%",height:A,display:"block"}});H.contentAreaContainer=q.iframeContainer;n.get(q.editorContainer).style.display=H.orgDisplay;n.get(H.id).style.display="none";n.setAttrib(H.id,"aria-hidden",true);if(!m.relaxedDomain||!F){H.setupIframe()}D=r=q=null},setupIframe:function(){var q=this,v=q.settings,x=n.get(q.id),y=q.getDoc(),u,p;if(!b||!m.relaxedDomain){y.open();y.write(q.iframeHTML);y.close();if(m.relaxedDomain){y.domain=m.relaxedDomain}}p=q.getBody();p.disabled=true;if(!v.readonly){p.contentEditable=true}p.disabled=false;q.schema=new m.html.Schema(v);q.dom=new m.dom.DOMUtils(q.getDoc(),{keep_values:true,url_converter:q.convertURL,url_converter_scope:q,hex_colors:v.force_hex_style_colors,class_filter:v.class_filter,update_styles:1,fix_ie_paragraphs:1,schema:q.schema});q.parser=new m.html.DomParser(v,q.schema);if(!q.settings.allow_html_in_named_anchor){q.parser.addAttributeFilter("name",function(s,t){var A=s.length,C,z,B,D;while(A--){D=s[A];if(D.name==="a"&&D.firstChild){B=D.parent;C=D.lastChild;do{z=C.prev;B.insert(C,D);C=z}while(C)}}})}q.parser.addAttributeFilter("src,href,style",function(s,t){var z=s.length,B,D=q.dom,C,A;while(z--){B=s[z];C=B.attr(t);A="data-mce-"+t;if(!B.attributes.map[A]){if(t==="style"){B.attr(A,D.serializeStyle(D.parseStyle(C),B.name))}else{B.attr(A,q.convertURL(C,t,B.name))}}}});q.parser.addNodeFilter("script",function(s,t){var z=s.length,A;while(z--){A=s[z];A.attr("type","mce-"+(A.attr("type")||"text/javascript"))}});q.parser.addNodeFilter("#cdata",function(s,t){var z=s.length,A;while(z--){A=s[z];A.type=8;A.name="#comment";A.value="[CDATA["+A.value+"]]"}});q.parser.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(t,z){var A=t.length,B,s=q.schema.getNonEmptyElements();while(A--){B=t[A];if(B.isEmpty(s)){B.empty().append(new m.html.Node("br",1)).shortEnded=true}}});q.serializer=new m.dom.Serializer(v,q.dom,q.schema);q.selection=new m.dom.Selection(q.dom,q.getWin(),q.serializer);q.formatter=new m.Formatter(this);q.formatter.register({alignleft:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"left"}},{selector:"img,table",collapsed:false,styles:{"float":"left"}}],aligncenter:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"center"}},{selector:"img",collapsed:false,styles:{display:"block",marginLeft:"auto",marginRight:"auto"}},{selector:"table",collapsed:false,styles:{marginLeft:"auto",marginRight:"auto"}}],alignright:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"right"}},{selector:"img,table",collapsed:false,styles:{"float":"right"}}],alignfull:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"justify"}}],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:true},{inline:"u",remove:"all"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:true},{inline:"strike",remove:"all"}],forecolor:{inline:"span",styles:{color:"%value"},wrap_links:false},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},wrap_links:false},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"},link:{inline:"a",selector:"a",remove:"all",split:true,deep:true,onmatch:function(s){return true},onformat:function(z,s,t){i(t,function(B,A){q.dom.setAttrib(z,A,B)})}},removeformat:[{selector:"b,strong,em,i,font,u,strike",remove:"all",split:true,expand:false,block_expand:true,deep:true},{selector:"span",attributes:["style","class"],remove:"empty",split:true,expand:false,deep:true},{selector:"*",attributes:["style","class"],split:false,expand:false,deep:true}]});i("p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp".split(/\s/),function(s){q.formatter.register(s,{block:s,remove:"all"})});q.formatter.register(q.settings.formats);q.undoManager=new m.UndoManager(q);q.undoManager.onAdd.add(function(t,s){if(t.hasUndo()){return q.onChange.dispatch(q,s,t)}});q.undoManager.onUndo.add(function(t,s){return q.onUndo.dispatch(q,s,t)});q.undoManager.onRedo.add(function(t,s){return q.onRedo.dispatch(q,s,t)});q.forceBlocks=new m.ForceBlocks(q,{forced_root_block:v.forced_root_block});q.editorCommands=new m.EditorCommands(q);q.serializer.onPreProcess.add(function(s,t){return q.onPreProcess.dispatch(q,t,s)});q.serializer.onPostProcess.add(function(s,t){return q.onPostProcess.dispatch(q,t,s)});q.onPreInit.dispatch(q);if(!v.gecko_spellcheck){q.getBody().spellcheck=0}if(!v.readonly){q._addEvents()}q.controlManager.onPostRender.dispatch(q,q.controlManager);q.onPostRender.dispatch(q);q.quirks=new m.util.Quirks(this);if(v.directionality){q.getBody().dir=v.directionality}if(v.nowrap){q.getBody().style.whiteSpace="nowrap"}if(v.handle_node_change_callback){q.onNodeChange.add(function(t,s,z){q.execCallback("handle_node_change_callback",q.id,z,-1,-1,true,q.selection.isCollapsed())})}if(v.save_callback){q.onSaveContent.add(function(s,z){var t=q.execCallback("save_callback",q.id,z.content,q.getBody());if(t){z.content=t}})}if(v.onchange_callback){q.onChange.add(function(t,s){q.execCallback("onchange_callback",q,s)})}if(v.protect){q.onBeforeSetContent.add(function(s,t){if(v.protect){i(v.protect,function(z){t.content=t.content.replace(z,function(A){return"<!--mce:protected "+escape(A)+"-->"})})}})}if(v.convert_newlines_to_brs){q.onBeforeSetContent.add(function(s,t){if(t.initial){t.content=t.content.replace(/\r?\n/g,"<br />")}})}if(v.preformatted){q.onPostProcess.add(function(s,t){t.content=t.content.replace(/^\s*<pre.*?>/,"");t.content=t.content.replace(/<\/pre>\s*$/,"");if(t.set){t.content='<pre class="mceItemHidden">'+t.content+"</pre>"}})}if(v.verify_css_classes){q.serializer.attribValueFilter=function(B,z){var A,t;if(B=="class"){if(!q.classesRE){t=q.dom.getClasses();if(t.length>0){A="";i(t,function(s){A+=(A?"|":"")+s["class"]});q.classesRE=new RegExp("("+A+")","gi")}}return !q.classesRE||/(\bmceItem\w+\b|\bmceTemp\w+\b)/g.test(z)||q.classesRE.test(z)?z:""}return z}}if(v.cleanup_callback){q.onBeforeSetContent.add(function(s,t){t.content=q.execCallback("cleanup_callback","insert_to_editor",t.content,t)});q.onPreProcess.add(function(s,t){if(t.set){q.execCallback("cleanup_callback","insert_to_editor_dom",t.node,t)}if(t.get){q.execCallback("cleanup_callback","get_from_editor_dom",t.node,t)}});q.onPostProcess.add(function(s,t){if(t.set){t.content=q.execCallback("cleanup_callback","insert_to_editor",t.content,t)}if(t.get){t.content=q.execCallback("cleanup_callback","get_from_editor",t.content,t)}})}if(v.save_callback){q.onGetContent.add(function(s,t){if(t.save){t.content=q.execCallback("save_callback",q.id,t.content,q.getBody())}})}if(v.handle_event_callback){q.onEvent.add(function(s,t,z){if(q.execCallback("handle_event_callback",t,s,z)===false){j.cancel(t)}})}q.onSetContent.add(function(){q.addVisual(q.getBody())});if(v.padd_empty_editor){q.onPostProcess.add(function(s,t){t.content=t.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/,"")})}if(a){function r(s,t){i(s.dom.select("a"),function(A){var z=A.parentNode;if(s.dom.isBlock(z)&&z.lastChild===A){s.dom.add(z,"br",{"data-mce-bogus":1})}})}q.onExecCommand.add(function(s,t){if(t==="CreateLink"){r(s)}});q.onSetContent.add(q.selection.onSetContent.add(r))}q.load({initial:true,format:"html"});q.startContent=q.getContent({format:"raw"});q.undoManager.add();q.initialized=true;q.onInit.dispatch(q);q.execCallback("setupcontent_callback",q.id,q.getBody(),q.getDoc());q.execCallback("init_instance_callback",q);q.focus(true);q.nodeChanged({initial:1});i(q.contentCSS,function(s){q.dom.loadCSS(s)});if(v.auto_focus){setTimeout(function(){var s=m.get(v.auto_focus);s.selection.select(s.getBody(),1);s.selection.collapse(1);s.getBody().focus();s.getWin().focus()},100)}x=null},focus:function(u){var y,q=this,s=q.selection,x=q.settings.content_editable,r,p,v=q.getDoc();if(!u){r=s.getRng();if(r.item){p=r.item(0)}q._refreshContentEditable();s.normalize();if(!x){q.getWin().focus()}if(m.isGecko){q.getBody().focus()}if(p&&p.ownerDocument==v){r=v.body.createControlRange();r.addElement(p);r.select()}}if(m.activeEditor!=q){if((y=m.activeEditor)!=null){y.onDeactivate.dispatch(y,q)}q.onActivate.dispatch(q,y)}m._setActive(q)},execCallback:function(u){var p=this,r=p.settings[u],q;if(!r){return}if(p.callbackLookup&&(q=p.callbackLookup[u])){r=q.func;q=q.scope}if(d(r,"string")){q=r.replace(/\.\w+$/,"");q=q?m.resolve(q):0;r=m.resolve(r);p.callbackLookup=p.callbackLookup||{};p.callbackLookup[u]={func:r,scope:q}}return r.apply(q||p,Array.prototype.slice.call(arguments,1))},translate:function(p){var r=this.settings.language||"en",q=m.i18n;if(!p){return""}return q[r+"."+p]||p.replace(/{\#([^}]+)\}/g,function(t,s){return q[r+"."+s]||"{#"+s+"}"})},getLang:function(q,p){return m.i18n[(this.settings.language||"en")+"."+q]||(d(p)?p:"{#"+q+"}")},getParam:function(u,r,p){var s=m.trim,q=d(this.settings[u])?this.settings[u]:r,t;if(p==="hash"){t={};if(d(q,"string")){i(q.indexOf("=")>0?q.split(/[;,](?![^=;,]*(?:[;,]|$))/):q.split(","),function(x){x=x.split("=");if(x.length>1){t[s(x[0])]=s(x[1])}else{t[s(x[0])]=s(x)}})}else{t=q}return t}return q},nodeChanged:function(r){var p=this,q=p.selection,u=q.getStart()||p.getBody();if(p.initialized){r=r||{};u=b&&u.ownerDocument!=p.getDoc()?p.getBody():u;r.parents=[];p.dom.getParent(u,function(s){if(s.nodeName=="BODY"){return true}r.parents.push(s)});p.onNodeChange.dispatch(p,r?r.controlManager||p.controlManager:p.controlManager,u,q.isCollapsed(),r)}},addButton:function(r,q){var p=this;p.buttons=p.buttons||{};p.buttons[r]=q},addCommand:function(p,r,q){this.execCommands[p]={func:r,scope:q||this}},addQueryStateHandler:function(p,r,q){this.queryStateCommands[p]={func:r,scope:q||this}},addQueryValueHandler:function(p,r,q){this.queryValueCommands[p]={func:r,scope:q||this}},addShortcut:function(r,u,p,s){var q=this,v;if(!q.settings.custom_shortcuts){return false}q.shortcuts=q.shortcuts||{};if(d(p,"string")){v=p;p=function(){q.execCommand(v,false,null)}}if(d(p,"object")){v=p;p=function(){q.execCommand(v[0],v[1],v[2])}}i(g(r),function(t){var x={func:p,scope:s||this,desc:u,alt:false,ctrl:false,shift:false};i(g(t,"+"),function(y){switch(y){case"alt":case"ctrl":case"shift":x[y]=true;break;default:x.charCode=y.charCodeAt(0);x.keyCode=y.toUpperCase().charCodeAt(0)}});q.shortcuts[(x.ctrl?"ctrl":"")+","+(x.alt?"alt":"")+","+(x.shift?"shift":"")+","+x.keyCode]=x});return true},execCommand:function(x,v,z,p){var r=this,u=0,y,q;if(!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(x)&&(!p||!p.skip_focus)){r.focus()}y={};r.onBeforeExecCommand.dispatch(r,x,v,z,y);if(y.terminate){return false}if(r.execCallback("execcommand_callback",r.id,r.selection.getNode(),x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(y=r.execCommands[x]){q=y.func.call(y.scope,v,z);if(q!==true){r.onExecCommand.dispatch(r,x,v,z,p);return q}}i(r.plugins,function(s){if(s.execCommand&&s.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);u=1;return false}});if(u){return true}if(r.theme&&r.theme.execCommand&&r.theme.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(r.editorCommands.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}r.getDoc().execCommand(x,v,z);r.onExecCommand.dispatch(r,x,v,z,p)},queryCommandState:function(u){var q=this,v,r;if(q._isHidden()){return}if(v=q.queryStateCommands[u]){r=v.func.call(v.scope);if(r!==true){return r}}v=q.editorCommands.queryCommandState(u);if(v!==-1){return v}try{return this.getDoc().queryCommandState(u)}catch(p){}},queryCommandValue:function(v){var q=this,u,r;if(q._isHidden()){return}if(u=q.queryValueCommands[v]){r=u.func.call(u.scope);if(r!==true){return r}}u=q.editorCommands.queryCommandValue(v);if(d(u)){return u}try{return this.getDoc().queryCommandValue(v)}catch(p){}},show:function(){var p=this;n.show(p.getContainer());n.hide(p.id);p.load()},hide:function(){var p=this,q=p.getDoc();if(b&&q){q.execCommand("SelectAll")}p.save();n.hide(p.getContainer());n.setStyle(p.id,"display",p.orgDisplay)},isHidden:function(){return !n.isHidden(this.id)},setProgressState:function(p,q,r){this.onSetProgressState.dispatch(this,p,q,r);return p},load:function(s){var p=this,r=p.getElement(),q;if(r){s=s||{};s.load=true;q=p.setContent(d(r.value)?r.value:r.innerHTML,s);s.element=r;if(!s.no_events){p.onLoadContent.dispatch(p,s)}s.element=r=null;return q}},save:function(u){var p=this,s=p.getElement(),q,r;if(!s||!p.initialized){return}u=u||{};u.save=true;if(!u.no_events){p.undoManager.typing=false;p.undoManager.add()}u.element=s;q=u.content=p.getContent(u);if(!u.no_events){p.onSaveContent.dispatch(p,u)}q=u.content;if(!/TEXTAREA|INPUT/i.test(s.nodeName)){s.innerHTML=q;if(r=n.getParent(p.id,"form")){i(r.elements,function(t){if(t.name==p.id){t.value=q;return false}})}}else{s.value=q}u.element=s=null;return q},setContent:function(u,s){var r=this,q,p=r.getBody(),t;s=s||{};s.format=s.format||"html";s.set=true;s.content=u;if(!s.no_events){r.onBeforeSetContent.dispatch(r,s)}u=s.content;if(!m.isIE&&(u.length===0||/^\s+$/.test(u))){t=r.settings.forced_root_block;if(t){u="<"+t+'><br data-mce-bogus="1"></'+t+">"}else{u='<br data-mce-bogus="1">'}p.innerHTML=u;r.selection.select(p,true);r.selection.collapse(true);return}if(s.format!=="raw"){u=new m.html.Serializer({},r.schema).serialize(r.parser.parse(u))}s.content=m.trim(u);r.dom.setHTML(p,s.content);if(!s.no_events){r.onSetContent.dispatch(r,s)}r.selection.normalize();return s.content},getContent:function(q){var p=this,r;q=q||{};q.format=q.format||"html";q.get=true;if(!q.no_events){p.onBeforeGetContent.dispatch(p,q)}if(q.format=="raw"){r=p.getBody().innerHTML}else{r=p.serializer.serialize(p.getBody(),q)}q.content=m.trim(r);if(!q.no_events){p.onGetContent.dispatch(p,q)}return q.content},isDirty:function(){var p=this;return m.trim(p.startContent)!=m.trim(p.getContent({format:"raw",no_events:1}))&&!p.isNotDirty},getContainer:function(){var p=this;if(!p.container){p.container=n.get(p.editorContainer||p.id+"_parent")}return p.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return n.get(this.settings.content_element||this.id)},getWin:function(){var p=this,q;if(!p.contentWindow){q=n.get(p.id+"_ifr");if(q){p.contentWindow=q.contentWindow}}return p.contentWindow},getDoc:function(){var q=this,p;if(!q.contentDocument){p=q.getWin();if(p){q.contentDocument=p.document}}return q.contentDocument},getBody:function(){return this.bodyElement||this.getDoc().body},convertURL:function(p,x,v){var q=this,r=q.settings;if(r.urlconverter_callback){return q.execCallback("urlconverter_callback",p,v,true,x)}if(!r.convert_urls||(v&&v.nodeName=="LINK")||p.indexOf("file:")===0){return p}if(r.relative_urls){return q.documentBaseURI.toRelative(p)}p=q.documentBaseURI.toAbsolute(p,r.remove_script_host);return p},addVisual:function(r){var p=this,q=p.settings;r=r||p.getBody();if(!d(p.hasVisual)){p.hasVisual=q.visual}i(p.dom.select("table,a",r),function(t){var s;switch(t.nodeName){case"TABLE":s=p.dom.getAttrib(t,"border");if(!s||s=="0"){if(p.hasVisual){p.dom.addClass(t,q.visual_table_class)}else{p.dom.removeClass(t,q.visual_table_class)}}return;case"A":s=p.dom.getAttrib(t,"name");if(s){if(p.hasVisual){p.dom.addClass(t,"mceItemAnchor")}else{p.dom.removeClass(t,"mceItemAnchor")}}return}});p.onVisualAid.dispatch(p,r,p.hasVisual)},remove:function(){var p=this,q=p.getContainer();p.removed=1;p.hide();p.execCallback("remove_instance_callback",p);p.onRemove.dispatch(p);p.onExecCommand.listeners=[];m.remove(p);n.remove(q)},destroy:function(q){var p=this;if(p.destroyed){return}if(!q){m.removeUnload(p.destroy);tinyMCE.onBeforeUnload.remove(p._beforeUnload);if(p.theme&&p.theme.destroy){p.theme.destroy()}p.controlManager.destroy();p.selection.destroy();p.dom.destroy();if(!p.settings.content_editable){j.clear(p.getWin());j.clear(p.getDoc())}j.clear(p.getBody());j.clear(p.formElement)}if(p.formElement){p.formElement.submit=p.formElement._mceOldSubmit;p.formElement._mceOldSubmit=null}p.contentAreaContainer=p.formElement=p.container=p.settings.content_element=p.bodyElement=p.contentDocument=p.contentWindow=null;if(p.selection){p.selection=p.selection.win=p.selection.dom=p.selection.dom.doc=null}p.destroyed=1},_addEvents:function(){var B=this,r,C=B.settings,q=B.dom,x={mouseup:"onMouseUp",mousedown:"onMouseDown",click:"onClick",keyup:"onKeyUp",keydown:"onKeyDown",keypress:"onKeyPress",submit:"onSubmit",reset:"onReset",contextmenu:"onContextMenu",dblclick:"onDblClick",paste:"onPaste"};function p(t,D){var s=t.type;if(B.removed){return}if(B.onEvent.dispatch(B,t,D)!==false){B[x[t.fakeType||t.type]].dispatch(B,t,D)}}i(x,function(t,s){switch(s){case"contextmenu":q.bind(B.getDoc(),s,p);break;case"paste":q.bind(B.getBody(),s,function(D){p(D)});break;case"submit":case"reset":q.bind(B.getElement().form||n.getParent(B.id,"form"),s,p);break;default:q.bind(C.content_editable?B.getBody():B.getDoc(),s,p)}});q.bind(C.content_editable?B.getBody():(a?B.getDoc():B.getWin()),"focus",function(s){B.focus(true)});if(m.isGecko){q.bind(B.getDoc(),"DOMNodeInserted",function(t){var s;t=t.target;if(t.nodeType===1&&t.nodeName==="IMG"&&(s=t.getAttribute("data-mce-src"))){t.src=B.documentBaseURI.toAbsolute(s)}})}if(a){function u(){var E=this,G=E.getDoc(),F=E.settings;if(a&&!F.readonly){E._refreshContentEditable();try{G.execCommand("styleWithCSS",0,false)}catch(D){if(!E._isHidden()){try{G.execCommand("useCSS",0,true)}catch(D){}}}if(!F.table_inline_editing){try{G.execCommand("enableInlineTableEditing",false,false)}catch(D){}}if(!F.object_resizing){try{G.execCommand("enableObjectResizing",false,false)}catch(D){}}}}B.onBeforeExecCommand.add(u);B.onMouseDown.add(u)}B.onMouseUp.add(B.nodeChanged);B.onKeyUp.add(function(s,t){var D=t.keyCode;if((D>=33&&D<=36)||(D>=37&&D<=40)||D==13||D==45||D==46||D==8||(m.isMac&&(D==91||D==93))||t.ctrlKey){B.nodeChanged()}});B.onKeyDown.add(function(t,D){if(D.keyCode!=8){return}var F=t.selection.getRng().startContainer;var E=t.selection.getRng().startOffset;while(F&&F.nodeType&&F.nodeType!=1&&F.parentNode){F=F.parentNode}if(F&&F.parentNode&&F.parentNode.tagName==="BLOCKQUOTE"&&F.parentNode.firstChild==F&&E==0){t.formatter.toggle("blockquote",null,F.parentNode);var s=t.selection.getRng();s.setStart(F,0);s.setEnd(F,0);t.selection.setRng(s);t.selection.collapse(false)}});B.onReset.add(function(){B.setContent(B.startContent,{format:"raw"})});if(C.custom_shortcuts){if(C.custom_undo_redo_keyboard_shortcuts){B.addShortcut("ctrl+z",B.getLang("undo_desc"),"Undo");B.addShortcut("ctrl+y",B.getLang("redo_desc"),"Redo")}B.addShortcut("ctrl+b",B.getLang("bold_desc"),"Bold");B.addShortcut("ctrl+i",B.getLang("italic_desc"),"Italic");B.addShortcut("ctrl+u",B.getLang("underline_desc"),"Underline");for(r=1;r<=6;r++){B.addShortcut("ctrl+"+r,"",["FormatBlock",false,"h"+r])}B.addShortcut("ctrl+7","",["FormatBlock",false,"p"]);B.addShortcut("ctrl+8","",["FormatBlock",false,"div"]);B.addShortcut("ctrl+9","",["FormatBlock",false,"address"]);function v(t){var s=null;if(!t.altKey&&!t.ctrlKey&&!t.metaKey){return s}i(B.shortcuts,function(D){if(m.isMac&&D.ctrl!=t.metaKey){return}else{if(!m.isMac&&D.ctrl!=t.ctrlKey){return}}if(D.alt!=t.altKey){return}if(D.shift!=t.shiftKey){return}if(t.keyCode==D.keyCode||(t.charCode&&t.charCode==D.charCode)){s=D;return false}});return s}B.onKeyUp.add(function(s,t){var D=v(t);if(D){return j.cancel(t)}});B.onKeyPress.add(function(s,t){var D=v(t);if(D){return j.cancel(t)}});B.onKeyDown.add(function(s,t){var D=v(t);if(D){D.func.call(D.scope);return j.cancel(t)}})}if(m.isIE){q.bind(B.getDoc(),"controlselect",function(D){var t=B.resizeInfo,s;D=D.target;if(D.nodeName!=="IMG"){return}if(t){q.unbind(t.node,t.ev,t.cb)}if(!q.hasClass(D,"mceItemNoResize")){ev="resizeend";s=q.bind(D,ev,function(F){var E;F=F.target;if(E=q.getStyle(F,"width")){q.setAttrib(F,"width",E.replace(/[^0-9%]+/g,""));q.setStyle(F,"width","")}if(E=q.getStyle(F,"height")){q.setAttrib(F,"height",E.replace(/[^0-9%]+/g,""));q.setStyle(F,"height","")}})}else{ev="resizestart";s=q.bind(D,"resizestart",j.cancel,j)}t=B.resizeInfo={node:D,ev:ev,cb:s}})}if(m.isOpera){B.onClick.add(function(s,t){j.prevent(t)})}if(C.custom_undo_redo){function y(){B.undoManager.typing=false;B.undoManager.add()}q.bind(B.getDoc(),"focusout",function(s){if(!B.removed&&B.undoManager.typing){y()}});B.dom.bind(B.dom.getRoot(),"dragend",function(s){y()});B.onKeyUp.add(function(s,D){var t=D.keyCode;if((t>=33&&t<=36)||(t>=37&&t<=40)||t==13||t==45||D.ctrlKey){y()}});B.onKeyDown.add(function(s,E){var D=E.keyCode,t;if(D==8){t=B.getDoc().selection;if(t&&t.createRange&&t.createRange().item){B.undoManager.beforeChange();s.dom.remove(t.createRange().item(0));y();return j.cancel(E)}}if((D>=33&&D<=36)||(D>=37&&D<=40)||D==13||D==45){if(m.isIE&&D==13){B.undoManager.beforeChange()}if(B.undoManager.typing){y()}return}if((D<16||D>20)&&D!=224&&D!=91&&!B.undoManager.typing){B.undoManager.beforeChange();B.undoManager.typing=true;B.undoManager.add()}});B.onMouseDown.add(function(){if(B.undoManager.typing){y()}})}if(m.isGecko){function A(){var s=B.dom.getAttribs(B.selection.getStart().cloneNode(false));return function(){var t=B.selection.getStart();if(t!==B.getBody()){B.dom.setAttrib(t,"style",null);i(s,function(D){t.setAttributeNode(D.cloneNode(true))})}}}function z(){var t=B.selection;return !t.isCollapsed()&&t.getStart()!=t.getEnd()}B.onKeyPress.add(function(s,D){var t;if((D.keyCode==8||D.keyCode==46)&&z()){t=A();B.getDoc().execCommand("delete",false,null);t();return j.cancel(D)}});B.dom.bind(B.getDoc(),"cut",function(t){var s;if(z()){s=A();B.onKeyUp.addToTop(j.cancel,j);setTimeout(function(){s();B.onKeyUp.remove(j.cancel,j)},0)}})}},_refreshContentEditable:function(){var q=this,p,r;if(q._isHidden()){p=q.getBody();r=p.parentNode;r.removeChild(p);r.appendChild(p);p.focus()}},_isHidden:function(){var p;if(!a){return 0}p=this.selection.getSel();return(!p||!p.rangeCount||p.rangeCount==0)}})})(tinymce);(function(c){var d=c.each,e,a=true,b=false;c.EditorCommands=function(n){var m=n.dom,p=n.selection,j={state:{},exec:{},value:{}},k=n.settings,q=n.formatter,o;function r(z,y,x){var v;z=z.toLowerCase();if(v=j.exec[z]){v(z,y,x);return a}return b}function l(x){var v;x=x.toLowerCase();if(v=j.state[x]){return v(x)}return -1}function h(x){var v;x=x.toLowerCase();if(v=j.value[x]){return v(x)}return b}function u(v,x){x=x||"exec";d(v,function(z,y){d(y.toLowerCase().split(","),function(A){j[x][A]=z})})}c.extend(this,{execCommand:r,queryCommandState:l,queryCommandValue:h,addCommands:u});function f(y,x,v){if(x===e){x=b}if(v===e){v=null}return n.getDoc().execCommand(y,x,v)}function t(v){return q.match(v)}function s(v,x){q.toggle(v,x?{value:x}:e)}function i(v){o=p.getBookmark(v)}function g(){p.moveToBookmark(o)}u({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){n.undoManager.add()},"Cut,Copy,Paste":function(z){var y=n.getDoc(),v;try{f(z)}catch(x){v=a}if(v||!y.queryCommandSupported(z)){if(c.isGecko){n.windowManager.confirm(n.getLang("clipboard_msg"),function(A){if(A){open("http://www.mozilla.org/editor/midasdemo/securityprefs.html","_blank")}})}else{n.windowManager.alert(n.getLang("clipboard_no_support"))}}},unlink:function(v){if(p.isCollapsed()){p.select(p.getNode())}f(v);p.collapse(b)},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(v){var x=v.substring(7);d("left,center,right,full".split(","),function(y){if(x!=y){q.remove("align"+y)}});s("align"+x);r("mceRepaint")},"InsertUnorderedList,InsertOrderedList":function(y){var v,x;f(y);v=m.getParent(p.getNode(),"ol,ul");if(v){x=v.parentNode;if(/^(H[1-6]|P|ADDRESS|PRE)$/.test(x.nodeName)){i();m.split(x,v);g()}}},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(v){s(v)},"ForeColor,HiliteColor,FontName":function(y,x,v){s(y,v)},FontSize:function(z,y,x){var v,A;if(x>=1&&x<=7){A=c.explode(k.font_size_style_values);v=c.explode(k.font_size_classes);if(v){x=v[x-1]||x}else{x=A[x-1]||x}}s(z,x)},RemoveFormat:function(v){q.remove(v)},mceBlockQuote:function(v){s("blockquote")},FormatBlock:function(y,x,v){return s(v||"p")},mceCleanup:function(){var v=p.getBookmark();n.setContent(n.getContent({cleanup:a}),{cleanup:a});p.moveToBookmark(v)},mceRemoveNode:function(z,y,x){var v=x||p.getNode();if(v!=n.getBody()){i();n.dom.remove(v,a);g()}},mceSelectNodeDepth:function(z,y,x){var v=0;m.getParent(p.getNode(),function(A){if(A.nodeType==1&&v++==x){p.select(A);return b}},n.getBody())},mceSelectNode:function(y,x,v){p.select(v)},mceInsertContent:function(B,I,K){var y,J,E,z,F,G,D,C,L,x,A,M,v,H;y=n.parser;J=new c.html.Serializer({},n.schema);v='<span id="mce_marker" data-mce-type="bookmark">\uFEFF</span>';G={content:K,format:"html"};p.onBeforeSetContent.dispatch(p,G);K=G.content;if(K.indexOf("{$caret}")==-1){K+="{$caret}"}K=K.replace(/\{\$caret\}/,v);if(!p.isCollapsed()){n.getDoc().execCommand("Delete",false,null)}E=p.getNode();G={context:E.nodeName.toLowerCase()};F=y.parse(K,G);A=F.lastChild;if(A.attr("id")=="mce_marker"){D=A;for(A=A.prev;A;A=A.walk(true)){if(A.type==3||!m.isBlock(A.name)){A.parent.insert(D,A,A.name==="br");break}}}if(!G.invalid){K=J.serialize(F);A=E.firstChild;M=E.lastChild;if(!A||(A===M&&A.nodeName==="BR")){m.setHTML(E,K)}else{p.setContent(K)}}else{p.setContent(v);E=n.selection.getNode();z=n.getBody();if(E.nodeType==9){E=A=z}else{A=E}while(A!==z){E=A;A=A.parentNode}K=E==z?z.innerHTML:m.getOuterHTML(E);K=J.serialize(y.parse(K.replace(/<span (id="mce_marker"|id=mce_marker).+?<\/span>/i,function(){return J.serialize(F)})));if(E==z){m.setHTML(z,K)}else{m.setOuterHTML(E,K)}}D=m.get("mce_marker");C=m.getRect(D);L=m.getViewPort(n.getWin());if((C.y+C.h>L.y+L.h||C.y<L.y)||(C.x>L.x+L.w||C.x<L.x)){H=c.isIE?n.getDoc().documentElement:n.getBody();H.scrollLeft=C.x;H.scrollTop=C.y-L.h+25}x=m.createRng();A=D.previousSibling;if(A&&A.nodeType==3){x.setStart(A,A.nodeValue.length)}else{x.setStartBefore(D);x.setEndBefore(D)}m.remove(D);p.setRng(x);p.onSetContent.dispatch(p,G);n.addVisual()},mceInsertRawHTML:function(y,x,v){p.setContent("tiny_mce_marker");n.setContent(n.getContent().replace(/tiny_mce_marker/g,function(){return v}))},mceSetContent:function(y,x,v){n.setContent(v)},"Indent,Outdent":function(z){var x,v,y;x=k.indentation;v=/[a-z%]+$/i.exec(x);x=parseInt(x);if(!l("InsertUnorderedList")&&!l("InsertOrderedList")){d(p.getSelectedBlocks(),function(A){if(z=="outdent"){y=Math.max(0,parseInt(A.style.paddingLeft||0)-x);m.setStyle(A,"paddingLeft",y?y+v:"")}else{m.setStyle(A,"paddingLeft",(parseInt(A.style.paddingLeft||0)+x)+v)}})}else{f(z)}},mceRepaint:function(){var x;if(c.isGecko){try{i(a);if(p.getSel()){p.getSel().selectAllChildren(n.getBody())}p.collapse(a);g()}catch(v){}}},mceToggleFormat:function(y,x,v){q.toggle(v)},InsertHorizontalRule:function(){n.execCommand("mceInsertContent",false,"<hr />")},mceToggleVisualAid:function(){n.hasVisual=!n.hasVisual;n.addVisual()},mceReplaceContent:function(y,x,v){n.execCommand("mceInsertContent",false,v.replace(/\{\$selection\}/g,p.getContent({format:"text"})))},mceInsertLink:function(z,y,x){var v;if(typeof(x)=="string"){x={href:x}}v=m.getParent(p.getNode(),"a");x.href=x.href.replace(" ","%20");if(!v||!x.href){q.remove("link")}if(x.href){q.apply("link",x,v)}},selectAll:function(){var x=m.getRoot(),v=m.createRng();v.setStart(x,0);v.setEnd(x,x.childNodes.length);n.selection.setRng(v)}});u({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(v){return t("align"+v.substring(7))},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(v){return t(v)},mceBlockQuote:function(){return t("blockquote")},Outdent:function(){var v;if(k.inline_styles){if((v=m.getParent(p.getStart(),m.isBlock))&&parseInt(v.style.paddingLeft)>0){return a}if((v=m.getParent(p.getEnd(),m.isBlock))&&parseInt(v.style.paddingLeft)>0){return a}}return l("InsertUnorderedList")||l("InsertOrderedList")||(!k.inline_styles&&!!m.getParent(p.getNode(),"BLOCKQUOTE"))},"InsertUnorderedList,InsertOrderedList":function(v){return m.getParent(p.getNode(),v=="insertunorderedlist"?"UL":"OL")}},"state");u({"FontSize,FontName":function(y){var x=0,v;if(v=m.getParent(p.getNode(),"span")){if(y=="fontsize"){x=v.style.fontSize}else{x=v.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()}}return x}},"value");if(k.custom_undo_redo){u({Undo:function(){n.undoManager.undo()},Redo:function(){n.undoManager.redo()}})}}})(tinymce);(function(b){var a=b.util.Dispatcher;b.UndoManager=function(f){var d,e=0,h=[],c;function g(){return b.trim(f.getContent({format:"raw",no_events:1}))}return d={typing:false,onAdd:new a(d),onUndo:new a(d),onRedo:new a(d),beforeChange:function(){c=f.selection.getBookmark(2,true)},add:function(m){var j,k=f.settings,l;m=m||{};m.content=g();l=h[e];if(l&&l.content==m.content){return null}if(h[e]){h[e].beforeBookmark=c}if(k.custom_undo_redo_levels){if(h.length>k.custom_undo_redo_levels){for(j=0;j<h.length-1;j++){h[j]=h[j+1]}h.length--;e=h.length}}m.bookmark=f.selection.getBookmark(2,true);if(e<h.length-1){h.length=e+1}h.push(m);e=h.length-1;d.onAdd.dispatch(d,m);f.isNotDirty=0;return m},undo:function(){var k,j;if(d.typing){d.add();d.typing=false}if(e>0){k=h[--e];f.setContent(k.content,{format:"raw"});f.selection.moveToBookmark(k.beforeBookmark);d.onUndo.dispatch(d,k)}return k},redo:function(){var i;if(e<h.length-1){i=h[++e];f.setContent(i.content,{format:"raw"});f.selection.moveToBookmark(i.bookmark);d.onRedo.dispatch(d,i)}return i},clear:function(){h=[];e=0;d.typing=false},hasUndo:function(){return e>0||this.typing},hasRedo:function(){return e<h.length-1&&!this.typing}}}})(tinymce);(function(l){var j=l.dom.Event,c=l.isIE,a=l.isGecko,b=l.isOpera,i=l.each,h=l.extend,d=true,g=false;function k(o){var p,n,m;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(o.nodeName)){if(p){n=o.cloneNode(false);n.appendChild(p);p=n}else{p=m=o.cloneNode(false)}p.removeAttribute("id")}}while(o=o.parentNode);if(p){return{wrapper:p,inner:m}}}function f(n,o){var m=o.ownerDocument.createRange();m.setStart(n.endContainer,n.endOffset);m.setEndAfter(o);return m.cloneContents().textContent.length==0}function e(o,q,m){var n,p;if(q.isEmpty(m)){n=q.getParent(m,"ul,ol");if(!q.getParent(n.parentNode,"ul,ol")){q.split(n,m);p=q.create("p",0,'<br data-mce-bogus="1" />');q.replace(p,m);o.select(p,1)}return g}return d}l.create("tinymce.ForceBlocks",{ForceBlocks:function(m){var n=this,o=m.settings,p;n.editor=m;n.dom=m.dom;p=(o.forced_root_block||"p").toLowerCase();o.element=p.toUpperCase();m.onPreInit.add(n.setup,n)},setup:function(){var n=this,m=n.editor,p=m.settings,u=m.dom,o=m.selection,q=m.schema.getBlockElements();if(p.forced_root_block){function v(){var y=o.getStart(),t=m.getBody(),s,z,D,F,E,x,A,B=-16777215;if(!y||y.nodeType!==1){return}while(y!=t){if(q[y.nodeName]){return}y=y.parentNode}s=o.getRng();if(s.setStart){z=s.startContainer;D=s.startOffset;F=s.endContainer;E=s.endOffset}else{if(s.item){s=m.getDoc().body.createTextRange();s.moveToElementText(s.item(0))}tmpRng=s.duplicate();tmpRng.collapse(true);D=tmpRng.move("character",B)*-1;if(!tmpRng.collapsed){tmpRng=s.duplicate();tmpRng.collapse(false);E=(tmpRng.move("character",B)*-1)-D}}for(y=t.firstChild;y;y){if(y.nodeType===3||(y.nodeType==1&&!q[y.nodeName])){if(!x){x=u.create(p.forced_root_block);y.parentNode.insertBefore(x,y)}A=y;y=y.nextSibling;x.appendChild(A)}else{x=null;y=y.nextSibling}}if(s.setStart){s.setStart(z,D);s.setEnd(F,E);o.setRng(s)}else{try{s=m.getDoc().body.createTextRange();s.moveToElementText(t);s.collapse(true);s.moveStart("character",D);if(E>0){s.moveEnd("character",E)}s.select()}catch(C){}}m.nodeChanged()}m.onKeyUp.add(v);m.onClick.add(v)}if(p.force_br_newlines){if(c){m.onKeyPress.add(function(s,t){var x;if(t.keyCode==13&&o.getNode().nodeName!="LI"){o.setContent('<br id="__" /> ',{format:"raw"});x=u.get("__");x.removeAttribute("id");o.select(x);o.collapse();return j.cancel(t)}})}}if(p.force_p_newlines){if(!c){m.onKeyPress.add(function(s,t){if(t.keyCode==13&&!t.shiftKey&&!n.insertPara(t)){j.cancel(t)}})}else{l.addUnload(function(){n._previousFormats=0});m.onKeyPress.add(function(s,t){n._previousFormats=0;if(t.keyCode==13&&!t.shiftKey&&s.selection.isCollapsed()&&p.keep_styles){n._previousFormats=k(s.selection.getStart())}});m.onKeyUp.add(function(t,y){if(y.keyCode==13&&!y.shiftKey){var x=t.selection.getStart(),s=n._previousFormats;if(!x.hasChildNodes()&&s){x=u.getParent(x,u.isBlock);if(x&&x.nodeName!="LI"){x.innerHTML="";if(n._previousFormats){x.appendChild(s.wrapper);s.inner.innerHTML="\uFEFF"}else{x.innerHTML="\uFEFF"}o.select(x,1);o.collapse(true);t.getDoc().execCommand("Delete",false,null);n._previousFormats=0}}}})}if(a){m.onKeyDown.add(function(s,t){if((t.keyCode==8||t.keyCode==46)&&!t.shiftKey){n.backspaceDelete(t,t.keyCode==8)}})}}if(l.isWebKit){function r(t){var s=o.getRng(),x,A=u.create("div",null," "),z,y=u.getViewPort(t.getWin()).h;s.insertNode(x=u.create("br"));s.setStartAfter(x);s.setEndAfter(x);o.setRng(s);if(o.getSel().focusNode==x.previousSibling){o.select(u.insertAfter(u.doc.createTextNode("\u00a0"),x));o.collapse(d)}u.insertAfter(A,x);z=u.getPos(A).y;u.remove(A);if(z>y){t.getWin().scrollTo(0,z)}}m.onKeyPress.add(function(s,t){if(t.keyCode==13&&(t.shiftKey||(p.force_br_newlines&&!u.getParent(o.getNode(),"h1,h2,h3,h4,h5,h6,ol,ul")))){r(s);j.cancel(t)}})}if(c){if(p.element!="P"){m.onKeyPress.add(function(s,t){n.lastElm=o.getNode().nodeName});m.onKeyUp.add(function(t,x){var z,y=o.getNode(),s=t.getBody();if(s.childNodes.length===1&&y.nodeName=="P"){y=u.rename(y,p.element);o.select(y);o.collapse();t.nodeChanged()}else{if(x.keyCode==13&&!x.shiftKey&&n.lastElm!="P"){z=u.getParent(y,"p");if(z){u.rename(z,p.element);t.nodeChanged()}}}})}}},getParentBlock:function(o){var m=this.dom;return m.getParent(o,m.isBlock)},insertPara:function(Q){var E=this,v=E.editor,M=v.dom,R=v.getDoc(),V=v.settings,F=v.selection.getSel(),G=F.getRangeAt(0),U=R.body;var J,K,H,O,N,q,o,u,z,m,C,T,p,x,I,L=M.getViewPort(v.getWin()),B,D,A;v.undoManager.beforeChange();J=R.createRange();J.setStart(F.anchorNode,F.anchorOffset);J.collapse(d);K=R.createRange();K.setStart(F.focusNode,F.focusOffset);K.collapse(d);H=J.compareBoundaryPoints(J.START_TO_END,K)<0;O=H?F.anchorNode:F.focusNode;N=H?F.anchorOffset:F.focusOffset;q=H?F.focusNode:F.anchorNode;o=H?F.focusOffset:F.anchorOffset;if(O===q&&/^(TD|TH)$/.test(O.nodeName)){if(O.firstChild.nodeName=="BR"){M.remove(O.firstChild)}if(O.childNodes.length==0){v.dom.add(O,V.element,null,"<br />");T=v.dom.add(O,V.element,null,"<br />")}else{I=O.innerHTML;O.innerHTML="";v.dom.add(O,V.element,null,I);T=v.dom.add(O,V.element,null,"<br />")}G=R.createRange();G.selectNodeContents(T);G.collapse(1);v.selection.setRng(G);return g}if(O==U&&q==U&&U.firstChild&&v.dom.isBlock(U.firstChild)){O=q=O.firstChild;N=o=0;J=R.createRange();J.setStart(O,0);K=R.createRange();K.setStart(q,0)}if(!R.body.hasChildNodes()){R.body.appendChild(M.create("br"))}O=O.nodeName=="HTML"?R.body:O;O=O.nodeName=="BODY"?O.firstChild:O;q=q.nodeName=="HTML"?R.body:q;q=q.nodeName=="BODY"?q.firstChild:q;u=E.getParentBlock(O);z=E.getParentBlock(q);m=u?u.nodeName:V.element;if(I=E.dom.getParent(u,"li,pre")){if(I.nodeName=="LI"){return e(v.selection,E.dom,I)}return d}if(u&&(u.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(M.getStyle(u,"position",1)))){m=V.element;u=null}if(z&&(z.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(M.getStyle(u,"position",1)))){m=V.element;z=null}if(/(TD|TABLE|TH|CAPTION)/.test(m)||(u&&m=="DIV"&&/left|right/gi.test(M.getStyle(u,"float",1)))){m=V.element;u=z=null}C=(u&&u.nodeName==m)?u.cloneNode(0):v.dom.create(m);T=(z&&z.nodeName==m)?z.cloneNode(0):v.dom.create(m);T.removeAttribute("id");if(/^(H[1-6])$/.test(m)&&f(G,u)){T=v.dom.create(V.element)}I=p=O;do{if(I==U||I.nodeType==9||E.dom.isBlock(I)||/(TD|TABLE|TH|CAPTION)/.test(I.nodeName)){break}p=I}while((I=I.previousSibling?I.previousSibling:I.parentNode));I=x=q;do{if(I==U||I.nodeType==9||E.dom.isBlock(I)||/(TD|TABLE|TH|CAPTION)/.test(I.nodeName)){break}x=I}while((I=I.nextSibling?I.nextSibling:I.parentNode));if(p.nodeName==m){J.setStart(p,0)}else{J.setStartBefore(p)}J.setEnd(O,N);C.appendChild(J.cloneContents()||R.createTextNode(""));try{K.setEndAfter(x)}catch(P){}K.setStart(q,o);T.appendChild(K.cloneContents()||R.createTextNode(""));G=R.createRange();if(!p.previousSibling&&p.parentNode.nodeName==m){G.setStartBefore(p.parentNode)}else{if(J.startContainer.nodeName==m&&J.startOffset==0){G.setStartBefore(J.startContainer)}else{G.setStart(J.startContainer,J.startOffset)}}if(!x.nextSibling&&x.parentNode.nodeName==m){G.setEndAfter(x.parentNode)}else{G.setEnd(K.endContainer,K.endOffset)}G.deleteContents();if(b){v.getWin().scrollTo(0,L.y)}if(C.firstChild&&C.firstChild.nodeName==m){C.innerHTML=C.firstChild.innerHTML}if(T.firstChild&&T.firstChild.nodeName==m){T.innerHTML=T.firstChild.innerHTML}function S(y,s){var r=[],X,W,t;y.innerHTML="";if(V.keep_styles){W=s;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(W.nodeName)){X=W.cloneNode(g);M.setAttrib(X,"id","");r.push(X)}}while(W=W.parentNode)}if(r.length>0){for(t=r.length-1,X=y;t>=0;t--){X=X.appendChild(r[t])}r[0].innerHTML=b?"\u00a0":"<br />";return r[0]}else{y.innerHTML=b?"\u00a0":"<br />"}}if(M.isEmpty(C)){S(C,O)}if(M.isEmpty(T)){A=S(T,q)}if(b&&parseFloat(opera.version())<9.5){G.insertNode(C);G.insertNode(T)}else{G.insertNode(T);G.insertNode(C)}T.normalize();C.normalize();v.selection.select(T,true);v.selection.collapse(true);B=v.dom.getPos(T).y;if(B<L.y||B+25>L.y+L.h){v.getWin().scrollTo(0,B<L.y?B:B-L.h+25)}v.undoManager.add();return g},backspaceDelete:function(u,B){var C=this,s=C.editor,y=s.getBody(),q=s.dom,p,v=s.selection,o=v.getRng(),x=o.startContainer,p,z,A,m;if(!B&&o.collapsed&&x.nodeType==1&&o.startOffset==x.childNodes.length){m=new l.dom.TreeWalker(x.lastChild,x);for(p=x.lastChild;p;p=m.prev()){if(p.nodeType==3){o.setStart(p,p.nodeValue.length);o.collapse(true);v.setRng(o);return}}}if(x&&s.dom.isBlock(x)&&!/^(TD|TH)$/.test(x.nodeName)&&B){if(x.childNodes.length==0||(x.childNodes.length==1&&x.firstChild.nodeName=="BR")){p=x;while((p=p.previousSibling)&&!s.dom.isBlock(p)){}if(p){if(x!=y.firstChild){z=s.dom.doc.createTreeWalker(p,NodeFilter.SHOW_TEXT,null,g);while(A=z.nextNode()){p=A}o=s.getDoc().createRange();o.setStart(p,p.nodeValue?p.nodeValue.length:0);o.setEnd(p,p.nodeValue?p.nodeValue.length:0);v.setRng(o);s.dom.remove(x)}return j.cancel(u)}}}}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each,e=c.extend;c.create("tinymce.ControlManager",{ControlManager:function(f,j){var h=this,g;j=j||{};h.editor=f;h.controls={};h.onAdd=new c.util.Dispatcher(h);h.onPostRender=new c.util.Dispatcher(h);h.prefix=j.prefix||f.id+"_";h._cls={};h.onPostRender.add(function(){d(h.controls,function(i){i.postRender()})})},get:function(f){return this.controls[this.prefix+f]||this.controls[f]},setActive:function(h,f){var g=null;if(g=this.get(h)){g.setActive(f)}return g},setDisabled:function(h,f){var g=null;if(g=this.get(h)){g.setDisabled(f)}return g},add:function(g){var f=this;if(g){f.controls[g.id]=g;f.onAdd.dispatch(g,f)}return g},createControl:function(i){var h,g=this,f=g.editor;d(f.plugins,function(j){if(j.createControl){h=j.createControl(i,g);if(h){return false}}});switch(i){case"|":case"separator":return g.createSeparator()}if(!h&&f.buttons&&(h=f.buttons[i])){return g.createButton(i,h)}return g.add(h)},createDropMenu:function(f,n,h){var m=this,i=m.editor,j,g,k,l;n=e({"class":"mceDropDown",constrain:i.settings.constrain_menus},n);n["class"]=n["class"]+" "+i.getParam("skin")+"Skin";if(k=i.getParam("skin_variant")){n["class"]+=" "+i.getParam("skin")+"Skin"+k.substring(0,1).toUpperCase()+k.substring(1)}f=m.prefix+f;l=h||m._cls.dropmenu||c.ui.DropMenu;j=m.controls[f]=new l(f,n);j.onAddItem.add(function(r,q){var p=q.settings;p.title=i.getLang(p.title,p.title);if(!p.onclick){p.onclick=function(o){if(p.cmd){i.execCommand(p.cmd,p.ui||false,p.value)}}}});i.onRemove.add(function(){j.destroy()});if(c.isIE){j.onShowMenu.add(function(){i.focus();g=i.selection.getBookmark(1)});j.onHideMenu.add(function(){if(g){i.selection.moveToBookmark(g);g=0}})}return m.add(j)},createListBox:function(f,n,h){var l=this,j=l.editor,i,k,m;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,scope:n.scope,control_manager:l},n);f=l.prefix+f;function g(o){return o.settings.use_accessible_selects&&!c.isGecko}if(j.settings.use_native_selects||g(j)){k=new c.ui.NativeListBox(f,n)}else{m=h||l._cls.listbox||c.ui.ListBox;k=new m(f,n,j)}l.controls[f]=k;if(c.isWebKit){k.onPostRender.add(function(p,o){a.add(o,"mousedown",function(){j.bookmark=j.selection.getBookmark(1)});a.add(o,"focus",function(){j.selection.moveToBookmark(j.bookmark);j.bookmark=null})})}if(k.hideMenu){j.onMouseDown.add(k.hideMenu,k)}return l.add(k)},createButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.label=g.translate(i.label);i.scope=i.scope||g;if(!i.onclick&&!i.menu_button){i.onclick=function(){g.execCommand(i.cmd,i.ui||false,i.value)}}i=e({title:i.title,"class":"mce_"+m,unavailable_prefix:g.getLang("unavailable",""),scope:i.scope,control_manager:h},i);m=h.prefix+m;if(i.menu_button){f=l||h._cls.menubutton||c.ui.MenuButton;k=new f(m,i,g);g.onMouseDown.add(k.hideMenu,k)}else{f=h._cls.button||c.ui.Button;k=new f(m,i,g)}return h.add(k)},createMenuButton:function(h,f,g){f=f||{};f.menu_button=1;return this.createButton(h,f,g)},createSplitButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onclick){i.onclick=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;f=l||h._cls.splitbutton||c.ui.SplitButton;k=h.add(new f(m,i,g));g.onMouseDown.add(k.hideMenu,k);return k},createColorSplitButton:function(f,n,h){var l=this,j=l.editor,i,k,m,g;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onclick){n.onclick=function(o){if(c.isIE){g=j.selection.getBookmark(1)}j.execCommand(n.cmd,n.ui||false,o||n.value)}}if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,menu_class:j.getParam("skin")+"Skin",scope:n.scope,more_colors_title:j.getLang("more_colors")},n);f=l.prefix+f;m=h||l._cls.colorsplitbutton||c.ui.ColorSplitButton;k=new m(f,n,j);j.onMouseDown.add(k.hideMenu,k);j.onRemove.add(function(){k.destroy()});if(c.isIE){k.onShowMenu.add(function(){j.focus();g=j.selection.getBookmark(1)});k.onHideMenu.add(function(){if(g){j.selection.moveToBookmark(g);g=0}})}return l.add(k)},createToolbar:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||g._cls.toolbar||c.ui.Toolbar;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createToolbarGroup:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||this._cls.toolbarGroup||c.ui.ToolbarGroup;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createSeparator:function(g){var f=g||this._cls.separator||c.ui.Separator;return new f()},setControlType:function(g,f){return this._cls[g.toLowerCase()]=f},destroy:function(){d(this.controls,function(f){f.destroy()});this.controls=null}})})(tinymce);(function(d){var a=d.util.Dispatcher,e=d.each,c=d.isIE,b=d.isOpera;d.create("tinymce.WindowManager",{WindowManager:function(f){var g=this;g.editor=f;g.onOpen=new a(g);g.onClose=new a(g);g.params={};g.features={}},open:function(z,h){var v=this,k="",n,m,i=v.editor.settings.dialog_type=="modal",q,o,j,g=d.DOM.getViewPort(),r;z=z||{};h=h||{};o=b?g.w:screen.width;j=b?g.h:screen.height;z.name=z.name||"mc_"+new Date().getTime();z.width=parseInt(z.width||320);z.height=parseInt(z.height||240);z.resizable=true;z.left=z.left||parseInt(o/2)-(z.width/2);z.top=z.top||parseInt(j/2)-(z.height/2);h.inline=false;h.mce_width=z.width;h.mce_height=z.height;h.mce_auto_focus=z.auto_focus;if(i){if(c){z.center=true;z.help=false;z.dialogWidth=z.width+"px";z.dialogHeight=z.height+"px";z.scroll=z.scrollbars||false}}e(z,function(p,f){if(d.is(p,"boolean")){p=p?"yes":"no"}if(!/^(name|url)$/.test(f)){if(c&&i){k+=(k?";":"")+f+":"+p}else{k+=(k?",":"")+f+"="+p}}});v.features=z;v.params=h;v.onOpen.dispatch(v,z,h);r=z.url||z.file;r=d._addVer(r);try{if(c&&i){q=1;window.showModalDialog(r,window,k)}else{q=window.open(r,z.name,k)}}catch(l){}if(!q){alert(v.editor.getLang("popup_blocked"))}},close:function(f){f.close();this.onClose.dispatch(this)},createInstance:function(i,h,g,m,l,k){var j=d.resolve(i);return new j(h,g,m,l,k)},confirm:function(h,f,i,g){g=g||window;f.call(i||this,g.confirm(this._decode(this.editor.getLang(h,h))))},alert:function(h,f,j,g){var i=this;g=g||window;g.alert(i._decode(i.editor.getLang(h,h)));if(f){f.call(j||i)}},resizeBy:function(f,g,h){h.resizeBy(f,g)},_decode:function(f){return d.DOM.decode(f).replace(/\\n/g,"\n")}})}(tinymce));(function(a){a.Formatter=function(U){var M={},O=a.each,c=U.dom,q=U.selection,t=a.dom.TreeWalker,K=new a.dom.RangeUtils(c),d=U.schema.isValidChild,F=c.isBlock,l=U.settings.forced_root_block,s=c.nodeIndex,E="\uFEFF",e=/^(src|href|style)$/,R=false,B=true,p;function z(V){return V instanceof Array}function m(W,V){return c.getParents(W,V,c.getRoot())}function b(V){return V.nodeType===1&&(V.face==="mceinline"||V.style.fontFamily==="mceinline")}function Q(V){return V?M[V]:M}function k(V,W){if(V){if(typeof(V)!=="string"){O(V,function(Y,X){k(X,Y)})}else{W=W.length?W:[W];O(W,function(X){if(X.deep===p){X.deep=!X.selector}if(X.split===p){X.split=!X.selector||X.inline}if(X.remove===p&&X.selector&&!X.inline){X.remove="none"}if(X.selector&&X.inline){X.mixed=true;X.block_expand=true}if(typeof(X.classes)==="string"){X.classes=X.classes.split(/\s+/)}});M[V]=W}}}var i=function(W){var V;U.dom.getParent(W,function(X){V=U.dom.getStyle(X,"text-decoration");return V&&V!=="none"});return V};var I=function(V){var W;if(V.nodeType===1&&V.parentNode&&V.parentNode.nodeType===1){W=i(V.parentNode);if(U.dom.getStyle(V,"color")&&W){U.dom.setStyle(V,"text-decoration",W)}else{if(U.dom.getStyle(V,"textdecoration")===W){U.dom.setStyle(V,"text-decoration",null)}}}};function S(Y,ag,ab){var ac=Q(Y),ah=ac[0],af,W,ae,ad=q.isCollapsed();function Z(al){var ak=al.startContainer,ao=al.startOffset,an,am;if(ak.nodeType==1||ak.nodeValue===""){ak=ak.nodeType==1?ak.childNodes[ao]:ak;if(ak){an=new t(ak,ak.parentNode);for(am=an.current();am;am=an.next()){if(am.nodeType==3&&!f(am)){al.setStart(am,0);break}}}}return al}function V(al,ak){ak=ak||ah;if(al){if(ak.onformat){ak.onformat(al,ak,ag,ab)}O(ak.styles,function(an,am){c.setStyle(al,am,r(an,ag))});O(ak.attributes,function(an,am){c.setAttrib(al,am,r(an,ag))});O(ak.classes,function(am){am=r(am,ag);if(!c.hasClass(al,am)){c.addClass(al,am)}})}}function aa(){function am(at,aq){var ar=new t(aq);for(ab=ar.current();ab;ab=ar.prev()){if(ab.childNodes.length>1||ab==at){return ab}}}var al=U.selection.getRng();var ap=al.startContainer;var ak=al.endContainer;if(ap!=ak&&al.endOffset==0){var ao=am(ap,ak);var an=ao.nodeType==3?ao.length:ao.childNodes.length;al.setEnd(ao,an)}return al}function X(an,at,aq,ap,al){var ak=[],am=-1,ar,av=-1,ao=-1,au;O(an.childNodes,function(ax,aw){if(ax.nodeName==="UL"||ax.nodeName==="OL"){am=aw;ar=ax;return false}});O(an.childNodes,function(ax,aw){if(ax.nodeName==="SPAN"&&c.getAttrib(ax,"data-mce-type")=="bookmark"){if(ax.id==at.id+"_start"){av=aw}else{if(ax.id==at.id+"_end"){ao=aw}}}});if(am<=0||(av<am&&ao>am)){O(a.grep(an.childNodes),al);return 0}else{au=aq.cloneNode(R);O(a.grep(an.childNodes),function(ax,aw){if((av<am&&aw<am)||(av>am&&aw>am)){ak.push(ax);ax.parentNode.removeChild(ax)}});if(av<am){an.insertBefore(au,ar)}else{if(av>am){an.insertBefore(au,ar.nextSibling)}}ap.push(au);O(ak,function(aw){au.appendChild(aw)});return au}}function ai(al,an,ap){var ak=[],ao,am;ao=ah.inline||ah.block;am=c.create(ao);V(am);K.walk(al,function(aq){var ar;function at(au){var ax=au.nodeName.toLowerCase(),aw=au.parentNode.nodeName.toLowerCase(),av;if(g(ax,"br")){ar=0;if(ah.block){c.remove(au)}return}if(ah.wrapper&&x(au,Y,ag)){ar=0;return}if(ah.block&&!ah.wrapper&&G(ax)){au=c.rename(au,ao);V(au);ak.push(au);ar=0;return}if(ah.selector){O(ac,function(ay){if("collapsed" in ay&&ay.collapsed!==ad){return}if(c.is(au,ay.selector)&&!b(au)){V(au,ay);av=true}});if(!ah.inline||av){ar=0;return}}if(d(ao,ax)&&d(aw,ao)&&!(!ap&&au.nodeType===3&&au.nodeValue.length===1&&au.nodeValue.charCodeAt(0)===65279)&&au.id!=="_mce_caret"){if(!ar){ar=am.cloneNode(R);au.parentNode.insertBefore(ar,au);ak.push(ar)}ar.appendChild(au)}else{if(ax=="li"&&an){ar=X(au,an,am,ak,at)}else{ar=0;O(a.grep(au.childNodes),at);ar=0}}}O(aq,at)});if(ah.wrap_links===false){O(ak,function(aq){function ar(aw){var av,au,at;if(aw.nodeName==="A"){au=am.cloneNode(R);ak.push(au);at=a.grep(aw.childNodes);for(av=0;av<at.length;av++){au.appendChild(at[av])}aw.appendChild(au)}O(a.grep(aw.childNodes),ar)}ar(aq)})}O(ak,function(at){var aq;function au(aw){var av=0;O(aw.childNodes,function(ax){if(!f(ax)&&!H(ax)){av++}});return av}function ar(av){var ax,aw;O(av.childNodes,function(ay){if(ay.nodeType==1&&!H(ay)&&!b(ay)){ax=ay;return R}});if(ax&&h(ax,ah)){aw=ax.cloneNode(R);V(aw);c.replace(aw,av,B);c.remove(ax,1)}return aw||av}aq=au(at);if((ak.length>1||!F(at))&&aq===0){c.remove(at,1);return}if(ah.inline||ah.wrapper){if(!ah.exact&&aq===1){at=ar(at)}O(ac,function(av){O(c.select(av.inline,at),function(ax){var aw;if(av.wrap_links===false){aw=ax.parentNode;do{if(aw.nodeName==="A"){return}}while(aw=aw.parentNode)}T(av,ag,ax,av.exact?ax:null)})});if(x(at.parentNode,Y,ag)){c.remove(at,1);at=0;return B}if(ah.merge_with_parents){c.getParent(at.parentNode,function(av){if(x(av,Y,ag)){c.remove(at,1);at=0;return B}})}if(at&&ah.merge_siblings!==false){at=u(C(at),at);at=u(at,C(at,B))}}})}if(ah){if(ab){if(ab.nodeType){W=c.createRng();W.setStartBefore(ab);W.setEndAfter(ab);ai(o(W,ac),null,true)}else{ai(ab,null,true)}}else{if(!ad||!ah.inline||c.select("td.mceSelected,th.mceSelected").length){var aj=U.selection.getNode();U.selection.setRng(aa());af=q.getBookmark();ai(o(q.getRng(B),ac),af);if(ah.styles&&(ah.styles.color||ah.styles.textDecoration)){a.walk(aj,I,"childNodes");I(aj)}q.moveToBookmark(af);q.setRng(Z(q.getRng(B)));U.nodeChanged()}else{P("apply",Y,ag)}}}}function A(X,ag,aa){var ab=Q(X),ai=ab[0],af,ae,W;function Z(al){var ak=al.startContainer,aq=al.startOffset,ap,ao,am,an;if(ak.nodeType==3&&aq>=ak.nodeValue.length-1){ak=ak.parentNode;aq=s(ak)+1}if(ak.nodeType==1){am=ak.childNodes;ak=am[Math.min(aq,am.length-1)];ap=new t(ak);if(aq>am.length-1){ap.next()}for(ao=ap.current();ao;ao=ap.next()){if(ao.nodeType==3&&!f(ao)){an=c.create("a",null,E);ao.parentNode.insertBefore(an,ao);al.setStart(ao,0);q.setRng(al);c.remove(an);return}}}}function Y(an){var am,al,ak;am=a.grep(an.childNodes);for(al=0,ak=ab.length;al<ak;al++){if(T(ab[al],ag,an,an)){break}}if(ai.deep){for(al=0,ak=am.length;al<ak;al++){Y(am[al])}}}function ac(ak){var al;O(m(ak.parentNode).reverse(),function(am){var an;if(!al&&am.id!="_start"&&am.id!="_end"){an=x(am,X,ag);if(an&&an.split!==false){al=am}}});return al}function V(an,ak,ap,at){var au,ar,aq,am,ao,al;if(an){al=an.parentNode;for(au=ak.parentNode;au&&au!=al;au=au.parentNode){ar=au.cloneNode(R);for(ao=0;ao<ab.length;ao++){if(T(ab[ao],ag,ar,ar)){ar=0;break}}if(ar){if(aq){ar.appendChild(aq)}if(!am){am=ar}aq=ar}}if(at&&(!ai.mixed||!F(an))){ak=c.split(an,ak)}if(aq){ap.parentNode.insertBefore(aq,ap);am.appendChild(ap)}}return ak}function ah(ak){return V(ac(ak),ak,ak,true)}function ad(am){var al=c.get(am?"_start":"_end"),ak=al[am?"firstChild":"lastChild"];if(H(ak)){ak=ak[am?"firstChild":"lastChild"]}c.remove(al,true);return ak}function aj(ak){var al,am;ak=o(ak,ab,B);if(ai.split){al=J(ak,B);am=J(ak);if(al!=am){al=N(al,"span",{id:"_start","data-mce-type":"bookmark"});am=N(am,"span",{id:"_end","data-mce-type":"bookmark"});ah(al);ah(am);al=ad(B);am=ad()}else{al=am=ah(al)}ak.startContainer=al.parentNode;ak.startOffset=s(al);ak.endContainer=am.parentNode;ak.endOffset=s(am)+1}K.walk(ak,function(an){O(an,function(ao){Y(ao);if(ao.nodeType===1&&U.dom.getStyle(ao,"text-decoration")==="underline"&&ao.parentNode&&i(ao.parentNode)==="underline"){T({deep:false,exact:true,inline:"span",styles:{textDecoration:"underline"}},null,ao)}})})}if(aa){if(aa.nodeType){W=c.createRng();W.setStartBefore(aa);W.setEndAfter(aa);aj(W)}else{aj(aa)}return}if(!q.isCollapsed()||!ai.inline||c.select("td.mceSelected,th.mceSelected").length){af=q.getBookmark();aj(q.getRng(B));q.moveToBookmark(af);if(ai.inline&&j(X,ag,q.getStart())){Z(q.getRng(true))}U.nodeChanged()}else{P("remove",X,ag)}if(a.isWebKit){U.execCommand("mceCleanup")}}function D(W,Y,X){var V=Q(W);if(j(W,Y,X)&&(!("toggle" in V[0])||V[0]["toggle"])){A(W,Y,X)}else{S(W,Y,X)}}function x(W,V,ab,Z){var X=Q(V),ac,aa,Y;function ad(ah,aj,ak){var ag,ai,ae=aj[ak],af;if(aj.onmatch){return aj.onmatch(ah,aj,ak)}if(ae){if(ae.length===p){for(ag in ae){if(ae.hasOwnProperty(ag)){if(ak==="attributes"){ai=c.getAttrib(ah,ag)}else{ai=L(ah,ag)}if(Z&&!ai&&!aj.exact){return}if((!Z||aj.exact)&&!g(ai,r(ae[ag],ab))){return}}}}else{for(af=0;af<ae.length;af++){if(ak==="attributes"?c.getAttrib(ah,ae[af]):L(ah,ae[af])){return aj}}}}return aj}if(X&&W){for(aa=0;aa<X.length;aa++){ac=X[aa];if(h(W,ac)&&ad(W,ac,"attributes")&&ad(W,ac,"styles")){if(Y=ac.classes){for(aa=0;aa<Y.length;aa++){if(!c.hasClass(W,Y[aa])){return}}}return ac}}}}function j(X,Z,Y){var W;function V(aa){aa=c.getParent(aa,function(ab){return !!x(ab,X,Z,true)});return x(aa,X,Z)}if(Y){return V(Y)}Y=q.getNode();if(V(Y)){return B}W=q.getStart();if(W!=Y){if(V(W)){return B}}return R}function v(ac,ab){var Z,aa=[],Y={},X,W,V;Z=q.getStart();c.getParent(Z,function(af){var ae,ad;for(ae=0;ae<ac.length;ae++){ad=ac[ae];if(!Y[ad]&&x(af,ad,ab)){Y[ad]=true;aa.push(ad)}}});return aa}function y(Z){var ab=Q(Z),Y,X,aa,W,V;if(ab){Y=q.getStart();X=m(Y);for(W=ab.length-1;W>=0;W--){V=ab[W].selector;if(!V){return B}for(aa=X.length-1;aa>=0;aa--){if(c.is(X[aa],V)){return B}}}}return R}a.extend(this,{get:Q,register:k,apply:S,remove:A,toggle:D,match:j,matchAll:v,matchNode:x,canApply:y});function h(V,W){if(g(V,W.inline)){return B}if(g(V,W.block)){return B}if(W.selector){return c.is(V,W.selector)}}function g(W,V){W=W||"";V=V||"";W=""+(W.nodeName||W);V=""+(V.nodeName||V);return W.toLowerCase()==V.toLowerCase()}function L(W,V){var X=c.getStyle(W,V);if(V=="color"||V=="backgroundColor"){X=c.toHex(X)}if(V=="fontWeight"&&X==700){X="bold"}return""+X}function r(V,W){if(typeof(V)!="string"){V=V(W)}else{if(W){V=V.replace(/%(\w+)/g,function(Y,X){return W[X]||Y})}}return V}function f(V){return V&&V.nodeType===3&&/^([\t \r\n]+|)$/.test(V.nodeValue)}function N(X,W,V){var Y=c.create(W,V);X.parentNode.insertBefore(Y,X);Y.appendChild(X);return Y}function o(V,ah,Y){var X=V.startContainer,ac=V.startOffset,ak=V.endContainer,ae=V.endOffset,aj,ag,ab,af;function ai(aq){var al,ao,ap,an,am;al=ao=aq?X:ak;am=aq?"previousSibling":"nextSibling";root=c.getRoot();if(al.nodeType==3&&!f(al)){if(aq?ac>0:ae<al.nodeValue.length){return al}}for(;;){if(ao==root||(!ah[0].block_expand&&F(ao))){return ao}for(an=ao[am];an;an=an[am]){if(!H(an)&&!f(an)){return ao}}ao=ao.parentNode}return al}function aa(al,am){if(am===p){am=al.nodeType===3?al.length:al.childNodes.length}while(al&&al.hasChildNodes()){al=al.childNodes[am];if(al){am=al.nodeType===3?al.length:al.childNodes.length}}return{node:al,offset:am}}if(X.nodeType==1&&X.hasChildNodes()){ag=X.childNodes.length-1;X=X.childNodes[ac>ag?ag:ac];if(X.nodeType==3){ac=0}}if(ak.nodeType==1&&ak.hasChildNodes()){ag=ak.childNodes.length-1;ak=ak.childNodes[ae>ag?ag:ae-1];if(ak.nodeType==3){ae=ak.nodeValue.length}}if(H(X.parentNode)||H(X)){X=H(X)?X:X.parentNode;X=X.nextSibling||X;if(X.nodeType==3){ac=0}}if(H(ak.parentNode)||H(ak)){ak=H(ak)?ak:ak.parentNode;ak=ak.previousSibling||ak;if(ak.nodeType==3){ae=ak.length}}if(ah[0].inline){if(V.collapsed){function ad(am,aq,at){var ap,an,ar,al;function ao(av,ax){var ay,au,aw=av.nodeValue;if(typeof(ax)=="undefined"){ax=at?aw.length:0}if(at){ay=aw.lastIndexOf(" ",ax);au=aw.lastIndexOf("\u00a0",ax);ay=ay>au?ay:au;if(ay!==-1&&!Y){ay++}}else{ay=aw.indexOf(" ",ax);au=aw.indexOf("\u00a0",ax);ay=ay!==-1&&(au===-1||ay<au)?ay:au}return ay}if(am.nodeType===3){ar=ao(am,aq);if(ar!==-1){return{container:am,offset:ar}}al=am}ap=new t(am,c.getParent(am,F)||U.getBody());while(an=ap[at?"prev":"next"]()){if(an.nodeType===3){al=an;ar=ao(an);if(ar!==-1){return{container:an,offset:ar}}}else{if(F(an)){break}}}if(al){if(at){aq=0}else{aq=al.length}return{container:al,offset:aq}}}af=ad(X,ac,true);if(af){X=af.container;ac=af.offset}af=ad(ak,ae);if(af){ak=af.container;ae=af.offset}}ab=aa(ak,ae);if(ab.node){while(ab.node&&ab.offset===0&&ab.node.previousSibling){ab=aa(ab.node.previousSibling)}if(ab.node&&ab.offset>0&&ab.node.nodeType===3&&ab.node.nodeValue.charAt(ab.offset-1)===" "){if(ab.offset>1){ak=ab.node;ak.splitText(ab.offset-1)}else{if(ab.node.previousSibling){}}}}}if(ah[0].inline||ah[0].block_expand){if(!ah[0].inline||(X.nodeType!=3||ac===0)){X=ai(true)}if(!ah[0].inline||(ak.nodeType!=3||ae===ak.nodeValue.length)){ak=ai()}}if(ah[0].selector&&ah[0].expand!==R&&!ah[0].inline){function Z(am,al){var an,ao,aq,ap;if(am.nodeType==3&&am.nodeValue.length==0&&am[al]){am=am[al]}an=m(am);for(ao=0;ao<an.length;ao++){for(aq=0;aq<ah.length;aq++){ap=ah[aq];if("collapsed" in ap&&ap.collapsed!==V.collapsed){continue}if(c.is(an[ao],ap.selector)){return an[ao]}}}return am}X=Z(X,"previousSibling");ak=Z(ak,"nextSibling")}if(ah[0].block||ah[0].selector){function W(am,al,ao){var an;if(!ah[0].wrapper){an=c.getParent(am,ah[0].block)}if(!an){an=c.getParent(am.nodeType==3?am.parentNode:am,F)}if(an&&ah[0].wrapper){an=m(an,"ul,ol").reverse()[0]||an}if(!an){an=am;while(an[al]&&!F(an[al])){an=an[al];if(g(an,"br")){break}}}return an||am}X=W(X,"previousSibling");ak=W(ak,"nextSibling");if(ah[0].block){if(!F(X)){X=ai(true)}if(!F(ak)){ak=ai()}}}if(X.nodeType==1){ac=s(X);X=X.parentNode}if(ak.nodeType==1){ae=s(ak)+1;ak=ak.parentNode}return{startContainer:X,startOffset:ac,endContainer:ak,endOffset:ae}}function T(ab,aa,Y,V){var X,W,Z;if(!h(Y,ab)){return R}if(ab.remove!="all"){O(ab.styles,function(ad,ac){ad=r(ad,aa);if(typeof(ac)==="number"){ac=ad;V=0}if(!V||g(L(V,ac),ad)){c.setStyle(Y,ac,"")}Z=1});if(Z&&c.getAttrib(Y,"style")==""){Y.removeAttribute("style");Y.removeAttribute("data-mce-style")}O(ab.attributes,function(ae,ac){var ad;ae=r(ae,aa);if(typeof(ac)==="number"){ac=ae;V=0}if(!V||g(c.getAttrib(V,ac),ae)){if(ac=="class"){ae=c.getAttrib(Y,ac);if(ae){ad="";O(ae.split(/\s+/),function(af){if(/mce\w+/.test(af)){ad+=(ad?" ":"")+af}});if(ad){c.setAttrib(Y,ac,ad);return}}}if(ac=="class"){Y.removeAttribute("className")}if(e.test(ac)){Y.removeAttribute("data-mce-"+ac)}Y.removeAttribute(ac)}});O(ab.classes,function(ac){ac=r(ac,aa);if(!V||c.hasClass(V,ac)){c.removeClass(Y,ac)}});W=c.getAttribs(Y);for(X=0;X<W.length;X++){if(W[X].nodeName.indexOf("_")!==0){return R}}}if(ab.remove!="none"){n(Y,ab);return B}}function n(X,Y){var V=X.parentNode,W;if(Y.block){if(!l){function Z(ab,aa,ac){ab=C(ab,aa,ac);return !ab||(ab.nodeName=="BR"||F(ab))}if(F(X)&&!F(V)){if(!Z(X,R)&&!Z(X.firstChild,B,1)){X.insertBefore(c.create("br"),X.firstChild)}if(!Z(X,B)&&!Z(X.lastChild,R,1)){X.appendChild(c.create("br"))}}}else{if(V==c.getRoot()){if(!Y.list_block||!g(X,Y.list_block)){O(a.grep(X.childNodes),function(aa){if(d(l,aa.nodeName.toLowerCase())){if(!W){W=N(aa,l)}else{W.appendChild(aa)}}else{W=0}})}}}}if(Y.selector&&Y.inline&&!g(Y.inline,X)){return}c.remove(X,1)}function C(W,V,X){if(W){V=V?"nextSibling":"previousSibling";for(W=X?W:W[V];W;W=W[V]){if(W.nodeType==1||!f(W)){return W}}}}function H(V){return V&&V.nodeType==1&&V.getAttribute("data-mce-type")=="bookmark"}function u(Z,Y){var V,X,W;function ab(ae,ad){if(ae.nodeName!=ad.nodeName){return R}function ac(ag){var ah={};O(c.getAttribs(ag),function(ai){var aj=ai.nodeName.toLowerCase();if(aj.indexOf("_")!==0&&aj!=="style"){ah[aj]=c.getAttrib(ag,aj)}});return ah}function af(aj,ai){var ah,ag;for(ag in aj){if(aj.hasOwnProperty(ag)){ah=ai[ag];if(ah===p){return R}if(aj[ag]!=ah){return R}delete ai[ag]}}for(ag in ai){if(ai.hasOwnProperty(ag)){return R}}return B}if(!af(ac(ae),ac(ad))){return R}if(!af(c.parseStyle(c.getAttrib(ae,"style")),c.parseStyle(c.getAttrib(ad,"style")))){return R}return B}if(Z&&Y){function aa(ad,ac){for(X=ad;X;X=X[ac]){if(X.nodeType==3&&X.nodeValue.length!==0){return ad}if(X.nodeType==1&&!H(X)){return X}}return ad}Z=aa(Z,"previousSibling");Y=aa(Y,"nextSibling");if(ab(Z,Y)){for(X=Z.nextSibling;X&&X!=Y;){W=X;X=X.nextSibling;Z.appendChild(W)}c.remove(Y);O(a.grep(Y.childNodes),function(ac){Z.appendChild(ac)});return Z}}return Y}function G(V){return/^(h[1-6]|p|div|pre|address|dl|dt|dd)$/.test(V)}function J(W,aa){var V,Z,X,Y;V=W[aa?"startContainer":"endContainer"];Z=W[aa?"startOffset":"endOffset"];if(V.nodeType==1){X=V.childNodes.length-1;if(!aa&&Z){Z--}V=V.childNodes[Z>X?X:Z]}if(V.nodeType===3&&aa&&Z>=V.nodeValue.length){V=new t(V,U.getBody()).next()||V}if(V.nodeType===3&&!aa&&Z==0){V=new t(V,U.getBody()).prev()||V}return V}function P(ae,V,ac){var ah,af="_mce_caret",W=U.settings.caret_debug;ah=a.isGecko?"\u200B":E;function X(aj){var ai=c.create("span",{id:af,"data-mce-bogus":true,style:W?"color:red":""});if(aj){ai.appendChild(U.getDoc().createTextNode(ah))}return ai}function ad(aj,ai){while(aj){if((aj.nodeType===3&&aj.nodeValue!==ah)||aj.childNodes.length>1){return false}if(ai&&aj.nodeType===1){ai.push(aj)}aj=aj.firstChild}return true}function aa(ai){while(ai){if(ai.id===af){return ai}ai=ai.parentNode}}function Z(ai){var aj;if(ai){aj=new t(ai,ai);for(ai=aj.current();ai;ai=aj.next()){if(ai.nodeType===3){return ai}}}}function Y(ak,aj){var al,ai;if(!ak){ak=aa(q.getStart());if(!ak){while(ak=c.get(af)){Y(ak,false)}}}else{ai=q.getRng(true);if(ad(ak)){if(aj!==false){ai.setStartBefore(ak);ai.setEndBefore(ak)}c.remove(ak)}else{al=Z(ak);al=al.deleteData(0,1);c.remove(ak,1)}q.setRng(ai)}}function ab(){var ak,ai,ao,an,al,aj,am;ak=q.getRng(true);an=ak.startOffset;aj=ak.startContainer;am=aj.nodeValue;ai=aa(q.getStart());if(ai){ao=Z(ai)}if(am&&an>0&&an<am.length&&/\w/.test(am.charAt(an))&&/\w/.test(am.charAt(an-1))){al=q.getBookmark();ak.collapse(true);ak=o(ak,Q(V));ak=K.split(ak);S(V,ac,ak);q.moveToBookmark(al)}else{if(!ai||ao.nodeValue!==ah){ai=X(true);ao=ai.firstChild;ak.insertNode(ai);an=1;S(V,ac,ai)}else{S(V,ac,ai)}q.setCursorLocation(ao,an)}}function ag(){var ai=q.getRng(true),aj,al,ao,an,ak,ar,aq=[],am,ap;aj=ai.startContainer;al=ai.startOffset;ak=aj;if(aj.nodeType==3){if(al!=aj.nodeValue.length||aj.nodeValue===ah){an=true}ak=ak.parentNode}while(ak){if(x(ak,V,ac)){ar=ak;break}if(ak.nextSibling){an=true}aq.push(ak);ak=ak.parentNode}if(!ar){return}if(an){ao=q.getBookmark();ai.collapse(true);ai=o(ai,Q(V),true);ai=K.split(ai);A(V,ac,ai);q.moveToBookmark(ao)}else{ap=X();ak=ap;for(am=aq.length-1;am>=0;am--){ak.appendChild(aq[am].cloneNode(false));ak=ak.firstChild}ak.appendChild(c.doc.createTextNode(ah));ak=ak.firstChild;c.insertAfter(ap,ar);q.setCursorLocation(ak,1)}}U.onBeforeGetContent.addToTop(function(){var ai=[],aj;if(ad(aa(q.getStart()),ai)){aj=ai.length;while(aj--){c.setAttrib(ai[aj],"data-mce-bogus","1")}}});a.each("onMouseUp onKeyUp".split(" "),function(ai){U[ai].addToTop(function(){Y()})});U.onKeyDown.addToTop(function(ai,ak){var aj=ak.keyCode;if(aj==8||aj==37||aj==39){Y(aa(q.getStart()))}});if(ae=="apply"){ab()}else{ag()}}}})(tinymce);tinymce.onAddEditor.add(function(e,a){var d,h,g,c=a.settings;if(c.inline_styles){h=e.explode(c.font_size_legacy_values);function b(j,i){e.each(i,function(l,k){if(l){g.setStyle(j,k,l)}});g.rename(j,"span")}d={font:function(j,i){b(i,{backgroundColor:i.style.backgroundColor,color:i.color,fontFamily:i.face,fontSize:h[parseInt(i.size)-1]})},u:function(j,i){b(i,{textDecoration:"underline"})},strike:function(j,i){b(i,{textDecoration:"line-through"})}};function f(i,j){g=i.dom;if(c.convert_fonts_to_spans){e.each(g.select("font,u,strike",j.node),function(k){d[k.nodeName.toLowerCase()](a.dom,k)})}}a.onPreProcess.add(f);a.onSetContent.add(f);a.onInit.add(function(){a.selection.onSetContent.add(f)})}});
\ No newline at end of file
+(function(d){var a=/^\s*|\s*$/g,e,c="B".replace(/A(.)|B/,"$1")==="$1";var b={majorVersion:"3",minorVersion:"4.7",releaseDate:"2011-11-03",_init:function(){var s=this,q=document,o=navigator,g=o.userAgent,m,f,l,k,j,r;s.isOpera=d.opera&&opera.buildNumber;s.isWebKit=/WebKit/.test(g);s.isIE=!s.isWebKit&&!s.isOpera&&(/MSIE/gi).test(g)&&(/Explorer/gi).test(o.appName);s.isIE6=s.isIE&&/MSIE [56]/.test(g);s.isIE7=s.isIE&&/MSIE [7]/.test(g);s.isIE8=s.isIE&&/MSIE [8]/.test(g);s.isIE9=s.isIE&&/MSIE [9]/.test(g);s.isGecko=!s.isWebKit&&/Gecko/.test(g);s.isMac=g.indexOf("Mac")!=-1;s.isAir=/adobeair/i.test(g);s.isIDevice=/(iPad|iPhone)/.test(g);s.isIOS5=s.isIDevice&&g.match(/AppleWebKit\/(\d*)/)[1]>=534;if(d.tinyMCEPreInit){s.suffix=tinyMCEPreInit.suffix;s.baseURL=tinyMCEPreInit.base;s.query=tinyMCEPreInit.query;return}s.suffix="";f=q.getElementsByTagName("base");for(m=0;m<f.length;m++){if(r=f[m].href){if(/^https?:\/\/[^\/]+$/.test(r)){r+="/"}k=r?r.match(/.*\//)[0]:""}}function h(i){if(i.src&&/tiny_mce(|_gzip|_jquery|_prototype|_full)(_dev|_src)?.js/.test(i.src)){if(/_(src|dev)\.js/g.test(i.src)){s.suffix="_src"}if((j=i.src.indexOf("?"))!=-1){s.query=i.src.substring(j+1)}s.baseURL=i.src.substring(0,i.src.lastIndexOf("/"));if(k&&s.baseURL.indexOf("://")==-1&&s.baseURL.indexOf("/")!==0){s.baseURL=k+s.baseURL}return s.baseURL}return null}f=q.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}l=q.getElementsByTagName("head")[0];if(l){f=l.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}}return},is:function(g,f){if(!f){return g!==e}if(f=="array"&&(g.hasOwnProperty&&g instanceof Array)){return true}return typeof(g)==f},makeMap:function(f,j,h){var g;f=f||[];j=j||",";if(typeof(f)=="string"){f=f.split(j)}h=h||{};g=f.length;while(g--){h[f[g]]={}}return h},each:function(i,f,h){var j,g;if(!i){return 0}h=h||i;if(i.length!==e){for(j=0,g=i.length;j<g;j++){if(f.call(h,i[j],j,i)===false){return 0}}}else{for(j in i){if(i.hasOwnProperty(j)){if(f.call(h,i[j],j,i)===false){return 0}}}}return 1},map:function(g,h){var i=[];b.each(g,function(f){i.push(h(f))});return i},grep:function(g,h){var i=[];b.each(g,function(f){if(!h||h(f)){i.push(f)}});return i},inArray:function(g,h){var j,f;if(g){for(j=0,f=g.length;j<f;j++){if(g[j]===h){return j}}}return -1},extend:function(k,j){var h,g,f=arguments;for(h=1,g=f.length;h<g;h++){j=f[h];b.each(j,function(i,l){if(i!==e){k[l]=i}})}return k},trim:function(f){return(f?""+f:"").replace(a,"")},create:function(o,f,j){var n=this,g,i,k,l,h,m=0;o=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(o);k=o[3].match(/(^|\.)(\w+)$/i)[2];i=n.createNS(o[3].replace(/\.\w+$/,""),j);if(i[k]){return}if(o[2]=="static"){i[k]=f;if(this.onCreate){this.onCreate(o[2],o[3],i[k])}return}if(!f[k]){f[k]=function(){};m=1}i[k]=f[k];n.extend(i[k].prototype,f);if(o[5]){g=n.resolve(o[5]).prototype;l=o[5].match(/\.(\w+)$/i)[1];h=i[k];if(m){i[k]=function(){return g[l].apply(this,arguments)}}else{i[k]=function(){this.parent=g[l];return h.apply(this,arguments)}}i[k].prototype[k]=i[k];n.each(g,function(p,q){i[k].prototype[q]=g[q]});n.each(f,function(p,q){if(g[q]){i[k].prototype[q]=function(){this.parent=g[q];return p.apply(this,arguments)}}else{if(q!=k){i[k].prototype[q]=p}}})}n.each(f["static"],function(p,q){i[k][q]=p});if(this.onCreate){this.onCreate(o[2],o[3],i[k].prototype)}},walk:function(i,h,j,g){g=g||this;if(i){if(j){i=i[j]}b.each(i,function(k,f){if(h.call(g,k,f,j)===false){return false}b.walk(k,h,j,g)})}},createNS:function(j,h){var g,f;h=h||d;j=j.split(".");for(g=0;g<j.length;g++){f=j[g];if(!h[f]){h[f]={}}h=h[f]}return h},resolve:function(j,h){var g,f;h=h||d;j=j.split(".");for(g=0,f=j.length;g<f;g++){h=h[j[g]];if(!h){break}}return h},addUnload:function(j,i){var h=this;j={func:j,scope:i||this};if(!h.unloads){function g(){var f=h.unloads,l,m;if(f){for(m in f){l=f[m];if(l&&l.func){l.func.call(l.scope,1)}}if(d.detachEvent){d.detachEvent("onbeforeunload",k);d.detachEvent("onunload",g)}else{if(d.removeEventListener){d.removeEventListener("unload",g,false)}}h.unloads=l=f=w=g=0;if(d.CollectGarbage){CollectGarbage()}}}function k(){var l=document;if(l.readyState=="interactive"){function f(){l.detachEvent("onstop",f);if(g){g()}l=0}if(l){l.attachEvent("onstop",f)}d.setTimeout(function(){if(l){l.detachEvent("onstop",f)}},0)}}if(d.attachEvent){d.attachEvent("onunload",g);d.attachEvent("onbeforeunload",k)}else{if(d.addEventListener){d.addEventListener("unload",g,false)}}h.unloads=[j]}else{h.unloads.push(j)}return j},removeUnload:function(i){var g=this.unloads,h=null;b.each(g,function(j,f){if(j&&j.func==i){g.splice(f,1);h=i;return false}});return h},explode:function(f,g){return f?b.map(f.split(g||","),b.trim):f},_addVer:function(g){var f;if(!this.query){return g}f=(g.indexOf("?")==-1?"?":"&")+this.query;if(g.indexOf("#")==-1){return g+f}return g.replace("#",f+"#")},_replace:function(h,f,g){if(c){return g.replace(h,function(){var l=f,j=arguments,k;for(k=0;k<j.length-2;k++){if(j[k]===e){l=l.replace(new RegExp("\\$"+k,"g"),"")}else{l=l.replace(new RegExp("\\$"+k,"g"),j[k])}}return l})}return g.replace(h,f)}};b._init();d.tinymce=d.tinyMCE=b})(window);(function(){if(!window.Prototype){return alert("Load prototype first!")}tinymce.extend(tinymce,{trim:function(b){return b?b.strip():""},inArray:function(b,c){return b&&b.indexOf?b.indexOf(c):-1}});var a={"tinymce.util.JSON":{},};tinymce.onCreate=function(b,e,d){tinymce.extend(d,a[e])}})();tinymce.create("tinymce.util.Dispatcher",{scope:null,listeners:null,Dispatcher:function(a){this.scope=a||this;this.listeners=[]},add:function(a,b){this.listeners.push({cb:a,scope:b||this.scope});return a},addToTop:function(a,b){this.listeners.unshift({cb:a,scope:b||this.scope});return a},remove:function(a){var b=this.listeners,c=null;tinymce.each(b,function(e,d){if(a==e.cb){c=a;b.splice(d,1);return false}});return c},dispatch:function(){var f,d=arguments,e,b=this.listeners,g;for(e=0;e<b.length;e++){g=b[e];f=g.cb.apply(g.scope,d);if(f===false){break}}return f}});(function(){var a=tinymce.each;tinymce.create("tinymce.util.URI",{URI:function(e,g){var f=this,i,d,c,h;e=tinymce.trim(e);g=f.settings=g||{};if(/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e)){f.source=e;return}if(e.indexOf("/")===0&&e.indexOf("//")!==0){e=(g.base_uri?g.base_uri.protocol||"http":"http")+"://mce_host"+e}if(!/^[\w-]*:?\/\//.test(e)){h=g.base_uri?g.base_uri.path:new tinymce.util.URI(location.href).directory;e=((g.base_uri&&g.base_uri.protocol)||"http")+"://mce_host"+f.toAbsPath(h,e)}e=e.replace(/@@/g,"(mce_at)");e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e);a(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],function(b,j){var k=e[j];if(k){k=k.replace(/\(mce_at\)/g,"@@")}f[b]=k});if(c=g.base_uri){if(!f.protocol){f.protocol=c.protocol}if(!f.userInfo){f.userInfo=c.userInfo}if(!f.port&&f.host=="mce_host"){f.port=c.port}if(!f.host||f.host=="mce_host"){f.host=c.host}f.source=""}},setPath:function(c){var b=this;c=/^(.*?)\/?(\w+)?$/.exec(c);b.path=c[0];b.directory=c[1];b.file=c[2];b.source="";b.getURI()},toRelative:function(b){var c=this,d;if(b==="./"){return b}b=new tinymce.util.URI(b,{base_uri:c});if((b.host!="mce_host"&&c.host!=b.host&&b.host)||c.port!=b.port||c.protocol!=b.protocol){return b.getURI()}d=c.toRelPath(c.path,b.path);if(b.query){d+="?"+b.query}if(b.anchor){d+="#"+b.anchor}return d},toAbsolute:function(b,c){var b=new tinymce.util.URI(b,{base_uri:this});return b.getURI(this.host==b.host&&this.protocol==b.protocol?c:0)},toRelPath:function(g,h){var c,f=0,d="",e,b;g=g.substring(0,g.lastIndexOf("/"));g=g.split("/");c=h.split("/");if(g.length>=c.length){for(e=0,b=g.length;e<b;e++){if(e>=c.length||g[e]!=c[e]){f=e+1;break}}}if(g.length<c.length){for(e=0,b=c.length;e<b;e++){if(e>=g.length||g[e]!=c[e]){f=e+1;break}}}if(f==1){return h}for(e=0,b=g.length-(f-1);e<b;e++){d+="../"}for(e=f-1,b=c.length;e<b;e++){if(e!=f-1){d+="/"+c[e]}else{d+=c[e]}}return d},toAbsPath:function(e,f){var c,b=0,h=[],d,g;d=/\/$/.test(f)?"/":"";e=e.split("/");f=f.split("/");a(e,function(i){if(i){h.push(i)}});e=h;for(c=f.length-1,h=[];c>=0;c--){if(f[c].length==0||f[c]=="."){continue}if(f[c]==".."){b++;continue}if(b>0){b--;continue}h.push(f[c])}c=e.length-b;if(c<=0){g=h.reverse().join("/")}else{g=e.slice(0,c).join("/")+"/"+h.reverse().join("/")}if(g.indexOf("/")!==0){g="/"+g}if(d&&g.lastIndexOf("/")!==g.length-1){g+=d}return g},getURI:function(d){var c,b=this;if(!b.source||d){c="";if(!d){if(b.protocol){c+=b.protocol+"://"}if(b.userInfo){c+=b.userInfo+"@"}if(b.host){c+=b.host}if(b.port){c+=":"+b.port}}if(b.path){c+=b.path}if(b.query){c+="?"+b.query}if(b.anchor){c+="#"+b.anchor}b.source=c}return b.source}})})();(function(){var a=tinymce.each;tinymce.create("static tinymce.util.Cookie",{getHash:function(d){var b=this.get(d),c;if(b){a(b.split("&"),function(e){e=e.split("=");c=c||{};c[unescape(e[0])]=unescape(e[1])})}return c},setHash:function(j,b,g,f,i,c){var h="";a(b,function(e,d){h+=(!h?"":"&")+escape(d)+"="+escape(e)});this.set(j,h,g,f,i,c)},get:function(i){var h=document.cookie,g,f=i+"=",d;if(!h){return}d=h.indexOf("; "+f);if(d==-1){d=h.indexOf(f);if(d!=0){return null}}else{d+=2}g=h.indexOf(";",d);if(g==-1){g=h.length}return unescape(h.substring(d+f.length,g))},set:function(i,b,g,f,h,c){document.cookie=i+"="+escape(b)+((g)?"; expires="+g.toGMTString():"")+((f)?"; path="+escape(f):"")+((h)?"; domain="+h:"")+((c)?"; secure":"")},remove:function(e,b){var c=new Date();c.setTime(c.getTime()-1000);this.set(e,"",c,b,c)}})})();(function(){function serialize(o,quote){var i,v,t;quote=quote||'"';if(o==null){return"null"}t=typeof o;if(t=="string"){v="\bb\tt\nn\ff\rr\"\"''\\\\";return quote+o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g,function(a,b){if(quote==='"'&&a==="'"){return a}i=v.indexOf(b);if(i+1){return"\\"+v.charAt(i+1)}a=b.charCodeAt().toString(16);return"\\u"+"0000".substring(a.length)+a})+quote}if(t=="object"){if(o.hasOwnProperty&&o instanceof Array){for(i=0,v="[";i<o.length;i++){v+=(i>0?",":"")+serialize(o[i],quote)}return v+"]"}v="{";for(i in o){if(o.hasOwnProperty(i)){v+=typeof o[i]!="function"?(v.length>1?","+quote:quote)+i+quote+":"+serialize(o[i],quote):""}}return v+"}"}return""+o}tinymce.util.JSON={serialize:serialize,parse:function(s){try{return eval("("+s+")")}catch(ex){}}}})();tinymce.create("static tinymce.util.XHR",{send:function(g){var a,e,b=window,h=0;g.scope=g.scope||this;g.success_scope=g.success_scope||g.scope;g.error_scope=g.error_scope||g.scope;g.async=g.async===false?false:true;g.data=g.data||"";function d(i){a=0;try{a=new ActiveXObject(i)}catch(c){}return a}a=b.XMLHttpRequest?new XMLHttpRequest():d("Microsoft.XMLHTTP")||d("Msxml2.XMLHTTP");if(a){if(a.overrideMimeType){a.overrideMimeType(g.content_type)}a.open(g.type||(g.data?"POST":"GET"),g.url,g.async);if(g.content_type){a.setRequestHeader("Content-Type",g.content_type)}a.setRequestHeader("X-Requested-With","XMLHttpRequest");a.send(g.data);function f(){if(!g.async||a.readyState==4||h++>10000){if(g.success&&h<10000&&a.status==200){g.success.call(g.success_scope,""+a.responseText,a,g)}else{if(g.error){g.error.call(g.error_scope,h>10000?"TIMED_OUT":"GENERAL",a,g)}}a=null}else{b.setTimeout(f,10)}}if(!g.async){return f()}e=b.setTimeout(f,10)}}});(function(){var c=tinymce.extend,b=tinymce.util.JSON,a=tinymce.util.XHR;tinymce.create("tinymce.util.JSONRequest",{JSONRequest:function(d){this.settings=c({},d);this.count=0},send:function(f){var e=f.error,d=f.success;f=c(this.settings,f);f.success=function(h,g){h=b.parse(h);if(typeof(h)=="undefined"){h={error:"JSON Parse error."}}if(h.error){e.call(f.error_scope||f.scope,h.error,g)}else{d.call(f.success_scope||f.scope,h.result)}};f.error=function(h,g){if(e){e.call(f.error_scope||f.scope,h,g)}};f.data=b.serialize({id:f.id||"c"+(this.count++),method:f.method,params:f.params});f.content_type="application/json";a.send(f)},"static":{sendRPC:function(d){return new tinymce.util.JSONRequest().send(d)}}})}());(function(a){a.VK={DELETE:46,BACKSPACE:8,ENTER:13,TAB:9,SPACEBAR:32,UP:38,DOWN:40}})(tinymce);(function(k){var i=k.VK,j=i.BACKSPACE,h=i.DELETE;function c(m){var o=m.dom,n=m.selection;m.onKeyDown.add(function(q,u){var p,v,s,t,r;r=u.keyCode==h;if(r||u.keyCode==j){u.preventDefault();p=n.getRng();v=o.getParent(p.startContainer,o.isBlock);if(r){v=o.getNext(v,o.isBlock)}if(v){s=v.firstChild;while(s&&s.nodeType==3&&s.nodeValue.length==0){s=s.nextSibling}if(s&&s.nodeName==="SPAN"){t=s.cloneNode(false)}}q.getDoc().execCommand(r?"ForwardDelete":"Delete",false,null);v=o.getParent(p.startContainer,o.isBlock);k.each(o.select("span.Apple-style-span,font.Apple-style-span",v),function(x){var y=n.getBookmark();if(t){o.replace(t.cloneNode(false),x,true)}else{o.remove(x,true)}n.moveToBookmark(y)})}})}function d(m){m.onKeyUp.add(function(n,p){var o=p.keyCode;if(o==h||o==j){if(n.dom.isEmpty(n.getBody())){n.setContent("",{format:"raw"});n.nodeChanged();return}}})}function b(m){m.dom.bind(m.getDoc(),"focusin",function(){m.selection.setRng(m.selection.getRng())})}function e(m){m.onKeyDown.add(function(n,q){if(q.keyCode===j){if(n.selection.isCollapsed()&&n.selection.getRng(true).startOffset===0){var p=n.selection.getNode();var o=p.previousSibling;if(o&&o.nodeName&&o.nodeName.toLowerCase()==="hr"){n.dom.remove(o);k.dom.Event.cancel(q)}}}})}function g(m){if(!Range.prototype.getClientRects){m.onMouseDown.add(function(o,p){if(p.target.nodeName==="HTML"){var n=o.getBody();n.blur();setTimeout(function(){n.focus()},0)}})}}function f(m){m.onClick.add(function(n,o){o=o.target;if(/^(IMG|HR)$/.test(o.nodeName)){n.selection.getSel().setBaseAndExtent(o,0,o,1)}if(o.nodeName=="A"&&n.dom.hasClass(o,"mceItemAnchor")){n.selection.select(o)}n.nodeChanged()})}function l(m){var o,n;m.dom.bind(m.getDoc(),"selectionchange",function(){if(n){clearTimeout(n);n=0}n=window.setTimeout(function(){var p=m.selection.getRng();if(!o||!k.dom.RangeUtils.compareRanges(p,o)){m.nodeChanged();o=p}},50)})}function a(m){document.body.setAttribute("role","application")}k.create("tinymce.util.Quirks",{Quirks:function(m){if(k.isWebKit){c(m);d(m);b(m);f(m);if(k.isIDevice){l(m)}}if(k.isIE){e(m);d(m);a(m)}if(k.isGecko){e(m);g(m)}}})})(tinymce);(function(j){var a,g,d,k=/[&<>\"\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,b=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,f=/[<>&\"\']/g,c=/&(#x|#)?([\w]+);/g,i={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"};g={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;"};d={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"};function h(l){var m;m=document.createElement("div");m.innerHTML=l;return m.textContent||m.innerText||l}function e(m,p){var n,o,l,q={};if(m){m=m.split(",");p=p||10;for(n=0;n<m.length;n+=2){o=String.fromCharCode(parseInt(m[n],p));if(!g[o]){l="&"+m[n+1]+";";q[o]=l;q[l]=o}}return q}}a=e("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);j.html=j.html||{};j.html.Entities={encodeRaw:function(m,l){return m.replace(l?k:b,function(n){return g[n]||n})},encodeAllRaw:function(l){return(""+l).replace(f,function(m){return g[m]||m})},encodeNumeric:function(m,l){return m.replace(l?k:b,function(n){if(n.length>1){return"&#"+(((n.charCodeAt(0)-55296)*1024)+(n.charCodeAt(1)-56320)+65536)+";"}return g[n]||"&#"+n.charCodeAt(0)+";"})},encodeNamed:function(n,l,m){m=m||a;return n.replace(l?k:b,function(o){return g[o]||m[o]||o})},getEncodeFunc:function(l,o){var p=j.html.Entities;o=e(o)||a;function m(r,q){return r.replace(q?k:b,function(s){return g[s]||o[s]||"&#"+s.charCodeAt(0)+";"||s})}function n(r,q){return p.encodeNamed(r,q,o)}l=j.makeMap(l.replace(/\+/g,","));if(l.named&&l.numeric){return m}if(l.named){if(o){return n}return p.encodeNamed}if(l.numeric){return p.encodeNumeric}return p.encodeRaw},decode:function(l){return l.replace(c,function(n,m,o){if(m){o=parseInt(o,m.length===2?16:10);if(o>65535){o-=65536;return String.fromCharCode(55296+(o>>10),56320+(o&1023))}else{return i[o]||String.fromCharCode(o)}}return d[n]||a[n]||h(n)})}}})(tinymce);tinymce.html.Styles=function(d,f){var k=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,h=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,b=/\s*([^:]+):\s*([^;]+);?/g,l=/\s+$/,m=/rgb/,e,g,a={},j;d=d||{};j="\\\" \\' \\; \\: ; : \uFEFF".split(" ");for(g=0;g<j.length;g++){a[j[g]]="\uFEFF"+g;a["\uFEFF"+g]=j[g]}function c(n,q,p,i){function o(r){r=parseInt(r).toString(16);return r.length>1?r:"0"+r}return"#"+o(q)+o(p)+o(i)}return{toHex:function(i){return i.replace(k,c)},parse:function(r){var y={},p,n,v,q,u=d.url_converter,x=d.url_converter_scope||this;function o(C,F){var E,B,A,D;E=y[C+"-top"+F];if(!E){return}B=y[C+"-right"+F];if(E!=B){return}A=y[C+"-bottom"+F];if(B!=A){return}D=y[C+"-left"+F];if(A!=D){return}y[C+F]=D;delete y[C+"-top"+F];delete y[C+"-right"+F];delete y[C+"-bottom"+F];delete y[C+"-left"+F]}function t(B){var C=y[B],A;if(!C||C.indexOf(" ")<0){return}C=C.split(" ");A=C.length;while(A--){if(C[A]!==C[0]){return false}}y[B]=C[0];return true}function z(C,B,A,D){if(!t(B)){return}if(!t(A)){return}if(!t(D)){return}y[C]=y[B]+" "+y[A]+" "+y[D];delete y[B];delete y[A];delete y[D]}function s(A){q=true;return a[A]}function i(B,A){if(q){B=B.replace(/\uFEFF[0-9]/g,function(C){return a[C]})}if(!A){B=B.replace(/\\([\'\";:])/g,"$1")}return B}if(r){r=r.replace(/\\[\"\';:\uFEFF]/g,s).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(A){return A.replace(/[;:]/g,s)});while(p=b.exec(r)){n=p[1].replace(l,"").toLowerCase();v=p[2].replace(l,"");if(n&&v.length>0){if(n==="font-weight"&&v==="700"){v="bold"}else{if(n==="color"||n==="background-color"){v=v.toLowerCase()}}v=v.replace(k,c);v=v.replace(h,function(B,A,E,D,F,C){F=F||C;if(F){F=i(F);return"'"+F.replace(/\'/g,"\\'")+"'"}A=i(A||E||D);if(u){A=u.call(x,A,"style")}return"url('"+A.replace(/\'/g,"\\'")+"')"});y[n]=q?i(v,true):v}b.lastIndex=p.index+p[0].length}o("border","");o("border","-width");o("border","-color");o("border","-style");o("padding","");o("margin","");z("border","border-width","border-style","border-color");if(y.border==="medium none"){delete y.border}}return y},serialize:function(p,r){var o="",n,q;function i(t){var x,u,s,v;x=f.styles[t];if(x){for(u=0,s=x.length;u<s;u++){t=x[u];v=p[t];if(v!==e&&v.length>0){o+=(o.length>0?" ":"")+t+": "+v+";"}}}}if(r&&f&&f.styles){i("*");i(r)}else{for(n in p){q=p[n];if(q!==e&&q.length>0){o+=(o.length>0?" ":"")+n+": "+q+";"}}}return o}}};(function(m){var h={},j,l,g,f,c={},b,e,d=m.makeMap,k=m.each;function i(o,n){return o.split(n||",")}function a(r,q){var o,p={};function n(s){return s.replace(/[A-Z]+/g,function(t){return n(r[t])})}for(o in r){if(r.hasOwnProperty(o)){r[o]=n(r[o])}}n(q).replace(/#/g,"#text").replace(/(\w+)\[([^\]]+)\]\[([^\]]*)\]/g,function(v,t,s,u){s=i(s,"|");p[t]={attributes:d(s),attributesOrder:s,children:d(u,"|",{"#comment":{}})}});return p}l="h1,h2,h3,h4,h5,h6,hr,p,div,address,pre,form,table,tbody,thead,tfoot,th,tr,td,li,ol,ul,caption,blockquote,center,dl,dt,dd,dir,fieldset,noscript,menu,isindex,samp,header,footer,article,section,hgroup";l=d(l,",",d(l.toUpperCase()));h=a({Z:"H|K|N|O|P",Y:"X|form|R|Q",ZG:"E|span|width|align|char|charoff|valign",X:"p|T|div|U|W|isindex|fieldset|table",ZF:"E|align|char|charoff|valign",W:"pre|hr|blockquote|address|center|noframes",ZE:"abbr|axis|headers|scope|rowspan|colspan|align|char|charoff|valign|nowrap|bgcolor|width|height",ZD:"[E][S]",U:"ul|ol|dl|menu|dir",ZC:"p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q",T:"h1|h2|h3|h4|h5|h6",ZB:"X|S|Q",S:"R|P",ZA:"a|G|J|M|O|P",R:"a|H|K|N|O",Q:"noscript|P",P:"ins|del|script",O:"input|select|textarea|label|button",N:"M|L",M:"em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym",L:"sub|sup",K:"J|I",J:"tt|i|b|u|s|strike",I:"big|small|font|basefont",H:"G|F",G:"br|span|bdo",F:"object|applet|img|map|iframe",E:"A|B|C",D:"accesskey|tabindex|onfocus|onblur",C:"onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup",B:"lang|xml:lang|dir",A:"id|class|style|title"},"script[id|charset|type|language|src|defer|xml:space][]style[B|id|type|media|title|xml:space][]object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]param[id|name|value|valuetype|type][]p[E|align][#|S]a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]br[A|clear][]span[E][#|S]bdo[A|C|B][#|S]applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]h1[E|align][#|S]img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]map[B|C|A|name][X|form|Q|area]h2[E|align][#|S]iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]h3[E|align][#|S]tt[E][#|S]i[E][#|S]b[E][#|S]u[E][#|S]s[E][#|S]strike[E][#|S]big[E][#|S]small[E][#|S]font[A|B|size|color|face][#|S]basefont[id|size|color|face][]em[E][#|S]strong[E][#|S]dfn[E][#|S]code[E][#|S]q[E|cite][#|S]samp[E][#|S]kbd[E][#|S]var[E][#|S]cite[E][#|S]abbr[E][#|S]acronym[E][#|S]sub[E][#|S]sup[E][#|S]input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]optgroup[E|disabled|label][option]option[E|selected|disabled|label|value][]textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]label[E|for|accesskey|onfocus|onblur][#|S]button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]h4[E|align][#|S]ins[E|cite|datetime][#|Y]h5[E|align][#|S]del[E|cite|datetime][#|Y]h6[E|align][#|S]div[E|align][#|Y]ul[E|type|compact][li]li[E|type|value][#|Y]ol[E|type|compact|start][li]dl[E|compact][dt|dd]dt[E][#|S]dd[E][#|Y]menu[E|compact][li]dir[E|compact][li]pre[E|width|xml:space][#|ZA]hr[E|align|noshade|size|width][]blockquote[E|cite][#|Y]address[E][#|S|p]center[E][#|Y]noframes[E][#|Y]isindex[A|B|prompt][]fieldset[E][#|legend|Y]legend[E|accesskey|align][#|S]table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]caption[E|align][#|S]col[ZG][]colgroup[ZG][col]thead[ZF][tr]tr[ZF|bgcolor][th|td]th[E|ZE][#|Y]form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]noscript[E][#|Y]td[E|ZE][#|Y]tfoot[ZF][tr]tbody[ZF][tr]area[E|D|shape|coords|href|nohref|alt|target][]base[id|href|target][]body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]");j=d("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected,autoplay,loop,controls");g=d("area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed,source");f=m.extend(d("td,th,iframe,video,audio,object"),g);b=d("pre,script,style,textarea");e=d("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");m.html.Schema=function(r){var A=this,n={},o={},y=[],q,p;r=r||{};if(r.verify_html===false){r.valid_elements="*[*]"}if(r.valid_styles){q={};k(r.valid_styles,function(C,B){q[B]=m.explode(C)})}p=r.whitespace_elements?d(r.whitespace_elements):b;function z(B){return new RegExp("^"+B.replace(/([?+*])/g,".$1")+"$")}function t(I){var H,D,W,S,X,C,F,R,U,N,V,Z,L,G,T,B,P,E,Y,aa,M,Q,K=/^([#+-])?([^\[\/]+)(?:\/([^\[]+))?(?:\[([^\]]+)\])?$/,O=/^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,J=/[*?+]/;if(I){I=i(I);if(n["@"]){P=n["@"].attributes;E=n["@"].attributesOrder}for(H=0,D=I.length;H<D;H++){C=K.exec(I[H]);if(C){T=C[1];N=C[2];B=C[3];U=C[4];L={};G=[];F={attributes:L,attributesOrder:G};if(T==="#"){F.paddEmpty=true}if(T==="-"){F.removeEmpty=true}if(P){for(aa in P){L[aa]=P[aa]}G.push.apply(G,E)}if(U){U=i(U,"|");for(W=0,S=U.length;W<S;W++){C=O.exec(U[W]);if(C){R={};Z=C[1];V=C[2].replace(/::/g,":");T=C[3];Q=C[4];if(Z==="!"){F.attributesRequired=F.attributesRequired||[];F.attributesRequired.push(V);R.required=true}if(Z==="-"){delete L[V];G.splice(m.inArray(G,V),1);continue}if(T){if(T==="="){F.attributesDefault=F.attributesDefault||[];F.attributesDefault.push({name:V,value:Q});R.defaultValue=Q}if(T===":"){F.attributesForced=F.attributesForced||[];F.attributesForced.push({name:V,value:Q});R.forcedValue=Q}if(T==="<"){R.validValues=d(Q,"?")}}if(J.test(V)){F.attributePatterns=F.attributePatterns||[];R.pattern=z(V);F.attributePatterns.push(R)}else{if(!L[V]){G.push(V)}L[V]=R}}}}if(!P&&N=="@"){P=L;E=G}if(B){F.outputName=N;n[B]=F}if(J.test(N)){F.pattern=z(N);y.push(F)}else{n[N]=F}}}}}function v(B){n={};y=[];t(B);k(h,function(D,C){o[C]=D.children})}function s(C){var B=/^(~)?(.+)$/;if(C){k(i(C),function(G){var E=B.exec(G),F=E[1]==="~",H=F?"span":"div",D=E[2];o[D]=o[H];c[D]=H;if(!F){l[D]={}}k(o,function(I,J){if(I[H]){I[D]=I[H]}})})}}function u(C){var B=/^([+\-]?)(\w+)\[([^\]]+)\]$/;if(C){k(i(C),function(G){var F=B.exec(G),D,E;if(F){E=F[1];if(E){D=o[F[2]]}else{D=o[F[2]]={"#comment":{}}}D=o[F[2]];k(i(F[3],"|"),function(H){if(E==="-"){delete D[H]}else{D[H]={}}})}})}}function x(B){var D=n[B],C;if(D){return D}C=y.length;while(C--){D=y[C];if(D.pattern.test(B)){return D}}}if(!r.valid_elements){k(h,function(C,B){n[B]={attributes:C.attributes,attributesOrder:C.attributesOrder};o[B]=C.children});k(i("strong/b,em/i"),function(B){B=i(B,"/");n[B[1]].outputName=B[0]});n.img.attributesDefault=[{name:"alt",value:""}];k(i("ol,ul,sub,sup,blockquote,span,font,a,table,tbody,tr"),function(B){n[B].removeEmpty=true});k(i("p,h1,h2,h3,h4,h5,h6,th,td,pre,div,address,caption"),function(B){n[B].paddEmpty=true})}else{v(r.valid_elements)}s(r.custom_elements);u(r.valid_children);t(r.extended_valid_elements);u("+ol[ul|ol],+ul[ul|ol]");if(!x("span")){t("span[!data-mce-type|*]")}if(r.invalid_elements){m.each(m.explode(r.invalid_elements),function(B){if(n[B]){delete n[B]}})}A.children=o;A.styles=q;A.getBoolAttrs=function(){return j};A.getBlockElements=function(){return l};A.getShortEndedElements=function(){return g};A.getSelfClosingElements=function(){return e};A.getNonEmptyElements=function(){return f};A.getWhiteSpaceElements=function(){return p};A.isValidChild=function(B,D){var C=o[B];return !!(C&&C[D])};A.getElementRule=x;A.getCustomElements=function(){return c};A.addValidElements=t;A.setValidElements=v;A.addCustomElements=s;A.addValidChildren=u};m.html.Schema.boolAttrMap=j;m.html.Schema.blockElementsMap=l})(tinymce);(function(a){a.html.SaxParser=function(c,e){var b=this,d=function(){};c=c||{};b.schema=e=e||new a.html.Schema();if(c.fix_self_closing!==false){c.fix_self_closing=true}a.each("comment cdata text start end pi doctype".split(" "),function(f){if(f){b[f]=c[f]||d}});b.parse=function(D){var n=this,g,F=0,H,A,z=[],M,P,B,q,y,r,L,G,N,u,m,k,s,Q,o,O,E,R,K,f,I,l,C,J,h,v=0,j=a.html.Entities.decode,x,p;function t(S){var U,T;U=z.length;while(U--){if(z[U].name===S){break}}if(U>=0){for(T=z.length-1;T>=U;T--){S=z[T];if(S.valid){n.end(S.name)}}z.length=U}}l=new RegExp("<(?:(?:!--([\\w\\W]*?)-->)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:!DOCTYPE([\\w\\W]*?)>)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([^>]+)>)|(?:([^\\s\\/<>]+)((?:\\s+[^\"'>]+(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>]*))*|\\/)>))","g");C=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:\\.|[^\"])*)\")|(?:\'((?:\\.|[^\'])*)\')|([^>\s]+)))?/g;J={script:/<\/script[^>]*>/gi,style:/<\/style[^>]*>/gi,noscript:/<\/noscript[^>]*>/gi};L=e.getShortEndedElements();I=e.getSelfClosingElements();G=e.getBoolAttrs();u=c.validate;r=c.remove_internals;x=c.fix_self_closing;p=a.isIE;o=/^:/;while(g=l.exec(D)){if(F<g.index){n.text(j(D.substr(F,g.index-F)))}if(H=g[6]){H=H.toLowerCase();if(p&&o.test(H)){H=H.substr(1)}t(H)}else{if(H=g[7]){H=H.toLowerCase();if(p&&o.test(H)){H=H.substr(1)}N=H in L;if(x&&I[H]&&z.length>0&&z[z.length-1].name===H){t(H)}if(!u||(m=e.getElementRule(H))){k=true;if(u){O=m.attributes;E=m.attributePatterns}if(Q=g[8]){y=Q.indexOf("data-mce-type")!==-1;if(y&&r){k=false}M=[];M.map={};Q.replace(C,function(T,S,X,W,V){var Y,U;S=S.toLowerCase();X=S in G?S:j(X||W||V||"");if(u&&!y&&S.indexOf("data-")!==0){Y=O[S];if(!Y&&E){U=E.length;while(U--){Y=E[U];if(Y.pattern.test(S)){break}}if(U===-1){Y=null}}if(!Y){return}if(Y.validValues&&!(X in Y.validValues)){return}}M.map[S]=X;M.push({name:S,value:X})})}else{M=[];M.map={}}if(u&&!y){R=m.attributesRequired;K=m.attributesDefault;f=m.attributesForced;if(f){P=f.length;while(P--){s=f[P];q=s.name;h=s.value;if(h==="{$uid}"){h="mce_"+v++}M.map[q]=h;M.push({name:q,value:h})}}if(K){P=K.length;while(P--){s=K[P];q=s.name;if(!(q in M.map)){h=s.value;if(h==="{$uid}"){h="mce_"+v++}M.map[q]=h;M.push({name:q,value:h})}}}if(R){P=R.length;while(P--){if(R[P] in M.map){break}}if(P===-1){k=false}}if(M.map["data-mce-bogus"]){k=false}}if(k){n.start(H,M,N)}}else{k=false}if(A=J[H]){A.lastIndex=F=g.index+g[0].length;if(g=A.exec(D)){if(k){B=D.substr(F,g.index-F)}F=g.index+g[0].length}else{B=D.substr(F);F=D.length}if(k&&B.length>0){n.text(B,true)}if(k){n.end(H)}l.lastIndex=F;continue}if(!N){if(!Q||Q.indexOf("/")!=Q.length-1){z.push({name:H,valid:k})}else{if(k){n.end(H)}}}}else{if(H=g[1]){n.comment(H)}else{if(H=g[2]){n.cdata(H)}else{if(H=g[3]){n.doctype(H)}else{if(H=g[4]){n.pi(H,g[5])}}}}}}F=g.index+g[0].length}if(F<D.length){n.text(j(D.substr(F)))}for(P=z.length-1;P>=0;P--){H=z[P];if(H.valid){n.end(H.name)}}}}})(tinymce);(function(d){var c=/^[ \t\r\n]*$/,e={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11};function a(k,l,j){var i,h,f=j?"lastChild":"firstChild",g=j?"prev":"next";if(k[f]){return k[f]}if(k!==l){i=k[g];if(i){return i}for(h=k.parent;h&&h!==l;h=h.parent){i=h[g];if(i){return i}}}}function b(f,g){this.name=f;this.type=g;if(g===1){this.attributes=[];this.attributes.map={}}}d.extend(b.prototype,{replace:function(g){var f=this;if(g.parent){g.remove()}f.insert(g,f);f.remove();return f},attr:function(h,l){var f=this,g,j,k;if(typeof h!=="string"){for(j in h){f.attr(j,h[j])}return f}if(g=f.attributes){if(l!==k){if(l===null){if(h in g.map){delete g.map[h];j=g.length;while(j--){if(g[j].name===h){g=g.splice(j,1);return f}}}return f}if(h in g.map){j=g.length;while(j--){if(g[j].name===h){g[j].value=l;break}}}else{g.push({name:h,value:l})}g.map[h]=l;return f}else{return g.map[h]}}},clone:function(){var g=this,n=new b(g.name,g.type),h,f,m,j,k;if(m=g.attributes){k=[];k.map={};for(h=0,f=m.length;h<f;h++){j=m[h];if(j.name!=="id"){k[k.length]={name:j.name,value:j.value};k.map[j.name]=j.value}}n.attributes=k}n.value=g.value;n.shortEnded=g.shortEnded;return n},wrap:function(g){var f=this;f.parent.insert(g,f);g.append(f);return f},unwrap:function(){var f=this,h,g;for(h=f.firstChild;h;){g=h.next;f.insert(h,f,true);h=g}f.remove()},remove:function(){var f=this,h=f.parent,g=f.next,i=f.prev;if(h){if(h.firstChild===f){h.firstChild=g;if(g){g.prev=null}}else{i.next=g}if(h.lastChild===f){h.lastChild=i;if(i){i.next=null}}else{g.prev=i}f.parent=f.next=f.prev=null}return f},append:function(h){var f=this,g;if(h.parent){h.remove()}g=f.lastChild;if(g){g.next=h;h.prev=g;f.lastChild=h}else{f.lastChild=f.firstChild=h}h.parent=f;return h},insert:function(h,f,i){var g;if(h.parent){h.remove()}g=f.parent||this;if(i){if(f===g.firstChild){g.firstChild=h}else{f.prev.next=h}h.prev=f.prev;h.next=f;f.prev=h}else{if(f===g.lastChild){g.lastChild=h}else{f.next.prev=h}h.next=f.next;h.prev=f;f.next=h}h.parent=g;return h},getAll:function(g){var f=this,h,i=[];for(h=f.firstChild;h;h=a(h,f)){if(h.name===g){i.push(h)}}return i},empty:function(){var g=this,f,h,j;if(g.firstChild){f=[];for(j=g.firstChild;j;j=a(j,g)){f.push(j)}h=f.length;while(h--){j=f[h];j.parent=j.firstChild=j.lastChild=j.next=j.prev=null}}g.firstChild=g.lastChild=null;return g},isEmpty:function(k){var f=this,j=f.firstChild,h,g;if(j){do{if(j.type===1){if(j.attributes.map["data-mce-bogus"]){continue}if(k[j.name]){return false}h=j.attributes.length;while(h--){g=j.attributes[h].name;if(g==="name"||g.indexOf("data-")===0){return false}}}if((j.type===3&&!c.test(j.value))){return false}}while(j=a(j,f))}return true},walk:function(f){return a(this,null,f)}});d.extend(b,{create:function(g,f){var i,h;i=new b(g,e[g]||1);if(f){for(h in f){i.attr(h,f[h])}}return i}});d.html.Node=b})(tinymce);(function(b){var a=b.html.Node;b.html.DomParser=function(g,h){var f=this,e={},d=[],i={},c={};g=g||{};g.validate="validate" in g?g.validate:true;g.root_name=g.root_name||"body";f.schema=h=h||new b.html.Schema();function j(m){var o,p,x,v,z,n,q,l,t,u,k,s,y,r;s=b.makeMap("tr,td,th,tbody,thead,tfoot,table");k=h.getNonEmptyElements();for(o=0;o<m.length;o++){p=m[o];if(!p.parent){continue}v=[p];for(x=p.parent;x&&!h.isValidChild(x.name,p.name)&&!s[x.name];x=x.parent){v.push(x)}if(x&&v.length>1){v.reverse();z=n=f.filterNode(v[0].clone());for(t=0;t<v.length-1;t++){if(h.isValidChild(n.name,v[t].name)){q=f.filterNode(v[t].clone());n.append(q)}else{q=n}for(l=v[t].firstChild;l&&l!=v[t+1];){r=l.next;q.append(l);l=r}n=q}if(!z.isEmpty(k)){x.insert(z,v[0],true);x.insert(p,z)}else{x.insert(p,v[0],true)}x=v[0];if(x.isEmpty(k)||x.firstChild===x.lastChild&&x.firstChild.name==="br"){x.empty().remove()}}else{if(p.parent){if(p.name==="li"){y=p.prev;if(y&&(y.name==="ul"||y.name==="ul")){y.append(p);continue}y=p.next;if(y&&(y.name==="ul"||y.name==="ul")){y.insert(p,y.firstChild,true);continue}p.wrap(f.filterNode(new a("ul",1)));continue}if(h.isValidChild(p.parent.name,"div")&&h.isValidChild("div",p.name)){p.wrap(f.filterNode(new a("div",1)))}else{if(p.name==="style"||p.name==="script"){p.empty().remove()}else{p.unwrap()}}}}}}f.filterNode=function(m){var l,k,n;if(k in e){n=i[k];if(n){n.push(m)}else{i[k]=[m]}}l=d.length;while(l--){k=d[l].name;if(k in m.attributes.map){n=c[k];if(n){n.push(m)}else{c[k]=[m]}}}return m};f.addNodeFilter=function(k,l){b.each(b.explode(k),function(m){var n=e[m];if(!n){e[m]=n=[]}n.push(l)})};f.addAttributeFilter=function(k,l){b.each(b.explode(k),function(m){var n;for(n=0;n<d.length;n++){if(d[n].name===m){d[n].callbacks.push(l);return}}d.push({name:m,callbacks:[l]})})};f.parse=function(v,m){var n,H,A,z,C,B,x,r,E,K,y,o,D,J=[],t,k,s,p,u,q;m=m||{};i={};c={};o=b.extend(b.makeMap("script,style,head,html,body,title,meta,param"),h.getBlockElements());u=h.getNonEmptyElements();p=h.children;y=g.validate;q="forced_root_block" in m?m.forced_root_block:g.forced_root_block;s=h.getWhiteSpaceElements();D=/^[ \t\r\n]+/;t=/[ \t\r\n]+$/;k=/[ \t\r\n]+/g;function F(){var L=H.firstChild,l,M;while(L){l=L.next;if(L.type==3||(L.type==1&&L.name!=="p"&&!o[L.name]&&!L.attr("data-mce-type"))){if(!M){M=I(q,1);H.insert(M,L);M.append(L)}else{M.append(L)}}else{M=null}L=l}}function I(l,L){var M=new a(l,L),N;if(l in e){N=i[l];if(N){N.push(M)}else{i[l]=[M]}}return M}function G(M){var N,l,L;for(N=M.prev;N&&N.type===3;){l=N.value.replace(t,"");if(l.length>0){N.value=l;N=N.prev}else{L=N.prev;N.remove();N=L}}}n=new b.html.SaxParser({validate:y,fix_self_closing:!y,cdata:function(l){A.append(I("#cdata",4)).value=l},text:function(M,l){var L;if(!s[A.name]){M=M.replace(k," ");if(A.lastChild&&o[A.lastChild.name]){M=M.replace(D,"")}}if(M.length!==0){L=I("#text",3);L.raw=!!l;A.append(L).value=M}},comment:function(l){A.append(I("#comment",8)).value=l},pi:function(l,L){A.append(I(l,7)).value=L;G(A)},doctype:function(L){var l;l=A.append(I("#doctype",10));l.value=L;G(A)},start:function(l,T,M){var R,O,N,L,P,U,S,Q;N=y?h.getElementRule(l):{};if(N){R=I(N.outputName||l,1);R.attributes=T;R.shortEnded=M;A.append(R);Q=p[A.name];if(Q&&p[R.name]&&!Q[R.name]){J.push(R)}O=d.length;while(O--){P=d[O].name;if(P in T.map){E=c[P];if(E){E.push(R)}else{c[P]=[R]}}}if(o[l]){G(R)}if(!M){A=R}}},end:function(l){var P,M,O,L,N;M=y?h.getElementRule(l):{};if(M){if(o[l]){if(!s[A.name]){for(P=A.firstChild;P&&P.type===3;){O=P.value.replace(D,"");if(O.length>0){P.value=O;P=P.next}else{L=P.next;P.remove();P=L}}for(P=A.lastChild;P&&P.type===3;){O=P.value.replace(t,"");if(O.length>0){P.value=O;P=P.prev}else{L=P.prev;P.remove();P=L}}}P=A.prev;if(P&&P.type===3){O=P.value.replace(D,"");if(O.length>0){P.value=O}else{P.remove()}}}if(M.removeEmpty||M.paddEmpty){if(A.isEmpty(u)){if(M.paddEmpty){A.empty().append(new a("#text","3")).value="\u00a0"}else{if(!A.attributes.map.name){N=A.parent;A.empty().remove();A=N;return}}}}A=A.parent}}},h);H=A=new a(m.context||g.root_name,11);n.parse(v);if(y&&J.length){if(!m.context){j(J)}else{m.invalid=true}}if(q&&H.name=="body"){F()}if(!m.invalid){for(K in i){E=e[K];z=i[K];x=z.length;while(x--){if(!z[x].parent){z.splice(x,1)}}for(C=0,B=E.length;C<B;C++){E[C](z,K,m)}}for(C=0,B=d.length;C<B;C++){E=d[C];if(E.name in c){z=c[E.name];x=z.length;while(x--){if(!z[x].parent){z.splice(x,1)}}for(x=0,r=E.callbacks.length;x<r;x++){E.callbacks[x](z,E.name,m)}}}}return H};if(g.remove_trailing_brs){f.addNodeFilter("br",function(n,m){var r,q=n.length,o,u=h.getBlockElements(),k=h.getNonEmptyElements(),s,p,t;u.body=1;for(r=0;r<q;r++){o=n[r];s=o.parent;if(u[o.parent.name]&&o===s.lastChild){p=o.prev;while(p){t=p.name;if(t!=="span"||p.attr("data-mce-type")!=="bookmark"){if(t!=="br"){break}if(t==="br"){o=null;break}}p=p.prev}if(o){o.remove();if(s.isEmpty(k)){elementRule=h.getElementRule(s.name);if(elementRule){if(elementRule.removeEmpty){s.remove()}else{if(elementRule.paddEmpty){s.empty().append(new b.html.Node("#text",3)).value="\u00a0"}}}}}}}})}}})(tinymce);tinymce.html.Writer=function(e){var c=[],a,b,d,f,g;e=e||{};a=e.indent;b=tinymce.makeMap(e.indent_before||"");d=tinymce.makeMap(e.indent_after||"");f=tinymce.html.Entities.getEncodeFunc(e.entity_encoding||"raw",e.entities);g=e.element_format=="html";return{start:function(m,k,p){var n,j,h,o;if(a&&b[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}c.push("<",m);if(k){for(n=0,j=k.length;n<j;n++){h=k[n];c.push(" ",h.name,'="',f(h.value,true),'"')}}if(!p||g){c[c.length]=">"}else{c[c.length]=" />"}if(p&&a&&d[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}},end:function(h){var i;c.push("</",h,">");if(a&&d[h]&&c.length>0){i=c[c.length-1];if(i.length>0&&i!=="\n"){c.push("\n")}}},text:function(i,h){if(i.length>0){c[c.length]=h?i:f(i)}},cdata:function(h){c.push("<![CDATA[",h,"]]>")},comment:function(h){c.push("<!--",h,"-->")},pi:function(h,i){if(i){c.push("<?",h," ",i,"?>")}else{c.push("<?",h,"?>")}if(a){c.push("\n")}},doctype:function(h){c.push("<!DOCTYPE",h,">",a?"\n":"")},reset:function(){c.length=0},getContent:function(){return c.join("").replace(/\n$/,"")}}};(function(a){a.html.Serializer=function(c,d){var b=this,e=new a.html.Writer(c);c=c||{};c.validate="validate" in c?c.validate:true;b.schema=d=d||new a.html.Schema();b.writer=e;b.serialize=function(h){var g,i;i=c.validate;g={3:function(k,j){e.text(k.value,k.raw)},8:function(j){e.comment(j.value)},7:function(j){e.pi(j.name,j.value)},10:function(j){e.doctype(j.value)},4:function(j){e.cdata(j.value)},11:function(j){if((j=j.firstChild)){do{f(j)}while(j=j.next)}}};e.reset();function f(k){var t=g[k.type],j,o,s,r,p,u,n,m,q;if(!t){j=k.name;o=k.shortEnded;s=k.attributes;if(i&&s&&s.length>1){u=[];u.map={};q=d.getElementRule(k.name);for(n=0,m=q.attributesOrder.length;n<m;n++){r=q.attributesOrder[n];if(r in s.map){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}for(n=0,m=s.length;n<m;n++){r=s[n].name;if(!(r in u.map)){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}s=u}e.start(k.name,s,o);if(!o){if((k=k.firstChild)){do{f(k)}while(k=k.next)}e.end(j)}}else{t(k)}}if(h.type==1&&!c.inner){f(h)}else{g[11](h)}return e.getContent()}}})(tinymce);(function(h){var f=h.each,e=h.is,d=h.isWebKit,b=h.isIE,c=h.html.Entities,a=/^([a-z0-9],?)+$/i,g=h.html.Schema.blockElementsMap,i=/^[ \t\r\n]*$/;h.create("tinymce.dom.DOMUtils",{doc:null,root:null,files:null,pixelStyles:/^(top|left|bottom|right|width|height|borderWidth)$/,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"},DOMUtils:function(o,m){var l=this,j,k;l.doc=o;l.win=window;l.files={};l.cssFlicker=false;l.counter=0;l.stdMode=!h.isIE||o.documentMode>=8;l.boxModel=!h.isIE||o.compatMode=="CSS1Compat"||l.stdMode;l.hasOuterHTML="outerHTML" in o.createElement("a");l.settings=m=h.extend({keep_values:false,hex_colors:1},m);l.schema=m.schema;l.styles=new h.html.Styles({url_converter:m.url_converter,url_converter_scope:m.url_converter_scope},m.schema);if(h.isIE6){try{o.execCommand("BackgroundImageCache",false,true)}catch(n){l.cssFlicker=true}}if(b&&m.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(p){o.createElement(p)});for(k in m.schema.getCustomElements()){o.createElement(k)}}h.addUnload(l.destroy,l)},getRoot:function(){var j=this,k=j.settings;return(k&&j.get(k.root_element))||j.doc.body},getViewPort:function(k){var l,j;k=!k?this.win:k;l=k.document;j=this.boxModel?l.documentElement:l.body;return{x:k.pageXOffset||j.scrollLeft,y:k.pageYOffset||j.scrollTop,w:k.innerWidth||j.clientWidth,h:k.innerHeight||j.clientHeight}},getRect:function(m){var l,j=this,k;m=j.get(m);l=j.getPos(m);k=j.getSize(m);return{x:l.x,y:l.y,w:k.w,h:k.h}},getSize:function(m){var k=this,j,l;m=k.get(m);j=k.getStyle(m,"width");l=k.getStyle(m,"height");if(j.indexOf("px")===-1){j=0}if(l.indexOf("px")===-1){l=0}return{w:parseInt(j)||m.offsetWidth||m.clientWidth,h:parseInt(l)||m.offsetHeight||m.clientHeight}},getParent:function(l,k,j){return this.getParents(l,k,j,false)},getParents:function(u,p,l,s){var k=this,j,m=k.settings,q=[];u=k.get(u);s=s===undefined;if(m.strict_root){l=l||k.getRoot()}if(e(p,"string")){j=p;if(p==="*"){p=function(o){return o.nodeType==1}}else{p=function(o){return k.is(o,j)}}}while(u){if(u==l||!u.nodeType||u.nodeType===9){break}if(!p||p(u)){if(s){q.push(u)}else{return u}}u=u.parentNode}return s?q:null},get:function(j){var k;if(j&&this.doc&&typeof(j)=="string"){k=j;j=this.doc.getElementById(j);if(j&&j.id!==k){return this.doc.getElementsByName(k)[1]}}return j},getNext:function(k,j){return this._findSib(k,j,"nextSibling")},getPrev:function(k,j){return this._findSib(k,j,"previousSibling")},select:function(l,k){var j=this;return h.dom.Sizzle(l,j.get(k)||j.get(j.settings.root_element)||j.doc,[])},is:function(l,j){var k;if(l.length===undefined){if(j==="*"){return l.nodeType==1}if(a.test(j)){j=j.toLowerCase().split(/,/);l=l.nodeName.toLowerCase();for(k=j.length-1;k>=0;k--){if(j[k]==l){return true}}return false}}return h.dom.Sizzle.matches(j,l.nodeType?[l]:l).length>0},add:function(m,q,j,l,o){var k=this;return this.run(m,function(s){var r,n;r=e(q,"string")?k.doc.createElement(q):q;k.setAttribs(r,j);if(l){if(l.nodeType){r.appendChild(l)}else{k.setHTML(r,l)}}return !o?s.appendChild(r):r})},create:function(l,j,k){return this.add(this.doc.createElement(l),l,j,k,1)},createHTML:function(r,j,p){var q="",m=this,l;q+="<"+r;for(l in j){if(j.hasOwnProperty(l)){q+=" "+l+'="'+m.encode(j[l])+'"'}}if(typeof(p)!="undefined"){return q+">"+p+"</"+r+">"}return q+" />"},remove:function(j,k){return this.run(j,function(m){var n,l=m.parentNode;if(!l){return null}if(k){while(n=m.firstChild){if(!h.isIE||n.nodeType!==3||n.nodeValue){l.insertBefore(n,m)}else{m.removeChild(n)}}}return l.removeChild(m)})},setStyle:function(m,j,k){var l=this;return l.run(m,function(p){var o,n;o=p.style;j=j.replace(/-(\D)/g,function(r,q){return q.toUpperCase()});if(l.pixelStyles.test(j)&&(h.is(k,"number")||/^[\-0-9\.]+$/.test(k))){k+="px"}switch(j){case"opacity":if(b){o.filter=k===""?"":"alpha(opacity="+(k*100)+")";if(!m.currentStyle||!m.currentStyle.hasLayout){o.display="inline-block"}}o[j]=o["-moz-opacity"]=o["-khtml-opacity"]=k||"";break;case"float":b?o.styleFloat=k:o.cssFloat=k;break;default:o[j]=k||""}if(l.settings.update_styles){l.setAttrib(p,"data-mce-style")}})},getStyle:function(m,j,l){m=this.get(m);if(!m){return}if(this.doc.defaultView&&l){j=j.replace(/[A-Z]/g,function(n){return"-"+n});try{return this.doc.defaultView.getComputedStyle(m,null).getPropertyValue(j)}catch(k){return null}}j=j.replace(/-(\D)/g,function(o,n){return n.toUpperCase()});if(j=="float"){j=b?"styleFloat":"cssFloat"}if(m.currentStyle&&l){return m.currentStyle[j]}return m.style?m.style[j]:undefined},setStyles:function(m,n){var k=this,l=k.settings,j;j=l.update_styles;l.update_styles=0;f(n,function(o,p){k.setStyle(m,p,o)});l.update_styles=j;if(l.update_styles){k.setAttrib(m,l.cssText)}},removeAllAttribs:function(j){return this.run(j,function(m){var l,k=m.attributes;for(l=k.length-1;l>=0;l--){m.removeAttributeNode(k.item(l))}})},setAttrib:function(l,m,j){var k=this;if(!l||!m){return}if(k.settings.strict){m=m.toLowerCase()}return this.run(l,function(o){var n=k.settings;if(j!==null){switch(m){case"style":if(!e(j,"string")){f(j,function(p,q){k.setStyle(o,q,p)});return}if(n.keep_values){if(j&&!k._isRes(j)){o.setAttribute("data-mce-style",j,2)}else{o.removeAttribute("data-mce-style",2)}}o.style.cssText=j;break;case"class":o.className=j||"";break;case"src":case"href":if(n.keep_values){if(n.url_converter){j=n.url_converter.call(n.url_converter_scope||k,j,m,o)}k.setAttrib(o,"data-mce-"+m,j,2)}break;case"shape":o.setAttribute("data-mce-style",j);break}}if(e(j)&&j!==null&&j.length!==0){o.setAttribute(m,""+j,2)}else{o.removeAttribute(m,2)}})},setAttribs:function(k,l){var j=this;return this.run(k,function(m){f(l,function(o,p){j.setAttrib(m,p,o)})})},getAttrib:function(o,p,l){var j,k=this,m;o=k.get(o);if(!o||o.nodeType!==1){return l===m?false:l}if(!e(l)){l=""}if(/^(src|href|style|coords|shape)$/.test(p)){j=o.getAttribute("data-mce-"+p);if(j){return j}}if(b&&k.props[p]){j=o[k.props[p]];j=j&&j.nodeValue?j.nodeValue:j}if(!j){j=o.getAttribute(p,2)}if(/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(p)){if(o[k.props[p]]===true&&j===""){return p}return j?p:""}if(o.nodeName==="FORM"&&o.getAttributeNode(p)){return o.getAttributeNode(p).nodeValue}if(p==="style"){j=j||o.style.cssText;if(j){j=k.serializeStyle(k.parseStyle(j),o.nodeName);if(k.settings.keep_values&&!k._isRes(j)){o.setAttribute("data-mce-style",j)}}}if(d&&p==="class"&&j){j=j.replace(/(apple|webkit)\-[a-z\-]+/gi,"")}if(b){switch(p){case"rowspan":case"colspan":if(j===1){j=""}break;case"size":if(j==="+0"||j===20||j===0){j=""}break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":if(j===0){j=""}break;case"hspace":if(j===-1){j=""}break;case"maxlength":case"tabindex":if(j===32768||j===2147483647||j==="32768"){j=""}break;case"multiple":case"compact":case"noshade":case"nowrap":if(j===65535){return p}return l;case"shape":j=j.toLowerCase();break;default:if(p.indexOf("on")===0&&j){j=h._replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/,"$1",""+j)}}}return(j!==m&&j!==null&&j!=="")?""+j:l},getPos:function(s,m){var k=this,j=0,q=0,o,p=k.doc,l;s=k.get(s);m=m||p.body;if(s){if(s.getBoundingClientRect){s=s.getBoundingClientRect();o=k.boxModel?p.documentElement:p.body;j=s.left+(p.documentElement.scrollLeft||p.body.scrollLeft)-o.clientTop;q=s.top+(p.documentElement.scrollTop||p.body.scrollTop)-o.clientLeft;return{x:j,y:q}}l=s;while(l&&l!=m&&l.nodeType){j+=l.offsetLeft||0;q+=l.offsetTop||0;l=l.offsetParent}l=s.parentNode;while(l&&l!=m&&l.nodeType){j-=l.scrollLeft||0;q-=l.scrollTop||0;l=l.parentNode}}return{x:j,y:q}},parseStyle:function(j){return this.styles.parse(j)},serializeStyle:function(k,j){return this.styles.serialize(k,j)},loadCSS:function(j){var l=this,m=l.doc,k;if(!j){j=""}k=l.select("head")[0];f(j.split(","),function(n){var o;if(l.files[n]){return}l.files[n]=true;o=l.create("link",{rel:"stylesheet",href:h._addVer(n)});if(b&&m.documentMode&&m.recalc){o.onload=function(){if(m.recalc){m.recalc()}o.onload=null}}k.appendChild(o)})},addClass:function(j,k){return this.run(j,function(l){var m;if(!k){return 0}if(this.hasClass(l,k)){return l.className}m=this.removeClass(l,k);return l.className=(m!=""?(m+" "):"")+k})},removeClass:function(l,m){var j=this,k;return j.run(l,function(o){var n;if(j.hasClass(o,m)){if(!k){k=new RegExp("(^|\\s+)"+m+"(\\s+|$)","g")}n=o.className.replace(k," ");n=h.trim(n!=" "?n:"");o.className=n;if(!n){o.removeAttribute("class");o.removeAttribute("className")}return n}return o.className})},hasClass:function(k,j){k=this.get(k);if(!k||!j){return false}return(" "+k.className+" ").indexOf(" "+j+" ")!==-1},show:function(j){return this.setStyle(j,"display","block")},hide:function(j){return this.setStyle(j,"display","none")},isHidden:function(j){j=this.get(j);return !j||j.style.display=="none"||this.getStyle(j,"display")=="none"},uniqueId:function(j){return(!j?"mce_":j)+(this.counter++)},setHTML:function(l,k){var j=this;return j.run(l,function(n){if(b){while(n.firstChild){n.removeChild(n.firstChild)}try{n.innerHTML="<br />"+k;n.removeChild(n.firstChild)}catch(m){n=j.create("div");n.innerHTML="<br />"+k;f(n.childNodes,function(p,o){if(o){n.appendChild(p)}})}}else{n.innerHTML=k}return k})},getOuterHTML:function(l){var k,j=this;l=j.get(l);if(!l){return null}if(l.nodeType===1&&j.hasOuterHTML){return l.outerHTML}k=(l.ownerDocument||j.doc).createElement("body");k.appendChild(l.cloneNode(true));return k.innerHTML},setOuterHTML:function(m,k,n){var j=this;function l(p,o,r){var s,q;q=r.createElement("body");q.innerHTML=o;s=q.lastChild;while(s){j.insertAfter(s.cloneNode(true),p);s=s.previousSibling}j.remove(p)}return this.run(m,function(p){p=j.get(p);if(p.nodeType==1){n=n||p.ownerDocument||j.doc;if(b){try{if(b&&p.nodeType==1){p.outerHTML=k}else{l(p,k,n)}}catch(o){l(p,k,n)}}else{l(p,k,n)}}})},decode:c.decode,encode:c.encodeAllRaw,insertAfter:function(j,k){k=this.get(k);return this.run(j,function(m){var l,n;l=k.parentNode;n=k.nextSibling;if(n){l.insertBefore(m,n)}else{l.appendChild(m)}return m})},isBlock:function(k){var j=k.nodeType;if(j){return !!(j===1&&g[k.nodeName])}return !!g[k]},replace:function(p,m,j){var l=this;if(e(m,"array")){p=p.cloneNode(true)}return l.run(m,function(k){if(j){f(h.grep(k.childNodes),function(n){p.appendChild(n)})}return k.parentNode.replaceChild(p,k)})},rename:function(m,j){var l=this,k;if(m.nodeName!=j.toUpperCase()){k=l.create(j);f(l.getAttribs(m),function(n){l.setAttrib(k,n.nodeName,l.getAttrib(m,n.nodeName))});l.replace(k,m,1)}return k||m},findCommonAncestor:function(l,j){var m=l,k;while(m){k=j;while(k&&m!=k){k=k.parentNode}if(m==k){break}m=m.parentNode}if(!m&&l.ownerDocument){return l.ownerDocument.documentElement}return m},toHex:function(j){var l=/^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(j);function k(m){m=parseInt(m).toString(16);return m.length>1?m:"0"+m}if(l){j="#"+k(l[1])+k(l[2])+k(l[3]);return j}return j},getClasses:function(){var n=this,j=[],m,o={},p=n.settings.class_filter,l;if(n.classes){return n.classes}function q(r){f(r.imports,function(s){q(s)});f(r.cssRules||r.rules,function(s){switch(s.type||1){case 1:if(s.selectorText){f(s.selectorText.split(","),function(t){t=t.replace(/^\s*|\s*$|^\s\./g,"");if(/\.mce/.test(t)||!/\.[\w\-]+$/.test(t)){return}l=t;t=h._replace(/.*\.([a-z0-9_\-]+).*/i,"$1",t);if(p&&!(t=p(t,l))){return}if(!o[t]){j.push({"class":t});o[t]=1}})}break;case 3:q(s.styleSheet);break}})}try{f(n.doc.styleSheets,q)}catch(k){}if(j.length>0){n.classes=j}return j},run:function(m,l,k){var j=this,n;if(j.doc&&typeof(m)==="string"){m=j.get(m)}if(!m){return false}k=k||this;if(!m.nodeType&&(m.length||m.length===0)){n=[];f(m,function(p,o){if(p){if(typeof(p)=="string"){p=j.doc.getElementById(p)}n.push(l.call(k,p,o))}});return n}return l.call(k,m)},getAttribs:function(k){var j;k=this.get(k);if(!k){return[]}if(b){j=[];if(k.nodeName=="OBJECT"){return k.attributes}if(k.nodeName==="OPTION"&&this.getAttrib(k,"selected")){j.push({specified:1,nodeName:"selected"})}k.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi,"").replace(/[\w:\-]+/gi,function(l){j.push({specified:1,nodeName:l})});return j}return k.attributes},isEmpty:function(m,k){var r=this,o,n,q,j,l,p;m=m.firstChild;if(m){j=new h.dom.TreeWalker(m);k=k||r.schema?r.schema.getNonEmptyElements():null;do{q=m.nodeType;if(q===1){if(m.getAttribute("data-mce-bogus")){continue}l=m.nodeName.toLowerCase();if(k&&k[l]){p=m.parentNode;if(l==="br"&&r.isBlock(p)&&p.firstChild===m&&p.lastChild===m){continue}return false}n=r.getAttribs(m);o=m.attributes.length;while(o--){l=m.attributes[o].nodeName;if(l==="name"||l==="data-mce-bookmark"){return false}}}if((q===3&&!i.test(m.nodeValue))){return false}}while(m=j.next())}return true},destroy:function(k){var j=this;if(j.events){j.events.destroy()}j.win=j.doc=j.root=j.events=null;if(!k){h.removeUnload(j.destroy)}},createRng:function(){var j=this.doc;return j.createRange?j.createRange():new h.dom.Range(this)},nodeIndex:function(n,o){var j=0,l,m,k;if(n){for(l=n.nodeType,n=n.previousSibling,m=n;n;n=n.previousSibling){k=n.nodeType;if(o&&k==3){if(k==l||!n.nodeValue.length){continue}}j++;l=k}}return j},split:function(n,m,q){var s=this,j=s.createRng(),o,l,p;function k(v){var t,r=v.childNodes,u=v.nodeType;if(u==1&&v.getAttribute("data-mce-type")=="bookmark"){return}for(t=r.length-1;t>=0;t--){k(r[t])}if(u!=9){if(u==3&&v.nodeValue.length>0){if(!s.isBlock(v.parentNode)||h.trim(v.nodeValue).length>0){return}}else{if(u==1){r=v.childNodes;if(r.length==1&&r[0]&&r[0].nodeType==1&&r[0].getAttribute("data-mce-type")=="bookmark"){v.parentNode.insertBefore(r[0],v)}if(r.length||/^(br|hr|input|img)$/i.test(v.nodeName)){return}}}s.remove(v)}return v}if(n&&m){j.setStart(n.parentNode,s.nodeIndex(n));j.setEnd(m.parentNode,s.nodeIndex(m));o=j.extractContents();j=s.createRng();j.setStart(m.parentNode,s.nodeIndex(m)+1);j.setEnd(n.parentNode,s.nodeIndex(n)+1);l=j.extractContents();p=n.parentNode;p.insertBefore(k(o),n);if(q){p.replaceChild(q,m)}else{p.insertBefore(m,n)}p.insertBefore(k(l),n);s.remove(n);return q||m}},bind:function(n,j,m,l){var k=this;if(!k.events){k.events=new h.dom.EventUtils()}return k.events.add(n,j,m,l||this)},unbind:function(m,j,l){var k=this;if(!k.events){k.events=new h.dom.EventUtils()}return k.events.remove(m,j,l)},_findSib:function(m,j,k){var l=this,n=j;if(m){if(e(n,"string")){n=function(o){return l.is(o,j)}}for(m=m[k];m;m=m[k]){if(n(m)){return m}}}return null},_isRes:function(j){return/^(top|left|bottom|right|width|height)/i.test(j)||/;\s*(top|left|bottom|right|width|height)/i.test(j)}});h.DOM=new h.dom.DOMUtils(document,{process_html:0})})(tinymce);(function(a){function b(c){var N=this,e=c.doc,S=0,E=1,j=2,D=true,R=false,U="startOffset",h="startContainer",P="endContainer",z="endOffset",k=tinymce.extend,n=c.nodeIndex;k(N,{startContainer:e,startOffset:0,endContainer:e,endOffset:0,collapsed:D,commonAncestorContainer:e,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:q,setEnd:s,setStartBefore:g,setStartAfter:I,setEndBefore:J,setEndAfter:u,collapse:A,selectNode:x,selectNodeContents:F,compareBoundaryPoints:v,deleteContents:p,extractContents:H,cloneContents:d,insertNode:C,surroundContents:M,cloneRange:K});function q(V,t){B(D,V,t)}function s(V,t){B(R,V,t)}function g(t){q(t.parentNode,n(t))}function I(t){q(t.parentNode,n(t)+1)}function J(t){s(t.parentNode,n(t))}function u(t){s(t.parentNode,n(t)+1)}function A(t){if(t){N[P]=N[h];N[z]=N[U]}else{N[h]=N[P];N[U]=N[z]}N.collapsed=D}function x(t){g(t);u(t)}function F(t){q(t,0);s(t,t.nodeType===1?t.childNodes.length:t.nodeValue.length)}function v(Y,t){var ab=N[h],W=N[U],aa=N[P],V=N[z],Z=t.startContainer,ad=t.startOffset,X=t.endContainer,ac=t.endOffset;if(Y===0){return G(ab,W,Z,ad)}if(Y===1){return G(aa,V,Z,ad)}if(Y===2){return G(aa,V,X,ac)}if(Y===3){return G(ab,W,X,ac)}}function p(){m(j)}function H(){return m(S)}function d(){return m(E)}function C(Y){var V=this[h],t=this[U],X,W;if((V.nodeType===3||V.nodeType===4)&&V.nodeValue){if(!t){V.parentNode.insertBefore(Y,V)}else{if(t>=V.nodeValue.length){c.insertAfter(Y,V)}else{X=V.splitText(t);V.parentNode.insertBefore(Y,X)}}}else{if(V.childNodes.length>0){W=V.childNodes[t]}if(W){V.insertBefore(Y,W)}else{V.appendChild(Y)}}}function M(V){var t=N.extractContents();N.insertNode(V);V.appendChild(t);N.selectNode(V)}function K(){return k(new b(c),{startContainer:N[h],startOffset:N[U],endContainer:N[P],endOffset:N[z],collapsed:N.collapsed,commonAncestorContainer:N.commonAncestorContainer})}function O(t,V){var W;if(t.nodeType==3){return t}if(V<0){return t}W=t.firstChild;while(W&&V>0){--V;W=W.nextSibling}if(W){return W}return t}function l(){return(N[h]==N[P]&&N[U]==N[z])}function G(X,Z,V,Y){var aa,W,t,ab,ad,ac;if(X==V){if(Z==Y){return 0}if(Z<Y){return -1}return 1}aa=V;while(aa&&aa.parentNode!=X){aa=aa.parentNode}if(aa){W=0;t=X.firstChild;while(t!=aa&&W<Z){W++;t=t.nextSibling}if(Z<=W){return -1}return 1}aa=X;while(aa&&aa.parentNode!=V){aa=aa.parentNode}if(aa){W=0;t=V.firstChild;while(t!=aa&&W<Y){W++;t=t.nextSibling}if(W<Y){return -1}return 1}ab=c.findCommonAncestor(X,V);ad=X;while(ad&&ad.parentNode!=ab){ad=ad.parentNode}if(!ad){ad=ab}ac=V;while(ac&&ac.parentNode!=ab){ac=ac.parentNode}if(!ac){ac=ab}if(ad==ac){return 0}t=ab.firstChild;while(t){if(t==ad){return -1}if(t==ac){return 1}t=t.nextSibling}}function B(V,Y,X){var t,W;if(V){N[h]=Y;N[U]=X}else{N[P]=Y;N[z]=X}t=N[P];while(t.parentNode){t=t.parentNode}W=N[h];while(W.parentNode){W=W.parentNode}if(W==t){if(G(N[h],N[U],N[P],N[z])>0){N.collapse(V)}}else{N.collapse(V)}N.collapsed=l();N.commonAncestorContainer=c.findCommonAncestor(N[h],N[P])}function m(ab){var aa,X=0,ad=0,V,Z,W,Y,t,ac;if(N[h]==N[P]){return f(ab)}for(aa=N[P],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[h]){return r(aa,ab)}++X}for(aa=N[h],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[P]){return T(aa,ab)}++ad}Z=ad-X;W=N[h];while(Z>0){W=W.parentNode;Z--}Y=N[P];while(Z<0){Y=Y.parentNode;Z++}for(t=W.parentNode,ac=Y.parentNode;t!=ac;t=t.parentNode,ac=ac.parentNode){W=t;Y=ac}return o(W,Y,ab)}function f(Z){var ab,Y,X,aa,t,W,V;if(Z!=j){ab=e.createDocumentFragment()}if(N[U]==N[z]){return ab}if(N[h].nodeType==3){Y=N[h].nodeValue;X=Y.substring(N[U],N[z]);if(Z!=E){N[h].deleteData(N[U],N[z]-N[U]);N.collapse(D)}if(Z==j){return}ab.appendChild(e.createTextNode(X));return ab}aa=O(N[h],N[U]);t=N[z]-N[U];while(t>0){W=aa.nextSibling;V=y(aa,Z);if(ab){ab.appendChild(V)}--t;aa=W}if(Z!=E){N.collapse(D)}return ab}function r(ab,Y){var aa,Z,V,t,X,W;if(Y!=j){aa=e.createDocumentFragment()}Z=i(ab,Y);if(aa){aa.appendChild(Z)}V=n(ab);t=V-N[U];if(t<=0){if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}Z=ab.previousSibling;while(t>0){X=Z.previousSibling;W=y(Z,Y);if(aa){aa.insertBefore(W,aa.firstChild)}--t;Z=X}if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}function T(Z,Y){var ab,V,aa,t,X,W;if(Y!=j){ab=e.createDocumentFragment()}aa=Q(Z,Y);if(ab){ab.appendChild(aa)}V=n(Z);++V;t=N[z]-V;aa=Z.nextSibling;while(t>0){X=aa.nextSibling;W=y(aa,Y);if(ab){ab.appendChild(W)}--t;aa=X}if(Y!=E){N.setStartAfter(Z);N.collapse(D)}return ab}function o(Z,t,ac){var W,ae,Y,aa,ab,V,ad,X;if(ac!=j){ae=e.createDocumentFragment()}W=Q(Z,ac);if(ae){ae.appendChild(W)}Y=Z.parentNode;aa=n(Z);ab=n(t);++aa;V=ab-aa;ad=Z.nextSibling;while(V>0){X=ad.nextSibling;W=y(ad,ac);if(ae){ae.appendChild(W)}ad=X;--V}W=i(t,ac);if(ae){ae.appendChild(W)}if(ac!=E){N.setStartAfter(Z);N.collapse(D)}return ae}function i(aa,ab){var W=O(N[P],N[z]-1),ac,Z,Y,t,V,X=W!=N[P];if(W==aa){return L(W,X,R,ab)}ac=W.parentNode;Z=L(ac,R,R,ab);while(ac){while(W){Y=W.previousSibling;t=L(W,X,R,ab);if(ab!=j){Z.insertBefore(t,Z.firstChild)}X=D;W=Y}if(ac==aa){return Z}W=ac.previousSibling;ac=ac.parentNode;V=L(ac,R,R,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function Q(aa,ab){var X=O(N[h],N[U]),Y=X!=N[h],ac,Z,W,t,V;if(X==aa){return L(X,Y,D,ab)}ac=X.parentNode;Z=L(ac,R,D,ab);while(ac){while(X){W=X.nextSibling;t=L(X,Y,D,ab);if(ab!=j){Z.appendChild(t)}Y=D;X=W}if(ac==aa){return Z}X=ac.nextSibling;ac=ac.parentNode;V=L(ac,R,D,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function L(t,Y,ab,ac){var X,W,Z,V,aa;if(Y){return y(t,ac)}if(t.nodeType==3){X=t.nodeValue;if(ab){V=N[U];W=X.substring(V);Z=X.substring(0,V)}else{V=N[z];W=X.substring(0,V);Z=X.substring(V)}if(ac!=E){t.nodeValue=Z}if(ac==j){return}aa=t.cloneNode(R);aa.nodeValue=W;return aa}if(ac==j){return}return t.cloneNode(R)}function y(V,t){if(t!=j){return t==E?V.cloneNode(D):V}V.parentNode.removeChild(V)}}a.Range=b})(tinymce.dom);(function(){function a(d){var b=this,h=d.dom,c=true,f=false;function e(i,j){var k,t=0,q,n,m,l,o,r,p=-1,s;k=i.duplicate();k.collapse(j);s=k.parentElement();if(s.ownerDocument!==d.dom.doc){return}while(s.contentEditable==="false"){s=s.parentNode}if(!s.hasChildNodes()){return{node:s,inside:1}}m=s.children;q=m.length-1;while(t<=q){r=Math.floor((t+q)/2);l=m[r];k.moveToElementText(l);p=k.compareEndPoints(j?"StartToStart":"EndToEnd",i);if(p>0){q=r-1}else{if(p<0){t=r+1}else{return{node:l}}}}if(p<0){if(!l){k.moveToElementText(s);k.collapse(true);l=s;n=true}else{k.collapse(false)}k.setEndPoint(j?"EndToStart":"EndToEnd",i);if(k.compareEndPoints(j?"StartToStart":"StartToEnd",i)>0){k=i.duplicate();k.collapse(j);o=-1;while(s==k.parentElement()){if(k.move("character",-1)==0){break}o++}}o=o||k.text.replace("\r\n"," ").length}else{k.collapse(true);k.setEndPoint(j?"StartToStart":"StartToEnd",i);o=k.text.replace("\r\n"," ").length}return{node:l,position:p,offset:o,inside:n}}function g(){var i=d.getRng(),r=h.createRng(),l,k,p,q,m,j;l=i.item?i.item(0):i.parentElement();if(l.ownerDocument!=h.doc){return r}k=d.isCollapsed();if(i.item){r.setStart(l.parentNode,h.nodeIndex(l));r.setEnd(r.startContainer,r.startOffset+1);return r}function o(A){var u=e(i,A),s,y,z=0,x,v,t;s=u.node;y=u.offset;if(u.inside&&!s.hasChildNodes()){r[A?"setStart":"setEnd"](s,0);return}if(y===v){r[A?"setStartBefore":"setEndAfter"](s);return}if(u.position<0){x=u.inside?s.firstChild:s.nextSibling;if(!x){r[A?"setStartAfter":"setEndAfter"](s);return}if(!y){if(x.nodeType==3){r[A?"setStart":"setEnd"](x,0)}else{r[A?"setStartBefore":"setEndBefore"](x)}return}while(x){t=x.nodeValue;z+=t.length;if(z>=y){s=x;z-=y;z=t.length-z;break}x=x.nextSibling}}else{x=s.previousSibling;if(!x){return r[A?"setStartBefore":"setEndBefore"](s)}if(!y){if(s.nodeType==3){r[A?"setStart":"setEnd"](x,s.nodeValue.length)}else{r[A?"setStartAfter":"setEndAfter"](x)}return}while(x){z+=x.nodeValue.length;if(z>=y){s=x;z-=y;break}x=x.previousSibling}}r[A?"setStart":"setEnd"](s,z)}try{o(true);if(!k){o()}}catch(n){if(n.number==-2147024809){m=b.getBookmark(2);p=i.duplicate();p.collapse(true);l=p.parentElement();if(!k){p=i.duplicate();p.collapse(false);q=p.parentElement();q.innerHTML=q.innerHTML}l.innerHTML=l.innerHTML;b.moveToBookmark(m);i=d.getRng();o(true);if(!k){o()}}else{throw n}}return r}this.getBookmark=function(m){var j=d.getRng(),o,i,l={};function n(u){var u,t,p,s,r,q=[];t=u.parentNode;p=h.getRoot().parentNode;while(t!=p&&t.nodeType!==9){s=t.children;r=s.length;while(r--){if(u===s[r]){q.push(r);break}}u=t;t=t.parentNode}return q}function k(q){var p;p=e(j,q);if(p){return{position:p.position,offset:p.offset,indexes:n(p.node),inside:p.inside}}}if(m===2){if(!j.item){l.start=k(true);if(!d.isCollapsed()){l.end=k()}}else{l.start={ctrl:true,indexes:n(j.item(0))}}}return l};this.moveToBookmark=function(k){var j,i=h.doc.body;function m(o){var r,q,n,p;r=h.getRoot();for(q=o.length-1;q>=0;q--){p=r.children;n=o[q];if(n<=p.length-1){r=p[n]}}return r}function l(r){var n=k[r?"start":"end"],q,p,o;if(n){q=n.position>0;p=i.createTextRange();p.moveToElementText(m(n.indexes));offset=n.offset;if(offset!==o){p.collapse(n.inside||q);p.moveStart("character",q?-offset:offset)}else{p.collapse(r)}j.setEndPoint(r?"StartToStart":"EndToStart",p);if(r){j.collapse(true)}}}if(k.start){if(k.start.ctrl){j=i.createControlRange();j.addElement(m(k.start.indexes));j.select()}else{j=i.createTextRange();l(true);l();j.select()}}};this.addRange=function(i){var n,l,k,p,s,q,r=d.dom.doc,m=r.body;function j(z){var u,y,t,x,v;t=h.create("a");u=z?k:s;y=z?p:q;x=n.duplicate();if(u==r||u==r.documentElement){u=m;y=0}if(u.nodeType==3){u.parentNode.insertBefore(t,u);x.moveToElementText(t);x.moveStart("character",y);h.remove(t);n.setEndPoint(z?"StartToStart":"EndToEnd",x)}else{v=u.childNodes;if(v.length){if(y>=v.length){h.insertAfter(t,v[v.length-1])}else{u.insertBefore(t,v[y])}x.moveToElementText(t)}else{t=r.createTextNode("\uFEFF");u.appendChild(t);x.moveToElementText(t.parentNode);x.collapse(c)}n.setEndPoint(z?"StartToStart":"EndToEnd",x);h.remove(t)}}k=i.startContainer;p=i.startOffset;s=i.endContainer;q=i.endOffset;n=m.createTextRange();if(k==s&&k.nodeType==1&&p==q-1){if(p==q-1){try{l=m.createControlRange();l.addElement(k.childNodes[p]);l.select();return}catch(o){}}}j(true);j();n.select()};this.getRangeAt=g}tinymce.dom.TridentSelection=a})();(function(){var p=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,j=0,d=Object.prototype.toString,o=false,i=true;[0,0].sort(function(){i=false;return 0});var b=function(v,e,z,A){z=z||[];e=e||document;var C=e;if(e.nodeType!==1&&e.nodeType!==9){return[]}if(!v||typeof v!=="string"){return z}var x=[],s,E,H,r,u=true,t=b.isXML(e),B=v,D,G,F,y;do{p.exec("");s=p.exec(B);if(s){B=s[3];x.push(s[1]);if(s[2]){r=s[3];break}}}while(s);if(x.length>1&&k.exec(v)){if(x.length===2&&f.relative[x[0]]){E=h(x[0]+x[1],e)}else{E=f.relative[x[0]]?[e]:b(x.shift(),e);while(x.length){v=x.shift();if(f.relative[v]){v+=x.shift()}E=h(v,E)}}}else{if(!A&&x.length>1&&e.nodeType===9&&!t&&f.match.ID.test(x[0])&&!f.match.ID.test(x[x.length-1])){D=b.find(x.shift(),e,t);e=D.expr?b.filter(D.expr,D.set)[0]:D.set[0]}if(e){D=A?{expr:x.pop(),set:a(A)}:b.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&e.parentNode?e.parentNode:e,t);E=D.expr?b.filter(D.expr,D.set):D.set;if(x.length>0){H=a(E)}else{u=false}while(x.length){G=x.pop();F=G;if(!f.relative[G]){G=""}else{F=x.pop()}if(F==null){F=e}f.relative[G](H,F,t)}}else{H=x=[]}}if(!H){H=E}if(!H){b.error(G||v)}if(d.call(H)==="[object Array]"){if(!u){z.push.apply(z,H)}else{if(e&&e.nodeType===1){for(y=0;H[y]!=null;y++){if(H[y]&&(H[y]===true||H[y].nodeType===1&&b.contains(e,H[y]))){z.push(E[y])}}}else{for(y=0;H[y]!=null;y++){if(H[y]&&H[y].nodeType===1){z.push(E[y])}}}}}else{a(H,z)}if(r){b(r,C,z,A);b.uniqueSort(z)}return z};b.uniqueSort=function(r){if(c){o=i;r.sort(c);if(o){for(var e=1;e<r.length;e++){if(r[e]===r[e-1]){r.splice(e--,1)}}}}return r};b.matches=function(e,r){return b(e,null,null,r)};b.find=function(y,e,z){var x;if(!y){return[]}for(var t=0,s=f.order.length;t<s;t++){var v=f.order[t],u;if((u=f.leftMatch[v].exec(y))){var r=u[1];u.splice(1,1);if(r.substr(r.length-1)!=="\\"){u[1]=(u[1]||"").replace(/\\/g,"");x=f.find[v](u,e,z);if(x!=null){y=y.replace(f.match[v],"");break}}}}if(!x){x=e.getElementsByTagName("*")}return{set:x,expr:y}};b.filter=function(C,B,F,u){var s=C,H=[],z=B,x,e,y=B&&B[0]&&b.isXML(B[0]);while(C&&B.length){for(var A in f.filter){if((x=f.leftMatch[A].exec(C))!=null&&x[2]){var r=f.filter[A],G,E,t=x[1];e=false;x.splice(1,1);if(t.substr(t.length-1)==="\\"){continue}if(z===H){H=[]}if(f.preFilter[A]){x=f.preFilter[A](x,z,F,H,u,y);if(!x){e=G=true}else{if(x===true){continue}}}if(x){for(var v=0;(E=z[v])!=null;v++){if(E){G=r(E,x,v,z);var D=u^!!G;if(F&&G!=null){if(D){e=true}else{z[v]=false}}else{if(D){H.push(E);e=true}}}}}if(G!==undefined){if(!F){z=H}C=C.replace(f.match[A],"");if(!e){return[]}break}}}if(C===s){if(e==null){b.error(C)}else{break}}s=C}return z};b.error=function(e){throw"Syntax error, unrecognized expression: "+e};var f=b.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(e){return e.getAttribute("href")}},relative:{"+":function(x,r){var t=typeof r==="string",v=t&&!/\W/.test(r),y=t&&!v;if(v){r=r.toLowerCase()}for(var s=0,e=x.length,u;s<e;s++){if((u=x[s])){while((u=u.previousSibling)&&u.nodeType!==1){}x[s]=y||u&&u.nodeName.toLowerCase()===r?u||false:u===r}}if(y){b.filter(r,x,true)}},">":function(x,r){var u=typeof r==="string",v,s=0,e=x.length;if(u&&!/\W/.test(r)){r=r.toLowerCase();for(;s<e;s++){v=x[s];if(v){var t=v.parentNode;x[s]=t.nodeName.toLowerCase()===r?t:false}}}else{for(;s<e;s++){v=x[s];if(v){x[s]=u?v.parentNode:v.parentNode===r}}if(u){b.filter(r,x,true)}}},"":function(t,r,v){var s=j++,e=q,u;if(typeof r==="string"&&!/\W/.test(r)){r=r.toLowerCase();u=r;e=n}e("parentNode",r,s,t,u,v)},"~":function(t,r,v){var s=j++,e=q,u;if(typeof r==="string"&&!/\W/.test(r)){r=r.toLowerCase();u=r;e=n}e("previousSibling",r,s,t,u,v)}},find:{ID:function(r,s,t){if(typeof s.getElementById!=="undefined"&&!t){var e=s.getElementById(r[1]);return e?[e]:[]}},NAME:function(s,v){if(typeof v.getElementsByName!=="undefined"){var r=[],u=v.getElementsByName(s[1]);for(var t=0,e=u.length;t<e;t++){if(u[t].getAttribute("name")===s[1]){r.push(u[t])}}return r.length===0?null:r}},TAG:function(e,r){return r.getElementsByTagName(e[1])}},preFilter:{CLASS:function(t,r,s,e,x,y){t=" "+t[1].replace(/\\/g,"")+" ";if(y){return t}for(var u=0,v;(v=r[u])!=null;u++){if(v){if(x^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(t)>=0)){if(!s){e.push(v)}}else{if(s){r[u]=false}}}}return false},ID:function(e){return e[1].replace(/\\/g,"")},TAG:function(r,e){return r[1].toLowerCase()},CHILD:function(e){if(e[1]==="nth"){var r=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(e[2]==="even"&&"2n"||e[2]==="odd"&&"2n+1"||!/\D/.test(e[2])&&"0n+"+e[2]||e[2]);e[2]=(r[1]+(r[2]||1))-0;e[3]=r[3]-0}e[0]=j++;return e},ATTR:function(u,r,s,e,v,x){var t=u[1].replace(/\\/g,"");if(!x&&f.attrMap[t]){u[1]=f.attrMap[t]}if(u[2]==="~="){u[4]=" "+u[4]+" "}return u},PSEUDO:function(u,r,s,e,v){if(u[1]==="not"){if((p.exec(u[3])||"").length>1||/^\w/.test(u[3])){u[3]=b(u[3],null,null,r)}else{var t=b.filter(u[3],r,s,true^v);if(!s){e.push.apply(e,t)}return false}}else{if(f.match.POS.test(u[0])||f.match.CHILD.test(u[0])){return true}}return u},POS:function(e){e.unshift(true);return e}},filters:{enabled:function(e){return e.disabled===false&&e.type!=="hidden"},disabled:function(e){return e.disabled===true},checked:function(e){return e.checked===true},selected:function(e){e.parentNode.selectedIndex;return e.selected===true},parent:function(e){return !!e.firstChild},empty:function(e){return !e.firstChild},has:function(s,r,e){return !!b(e[3],s).length},header:function(e){return(/h\d/i).test(e.nodeName)},text:function(e){return"text"===e.type},radio:function(e){return"radio"===e.type},checkbox:function(e){return"checkbox"===e.type},file:function(e){return"file"===e.type},password:function(e){return"password"===e.type},submit:function(e){return"submit"===e.type},image:function(e){return"image"===e.type},reset:function(e){return"reset"===e.type},button:function(e){return"button"===e.type||e.nodeName.toLowerCase()==="button"},input:function(e){return(/input|select|textarea|button/i).test(e.nodeName)}},setFilters:{first:function(r,e){return e===0},last:function(s,r,e,t){return r===t.length-1},even:function(r,e){return e%2===0},odd:function(r,e){return e%2===1},lt:function(s,r,e){return r<e[3]-0},gt:function(s,r,e){return r>e[3]-0},nth:function(s,r,e){return e[3]-0===r},eq:function(s,r,e){return e[3]-0===r}},filter:{PSEUDO:function(s,y,x,z){var e=y[1],r=f.filters[e];if(r){return r(s,x,y,z)}else{if(e==="contains"){return(s.textContent||s.innerText||b.getText([s])||"").indexOf(y[3])>=0}else{if(e==="not"){var t=y[3];for(var v=0,u=t.length;v<u;v++){if(t[v]===s){return false}}return true}else{b.error("Syntax error, unrecognized expression: "+e)}}}},CHILD:function(e,t){var x=t[1],r=e;switch(x){case"only":case"first":while((r=r.previousSibling)){if(r.nodeType===1){return false}}if(x==="first"){return true}r=e;case"last":while((r=r.nextSibling)){if(r.nodeType===1){return false}}return true;case"nth":var s=t[2],A=t[3];if(s===1&&A===0){return true}var v=t[0],z=e.parentNode;if(z&&(z.sizcache!==v||!e.nodeIndex)){var u=0;for(r=z.firstChild;r;r=r.nextSibling){if(r.nodeType===1){r.nodeIndex=++u}}z.sizcache=v}var y=e.nodeIndex-A;if(s===0){return y===0}else{return(y%s===0&&y/s>=0)}}},ID:function(r,e){return r.nodeType===1&&r.getAttribute("id")===e},TAG:function(r,e){return(e==="*"&&r.nodeType===1)||r.nodeName.toLowerCase()===e},CLASS:function(r,e){return(" "+(r.className||r.getAttribute("class"))+" ").indexOf(e)>-1},ATTR:function(v,t){var s=t[1],e=f.attrHandle[s]?f.attrHandle[s](v):v[s]!=null?v[s]:v.getAttribute(s),x=e+"",u=t[2],r=t[4];return e==null?u==="!=":u==="="?x===r:u==="*="?x.indexOf(r)>=0:u==="~="?(" "+x+" ").indexOf(r)>=0:!r?x&&e!==false:u==="!="?x!==r:u==="^="?x.indexOf(r)===0:u==="$="?x.substr(x.length-r.length)===r:u==="|="?x===r||x.substr(0,r.length+1)===r+"-":false},POS:function(u,r,s,v){var e=r[2],t=f.setFilters[e];if(t){return t(u,s,r,v)}}}};var k=f.match.POS,g=function(r,e){return"\\"+(e-0+1)};for(var m in f.match){f.match[m]=new RegExp(f.match[m].source+(/(?![^\[]*\])(?![^\(]*\))/.source));f.leftMatch[m]=new RegExp(/(^(?:.|\r|\n)*?)/.source+f.match[m].source.replace(/\\(\d+)/g,g))}var a=function(r,e){r=Array.prototype.slice.call(r,0);if(e){e.push.apply(e,r);return e}return r};try{Array.prototype.slice.call(document.documentElement.childNodes,0)[0].nodeType}catch(l){a=function(u,t){var r=t||[],s=0;if(d.call(u)==="[object Array]"){Array.prototype.push.apply(r,u)}else{if(typeof u.length==="number"){for(var e=u.length;s<e;s++){r.push(u[s])}}else{for(;u[s];s++){r.push(u[s])}}}return r}}var c;if(document.documentElement.compareDocumentPosition){c=function(r,e){if(!r.compareDocumentPosition||!e.compareDocumentPosition){if(r==e){o=true}return r.compareDocumentPosition?-1:1}var s=r.compareDocumentPosition(e)&4?-1:r===e?0:1;if(s===0){o=true}return s}}else{if("sourceIndex" in document.documentElement){c=function(r,e){if(!r.sourceIndex||!e.sourceIndex){if(r==e){o=true}return r.sourceIndex?-1:1}var s=r.sourceIndex-e.sourceIndex;if(s===0){o=true}return s}}else{if(document.createRange){c=function(t,r){if(!t.ownerDocument||!r.ownerDocument){if(t==r){o=true}return t.ownerDocument?-1:1}var s=t.ownerDocument.createRange(),e=r.ownerDocument.createRange();s.setStart(t,0);s.setEnd(t,0);e.setStart(r,0);e.setEnd(r,0);var u=s.compareBoundaryPoints(Range.START_TO_END,e);if(u===0){o=true}return u}}}}b.getText=function(e){var r="",t;for(var s=0;e[s];s++){t=e[s];if(t.nodeType===3||t.nodeType===4){r+=t.nodeValue}else{if(t.nodeType!==8){r+=b.getText(t.childNodes)}}}return r};(function(){var r=document.createElement("div"),s="script"+(new Date()).getTime();r.innerHTML="<a name='"+s+"'/>";var e=document.documentElement;e.insertBefore(r,e.firstChild);if(document.getElementById(s)){f.find.ID=function(u,v,x){if(typeof v.getElementById!=="undefined"&&!x){var t=v.getElementById(u[1]);return t?t.id===u[1]||typeof t.getAttributeNode!=="undefined"&&t.getAttributeNode("id").nodeValue===u[1]?[t]:undefined:[]}};f.filter.ID=function(v,t){var u=typeof v.getAttributeNode!=="undefined"&&v.getAttributeNode("id");return v.nodeType===1&&u&&u.nodeValue===t}}e.removeChild(r);e=r=null})();(function(){var e=document.createElement("div");e.appendChild(document.createComment(""));if(e.getElementsByTagName("*").length>0){f.find.TAG=function(r,v){var u=v.getElementsByTagName(r[1]);if(r[1]==="*"){var t=[];for(var s=0;u[s];s++){if(u[s].nodeType===1){t.push(u[s])}}u=t}return u}}e.innerHTML="<a href='#'></a>";if(e.firstChild&&typeof e.firstChild.getAttribute!=="undefined"&&e.firstChild.getAttribute("href")!=="#"){f.attrHandle.href=function(r){return r.getAttribute("href",2)}}e=null})();if(document.querySelectorAll){(function(){var e=b,s=document.createElement("div");s.innerHTML="<p class='TEST'></p>";if(s.querySelectorAll&&s.querySelectorAll(".TEST").length===0){return}b=function(x,v,t,u){v=v||document;if(!u&&v.nodeType===9&&!b.isXML(v)){try{return a(v.querySelectorAll(x),t)}catch(y){}}return e(x,v,t,u)};for(var r in e){b[r]=e[r]}s=null})()}(function(){var e=document.createElement("div");e.innerHTML="<div class='test e'></div><div class='test'></div>";if(!e.getElementsByClassName||e.getElementsByClassName("e").length===0){return}e.lastChild.className="e";if(e.getElementsByClassName("e").length===1){return}f.order.splice(1,0,"CLASS");f.find.CLASS=function(r,s,t){if(typeof s.getElementsByClassName!=="undefined"&&!t){return s.getElementsByClassName(r[1])}};e=null})();function n(r,x,v,A,y,z){for(var t=0,s=A.length;t<s;t++){var e=A[t];if(e){e=e[r];var u=false;while(e){if(e.sizcache===v){u=A[e.sizset];break}if(e.nodeType===1&&!z){e.sizcache=v;e.sizset=t}if(e.nodeName.toLowerCase()===x){u=e;break}e=e[r]}A[t]=u}}}function q(r,x,v,A,y,z){for(var t=0,s=A.length;t<s;t++){var e=A[t];if(e){e=e[r];var u=false;while(e){if(e.sizcache===v){u=A[e.sizset];break}if(e.nodeType===1){if(!z){e.sizcache=v;e.sizset=t}if(typeof x!=="string"){if(e===x){u=true;break}}else{if(b.filter(x,[e]).length>0){u=e;break}}}e=e[r]}A[t]=u}}}b.contains=document.compareDocumentPosition?function(r,e){return !!(r.compareDocumentPosition(e)&16)}:function(r,e){return r!==e&&(r.contains?r.contains(e):true)};b.isXML=function(e){var r=(e?e.ownerDocument||e:0).documentElement;return r?r.nodeName!=="HTML":false};var h=function(e,y){var t=[],u="",v,s=y.nodeType?[y]:y;while((v=f.match.PSEUDO.exec(e))){u+=v[0];e=e.replace(f.match.PSEUDO,"")}e=f.relative[e]?e+"*":e;for(var x=0,r=s.length;x<r;x++){b(e,s[x],t)}return b.filter(u,t)};window.tinymce.dom.Sizzle=b})();(function(d){var f=d.each,c=d.DOM,b=d.isIE,e=d.isWebKit,a;d.create("tinymce.dom.EventUtils",{EventUtils:function(){this.inits=[];this.events=[]},add:function(m,p,l,j){var g,h=this,i=h.events,k;if(p instanceof Array){k=[];f(p,function(o){k.push(h.add(m,o,l,j))});return k}if(m&&m.hasOwnProperty&&m instanceof Array){k=[];f(m,function(n){n=c.get(n);k.push(h.add(n,p,l,j))});return k}m=c.get(m);if(!m){return}g=function(n){if(h.disabled){return}n=n||window.event;if(n&&b){if(!n.target){n.target=n.srcElement}d.extend(n,h._stoppers)}if(!j){return l(n)}return l.call(j,n)};if(p=="unload"){d.unloads.unshift({func:g});return g}if(p=="init"){if(h.domLoaded){g()}else{h.inits.push(g)}return g}i.push({obj:m,name:p,func:l,cfunc:g,scope:j});h._add(m,p,g);return l},remove:function(l,m,k){var h=this,g=h.events,i=false,j;if(l&&l.hasOwnProperty&&l instanceof Array){j=[];f(l,function(n){n=c.get(n);j.push(h.remove(n,m,k))});return j}l=c.get(l);f(g,function(o,n){if(o.obj==l&&o.name==m&&(!k||(o.func==k||o.cfunc==k))){g.splice(n,1);h._remove(l,m,o.cfunc);i=true;return false}});return i},clear:function(l){var j=this,g=j.events,h,k;if(l){l=c.get(l);for(h=g.length-1;h>=0;h--){k=g[h];if(k.obj===l){j._remove(k.obj,k.name,k.cfunc);k.obj=k.cfunc=null;g.splice(h,1)}}}},cancel:function(g){if(!g){return false}this.stop(g);return this.prevent(g)},stop:function(g){if(g.stopPropagation){g.stopPropagation()}else{g.cancelBubble=true}return false},prevent:function(g){if(g.preventDefault){g.preventDefault()}else{g.returnValue=false}return false},destroy:function(){var g=this;f(g.events,function(j,h){g._remove(j.obj,j.name,j.cfunc);j.obj=j.cfunc=null});g.events=[];g=null},_add:function(h,i,g){if(h.attachEvent){h.attachEvent("on"+i,g)}else{if(h.addEventListener){h.addEventListener(i,g,false)}else{h["on"+i]=g}}},_remove:function(i,j,h){if(i){try{if(i.detachEvent){i.detachEvent("on"+j,h)}else{if(i.removeEventListener){i.removeEventListener(j,h,false)}else{i["on"+j]=null}}}catch(g){}}},_pageInit:function(h){var g=this;if(g.domLoaded){return}g.domLoaded=true;f(g.inits,function(i){i()});g.inits=[]},_wait:function(i){var g=this,h=i.document;if(i.tinyMCE_GZ&&tinyMCE_GZ.loaded){g.domLoaded=1;return}if(h.attachEvent){h.attachEvent("onreadystatechange",function(){if(h.readyState==="complete"){h.detachEvent("onreadystatechange",arguments.callee);g._pageInit(i)}});if(h.documentElement.doScroll&&i==i.top){(function(){if(g.domLoaded){return}try{h.documentElement.doScroll("left")}catch(j){setTimeout(arguments.callee,0);return}g._pageInit(i)})()}}else{if(h.addEventListener){g._add(i,"DOMContentLoaded",function(){g._pageInit(i)})}}g._add(i,"load",function(){g._pageInit(i)})},_stoppers:{preventDefault:function(){this.returnValue=false},stopPropagation:function(){this.cancelBubble=true}}});a=d.dom.Event=new d.dom.EventUtils();a._wait(window);d.addUnload(function(){a.destroy()})})(tinymce);(function(a){a.dom.Element=function(f,d){var b=this,e,c;b.settings=d=d||{};b.id=f;b.dom=e=d.dom||a.DOM;if(!a.isIE){c=e.get(b.id)}a.each(("getPos,getRect,getParent,add,setStyle,getStyle,setStyles,setAttrib,setAttribs,getAttrib,addClass,removeClass,hasClass,getOuterHTML,setOuterHTML,remove,show,hide,isHidden,setHTML,get").split(/,/),function(g){b[g]=function(){var h=[f],j;for(j=0;j<arguments.length;j++){h.push(arguments[j])}h=e[g].apply(e,h);b.update(g);return h}});a.extend(b,{on:function(i,h,g){return a.dom.Event.add(b.id,i,h,g)},getXY:function(){return{x:parseInt(b.getStyle("left")),y:parseInt(b.getStyle("top"))}},getSize:function(){var g=e.get(b.id);return{w:parseInt(b.getStyle("width")||g.clientWidth),h:parseInt(b.getStyle("height")||g.clientHeight)}},moveTo:function(g,h){b.setStyles({left:g,top:h})},moveBy:function(g,i){var h=b.getXY();b.moveTo(h.x+g,h.y+i)},resizeTo:function(g,i){b.setStyles({width:g,height:i})},resizeBy:function(g,j){var i=b.getSize();b.resizeTo(i.w+g,i.h+j)},update:function(h){var g;if(a.isIE6&&d.blocker){h=h||"";if(h.indexOf("get")===0||h.indexOf("has")===0||h.indexOf("is")===0){return}if(h=="remove"){e.remove(b.blocker);return}if(!b.blocker){b.blocker=e.uniqueId();g=e.add(d.container||e.getRoot(),"iframe",{id:b.blocker,style:"position:absolute;",frameBorder:0,src:'javascript:""'});e.setStyle(g,"opacity",0)}else{g=e.get(b.blocker)}e.setStyles(g,{left:b.getStyle("left",1),top:b.getStyle("top",1),width:b.getStyle("width",1),height:b.getStyle("height",1),display:b.getStyle("display",1),zIndex:parseInt(b.getStyle("zIndex",1)||0)-1})}}})}})(tinymce);(function(c){function e(f){return f.replace(/[\n\r]+/g,"")}var b=c.is,a=c.isIE,d=c.each;c.create("tinymce.dom.Selection",{Selection:function(i,h,g){var f=this;f.dom=i;f.win=h;f.serializer=g;d(["onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent"],function(j){f[j]=new c.util.Dispatcher(f)});if(!f.win.getSelection){f.tridentSel=new c.dom.TridentSelection(f)}if(c.isIE&&i.boxModel){this._fixIESelection()}c.addUnload(f.destroy,f)},setCursorLocation:function(h,i){var f=this;var g=f.dom.createRng();g.setStart(h,i);g.setEnd(h,i);f.setRng(g);f.collapse(false)},getContent:function(g){var f=this,h=f.getRng(),l=f.dom.create("body"),j=f.getSel(),i,k,m;g=g||{};i=k="";g.get=true;g.format=g.format||"html";g.forced_root_block="";f.onBeforeGetContent.dispatch(f,g);if(g.format=="text"){return f.isCollapsed()?"":(h.text||(j.toString?j.toString():""))}if(h.cloneContents){m=h.cloneContents();if(m){l.appendChild(m)}}else{if(b(h.item)||b(h.htmlText)){l.innerHTML="<br>"+(h.item?h.item(0).outerHTML:h.htmlText);l.removeChild(l.firstChild)}else{l.innerHTML=h.toString()}}if(/^\s/.test(l.innerHTML)){i=" "}if(/\s+$/.test(l.innerHTML)){k=" "}g.getInner=true;g.content=f.isCollapsed()?"":i+f.serializer.serialize(l,g)+k;f.onGetContent.dispatch(f,g);return g.content},setContent:function(g,i){var n=this,f=n.getRng(),j,k=n.win.document,m,l;i=i||{format:"html"};i.set=true;g=i.content=g;if(!i.no_events){n.onBeforeSetContent.dispatch(n,i)}g=i.content;if(f.insertNode){g+='<span id="__caret">_</span>';if(f.startContainer==k&&f.endContainer==k){k.body.innerHTML=g}else{f.deleteContents();if(k.body.childNodes.length==0){k.body.innerHTML=g}else{if(f.createContextualFragment){f.insertNode(f.createContextualFragment(g))}else{m=k.createDocumentFragment();l=k.createElement("div");m.appendChild(l);l.outerHTML=g;f.insertNode(m)}}}j=n.dom.get("__caret");f=k.createRange();f.setStartBefore(j);f.setEndBefore(j);n.setRng(f);n.dom.remove("__caret");try{n.setRng(f)}catch(h){}}else{if(f.item){k.execCommand("Delete",false,null);f=n.getRng()}if(/^\s+/.test(g)){f.pasteHTML('<span id="__mce_tmp">_</span>'+g);n.dom.remove("__mce_tmp")}else{f.pasteHTML(g)}}if(!i.no_events){n.onSetContent.dispatch(n,i)}},getStart:function(){var g=this.getRng(),h,f,j,i;if(g.duplicate||g.item){if(g.item){return g.item(0)}j=g.duplicate();j.collapse(1);h=j.parentElement();f=i=g.parentElement();while(i=i.parentNode){if(i==h){h=f;break}}return h}else{h=g.startContainer;if(h.nodeType==1&&h.hasChildNodes()){h=h.childNodes[Math.min(h.childNodes.length-1,g.startOffset)]}if(h&&h.nodeType==3){return h.parentNode}return h}},getEnd:function(){var g=this,h=g.getRng(),i,f;if(h.duplicate||h.item){if(h.item){return h.item(0)}h=h.duplicate();h.collapse(0);i=h.parentElement();if(i&&i.nodeName=="BODY"){return i.lastChild||i}return i}else{i=h.endContainer;f=h.endOffset;if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[f>0?f-1:f]}if(i&&i.nodeType==3){return i.parentNode}return i}},getBookmark:function(r,s){var v=this,m=v.dom,g,j,i,n,h,o,p,l="\uFEFF",u;function f(x,y){var t=0;d(m.select(x),function(A,z){if(A==y){t=z}});return t}if(r==2){function k(){var x=v.getRng(true),t=m.getRoot(),y={};function z(C,H){var B=C[H?"startContainer":"endContainer"],G=C[H?"startOffset":"endOffset"],A=[],D,F,E=0;if(B.nodeType==3){if(s){for(D=B.previousSibling;D&&D.nodeType==3;D=D.previousSibling){G+=D.nodeValue.length}}A.push(G)}else{F=B.childNodes;if(G>=F.length&&F.length){E=1;G=Math.max(0,F.length-1)}A.push(v.dom.nodeIndex(F[G],s)+E)}for(;B&&B!=t;B=B.parentNode){A.push(v.dom.nodeIndex(B,s))}return A}y.start=z(x,true);if(!v.isCollapsed()){y.end=z(x)}return y}if(v.tridentSel){return v.tridentSel.getBookmark(r)}return k()}if(r){return{rng:v.getRng()}}g=v.getRng();i=m.uniqueId();n=tinyMCE.activeEditor.selection.isCollapsed();u="overflow:hidden;line-height:0px";if(g.duplicate||g.item){if(!g.item){j=g.duplicate();try{g.collapse();g.pasteHTML('<span data-mce-type="bookmark" id="'+i+'_start" style="'+u+'">'+l+"</span>");if(!n){j.collapse(false);g.moveToElementText(j.parentElement());if(g.compareEndPoints("StartToEnd",j)==0){j.move("character",-1)}j.pasteHTML('<span data-mce-type="bookmark" id="'+i+'_end" style="'+u+'">'+l+"</span>")}}catch(q){return null}}else{o=g.item(0);h=o.nodeName;return{name:h,index:f(h,o)}}}else{o=v.getNode();h=o.nodeName;if(h=="IMG"){return{name:h,index:f(h,o)}}j=g.cloneRange();if(!n){j.collapse(false);j.insertNode(m.create("span",{"data-mce-type":"bookmark",id:i+"_end",style:u},l))}g.collapse(true);g.insertNode(m.create("span",{"data-mce-type":"bookmark",id:i+"_start",style:u},l))}v.moveToBookmark({id:i,keep:1});return{id:i}},moveToBookmark:function(n){var r=this,l=r.dom,i,h,f,q,j,s,o,p;if(n){if(n.start){f=l.createRng();q=l.getRoot();function g(z){var t=n[z?"start":"end"],v,x,y,u;if(t){y=t[0];for(x=q,v=t.length-1;v>=1;v--){u=x.childNodes;if(t[v]>u.length-1){return}x=u[t[v]]}if(x.nodeType===3){y=Math.min(t[0],x.nodeValue.length)}if(x.nodeType===1){y=Math.min(t[0],x.childNodes.length)}if(z){f.setStart(x,y)}else{f.setEnd(x,y)}}return true}if(r.tridentSel){return r.tridentSel.moveToBookmark(n)}if(g(true)&&g()){r.setRng(f)}}else{if(n.id){function k(A){var u=l.get(n.id+"_"+A),z,t,x,y,v=n.keep;if(u){z=u.parentNode;if(A=="start"){if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}j=s=z;o=p=t}else{if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}s=z;p=t}if(!v){y=u.previousSibling;x=u.nextSibling;d(c.grep(u.childNodes),function(B){if(B.nodeType==3){B.nodeValue=B.nodeValue.replace(/\uFEFF/g,"")}});while(u=l.get(n.id+"_"+A)){l.remove(u,1)}if(y&&x&&y.nodeType==x.nodeType&&y.nodeType==3&&!c.isOpera){t=y.nodeValue.length;y.appendData(x.nodeValue);l.remove(x);if(A=="start"){j=s=y;o=p=t}else{s=y;p=t}}}}}function m(t){if(l.isBlock(t)&&!t.innerHTML){t.innerHTML=!a?'<br data-mce-bogus="1" />':" "}return t}k("start");k("end");if(j){f=l.createRng();f.setStart(m(j),o);f.setEnd(m(s),p);r.setRng(f)}}else{if(n.name){r.select(l.select(n.name)[n.index])}else{if(n.rng){r.setRng(n.rng)}}}}}},select:function(k,j){var i=this,l=i.dom,g=l.createRng(),f;if(k){f=l.nodeIndex(k);g.setStart(k.parentNode,f);g.setEnd(k.parentNode,f+1);if(j){function h(m,o){var n=new c.dom.TreeWalker(m,m);do{if(m.nodeType==3&&c.trim(m.nodeValue).length!=0){if(o){g.setStart(m,0)}else{g.setEnd(m,m.nodeValue.length)}return}if(m.nodeName=="BR"){if(o){g.setStartBefore(m)}else{g.setEndBefore(m)}return}}while(m=(o?n.next():n.prev()))}h(k,1);h(k)}i.setRng(g)}return k},isCollapsed:function(){var f=this,h=f.getRng(),g=f.getSel();if(!h||h.item){return false}if(h.compareEndPoints){return h.compareEndPoints("StartToEnd",h)===0}return !g||h.collapsed},collapse:function(f){var h=this,g=h.getRng(),i;if(g.item){i=g.item(0);g=h.win.document.body.createTextRange();g.moveToElementText(i)}g.collapse(!!f);h.setRng(g)},getSel:function(){var g=this,f=this.win;return f.getSelection?f.getSelection():f.document.selection},getRng:function(l){var g=this,h,i,k,j=g.win.document;if(l&&g.tridentSel){return g.tridentSel.getRangeAt(0)}try{if(h=g.getSel()){i=h.rangeCount>0?h.getRangeAt(0):(h.createRange?h.createRange():j.createRange())}}catch(f){}if(c.isIE&&i&&i.setStart&&j.selection.createRange().item){k=j.selection.createRange().item(0);i=j.createRange();i.setStartBefore(k);i.setEndAfter(k)}if(!i){i=j.createRange?j.createRange():j.body.createTextRange()}if(g.selectedRange&&g.explicitRange){if(i.compareBoundaryPoints(i.START_TO_START,g.selectedRange)===0&&i.compareBoundaryPoints(i.END_TO_END,g.selectedRange)===0){i=g.explicitRange}else{g.selectedRange=null;g.explicitRange=null}}return i},setRng:function(i){var h,g=this;if(!g.tridentSel){h=g.getSel();if(h){g.explicitRange=i;try{h.removeAllRanges()}catch(f){}h.addRange(i);g.selectedRange=h.getRangeAt(0)}}else{if(i.cloneRange){g.tridentSel.addRange(i);return}try{i.select()}catch(f){}}},setNode:function(g){var f=this;f.setContent(f.dom.getOuterHTML(g));return g},getNode:function(){var h=this,g=h.getRng(),i=h.getSel(),l,k=g.startContainer,f=g.endContainer;if(!g){return h.dom.getRoot()}if(g.setStart){l=g.commonAncestorContainer;if(!g.collapsed){if(g.startContainer==g.endContainer){if(g.endOffset-g.startOffset<2){if(g.startContainer.hasChildNodes()){l=g.startContainer.childNodes[g.startOffset]}}}if(k.nodeType===3&&f.nodeType===3){function j(p,m){var o=p;while(p&&p.nodeType===3&&p.length===0){p=m?p.nextSibling:p.previousSibling}return p||o}if(k.length===g.startOffset){k=j(k.nextSibling,true)}else{k=k.parentNode}if(g.endOffset===0){f=j(f.previousSibling,false)}else{f=f.parentNode}if(k&&k===f){return k}}}if(l&&l.nodeType==3){return l.parentNode}return l}return g.item?g.item(0):g.parentElement()},getSelectedBlocks:function(o,g){var m=this,j=m.dom,l,k,h,i=[];l=j.getParent(o||m.getStart(),j.isBlock);k=j.getParent(g||m.getEnd(),j.isBlock);if(l){i.push(l)}if(l&&k&&l!=k){h=l;var f=new c.dom.TreeWalker(l,j.getRoot());while((h=f.next())&&h!=k){if(j.isBlock(h)){i.push(h)}}}if(k&&l!=k){i.push(k)}return i},normalize:function(){var g=this,f,i;if(c.isIE){return}function h(p){var k,o,n,m=g.dom,j=m.getRoot(),l;k=f[(p?"start":"end")+"Container"];o=f[(p?"start":"end")+"Offset"];if(k.nodeType===9){k=k.body;o=0}if(k===j){if(k.hasChildNodes()){k=k.childNodes[Math.min(!p&&o>0?o-1:o,k.childNodes.length-1)];o=0;if(k.hasChildNodes()){l=k;n=new c.dom.TreeWalker(k,j);do{if(l.nodeType===3){o=p?0:l.nodeValue.length-1;k=l;break}if(l.nodeName==="BR"){o=m.nodeIndex(l);k=l.parentNode;break}}while(l=(p?n.next():n.prev()));i=true}}}if(i){f["set"+(p?"Start":"End")](k,o)}}f=g.getRng();h(true);if(f.collapsed){h()}if(i){g.setRng(f)}},destroy:function(g){var f=this;f.win=null;if(!g){c.removeUnload(f.destroy)}},_fixIESelection:function(){var g=this.dom,m=g.doc,h=m.body,j,n,f;m.documentElement.unselectable=true;function i(o,r){var p=h.createTextRange();try{p.moveToPoint(o,r)}catch(q){p=null}return p}function l(p){var o;if(p.button){o=i(p.x,p.y);if(o){if(o.compareEndPoints("StartToStart",n)>0){o.setEndPoint("StartToStart",n)}else{o.setEndPoint("EndToEnd",n)}o.select()}}else{k()}}function k(){var o=m.selection.createRange();if(n&&!o.item&&o.compareEndPoints("StartToEnd",o)===0){n.select()}g.unbind(m,"mouseup",k);g.unbind(m,"mousemove",l);n=j=0}g.bind(m,["mousedown","contextmenu"],function(o){if(o.target.nodeName==="HTML"){if(j){k()}f=m.documentElement;if(f.scrollHeight>f.clientHeight){return}j=1;n=i(o.x,o.y);if(n){g.bind(m,"mouseup",k);g.bind(m,"mousemove",l);g.win.focus();n.select()}}})}})})(tinymce);(function(a){a.dom.Serializer=function(e,i,f){var h,b,d=a.isIE,g=a.each,c;if(!e.apply_source_formatting){e.indent=false}e.remove_trailing_brs=true;i=i||a.DOM;f=f||new a.html.Schema(e);e.entity_encoding=e.entity_encoding||"named";h=new a.util.Dispatcher(self);b=new a.util.Dispatcher(self);c=new a.html.DomParser(e,f);c.addAttributeFilter("src,href,style",function(k,j){var o=k.length,l,q,n="data-mce-"+j,p=e.url_converter,r=e.url_converter_scope,m;while(o--){l=k[o];q=l.attributes.map[n];if(q!==m){l.attr(j,q.length>0?q:null);l.attr(n,null)}else{q=l.attributes.map[j];if(j==="style"){q=i.serializeStyle(i.parseStyle(q),l.name)}else{if(p){q=p.call(r,q,j,l.name)}}l.attr(j,q.length>0?q:null)}}});c.addAttributeFilter("class",function(j,k){var l=j.length,m,n;while(l--){m=j[l];n=m.attr("class").replace(/\s*mce(Item\w+|Selected)\s*/g,"");m.attr("class",n.length>0?n:null)}});c.addAttributeFilter("data-mce-type",function(j,l,k){var m=j.length,n;while(m--){n=j[m];if(n.attributes.map["data-mce-type"]==="bookmark"&&!k.cleanup){n.remove()}}});c.addNodeFilter("script,style",function(k,l){var m=k.length,n,o;function j(p){return p.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g,"").replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g,"")}while(m--){n=k[m];o=n.firstChild?n.firstChild.value:"";if(l==="script"){n.attr("type",(n.attr("type")||"text/javascript").replace(/^mce\-/,""));if(o.length>0){n.firstChild.value="// <![CDATA[\n"+j(o)+"\n// ]]>"}}else{if(o.length>0){n.firstChild.value="<!--\n"+j(o)+"\n-->"}}}});c.addNodeFilter("#comment",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.value.indexOf("[CDATA[")===0){m.name="#cdata";m.type=4;m.value=m.value.replace(/^\[CDATA\[|\]\]$/g,"")}else{if(m.value.indexOf("mce:protected ")===0){m.name="#text";m.type=3;m.raw=true;m.value=unescape(m.value).substr(14)}}}});c.addNodeFilter("xml:namespace,input",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.type===7){m.remove()}else{if(m.type===1){if(k==="input"&&!("type" in m.attributes.map)){m.attr("type","text")}}}}});if(e.fix_list_elements){c.addNodeFilter("ul,ol",function(k,l){var m=k.length,n,j;while(m--){n=k[m];j=n.parent;if(j.name==="ul"||j.name==="ol"){if(n.prev&&n.prev.name==="li"){n.prev.append(n)}}}})}c.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style",function(j,k){var l=j.length;while(l--){j[l].attr(k,null)}});return{schema:f,addNodeFilter:c.addNodeFilter,addAttributeFilter:c.addAttributeFilter,onPreProcess:h,onPostProcess:b,serialize:function(o,m){var l,p,k,j,n;if(d&&i.select("script,style,select,map").length>0){n=o.innerHTML;o=o.cloneNode(false);i.setHTML(o,n)}else{o=o.cloneNode(true)}l=o.ownerDocument.implementation;if(l.createHTMLDocument){p=l.createHTMLDocument("");g(o.nodeName=="BODY"?o.childNodes:[o],function(q){p.body.appendChild(p.importNode(q,true))});if(o.nodeName!="BODY"){o=p.body.firstChild}else{o=p.body}k=i.doc;i.doc=p}m=m||{};m.format=m.format||"html";if(!m.no_events){m.node=o;h.dispatch(self,m)}j=new a.html.Serializer(e,f);m.content=j.serialize(c.parse(m.getInner?o.innerHTML:a.trim(i.getOuterHTML(o),m),m));if(!m.cleanup){m.content=m.content.replace(/\uFEFF|\u200B/g,"")}if(!m.no_events){b.dispatch(self,m)}if(k){i.doc=k}m.node=null;return m.content},addRules:function(j){f.addValidElements(j)},setRules:function(j){f.setValidElements(j)}}}})(tinymce);(function(a){a.dom.ScriptLoader=function(h){var c=0,k=1,i=2,l={},j=[],f={},d=[],g=0,e;function b(m,v){var x=this,q=a.DOM,s,o,r,n;function p(){q.remove(n);if(s){s.onreadystatechange=s.onload=s=null}v()}function u(){if(typeof(console)!=="undefined"&&console.log){console.log("Failed to load: "+m)}}n=q.uniqueId();if(a.isIE6){o=new a.util.URI(m);r=location;if(o.host==r.hostname&&o.port==r.port&&(o.protocol+":")==r.protocol&&o.protocol.toLowerCase()!="file"){a.util.XHR.send({url:a._addVer(o.getURI()),success:function(y){var t=q.create("script",{type:"text/javascript"});t.text=y;document.getElementsByTagName("head")[0].appendChild(t);q.remove(t);p()},error:u});return}}s=q.create("script",{id:n,type:"text/javascript",src:a._addVer(m)});if(!a.isIE){s.onload=p}s.onerror=u;if(!a.isOpera){s.onreadystatechange=function(){var t=s.readyState;if(t=="complete"||t=="loaded"){p()}}}(document.getElementsByTagName("head")[0]||document.body).appendChild(s)}this.isDone=function(m){return l[m]==i};this.markDone=function(m){l[m]=i};this.add=this.load=function(m,q,n){var o,p=l[m];if(p==e){j.push(m);l[m]=c}if(q){if(!f[m]){f[m]=[]}f[m].push({func:q,scope:n||this})}};this.loadQueue=function(n,m){this.loadScripts(j,n,m)};this.loadScripts=function(m,q,p){var o;function n(r){a.each(f[r],function(s){s.func.call(s.scope)});f[r]=e}d.push({func:q,scope:p||this});o=function(){var r=a.grep(m);m.length=0;a.each(r,function(s){if(l[s]==i){n(s);return}if(l[s]!=k){l[s]=k;g++;b(s,function(){l[s]=i;g--;n(s);o()})}});if(!g){a.each(d,function(s){s.func.call(s.scope)});d.length=0}};o()}};a.ScriptLoader=new a.dom.ScriptLoader()})(tinymce);tinymce.dom.TreeWalker=function(a,c){var b=a;function d(i,f,e,j){var h,g;if(i){if(!j&&i[f]){return i[f]}if(i!=c){h=i[e];if(h){return h}for(g=i.parentNode;g&&g!=c;g=g.parentNode){h=g[e];if(h){return h}}}}}this.current=function(){return b};this.next=function(e){return(b=d(b,"firstChild","nextSibling",e))};this.prev=function(e){return(b=d(b,"lastChild","previousSibling",e))}};(function(a){a.dom.RangeUtils=function(c){var b="\uFEFF";this.walk=function(d,s){var i=d.startContainer,l=d.startOffset,t=d.endContainer,m=d.endOffset,j,g,o,h,r,q,e;e=c.select("td.mceSelected,th.mceSelected");if(e.length>0){a.each(e,function(u){s([u])});return}function f(u){var v;v=u[0];if(v.nodeType===3&&v===i&&l>=v.nodeValue.length){u.splice(0,1)}v=u[u.length-1];if(m===0&&u.length>0&&v===t&&v.nodeType===3){u.splice(u.length-1,1)}return u}function p(x,v,u){var y=[];for(;x&&x!=u;x=x[v]){y.push(x)}return y}function n(v,u){do{if(v.parentNode==u){return v}v=v.parentNode}while(v)}function k(x,v,y){var u=y?"nextSibling":"previousSibling";for(h=x,r=h.parentNode;h&&h!=v;h=r){r=h.parentNode;q=p(h==x?h:h[u],u);if(q.length){if(!y){q.reverse()}s(f(q))}}}if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[l]}if(t.nodeType==1&&t.hasChildNodes()){t=t.childNodes[Math.min(m-1,t.childNodes.length-1)]}if(i==t){return s(f([i]))}j=c.findCommonAncestor(i,t);for(h=i;h;h=h.parentNode){if(h===t){return k(i,j,true)}if(h===j){break}}for(h=t;h;h=h.parentNode){if(h===i){return k(t,j)}if(h===j){break}}g=n(i,j)||i;o=n(t,j)||t;k(i,g,true);q=p(g==i?g:g.nextSibling,"nextSibling",o==t?o.nextSibling:o);if(q.length){s(f(q))}k(t,o)};this.split=function(e){var h=e.startContainer,d=e.startOffset,i=e.endContainer,g=e.endOffset;function f(j,k){return j.splitText(k)}if(h==i&&h.nodeType==3){if(d>0&&d<h.nodeValue.length){i=f(h,d);h=i.previousSibling;if(g>d){g=g-d;h=i=f(i,g).previousSibling;g=i.nodeValue.length;d=0}else{g=0}}}else{if(h.nodeType==3&&d>0&&d<h.nodeValue.length){h=f(h,d);d=0}if(i.nodeType==3&&g>0&&g<i.nodeValue.length){i=f(i,g).previousSibling;g=i.nodeValue.length}}return{startContainer:h,startOffset:d,endContainer:i,endOffset:g}}};a.dom.RangeUtils.compareRanges=function(c,b){if(c&&b){if(c.item||c.duplicate){if(c.item&&b.item&&c.item(0)===b.item(0)){return true}if(c.isEqual&&b.isEqual&&b.isEqual(c)){return true}}else{return c.startContainer==b.startContainer&&c.startOffset==b.startOffset}}return false}})(tinymce);(function(b){var a=b.dom.Event,c=b.each;b.create("tinymce.ui.KeyboardNavigation",{KeyboardNavigation:function(e,f){var p=this,m=e.root,l=e.items,n=e.enableUpDown,i=e.enableLeftRight||!e.enableUpDown,k=e.excludeFromTabOrder,j,h,o,d,g;f=f||b.DOM;j=function(q){g=q.target.id};h=function(q){f.setAttrib(q.target.id,"tabindex","-1")};d=function(q){var r=f.get(g);f.setAttrib(r,"tabindex","0");r.focus()};p.focus=function(){f.get(g).focus()};p.destroy=function(){c(l,function(q){f.unbind(f.get(q.id),"focus",j);f.unbind(f.get(q.id),"blur",h)});f.unbind(f.get(m),"focus",d);f.unbind(f.get(m),"keydown",o);l=f=m=p.focus=j=h=o=d=null;p.destroy=function(){}};p.moveFocus=function(u,r){var q=-1,t=p.controls,s;if(!g){return}c(l,function(x,v){if(x.id===g){q=v;return false}});q+=u;if(q<0){q=l.length-1}else{if(q>=l.length){q=0}}s=l[q];f.setAttrib(g,"tabindex","-1");f.setAttrib(s.id,"tabindex","0");f.get(s.id).focus();if(e.actOnFocus){e.onAction(s.id)}if(r){a.cancel(r)}};o=function(y){var u=37,t=39,x=38,z=40,q=27,s=14,r=13,v=32;switch(y.keyCode){case u:if(i){p.moveFocus(-1)}break;case t:if(i){p.moveFocus(1)}break;case x:if(n){p.moveFocus(-1)}break;case z:if(n){p.moveFocus(1)}break;case q:if(e.onCancel){e.onCancel();a.cancel(y)}break;case s:case r:case v:if(e.onAction){e.onAction(g);a.cancel(y)}break}};c(l,function(s,q){var r;if(!s.id){s.id=f.uniqueId("_mce_item_")}if(k){f.bind(s.id,"blur",h);r="-1"}else{r=(q===0?"0":"-1")}f.setAttrib(s.id,"tabindex",r);f.bind(f.get(s.id),"focus",j)});if(l[0]){g=l[0].id}f.setAttrib(m,"tabindex","-1");f.bind(f.get(m),"focus",d);f.bind(f.get(m),"keydown",o)}})})(tinymce);(function(c){var b=c.DOM,a=c.is;c.create("tinymce.ui.Control",{Control:function(f,e,d){this.id=f;this.settings=e=e||{};this.rendered=false;this.onRender=new c.util.Dispatcher(this);this.classPrefix="";this.scope=e.scope||this;this.disabled=0;this.active=0;this.editor=d},setAriaProperty:function(f,e){var d=b.get(this.id+"_aria")||b.get(this.id);if(d){b.setAttrib(d,"aria-"+f,!!e)}},focus:function(){b.get(this.id).focus()},setDisabled:function(d){if(d!=this.disabled){this.setAriaProperty("disabled",d);this.setState("Disabled",d);this.setState("Enabled",!d);this.disabled=d}},isDisabled:function(){return this.disabled},setActive:function(d){if(d!=this.active){this.setState("Active",d);this.active=d;this.setAriaProperty("pressed",d)}},isActive:function(){return this.active},setState:function(f,d){var e=b.get(this.id);f=this.classPrefix+f;if(d){b.addClass(e,f)}else{b.removeClass(e,f)}},isRendered:function(){return this.rendered},renderHTML:function(){},renderTo:function(d){b.setHTML(d,this.renderHTML())},postRender:function(){var e=this,d;if(a(e.disabled)){d=e.disabled;e.disabled=-1;e.setDisabled(d)}if(a(e.active)){d=e.active;e.active=-1;e.setActive(d)}},remove:function(){b.remove(this.id);this.destroy()},destroy:function(){c.dom.Event.clear(this.id)}})})(tinymce);tinymce.create("tinymce.ui.Container:tinymce.ui.Control",{Container:function(c,b,a){this.parent(c,b,a);this.controls=[];this.lookup={}},add:function(a){this.lookup[a.id]=a;this.controls.push(a);return a},get:function(a){return this.lookup[a]}});tinymce.create("tinymce.ui.Separator:tinymce.ui.Control",{Separator:function(b,a){this.parent(b,a);this.classPrefix="mceSeparator";this.setDisabled(true)},renderHTML:function(){return tinymce.DOM.createHTML("span",{"class":this.classPrefix,role:"separator","aria-orientation":"vertical",tabindex:"-1"})}});(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.MenuItem:tinymce.ui.Control",{MenuItem:function(g,f){this.parent(g,f);this.classPrefix="mceMenuItem"},setSelected:function(f){this.setState("Selected",f);this.setAriaProperty("checked",!!f);this.selected=f},isSelected:function(){return this.selected},postRender:function(){var f=this;f.parent();if(c(f.selected)){f.setSelected(f.selected)}}})})(tinymce);(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.Menu:tinymce.ui.MenuItem",{Menu:function(h,g){var f=this;f.parent(h,g);f.items={};f.collapsed=false;f.menuCount=0;f.onAddItem=new d.util.Dispatcher(this)},expand:function(g){var f=this;if(g){a(f,function(h){if(h.expand){h.expand()}},"items",f)}f.collapsed=false},collapse:function(g){var f=this;if(g){a(f,function(h){if(h.collapse){h.collapse()}},"items",f)}f.collapsed=true},isCollapsed:function(){return this.collapsed},add:function(f){if(!f.settings){f=new d.ui.MenuItem(f.id||b.uniqueId(),f)}this.onAddItem.dispatch(this,f);return this.items[f.id]=f},addSeparator:function(){return this.add({separator:true})},addMenu:function(f){if(!f.collapse){f=this.createMenu(f)}this.menuCount++;return this.add(f)},hasMenus:function(){return this.menuCount!==0},remove:function(f){delete this.items[f.id]},removeAll:function(){var f=this;a(f,function(g){if(g.removeAll){g.removeAll()}else{g.remove()}g.destroy()},"items",f);f.items={}},createMenu:function(g){var f=new d.ui.Menu(g.id||b.uniqueId(),g);f.onAddItem.add(this.onAddItem.dispatch,this.onAddItem);return f}})})(tinymce);(function(e){var d=e.is,c=e.DOM,f=e.each,a=e.dom.Event,b=e.dom.Element;e.create("tinymce.ui.DropMenu:tinymce.ui.Menu",{DropMenu:function(h,g){g=g||{};g.container=g.container||c.doc.body;g.offset_x=g.offset_x||0;g.offset_y=g.offset_y||0;g.vp_offset_x=g.vp_offset_x||0;g.vp_offset_y=g.vp_offset_y||0;if(d(g.icons)&&!g.icons){g["class"]+=" mceNoIcons"}this.parent(h,g);this.onShowMenu=new e.util.Dispatcher(this);this.onHideMenu=new e.util.Dispatcher(this);this.classPrefix="mceMenu"},createMenu:function(j){var h=this,i=h.settings,g;j.container=j.container||i.container;j.parent=h;j.constrain=j.constrain||i.constrain;j["class"]=j["class"]||i["class"];j.vp_offset_x=j.vp_offset_x||i.vp_offset_x;j.vp_offset_y=j.vp_offset_y||i.vp_offset_y;j.keyboard_focus=i.keyboard_focus;g=new e.ui.DropMenu(j.id||c.uniqueId(),j);g.onAddItem.add(h.onAddItem.dispatch,h.onAddItem);return g},focus:function(){var g=this;if(g.keyboardNav){g.keyboardNav.focus()}},update:function(){var i=this,j=i.settings,g=c.get("menu_"+i.id+"_tbl"),l=c.get("menu_"+i.id+"_co"),h,k;h=j.max_width?Math.min(g.clientWidth,j.max_width):g.clientWidth;k=j.max_height?Math.min(g.clientHeight,j.max_height):g.clientHeight;if(!c.boxModel){i.element.setStyles({width:h+2,height:k+2})}else{i.element.setStyles({width:h,height:k})}if(j.max_width){c.setStyle(l,"width",h)}if(j.max_height){c.setStyle(l,"height",k);if(g.clientHeight<j.max_height){c.setStyle(l,"overflow","hidden")}}},showMenu:function(p,n,r){var z=this,A=z.settings,o,g=c.getViewPort(),u,l,v,q,i=2,k,j,m=z.classPrefix;z.collapse(1);if(z.isMenuVisible){return}if(!z.rendered){o=c.add(z.settings.container,z.renderNode());f(z.items,function(h){h.postRender()});z.element=new b("menu_"+z.id,{blocker:1,container:A.container})}else{o=c.get("menu_"+z.id)}if(!e.isOpera){c.setStyles(o,{left:-65535,top:-65535})}c.show(o);z.update();p+=A.offset_x||0;n+=A.offset_y||0;g.w-=4;g.h-=4;if(A.constrain){u=o.clientWidth-i;l=o.clientHeight-i;v=g.x+g.w;q=g.y+g.h;if((p+A.vp_offset_x+u)>v){p=r?r-u:Math.max(0,(v-A.vp_offset_x)-u)}if((n+A.vp_offset_y+l)>q){n=Math.max(0,(q-A.vp_offset_y)-l)}}c.setStyles(o,{left:p,top:n});z.element.update();z.isMenuVisible=1;z.mouseClickFunc=a.add(o,"click",function(s){var h;s=s.target;if(s&&(s=c.getParent(s,"tr"))&&!c.hasClass(s,m+"ItemSub")){h=z.items[s.id];if(h.isDisabled()){return}k=z;while(k){if(k.hideMenu){k.hideMenu()}k=k.settings.parent}if(h.settings.onclick){h.settings.onclick(s)}return a.cancel(s)}});if(z.hasMenus()){z.mouseOverFunc=a.add(o,"mouseover",function(x){var h,t,s;x=x.target;if(x&&(x=c.getParent(x,"tr"))){h=z.items[x.id];if(z.lastMenu){z.lastMenu.collapse(1)}if(h.isDisabled()){return}if(x&&c.hasClass(x,m+"ItemSub")){t=c.getRect(x);h.showMenu((t.x+t.w-i),t.y-i,t.x);z.lastMenu=h;c.addClass(c.get(h.id).firstChild,m+"ItemActive")}}})}a.add(o,"keydown",z._keyHandler,z);z.onShowMenu.dispatch(z);if(A.keyboard_focus){z._setupKeyboardNav()}},hideMenu:function(j){var g=this,i=c.get("menu_"+g.id),h;if(!g.isMenuVisible){return}if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(i,"mouseover",g.mouseOverFunc);a.remove(i,"click",g.mouseClickFunc);a.remove(i,"keydown",g._keyHandler);c.hide(i);g.isMenuVisible=0;if(!j){g.collapse(1)}if(g.element){g.element.hide()}if(h=c.get(g.id)){c.removeClass(h.firstChild,g.classPrefix+"ItemActive")}g.onHideMenu.dispatch(g)},add:function(i){var g=this,h;i=g.parent(i);if(g.isRendered&&(h=c.get("menu_"+g.id))){g._add(c.select("tbody",h)[0],i)}return i},collapse:function(g){this.parent(g);this.hideMenu(1)},remove:function(g){c.remove(g.id);this.destroy();return this.parent(g)},destroy:function(){var g=this,h=c.get("menu_"+g.id);if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(h,"mouseover",g.mouseOverFunc);a.remove(c.select("a",h),"focus",g.mouseOverFunc);a.remove(h,"click",g.mouseClickFunc);a.remove(h,"keydown",g._keyHandler);if(g.element){g.element.remove()}c.remove(h)},renderNode:function(){var i=this,j=i.settings,l,h,k,g;g=c.create("div",{role:"listbox",id:"menu_"+i.id,"class":j["class"],style:"position:absolute;left:0;top:0;z-index:200000;outline:0"});if(i.settings.parent){c.setAttrib(g,"aria-parent","menu_"+i.settings.parent.id)}k=c.add(g,"div",{role:"presentation",id:"menu_"+i.id+"_co","class":i.classPrefix+(j["class"]?" "+j["class"]:"")});i.element=new b("menu_"+i.id,{blocker:1,container:j.container});if(j.menu_line){c.add(k,"span",{"class":i.classPrefix+"Line"})}l=c.add(k,"table",{role:"presentation",id:"menu_"+i.id+"_tbl",border:0,cellPadding:0,cellSpacing:0});h=c.add(l,"tbody");f(i.items,function(m){i._add(h,m)});i.rendered=true;return g},_setupKeyboardNav:function(){var i,h,g=this;i=c.select("#menu_"+g.id)[0];h=c.select("a[role=option]","menu_"+g.id);h.splice(0,0,i);g.keyboardNav=new e.ui.KeyboardNavigation({root:"menu_"+g.id,items:h,onCancel:function(){g.hideMenu()},enableUpDown:true});i.focus()},_keyHandler:function(g){var h=this,i;switch(g.keyCode){case 37:if(h.settings.parent){h.hideMenu();h.settings.parent.focus();a.cancel(g)}break;case 39:if(h.mouseOverFunc){h.mouseOverFunc(g)}break}},_add:function(j,h){var i,q=h.settings,p,l,k,m=this.classPrefix,g;if(q.separator){l=c.add(j,"tr",{id:h.id,"class":m+"ItemSeparator"});c.add(l,"td",{"class":m+"ItemSeparator"});if(i=l.previousSibling){c.addClass(i,"mceLast")}return}i=l=c.add(j,"tr",{id:h.id,"class":m+"Item "+m+"ItemEnabled"});i=k=c.add(i,q.titleItem?"th":"td");i=p=c.add(i,"a",{id:h.id+"_aria",role:q.titleItem?"presentation":"option",href:"javascript:;",onclick:"return false;",onmousedown:"return false;"});if(q.parent){c.setAttrib(p,"aria-haspopup","true");c.setAttrib(p,"aria-owns","menu_"+h.id)}c.addClass(k,q["class"]);g=c.add(i,"span",{"class":"mceIcon"+(q.icon?" mce_"+q.icon:"")});if(q.icon_src){c.add(g,"img",{src:q.icon_src})}i=c.add(i,q.element||"span",{"class":"mceText",title:h.settings.title},h.settings.title);if(h.settings.style){c.setAttrib(i,"style",h.settings.style)}if(j.childNodes.length==1){c.addClass(l,"mceFirst")}if((i=l.previousSibling)&&c.hasClass(i,m+"ItemSeparator")){c.addClass(l,"mceFirst")}if(h.collapse){c.addClass(l,m+"ItemSub")}if(i=l.previousSibling){c.removeClass(i,"mceLast")}c.addClass(l,"mceLast")}})})(tinymce);(function(b){var a=b.DOM;b.create("tinymce.ui.Button:tinymce.ui.Control",{Button:function(e,d,c){this.parent(e,d,c);this.classPrefix="mceButton"},renderHTML:function(){var f=this.classPrefix,e=this.settings,d,c;c=a.encode(e.label||"");d='<a role="button" id="'+this.id+'" href="javascript:;" class="'+f+" "+f+"Enabled "+e["class"]+(c?" "+f+"Labeled":"")+'" onmousedown="return false;" onclick="return false;" aria-labelledby="'+this.id+'_voice" title="'+a.encode(e.title)+'">';if(e.image&&!(this.editor&&this.editor.forcedHighContrastMode)){d+='<img class="mceIcon" src="'+e.image+'" alt="'+a.encode(e.title)+'" />'+c}else{d+='<span class="mceIcon '+e["class"]+'"></span>'+(c?'<span class="'+f+'Label">'+c+"</span>":"")}d+='<span class="mceVoiceLabel mceIconOnly" style="display: none;" id="'+this.id+'_voice">'+e.title+"</span>";d+="</a>";return d},postRender:function(){var c=this,d=c.settings;b.dom.Event.add(c.id,"click",function(f){if(!c.isDisabled()){return d.onclick.call(d.scope,f)}})}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.ListBox:tinymce.ui.Control",{ListBox:function(i,h,f){var g=this;g.parent(i,h,f);g.items=[];g.onChange=new a(g);g.onPostRender=new a(g);g.onAdd=new a(g);g.onRenderMenu=new d.util.Dispatcher(this);g.classPrefix="mceListBox"},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){var h=this,i,j,g;if(f!=h.selectedIndex){i=c.get(h.id+"_text");g=c.get(h.id+"_voiceDesc");j=h.items[f];if(j){h.selectedValue=j.value;h.selectedIndex=f;c.setHTML(i,c.encode(j.title));c.setHTML(g,h.settings.title+" - "+j.title);c.removeClass(i,"mceTitle");c.setAttrib(h.id,"aria-valuenow",j.title)}else{c.setHTML(i,c.encode(h.settings.title));c.setHTML(g,c.encode(h.settings.title));c.addClass(i,"mceTitle");h.selectedValue=h.selectedIndex=null;c.setAttrib(h.id,"aria-valuenow",h.settings.title)}i=0}},add:function(i,f,h){var g=this;h=h||{};h=d.extend(h,{title:i,value:f});g.items.push(h);g.onAdd.dispatch(g,h)},getLength:function(){return this.items.length},renderHTML:function(){var i="",f=this,g=f.settings,j=f.classPrefix;i='<span role="listbox" aria-haspopup="true" aria-labelledby="'+f.id+'_voiceDesc" aria-describedby="'+f.id+'_voiceDesc"><table role="presentation" tabindex="0" id="'+f.id+'" cellpadding="0" cellspacing="0" class="'+j+" "+j+"Enabled"+(g["class"]?(" "+g["class"]):"")+'"><tbody><tr>';i+="<td>"+c.createHTML("span",{id:f.id+"_voiceDesc","class":"voiceLabel",style:"display:none;"},f.settings.title);i+=c.createHTML("a",{id:f.id+"_text",tabindex:-1,href:"javascript:;","class":"mceText",onclick:"return false;",onmousedown:"return false;"},c.encode(f.settings.title))+"</td>";i+="<td>"+c.createHTML("a",{id:f.id+"_open",tabindex:-1,href:"javascript:;","class":"mceOpen",onclick:"return false;",onmousedown:"return false;"},'<span><span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span></span>')+"</td>";i+="</tr></tbody></table></span>";return i},showMenu:function(){var g=this,i,h=c.get(this.id),f;if(g.isDisabled()||g.items.length==0){return}if(g.menu&&g.menu.isMenuVisible){return g.hideMenu()}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}i=c.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.keyboard_focus=!d.isOpera;if(g.oldID){f.items[g.oldID].setSelected(0)}e(g.items,function(j){if(j.value===g.selectedValue){f.items[j.id].setSelected(1);g.oldID=j.id}});f.showMenu(0,h.clientHeight);b.add(c.doc,"mousedown",g.hideMenu,g);c.addClass(g.id,g.classPrefix+"Selected")},hideMenu:function(g){var f=this;if(f.menu&&f.menu.isMenuVisible){c.removeClass(f.id,f.classPrefix+"Selected");if(g&&g.type=="mousedown"&&(g.target.id==f.id+"_text"||g.target.id==f.id+"_open")){return}if(!g||!c.getParent(g.target,".mceMenu")){c.removeClass(f.id,f.classPrefix+"Selected");b.remove(c.doc,"mousedown",f.hideMenu,f);f.menu.hideMenu()}}},renderMenu:function(){var g=this,f;f=g.settings.control_manager.createDropMenu(g.id+"_menu",{menu_line:1,"class":g.classPrefix+"Menu mceNoIcons",max_width:150,max_height:150});f.onHideMenu.add(function(){g.hideMenu();g.focus()});f.add({title:g.settings.title,"class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}});e(g.items,function(h){if(h.value===undefined){f.add({title:h.title,role:"option","class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}})}else{h.id=c.uniqueId();h.role="option";h.onclick=function(){if(g.settings.onselect(h.value)!==false){g.select(h.value)}};f.add(h)}});g.onRenderMenu.dispatch(g,f);g.menu=f},postRender:function(){var f=this,g=f.classPrefix;b.add(f.id,"click",f.showMenu,f);b.add(f.id,"keydown",function(h){if(h.keyCode==32){f.showMenu(h);b.cancel(h)}});b.add(f.id,"focus",function(){if(!f._focused){f.keyDownHandler=b.add(f.id,"keydown",function(h){if(h.keyCode==40){f.showMenu();b.cancel(h)}});f.keyPressHandler=b.add(f.id,"keypress",function(i){var h;if(i.keyCode==13){h=f.selectedValue;f.selectedValue=null;b.cancel(i);f.settings.onselect(h)}})}f._focused=1});b.add(f.id,"blur",function(){b.remove(f.id,"keydown",f.keyDownHandler);b.remove(f.id,"keypress",f.keyPressHandler);f._focused=0});if(d.isIE6||!c.boxModel){b.add(f.id,"mouseover",function(){if(!c.hasClass(f.id,g+"Disabled")){c.addClass(f.id,g+"Hover")}});b.add(f.id,"mouseout",function(){if(!c.hasClass(f.id,g+"Disabled")){c.removeClass(f.id,g+"Hover")}})}f.onPostRender.dispatch(f,c.get(f.id))},destroy:function(){this.parent();b.clear(this.id+"_text");b.clear(this.id+"_open")}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.NativeListBox:tinymce.ui.ListBox",{NativeListBox:function(g,f){this.parent(g,f);this.classPrefix="mceNativeListBox"},setDisabled:function(f){c.get(this.id).disabled=f;this.setAriaProperty("disabled",f)},isDisabled:function(){return c.get(this.id).disabled},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){c.get(this.id).selectedIndex=f+1;this.selectedValue=this.items[f]?this.items[f].value:null},add:function(j,g,f){var i,h=this;f=f||{};f.value=g;if(h.isRendered()){c.add(c.get(this.id),"option",f,j)}i={title:j,value:g,attribs:f};h.items.push(i);h.onAdd.dispatch(h,i)},getLength:function(){return this.items.length},renderHTML:function(){var g,f=this;g=c.createHTML("option",{value:""},"-- "+f.settings.title+" --");e(f.items,function(h){g+=c.createHTML("option",{value:h.value},h.title)});g=c.createHTML("select",{id:f.id,"class":"mceNativeListBox","aria-labelledby":f.id+"_aria"},g);g+=c.createHTML("span",{id:f.id+"_aria",style:"display: none"},f.settings.title);return g},postRender:function(){var g=this,h,i=true;g.rendered=true;function f(k){var j=g.items[k.target.selectedIndex-1];if(j&&(j=j.value)){g.onChange.dispatch(g,j);if(g.settings.onselect){g.settings.onselect(j)}}}b.add(g.id,"change",f);b.add(g.id,"keydown",function(k){var j;b.remove(g.id,"change",h);i=false;j=b.add(g.id,"blur",function(){if(i){return}i=true;b.add(g.id,"change",f);b.remove(g.id,"blur",j)});if(d.isWebKit&&(k.keyCode==37||k.keyCode==39)){return b.prevent(k)}if(k.keyCode==13||k.keyCode==32){f(k);return b.cancel(k)}});g.onPostRender.dispatch(g,c.get(g.id))}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.MenuButton:tinymce.ui.Button",{MenuButton:function(g,f,e){this.parent(g,f,e);this.onRenderMenu=new c.util.Dispatcher(this);f.menu_container=f.menu_container||b.doc.body},showMenu:function(){var g=this,j,i,h=b.get(g.id),f;if(g.isDisabled()){return}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}if(g.isMenuVisible){return g.hideMenu()}j=b.getPos(g.settings.menu_container);i=b.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.vp_offset_x=i.x;f.settings.vp_offset_y=i.y;f.settings.keyboard_focus=g._focused;f.showMenu(0,h.clientHeight);a.add(b.doc,"mousedown",g.hideMenu,g);g.setState("Selected",1);g.isMenuVisible=1},renderMenu:function(){var f=this,e;e=f.settings.control_manager.createDropMenu(f.id+"_menu",{menu_line:1,"class":this.classPrefix+"Menu",icons:f.settings.icons});e.onHideMenu.add(function(){f.hideMenu();f.focus()});f.onRenderMenu.dispatch(f,e);f.menu=e},hideMenu:function(g){var f=this;if(g&&g.type=="mousedown"&&b.getParent(g.target,function(h){return h.id===f.id||h.id===f.id+"_open"})){return}if(!g||!b.getParent(g.target,".mceMenu")){f.setState("Selected",0);a.remove(b.doc,"mousedown",f.hideMenu,f);if(f.menu){f.menu.hideMenu()}}f.isMenuVisible=0},postRender:function(){var e=this,f=e.settings;a.add(e.id,"click",function(){if(!e.isDisabled()){if(f.onclick){f.onclick(e.value)}e.showMenu()}})}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.SplitButton:tinymce.ui.MenuButton",{SplitButton:function(g,f,e){this.parent(g,f,e);this.classPrefix="mceSplitButton"},renderHTML:function(){var i,f=this,g=f.settings,e;i="<tbody><tr>";if(g.image){e=b.createHTML("img ",{src:g.image,role:"presentation","class":"mceAction "+g["class"]})}else{e=b.createHTML("span",{"class":"mceAction "+g["class"]},"")}e+=b.createHTML("span",{"class":"mceVoiceLabel mceIconOnly",id:f.id+"_voice",style:"display:none;"},g.title);i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_action",tabindex:"-1",href:"javascript:;","class":"mceAction "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";e=b.createHTML("span",{"class":"mceOpen "+g["class"]},'<span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span>');i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_open",tabindex:"-1",href:"javascript:;","class":"mceOpen "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";i+="</tr></tbody>";i=b.createHTML("table",{role:"presentation","class":"mceSplitButton mceSplitButtonEnabled "+g["class"],cellpadding:"0",cellspacing:"0",title:g.title},i);return b.createHTML("div",{id:f.id,role:"button",tabindex:"0","aria-labelledby":f.id+"_voice","aria-haspopup":"true"},i)},postRender:function(){var e=this,g=e.settings,f;if(g.onclick){f=function(h){if(!e.isDisabled()){g.onclick(e.value);a.cancel(h)}};a.add(e.id+"_action","click",f);a.add(e.id,["click","keydown"],function(h){var k=32,m=14,i=13,j=38,l=40;if((h.keyCode===32||h.keyCode===13||h.keyCode===14)&&!h.altKey&&!h.ctrlKey&&!h.metaKey){f();a.cancel(h)}else{if(h.type==="click"||h.keyCode===l){e.showMenu();a.cancel(h)}}})}a.add(e.id+"_open","click",function(h){e.showMenu();a.cancel(h)});a.add([e.id,e.id+"_open"],"focus",function(){e._focused=1});a.add([e.id,e.id+"_open"],"blur",function(){e._focused=0});if(c.isIE6||!b.boxModel){a.add(e.id,"mouseover",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.addClass(e.id,"mceSplitButtonHover")}});a.add(e.id,"mouseout",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.removeClass(e.id,"mceSplitButtonHover")}})}},destroy:function(){this.parent();a.clear(this.id+"_action");a.clear(this.id+"_open");a.clear(this.id)}})})(tinymce);(function(d){var c=d.DOM,a=d.dom.Event,b=d.is,e=d.each;d.create("tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton",{ColorSplitButton:function(i,h,f){var g=this;g.parent(i,h,f);g.settings=h=d.extend({colors:"000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,008000,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF",grid_width:8,default_color:"#888888"},g.settings);g.onShowMenu=new d.util.Dispatcher(g);g.onHideMenu=new d.util.Dispatcher(g);g.value=h.default_color},showMenu:function(){var f=this,g,j,i,h;if(f.isDisabled()){return}if(!f.isMenuRendered){f.renderMenu();f.isMenuRendered=true}if(f.isMenuVisible){return f.hideMenu()}i=c.get(f.id);c.show(f.id+"_menu");c.addClass(i,"mceSplitButtonSelected");h=c.getPos(i);c.setStyles(f.id+"_menu",{left:h.x,top:h.y+i.clientHeight,zIndex:200000});i=0;a.add(c.doc,"mousedown",f.hideMenu,f);f.onShowMenu.dispatch(f);if(f._focused){f._keyHandler=a.add(f.id+"_menu","keydown",function(k){if(k.keyCode==27){f.hideMenu()}});c.select("a",f.id+"_menu")[0].focus()}f.isMenuVisible=1},hideMenu:function(g){var f=this;if(f.isMenuVisible){if(g&&g.type=="mousedown"&&c.getParent(g.target,function(h){return h.id===f.id+"_open"})){return}if(!g||!c.getParent(g.target,".mceSplitButtonMenu")){c.removeClass(f.id,"mceSplitButtonSelected");a.remove(c.doc,"mousedown",f.hideMenu,f);a.remove(f.id+"_menu","keydown",f._keyHandler);c.hide(f.id+"_menu")}f.isMenuVisible=0;f.onHideMenu.dispatch()}},renderMenu:function(){var p=this,h,k=0,q=p.settings,g,j,l,o,f;o=c.add(q.menu_container,"div",{role:"listbox",id:p.id+"_menu","class":q.menu_class+" "+q["class"],style:"position:absolute;left:0;top:-1000px;"});h=c.add(o,"div",{"class":q["class"]+" mceSplitButtonMenu"});c.add(h,"span",{"class":"mceMenuLine"});g=c.add(h,"table",{role:"presentation","class":"mceColorSplitMenu"});j=c.add(g,"tbody");k=0;e(b(q.colors,"array")?q.colors:q.colors.split(","),function(i){i=i.replace(/^#/,"");if(!k--){l=c.add(j,"tr");k=q.grid_width-1}g=c.add(l,"td");g=c.add(g,"a",{role:"option",href:"javascript:;",style:{backgroundColor:"#"+i},title:p.editor.getLang("colors."+i,i),"data-mce-color":"#"+i});if(p.editor.forcedHighContrastMode){g=c.add(g,"canvas",{width:16,height:16,"aria-hidden":"true"});if(g.getContext&&(f=g.getContext("2d"))){f.fillStyle="#"+i;f.fillRect(0,0,16,16)}else{c.remove(g)}}});if(q.more_colors_func){g=c.add(j,"tr");g=c.add(g,"td",{colspan:q.grid_width,"class":"mceMoreColors"});g=c.add(g,"a",{role:"option",id:p.id+"_more",href:"javascript:;",onclick:"return false;","class":"mceMoreColors"},q.more_colors_title);a.add(g,"click",function(i){q.more_colors_func.call(q.more_colors_scope||this);return a.cancel(i)})}c.addClass(h,"mceColorSplitMenu");new d.ui.KeyboardNavigation({root:p.id+"_menu",items:c.select("a",p.id+"_menu"),onCancel:function(){p.hideMenu();p.focus()}});a.add(p.id+"_menu","mousedown",function(i){return a.cancel(i)});a.add(p.id+"_menu","click",function(i){var m;i=c.getParent(i.target,"a",j);if(i&&i.nodeName.toLowerCase()=="a"&&(m=i.getAttribute("data-mce-color"))){p.setColor(m)}return a.cancel(i)});return o},setColor:function(f){this.displayColor(f);this.hideMenu();this.settings.onselect(f)},displayColor:function(g){var f=this;c.setStyle(f.id+"_preview","backgroundColor",g);f.value=g},postRender:function(){var f=this,g=f.id;f.parent();c.add(g+"_action","div",{id:g+"_preview","class":"mceColorPreview"});c.setStyle(f.id+"_preview","backgroundColor",f.value)},destroy:function(){this.parent();a.clear(this.id+"_menu");a.clear(this.id+"_more");c.remove(this.id+"_menu")}})})(tinymce);(function(b){var d=b.DOM,c=b.each,a=b.dom.Event;b.create("tinymce.ui.ToolbarGroup:tinymce.ui.Container",{renderHTML:function(){var f=this,i=[],e=f.controls,j=b.each,g=f.settings;i.push('<div id="'+f.id+'" role="group" aria-labelledby="'+f.id+'_voice">');i.push("<span role='application'>");i.push('<span id="'+f.id+'_voice" class="mceVoiceLabel" style="display:none;">'+d.encode(g.name)+"</span>");j(e,function(h){i.push(h.renderHTML())});i.push("</span>");i.push("</div>");return i.join("")},focus:function(){var e=this;d.get(e.id).focus()},postRender:function(){var f=this,e=[];c(f.controls,function(g){c(g.controls,function(h){if(h.id){e.push(h)}})});f.keyNav=new b.ui.KeyboardNavigation({root:f.id,items:e,onCancel:function(){if(b.isWebKit){d.get(f.editor.id+"_ifr").focus()}f.editor.focus()},excludeFromTabOrder:!f.settings.tab_focus_toolbar})},destroy:function(){var e=this;e.parent();e.keyNav.destroy();a.clear(e.id)}})})(tinymce);(function(a){var c=a.DOM,b=a.each;a.create("tinymce.ui.Toolbar:tinymce.ui.Container",{renderHTML:function(){var m=this,f="",j,k,n=m.settings,e,d,g,l;l=m.controls;for(e=0;e<l.length;e++){k=l[e];d=l[e-1];g=l[e+1];if(e===0){j="mceToolbarStart";if(k.Button){j+=" mceToolbarStartButton"}else{if(k.SplitButton){j+=" mceToolbarStartSplitButton"}else{if(k.ListBox){j+=" mceToolbarStartListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"))}if(d&&k.ListBox){if(d.Button||d.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarEnd"},c.createHTML("span",null,"<!-- IE -->"))}}if(c.stdMode){f+='<td style="position: relative">'+k.renderHTML()+"</td>"}else{f+="<td>"+k.renderHTML()+"</td>"}if(g&&k.ListBox){if(g.Button||g.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarStart"},c.createHTML("span",null,"<!-- IE -->"))}}}j="mceToolbarEnd";if(k.Button){j+=" mceToolbarEndButton"}else{if(k.SplitButton){j+=" mceToolbarEndSplitButton"}else{if(k.ListBox){j+=" mceToolbarEndListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"));return c.createHTML("table",{id:m.id,"class":"mceToolbar"+(n["class"]?" "+n["class"]:""),cellpadding:"0",cellspacing:"0",align:m.settings.align||"",role:"presentation",tabindex:"-1"},"<tbody><tr>"+f+"</tr></tbody>")}})})(tinymce);(function(b){var a=b.util.Dispatcher,c=b.each;b.create("tinymce.AddOnManager",{AddOnManager:function(){var d=this;d.items=[];d.urls={};d.lookup={};d.onAdd=new a(d)},get:function(d){if(this.lookup[d]){return this.lookup[d].instance}else{return undefined}},dependencies:function(e){var d;if(this.lookup[e]){d=this.lookup[e].dependencies}return d||[]},requireLangPack:function(e){var d=b.settings;if(d&&d.language&&d.language_load!==false){b.ScriptLoader.add(this.urls[e]+"/langs/"+d.language+".js")}},add:function(f,e,d){this.items.push(e);this.lookup[f]={instance:e,dependencies:d};this.onAdd.dispatch(this,f,e);return e},createUrl:function(d,e){if(typeof e==="object"){return e}else{return{prefix:d.prefix,resource:e,suffix:d.suffix}}},addComponents:function(f,d){var e=this.urls[f];b.each(d,function(g){b.ScriptLoader.add(e+"/"+g)})},load:function(j,f,d,h){var g=this,e=f;function i(){var k=g.dependencies(j);b.each(k,function(m){var l=g.createUrl(f,m);g.load(l.resource,l,undefined,undefined)});if(d){if(h){d.call(h)}else{d.call(b.ScriptLoader)}}}if(g.urls[j]){return}if(typeof f==="object"){e=f.prefix+f.resource+f.suffix}if(e.indexOf("/")!=0&&e.indexOf("://")==-1){e=b.baseURL+"/"+e}g.urls[j]=e.substring(0,e.lastIndexOf("/"));if(g.lookup[j]){i()}else{b.ScriptLoader.add(e,i,h)}}});b.PluginManager=new b.AddOnManager();b.ThemeManager=new b.AddOnManager()}(tinymce));(function(j){var g=j.each,d=j.extend,k=j.DOM,i=j.dom.Event,f=j.ThemeManager,b=j.PluginManager,e=j.explode,h=j.util.Dispatcher,a,c=0;j.documentBaseURL=window.location.href.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,"");if(!/[\/\\]$/.test(j.documentBaseURL)){j.documentBaseURL+="/"}j.baseURL=new j.util.URI(j.documentBaseURL).toAbsolute(j.baseURL);j.baseURI=new j.util.URI(j.baseURL);j.onBeforeUnload=new h(j);i.add(window,"beforeunload",function(l){j.onBeforeUnload.dispatch(j,l)});j.onAddEditor=new h(j);j.onRemoveEditor=new h(j);j.EditorManager=d(j,{editors:[],i18n:{},activeEditor:null,init:function(q){var n=this,p,l=j.ScriptLoader,u,o=[],m;function r(x,y,t){var v=x[y];if(!v){return}if(j.is(v,"string")){t=v.replace(/\.\w+$/,"");t=t?j.resolve(t):0;v=j.resolve(v)}return v.apply(t||this,Array.prototype.slice.call(arguments,2))}q=d({theme:"simple",language:"en"},q);n.settings=q;i.add(document,"init",function(){var s,v;r(q,"onpageload");switch(q.mode){case"exact":s=q.elements||"";if(s.length>0){g(e(s),function(x){if(k.get(x)){m=new j.Editor(x,q);o.push(m);m.render(1)}else{g(document.forms,function(y){g(y.elements,function(z){if(z.name===x){x="mce_editor_"+c++;k.setAttrib(z,"id",x);m=new j.Editor(x,q);o.push(m);m.render(1)}})})}})}break;case"textareas":case"specific_textareas":function t(y,x){return x.constructor===RegExp?x.test(y.className):k.hasClass(y,x)}g(k.select("textarea"),function(x){if(q.editor_deselector&&t(x,q.editor_deselector)){return}if(!q.editor_selector||t(x,q.editor_selector)){u=k.get(x.name);if(!x.id&&!u){x.id=x.name}if(!x.id||n.get(x.id)){x.id=k.uniqueId()}m=new j.Editor(x.id,q);o.push(m);m.render(1)}});break}if(q.oninit){s=v=0;g(o,function(x){v++;if(!x.initialized){x.onInit.add(function(){s++;if(s==v){r(q,"oninit")}})}else{s++}if(s==v){r(q,"oninit")}})}})},get:function(l){if(l===a){return this.editors}return this.editors[l]},getInstanceById:function(l){return this.get(l)},add:function(m){var l=this,n=l.editors;n[m.id]=m;n.push(m);l._setActive(m);l.onAddEditor.dispatch(l,m);return m},remove:function(n){var m=this,l,o=m.editors;if(!o[n.id]){return null}delete o[n.id];for(l=0;l<o.length;l++){if(o[l]==n){o.splice(l,1);break}}if(m.activeEditor==n){m._setActive(o[0])}n.destroy();m.onRemoveEditor.dispatch(m,n);return n},execCommand:function(r,p,o){var q=this,n=q.get(o),l;switch(r){case"mceFocus":n.focus();return true;case"mceAddEditor":case"mceAddControl":if(!q.get(o)){new j.Editor(o,q.settings).render()}return true;case"mceAddFrameControl":l=o.window;l.tinyMCE=tinyMCE;l.tinymce=j;j.DOM.doc=l.document;j.DOM.win=l;n=new j.Editor(o.element_id,o);n.render();if(j.isIE){function m(){n.destroy();l.detachEvent("onunload",m);l=l.tinyMCE=l.tinymce=null}l.attachEvent("onunload",m)}o.page_window=null;return true;case"mceRemoveEditor":case"mceRemoveControl":if(n){n.remove()}return true;case"mceToggleEditor":if(!n){q.execCommand("mceAddControl",0,o);return true}if(n.isHidden()){n.show()}else{n.hide()}return true}if(q.activeEditor){return q.activeEditor.execCommand(r,p,o)}return false},execInstanceCommand:function(p,o,n,m){var l=this.get(p);if(l){return l.execCommand(o,n,m)}return false},triggerSave:function(){g(this.editors,function(l){l.save()})},addI18n:function(n,q){var l,m=this.i18n;if(!j.is(n,"string")){g(n,function(r,p){g(r,function(t,s){g(t,function(v,u){if(s==="common"){m[p+"."+u]=v}else{m[p+"."+s+"."+u]=v}})})})}else{g(q,function(r,p){m[n+"."+p]=r})}},_setActive:function(l){this.selectedInstance=this.activeEditor=l}})})(tinymce);(function(m){var n=m.DOM,j=m.dom.Event,f=m.extend,k=m.util.Dispatcher,i=m.each,a=m.isGecko,b=m.isIE,e=m.isWebKit,d=m.is,h=m.ThemeManager,c=m.PluginManager,o=m.inArray,l=m.grep,g=m.explode;m.create("tinymce.Editor",{Editor:function(r,q){var p=this;p.id=p.editorId=r;p.execCommands={};p.queryStateCommands={};p.queryValueCommands={};p.isNotDirty=false;p.plugins={};i(["onPreInit","onBeforeRenderUI","onPostRender","onInit","onRemove","onActivate","onDeactivate","onClick","onEvent","onMouseUp","onMouseDown","onDblClick","onKeyDown","onKeyUp","onKeyPress","onContextMenu","onSubmit","onReset","onPaste","onPreProcess","onPostProcess","onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent","onLoadContent","onSaveContent","onNodeChange","onChange","onBeforeExecCommand","onExecCommand","onUndo","onRedo","onVisualAid","onSetProgressState"],function(s){p[s]=new k(p)});p.settings=q=f({id:r,language:"en",docs_language:"en",theme:"simple",skin:"default",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:m.documentBaseURL,add_form_submit_trigger:1,submit_patch:1,add_unload_trigger:1,convert_urls:1,relative_urls:1,remove_script_host:1,table_inline_editing:0,object_resizing:1,cleanup:1,accessibility_focus:1,custom_shortcuts:1,custom_undo_redo_keyboard_shortcuts:1,custom_undo_redo_restore_selection:1,custom_undo_redo:1,doctype:m.isIE6?'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">':"<!DOCTYPE>",visual_table_class:"mceItemTable",visual:1,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%",apply_source_formatting:1,directionality:"ltr",forced_root_block:"p",hidden_input:1,padd_empty_editor:1,render_ui:1,init_theme:1,force_p_newlines:1,indentation:"30px",keep_styles:1,fix_table_elements:1,inline_styles:1,convert_fonts_to_spans:true,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",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr",validate:true,entity_encoding:"named",url_converter:p.convertURL,url_converter_scope:p,ie7_compat:true},q);p.documentBaseURI=new m.util.URI(q.document_base_url||m.documentBaseURL,{base_uri:tinyMCE.baseURI});p.baseURI=m.baseURI;p.contentCSS=[];p.execCallback("setup",p)},render:function(r){var u=this,v=u.settings,x=u.id,p=m.ScriptLoader;if(!j.domLoaded){j.add(document,"init",function(){u.render()});return}tinyMCE.settings=v;if(!u.getElement()){return}if(m.isIDevice&&!m.isIOS5){return}if(!/TEXTAREA|INPUT/i.test(u.getElement().nodeName)&&v.hidden_input&&n.getParent(x,"form")){n.insertAfter(n.create("input",{type:"hidden",name:x}),x)}if(m.WindowManager){u.windowManager=new m.WindowManager(u)}if(v.encoding=="xml"){u.onGetContent.add(function(s,t){if(t.save){t.content=n.encode(t.content)}})}if(v.add_form_submit_trigger){u.onSubmit.addToTop(function(){if(u.initialized){u.save();u.isNotDirty=1}})}if(v.add_unload_trigger){u._beforeUnload=tinyMCE.onBeforeUnload.add(function(){if(u.initialized&&!u.destroyed&&!u.isHidden()){u.save({format:"raw",no_events:true})}})}m.addUnload(u.destroy,u);if(v.submit_patch){u.onBeforeRenderUI.add(function(){var s=u.getElement().form;if(!s){return}if(s._mceOldSubmit){return}if(!s.submit.nodeType&&!s.submit.length){u.formElement=s;s._mceOldSubmit=s.submit;s.submit=function(){m.triggerSave();u.isNotDirty=1;return u.formElement._mceOldSubmit(u.formElement)}}s=null})}function q(){if(v.language&&v.language_load!==false){p.add(m.baseURL+"/langs/"+v.language+".js")}if(v.theme&&v.theme.charAt(0)!="-"&&!h.urls[v.theme]){h.load(v.theme,"themes/"+v.theme+"/editor_template"+m.suffix+".js")}i(g(v.plugins),function(t){if(t&&!c.urls[t]){if(t.charAt(0)=="-"){t=t.substr(1,t.length);var s=c.dependencies(t);i(s,function(z){var y={prefix:"plugins/",resource:z,suffix:"/editor_plugin"+m.suffix+".js"};var z=c.createUrl(y,z);c.load(z.resource,z)})}else{if(t=="safari"){return}c.load(t,{prefix:"plugins/",resource:t,suffix:"/editor_plugin"+m.suffix+".js"})}}});p.loadQueue(function(){if(!u.removed){u.init()}})}q()},init:function(){var r,H=this,I=H.settings,E,A,D=H.getElement(),q,p,F,y,C,G,z,v=[];m.add(H);I.aria_label=I.aria_label||n.getAttrib(D,"aria-label",H.getLang("aria.rich_text_area"));if(I.theme){I.theme=I.theme.replace(/-/,"");q=h.get(I.theme);H.theme=new q();if(H.theme.init&&I.init_theme){H.theme.init(H,h.urls[I.theme]||m.documentBaseURL.replace(/\/$/,""))}}function B(J){var K=c.get(J),t=c.urls[J]||m.documentBaseURL.replace(/\/$/,""),s;if(K&&m.inArray(v,J)===-1){i(c.dependencies(J),function(u){B(u)});s=new K(H,t);H.plugins[J]=s;if(s.init){s.init(H,t);v.push(J)}}}i(g(I.plugins.replace(/\-/g,"")),B);if(I.popup_css!==false){if(I.popup_css){I.popup_css=H.documentBaseURI.toAbsolute(I.popup_css)}else{I.popup_css=H.baseURI.toAbsolute("themes/"+I.theme+"/skins/"+I.skin+"/dialog.css")}}if(I.popup_css_add){I.popup_css+=","+H.documentBaseURI.toAbsolute(I.popup_css_add)}H.controlManager=new m.ControlManager(H);if(I.custom_undo_redo){H.onBeforeExecCommand.add(function(t,J,u,K,s){if(J!="Undo"&&J!="Redo"&&J!="mceRepaint"&&(!s||!s.skip_undo)){H.undoManager.beforeChange()}});H.onExecCommand.add(function(t,J,u,K,s){if(J!="Undo"&&J!="Redo"&&J!="mceRepaint"&&(!s||!s.skip_undo)){H.undoManager.add()}})}H.onExecCommand.add(function(s,t){if(!/^(FontName|FontSize)$/.test(t)){H.nodeChanged()}});if(a){function x(s,t){if(!t||!t.initial){H.execCommand("mceRepaint")}}H.onUndo.add(x);H.onRedo.add(x);H.onSetContent.add(x)}H.onBeforeRenderUI.dispatch(H,H.controlManager);if(I.render_ui){E=I.width||D.style.width||D.offsetWidth;A=I.height||D.style.height||D.offsetHeight;H.orgDisplay=D.style.display;G=/^[0-9\.]+(|px)$/i;if(G.test(""+E)){E=Math.max(parseInt(E)+(q.deltaWidth||0),100)}if(G.test(""+A)){A=Math.max(parseInt(A)+(q.deltaHeight||0),100)}q=H.theme.renderUI({targetNode:D,width:E,height:A,deltaWidth:I.delta_width,deltaHeight:I.delta_height});H.editorContainer=q.editorContainer}if(document.domain&&location.hostname!=document.domain){m.relaxedDomain=document.domain}n.setStyles(q.sizeContainer||q.editorContainer,{width:E,height:A});if(I.content_css){m.each(g(I.content_css),function(s){H.contentCSS.push(H.documentBaseURI.toAbsolute(s))})}A=(q.iframeHeight||A)+(typeof(A)=="number"?(q.deltaHeight||0):"");if(A<100){A=100}H.iframeHTML=I.doctype+'<html><head xmlns="http://www.w3.org/1999/xhtml">';if(I.document_base_url!=m.documentBaseURL){H.iframeHTML+='<base href="'+H.documentBaseURI.getURI()+'" />'}if(I.ie7_compat){H.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=7" />'}else{H.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=edge" />'}H.iframeHTML+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';for(z=0;z<H.contentCSS.length;z++){H.iframeHTML+='<link type="text/css" rel="stylesheet" href="'+H.contentCSS[z]+'" />'}y=I.body_id||"tinymce";if(y.indexOf("=")!=-1){y=H.getParam("body_id","","hash");y=y[H.id]||y}C=I.body_class||"";if(C.indexOf("=")!=-1){C=H.getParam("body_class","","hash");C=C[H.id]||""}H.iframeHTML+='</head><body id="'+y+'" class="mceContentBody '+C+'"><br></body></html>';if(m.relaxedDomain&&(b||(m.isOpera&&parseFloat(opera.version())<11))){F='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinyMCE.get("'+H.id+'");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()'}r=n.add(q.iframeContainer,"iframe",{id:H.id+"_ifr",src:F||'javascript:""',frameBorder:"0",allowTransparency:"true",title:I.aria_label,style:{width:"100%",height:A,display:"block"}});H.contentAreaContainer=q.iframeContainer;n.get(q.editorContainer).style.display=H.orgDisplay;n.get(H.id).style.display="none";n.setAttrib(H.id,"aria-hidden",true);if(!m.relaxedDomain||!F){H.setupIframe()}D=r=q=null},setupIframe:function(){var q=this,v=q.settings,x=n.get(q.id),y=q.getDoc(),u,p;if(!b||!m.relaxedDomain){y.open();y.write(q.iframeHTML);y.close();if(m.relaxedDomain){y.domain=m.relaxedDomain}}p=q.getBody();p.disabled=true;if(!v.readonly){p.contentEditable=true}p.disabled=false;q.schema=new m.html.Schema(v);q.dom=new m.dom.DOMUtils(q.getDoc(),{keep_values:true,url_converter:q.convertURL,url_converter_scope:q,hex_colors:v.force_hex_style_colors,class_filter:v.class_filter,update_styles:1,fix_ie_paragraphs:1,schema:q.schema});q.parser=new m.html.DomParser(v,q.schema);if(!q.settings.allow_html_in_named_anchor){q.parser.addAttributeFilter("name",function(s,t){var A=s.length,C,z,B,D;while(A--){D=s[A];if(D.name==="a"&&D.firstChild){B=D.parent;C=D.lastChild;do{z=C.prev;B.insert(C,D);C=z}while(C)}}})}q.parser.addAttributeFilter("src,href,style",function(s,t){var z=s.length,B,D=q.dom,C,A;while(z--){B=s[z];C=B.attr(t);A="data-mce-"+t;if(!B.attributes.map[A]){if(t==="style"){B.attr(A,D.serializeStyle(D.parseStyle(C),B.name))}else{B.attr(A,q.convertURL(C,t,B.name))}}}});q.parser.addNodeFilter("script",function(s,t){var z=s.length,A;while(z--){A=s[z];A.attr("type","mce-"+(A.attr("type")||"text/javascript"))}});q.parser.addNodeFilter("#cdata",function(s,t){var z=s.length,A;while(z--){A=s[z];A.type=8;A.name="#comment";A.value="[CDATA["+A.value+"]]"}});q.parser.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(t,z){var A=t.length,B,s=q.schema.getNonEmptyElements();while(A--){B=t[A];if(B.isEmpty(s)){B.empty().append(new m.html.Node("br",1)).shortEnded=true}}});q.serializer=new m.dom.Serializer(v,q.dom,q.schema);q.selection=new m.dom.Selection(q.dom,q.getWin(),q.serializer);q.formatter=new m.Formatter(this);q.formatter.register({alignleft:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"left"}},{selector:"img,table",collapsed:false,styles:{"float":"left"}}],aligncenter:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"center"}},{selector:"img",collapsed:false,styles:{display:"block",marginLeft:"auto",marginRight:"auto"}},{selector:"table",collapsed:false,styles:{marginLeft:"auto",marginRight:"auto"}}],alignright:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"right"}},{selector:"img,table",collapsed:false,styles:{"float":"right"}}],alignfull:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"justify"}}],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:true},{inline:"u",remove:"all"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:true},{inline:"strike",remove:"all"}],forecolor:{inline:"span",styles:{color:"%value"},wrap_links:false},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},wrap_links:false},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"},link:{inline:"a",selector:"a",remove:"all",split:true,deep:true,onmatch:function(s){return true},onformat:function(z,s,t){i(t,function(B,A){q.dom.setAttrib(z,A,B)})}},removeformat:[{selector:"b,strong,em,i,font,u,strike",remove:"all",split:true,expand:false,block_expand:true,deep:true},{selector:"span",attributes:["style","class"],remove:"empty",split:true,expand:false,deep:true},{selector:"*",attributes:["style","class"],split:false,expand:false,deep:true}]});i("p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp".split(/\s/),function(s){q.formatter.register(s,{block:s,remove:"all"})});q.formatter.register(q.settings.formats);q.undoManager=new m.UndoManager(q);q.undoManager.onAdd.add(function(t,s){if(t.hasUndo()){return q.onChange.dispatch(q,s,t)}});q.undoManager.onUndo.add(function(t,s){return q.onUndo.dispatch(q,s,t)});q.undoManager.onRedo.add(function(t,s){return q.onRedo.dispatch(q,s,t)});q.forceBlocks=new m.ForceBlocks(q,{forced_root_block:v.forced_root_block});q.editorCommands=new m.EditorCommands(q);q.serializer.onPreProcess.add(function(s,t){return q.onPreProcess.dispatch(q,t,s)});q.serializer.onPostProcess.add(function(s,t){return q.onPostProcess.dispatch(q,t,s)});q.onPreInit.dispatch(q);if(!v.gecko_spellcheck){q.getBody().spellcheck=0}if(!v.readonly){q._addEvents()}q.controlManager.onPostRender.dispatch(q,q.controlManager);q.onPostRender.dispatch(q);q.quirks=new m.util.Quirks(this);if(v.directionality){q.getBody().dir=v.directionality}if(v.nowrap){q.getBody().style.whiteSpace="nowrap"}if(v.handle_node_change_callback){q.onNodeChange.add(function(t,s,z){q.execCallback("handle_node_change_callback",q.id,z,-1,-1,true,q.selection.isCollapsed())})}if(v.save_callback){q.onSaveContent.add(function(s,z){var t=q.execCallback("save_callback",q.id,z.content,q.getBody());if(t){z.content=t}})}if(v.onchange_callback){q.onChange.add(function(t,s){q.execCallback("onchange_callback",q,s)})}if(v.protect){q.onBeforeSetContent.add(function(s,t){if(v.protect){i(v.protect,function(z){t.content=t.content.replace(z,function(A){return"<!--mce:protected "+escape(A)+"-->"})})}})}if(v.convert_newlines_to_brs){q.onBeforeSetContent.add(function(s,t){if(t.initial){t.content=t.content.replace(/\r?\n/g,"<br />")}})}if(v.preformatted){q.onPostProcess.add(function(s,t){t.content=t.content.replace(/^\s*<pre.*?>/,"");t.content=t.content.replace(/<\/pre>\s*$/,"");if(t.set){t.content='<pre class="mceItemHidden">'+t.content+"</pre>"}})}if(v.verify_css_classes){q.serializer.attribValueFilter=function(B,z){var A,t;if(B=="class"){if(!q.classesRE){t=q.dom.getClasses();if(t.length>0){A="";i(t,function(s){A+=(A?"|":"")+s["class"]});q.classesRE=new RegExp("("+A+")","gi")}}return !q.classesRE||/(\bmceItem\w+\b|\bmceTemp\w+\b)/g.test(z)||q.classesRE.test(z)?z:""}return z}}if(v.cleanup_callback){q.onBeforeSetContent.add(function(s,t){t.content=q.execCallback("cleanup_callback","insert_to_editor",t.content,t)});q.onPreProcess.add(function(s,t){if(t.set){q.execCallback("cleanup_callback","insert_to_editor_dom",t.node,t)}if(t.get){q.execCallback("cleanup_callback","get_from_editor_dom",t.node,t)}});q.onPostProcess.add(function(s,t){if(t.set){t.content=q.execCallback("cleanup_callback","insert_to_editor",t.content,t)}if(t.get){t.content=q.execCallback("cleanup_callback","get_from_editor",t.content,t)}})}if(v.save_callback){q.onGetContent.add(function(s,t){if(t.save){t.content=q.execCallback("save_callback",q.id,t.content,q.getBody())}})}if(v.handle_event_callback){q.onEvent.add(function(s,t,z){if(q.execCallback("handle_event_callback",t,s,z)===false){j.cancel(t)}})}q.onSetContent.add(function(){q.addVisual(q.getBody())});if(v.padd_empty_editor){q.onPostProcess.add(function(s,t){t.content=t.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/,"")})}if(a){function r(s,t){i(s.dom.select("a"),function(A){var z=A.parentNode;if(s.dom.isBlock(z)&&z.lastChild===A){s.dom.add(z,"br",{"data-mce-bogus":1})}})}q.onExecCommand.add(function(s,t){if(t==="CreateLink"){r(s)}});q.onSetContent.add(q.selection.onSetContent.add(r))}q.load({initial:true,format:"html"});q.startContent=q.getContent({format:"raw"});q.undoManager.add();q.initialized=true;q.onInit.dispatch(q);q.execCallback("setupcontent_callback",q.id,q.getBody(),q.getDoc());q.execCallback("init_instance_callback",q);q.focus(true);q.nodeChanged({initial:1});i(q.contentCSS,function(s){q.dom.loadCSS(s)});if(v.auto_focus){setTimeout(function(){var s=m.get(v.auto_focus);s.selection.select(s.getBody(),1);s.selection.collapse(1);s.getBody().focus();s.getWin().focus()},100)}x=null},focus:function(u){var y,q=this,s=q.selection,x=q.settings.content_editable,r,p,v=q.getDoc();if(!u){r=s.getRng();if(r.item){p=r.item(0)}q._refreshContentEditable();s.normalize();if(!x){q.getWin().focus()}if(m.isGecko){q.getBody().focus()}if(p&&p.ownerDocument==v){r=v.body.createControlRange();r.addElement(p);r.select()}}if(m.activeEditor!=q){if((y=m.activeEditor)!=null){y.onDeactivate.dispatch(y,q)}q.onActivate.dispatch(q,y)}m._setActive(q)},execCallback:function(u){var p=this,r=p.settings[u],q;if(!r){return}if(p.callbackLookup&&(q=p.callbackLookup[u])){r=q.func;q=q.scope}if(d(r,"string")){q=r.replace(/\.\w+$/,"");q=q?m.resolve(q):0;r=m.resolve(r);p.callbackLookup=p.callbackLookup||{};p.callbackLookup[u]={func:r,scope:q}}return r.apply(q||p,Array.prototype.slice.call(arguments,1))},translate:function(p){var r=this.settings.language||"en",q=m.i18n;if(!p){return""}return q[r+"."+p]||p.replace(/{\#([^}]+)\}/g,function(t,s){return q[r+"."+s]||"{#"+s+"}"})},getLang:function(q,p){return m.i18n[(this.settings.language||"en")+"."+q]||(d(p)?p:"{#"+q+"}")},getParam:function(u,r,p){var s=m.trim,q=d(this.settings[u])?this.settings[u]:r,t;if(p==="hash"){t={};if(d(q,"string")){i(q.indexOf("=")>0?q.split(/[;,](?![^=;,]*(?:[;,]|$))/):q.split(","),function(x){x=x.split("=");if(x.length>1){t[s(x[0])]=s(x[1])}else{t[s(x[0])]=s(x)}})}else{t=q}return t}return q},nodeChanged:function(r){var p=this,q=p.selection,u=q.getStart()||p.getBody();if(p.initialized){r=r||{};u=b&&u.ownerDocument!=p.getDoc()?p.getBody():u;r.parents=[];p.dom.getParent(u,function(s){if(s.nodeName=="BODY"){return true}r.parents.push(s)});p.onNodeChange.dispatch(p,r?r.controlManager||p.controlManager:p.controlManager,u,q.isCollapsed(),r)}},addButton:function(r,q){var p=this;p.buttons=p.buttons||{};p.buttons[r]=q},addCommand:function(p,r,q){this.execCommands[p]={func:r,scope:q||this}},addQueryStateHandler:function(p,r,q){this.queryStateCommands[p]={func:r,scope:q||this}},addQueryValueHandler:function(p,r,q){this.queryValueCommands[p]={func:r,scope:q||this}},addShortcut:function(r,u,p,s){var q=this,v;if(!q.settings.custom_shortcuts){return false}q.shortcuts=q.shortcuts||{};if(d(p,"string")){v=p;p=function(){q.execCommand(v,false,null)}}if(d(p,"object")){v=p;p=function(){q.execCommand(v[0],v[1],v[2])}}i(g(r),function(t){var x={func:p,scope:s||this,desc:u,alt:false,ctrl:false,shift:false};i(g(t,"+"),function(y){switch(y){case"alt":case"ctrl":case"shift":x[y]=true;break;default:x.charCode=y.charCodeAt(0);x.keyCode=y.toUpperCase().charCodeAt(0)}});q.shortcuts[(x.ctrl?"ctrl":"")+","+(x.alt?"alt":"")+","+(x.shift?"shift":"")+","+x.keyCode]=x});return true},execCommand:function(x,v,z,p){var r=this,u=0,y,q;if(!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(x)&&(!p||!p.skip_focus)){r.focus()}y={};r.onBeforeExecCommand.dispatch(r,x,v,z,y);if(y.terminate){return false}if(r.execCallback("execcommand_callback",r.id,r.selection.getNode(),x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(y=r.execCommands[x]){q=y.func.call(y.scope,v,z);if(q!==true){r.onExecCommand.dispatch(r,x,v,z,p);return q}}i(r.plugins,function(s){if(s.execCommand&&s.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);u=1;return false}});if(u){return true}if(r.theme&&r.theme.execCommand&&r.theme.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(r.editorCommands.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}r.getDoc().execCommand(x,v,z);r.onExecCommand.dispatch(r,x,v,z,p)},queryCommandState:function(u){var q=this,v,r;if(q._isHidden()){return}if(v=q.queryStateCommands[u]){r=v.func.call(v.scope);if(r!==true){return r}}v=q.editorCommands.queryCommandState(u);if(v!==-1){return v}try{return this.getDoc().queryCommandState(u)}catch(p){}},queryCommandValue:function(v){var q=this,u,r;if(q._isHidden()){return}if(u=q.queryValueCommands[v]){r=u.func.call(u.scope);if(r!==true){return r}}u=q.editorCommands.queryCommandValue(v);if(d(u)){return u}try{return this.getDoc().queryCommandValue(v)}catch(p){}},show:function(){var p=this;n.show(p.getContainer());n.hide(p.id);p.load()},hide:function(){var p=this,q=p.getDoc();if(b&&q){q.execCommand("SelectAll")}p.save();n.hide(p.getContainer());n.setStyle(p.id,"display",p.orgDisplay)},isHidden:function(){return !n.isHidden(this.id)},setProgressState:function(p,q,r){this.onSetProgressState.dispatch(this,p,q,r);return p},load:function(s){var p=this,r=p.getElement(),q;if(r){s=s||{};s.load=true;q=p.setContent(d(r.value)?r.value:r.innerHTML,s);s.element=r;if(!s.no_events){p.onLoadContent.dispatch(p,s)}s.element=r=null;return q}},save:function(u){var p=this,s=p.getElement(),q,r;if(!s||!p.initialized){return}u=u||{};u.save=true;if(!u.no_events){p.undoManager.typing=false;p.undoManager.add()}u.element=s;q=u.content=p.getContent(u);if(!u.no_events){p.onSaveContent.dispatch(p,u)}q=u.content;if(!/TEXTAREA|INPUT/i.test(s.nodeName)){s.innerHTML=q;if(r=n.getParent(p.id,"form")){i(r.elements,function(t){if(t.name==p.id){t.value=q;return false}})}}else{s.value=q}u.element=s=null;return q},setContent:function(u,s){var r=this,q,p=r.getBody(),t;s=s||{};s.format=s.format||"html";s.set=true;s.content=u;if(!s.no_events){r.onBeforeSetContent.dispatch(r,s)}u=s.content;if(!m.isIE&&(u.length===0||/^\s+$/.test(u))){t=r.settings.forced_root_block;if(t){u="<"+t+'><br data-mce-bogus="1"></'+t+">"}else{u='<br data-mce-bogus="1">'}p.innerHTML=u;r.selection.select(p,true);r.selection.collapse(true);return}if(s.format!=="raw"){u=new m.html.Serializer({},r.schema).serialize(r.parser.parse(u))}s.content=m.trim(u);r.dom.setHTML(p,s.content);if(!s.no_events){r.onSetContent.dispatch(r,s)}r.selection.normalize();return s.content},getContent:function(q){var p=this,r;q=q||{};q.format=q.format||"html";q.get=true;if(!q.no_events){p.onBeforeGetContent.dispatch(p,q)}if(q.format=="raw"){r=p.getBody().innerHTML}else{r=p.serializer.serialize(p.getBody(),q)}q.content=m.trim(r);if(!q.no_events){p.onGetContent.dispatch(p,q)}return q.content},isDirty:function(){var p=this;return m.trim(p.startContent)!=m.trim(p.getContent({format:"raw",no_events:1}))&&!p.isNotDirty},getContainer:function(){var p=this;if(!p.container){p.container=n.get(p.editorContainer||p.id+"_parent")}return p.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return n.get(this.settings.content_element||this.id)},getWin:function(){var p=this,q;if(!p.contentWindow){q=n.get(p.id+"_ifr");if(q){p.contentWindow=q.contentWindow}}return p.contentWindow},getDoc:function(){var q=this,p;if(!q.contentDocument){p=q.getWin();if(p){q.contentDocument=p.document}}return q.contentDocument},getBody:function(){return this.bodyElement||this.getDoc().body},convertURL:function(p,x,v){var q=this,r=q.settings;if(r.urlconverter_callback){return q.execCallback("urlconverter_callback",p,v,true,x)}if(!r.convert_urls||(v&&v.nodeName=="LINK")||p.indexOf("file:")===0){return p}if(r.relative_urls){return q.documentBaseURI.toRelative(p)}p=q.documentBaseURI.toAbsolute(p,r.remove_script_host);return p},addVisual:function(r){var p=this,q=p.settings;r=r||p.getBody();if(!d(p.hasVisual)){p.hasVisual=q.visual}i(p.dom.select("table,a",r),function(t){var s;switch(t.nodeName){case"TABLE":s=p.dom.getAttrib(t,"border");if(!s||s=="0"){if(p.hasVisual){p.dom.addClass(t,q.visual_table_class)}else{p.dom.removeClass(t,q.visual_table_class)}}return;case"A":s=p.dom.getAttrib(t,"name");if(s){if(p.hasVisual){p.dom.addClass(t,"mceItemAnchor")}else{p.dom.removeClass(t,"mceItemAnchor")}}return}});p.onVisualAid.dispatch(p,r,p.hasVisual)},remove:function(){var p=this,q=p.getContainer();p.removed=1;p.hide();p.execCallback("remove_instance_callback",p);p.onRemove.dispatch(p);p.onExecCommand.listeners=[];m.remove(p);n.remove(q)},destroy:function(q){var p=this;if(p.destroyed){return}if(!q){m.removeUnload(p.destroy);tinyMCE.onBeforeUnload.remove(p._beforeUnload);if(p.theme&&p.theme.destroy){p.theme.destroy()}p.controlManager.destroy();p.selection.destroy();p.dom.destroy();if(!p.settings.content_editable){j.clear(p.getWin());j.clear(p.getDoc())}j.clear(p.getBody());j.clear(p.formElement)}if(p.formElement){p.formElement.submit=p.formElement._mceOldSubmit;p.formElement._mceOldSubmit=null}p.contentAreaContainer=p.formElement=p.container=p.settings.content_element=p.bodyElement=p.contentDocument=p.contentWindow=null;if(p.selection){p.selection=p.selection.win=p.selection.dom=p.selection.dom.doc=null}p.destroyed=1},_addEvents:function(){var B=this,r,C=B.settings,q=B.dom,x={mouseup:"onMouseUp",mousedown:"onMouseDown",click:"onClick",keyup:"onKeyUp",keydown:"onKeyDown",keypress:"onKeyPress",submit:"onSubmit",reset:"onReset",contextmenu:"onContextMenu",dblclick:"onDblClick",paste:"onPaste"};function p(t,D){var s=t.type;if(B.removed){return}if(B.onEvent.dispatch(B,t,D)!==false){B[x[t.fakeType||t.type]].dispatch(B,t,D)}}i(x,function(t,s){switch(s){case"contextmenu":q.bind(B.getDoc(),s,p);break;case"paste":q.bind(B.getBody(),s,function(D){p(D)});break;case"submit":case"reset":q.bind(B.getElement().form||n.getParent(B.id,"form"),s,p);break;default:q.bind(C.content_editable?B.getBody():B.getDoc(),s,p)}});q.bind(C.content_editable?B.getBody():(a?B.getDoc():B.getWin()),"focus",function(s){B.focus(true)});if(m.isGecko){q.bind(B.getDoc(),"DOMNodeInserted",function(t){var s;t=t.target;if(t.nodeType===1&&t.nodeName==="IMG"&&(s=t.getAttribute("data-mce-src"))){t.src=B.documentBaseURI.toAbsolute(s)}})}if(a){function u(){var E=this,G=E.getDoc(),F=E.settings;if(a&&!F.readonly){E._refreshContentEditable();try{G.execCommand("styleWithCSS",0,false)}catch(D){if(!E._isHidden()){try{G.execCommand("useCSS",0,true)}catch(D){}}}if(!F.table_inline_editing){try{G.execCommand("enableInlineTableEditing",false,false)}catch(D){}}if(!F.object_resizing){try{G.execCommand("enableObjectResizing",false,false)}catch(D){}}}}B.onBeforeExecCommand.add(u);B.onMouseDown.add(u)}B.onMouseUp.add(B.nodeChanged);B.onKeyUp.add(function(s,t){var D=t.keyCode;if((D>=33&&D<=36)||(D>=37&&D<=40)||D==13||D==45||D==46||D==8||(m.isMac&&(D==91||D==93))||t.ctrlKey){B.nodeChanged()}});B.onKeyDown.add(function(t,D){if(D.keyCode!=8){return}var F=t.selection.getRng().startContainer;var E=t.selection.getRng().startOffset;while(F&&F.nodeType&&F.nodeType!=1&&F.parentNode){F=F.parentNode}if(F&&F.parentNode&&F.parentNode.tagName==="BLOCKQUOTE"&&F.parentNode.firstChild==F&&E==0){t.formatter.toggle("blockquote",null,F.parentNode);var s=t.selection.getRng();s.setStart(F,0);s.setEnd(F,0);t.selection.setRng(s);t.selection.collapse(false)}});B.onReset.add(function(){B.setContent(B.startContent,{format:"raw"})});if(C.custom_shortcuts){if(C.custom_undo_redo_keyboard_shortcuts){B.addShortcut("ctrl+z",B.getLang("undo_desc"),"Undo");B.addShortcut("ctrl+y",B.getLang("redo_desc"),"Redo")}B.addShortcut("ctrl+b",B.getLang("bold_desc"),"Bold");B.addShortcut("ctrl+i",B.getLang("italic_desc"),"Italic");B.addShortcut("ctrl+u",B.getLang("underline_desc"),"Underline");for(r=1;r<=6;r++){B.addShortcut("ctrl+"+r,"",["FormatBlock",false,"h"+r])}B.addShortcut("ctrl+7","",["FormatBlock",false,"p"]);B.addShortcut("ctrl+8","",["FormatBlock",false,"div"]);B.addShortcut("ctrl+9","",["FormatBlock",false,"address"]);function v(t){var s=null;if(!t.altKey&&!t.ctrlKey&&!t.metaKey){return s}i(B.shortcuts,function(D){if(m.isMac&&D.ctrl!=t.metaKey){return}else{if(!m.isMac&&D.ctrl!=t.ctrlKey){return}}if(D.alt!=t.altKey){return}if(D.shift!=t.shiftKey){return}if(t.keyCode==D.keyCode||(t.charCode&&t.charCode==D.charCode)){s=D;return false}});return s}B.onKeyUp.add(function(s,t){var D=v(t);if(D){return j.cancel(t)}});B.onKeyPress.add(function(s,t){var D=v(t);if(D){return j.cancel(t)}});B.onKeyDown.add(function(s,t){var D=v(t);if(D){D.func.call(D.scope);return j.cancel(t)}})}if(m.isIE){q.bind(B.getDoc(),"controlselect",function(D){var t=B.resizeInfo,s;D=D.target;if(D.nodeName!=="IMG"){return}if(t){q.unbind(t.node,t.ev,t.cb)}if(!q.hasClass(D,"mceItemNoResize")){ev="resizeend";s=q.bind(D,ev,function(F){var E;F=F.target;if(E=q.getStyle(F,"width")){q.setAttrib(F,"width",E.replace(/[^0-9%]+/g,""));q.setStyle(F,"width","")}if(E=q.getStyle(F,"height")){q.setAttrib(F,"height",E.replace(/[^0-9%]+/g,""));q.setStyle(F,"height","")}})}else{ev="resizestart";s=q.bind(D,"resizestart",j.cancel,j)}t=B.resizeInfo={node:D,ev:ev,cb:s}})}if(m.isOpera){B.onClick.add(function(s,t){j.prevent(t)})}if(C.custom_undo_redo){function y(){B.undoManager.typing=false;B.undoManager.add()}q.bind(B.getDoc(),"focusout",function(s){if(!B.removed&&B.undoManager.typing){y()}});B.dom.bind(B.dom.getRoot(),"dragend",function(s){y()});B.onKeyUp.add(function(s,D){var t=D.keyCode;if((t>=33&&t<=36)||(t>=37&&t<=40)||t==13||t==45||D.ctrlKey){y()}});B.onKeyDown.add(function(s,E){var D=E.keyCode,t;if(D==8){t=B.getDoc().selection;if(t&&t.createRange&&t.createRange().item){B.undoManager.beforeChange();s.dom.remove(t.createRange().item(0));y();return j.cancel(E)}}if((D>=33&&D<=36)||(D>=37&&D<=40)||D==13||D==45){if(m.isIE&&D==13){B.undoManager.beforeChange()}if(B.undoManager.typing){y()}return}if((D<16||D>20)&&D!=224&&D!=91&&!B.undoManager.typing){B.undoManager.beforeChange();B.undoManager.typing=true;B.undoManager.add()}});B.onMouseDown.add(function(){if(B.undoManager.typing){y()}})}if(m.isGecko){function A(){var s=B.dom.getAttribs(B.selection.getStart().cloneNode(false));return function(){var t=B.selection.getStart();if(t!==B.getBody()){B.dom.setAttrib(t,"style",null);i(s,function(D){t.setAttributeNode(D.cloneNode(true))})}}}function z(){var t=B.selection;return !t.isCollapsed()&&t.getStart()!=t.getEnd()}B.onKeyPress.add(function(s,D){var t;if((D.keyCode==8||D.keyCode==46)&&z()){t=A();B.getDoc().execCommand("delete",false,null);t();return j.cancel(D)}});B.dom.bind(B.getDoc(),"cut",function(t){var s;if(z()){s=A();B.onKeyUp.addToTop(j.cancel,j);setTimeout(function(){s();B.onKeyUp.remove(j.cancel,j)},0)}})}},_refreshContentEditable:function(){var q=this,p,r;if(q._isHidden()){p=q.getBody();r=p.parentNode;r.removeChild(p);r.appendChild(p);p.focus()}},_isHidden:function(){var p;if(!a){return 0}p=this.selection.getSel();return(!p||!p.rangeCount||p.rangeCount==0)}})})(tinymce);(function(c){var d=c.each,e,a=true,b=false;c.EditorCommands=function(n){var m=n.dom,p=n.selection,j={state:{},exec:{},value:{}},k=n.settings,q=n.formatter,o;function r(z,y,x){var v;z=z.toLowerCase();if(v=j.exec[z]){v(z,y,x);return a}return b}function l(x){var v;x=x.toLowerCase();if(v=j.state[x]){return v(x)}return -1}function h(x){var v;x=x.toLowerCase();if(v=j.value[x]){return v(x)}return b}function u(v,x){x=x||"exec";d(v,function(z,y){d(y.toLowerCase().split(","),function(A){j[x][A]=z})})}c.extend(this,{execCommand:r,queryCommandState:l,queryCommandValue:h,addCommands:u});function f(y,x,v){if(x===e){x=b}if(v===e){v=null}return n.getDoc().execCommand(y,x,v)}function t(v){return q.match(v)}function s(v,x){q.toggle(v,x?{value:x}:e)}function i(v){o=p.getBookmark(v)}function g(){p.moveToBookmark(o)}u({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){n.undoManager.add()},"Cut,Copy,Paste":function(z){var y=n.getDoc(),v;try{f(z)}catch(x){v=a}if(v||!y.queryCommandSupported(z)){if(c.isGecko){n.windowManager.confirm(n.getLang("clipboard_msg"),function(A){if(A){open("http://www.mozilla.org/editor/midasdemo/securityprefs.html","_blank")}})}else{n.windowManager.alert(n.getLang("clipboard_no_support"))}}},unlink:function(v){if(p.isCollapsed()){p.select(p.getNode())}f(v);p.collapse(b)},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(v){var x=v.substring(7);d("left,center,right,full".split(","),function(y){if(x!=y){q.remove("align"+y)}});s("align"+x);r("mceRepaint")},"InsertUnorderedList,InsertOrderedList":function(y){var v,x;f(y);v=m.getParent(p.getNode(),"ol,ul");if(v){x=v.parentNode;if(/^(H[1-6]|P|ADDRESS|PRE)$/.test(x.nodeName)){i();m.split(x,v);g()}}},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(v){s(v)},"ForeColor,HiliteColor,FontName":function(y,x,v){s(y,v)},FontSize:function(z,y,x){var v,A;if(x>=1&&x<=7){A=c.explode(k.font_size_style_values);v=c.explode(k.font_size_classes);if(v){x=v[x-1]||x}else{x=A[x-1]||x}}s(z,x)},RemoveFormat:function(v){q.remove(v)},mceBlockQuote:function(v){s("blockquote")},FormatBlock:function(y,x,v){return s(v||"p")},mceCleanup:function(){var v=p.getBookmark();n.setContent(n.getContent({cleanup:a}),{cleanup:a});p.moveToBookmark(v)},mceRemoveNode:function(z,y,x){var v=x||p.getNode();if(v!=n.getBody()){i();n.dom.remove(v,a);g()}},mceSelectNodeDepth:function(z,y,x){var v=0;m.getParent(p.getNode(),function(A){if(A.nodeType==1&&v++==x){p.select(A);return b}},n.getBody())},mceSelectNode:function(y,x,v){p.select(v)},mceInsertContent:function(B,I,K){var y,J,E,z,F,G,D,C,L,x,A,M,v,H;y=n.parser;J=new c.html.Serializer({},n.schema);v='<span id="mce_marker" data-mce-type="bookmark">\uFEFF</span>';G={content:K,format:"html"};p.onBeforeSetContent.dispatch(p,G);K=G.content;if(K.indexOf("{$caret}")==-1){K+="{$caret}"}K=K.replace(/\{\$caret\}/,v);if(!p.isCollapsed()){n.getDoc().execCommand("Delete",false,null)}E=p.getNode();G={context:E.nodeName.toLowerCase()};F=y.parse(K,G);A=F.lastChild;if(A.attr("id")=="mce_marker"){D=A;for(A=A.prev;A;A=A.walk(true)){if(A.type==3||!m.isBlock(A.name)){A.parent.insert(D,A,A.name==="br");break}}}if(!G.invalid){K=J.serialize(F);A=E.firstChild;M=E.lastChild;if(!A||(A===M&&A.nodeName==="BR")){m.setHTML(E,K)}else{p.setContent(K)}}else{p.setContent(v);E=n.selection.getNode();z=n.getBody();if(E.nodeType==9){E=A=z}else{A=E}while(A!==z){E=A;A=A.parentNode}K=E==z?z.innerHTML:m.getOuterHTML(E);K=J.serialize(y.parse(K.replace(/<span (id="mce_marker"|id=mce_marker).+?<\/span>/i,function(){return J.serialize(F)})));if(E==z){m.setHTML(z,K)}else{m.setOuterHTML(E,K)}}D=m.get("mce_marker");C=m.getRect(D);L=m.getViewPort(n.getWin());if((C.y+C.h>L.y+L.h||C.y<L.y)||(C.x>L.x+L.w||C.x<L.x)){H=c.isIE?n.getDoc().documentElement:n.getBody();H.scrollLeft=C.x;H.scrollTop=C.y-L.h+25}x=m.createRng();A=D.previousSibling;if(A&&A.nodeType==3){x.setStart(A,A.nodeValue.length)}else{x.setStartBefore(D);x.setEndBefore(D)}m.remove(D);p.setRng(x);p.onSetContent.dispatch(p,G);n.addVisual()},mceInsertRawHTML:function(y,x,v){p.setContent("tiny_mce_marker");n.setContent(n.getContent().replace(/tiny_mce_marker/g,function(){return v}))},mceSetContent:function(y,x,v){n.setContent(v)},"Indent,Outdent":function(z){var x,v,y;x=k.indentation;v=/[a-z%]+$/i.exec(x);x=parseInt(x);if(!l("InsertUnorderedList")&&!l("InsertOrderedList")){d(p.getSelectedBlocks(),function(A){if(z=="outdent"){y=Math.max(0,parseInt(A.style.paddingLeft||0)-x);m.setStyle(A,"paddingLeft",y?y+v:"")}else{m.setStyle(A,"paddingLeft",(parseInt(A.style.paddingLeft||0)+x)+v)}})}else{f(z)}},mceRepaint:function(){var x;if(c.isGecko){try{i(a);if(p.getSel()){p.getSel().selectAllChildren(n.getBody())}p.collapse(a);g()}catch(v){}}},mceToggleFormat:function(y,x,v){q.toggle(v)},InsertHorizontalRule:function(){n.execCommand("mceInsertContent",false,"<hr />")},mceToggleVisualAid:function(){n.hasVisual=!n.hasVisual;n.addVisual()},mceReplaceContent:function(y,x,v){n.execCommand("mceInsertContent",false,v.replace(/\{\$selection\}/g,p.getContent({format:"text"})))},mceInsertLink:function(z,y,x){var v;if(typeof(x)=="string"){x={href:x}}v=m.getParent(p.getNode(),"a");x.href=x.href.replace(" ","%20");if(!v||!x.href){q.remove("link")}if(x.href){q.apply("link",x,v)}},selectAll:function(){var x=m.getRoot(),v=m.createRng();v.setStart(x,0);v.setEnd(x,x.childNodes.length);n.selection.setRng(v)}});u({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(v){return t("align"+v.substring(7))},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(v){return t(v)},mceBlockQuote:function(){return t("blockquote")},Outdent:function(){var v;if(k.inline_styles){if((v=m.getParent(p.getStart(),m.isBlock))&&parseInt(v.style.paddingLeft)>0){return a}if((v=m.getParent(p.getEnd(),m.isBlock))&&parseInt(v.style.paddingLeft)>0){return a}}return l("InsertUnorderedList")||l("InsertOrderedList")||(!k.inline_styles&&!!m.getParent(p.getNode(),"BLOCKQUOTE"))},"InsertUnorderedList,InsertOrderedList":function(v){return m.getParent(p.getNode(),v=="insertunorderedlist"?"UL":"OL")}},"state");u({"FontSize,FontName":function(y){var x=0,v;if(v=m.getParent(p.getNode(),"span")){if(y=="fontsize"){x=v.style.fontSize}else{x=v.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()}}return x}},"value");if(k.custom_undo_redo){u({Undo:function(){n.undoManager.undo()},Redo:function(){n.undoManager.redo()}})}}})(tinymce);(function(b){var a=b.util.Dispatcher;b.UndoManager=function(f){var d,e=0,h=[],c;function g(){return b.trim(f.getContent({format:"raw",no_events:1}))}return d={typing:false,onAdd:new a(d),onUndo:new a(d),onRedo:new a(d),beforeChange:function(){c=f.selection.getBookmark(2,true)},add:function(m){var j,k=f.settings,l;m=m||{};m.content=g();l=h[e];if(l&&l.content==m.content){return null}if(h[e]){h[e].beforeBookmark=c}if(k.custom_undo_redo_levels){if(h.length>k.custom_undo_redo_levels){for(j=0;j<h.length-1;j++){h[j]=h[j+1]}h.length--;e=h.length}}m.bookmark=f.selection.getBookmark(2,true);if(e<h.length-1){h.length=e+1}h.push(m);e=h.length-1;d.onAdd.dispatch(d,m);f.isNotDirty=0;return m},undo:function(){var k,j;if(d.typing){d.add();d.typing=false}if(e>0){k=h[--e];f.setContent(k.content,{format:"raw"});f.selection.moveToBookmark(k.beforeBookmark);d.onUndo.dispatch(d,k)}return k},redo:function(){var i;if(e<h.length-1){i=h[++e];f.setContent(i.content,{format:"raw"});f.selection.moveToBookmark(i.bookmark);d.onRedo.dispatch(d,i)}return i},clear:function(){h=[];e=0;d.typing=false},hasUndo:function(){return e>0||this.typing},hasRedo:function(){return e<h.length-1&&!this.typing}}}})(tinymce);(function(l){var j=l.dom.Event,c=l.isIE,a=l.isGecko,b=l.isOpera,i=l.each,h=l.extend,d=true,g=false;function k(o){var p,n,m;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(o.nodeName)){if(p){n=o.cloneNode(false);n.appendChild(p);p=n}else{p=m=o.cloneNode(false)}p.removeAttribute("id")}}while(o=o.parentNode);if(p){return{wrapper:p,inner:m}}}function f(n,o){var m=o.ownerDocument.createRange();m.setStart(n.endContainer,n.endOffset);m.setEndAfter(o);return m.cloneContents().textContent.length==0}function e(o,q,m){var n,p;if(q.isEmpty(m)){n=q.getParent(m,"ul,ol");if(!q.getParent(n.parentNode,"ul,ol")){q.split(n,m);p=q.create("p",0,'<br data-mce-bogus="1" />');q.replace(p,m);o.select(p,1)}return g}return d}l.create("tinymce.ForceBlocks",{ForceBlocks:function(m){var n=this,o=m.settings,p;n.editor=m;n.dom=m.dom;p=(o.forced_root_block||"p").toLowerCase();o.element=p.toUpperCase();m.onPreInit.add(n.setup,n)},setup:function(){var n=this,m=n.editor,p=m.settings,u=m.dom,o=m.selection,q=m.schema.getBlockElements();if(p.forced_root_block){function v(){var y=o.getStart(),t=m.getBody(),s,z,D,F,E,x,A,B=-16777215;if(!y||y.nodeType!==1){return}while(y!=t){if(q[y.nodeName]){return}y=y.parentNode}s=o.getRng();if(s.setStart){z=s.startContainer;D=s.startOffset;F=s.endContainer;E=s.endOffset}else{if(s.item){s=m.getDoc().body.createTextRange();s.moveToElementText(s.item(0))}tmpRng=s.duplicate();tmpRng.collapse(true);D=tmpRng.move("character",B)*-1;if(!tmpRng.collapsed){tmpRng=s.duplicate();tmpRng.collapse(false);E=(tmpRng.move("character",B)*-1)-D}}for(y=t.firstChild;y;y){if(y.nodeType===3||(y.nodeType==1&&!q[y.nodeName])){if(!x){x=u.create(p.forced_root_block);y.parentNode.insertBefore(x,y)}A=y;y=y.nextSibling;x.appendChild(A)}else{x=null;y=y.nextSibling}}if(s.setStart){s.setStart(z,D);s.setEnd(F,E);o.setRng(s)}else{try{s=m.getDoc().body.createTextRange();s.moveToElementText(t);s.collapse(true);s.moveStart("character",D);if(E>0){s.moveEnd("character",E)}s.select()}catch(C){}}m.nodeChanged()}m.onKeyUp.add(v);m.onClick.add(v)}if(p.force_br_newlines){if(c){m.onKeyPress.add(function(s,t){var x;if(t.keyCode==13&&o.getNode().nodeName!="LI"){o.setContent('<br id="__" /> ',{format:"raw"});x=u.get("__");x.removeAttribute("id");o.select(x);o.collapse();return j.cancel(t)}})}}if(p.force_p_newlines){if(!c){m.onKeyPress.add(function(s,t){if(t.keyCode==13&&!t.shiftKey&&!n.insertPara(t)){j.cancel(t)}})}else{l.addUnload(function(){n._previousFormats=0});m.onKeyPress.add(function(s,t){n._previousFormats=0;if(t.keyCode==13&&!t.shiftKey&&s.selection.isCollapsed()&&p.keep_styles){n._previousFormats=k(s.selection.getStart())}});m.onKeyUp.add(function(t,y){if(y.keyCode==13&&!y.shiftKey){var x=t.selection.getStart(),s=n._previousFormats;if(!x.hasChildNodes()&&s){x=u.getParent(x,u.isBlock);if(x&&x.nodeName!="LI"){x.innerHTML="";if(n._previousFormats){x.appendChild(s.wrapper);s.inner.innerHTML="\uFEFF"}else{x.innerHTML="\uFEFF"}o.select(x,1);o.collapse(true);t.getDoc().execCommand("Delete",false,null);n._previousFormats=0}}}})}if(a){m.onKeyDown.add(function(s,t){if((t.keyCode==8||t.keyCode==46)&&!t.shiftKey){n.backspaceDelete(t,t.keyCode==8)}})}}if(l.isWebKit){function r(t){var s=o.getRng(),x,A=u.create("div",null," "),z,y=u.getViewPort(t.getWin()).h;s.insertNode(x=u.create("br"));s.setStartAfter(x);s.setEndAfter(x);o.setRng(s);if(o.getSel().focusNode==x.previousSibling){o.select(u.insertAfter(u.doc.createTextNode("\u00a0"),x));o.collapse(d)}u.insertAfter(A,x);z=u.getPos(A).y;u.remove(A);if(z>y){t.getWin().scrollTo(0,z)}}m.onKeyPress.add(function(s,t){if(t.keyCode==13&&(t.shiftKey||(p.force_br_newlines&&!u.getParent(o.getNode(),"h1,h2,h3,h4,h5,h6,ol,ul")))){r(s);j.cancel(t)}})}if(c){if(p.element!="P"){m.onKeyPress.add(function(s,t){n.lastElm=o.getNode().nodeName});m.onKeyUp.add(function(t,x){var z,y=o.getNode(),s=t.getBody();if(s.childNodes.length===1&&y.nodeName=="P"){y=u.rename(y,p.element);o.select(y);o.collapse();t.nodeChanged()}else{if(x.keyCode==13&&!x.shiftKey&&n.lastElm!="P"){z=u.getParent(y,"p");if(z){u.rename(z,p.element);t.nodeChanged()}}}})}}},getParentBlock:function(o){var m=this.dom;return m.getParent(o,m.isBlock)},insertPara:function(Q){var E=this,v=E.editor,M=v.dom,R=v.getDoc(),V=v.settings,F=v.selection.getSel(),G=F.getRangeAt(0),U=R.body;var J,K,H,O,N,q,o,u,z,m,C,T,p,x,I,L=M.getViewPort(v.getWin()),B,D,A;v.undoManager.beforeChange();J=R.createRange();J.setStart(F.anchorNode,F.anchorOffset);J.collapse(d);K=R.createRange();K.setStart(F.focusNode,F.focusOffset);K.collapse(d);H=J.compareBoundaryPoints(J.START_TO_END,K)<0;O=H?F.anchorNode:F.focusNode;N=H?F.anchorOffset:F.focusOffset;q=H?F.focusNode:F.anchorNode;o=H?F.focusOffset:F.anchorOffset;if(O===q&&/^(TD|TH)$/.test(O.nodeName)){if(O.firstChild.nodeName=="BR"){M.remove(O.firstChild)}if(O.childNodes.length==0){v.dom.add(O,V.element,null,"<br />");T=v.dom.add(O,V.element,null,"<br />")}else{I=O.innerHTML;O.innerHTML="";v.dom.add(O,V.element,null,I);T=v.dom.add(O,V.element,null,"<br />")}G=R.createRange();G.selectNodeContents(T);G.collapse(1);v.selection.setRng(G);return g}if(O==U&&q==U&&U.firstChild&&v.dom.isBlock(U.firstChild)){O=q=O.firstChild;N=o=0;J=R.createRange();J.setStart(O,0);K=R.createRange();K.setStart(q,0)}if(!R.body.hasChildNodes()){R.body.appendChild(M.create("br"))}O=O.nodeName=="HTML"?R.body:O;O=O.nodeName=="BODY"?O.firstChild:O;q=q.nodeName=="HTML"?R.body:q;q=q.nodeName=="BODY"?q.firstChild:q;u=E.getParentBlock(O);z=E.getParentBlock(q);m=u?u.nodeName:V.element;if(I=E.dom.getParent(u,"li,pre")){if(I.nodeName=="LI"){return e(v.selection,E.dom,I)}return d}if(u&&(u.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(M.getStyle(u,"position",1)))){m=V.element;u=null}if(z&&(z.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(M.getStyle(u,"position",1)))){m=V.element;z=null}if(/(TD|TABLE|TH|CAPTION)/.test(m)||(u&&m=="DIV"&&/left|right/gi.test(M.getStyle(u,"float",1)))){m=V.element;u=z=null}C=(u&&u.nodeName==m)?u.cloneNode(0):v.dom.create(m);T=(z&&z.nodeName==m)?z.cloneNode(0):v.dom.create(m);T.removeAttribute("id");if(/^(H[1-6])$/.test(m)&&f(G,u)){T=v.dom.create(V.element)}I=p=O;do{if(I==U||I.nodeType==9||E.dom.isBlock(I)||/(TD|TABLE|TH|CAPTION)/.test(I.nodeName)){break}p=I}while((I=I.previousSibling?I.previousSibling:I.parentNode));I=x=q;do{if(I==U||I.nodeType==9||E.dom.isBlock(I)||/(TD|TABLE|TH|CAPTION)/.test(I.nodeName)){break}x=I}while((I=I.nextSibling?I.nextSibling:I.parentNode));if(p.nodeName==m){J.setStart(p,0)}else{J.setStartBefore(p)}J.setEnd(O,N);C.appendChild(J.cloneContents()||R.createTextNode(""));try{K.setEndAfter(x)}catch(P){}K.setStart(q,o);T.appendChild(K.cloneContents()||R.createTextNode(""));G=R.createRange();if(!p.previousSibling&&p.parentNode.nodeName==m){G.setStartBefore(p.parentNode)}else{if(J.startContainer.nodeName==m&&J.startOffset==0){G.setStartBefore(J.startContainer)}else{G.setStart(J.startContainer,J.startOffset)}}if(!x.nextSibling&&x.parentNode.nodeName==m){G.setEndAfter(x.parentNode)}else{G.setEnd(K.endContainer,K.endOffset)}G.deleteContents();if(b){v.getWin().scrollTo(0,L.y)}if(C.firstChild&&C.firstChild.nodeName==m){C.innerHTML=C.firstChild.innerHTML}if(T.firstChild&&T.firstChild.nodeName==m){T.innerHTML=T.firstChild.innerHTML}function S(y,s){var r=[],X,W,t;y.innerHTML="";if(V.keep_styles){W=s;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(W.nodeName)){X=W.cloneNode(g);M.setAttrib(X,"id","");r.push(X)}}while(W=W.parentNode)}if(r.length>0){for(t=r.length-1,X=y;t>=0;t--){X=X.appendChild(r[t])}r[0].innerHTML=b?"\u00a0":"<br />";return r[0]}else{y.innerHTML=b?"\u00a0":"<br />"}}if(M.isEmpty(C)){S(C,O)}if(M.isEmpty(T)){A=S(T,q)}if(b&&parseFloat(opera.version())<9.5){G.insertNode(C);G.insertNode(T)}else{G.insertNode(T);G.insertNode(C)}T.normalize();C.normalize();v.selection.select(T,true);v.selection.collapse(true);B=v.dom.getPos(T).y;if(B<L.y||B+25>L.y+L.h){v.getWin().scrollTo(0,B<L.y?B:B-L.h+25)}v.undoManager.add();return g},backspaceDelete:function(u,B){var C=this,s=C.editor,y=s.getBody(),q=s.dom,p,v=s.selection,o=v.getRng(),x=o.startContainer,p,z,A,m;if(!B&&o.collapsed&&x.nodeType==1&&o.startOffset==x.childNodes.length){m=new l.dom.TreeWalker(x.lastChild,x);for(p=x.lastChild;p;p=m.prev()){if(p.nodeType==3){o.setStart(p,p.nodeValue.length);o.collapse(true);v.setRng(o);return}}}if(x&&s.dom.isBlock(x)&&!/^(TD|TH)$/.test(x.nodeName)&&B){if(x.childNodes.length==0||(x.childNodes.length==1&&x.firstChild.nodeName=="BR")){p=x;while((p=p.previousSibling)&&!s.dom.isBlock(p)){}if(p){if(x!=y.firstChild){z=s.dom.doc.createTreeWalker(p,NodeFilter.SHOW_TEXT,null,g);while(A=z.nextNode()){p=A}o=s.getDoc().createRange();o.setStart(p,p.nodeValue?p.nodeValue.length:0);o.setEnd(p,p.nodeValue?p.nodeValue.length:0);v.setRng(o);s.dom.remove(x)}return j.cancel(u)}}}}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each,e=c.extend;c.create("tinymce.ControlManager",{ControlManager:function(f,j){var h=this,g;j=j||{};h.editor=f;h.controls={};h.onAdd=new c.util.Dispatcher(h);h.onPostRender=new c.util.Dispatcher(h);h.prefix=j.prefix||f.id+"_";h._cls={};h.onPostRender.add(function(){d(h.controls,function(i){i.postRender()})})},get:function(f){return this.controls[this.prefix+f]||this.controls[f]},setActive:function(h,f){var g=null;if(g=this.get(h)){g.setActive(f)}return g},setDisabled:function(h,f){var g=null;if(g=this.get(h)){g.setDisabled(f)}return g},add:function(g){var f=this;if(g){f.controls[g.id]=g;f.onAdd.dispatch(g,f)}return g},createControl:function(i){var h,g=this,f=g.editor;d(f.plugins,function(j){if(j.createControl){h=j.createControl(i,g);if(h){return false}}});switch(i){case"|":case"separator":return g.createSeparator()}if(!h&&f.buttons&&(h=f.buttons[i])){return g.createButton(i,h)}return g.add(h)},createDropMenu:function(f,n,h){var m=this,i=m.editor,j,g,k,l;n=e({"class":"mceDropDown",constrain:i.settings.constrain_menus},n);n["class"]=n["class"]+" "+i.getParam("skin")+"Skin";if(k=i.getParam("skin_variant")){n["class"]+=" "+i.getParam("skin")+"Skin"+k.substring(0,1).toUpperCase()+k.substring(1)}f=m.prefix+f;l=h||m._cls.dropmenu||c.ui.DropMenu;j=m.controls[f]=new l(f,n);j.onAddItem.add(function(r,q){var p=q.settings;p.title=i.getLang(p.title,p.title);if(!p.onclick){p.onclick=function(o){if(p.cmd){i.execCommand(p.cmd,p.ui||false,p.value)}}}});i.onRemove.add(function(){j.destroy()});if(c.isIE){j.onShowMenu.add(function(){i.focus();g=i.selection.getBookmark(1)});j.onHideMenu.add(function(){if(g){i.selection.moveToBookmark(g);g=0}})}return m.add(j)},createListBox:function(f,n,h){var l=this,j=l.editor,i,k,m;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,scope:n.scope,control_manager:l},n);f=l.prefix+f;function g(o){return o.settings.use_accessible_selects&&!c.isGecko}if(j.settings.use_native_selects||g(j)){k=new c.ui.NativeListBox(f,n)}else{m=h||l._cls.listbox||c.ui.ListBox;k=new m(f,n,j)}l.controls[f]=k;if(c.isWebKit){k.onPostRender.add(function(p,o){a.add(o,"mousedown",function(){j.bookmark=j.selection.getBookmark(1)});a.add(o,"focus",function(){j.selection.moveToBookmark(j.bookmark);j.bookmark=null})})}if(k.hideMenu){j.onMouseDown.add(k.hideMenu,k)}return l.add(k)},createButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.label=g.translate(i.label);i.scope=i.scope||g;if(!i.onclick&&!i.menu_button){i.onclick=function(){g.execCommand(i.cmd,i.ui||false,i.value)}}i=e({title:i.title,"class":"mce_"+m,unavailable_prefix:g.getLang("unavailable",""),scope:i.scope,control_manager:h},i);m=h.prefix+m;if(i.menu_button){f=l||h._cls.menubutton||c.ui.MenuButton;k=new f(m,i,g);g.onMouseDown.add(k.hideMenu,k)}else{f=h._cls.button||c.ui.Button;k=new f(m,i,g)}return h.add(k)},createMenuButton:function(h,f,g){f=f||{};f.menu_button=1;return this.createButton(h,f,g)},createSplitButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onclick){i.onclick=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;f=l||h._cls.splitbutton||c.ui.SplitButton;k=h.add(new f(m,i,g));g.onMouseDown.add(k.hideMenu,k);return k},createColorSplitButton:function(f,n,h){var l=this,j=l.editor,i,k,m,g;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onclick){n.onclick=function(o){if(c.isIE){g=j.selection.getBookmark(1)}j.execCommand(n.cmd,n.ui||false,o||n.value)}}if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,menu_class:j.getParam("skin")+"Skin",scope:n.scope,more_colors_title:j.getLang("more_colors")},n);f=l.prefix+f;m=h||l._cls.colorsplitbutton||c.ui.ColorSplitButton;k=new m(f,n,j);j.onMouseDown.add(k.hideMenu,k);j.onRemove.add(function(){k.destroy()});if(c.isIE){k.onShowMenu.add(function(){j.focus();g=j.selection.getBookmark(1)});k.onHideMenu.add(function(){if(g){j.selection.moveToBookmark(g);g=0}})}return l.add(k)},createToolbar:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||g._cls.toolbar||c.ui.Toolbar;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createToolbarGroup:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||this._cls.toolbarGroup||c.ui.ToolbarGroup;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createSeparator:function(g){var f=g||this._cls.separator||c.ui.Separator;return new f()},setControlType:function(g,f){return this._cls[g.toLowerCase()]=f},destroy:function(){d(this.controls,function(f){f.destroy()});this.controls=null}})})(tinymce);(function(d){var a=d.util.Dispatcher,e=d.each,c=d.isIE,b=d.isOpera;d.create("tinymce.WindowManager",{WindowManager:function(f){var g=this;g.editor=f;g.onOpen=new a(g);g.onClose=new a(g);g.params={};g.features={}},open:function(z,h){var v=this,k="",n,m,i=v.editor.settings.dialog_type=="modal",q,o,j,g=d.DOM.getViewPort(),r;z=z||{};h=h||{};o=b?g.w:screen.width;j=b?g.h:screen.height;z.name=z.name||"mc_"+new Date().getTime();z.width=parseInt(z.width||320);z.height=parseInt(z.height||240);z.resizable=true;z.left=z.left||parseInt(o/2)-(z.width/2);z.top=z.top||parseInt(j/2)-(z.height/2);h.inline=false;h.mce_width=z.width;h.mce_height=z.height;h.mce_auto_focus=z.auto_focus;if(i){if(c){z.center=true;z.help=false;z.dialogWidth=z.width+"px";z.dialogHeight=z.height+"px";z.scroll=z.scrollbars||false}}e(z,function(p,f){if(d.is(p,"boolean")){p=p?"yes":"no"}if(!/^(name|url)$/.test(f)){if(c&&i){k+=(k?";":"")+f+":"+p}else{k+=(k?",":"")+f+"="+p}}});v.features=z;v.params=h;v.onOpen.dispatch(v,z,h);r=z.url||z.file;r=d._addVer(r);try{if(c&&i){q=1;window.showModalDialog(r,window,k)}else{q=window.open(r,z.name,k)}}catch(l){}if(!q){alert(v.editor.getLang("popup_blocked"))}},close:function(f){f.close();this.onClose.dispatch(this)},createInstance:function(i,h,g,m,l,k){var j=d.resolve(i);return new j(h,g,m,l,k)},confirm:function(h,f,i,g){g=g||window;f.call(i||this,g.confirm(this._decode(this.editor.getLang(h,h))))},alert:function(h,f,j,g){var i=this;g=g||window;g.alert(i._decode(i.editor.getLang(h,h)));if(f){f.call(j||i)}},resizeBy:function(f,g,h){h.resizeBy(f,g)},_decode:function(f){return d.DOM.decode(f).replace(/\\n/g,"\n")}})}(tinymce));(function(a){a.Formatter=function(U){var M={},O=a.each,c=U.dom,q=U.selection,t=a.dom.TreeWalker,K=new a.dom.RangeUtils(c),d=U.schema.isValidChild,F=c.isBlock,l=U.settings.forced_root_block,s=c.nodeIndex,E="\uFEFF",e=/^(src|href|style)$/,R=false,B=true,p;function z(V){return V instanceof Array}function m(W,V){return c.getParents(W,V,c.getRoot())}function b(V){return V.nodeType===1&&(V.face==="mceinline"||V.style.fontFamily==="mceinline")}function Q(V){return V?M[V]:M}function k(V,W){if(V){if(typeof(V)!=="string"){O(V,function(Y,X){k(X,Y)})}else{W=W.length?W:[W];O(W,function(X){if(X.deep===p){X.deep=!X.selector}if(X.split===p){X.split=!X.selector||X.inline}if(X.remove===p&&X.selector&&!X.inline){X.remove="none"}if(X.selector&&X.inline){X.mixed=true;X.block_expand=true}if(typeof(X.classes)==="string"){X.classes=X.classes.split(/\s+/)}});M[V]=W}}}var i=function(W){var V;U.dom.getParent(W,function(X){V=U.dom.getStyle(X,"text-decoration");return V&&V!=="none"});return V};var I=function(V){var W;if(V.nodeType===1&&V.parentNode&&V.parentNode.nodeType===1){W=i(V.parentNode);if(U.dom.getStyle(V,"color")&&W){U.dom.setStyle(V,"text-decoration",W)}else{if(U.dom.getStyle(V,"textdecoration")===W){U.dom.setStyle(V,"text-decoration",null)}}}};function S(Y,ag,ab){var ac=Q(Y),ah=ac[0],af,W,ae,ad=q.isCollapsed();function Z(al){var ak=al.startContainer,ao=al.startOffset,an,am;if(ak.nodeType==1||ak.nodeValue===""){ak=ak.nodeType==1?ak.childNodes[ao]:ak;if(ak){an=new t(ak,ak.parentNode);for(am=an.current();am;am=an.next()){if(am.nodeType==3&&!f(am)){al.setStart(am,0);break}}}}return al}function V(al,ak){ak=ak||ah;if(al){if(ak.onformat){ak.onformat(al,ak,ag,ab)}O(ak.styles,function(an,am){c.setStyle(al,am,r(an,ag))});O(ak.attributes,function(an,am){c.setAttrib(al,am,r(an,ag))});O(ak.classes,function(am){am=r(am,ag);if(!c.hasClass(al,am)){c.addClass(al,am)}})}}function aa(){function am(at,aq){var ar=new t(aq);for(ab=ar.current();ab;ab=ar.prev()){if(ab.childNodes.length>1||ab==at){return ab}}}var al=U.selection.getRng();var ap=al.startContainer;var ak=al.endContainer;if(ap!=ak&&al.endOffset==0){var ao=am(ap,ak);var an=ao.nodeType==3?ao.length:ao.childNodes.length;al.setEnd(ao,an)}return al}function X(an,at,aq,ap,al){var ak=[],am=-1,ar,av=-1,ao=-1,au;O(an.childNodes,function(ax,aw){if(ax.nodeName==="UL"||ax.nodeName==="OL"){am=aw;ar=ax;return false}});O(an.childNodes,function(ax,aw){if(ax.nodeName==="SPAN"&&c.getAttrib(ax,"data-mce-type")=="bookmark"){if(ax.id==at.id+"_start"){av=aw}else{if(ax.id==at.id+"_end"){ao=aw}}}});if(am<=0||(av<am&&ao>am)){O(a.grep(an.childNodes),al);return 0}else{au=aq.cloneNode(R);O(a.grep(an.childNodes),function(ax,aw){if((av<am&&aw<am)||(av>am&&aw>am)){ak.push(ax);ax.parentNode.removeChild(ax)}});if(av<am){an.insertBefore(au,ar)}else{if(av>am){an.insertBefore(au,ar.nextSibling)}}ap.push(au);O(ak,function(aw){au.appendChild(aw)});return au}}function ai(al,an,ap){var ak=[],ao,am;ao=ah.inline||ah.block;am=c.create(ao);V(am);K.walk(al,function(aq){var ar;function at(au){var ax=au.nodeName.toLowerCase(),aw=au.parentNode.nodeName.toLowerCase(),av;if(g(ax,"br")){ar=0;if(ah.block){c.remove(au)}return}if(ah.wrapper&&x(au,Y,ag)){ar=0;return}if(ah.block&&!ah.wrapper&&G(ax)){au=c.rename(au,ao);V(au);ak.push(au);ar=0;return}if(ah.selector){O(ac,function(ay){if("collapsed" in ay&&ay.collapsed!==ad){return}if(c.is(au,ay.selector)&&!b(au)){V(au,ay);av=true}});if(!ah.inline||av){ar=0;return}}if(d(ao,ax)&&d(aw,ao)&&!(!ap&&au.nodeType===3&&au.nodeValue.length===1&&au.nodeValue.charCodeAt(0)===65279)&&au.id!=="_mce_caret"){if(!ar){ar=am.cloneNode(R);au.parentNode.insertBefore(ar,au);ak.push(ar)}ar.appendChild(au)}else{if(ax=="li"&&an){ar=X(au,an,am,ak,at)}else{ar=0;O(a.grep(au.childNodes),at);ar=0}}}O(aq,at)});if(ah.wrap_links===false){O(ak,function(aq){function ar(aw){var av,au,at;if(aw.nodeName==="A"){au=am.cloneNode(R);ak.push(au);at=a.grep(aw.childNodes);for(av=0;av<at.length;av++){au.appendChild(at[av])}aw.appendChild(au)}O(a.grep(aw.childNodes),ar)}ar(aq)})}O(ak,function(at){var aq;function au(aw){var av=0;O(aw.childNodes,function(ax){if(!f(ax)&&!H(ax)){av++}});return av}function ar(av){var ax,aw;O(av.childNodes,function(ay){if(ay.nodeType==1&&!H(ay)&&!b(ay)){ax=ay;return R}});if(ax&&h(ax,ah)){aw=ax.cloneNode(R);V(aw);c.replace(aw,av,B);c.remove(ax,1)}return aw||av}aq=au(at);if((ak.length>1||!F(at))&&aq===0){c.remove(at,1);return}if(ah.inline||ah.wrapper){if(!ah.exact&&aq===1){at=ar(at)}O(ac,function(av){O(c.select(av.inline,at),function(ax){var aw;if(av.wrap_links===false){aw=ax.parentNode;do{if(aw.nodeName==="A"){return}}while(aw=aw.parentNode)}T(av,ag,ax,av.exact?ax:null)})});if(x(at.parentNode,Y,ag)){c.remove(at,1);at=0;return B}if(ah.merge_with_parents){c.getParent(at.parentNode,function(av){if(x(av,Y,ag)){c.remove(at,1);at=0;return B}})}if(at&&ah.merge_siblings!==false){at=u(C(at),at);at=u(at,C(at,B))}}})}if(ah){if(ab){if(ab.nodeType){W=c.createRng();W.setStartBefore(ab);W.setEndAfter(ab);ai(o(W,ac),null,true)}else{ai(ab,null,true)}}else{if(!ad||!ah.inline||c.select("td.mceSelected,th.mceSelected").length){var aj=U.selection.getNode();U.selection.setRng(aa());af=q.getBookmark();ai(o(q.getRng(B),ac),af);if(ah.styles&&(ah.styles.color||ah.styles.textDecoration)){a.walk(aj,I,"childNodes");I(aj)}q.moveToBookmark(af);q.setRng(Z(q.getRng(B)));U.nodeChanged()}else{P("apply",Y,ag)}}}}function A(X,ag,aa){var ab=Q(X),ai=ab[0],af,ae,W;function Z(al){var ak=al.startContainer,aq=al.startOffset,ap,ao,am,an;if(ak.nodeType==3&&aq>=ak.nodeValue.length-1){ak=ak.parentNode;aq=s(ak)+1}if(ak.nodeType==1){am=ak.childNodes;ak=am[Math.min(aq,am.length-1)];ap=new t(ak);if(aq>am.length-1){ap.next()}for(ao=ap.current();ao;ao=ap.next()){if(ao.nodeType==3&&!f(ao)){an=c.create("a",null,E);ao.parentNode.insertBefore(an,ao);al.setStart(ao,0);q.setRng(al);c.remove(an);return}}}}function Y(an){var am,al,ak;am=a.grep(an.childNodes);for(al=0,ak=ab.length;al<ak;al++){if(T(ab[al],ag,an,an)){break}}if(ai.deep){for(al=0,ak=am.length;al<ak;al++){Y(am[al])}}}function ac(ak){var al;O(m(ak.parentNode).reverse(),function(am){var an;if(!al&&am.id!="_start"&&am.id!="_end"){an=x(am,X,ag);if(an&&an.split!==false){al=am}}});return al}function V(an,ak,ap,at){var au,ar,aq,am,ao,al;if(an){al=an.parentNode;for(au=ak.parentNode;au&&au!=al;au=au.parentNode){ar=au.cloneNode(R);for(ao=0;ao<ab.length;ao++){if(T(ab[ao],ag,ar,ar)){ar=0;break}}if(ar){if(aq){ar.appendChild(aq)}if(!am){am=ar}aq=ar}}if(at&&(!ai.mixed||!F(an))){ak=c.split(an,ak)}if(aq){ap.parentNode.insertBefore(aq,ap);am.appendChild(ap)}}return ak}function ah(ak){return V(ac(ak),ak,ak,true)}function ad(am){var al=c.get(am?"_start":"_end"),ak=al[am?"firstChild":"lastChild"];if(H(ak)){ak=ak[am?"firstChild":"lastChild"]}c.remove(al,true);return ak}function aj(ak){var al,am;ak=o(ak,ab,B);if(ai.split){al=J(ak,B);am=J(ak);if(al!=am){al=N(al,"span",{id:"_start","data-mce-type":"bookmark"});am=N(am,"span",{id:"_end","data-mce-type":"bookmark"});ah(al);ah(am);al=ad(B);am=ad()}else{al=am=ah(al)}ak.startContainer=al.parentNode;ak.startOffset=s(al);ak.endContainer=am.parentNode;ak.endOffset=s(am)+1}K.walk(ak,function(an){O(an,function(ao){Y(ao);if(ao.nodeType===1&&U.dom.getStyle(ao,"text-decoration")==="underline"&&ao.parentNode&&i(ao.parentNode)==="underline"){T({deep:false,exact:true,inline:"span",styles:{textDecoration:"underline"}},null,ao)}})})}if(aa){if(aa.nodeType){W=c.createRng();W.setStartBefore(aa);W.setEndAfter(aa);aj(W)}else{aj(aa)}return}if(!q.isCollapsed()||!ai.inline||c.select("td.mceSelected,th.mceSelected").length){af=q.getBookmark();aj(q.getRng(B));q.moveToBookmark(af);if(ai.inline&&j(X,ag,q.getStart())){Z(q.getRng(true))}U.nodeChanged()}else{P("remove",X,ag)}if(a.isWebKit){U.execCommand("mceCleanup")}}function D(W,Y,X){var V=Q(W);if(j(W,Y,X)&&(!("toggle" in V[0])||V[0]["toggle"])){A(W,Y,X)}else{S(W,Y,X)}}function x(W,V,ab,Z){var X=Q(V),ac,aa,Y;function ad(ah,aj,ak){var ag,ai,ae=aj[ak],af;if(aj.onmatch){return aj.onmatch(ah,aj,ak)}if(ae){if(ae.length===p){for(ag in ae){if(ae.hasOwnProperty(ag)){if(ak==="attributes"){ai=c.getAttrib(ah,ag)}else{ai=L(ah,ag)}if(Z&&!ai&&!aj.exact){return}if((!Z||aj.exact)&&!g(ai,r(ae[ag],ab))){return}}}}else{for(af=0;af<ae.length;af++){if(ak==="attributes"?c.getAttrib(ah,ae[af]):L(ah,ae[af])){return aj}}}}return aj}if(X&&W){for(aa=0;aa<X.length;aa++){ac=X[aa];if(h(W,ac)&&ad(W,ac,"attributes")&&ad(W,ac,"styles")){if(Y=ac.classes){for(aa=0;aa<Y.length;aa++){if(!c.hasClass(W,Y[aa])){return}}}return ac}}}}function j(X,Z,Y){var W;function V(aa){aa=c.getParent(aa,function(ab){return !!x(ab,X,Z,true)});return x(aa,X,Z)}if(Y){return V(Y)}Y=q.getNode();if(V(Y)){return B}W=q.getStart();if(W!=Y){if(V(W)){return B}}return R}function v(ac,ab){var Z,aa=[],Y={},X,W,V;Z=q.getStart();c.getParent(Z,function(af){var ae,ad;for(ae=0;ae<ac.length;ae++){ad=ac[ae];if(!Y[ad]&&x(af,ad,ab)){Y[ad]=true;aa.push(ad)}}});return aa}function y(Z){var ab=Q(Z),Y,X,aa,W,V;if(ab){Y=q.getStart();X=m(Y);for(W=ab.length-1;W>=0;W--){V=ab[W].selector;if(!V){return B}for(aa=X.length-1;aa>=0;aa--){if(c.is(X[aa],V)){return B}}}}return R}a.extend(this,{get:Q,register:k,apply:S,remove:A,toggle:D,match:j,matchAll:v,matchNode:x,canApply:y});function h(V,W){if(g(V,W.inline)){return B}if(g(V,W.block)){return B}if(W.selector){return c.is(V,W.selector)}}function g(W,V){W=W||"";V=V||"";W=""+(W.nodeName||W);V=""+(V.nodeName||V);return W.toLowerCase()==V.toLowerCase()}function L(W,V){var X=c.getStyle(W,V);if(V=="color"||V=="backgroundColor"){X=c.toHex(X)}if(V=="fontWeight"&&X==700){X="bold"}return""+X}function r(V,W){if(typeof(V)!="string"){V=V(W)}else{if(W){V=V.replace(/%(\w+)/g,function(Y,X){return W[X]||Y})}}return V}function f(V){return V&&V.nodeType===3&&/^([\t \r\n]+|)$/.test(V.nodeValue)}function N(X,W,V){var Y=c.create(W,V);X.parentNode.insertBefore(Y,X);Y.appendChild(X);return Y}function o(V,ah,Y){var X=V.startContainer,ac=V.startOffset,ak=V.endContainer,ae=V.endOffset,aj,ag,ab,af;function ai(aq){var al,ao,ap,an,am;al=ao=aq?X:ak;am=aq?"previousSibling":"nextSibling";root=c.getRoot();if(al.nodeType==3&&!f(al)){if(aq?ac>0:ae<al.nodeValue.length){return al}}for(;;){if(ao==root||(!ah[0].block_expand&&F(ao))){return ao}for(an=ao[am];an;an=an[am]){if(!H(an)&&!f(an)){return ao}}ao=ao.parentNode}return al}function aa(al,am){if(am===p){am=al.nodeType===3?al.length:al.childNodes.length}while(al&&al.hasChildNodes()){al=al.childNodes[am];if(al){am=al.nodeType===3?al.length:al.childNodes.length}}return{node:al,offset:am}}if(X.nodeType==1&&X.hasChildNodes()){ag=X.childNodes.length-1;X=X.childNodes[ac>ag?ag:ac];if(X.nodeType==3){ac=0}}if(ak.nodeType==1&&ak.hasChildNodes()){ag=ak.childNodes.length-1;ak=ak.childNodes[ae>ag?ag:ae-1];if(ak.nodeType==3){ae=ak.nodeValue.length}}if(H(X.parentNode)||H(X)){X=H(X)?X:X.parentNode;X=X.nextSibling||X;if(X.nodeType==3){ac=0}}if(H(ak.parentNode)||H(ak)){ak=H(ak)?ak:ak.parentNode;ak=ak.previousSibling||ak;if(ak.nodeType==3){ae=ak.length}}if(ah[0].inline){if(V.collapsed){function ad(am,aq,at){var ap,an,ar,al;function ao(av,ax){var ay,au,aw=av.nodeValue;if(typeof(ax)=="undefined"){ax=at?aw.length:0}if(at){ay=aw.lastIndexOf(" ",ax);au=aw.lastIndexOf("\u00a0",ax);ay=ay>au?ay:au;if(ay!==-1&&!Y){ay++}}else{ay=aw.indexOf(" ",ax);au=aw.indexOf("\u00a0",ax);ay=ay!==-1&&(au===-1||ay<au)?ay:au}return ay}if(am.nodeType===3){ar=ao(am,aq);if(ar!==-1){return{container:am,offset:ar}}al=am}ap=new t(am,c.getParent(am,F)||U.getBody());while(an=ap[at?"prev":"next"]()){if(an.nodeType===3){al=an;ar=ao(an);if(ar!==-1){return{container:an,offset:ar}}}else{if(F(an)){break}}}if(al){if(at){aq=0}else{aq=al.length}return{container:al,offset:aq}}}af=ad(X,ac,true);if(af){X=af.container;ac=af.offset}af=ad(ak,ae);if(af){ak=af.container;ae=af.offset}}ab=aa(ak,ae);if(ab.node){while(ab.node&&ab.offset===0&&ab.node.previousSibling){ab=aa(ab.node.previousSibling)}if(ab.node&&ab.offset>0&&ab.node.nodeType===3&&ab.node.nodeValue.charAt(ab.offset-1)===" "){if(ab.offset>1){ak=ab.node;ak.splitText(ab.offset-1)}else{if(ab.node.previousSibling){}}}}}if(ah[0].inline||ah[0].block_expand){if(!ah[0].inline||(X.nodeType!=3||ac===0)){X=ai(true)}if(!ah[0].inline||(ak.nodeType!=3||ae===ak.nodeValue.length)){ak=ai()}}if(ah[0].selector&&ah[0].expand!==R&&!ah[0].inline){function Z(am,al){var an,ao,aq,ap;if(am.nodeType==3&&am.nodeValue.length==0&&am[al]){am=am[al]}an=m(am);for(ao=0;ao<an.length;ao++){for(aq=0;aq<ah.length;aq++){ap=ah[aq];if("collapsed" in ap&&ap.collapsed!==V.collapsed){continue}if(c.is(an[ao],ap.selector)){return an[ao]}}}return am}X=Z(X,"previousSibling");ak=Z(ak,"nextSibling")}if(ah[0].block||ah[0].selector){function W(am,al,ao){var an;if(!ah[0].wrapper){an=c.getParent(am,ah[0].block)}if(!an){an=c.getParent(am.nodeType==3?am.parentNode:am,F)}if(an&&ah[0].wrapper){an=m(an,"ul,ol").reverse()[0]||an}if(!an){an=am;while(an[al]&&!F(an[al])){an=an[al];if(g(an,"br")){break}}}return an||am}X=W(X,"previousSibling");ak=W(ak,"nextSibling");if(ah[0].block){if(!F(X)){X=ai(true)}if(!F(ak)){ak=ai()}}}if(X.nodeType==1){ac=s(X);X=X.parentNode}if(ak.nodeType==1){ae=s(ak)+1;ak=ak.parentNode}return{startContainer:X,startOffset:ac,endContainer:ak,endOffset:ae}}function T(ab,aa,Y,V){var X,W,Z;if(!h(Y,ab)){return R}if(ab.remove!="all"){O(ab.styles,function(ad,ac){ad=r(ad,aa);if(typeof(ac)==="number"){ac=ad;V=0}if(!V||g(L(V,ac),ad)){c.setStyle(Y,ac,"")}Z=1});if(Z&&c.getAttrib(Y,"style")==""){Y.removeAttribute("style");Y.removeAttribute("data-mce-style")}O(ab.attributes,function(ae,ac){var ad;ae=r(ae,aa);if(typeof(ac)==="number"){ac=ae;V=0}if(!V||g(c.getAttrib(V,ac),ae)){if(ac=="class"){ae=c.getAttrib(Y,ac);if(ae){ad="";O(ae.split(/\s+/),function(af){if(/mce\w+/.test(af)){ad+=(ad?" ":"")+af}});if(ad){c.setAttrib(Y,ac,ad);return}}}if(ac=="class"){Y.removeAttribute("className")}if(e.test(ac)){Y.removeAttribute("data-mce-"+ac)}Y.removeAttribute(ac)}});O(ab.classes,function(ac){ac=r(ac,aa);if(!V||c.hasClass(V,ac)){c.removeClass(Y,ac)}});W=c.getAttribs(Y);for(X=0;X<W.length;X++){if(W[X].nodeName.indexOf("_")!==0){return R}}}if(ab.remove!="none"){n(Y,ab);return B}}function n(X,Y){var V=X.parentNode,W;if(Y.block){if(!l){function Z(ab,aa,ac){ab=C(ab,aa,ac);return !ab||(ab.nodeName=="BR"||F(ab))}if(F(X)&&!F(V)){if(!Z(X,R)&&!Z(X.firstChild,B,1)){X.insertBefore(c.create("br"),X.firstChild)}if(!Z(X,B)&&!Z(X.lastChild,R,1)){X.appendChild(c.create("br"))}}}else{if(V==c.getRoot()){if(!Y.list_block||!g(X,Y.list_block)){O(a.grep(X.childNodes),function(aa){if(d(l,aa.nodeName.toLowerCase())){if(!W){W=N(aa,l)}else{W.appendChild(aa)}}else{W=0}})}}}}if(Y.selector&&Y.inline&&!g(Y.inline,X)){return}c.remove(X,1)}function C(W,V,X){if(W){V=V?"nextSibling":"previousSibling";for(W=X?W:W[V];W;W=W[V]){if(W.nodeType==1||!f(W)){return W}}}}function H(V){return V&&V.nodeType==1&&V.getAttribute("data-mce-type")=="bookmark"}function u(Z,Y){var V,X,W;function ab(ae,ad){if(ae.nodeName!=ad.nodeName){return R}function ac(ag){var ah={};O(c.getAttribs(ag),function(ai){var aj=ai.nodeName.toLowerCase();if(aj.indexOf("_")!==0&&aj!=="style"){ah[aj]=c.getAttrib(ag,aj)}});return ah}function af(aj,ai){var ah,ag;for(ag in aj){if(aj.hasOwnProperty(ag)){ah=ai[ag];if(ah===p){return R}if(aj[ag]!=ah){return R}delete ai[ag]}}for(ag in ai){if(ai.hasOwnProperty(ag)){return R}}return B}if(!af(ac(ae),ac(ad))){return R}if(!af(c.parseStyle(c.getAttrib(ae,"style")),c.parseStyle(c.getAttrib(ad,"style")))){return R}return B}if(Z&&Y){function aa(ad,ac){for(X=ad;X;X=X[ac]){if(X.nodeType==3&&X.nodeValue.length!==0){return ad}if(X.nodeType==1&&!H(X)){return X}}return ad}Z=aa(Z,"previousSibling");Y=aa(Y,"nextSibling");if(ab(Z,Y)){for(X=Z.nextSibling;X&&X!=Y;){W=X;X=X.nextSibling;Z.appendChild(W)}c.remove(Y);O(a.grep(Y.childNodes),function(ac){Z.appendChild(ac)});return Z}}return Y}function G(V){return/^(h[1-6]|p|div|pre|address|dl|dt|dd)$/.test(V)}function J(W,aa){var V,Z,X,Y;V=W[aa?"startContainer":"endContainer"];Z=W[aa?"startOffset":"endOffset"];if(V.nodeType==1){X=V.childNodes.length-1;if(!aa&&Z){Z--}V=V.childNodes[Z>X?X:Z]}if(V.nodeType===3&&aa&&Z>=V.nodeValue.length){V=new t(V,U.getBody()).next()||V}if(V.nodeType===3&&!aa&&Z==0){V=new t(V,U.getBody()).prev()||V}return V}function P(ae,V,ac){var ah,af="_mce_caret",W=U.settings.caret_debug;ah=a.isGecko?"\u200B":E;function X(aj){var ai=c.create("span",{id:af,"data-mce-bogus":true,style:W?"color:red":""});if(aj){ai.appendChild(U.getDoc().createTextNode(ah))}return ai}function ad(aj,ai){while(aj){if((aj.nodeType===3&&aj.nodeValue!==ah)||aj.childNodes.length>1){return false}if(ai&&aj.nodeType===1){ai.push(aj)}aj=aj.firstChild}return true}function aa(ai){while(ai){if(ai.id===af){return ai}ai=ai.parentNode}}function Z(ai){var aj;if(ai){aj=new t(ai,ai);for(ai=aj.current();ai;ai=aj.next()){if(ai.nodeType===3){return ai}}}}function Y(ak,aj){var al,ai;if(!ak){ak=aa(q.getStart());if(!ak){while(ak=c.get(af)){Y(ak,false)}}}else{ai=q.getRng(true);if(ad(ak)){if(aj!==false){ai.setStartBefore(ak);ai.setEndBefore(ak)}c.remove(ak)}else{al=Z(ak);al=al.deleteData(0,1);c.remove(ak,1)}q.setRng(ai)}}function ab(){var ak,ai,ao,an,al,aj,am;ak=q.getRng(true);an=ak.startOffset;aj=ak.startContainer;am=aj.nodeValue;ai=aa(q.getStart());if(ai){ao=Z(ai)}if(am&&an>0&&an<am.length&&/\w/.test(am.charAt(an))&&/\w/.test(am.charAt(an-1))){al=q.getBookmark();ak.collapse(true);ak=o(ak,Q(V));ak=K.split(ak);S(V,ac,ak);q.moveToBookmark(al)}else{if(!ai||ao.nodeValue!==ah){ai=X(true);ao=ai.firstChild;ak.insertNode(ai);an=1;S(V,ac,ai)}else{S(V,ac,ai)}q.setCursorLocation(ao,an)}}function ag(){var ai=q.getRng(true),aj,al,ao,an,ak,ar,aq=[],am,ap;aj=ai.startContainer;al=ai.startOffset;ak=aj;if(aj.nodeType==3){if(al!=aj.nodeValue.length||aj.nodeValue===ah){an=true}ak=ak.parentNode}while(ak){if(x(ak,V,ac)){ar=ak;break}if(ak.nextSibling){an=true}aq.push(ak);ak=ak.parentNode}if(!ar){return}if(an){ao=q.getBookmark();ai.collapse(true);ai=o(ai,Q(V),true);ai=K.split(ai);A(V,ac,ai);q.moveToBookmark(ao)}else{ap=X();ak=ap;for(am=aq.length-1;am>=0;am--){ak.appendChild(aq[am].cloneNode(false));ak=ak.firstChild}ak.appendChild(c.doc.createTextNode(ah));ak=ak.firstChild;c.insertAfter(ap,ar);q.setCursorLocation(ak,1)}}U.onBeforeGetContent.addToTop(function(){var ai=[],aj;if(ad(aa(q.getStart()),ai)){aj=ai.length;while(aj--){c.setAttrib(ai[aj],"data-mce-bogus","1")}}});a.each("onMouseUp onKeyUp".split(" "),function(ai){U[ai].addToTop(function(){Y()})});U.onKeyDown.addToTop(function(ai,ak){var aj=ak.keyCode;if(aj==8||aj==37||aj==39){Y(aa(q.getStart()))}});if(ae=="apply"){ab()}else{ag()}}}})(tinymce);tinymce.onAddEditor.add(function(e,a){var d,h,g,c=a.settings;if(c.inline_styles){h=e.explode(c.font_size_legacy_values);function b(j,i){e.each(i,function(l,k){if(l){g.setStyle(j,k,l)}});g.rename(j,"span")}d={font:function(j,i){b(i,{backgroundColor:i.style.backgroundColor,color:i.color,fontFamily:i.face,fontSize:h[parseInt(i.size)-1]})},u:function(j,i){b(i,{textDecoration:"underline"})},strike:function(j,i){b(i,{textDecoration:"line-through"})}};function f(i,j){g=i.dom;if(c.convert_fonts_to_spans){e.each(g.select("font,u,strike",j.node),function(k){d[k.nodeName.toLowerCase()](a.dom,k)})}}a.onPreProcess.add(f);a.onSetContent.add(f);a.onInit.add(function(){a.selection.onSetContent.add(f)})}});
diff --git a/js/tiny_mce/utils/mctabs.js b/js/tiny_mce/utils/mctabs.js
index 458ec86da60..6553fa40804 100644
--- a/js/tiny_mce/utils/mctabs.js
+++ b/js/tiny_mce/utils/mctabs.js
@@ -159,4 +159,4 @@ tinyMCEPopup.onInit.add(function() {
 			enableUpDown: true
 		}, tinyMCEPopup.dom);
 	});
-});
\ No newline at end of file
+});
diff --git a/js/varien/configurable.js b/js/varien/configurable.js
index 68baf730bae..3721cf75bf0 100644
--- a/js/varien/configurable.js
+++ b/js/varien/configurable.js
@@ -40,12 +40,12 @@ Product.Config.prototype = {
         this.state      = new Hash();
         this.priceTemplate = new Template(this.config.template);
         this.prices     = config.prices;
-        
+
         // Set default values from config
         if (config.defaultValues) {
             this.values = config.defaultValues;
         }
-        
+
         // Overwrite defaults by url
         var separatorIndex = window.location.href.indexOf('#');
         if (separatorIndex != -1) {
@@ -58,7 +58,7 @@ Product.Config.prototype = {
                 this.values[i] = urlValues[i];
             }
         }
-        
+
         // Overwrite defaults by inputs values if needed
         if (config.inputsInitialized) {
             this.values = {};
@@ -69,8 +69,8 @@ Product.Config.prototype = {
                 }
             }.bind(this));
         }
-            
-        // Put events to check select reloads 
+
+        // Put events to check select reloads
         this.settings.each(function(element){
             Event.observe(element, 'change', this.configure.bind(this))
         }.bind(this));
@@ -105,7 +105,7 @@ Product.Config.prototype = {
         this.configureForValues();
         document.observe("dom:loaded", this.configureForValues.bind(this));
     },
-    
+
     configureForValues: function () {
         if (this.values) {
             this.settings.each(function(element){
@@ -168,7 +168,8 @@ Product.Config.prototype = {
         var attributeId = element.id.replace(/[a-z]*/, '');
         var options = this.getAttributeOptions(attributeId);
         this.clearSelect(element);
-        element.options[0] = new Option(this.config.chooseText, '');
+        element.options[0] = new Option('', '');
+        element.options[0].innerHTML = this.config.chooseText;
 
         var prevConfig = false;
         if(element.prevSetting){
diff --git a/js/varien/form.js b/js/varien/form.js
index ba13c4b8278..068b222606a 100644
--- a/js/varien/form.js
+++ b/js/varien/form.js
@@ -289,6 +289,7 @@ RegionUpdater.prototype = {
             }
             this.setMarkDisplay(this.regionSelectEl, true);
         } else {
+            this.regionSelectEl.options.length = 1;
             if (this.disableAction=='hide') {
                 if (this.regionTextEl) {
                     this.regionTextEl.style.display = '';
diff --git a/js/varien/js.js b/js/varien/js.js
index 3f335bf9738..d2a81b5c9cc 100644
--- a/js/varien/js.js
+++ b/js/varien/js.js
@@ -280,10 +280,12 @@ if (!window.Varien)
     var Varien = new Object();
 
 Varien.showLoading = function(){
-    Element.show('loading-process');
+    var loader = $('loading-process');
+    loader && loader.show();
 }
 Varien.hideLoading = function(){
-    Element.hide('loading-process');
+    var loader = $('loading-process');
+    loader && loader.hide();
 }
 Varien.GlobalHandlers = {
     onCreate: function() {
@@ -437,10 +439,13 @@ Varien.DateElement.prototype = {
     },
     validate: function() {
         var error = false,
-            day = parseInt(this.day.value.replace(/^0*/, '')) || 0,
-            month = parseInt(this.month.value.replace(/^0*/, '')) || 0,
-            year = parseInt(this.year.value) || 0;
-        if (!day && !month && !year) {
+            day   = parseInt(this.day.value, 10)   || 0,
+            month = parseInt(this.month.value, 10) || 0,
+            year  = parseInt(this.year.value, 10)  || 0;
+        if (this.day.value.strip().empty()
+            && this.month.value.strip().empty()
+            && this.year.value.strip().empty()
+        ) {
             if (this.required) {
                 error = 'This date is a required value.';
             } else {
diff --git a/js/varien/product.js b/js/varien/product.js
index a8b967f9fed..628f09672e9 100644
--- a/js/varien/product.js
+++ b/js/varien/product.js
@@ -133,14 +133,17 @@ Product.Zoom.prototype = {
         this.imageZoom = this.floorZoom+(v*(this.ceilingZoom-this.floorZoom));
 
         if (overSize) {
-            if (this.imageDim.width > this.containerDim.width) {
+            if (this.imageDim.width > this.imageDim.height) {
                 this.imageEl.style.width = (this.imageZoom*this.containerDim.width)+'px';
-            } else if (this.imageDim.height > this.containerDim.height) {
+            } else {
                 this.imageEl.style.height = (this.imageZoom*this.containerDim.height)+'px';
             }
-
-            if(this.containerDim.ratio){
-                this.imageEl.style.height = (this.imageZoom*this.containerDim.width*this.containerDim.ratio)+'px'; // for safari
+            if (this.containerDim.ratio) {
+                if (this.imageDim.width > this.imageDim.height) {
+                    this.imageEl.style.height = (this.imageZoom*this.containerDim.width*this.containerDim.ratio)+'px'; // for safari
+                } else {
+                    this.imageEl.style.width = (this.imageZoom*this.containerDim.height*this.containerDim.ratio)+'px'; // for safari
+                }
             }
         } else {
             this.slider.setDisabled();
@@ -365,7 +368,8 @@ Product.Config.prototype = {
         var attributeId = element.id.replace(/[a-z]*/, '');
         var options = this.getAttributeOptions(attributeId);
         this.clearSelect(element);
-        element.options[0] = new Option(this.config.chooseText, '');
+        element.options[0] = new Option('', '');
+        element.options[0].innerHTML = this.config.chooseText;
 
         var prevConfig = false;
         if(element.prevSetting){
@@ -561,7 +565,7 @@ Product.OptionsPrice.prototype = {
         this.productOldPrice    = config.productOldPrice;
         this.priceInclTax       = config.priceInclTax;
         this.priceExclTax       = config.priceExclTax;
-        this.skipCalculate      = config.skipCalculate;//@deprecated after 1.5.1.0
+        this.skipCalculate      = config.skipCalculate; /** @deprecated after 1.5.1.0 */
         this.duplicateIdSuffix  = config.idSuffix;
         this.specialTaxPrice    = config.specialTaxPrice;
         this.tierPrices         = config.tierPrices;
@@ -760,8 +764,8 @@ Product.OptionsPrice.prototype = {
                 };
                 var container = $(this.containers[3]) ? this.containers[3] : this.containers[0];
                 var price = parsePrice($(container).innerHTML);
-                var tierPrice = $$('.price.tier-' + i);
-                tierPrice = tierPrice.length ? parseInt(tierPrice[0].innerHTML, 10) : 0;
+                var tierPrice = $$('.tier-price.tier-' + i+' .price');
+                tierPrice = tierPrice.length ? parsePrice(tierPrice[0].innerHTML, 10) : 0;
                 var $percent = Selector.findChildElements(el, ['.percent.tier-' + i]);
                 $percent.each(function (el) {
                     el.innerHTML = Math.ceil(100 - ((100 / price) * tierPrice));
diff --git a/lib/Cm/Cache/Backend/Redis.php b/lib/Cm/Cache/Backend/Redis.php
new file mode 100644
index 00000000000..68a2e20730a
--- /dev/null
+++ b/lib/Cm/Cache/Backend/Redis.php
@@ -0,0 +1,752 @@
+<?php
+/*
+==New BSD License==
+
+Copyright (c) 2012, Colin Mollenhour
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * The name of Colin Mollenhour may not be used to endorse or promote products
+      derived from this software without specific prior written permission.
+    * The class name must remain as Cm_Cache_Backend_Redis.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * Redis adapter for Zend_Cache
+ *
+ * @copyright  Copyright (c) 2012 Colin Mollenhour (http://colin.mollenhour.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @author     Colin Mollenhour (http://colin.mollenhour.com)
+ */
+class Cm_Cache_Backend_Redis extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface
+{
+
+    const SET_IDS         = 'zc:ids';
+    const SET_TAGS        = 'zc:tags';
+
+    const PREFIX_KEY      = 'zc:k:';
+    const PREFIX_TAG_IDS  = 'zc:ti:';
+
+    const FIELD_DATA      = 'd';
+    const FIELD_MTIME     = 'm';
+    const FIELD_TAGS      = 't';
+    const FIELD_INF       = 'i';
+
+    const MAX_LIFETIME    = 2592000; /* Redis backend limit */
+    const COMPRESS_PREFIX = ":\x1f\x8b";
+    const DEFAULT_CONNECT_TIMEOUT = 2.5;
+    const DEFAULT_CONNECT_RETRIES = 1;
+
+    /** @var Credis_Client */
+    protected $_redis;
+
+    /** @var bool */
+    protected $_notMatchingTags = FALSE;
+
+    /** @var int */
+    protected $_lifetimelimit = self::MAX_LIFETIME; /* Redis backend limit */
+
+    /** @var int */
+    protected $_compressTags = 1;
+
+    /** @var int */
+    protected $_compressData = 1;
+
+    /** @var int */
+    protected $_compressThreshold = 20480;
+
+    /** @var string */
+    protected $_compressionLib;
+
+    /**
+     * Contruct Zend_Cache Redis backend
+     * @param array $options
+     * @return \Cm_Cache_Backend_Redis
+     */
+    public function __construct($options = array())
+    {
+        if ( empty($options['server']) ) {
+            Zend_Cache::throwException('Redis \'server\' not specified.');
+        }
+
+        if ( empty($options['port']) && substr($options['server'],0,1) != '/' ) {
+            Zend_Cache::throwException('Redis \'port\' not specified.');
+        }
+
+        $timeout = isset($options['timeout']) ? $options['timeout'] : self::DEFAULT_CONNECT_TIMEOUT;
+        $persistent = isset($options['persistent']) ? $options['persistent'] : '';
+        $this->_redis = new Credis_Client($options['server'], $options['port'], $timeout, $persistent);
+
+        if ( isset($options['force_standalone']) && $options['force_standalone']) {
+            $this->_redis->forceStandalone();
+        }
+
+        $connectRetries = isset($options['connect_retries']) ? (int)$options['connect_retries'] : self::DEFAULT_CONNECT_RETRIES;
+        $this->_redis->setMaxConnectRetries($connectRetries);
+
+        if ( ! empty($options['read_timeout']) && $options['read_timeout'] > 0) {
+            $this->_redis->setReadTimeout((float) $options['read_timeout']);
+        }
+
+        if ( ! empty($options['password'])) {
+            $this->_redis->auth($options['password']) or Zend_Cache::throwException('Unable to authenticate with the redis server.');
+        }
+
+        // Always select database on startup in case persistent connection is re-used by other code
+        if (empty($options['database'])) {
+            $options['database'] = 0;
+        }
+        $this->_redis->select( (int) $options['database']) or Zend_Cache::throwException('The redis database could not be selected.');
+
+        if ( isset($options['notMatchingTags']) ) {
+            $this->_notMatchingTags = (bool) $options['notMatchingTags'];
+        }
+
+        if ( isset($options['compress_tags'])) {
+            $this->_compressTags = (int) $options['compress_tags'];
+        }
+
+        if ( isset($options['compress_data'])) {
+            $this->_compressData = (int) $options['compress_data'];
+        }
+
+        if ( isset($options['lifetimelimit'])) {
+            $this->_lifetimelimit = (int) min($options['lifetimelimit'], self::MAX_LIFETIME);
+        }
+
+        if ( isset($options['compress_threshold'])) {
+            $this->_compressThreshold = (int) $options['compress_threshold'];
+        }
+
+        if ( isset($options['automatic_cleaning_factor']) ) {
+            $this->_options['automatic_cleaning_factor'] = (int) $options['automatic_cleaning_factor'];
+        } else {
+            $this->_options['automatic_cleaning_factor'] = 0;
+        }
+
+        if ( isset($options['compression_lib']) ) {
+            $this->_compressionLib = $options['compression_lib'];
+        }
+        else if ( function_exists('snappy_compress') ) {
+            $this->_compressionLib = 'snappy';
+        }
+        else if ( function_exists('lzf_compress') ) {
+            $this->_compressionLib = 'lzf';
+        }
+        else {
+            $this->_compressionLib = 'gzip';
+        }
+        $this->_compressPrefix = substr($this->_compressionLib,0,2).self::COMPRESS_PREFIX;
+    }
+
+    /**
+     * Load value with given id from cache
+     *
+     * @param  string  $id                     Cache id
+     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
+     * @return bool|string
+     */
+    public function load($id, $doNotTestCacheValidity = false)
+    {
+        $data = $this->_redis->hGet(self::PREFIX_KEY.$id, self::FIELD_DATA);
+        if ($data === NULL) {
+            return FALSE;
+        }
+        return $this->_decodeData($data);
+    }
+
+    /**
+     * Test if a cache is available or not (for the given id)
+     *
+     * @param  string $id Cache id
+     * @return bool|int False if record is not available or "last modified" timestamp of the available cache record
+     */
+    public function test($id)
+    {
+        $mtime = $this->_redis->hGet(self::PREFIX_KEY.$id, self::FIELD_MTIME);
+        return ($mtime ? $mtime : FALSE);
+    }
+
+    /**
+     * Save some string datas into a cache record
+     *
+     * Note : $data is always "string" (serialization is done by the
+     * core not by the backend)
+     *
+     * @param  string $data             Datas to cache
+     * @param  string $id               Cache id
+     * @param  array  $tags             Array of strings, the cache record will be tagged by each string entry
+     * @param  bool|int $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @throws CredisException
+     * @return boolean True if no problem
+     */
+    public function save($data, $id, $tags = array(), $specificLifetime = false)
+    {
+        if ( ! is_array($tags)) $tags = $tags ? array($tags) : array();
+
+        $lifetime = $this->getLifetime($specificLifetime);
+
+        // Get list of tags previously assigned
+        $oldTags = $this->_decodeData($this->_redis->hGet(self::PREFIX_KEY.$id, self::FIELD_TAGS));
+        $oldTags = $oldTags ? explode(',', $oldTags) : array();
+
+        $this->_redis->pipeline()->multi();
+
+        // Set the data
+        $result = $this->_redis->hMSet(self::PREFIX_KEY.$id, array(
+            self::FIELD_DATA => $this->_encodeData($data, $this->_compressData),
+            self::FIELD_TAGS => $this->_encodeData(implode(',',$tags), $this->_compressTags),
+            self::FIELD_MTIME => time(),
+            self::FIELD_INF => $lifetime ? 0 : 1,
+        ));
+        if( ! $result) {
+            throw new CredisException("Could not set cache key $id");
+        }
+
+        // Set expiration if specified
+        if ($lifetime) {
+            $this->_redis->expire(self::PREFIX_KEY.$id, min($lifetime, self::MAX_LIFETIME));
+        }
+
+        // Process added tags
+        if ($tags)
+        {
+            // Update the list with all the tags
+            $this->_redis->sAdd( self::SET_TAGS, $tags);
+
+            // Update the id list for each tag
+            foreach($tags as $tag)
+            {
+                $this->_redis->sAdd(self::PREFIX_TAG_IDS . $tag, $id);
+            }
+        }
+
+        // Process removed tags
+        if ($remTags = ($oldTags ? array_diff($oldTags, $tags) : FALSE))
+        {
+            // Update the id list for each tag
+            foreach($remTags as $tag)
+            {
+                $this->_redis->sRem(self::PREFIX_TAG_IDS . $tag, $id);
+            }
+        }
+
+        // Update the list with all the ids
+        if($this->_notMatchingTags) {
+            $this->_redis->sAdd(self::SET_IDS, $id);
+        }
+
+        $this->_redis->exec();
+
+        return TRUE;
+    }
+
+    /**
+     * Remove a cache record
+     *
+     * @param  string $id Cache id
+     * @return boolean True if no problem
+     */
+    public function remove($id)
+    {
+        // Get list of tags for this id
+        $tags = explode(',', $this->_decodeData($this->_redis->hGet(self::PREFIX_KEY.$id, self::FIELD_TAGS)));
+
+        $this->_redis->pipeline()->multi();
+
+        // Remove data
+        $this->_redis->del(self::PREFIX_KEY.$id);
+
+        // Remove id from list of all ids
+        if($this->_notMatchingTags) {
+            $this->_redis->sRem( self::SET_IDS, $id );
+        }
+
+        // Update the id list for each tag
+        foreach($tags as $tag) {
+            $this->_redis->sRem(self::PREFIX_TAG_IDS . $tag, $id);
+        }
+
+        $result = $this->_redis->exec();
+
+        return (bool) $result[0];
+    }
+
+    /**
+     * @param array $tags
+     */
+    protected function _removeByNotMatchingTags($tags)
+    {
+        $ids = $this->getIdsNotMatchingTags($tags);
+        if($ids)
+        {
+            $this->_redis->pipeline()->multi();
+
+            // Remove data
+            $this->_redis->del( $this->_preprocessIds($ids));
+
+            // Remove ids from list of all ids
+            if($this->_notMatchingTags) {
+                $this->_redis->sRem( self::SET_IDS, $ids);
+            }
+
+            $this->_redis->exec();
+        }
+    }
+
+    /**
+     * @param array $tags
+     */
+    protected function _removeByMatchingTags($tags)
+    {
+        $ids = $this->getIdsMatchingTags($tags);
+        if($ids)
+        {
+            $this->_redis->pipeline()->multi();
+
+            // Remove data
+            $this->_redis->del( $this->_preprocessIds($ids));
+
+            // Remove ids from list of all ids
+            if($this->_notMatchingTags) {
+                $this->_redis->sRem( self::SET_IDS, $ids);
+            }
+
+            $this->_redis->exec();
+        }
+    }
+
+    /**
+     * @param array $tags
+     */
+    protected function _removeByMatchingAnyTags($tags)
+    {
+        $ids = $this->getIdsMatchingAnyTags($tags);
+
+        $this->_redis->pipeline()->multi();
+
+        if($ids)
+        {
+            // Remove data
+            $this->_redis->del( $this->_preprocessIds($ids));
+
+            // Remove ids from list of all ids
+            if($this->_notMatchingTags) {
+                $this->_redis->sRem( self::SET_IDS, $ids);
+            }
+        }
+
+        // Remove tag id lists
+        $this->_redis->del( $this->_preprocessTagIds($tags));
+
+        // Remove tags from list of tags
+        $this->_redis->sRem( self::SET_TAGS, $tags);
+
+        $this->_redis->exec();
+    }
+
+    /**
+     * Clean up tag id lists since as keys expire the ids remain in the tag id lists
+     */
+    protected function _collectGarbage()
+    {
+        // Clean up expired keys from tag id set and global id set
+        $exists = array();
+        $tags = (array) $this->_redis->sMembers(self::SET_TAGS);
+        foreach($tags as $tag)
+        {
+            // Get list of expired ids for each tag
+            $tagMembers = $this->_redis->sMembers(self::PREFIX_TAG_IDS . $tag);
+            $numTagMembers = count($tagMembers);
+            $expired = array();
+            $numExpired = $numNotExpired = 0;
+            if($numTagMembers) {
+                while ($id = array_pop($tagMembers)) {
+                    if( ! isset($exists[$id])) {
+                        $exists[$id] = $this->_redis->exists(self::PREFIX_KEY.$id);
+                    }
+                    if ($exists[$id]) {
+                        $numNotExpired++;
+                    }
+                    else {
+                        $numExpired++;
+                        $expired[] = $id;
+
+                        // Remove incrementally to reduce memory usage
+                        if (count($expired) % 100 == 0 && $numNotExpired > 0) {
+                            $this->_redis->sRem( self::PREFIX_TAG_IDS . $tag, $expired);
+                            if($this->_notMatchingTags) { // Clean up expired ids from ids set
+                                $this->_redis->sRem( self::SET_IDS, $expired);
+                            }
+                            $expired = array();
+                        }
+                    }
+                }
+                if( ! count($expired)) continue;
+            }
+
+            // Remove empty tags or completely expired tags
+            if ($numExpired == $numTagMembers) {
+                $this->_redis->del(self::PREFIX_TAG_IDS . $tag);
+                $this->_redis->sRem(self::SET_TAGS, $tag);
+            }
+            // Clean up expired ids from tag ids set
+            else if (count($expired)) {
+                $this->_redis->sRem( self::PREFIX_TAG_IDS . $tag, $expired);
+                if($this->_notMatchingTags) { // Clean up expired ids from ids set
+                    $this->_redis->sRem( self::SET_IDS, $expired);
+                }
+            }
+            unset($expired);
+        }
+
+        // Clean up global list of ids for ids with no tag
+        if($this->_notMatchingTags) {
+            // TODO
+        }
+    }
+
+    /**
+     * Clean some cache records
+     *
+     * Available modes are :
+     * 'all' (default)  => remove all cache entries ($tags is not used)
+     * 'old'            => runs _collectGarbage()
+     * 'matchingTag'    => supported
+     * 'notMatchingTag' => supported
+     * 'matchingAnyTag' => supported
+     *
+     * @param  string $mode Clean mode
+     * @param  array  $tags Array of tags
+     * @throws Zend_Cache_Exception
+     * @return boolean True if no problem
+     */
+    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
+    {
+        if( $tags && ! is_array($tags)) {
+            $tags = array($tags);
+        }
+
+        if($mode == Zend_Cache::CLEANING_MODE_ALL) {
+            return $this->_redis->flushDb();
+        }
+
+        if($mode == Zend_Cache::CLEANING_MODE_OLD) {
+            $this->_collectGarbage();
+            return TRUE;
+        }
+
+        if( ! count($tags)) {
+            return TRUE;
+        }
+
+        $result = TRUE;
+
+        switch ($mode)
+        {
+            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
+
+                $this->_removeByMatchingTags($tags);
+                break;
+
+            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
+
+                $this->_removeByNotMatchingTags($tags);
+                break;
+
+            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
+
+                $this->_removeByMatchingAnyTags($tags);
+                break;
+
+            default:
+                Zend_Cache::throwException('Invalid mode for clean() method: '.$mode);
+        }
+        return (bool) $result;
+    }
+
+    /**
+     * Return true if the automatic cleaning is available for the backend
+     *
+     * @return boolean
+     */
+    public function isAutomaticCleaningAvailable()
+    {
+        return TRUE;
+    }
+
+    /**
+     * Set the frontend directives
+     *
+     * @param  array $directives Assoc of directives
+     * @throws Zend_Cache_Exception
+     * @return void
+     */
+    public function setDirectives($directives)
+    {
+        parent::setDirectives($directives);
+        $lifetime = $this->getLifetime(false);
+        if ($lifetime > self::MAX_LIFETIME) {
+            Zend_Cache::throwException('Redis backend has a limit of 30 days (2592000 seconds) for the lifetime');
+        }
+    }
+
+    /**
+     * Return an array of stored cache ids
+     *
+     * @return array array of stored cache ids (string)
+     */
+    public function getIds()
+    {
+        if($this->_notMatchingTags) {
+            return (array) $this->_redis->sMembers(self::SET_IDS);
+        } else {
+            $keys = $this->_redis->keys(self::PREFIX_KEY . '*');
+            $prefixLen = strlen(self::PREFIX_KEY);
+            foreach($keys as $index => $key) {
+                $keys[$index] = substr($key, $prefixLen);
+            }
+            return $keys;
+        }
+    }
+
+    /**
+     * Return an array of stored tags
+     *
+     * @return array array of stored tags (string)
+     */
+    public function getTags()
+    {
+        return (array) $this->_redis->sMembers(self::SET_TAGS);
+    }
+
+    /**
+     * Return an array of stored cache ids which match given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of matching cache ids (string)
+     */
+    public function getIdsMatchingTags($tags = array())
+    {
+        if ($tags) {
+            return (array) $this->_redis->sInter( $this->_preprocessTagIds($tags) );
+        }
+        return array();
+    }
+
+    /**
+     * Return an array of stored cache ids which don't match given tags
+     *
+     * In case of multiple tags, a negated logical AND is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of not matching cache ids (string)
+     */
+    public function getIdsNotMatchingTags($tags = array())
+    {
+        if( ! $this->_notMatchingTags) {
+            Zend_Cache::throwException("notMatchingTags is currently disabled.");
+        }
+        if ($tags) {
+            return (array) $this->_redis->sDiff( self::SET_IDS, $this->_preprocessTagIds($tags) );
+        }
+        return (array) $this->_redis->sMembers( self::SET_IDS );
+    }
+
+    /**
+     * Return an array of stored cache ids which match any given tags
+     *
+     * In case of multiple tags, a logical OR is made between tags
+     *
+     * @param array $tags array of tags
+     * @return array array of any matching cache ids (string)
+     */
+    public function getIdsMatchingAnyTags($tags = array())
+    {
+        if ($tags) {
+            return (array) $this->_redis->sUnion( $this->_preprocessTagIds($tags));
+        }
+        return array();
+    }
+
+    /**
+     * Return the filling percentage of the backend storage
+     *
+     * @throws Zend_Cache_Exception
+     * @return int integer between 0 and 100
+     */
+    public function getFillingPercentage()
+    {
+        return 0;
+    }
+
+    /**
+     * Return an array of metadatas for the given cache id
+     *
+     * The array must include these keys :
+     * - expire : the expire timestamp
+     * - tags : a string array of tags
+     * - mtime : timestamp of last modification time
+     *
+     * @param string $id cache id
+     * @return array array of metadatas (false if the cache id is not found)
+     */
+    public function getMetadatas($id)
+    {
+        list($tags, $mtime, $inf) = $this->_redis->hMGet(self::PREFIX_KEY.$id, array(self::FIELD_TAGS, self::FIELD_MTIME, self::FIELD_INF));
+        if( ! $mtime) {
+            return FALSE;
+        }
+        $tags = explode(',', $this->_decodeData($tags));
+        $expire = $inf === '1' ? FALSE : time() + $this->_redis->ttl(self::PREFIX_KEY.$id);
+
+        return array(
+            'expire' => $expire,
+            'tags'   => $tags,
+            'mtime'  => $mtime,
+        );
+    }
+
+    /**
+     * Give (if possible) an extra lifetime to the given cache id
+     *
+     * @param string $id cache id
+     * @param int $extraLifetime
+     * @return boolean true if ok
+     */
+    public function touch($id, $extraLifetime)
+    {
+        list($inf) = $this->_redis->hGet(self::PREFIX_KEY.$id, self::FIELD_INF);
+        if ($inf === '0') {
+            $expireAt = time() + $this->_redis->ttl(self::PREFIX_KEY.$id) + $extraLifetime;
+            return (bool) $this->_redis->expireAt(self::PREFIX_KEY.$id, $expireAt);
+        }
+        return false;
+    }
+
+    /**
+     * Return an associative array of capabilities (booleans) of the backend
+     *
+     * The array must include these keys :
+     * - automatic_cleaning (is automating cleaning necessary)
+     * - tags (are tags supported)
+     * - expired_read (is it possible to read expired cache records
+     *                 (for doNotTestCacheValidity option for example))
+     * - priority does the backend deal with priority when saving
+     * - infinite_lifetime (is infinite lifetime can work with this backend)
+     * - get_list (is it possible to get the list of cache ids and the complete list of tags)
+     *
+     * @return array associative of with capabilities
+     */
+    public function getCapabilities()
+    {
+        return array(
+            'automatic_cleaning' => ($this->_options['automatic_cleaning_factor'] > 0),
+            'tags'               => true,
+            'expired_read'       => false,
+            'priority'           => false,
+            'infinite_lifetime'  => true,
+            'get_list'           => true,
+        );
+    }
+
+    /**
+     * @param string $data
+     * @param int $level
+     * @throws CredisException
+     * @return string
+     */
+    protected function _encodeData($data, $level)
+    {
+        if ($level && strlen($data) >= $this->_compressThreshold) {
+            switch($this->_compressionLib) {
+                case 'snappy': $data = snappy_compress($data); break;
+                case 'lzf':    $data = lzf_compress($data); break;
+                case 'gzip':   $data = gzcompress($data, $level); break;
+            }
+            if( ! $data) {
+                throw new CredisException("Could not compress cache data.");
+            }
+            return $this->_compressPrefix.$data;
+        }
+        return $data;
+    }
+
+    /**
+     * @param bool|string $data
+     * @return string
+     */
+    protected function _decodeData($data)
+    {
+        if (substr($data,2,3) == self::COMPRESS_PREFIX) {
+            switch(substr($data,0,2)) {
+                case 'sn': return snappy_uncompress(substr($data,5));
+                case 'lz': return lzf_decompress(substr($data,5));
+                case 'gz': case 'zc': return gzuncompress(substr($data,5));
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * @param $item
+     * @param $index
+     * @param $prefix
+     */
+    protected function _preprocess(&$item, $index, $prefix)
+    {
+        $item = $prefix . $item;
+    }
+
+    /**
+     * @param $ids
+     * @return array
+     */
+    protected function _preprocessIds($ids)
+    {
+        array_walk($ids, array($this, '_preprocess'), self::PREFIX_KEY);
+        return $ids;
+    }
+
+    /**
+     * @param $tags
+     * @return array
+     */
+    protected function _preprocessTagIds($tags)
+    {
+        array_walk($tags, array($this, '_preprocess'), self::PREFIX_TAG_IDS);
+        return $tags;
+    }
+
+    /**
+     * Required to pass unit tests
+     *
+     * @param  string $id
+     * @return void
+     */
+    public function ___expire($id)
+    {
+        $this->_redis->del(self::PREFIX_KEY.$id);
+    }
+
+}
diff --git a/lib/Credis/Client.php b/lib/Credis/Client.php
new file mode 100644
index 00000000000..4a2062fca7c
--- /dev/null
+++ b/lib/Credis/Client.php
@@ -0,0 +1,793 @@
+<?php
+/**
+ * Credis_Client (a fork of Redisent)
+ *
+ * Most commands are compatible with phpredis library:
+ *   - use "pipeline()" to start a pipeline of commands instead of multi(Redis::PIPELINE)
+ *   - any arrays passed as arguments will be flattened automatically
+ *   - setOption and getOption are not supported in standalone mode
+ *   - order of arguments follows redis-cli instead of phpredis where they differ (lrem)
+ *
+ * - Uses phpredis library if extension is installed for better performance.
+ * - Establishes connection lazily.
+ * - Supports tcp and unix sockets.
+ * - Reconnects automatically unless a watch or transaction is in progress.
+ * - Can set automatic retry connection attempts for iffy Redis connections.
+ *
+ * @author Colin Mollenhour <colin@mollenhour.com>
+ * @copyright 2011 Colin Mollenhour <colin@mollenhour.com>
+ * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ * @package Credis_Client
+ */
+
+if( ! defined('CRLF')) define('CRLF', sprintf('%s%s', chr(13), chr(10)));
+
+/**
+ * Credis-specific errors, wraps native Redis errors
+ */
+class CredisException extends Exception {
+}
+
+/**
+ * Credis_Client, a lightweight Redis PHP standalone client and phpredis wrapper
+ *
+ * Server/Connection:
+ * @method Credis_Client pipeline()
+ * @method Credis_Client multi()
+ * @method array         exec()
+ * @method string        flushAll()
+ * @method string        flushDb()
+ * @method array         info()
+ * @method bool|array    config(string $setGet, string $key, string $value = null)
+ *
+ * Keys:
+ * @method int           del(string $key)
+ * @method int           exists(string $key)
+ * @method int           expire(string $key, int $seconds)
+ * @method int           expireAt(string $key, int $timestamp)
+ * @method array         keys(string $key)
+ * @method int           persist(string $key)
+ * @method bool          rename(string $key, string $newKey)
+ * @method bool          renameNx(string $key, string $newKey)
+ * @method array         sort(string $key, string $arg1, string $valueN = null)
+ * @method int           ttl(string $key)
+ * @method string        type(string $key)
+ *
+ * Scalars:
+ * @method int           append(string $key, string $value)
+ * @method int           decr(string $key)
+ * @method int           decrBy(string $key, int $decrement)
+ * @method bool|string   get(string $key)
+ * @method int           getBit(string $key, int $offset)
+ * @method string        getRange(string $key, int $start, int $end)
+ * @method string        getSet(string $key, string $value)
+ * @method int           incr(string $key)
+ * @method int           incrBy(string $key, int $decrement)
+ * @method array         mGet(array $keys)
+ * @method bool          mSet(array $keysValues)
+ * @method int           mSetNx(array $keysValues)
+ * @method bool          set(string $key, string $value)
+ * @method int           setBit(string $key, int $offset, int $value)
+ * @method bool          setEx(string $key, int $seconds, string $value)
+ * @method int           setNx(string $key, string $value)
+ * @method int           setRange(string $key, int $offset, int $value)
+ * @method int           strLen(string $key)
+ *
+ * Sets:
+ * @method int           sAdd(string $key, mixed $value, string $valueN = null)
+ * @method int           sRem(string $key, mixed $value, string $valueN = null)
+ * @method array         sMembers(string $key)
+ * @method array         sUnion(mixed $keyOrArray, string $valueN = null)
+ * @method array         sInter(mixed $keyOrArray, string $valueN = null)
+ * @method array         sDiff(mixed $keyOrArray, string $valueN = null)
+ * @method string        sPop(string $key)
+ * @method int           sCard(string $key)
+ * @method int           sIsMember(string $key, string $member)
+ * @method int           sMove(string $source, string $dest, string $member)
+ * @method string|array  sRandMember(string $key, int $count = null)
+ * @method int           sUnionStore(string $dest, string $key1, string $key2 = null)
+ * @method int           sInterStore(string $dest, string $key1, string $key2 = null)
+ * @method int           sDiffStore(string $dest, string $key1, string $key2 = null)
+ *
+ * Hashes:
+ * @method bool|int      hSet(string $key, string $field, string $value)
+ * @method bool          hSetNx(string $key, string $field, string $value)
+ * @method bool|string   hGet(string $key, string $field)
+ * @method bool|int      hLen(string $key)
+ * @method bool          hDel(string $key, string $field)
+ * @method array         hKeys(string $key, string $field)
+ * @method array         hVals(string $key, string $field)
+ * @method array         hGetAll(string $key)
+ * @method bool          hExists(string $key, string $field)
+ * @method int           hIncrBy(string $key, string $field, int $value)
+ * @method bool          hMSet(string $key, array $keysValues)
+ * @method array         hMGet(string $key, array $fields)
+ *
+ * Lists:
+ * @method array|null    blPop(string $keyN, int $timeout)
+ * @method array|null    brPop(string $keyN, int $timeout)
+ * @method array|null    brPoplPush(string $source, string $destination, int $timeout)
+ * @method string|null   lIndex(string $key, int $index)
+ * @method int           lInsert(string $key, string $beforeAfter, string $pivot, string $value)
+ * @method int           lLen(string $key)
+ * @method string|null   lPop(string $key)
+ * @method int           lPush(string $key, mixed $value, mixed $valueN = null)
+ * @method int           lPushX(string $key, mixed $value)
+ * @method array         lRange(string $key, int $start, int $stop)
+ * @method int           lRem(string $key, int $count, mixed $value)
+ * @method bool          lSet(string $key, int $index, mixed $value)
+ * @method bool          lTrim(string $key, int $start, int $stop)
+ * @method string|null   rPop(string $key)
+ * @method string|null   rPoplPush(string $source, string $destination)
+ * @method int           rPush(string $key, mixed $value, mixed $valueN = null)
+ * @method int           rPushX(string $key, mixed $value)
+ *
+ * Sorted Sets:
+ * TODO
+ *
+ * Pub/Sub
+ * TODO
+ *
+ * Scripting:
+ * @method string|int    script(string $command, string $arg1 = null)
+ * @method string|int|array|bool eval(string $script, int $numkeys, string $key = null, string $arg = null)
+ * @method string|int|array|bool evalSha(string $sha1, int $numkeys, string $key = null, string $arg = null)
+ */
+class Credis_Client {
+
+    const TYPE_STRING      = 'string';
+    const TYPE_LIST        = 'list';
+    const TYPE_SET         = 'set';
+    const TYPE_ZSET        = 'zset';
+    const TYPE_HASH        = 'hash';
+    const TYPE_NONE        = 'none';
+    const FREAD_BLOCK_SIZE = 8192;
+
+    /**
+     * Socket connection to the Redis server or Redis library instance
+     * @var resource|Redis
+     */
+    protected $redis;
+    protected $redisMulti;
+
+    /**
+     * Host of the Redis server
+     * @var string
+     */
+    protected $host;
+
+    /**
+     * Port on which the Redis server is running
+     * @var integer
+     */
+    protected $port;
+
+    /**
+     * Timeout for connecting to Redis server
+     * @var float
+     */
+    protected $timeout;
+
+    /**
+     * Timeout for reading response from Redis server
+     * @var float
+     */
+    protected $readTimeout;
+
+    /**
+     * Unique identifier for persistent connections
+     * @var string
+     */
+    protected $persistent;
+
+    /**
+     * @var bool
+     */
+    protected $closeOnDestruct = TRUE;
+
+    /**
+     * @var bool
+     */
+    protected $connected = FALSE;
+
+    /**
+     * @var bool
+     */
+    protected $standalone;
+
+    /**
+     * @var int
+     */
+    protected $maxConnectRetries = 0;
+
+    /**
+     * @var int
+     */
+    protected $connectFailures = 0;
+
+    /**
+     * @var bool
+     */
+    protected $usePipeline = FALSE;
+
+    /**
+     * @var array
+     */
+    protected $commandNames;
+
+    /**
+     * @var string
+     */
+    protected $commands;
+
+    /**
+     * @var bool
+     */
+    protected $isMulti = FALSE;
+
+    /**
+     * @var bool
+     */
+    protected $isWatching = FALSE;
+
+    /**
+     * @var string
+     */
+    protected $authPassword;
+
+    /**
+     * @var int
+     */
+    protected $selectedDb = 0;
+
+    /**
+     * Aliases for backwards compatibility with phpredis
+     * @var array
+     */
+    protected $aliasedMethods = array('delete' => 'del', 'getkeys' => 'keys', 'sremove' => 'srem');
+
+    /**
+     * Creates a Redisent connection to the Redis server on host {@link $host} and port {@link $port}.
+     * $host may also be a path to a unix socket or a string in the form of tcp://[hostname]:[port] or unix://[path]
+     *
+     * @param string $host The hostname of the Redis server
+     * @param integer $port The port number of the Redis server
+     * @param float $timeout  Timeout period in seconds
+     * @param string $persistent  Flag to establish persistent connection
+     */
+    public function __construct($host = '127.0.0.1', $port = 6379, $timeout = null, $persistent = '')
+    {
+        $this->host = (string) $host;
+        $this->port = (int) $port;
+        $this->timeout = $timeout;
+        $this->persistent = (string) $persistent;
+        $this->standalone = ! extension_loaded('redis');
+    }
+
+    public function __destruct()
+    {
+        if ($this->closeOnDestruct) {
+            $this->close();
+        }
+    }
+
+    /**
+     * @throws CredisException
+     * @return Credis_Client
+     */
+    public function forceStandalone()
+    {
+        if($this->connected) {
+            throw new CredisException('Cannot force Credis_Client to use standalone PHP driver after a connection has already been established.');
+        }
+        $this->standalone = TRUE;
+        return $this;
+    }
+
+    /**
+     * @param int $retries
+     * @return Credis_Client
+     */
+    public function setMaxConnectRetries($retries)
+    {
+        $this->maxConnectRetries = $retries;
+        return $this;
+    }
+
+    /**
+     * @param bool $flag
+     * @return Credis_Client
+     */
+    public function setCloseOnDestruct($flag)
+    {
+        $this->closeOnDestruct = $flag;
+        return $this;
+    }
+
+    /**
+     * @throws CredisException
+     * @return Credis_Client
+     */
+    public function connect()
+    {
+        if ($this->connected) {
+            return $this;
+        }
+        if (preg_match('#^(tcp|unix)://(.*)$#', $this->host, $matches)) {
+            if($matches[1] == 'tcp') {
+                if ( ! preg_match('#^(.*)(?::(\d+))?(?:/(.*))?$#', $matches[2], $matches)) {
+                    throw new CredisException('Invalid host format; expected tcp://host[:port][/persistent]');
+                }
+                $this->host = $matches[1];
+                $this->port = (int) (isset($matches[2]) ? $matches[2] : 6379);
+                $this->persistent = isset($matches[3]) ? $matches[3] : '';
+            } else {
+                $this->host = $matches[2];
+                $this->port = NULL;
+                if (substr($this->host,0,1) != '/') {
+                    throw new CredisException('Invalid unix socket format; expected unix:///path/to/redis.sock');
+                }
+            }
+        }
+        if ($this->port !== NULL && substr($this->host,0,1) == '/') {
+            $this->port = NULL;
+        }
+        if ($this->standalone) {
+            $flags = STREAM_CLIENT_CONNECT;
+            $remote_socket = $this->port === NULL
+                ? 'unix://'.$this->host
+                : 'tcp://'.$this->host.':'.$this->port;
+            if ($this->persistent) {
+                if ($this->port === NULL) { // Unix socket
+                    throw new CredisException('Persistent connections to UNIX sockets are not supported in standalone mode.');
+                }
+                $remote_socket .= '/'.$this->persistent;
+                $flags = $flags | STREAM_CLIENT_PERSISTENT;
+            }
+            $result = $this->redis = @stream_socket_client($remote_socket, $errno, $errstr, $this->timeout !== null ? $this->timeout : 2.5, $flags);
+        }
+        else {
+            if ( ! $this->redis) {
+                $this->redis = new Redis;
+            }
+            $result = $this->persistent
+                ? $this->redis->pconnect($this->host, $this->port, $this->timeout, $this->persistent)
+                : $this->redis->connect($this->host, $this->port, $this->timeout);
+        }
+
+        // Use recursion for connection retries
+        if ( ! $result) {
+            $this->connectFailures++;
+            if ($this->connectFailures <= $this->maxConnectRetries) {
+                return $this->connect();
+            }
+            $failures = $this->connectFailures;
+            $this->connectFailures = 0;
+            throw new CredisException("Connection to Redis failed after $failures failures.");
+        }
+
+        $this->connectFailures = 0;
+        $this->connected = TRUE;
+
+        // Set read timeout
+        if ($this->readTimeout) {
+            $this->setReadTimeout($this->readTimeout);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set the read timeout for the connection. If falsey, a timeout will not be set. Negative values not supported.
+     *
+     * @param $timeout
+     * @throws CredisException
+     * @return Credis_Client
+     */
+    public function setReadTimeout($timeout)
+    {
+        if ($timeout < 0) {
+            throw new CredisException('Negative read timeout values are not supported.');
+        }
+        $this->readTimeout = $timeout;
+        if ($this->connected) {
+            if ($this->standalone) {
+                stream_set_timeout($this->redis, (int) floor($timeout), ($timeout - floor($timeout)) * 1000000);
+            } else if (defined('Redis::OPT_READ_TIMEOUT')) {
+                // Not supported at time of writing, but hopefully this pull request will someday be merged:
+                // https://github.com/nicolasff/phpredis/pull/260
+                $this->redis->setOption(Redis::OPT_READ_TIMEOUT, $timeout);
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function close()
+    {
+        $result = TRUE;
+        if ($this->connected && ! $this->persistent) {
+            try {
+                $result = $this->standalone ? fclose($this->redis) : $this->redis->close();
+                $this->connected = FALSE;
+            } catch (Exception $e) {
+                ; // Ignore exceptions on close
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * @param string $password
+     * @return bool
+     */
+    public function auth($password)
+    {
+        $this->authPassword = $password;
+        $response = $this->__call('auth', array($this->authPassword));
+        return $response;
+    }
+
+    /**
+     * @param int $index
+     * @return bool
+     */
+    public function select($index)
+    {
+        $this->selectedDb = (int) $index;
+        $response = $this->__call('select', array($this->selectedDb));
+        return $response;
+    }
+
+    public function __call($name, $args)
+    {
+        // Lazy connection
+        $this->connect();
+
+        $name = strtolower($name);
+
+        // Send request via native PHP
+        if($this->standalone)
+        {
+            // Flatten arguments
+            $argsFlat = NULL;
+            foreach($args as $index => $arg) {
+                if(is_array($arg)) {
+                    if($argsFlat === NULL) {
+                        $argsFlat = array_slice($args, 0, $index);
+                    }
+                    if($name == 'mset' || $name == 'msetnx' || $name == 'hmset') {
+                        foreach($arg as $key => $value) {
+                            $argsFlat[] = $key;
+                            $argsFlat[] = $value;
+                        }
+                    } else {
+                        $argsFlat = array_merge($argsFlat, $arg);
+                    }
+                } else if($argsFlat !== NULL) {
+                    $argsFlat[] = $arg;
+                }
+            }
+            if($argsFlat !== NULL) {
+                $args = $argsFlat;
+                $argsFlat = NULL;
+            }
+
+            // In pipeline mode
+            if($this->usePipeline)
+            {
+                if($name == 'pipeline') {
+                    throw new CredisException('A pipeline is already in use and only one pipeline is supported.');
+                }
+                else if($name == 'exec') {
+                    if($this->isMulti) {
+                        $this->commandNames[] = $name;
+                        $this->commands .= self::_prepare_command(array($name));
+                    }
+
+                    // Write request
+                    if($this->commands) {
+                        $this->write_command($this->commands);
+                    }
+                    $this->commands = NULL;
+
+                    // Read response
+                    $response = array();
+                    foreach($this->commandNames as $command) {
+                        $response[] = $this->read_reply($command);
+                    }
+                    $this->commandNames = NULL;
+
+                    if($this->isMulti) {
+                        $response = array_pop($response);
+                    }
+                    $this->usePipeline = $this->isMulti = FALSE;
+                    return $response;
+                }
+                else {
+                    if($name == 'multi') {
+                        $this->isMulti = TRUE;
+                    }
+                    array_unshift($args, $name);
+                    $this->commandNames[] = $name;
+                    $this->commands .= self::_prepare_command($args);
+                    return $this;
+                }
+            }
+
+            // Start pipeline mode
+            if($name == 'pipeline')
+            {
+                $this->usePipeline = TRUE;
+                $this->commandNames = array();
+                $this->commands = '';
+                return $this;
+            }
+
+            // If unwatching, allow reconnect with no error thrown
+            if($name == 'unwatch') {
+                $this->isWatching = FALSE;
+            }
+
+            // Non-pipeline mode
+            array_unshift($args, $name);
+            $command = self::_prepare_command($args);
+            $this->write_command($command);
+            $response = $this->read_reply($name);
+
+            // Watch mode disables reconnect so error is thrown
+            if($name == 'watch') {
+                $this->isWatching = TRUE;
+            }
+            // Transaction mode
+            else if($this->isMulti && ($name == 'exec' || $name == 'discard')) {
+                $this->isMulti = FALSE;
+            }
+            // Started transaction
+            else if($this->isMulti || $name == 'multi') {
+                $this->isMulti = TRUE;
+                $response = $this;
+            }
+        }
+
+        // Send request via phpredis client
+        else
+        {
+            // Tweak arguments
+            switch($name) {
+                case 'get':   // optimize common cases
+                case 'set':
+                case 'hget':
+                case 'hset':
+                case 'setex':
+                case 'mset':
+                case 'msetnx':
+                case 'hmset':
+                case 'hmget':
+                case 'del':
+                    break;
+                case 'mget':
+                    if(isset($args[0]) && ! is_array($args[0])) {
+                        $args = array($args);
+                    }
+                    break;
+                case 'lrem':
+                    $args = array($args[0], $args[2], $args[1]);
+                    break;
+                default:
+                    // Flatten arguments
+                    $argsFlat = NULL;
+                    foreach($args as $index => $arg) {
+                        if(is_array($arg)) {
+                            if($argsFlat === NULL) {
+                                $argsFlat = array_slice($args, 0, $index);
+                            }
+                            $argsFlat = array_merge($argsFlat, $arg);
+                        } else if($argsFlat !== NULL) {
+                            $argsFlat[] = $arg;
+                        }
+                    }
+                    if($argsFlat !== NULL) {
+                        $args = $argsFlat;
+                        $argsFlat = NULL;
+                    }
+            }
+
+            try {
+                // Proxy pipeline mode to the phpredis library
+                if($name == 'pipeline' || $name == 'multi') {
+                    if($this->isMulti) {
+                        return $this;
+                    } else {
+                        $this->isMulti = TRUE;
+                        $this->redisMulti = call_user_func_array(array($this->redis, $name), $args);
+                    }
+                }
+                else if($name == 'exec' || $name == 'discard') {
+                    $this->isMulti = FALSE;
+                    $response = $this->redisMulti->$name();
+                    $this->redisMulti = NULL;
+                    #echo "> $name : ".substr(print_r($response, TRUE),0,100)."\n";
+                    return $response;
+                }
+
+                // Use aliases to be compatible with phpredis wrapper
+                if(isset($this->aliasedMethods[$name])) {
+                    $name = $this->aliasedMethods[$name];
+                }
+
+                // Multi and pipeline return self for chaining
+                if($this->isMulti) {
+                    call_user_func_array(array($this->redisMulti, $name), $args);
+                    return $this;
+                }
+
+                $response = call_user_func_array(array($this->redis, $name), $args);
+            }
+                // Wrap exceptions
+            catch(RedisException $e) {
+                throw new CredisException($e->getMessage(), $e->getCode());
+            }
+
+            #echo "> $name : ".substr(print_r($response, TRUE),0,100)."\n";
+
+            // change return values where it is too difficult to minim in standalone mode
+            switch($name)
+            {
+                case 'hmget':
+                    $response = array_values($response);
+                    break;
+                case 'type':
+                    $typeMap = array(
+                        self::TYPE_NONE,
+                        self::TYPE_STRING,
+                        self::TYPE_SET,
+                        self::TYPE_LIST,
+                        self::TYPE_ZSET,
+                        self::TYPE_HASH,
+                    );
+                    $response = $typeMap[$response];
+                    break;
+            }
+        }
+
+        return $response;
+    }
+
+    protected function write_command($command)
+    {
+        // Reconnect on lost connection (Redis server "timeout" exceeded since last command)
+        if(feof($this->redis)) {
+            $this->close();
+            // If a watch or transaction was in progress and connection was lost, throw error rather than reconnect
+            // since transaction/watch state will be lost.
+            if(($this->isMulti && ! $this->usePipeline) || $this->isWatching) {
+                $this->isMulti = $this->isWatching = FALSE;
+                throw new CredisException('Lost connection to Redis server during watch or transaction.');
+            }
+            $this->connected = FALSE;
+            $this->connect();
+            if($this->authPassword) {
+                $this->auth($this->authPassword);
+            }
+            if($this->selectedDb != 0) {
+                $this->select($this->selectedDb);
+            }
+        }
+
+        $commandLen = strlen($command);
+        for ($written = 0; $written < $commandLen; $written += $fwrite) {
+            $fwrite = fwrite($this->redis, substr($command, $written));
+            if ($fwrite === FALSE || $fwrite == 0 ) {
+                throw new CredisException('Failed to write entire command to stream');
+            }
+        }
+    }
+
+    protected function read_reply($name = '')
+    {
+        $reply = fgets($this->redis);
+        if($reply === FALSE) {
+            throw new CredisException('Lost connection to Redis server.');
+        }
+        $reply = rtrim($reply, CRLF);
+        #echo "> $name: $reply\n";
+        $replyType = substr($reply, 0, 1);
+        switch ($replyType) {
+            /* Error reply */
+            case '-':
+                if($this->isMulti || $this->usePipeline) {
+                    $response = FALSE;
+                } else {
+                    throw new CredisException(substr($reply, 4));
+                }
+                break;
+            /* Inline reply */
+            case '+':
+                $response = substr($reply, 1);
+                if($response == 'OK' || $response == 'QUEUED') {
+                    return TRUE;
+                }
+                break;
+            /* Bulk reply */
+            case '$':
+                if ($reply == '$-1') return FALSE;
+                $size = (int) substr($reply, 1);
+                $response = stream_get_contents($this->redis, $size + 2);
+                if( ! $response)
+                    throw new CredisException('Error reading reply.');
+                $response = substr($response, 0, $size);
+                break;
+            /* Multi-bulk reply */
+            case '*':
+                $count = substr($reply, 1);
+                if ($count == '-1') return FALSE;
+
+                $response = array();
+                for ($i = 0; $i < $count; $i++) {
+                    $response[] = $this->read_reply();
+                }
+                break;
+            /* Integer reply */
+            case ':':
+                $response = intval(substr($reply, 1));
+                break;
+            default:
+                throw new CredisException('Invalid response: '.print_r($reply, TRUE));
+                break;
+        }
+
+        // Smooth over differences between phpredis and standalone response
+        switch($name)
+        {
+            case '': // Minor optimization for multi-bulk replies
+                break;
+            case 'config':
+            case 'hgetall':
+                $keys = $values = array();
+                while($response) {
+                    $keys[] = array_shift($response);
+                    $values[] = array_shift($response);
+                }
+                $response = count($keys) ? array_combine($keys, $values) : array();
+                break;
+            case 'info':
+                $lines = explode(CRLF, trim($response,CRLF));
+                $response = array();
+                foreach($lines as $line) {
+                    if ( ! $line || substr($line, 0, 1) == '#') {
+                        continue;
+                    }
+                    list($key, $value) = explode(':', $line, 2);
+                    $response[$key] = $value;
+                }
+                break;
+            case 'ttl':
+                if($response === -1) {
+                    $response = FALSE;
+                }
+                break;
+        }
+
+        return $response;
+    }
+
+    /**
+     * Build the Redis unified protocol command
+     *
+     * @param array $args
+     * @return string
+     */
+    private static function _prepare_command($args)
+    {
+        return sprintf('*%d%s%s%s', count($args), CRLF, implode(array_map(array('self', '_map'), $args), CRLF), CRLF);
+    }
+
+    private static function _map($arg)
+    {
+        return sprintf('$%d%s%s', strlen($arg), CRLF, $arg);
+    }
+
+}
diff --git a/lib/Mage/Archive/Tar.php b/lib/Mage/Archive/Tar.php
index 231af6160d1..a88acfc9525 100644
--- a/lib/Mage/Archive/Tar.php
+++ b/lib/Mage/Archive/Tar.php
@@ -458,11 +458,8 @@ protected function _unpackCurrentTar($destination)
                 $list[] = $currentFile . DS;
             } elseif ($header['type'] == '2') {
 
-                $symlinkResult = @symlink($header['symlink'], $currentFile);
-
-                if (false === $symlinkResult) {
-                    throw new Mage_Exception('Failed to create symlink ' . $currentFile . ' to ' . $header['symlink']);
-                }
+                //we do not interrupt unpack process if symlink creation failed as symlinks are not so important
+                @symlink($header['symlink'], $currentFile);
             }
         }
 
diff --git a/lib/Mage/Autoload/Simple.php b/lib/Mage/Autoload/Simple.php
index b913e943d21..1e4e53f3a6f 100644
--- a/lib/Mage/Autoload/Simple.php
+++ b/lib/Mage/Autoload/Simple.php
@@ -49,4 +49,4 @@ public function autoload($class)
         @include $classFile;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/Backup/Filesystem/Helper.php b/lib/Mage/Backup/Filesystem/Helper.php
index 8403779b395..2fb28fcfa54 100644
--- a/lib/Mage/Backup/Filesystem/Helper.php
+++ b/lib/Mage/Backup/Filesystem/Helper.php
@@ -119,6 +119,10 @@ public function getInfo($path, $infoOptions = self::INFO_ALL, $skipFiles = array
         $iterator = new Mage_Backup_Filesystem_Iterator_Filter($filesystemIterator, $skipFiles);
 
         foreach ($iterator as $item) {
+            if ($item->isLink()) {
+                continue;
+            }
+
             if (($infoOptions & self::INFO_WRITABLE) && !$item->isWritable()) {
                 $info['writable'] = false;
             }
diff --git a/lib/Mage/Cache/Backend/File.php b/lib/Mage/Cache/Backend/File.php
new file mode 100644
index 00000000000..e34b1b3879f
--- /dev/null
+++ b/lib/Mage/Cache/Backend/File.php
@@ -0,0 +1,782 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category  Mage
+ * @package   Mage_Cache
+ * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ *
+ * Summary of changes:
+ * - code modified to follow Magento coding standards
+ */
+
+/**
+ * Licensed under New BSD license http://opensource.org/licenses/BSD-3-Clause
+ * Copyright (c) 2012, Colin Mollenhour
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *  * The name of Colin Mollenhour may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * Optimized file cache backend
+ *
+ * @category  Mage
+ * @package   Mage_Cache
+ * @author    Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Cache_Backend_File extends Zend_Cache_Backend_File
+{
+    /**
+     * Default options for the File cache adapter
+     *
+     *  @var array
+     */
+    protected $_options = array(
+        'cache_dir'              => null,    // Path to cache files
+        'file_locking'           => true,    // Best to keep enabled
+        'read_control'           => false,   // Use a checksum to detect corrupt data
+        'read_control_type'      => 'crc32', // If read_control is enabled, which checksum algorithm to use
+        'hashed_directory_level' => 2,       // How many characters should be used to create sub-directories
+        'hashed_directory_perm'  => 0770,    // Filesystem permissions for created directories
+        'file_name_prefix'       => 'mage',  // Prefix for cache directories created
+        'cache_file_perm'        => 0660,    // Filesystem permissions for created files
+    );
+
+    /**
+     * Prevents unnecessary checks
+     *
+     *  @var boolean
+     */
+    protected $_isTagDirChecked;
+
+    /**
+     * @param  array $options
+     */
+    public function __construct(array $options = array())
+    {
+        // Backwards compatibility ZF 1.11 and ZF 1.12
+        if (isset($options['hashed_directory_umask'])) {
+            $options['hashed_directory_perm'] = $options['hashed_directory_umask'];
+        }
+        if (isset($options['cache_file_umask'])) {
+            $options['cache_file_perm'] = $options['cache_file_umask'];
+        }
+
+        // Don't use parent constructor
+        while (list($name, $value) = each($options)) {
+            $this->setOption($name, $value);
+        }
+
+        // Check cache dir
+        if ($this->_options['cache_dir'] !== null) {
+            $this->setCacheDir($this->_options['cache_dir']);
+        } else {
+            $this->setCacheDir(self::getTmpDir() . DIRECTORY_SEPARATOR, false);
+        }
+
+        // Validate prefix
+        if (isset($this->_options['file_name_prefix'])) {
+            if (!preg_match('~^[a-zA-Z0-9_]+$~D', $this->_options['file_name_prefix'])) {
+                Zend_Cache::throwException('Invalid file_name_prefix : must use only [a-zA-Z0-9_]');
+            }
+        }
+
+        // See #ZF-4422
+        if (is_string($this->_options['hashed_directory_perm'])) {
+            $this->_options['hashed_directory_perm'] = octdec($this->_options['hashed_directory_perm']);
+        }
+        if (is_string($this->_options['cache_file_perm'])) {
+            $this->_options['cache_file_perm'] = octdec($this->_options['cache_file_perm']);
+        }
+        $this->_options['hashed_directory_umask'] = $this->_options['hashed_directory_perm'];
+        $this->_options['cache_file_umask']       = $this->_options['cache_file_perm'];
+    }
+
+    /**
+     * Trying to load cached value by id, in case of failure will return false, in other case will return cached string
+     *
+     * @param  string  $id                     Cache id
+     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
+     *
+     * @return string|bool Cached data or false
+     */
+    public function load($id, $doNotTestCacheValidity = false)
+    {
+        $file  = $this->_file($id);
+        $cache = $this->_getCache($file, true);
+        if (!$cache) {
+            return false;
+        }
+        list($metadatas, $data) = $cache;
+        if (!$doNotTestCacheValidity && time() > $metadatas['expire']) {
+            // ?? $this->remove($id);
+            return false;
+        }
+        if ($this->_options['read_control']) {
+            $hashData    = $this->_hash($data, $this->_options['read_control_type']);
+            $hashControl = $metadatas['hash'];
+            if ($hashData != $hashControl) {
+                $this->_log(
+                    'Zend_Cache_Backend_File::load() / read_control : stored hash and computed hash do not match'
+                );
+                $this->remove($id);
+
+                return false;
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * Save some string data into a cache record
+     *
+     * Note : $data must be a "string" (serialization is done by the
+     * core not by the backend)
+     *
+     * @param  string   $data             Data to cache
+     * @param  string   $id               Cache id
+     * @param  array    $tags             Array of strings, the cache record will be tagged by each string entry
+     * @param  bool|int $specificLifetime If != false, set a specific lifetime for this cache record
+     *                                    (null => infinite lifetime)
+     *
+     * @return boolean In case of success returns true
+     */
+    public function save($data, $id, $tags = array(), $specificLifetime = false)
+    {
+        $file = $this->_file($id);
+        $path = $this->_path($id);
+        if ($this->_options['hashed_directory_level'] > 0) {
+            if (!is_writable($path)) {
+                // maybe, we just have to build the directory structure
+                $this->_recursiveMkdirAndChmod($id);
+                if (!is_writable($path)) {
+                    return false;
+                }
+            }
+        }
+        if ($this->_options['read_control']) {
+            $hash = $this->_hash($data, $this->_options['read_control_type']);
+        } else {
+            $hash = '';
+        }
+        $metadatas = array(
+            'hash'   => $hash,
+            'mtime'  => time(),
+            'expire' => $this->_expireTime($this->getLifetime($specificLifetime)),
+            'tags'   => implode(',', $tags),
+        );
+        $res = $this->_filePutContents($file, serialize($metadatas) . "\n" . $data);
+        $res = $res && $this->_updateIdsTags(array($id), $tags, 'merge');
+
+        return $res;
+    }
+
+    /**
+     * Remove a cache record
+     *
+     * @param  string $id Cache id
+     *
+     * @return boolean In case of success returns true
+     */
+    public function remove($id)
+    {
+        $file      = $this->_file($id);
+        $metadatas = $this->_getCache($file, false);
+        if ($metadatas) {
+            $boolRemove = $this->_remove($file);
+            $boolTags   = $this->_updateIdsTags(array($id), explode(',', $metadatas['tags']), 'diff');
+
+            return $boolRemove && $boolTags;
+        }
+
+        return false;
+    }
+
+    /**
+     * Clean some cache records
+     *
+     * Available modes are :
+     * 'all' (default)  => remove all cache entries ($tags is not used)
+     * 'old'            => remove too old cache entries ($tags is not used)
+     * 'matchingTag'    => remove cache entries matching all given tags
+     *                     ($tags can be an array of strings or a single string)
+     * 'notMatchingTag' => remove cache entries not matching one of the given tags
+     *                     ($tags can be an array of strings or a single string)
+     * 'matchingAnyTag' => remove cache entries matching any given tags
+     *                     ($tags can be an array of strings or a single string)
+     *
+     * @param  string $mode
+     * @param  array $tags
+     *
+     * @return boolean In case of success returns true
+     */
+    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
+    {
+        // We use this protected method to hide the recursive stuff
+        clearstatcache();
+        switch ($mode) {
+            case Zend_Cache::CLEANING_MODE_ALL:
+            case Zend_Cache::CLEANING_MODE_OLD:
+                return $this->_clean($this->_options['cache_dir'], $mode);
+            default:
+                return $this->_cleanNew($mode, $tags);
+        }
+    }
+
+    /**
+     * Return an array of stored tags
+     *
+     * @return array Array of stored tags (string)
+     */
+    public function getTags()
+    {
+        $prefix    = $this->_tagFile('');
+        $prefixLen = strlen($prefix);
+        $tags      = array();
+        foreach (@glob($prefix . '*') as $tagFile) {
+            $tags[] = substr($tagFile, $prefixLen);
+        }
+
+        return $tags;
+    }
+
+    /**
+     * Return an array of stored cache ids which match given tags
+     *
+     * In case of multiple tags, a logical AND is made between tags
+     *
+     * @param  array $tags Array of tags
+     *
+     * @return array Array of matching cache ids (string)
+     */
+    public function getIdsMatchingTags($tags = array())
+    {
+        return $this->_getIdsByTags(Zend_Cache::CLEANING_MODE_MATCHING_TAG, $tags);
+    }
+
+    /**
+     * Return an array of stored cache ids which don't match given tags
+     *
+     * In case of multiple tags, a logical OR is made between tags
+     *
+     * @param  array $tags Array of tags
+     *
+     * @return array Array of not matching cache ids (string)
+     */
+    public function getIdsNotMatchingTags($tags = array())
+    {
+        return $this->_getIdsByTags(Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG, $tags);
+    }
+
+    /**
+     * Return an array of stored cache ids which match any given tags
+     *
+     * In case of multiple tags, a logical OR is made between tags
+     *
+     * @param  array $tags Array of tags
+     *
+     * @return array Array of any matching cache ids (string)
+     */
+    public function getIdsMatchingAnyTags($tags = array())
+    {
+        return $this->_getIdsByTags(Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, $tags);
+    }
+
+    /**
+     * Return an array of metadatas for the given cache id
+     *
+     * The array must include these keys :
+     * - expire : the expire timestamp
+     * - tags : a string array of tags
+     * - mtime : timestamp of last modification time
+     *
+     * @param  string $id Cache id
+     *
+     * @return array Array of metadatas (false if the cache id is not found)
+     */
+    public function getMetadatas($id)
+    {
+        $metadatas = $this->_getCache($this->_file($id), false);
+        if ($metadatas) {
+            $metadatas['tags'] = explode(',', $metadatas['tags']);
+        }
+
+        return $metadatas;
+    }
+
+    /**
+     * Give (if possible) an extra lifetime to the given cache id
+     *
+     * @param  string $id Cache id
+     * @param  int $extraLifetime
+     *
+     * @return boolean In case of success returns true
+     */
+    public function touch($id, $extraLifetime)
+    {
+        $file  = $this->_file($id);
+        $cache = $this->_getCache($file, true);
+        if (!$cache) {
+            return false;
+        }
+        list($metadatas, $data) = $cache;
+        if (time() > $metadatas['expire']) {
+            return false;
+        }
+        $newMetadatas = array(
+            'hash'   => $metadatas['hash'],
+            'mtime'  => time(),
+            'expire' => $metadatas['expire'] + $extraLifetime,
+            'tags'   => $metadatas['tags']
+        );
+
+        return !!$this->_filePutContents($file, serialize($newMetadatas) . "\n" . $data);
+    }
+
+    /**
+     * Get a metadatas record and optionally the data as well
+     *
+     * @param  string $file  Cache file
+     * @param  bool $withData
+     *
+     * @return array|bool
+     */
+    protected function _getCache($file, $withData)
+    {
+        if (!is_file($file) || !($fd = @fopen($file, 'rb'))) {
+            return false;
+        }
+        if ($this->_options['file_locking']) {
+            flock($fd, LOCK_SH);
+        }
+        $metadata = fgets($fd);
+        if (!$metadata) {
+            if ($this->_options['file_locking']) {
+                flock($fd, LOCK_UN);
+            }
+            fclose($fd);
+
+            return false;
+        }
+        if ($withData) {
+            $data = stream_get_contents($fd);
+        }
+        if ($this->_options['file_locking']) {
+            flock($fd, LOCK_UN);
+        }
+        fclose($fd);
+        $metadata = @unserialize(rtrim($metadata, "\n"));
+        if ($withData) {
+            return array($metadata, $data);
+        }
+
+        return $metadata;
+    }
+
+    /**
+     * Get meta data from a cache record
+     *
+     * @param  string $id Cache id
+     *
+     * @return array|bool Associative array of meta data
+     */
+    protected function _getMetadatas($id)
+    {
+        return $this->_getCache($this->_file($id), false);
+    }
+
+    /**
+     * Set a metadatas record
+     *
+     * @param  string  $id        Cache id
+     * @param  array   $metadatas Associative array of metadatas
+     * @param  boolean $save      Optional pass false to disable saving to file
+     *
+     * @return boolean In case of success returns true
+     */
+    protected function _setMetadatas($id, $metadatas, $save = true)
+    {
+        // TODO - implement for unit tests ___expire method
+        return true;
+    }
+
+    /**
+     * Return the complete directory path of a filename (including hashedDirectoryStructure)
+     *
+     * Uses multiple letters for a single-level hash rather than multiple levels
+     *
+     * @param  string  $id    Cache id
+     * @param  boolean $parts If true, returns array of directory parts instead of single string
+     *
+     * @return string Complete directory path
+     */
+    protected function _path($id, $parts = false)
+    {
+        $partsArray = array();
+        $root   = $this->_options['cache_dir'];
+        $prefix = $this->_options['file_name_prefix'];
+        if ($this->_options['hashed_directory_level'] > 0) {
+            $hash         = hash('adler32', $id);
+            $root         = $root . $prefix . '--' . substr($hash, -$this->_options['hashed_directory_level'])
+                                . DIRECTORY_SEPARATOR;
+            $partsArray[] = $root;
+        }
+        if ($parts) {
+            return $partsArray;
+        }
+        return $root;
+    }
+
+    /**
+     * Clean some cache records (protected method used for recursive stuff)
+     *
+     * Available modes are :
+     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags}
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags
+     *                                               ($tags can be an array of strings or a single string)
+     *
+     * @param string $dir  Directory to clean
+     * @param string $mode Clean mode
+     * @param array  $tags
+     *
+     * @throws Zend_Cache_Exception
+     * @return boolean In case of success returns true
+     */
+    protected function _clean($dir, $mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
+    {
+        if (!is_dir($dir)) {
+            return false;
+        }
+        $result = true;
+        $glob   = @glob($dir . $this->_options['file_name_prefix'] . '--*');
+        if ($glob === false) {
+            return true;
+        }
+        foreach ($glob as $file) {
+            if (is_file($file)) {
+                switch ($mode) {
+                    case Zend_Cache::CLEANING_MODE_ALL:
+                        $result = @unlink($file) && $result;
+                        continue;
+                }
+
+                $id    = $this->_fileNameToId(basename($file));
+                $_file = $this->_file($id);
+                if ($file != $_file) {
+                    @unlink($file);
+                    continue;
+                }
+                $metadatas = $this->_getCache($file, false);
+                if (!$metadatas) {
+                    @unlink($file);
+                    continue;
+                }
+                switch ($mode) {
+                    case Zend_Cache::CLEANING_MODE_OLD:
+                        if (time() > $metadatas['expire']) {
+                            $result = $this->_remove($file) && $result;
+                            $result = $this->_updateIdsTags(
+                                          array($id),
+                                          explode(',', $metadatas['tags']),
+                                          'diff'
+                                      ) && $result;
+                        }
+                        continue;
+                    default:
+                        Zend_Cache::throwException('Invalid mode for clean() method');
+                        break;
+                }
+            }
+            if (is_dir($file) && $this->_options['hashed_directory_level'] > 0) {
+                // Recursive call
+                $result = $this->_clean($file . DIRECTORY_SEPARATOR, $mode) && $result;
+                if ($mode == 'all') {
+                    // if mode=='all', we try to drop the structure too
+                    @rmdir($file);
+                }
+            }
+        }
+        if ($mode == 'all') {
+            foreach (glob($this->_tagFile('*')) as $tagFile) {
+                @unlink($tagFile);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Clean some cache records (protected method used for recursive stuff)
+     *
+     * Available modes are :
+     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags}
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags
+     *                                               ($tags can be an array of strings or a single string)
+     *
+     * @param  string $mode Clean mode
+     * @param  array  $tags Array of tags
+     *
+     * @throws Zend_Cache_Exception
+     * @return boolean In case of success returns true
+     */
+    protected function _cleanNew($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
+    {
+        $result = true;
+        $ids    = $this->_getIdsByTags($mode, $tags);
+        foreach ($ids as $id) {
+            $idFile = $this->_file($id);
+            if (is_file($idFile)) {
+                $result = $result && $this->_remove($idFile);
+            }
+        }
+        switch ($mode) {
+            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
+                foreach ($tags as $tag) {
+                    $tagFile = $this->_tagFile($tag);
+                    if (is_file($tagFile)) {
+                        $result = $result && $this->_remove($tagFile);
+                    }
+                }
+                break;
+            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
+            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
+                $this->_updateIdsTags($ids, $tags, 'diff');
+                break;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Fetching cache' ids, by tags using different mods
+     *
+     * @param string $mode
+     * @param array  $tags
+     *
+     * @return array
+     */
+    protected function _getIdsByTags($mode, $tags)
+    {
+        $ids = array();
+        switch ($mode) {
+            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
+                $ids = $this->getIds();
+                if ($tags) {
+                    foreach ($tags as $tag) {
+                        if (!$ids) {
+                            break; // early termination optimization
+                        }
+                        $ids = array_diff($ids, $this->_getTagIds($tag));
+                    }
+                }
+                break;
+            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
+                if ($tags) {
+                    $tag = array_shift($tags);
+                    $ids = $this->_getTagIds($tag);
+                    foreach ($tags as $tag) {
+                        if (!$ids) {
+                            break; // early termination optimization
+                        }
+                        $ids = array_intersect($ids, $this->_getTagIds($tag));
+                    }
+                    $ids = array_unique($ids);
+                }
+                break;
+            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
+                foreach ($tags as $tag) {
+                    $ids = $ids + $this->_getTagIds($tag);
+                }
+                $ids = array_unique($ids);
+                break;
+        }
+
+        return $ids;
+    }
+
+    /**
+     * Make and return a file name (with path)
+     *
+     * @param  string $id Cache id
+     *
+     * @return string File name (with path)
+     */
+    protected function _tagFile($id)
+    {
+        return $this->_tagPath() . $this->_idToFileName($id);
+    }
+
+    /**
+     * Return the complete directory path where tags are stored
+     *
+     * @return string Complete directory path
+     */
+    protected function _tagPath()
+    {
+        $path = $this->_options['cache_dir'] . DIRECTORY_SEPARATOR . $this->_options['file_name_prefix'] . '--tags'
+                    . DIRECTORY_SEPARATOR;
+        if (!$this->_isTagDirChecked) {
+            if (!is_dir($path)) {
+                @mkdir($path, $this->_options['hashed_directory_perm']);
+                @chmod($path, $this->_options['hashed_directory_perm']);
+            }
+            $this->_isTagDirChecked = true;
+        }
+
+        return $path;
+    }
+
+    /**
+     * Fetching all existed tags' ids
+     *
+     * @param string|resource $tag
+     *
+     * @return array
+     */
+    protected function _getTagIds($tag)
+    {
+        if (is_resource($tag)) {
+            $ids = stream_get_contents($tag);
+        } else {
+            $ids = @file_get_contents($this->_tagFile($tag));
+        }
+        if (!$ids) {
+            return array();
+        }
+        $ids = substr($ids, 0, strrpos($ids, "\n"));
+
+        return explode("\n", $ids);
+    }
+
+    /**
+     * Updating tags' ids
+     *
+     * @param array  $ids
+     * @param array  $tags
+     * @param string $mode
+     *
+     * @return boolean
+     */
+    protected function _updateIdsTags($ids, $tags, $mode)
+    {
+        $result = true;
+        foreach ($tags as $tag) {
+            $file = $this->_tagFile($tag);
+            if (file_exists($file)) {
+                if (!$ids && $mode == 'diff') {
+                    $result = $this->_remove($file);
+                } else {
+                    if ($mode == 'diff' || (rand(1, 100) == 1 && filesize($file) > 4096)) {
+                        $file = $this->_tagFile($tag);
+                        if (!($fd = fopen($file, 'rb+'))) {
+                            $result = false;
+                            continue;
+                        }
+                        if ($this->_options['file_locking']) {
+                            flock($fd, LOCK_EX);
+                        }
+                        if ($mode == 'diff') {
+                            $_ids = array_diff($this->_getTagIds($fd), $ids);
+                        } else { // if ($mode == 'merge')
+                            $_ids = $this->_getTagIds($fd) + $ids;
+                        }
+                        fseek($fd, 0);
+                        ftruncate($fd, 0);
+                        $result = fwrite($fd, implode("\n", array_unique($_ids)) . "\n") && $result;
+                        if ($this->_options['file_locking']) {
+                            flock($fd, LOCK_UN);
+                        }
+                        fclose($fd);
+                    } else {
+                        $string = implode("\n", $ids) . "\n";
+                        $flags  = FILE_APPEND | ($this->_options['file_locking'] ? LOCK_EX : 0);
+
+                        $result = file_put_contents($file, $string, $flags) && $result;
+                    }
+                }
+            } else {
+                if ($mode == 'merge') {
+                    $result = $this->_filePutContents($file, implode("\n", $ids) . "\n") && $result;
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Put the given string into the given file
+     *
+     * @param  string $file   File complete path
+     * @param  string $string String to put in file
+     *
+     * @return boolean In case of success returns true
+     */
+    protected function _filePutContents($file, $string)
+    {
+        $result = @file_put_contents($file, $string, $this->_options['file_locking'] ? LOCK_EX : 0);
+        $result && chmod($file, $this->_options['cache_file_perm']);
+
+        return $result;
+    }
+
+    /**
+     * For unit testing only
+     *
+     * @param $id
+     */
+    public function ___expire($id)
+    {
+        $metadata = $this->_getMetadatas($id);
+        $this->touch($id, 1 - $metadata['expire']);
+    }
+}
diff --git a/lib/Mage/Cache/Backend/Redis.php b/lib/Mage/Cache/Backend/Redis.php
new file mode 100644
index 00000000000..cb6f2b75fb9
--- /dev/null
+++ b/lib/Mage/Cache/Backend/Redis.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category  Mage
+ * @package   Mage_Cache
+ * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ *
+ * Summary of changes:
+ * - code modified to follow Magento coding standards
+ */
+
+/**
+ * Licensed under New BSD license http://opensource.org/licenses/BSD-3-Clause
+ * Copyright (c) 2012, Colin Mollenhour
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *  * The name of Colin Mollenhour may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * Optimized file cache backend
+ *
+ * @deprecated after 1.8.0.0
+ *
+ * @category  Mage
+ * @package   Mage_Cache
+ * @author    Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Cache_Backend_Redis extends Cm_Cache_Backend_Redis
+{
+}
diff --git a/lib/Mage/Connect/Channel/Generator.php b/lib/Mage/Connect/Channel/Generator.php
index 7ffbd8a832c..c4f60c77739 100644
--- a/lib/Mage/Connect/Channel/Generator.php
+++ b/lib/Mage/Connect/Channel/Generator.php
@@ -60,4 +60,4 @@ public function save($content)
         ->save($this->getFile());
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/Connect/Channel/Parser.php b/lib/Mage/Connect/Channel/Parser.php
index 5e209d66c1b..4a11ce2bf66 100644
--- a/lib/Mage/Connect/Channel/Parser.php
+++ b/lib/Mage/Connect/Channel/Parser.php
@@ -22,4 +22,4 @@
  * @package     Mage_Connect
  * @copyright   Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
\ No newline at end of file
+ */
diff --git a/lib/Mage/Connect/Channel/VO.php b/lib/Mage/Connect/Channel/VO.php
index 3eb64c49732..5357cebe753 100644
--- a/lib/Mage/Connect/Channel/VO.php
+++ b/lib/Mage/Connect/Channel/VO.php
@@ -110,4 +110,4 @@ public function validate()
         return true;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/Connect/Command.php b/lib/Mage/Connect/Command.php
index 2cd9ece64bd..21e79f256f8 100644
--- a/lib/Mage/Connect/Command.php
+++ b/lib/Mage/Connect/Command.php
@@ -387,4 +387,4 @@ public function getPackager()
         return self::$_packager;    
     }
     
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/Connect/Command/Channels_Header.php b/lib/Mage/Connect/Command/Channels_Header.php
index 823bfc6fa1a..8e1dc5a7709 100644
--- a/lib/Mage/Connect/Command/Channels_Header.php
+++ b/lib/Mage/Connect/Command/Channels_Header.php
@@ -102,4 +102,4 @@
 configuration.',
             ),
         );
- 
\ No newline at end of file
+ 
diff --git a/lib/Mage/Connect/Command/Config_Header.php b/lib/Mage/Connect/Command/Config_Header.php
index a7381a2bc91..5e050cc1dfd 100644
--- a/lib/Mage/Connect/Command/Config_Header.php
+++ b/lib/Mage/Connect/Command/Config_Header.php
@@ -97,4 +97,4 @@
 displays help for all configuration parameters.
 ',
 ),
-);
\ No newline at end of file
+);
diff --git a/lib/Mage/Connect/Command/Package.php b/lib/Mage/Connect/Command/Package.php
index ad9c84076e0..c4a109e79d4 100644
--- a/lib/Mage/Connect/Command/Package.php
+++ b/lib/Mage/Connect/Command/Package.php
@@ -131,4 +131,4 @@ public function doConvert($command, $options, $params)
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/Connect/Command/Package_Header.php b/lib/Mage/Connect/Command/Package_Header.php
index b8c38128ba5..b47e96d7005 100644
--- a/lib/Mage/Connect/Command/Package_Header.php
+++ b/lib/Mage/Connect/Command/Package_Header.php
@@ -64,4 +64,4 @@
             'options' => array(),
             'doc' => ''
             ),
-        ); 
\ No newline at end of file
+        ); 
diff --git a/lib/Mage/Connect/Command/Registry.php b/lib/Mage/Connect/Command/Registry.php
index 10f766d3452..c06efdd02cd 100644
--- a/lib/Mage/Connect/Command/Registry.php
+++ b/lib/Mage/Connect/Command/Registry.php
@@ -172,4 +172,4 @@ public function doInfo($command, $options, $params)
             $this->doError($command, $e->getMessage());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/Connect/Command/Registry_Header.php b/lib/Mage/Connect/Command/Registry_Header.php
index bdce5c65b9e..34ae15e9c0a 100644
--- a/lib/Mage/Connect/Command/Registry_Header.php
+++ b/lib/Mage/Connect/Command/Registry_Header.php
@@ -65,4 +65,4 @@
 local package file, an URL to a package file, or the name of an
 installed package.'
             )
-        ); 
\ No newline at end of file
+        ); 
diff --git a/lib/Mage/Connect/Command/Remote.php b/lib/Mage/Connect/Command/Remote.php
index b10ae5a0732..9810f34faa3 100644
--- a/lib/Mage/Connect/Command/Remote.php
+++ b/lib/Mage/Connect/Command/Remote.php
@@ -223,4 +223,4 @@ public function doClearCache($command, $options, $params)
 
 
 
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/Connect/Command/Remote_Header.php b/lib/Mage/Connect/Command/Remote_Header.php
index c59af4b2587..7c7cf1bd667 100644
--- a/lib/Mage/Connect/Command/Remote_Header.php
+++ b/lib/Mage/Connect/Command/Remote_Header.php
@@ -85,4 +85,4 @@
 parameter.
 ',
             ),
-        ); 
\ No newline at end of file
+        ); 
diff --git a/lib/Mage/Connect/Config.php b/lib/Mage/Connect/Config.php
index 3d1b5522be8..6c6a4b74e9f 100644
--- a/lib/Mage/Connect/Config.php
+++ b/lib/Mage/Connect/Config.php
@@ -262,4 +262,4 @@ public function toArray($withRules = false)
         return $out;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/Connect/Converter.php b/lib/Mage/Connect/Converter.php
index f396b61f00e..60c53969e30 100644
--- a/lib/Mage/Connect/Converter.php
+++ b/lib/Mage/Connect/Converter.php
@@ -334,4 +334,4 @@ public function convertPearToMage($sourceFile, $destFile = false)
 
 
 
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/Connect/Loader.php b/lib/Mage/Connect/Loader.php
index be0fad838b3..63bd87de130 100644
--- a/lib/Mage/Connect/Loader.php
+++ b/lib/Mage/Connect/Loader.php
@@ -48,4 +48,4 @@ public static function getInstance($protocol='')
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/Connect/Loader/Ftp.php b/lib/Mage/Connect/Loader/Ftp.php
index bc49630f982..6e5c9cfd5cc 100644
--- a/lib/Mage/Connect/Loader/Ftp.php
+++ b/lib/Mage/Connect/Loader/Ftp.php
@@ -118,4 +118,4 @@ public function getBody()
         return $this->_responseBody;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/Connect/Package/Hotfix.php b/lib/Mage/Connect/Package/Hotfix.php
index ee65decfb75..3326650f000 100644
--- a/lib/Mage/Connect/Package/Hotfix.php
+++ b/lib/Mage/Connect/Package/Hotfix.php
@@ -134,4 +134,4 @@ public function addReplaceDir($targetName, $targetDir, $path, $exclude=null, $in
         return $this;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/Connect/Package/Reader.php b/lib/Mage/Connect/Package/Reader.php
index 571907fefb6..6b8e7aeb69c 100644
--- a/lib/Mage/Connect/Package/Reader.php
+++ b/lib/Mage/Connect/Package/Reader.php
@@ -147,4 +147,4 @@ protected function _loadResource(&$resource)
         return $data;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/Connect/Package/Target.php b/lib/Mage/Connect/Package/Target.php
index 2edfe0e54e5..3aac3beb481 100644
--- a/lib/Mage/Connect/Package/Target.php
+++ b/lib/Mage/Connect/Package/Target.php
@@ -123,4 +123,4 @@ public function getTargetUri($name)
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/Connect/Package/Writer.php b/lib/Mage/Connect/Package/Writer.php
index 374a6b112f1..fbee884b54b 100644
--- a/lib/Mage/Connect/Package/Writer.php
+++ b/lib/Mage/Connect/Package/Writer.php
@@ -206,4 +206,4 @@ public function getPathToArchive()
         return $this->_pathToArchive;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/Connect/Singleconfig.php b/lib/Mage/Connect/Singleconfig.php
index 587b8e36319..ba27b8cfe80 100644
--- a/lib/Mage/Connect/Singleconfig.php
+++ b/lib/Mage/Connect/Singleconfig.php
@@ -862,4 +862,4 @@ public function hasConflicts($chanName, $packageName, $version)
 
 
 
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/Connect/Validator.php b/lib/Mage/Connect/Validator.php
index 6e7c677d6c7..5156314d063 100644
--- a/lib/Mage/Connect/Validator.php
+++ b/lib/Mage/Connect/Validator.php
@@ -414,4 +414,4 @@ public function validatePHPVersion($min, $max, $ver = PHP_VERSION)
 	}
 
 
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/HTTP/Client.php b/lib/Mage/HTTP/Client.php
index a368195c8fe..7a8ff3ea8ab 100644
--- a/lib/Mage/HTTP/Client.php
+++ b/lib/Mage/HTTP/Client.php
@@ -81,4 +81,4 @@ protected static function detectFrontend()
 	   }
 	   return false;	   
 	}
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/HTTP/Client/Curl.php b/lib/Mage/HTTP/Client/Curl.php
index f29c05376e8..ab524e67ec7 100644
--- a/lib/Mage/HTTP/Client/Curl.php
+++ b/lib/Mage/HTTP/Client/Curl.php
@@ -496,4 +496,4 @@ public function setOption($name, $value)
         $this->_curlUserOptions[$name] = $value;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/HTTP/Client/Socket.php b/lib/Mage/HTTP/Client/Socket.php
index f23f7613085..f5a0f8344d0 100644
--- a/lib/Mage/HTTP/Client/Socket.php
+++ b/lib/Mage/HTTP/Client/Socket.php
@@ -534,4 +534,4 @@ public function setOption($name, $value)
 		// Stub
 	}
 
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/Xml/Generator.php b/lib/Mage/Xml/Generator.php
index fd2bdc53242..3ffe484352c 100644
--- a/lib/Mage/Xml/Generator.php
+++ b/lib/Mage/Xml/Generator.php
@@ -87,4 +87,4 @@ public function save($file)
         return $this;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Mage/Xml/Parser.php b/lib/Mage/Xml/Parser.php
index 76b0e23dc4e..94501721843 100644
--- a/lib/Mage/Xml/Parser.php
+++ b/lib/Mage/Xml/Parser.php
@@ -88,4 +88,4 @@ public function loadXML($string)
         return $this;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Magento/Crypt.php b/lib/Magento/Crypt.php
new file mode 100644
index 00000000000..33325a4f814
--- /dev/null
+++ b/lib/Magento/Crypt.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @category    Magento
+ * @package     Magento_Crypt
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+/**
+ * Class encapsulates cryptographic algorithm
+ */
+class Magento_Crypt
+{
+    /**
+     * @var string
+     */
+    protected $_cipher;
+
+    /**
+     * @var string
+     */
+    protected $_mode;
+
+    /**
+     * @var string
+     */
+    protected $_initVector;
+
+    /**
+     * Encryption algorithm module handle
+     *
+     * @var resource
+     */
+    protected $_handle;
+
+    /**
+     * Constructor
+     *
+     * @param  string      $key        Secret encryption key.
+     *                                 It's unsafe to store encryption key in memory, so no getter for key exists.
+     * @param  string      $cipher     Cipher algorithm (one of the MCRYPT_ciphername constants)
+     * @param  string      $mode       Mode of cipher algorithm (MCRYPT_MODE_modeabbr constants)
+     * @param  string|bool $initVector Initial vector to fill algorithm blocks.
+     *                                 TRUE generates a random initial vector.
+     *                                 FALSE fills initial vector with zero bytes to not use it.
+     * @throws Magento_Exception
+     */
+    public function __construct($key, $cipher = MCRYPT_BLOWFISH, $mode = MCRYPT_MODE_ECB, $initVector = false)
+    {
+        $this->_cipher = $cipher;
+        $this->_mode = $mode;
+        $this->_handle = mcrypt_module_open($cipher, '', $mode, '');
+        try {
+            $maxKeySize = mcrypt_enc_get_key_size($this->_handle);
+            if (strlen($key) > $maxKeySize) {
+                throw new Magento_Exception('Key must not exceed ' . $maxKeySize . ' bytes.');
+            }
+            $initVectorSize = mcrypt_enc_get_iv_size($this->_handle);
+            if (true === $initVector) {
+                /* Generate a random vector from human-readable characters */
+                $abc = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+                $initVector = '';
+                for ($i = 0; $i < $initVectorSize; $i++) {
+                    $initVector .= $abc{rand(0, strlen($abc) - 1)};
+                }
+            } else if (false === $initVector) {
+                /* Set vector to zero bytes to not use it */
+                $initVector = str_repeat("\0", $initVectorSize);
+            } else if (!is_string($initVector) || strlen($initVector) != $initVectorSize) {
+                throw new Magento_Exception('Init vector must be a string of ' . $initVectorSize . ' bytes.');
+            }
+            $this->_initVector = $initVector;
+        } catch (Exception $e) {
+            mcrypt_module_close($this->_handle);
+            throw $e;
+        }
+        mcrypt_generic_init($this->_handle, $key, $initVector);
+    }
+
+    /**
+     * Destructor frees allocated resources
+     */
+    public function __destruct()
+    {
+        mcrypt_generic_deinit($this->_handle);
+        mcrypt_module_close($this->_handle);
+    }
+
+    /**
+     * Retrieve a name of currently used cryptographic algorithm
+     *
+     * @return string
+     */
+    public function getCipher()
+    {
+        return $this->_cipher;
+    }
+
+    /**
+     * Mode in which cryptographic algorithm is running
+     *
+     * @return string
+     */
+    public function getMode()
+    {
+        return $this->_mode;
+    }
+
+    /**
+     * Retrieve an actual value of initial vector that has been used to initialize a cipher
+     *
+     * @return string
+     */
+    public function getInitVector()
+    {
+        return $this->_initVector;
+    }
+
+    /**
+     * Encrypt a data
+     *
+     * @param  string $data String to encrypt
+     * @return string
+     */
+    public function encrypt($data)
+    {
+        if (strlen($data) == 0) {
+            return $data;
+        }
+        return mcrypt_generic($this->_handle, $data);
+    }
+
+    /**
+     * Decrypt a data
+     *
+     * @param  string $data String to decrypt
+     * @return string
+     */
+    public function decrypt($data)
+    {
+        if (strlen($data) == 0) {
+            return $data;
+        }
+        $data = mdecrypt_generic($this->_handle, $data);
+        /*
+         * Returned string can in fact be longer than the unencrypted string due to the padding of the data
+         * @link http://www.php.net/manual/en/function.mdecrypt-generic.php
+         */
+        $data = rtrim($data, "\0");
+        return $data;
+    }
+}
diff --git a/lib/Magento/Db/Adapter/Pdo/Mysql.php b/lib/Magento/Db/Adapter/Pdo/Mysql.php
new file mode 100644
index 00000000000..53a5d807e45
--- /dev/null
+++ b/lib/Magento/Db/Adapter/Pdo/Mysql.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento_Db
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Magento PDO MySQL DB adapter
+ *
+ * @category    Magento
+ * @package     Magento_Db
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Magento_Db_Adapter_Pdo_Mysql extends Varien_Db_Adapter_Pdo_Mysql
+{
+    /**
+     * Returns flag is transaction now?
+     *
+     * @return bool
+     */
+    public function isTransaction()
+    {
+        return (bool)$this->_transactionLevel;
+    }
+
+    /**
+     * Batched insert of specified select
+     *
+     * @param Varien_Db_Select $select
+     * @param string $table
+     * @param array $fields
+     * @param bool $mode
+     * @param int $step
+     * @return int
+     */
+    public function insertBatchFromSelect(Varien_Db_Select $select, $table, array $fields = array(),
+                                          $mode = false, $step = 10000
+    ) {
+        $limitOffset = 0;
+        $totalAffectedRows = 0;
+
+        do {
+            $select->limit($step, $limitOffset);
+            $result = $this->query(
+                $this->insertFromSelect($select, $table, $fields, $mode)
+            );
+
+            $affectedRows = $result->rowCount();
+            $totalAffectedRows += $affectedRows;
+            $limitOffset += $step;
+        } while ($affectedRows > 0);
+
+        return $totalAffectedRows;
+    }
+
+    /**
+     * Retrieve bunch of queries for specified select splitted by specified step
+     *
+     * @param Varien_Db_Select $select
+     * @param string $entityIdField
+     * @param int $step
+     * @return array
+     */
+    public function splitSelect(Varien_Db_Select $select, $entityIdField = '*', $step = 10000)
+    {
+        $countSelect = clone $select;
+
+        $countSelect->reset(Zend_Db_Select::COLUMNS);
+        $countSelect->reset(Zend_Db_Select::LIMIT_COUNT);
+        $countSelect->reset(Zend_Db_Select::LIMIT_OFFSET);
+        $countSelect->columns('COUNT(' . $entityIdField . ')');
+
+        $row = $this->fetchRow($countSelect);
+        $totalRows = array_shift($row);
+
+        $bunches = array();
+        for ($i = 0; $i <= $totalRows; $i += $step) {
+            $bunchSelect = clone $select;
+            $bunches[] = $bunchSelect->limit($step, $i);
+        }
+
+        return $bunches;
+    }
+}
diff --git a/lib/Magento/Db/Object.php b/lib/Magento/Db/Object.php
new file mode 100644
index 00000000000..be54be27626
--- /dev/null
+++ b/lib/Magento/Db/Object.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category   Magento
+ * @package    Magento_Db
+ * @copyright  Copyright (c) 2012 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Magento_Db_Object
+ *
+ * @category    Magento
+ * @package     Magento_Db
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+abstract class Magento_Db_Object
+{
+    /**
+     * @var Varien_Db_Adapter_Interface
+     */
+    protected $_adapter     = null;
+
+    /**
+     * @var string
+     */
+    protected $_objectName  = null;
+
+    /**
+     * @var string
+     */
+    protected $_dbType  = null;
+
+    /**
+     * @var string
+     */
+    protected $_schemaName  = null;
+
+    /**
+     * Constructor
+     * @param $objectName
+     * @param Varien_Db_Adapter_Interface $adapter
+     * @param $schemaName
+     */
+    public function __construct(Varien_Db_Adapter_Interface $adapter, $objectName, $schemaName = null)
+    {
+        $this->_objectName  = $objectName;
+        $this->_adapter = $adapter;
+        $this->_schemaName = $schemaName;
+    }
+
+    /**
+     * Returns object type
+     *
+     * @return string
+     */
+    public function getDbType()
+    {
+        return $this->_dbType;
+    }
+
+
+    /**
+     * Returns current schema name
+     *
+     * @return string
+     */
+    protected function _getCurrentSchema()
+    {
+        return $this->_adapter->fetchOne('SELECT SCHEMA()');
+    }
+
+    /**
+     * Returns schema name
+     *
+     * @return string
+     */
+    public function getSchemaName()
+    {
+        if (!$this->_schemaName) {
+            $this->_schemaName = $this->_getCurrentSchema();
+        }
+
+        return $this->_schemaName;
+    }
+
+    /**
+     * Drop database object
+     *
+     * @return Magento_Db_Object
+     */
+    public function drop()
+    {
+        $query  = 'DROP ' . $this->getDbType() . ' IF EXISTS '
+            . $this->_adapter->quoteIdentifier($this->_objectName);
+        $this->_adapter->query($query);
+
+        return $this;
+    }
+
+    /**
+     * Returns object name
+     *
+     * @return string
+     */
+    public function getFullName()
+    {
+        return ($this->getSchemaName() ? $this->getSchemaName() . '.' : '') . $this->_objectName;
+    }
+
+    /**
+     * Returns object name
+     *
+     * @return string
+     */
+    public function getObjectName()
+    {
+        return $this->_objectName;
+    }
+}
diff --git a/lib/Magento/Db/Object/Interface.php b/lib/Magento/Db/Object/Interface.php
new file mode 100755
index 00000000000..d0e64df62bf
--- /dev/null
+++ b/lib/Magento/Db/Object/Interface.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category   Magento
+ * @package    Magento_Db
+ * @copyright  Copyright (c) 2012 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Magento_Db_Object_Interface
+ *
+ * @category    Magento
+ * @package     Magento_Db
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+interface Magento_Db_Object_Interface
+{
+    /**
+     * Describe database object
+     *
+     * @return array
+     */
+    public function describe();
+
+    /**
+     * Drop database object
+     */
+    public function drop();
+
+    /**
+     * Check that database object is exist
+     */
+    public function isExists();
+}
diff --git a/lib/Magento/Db/Object/Table.php b/lib/Magento/Db/Object/Table.php
new file mode 100644
index 00000000000..2317d04aebb
--- /dev/null
+++ b/lib/Magento/Db/Object/Table.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category   Magento
+ * @package    Magento_Db
+ * @copyright  Copyright (c) 2012 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Magento_Db_Object_Table
+ *
+ * @category    Magento
+ * @package     Magento_Db
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Magento_Db_Object_Table extends Magento_Db_Object implements Magento_Db_Object_Interface
+{
+    /**
+     * @var string
+     */
+    protected $_dbType  = 'TABLE';
+
+    /**
+     * Check is object exists
+     *
+     * @return bool
+     */
+    public function isExists()
+    {
+        return $this->_adapter->isTableExists($this->_objectName, $this->_schemaName);
+    }
+
+    /**
+     * Create a new table from source
+     *
+     * @param $source Zend_Db_Select
+     * @return Magento_Db_Object_Table
+     */
+    public function createFromSource(Zend_Db_Select $source)
+    {
+        $this->_adapter->query(
+            'CREATE ' . $this->getDbType() . ' ' . $this->_objectName . ' AS ' . $source
+        );
+        return $this;
+    }
+
+    /**
+     * Describe Table
+     *
+     * @return array
+     */
+    public function describe()
+    {
+        return $this->_adapter->describeTable($this->_objectName, $this->_schemaName);
+    }
+}
diff --git a/lib/Magento/Db/Object/Trigger.php b/lib/Magento/Db/Object/Trigger.php
new file mode 100644
index 00000000000..09a7d0d1af5
--- /dev/null
+++ b/lib/Magento/Db/Object/Trigger.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category   Magento
+ * @package    Magento_Db
+ * @copyright  Copyright (c) 2012 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Magento_Db_Object_Trigger
+ *
+ * @category    Magento
+ * @package     Magento_Db
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Magento_Db_Object_Trigger extends Magento_Db_Object implements Magento_Db_Object_Interface
+{
+    /**
+     * @var string
+     */
+    protected $_dbType  = 'TRIGGER';
+
+    /**
+     * @var array
+     */
+    protected $_data = array();
+
+    /**
+     * @return bool
+     */
+    public function isExists()
+    {
+        if (!isset($this->_data['triggers'][$this->_schemaName])) {
+            $this->describe();
+        }
+
+        if (isset($this->_data['triggers'][$this->_schemaName][$this->_objectName])) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function describe()
+    {
+        $columns = array(
+            'TRIGGER_NAME',
+            'EVENT_MANIPULATION',
+            'EVENT_OBJECT_CATALOG',
+            'EVENT_OBJECT_SCHEMA',
+            'EVENT_OBJECT_TABLE',
+            'ACTION_ORDER',
+            'ACTION_CONDITION',
+            'ACTION_STATEMENT',
+            'ACTION_ORIENTATION',
+            'ACTION_TIMING',
+            'ACTION_REFERENCE_OLD_TABLE',
+            'ACTION_REFERENCE_NEW_TABLE',
+            'ACTION_REFERENCE_OLD_ROW',
+            'ACTION_REFERENCE_NEW_ROW',
+            'CREATED',
+        );
+        $sql = 'SELECT ' . implode(', ', $columns)
+            . ' FROM ' . $this->_adapter->quoteIdentifier(array('INFORMATION_SCHEMA','TRIGGERS'))
+            . ' WHERE ';
+
+        $schema = $this->getSchemaName();
+        if ($schema) {
+            $sql .= $this->_adapter->quoteIdentifier('EVENT_OBJECT_SCHEMA')
+                . ' = ' . $this->_adapter->quote($schema);
+        } else {
+            $sql .= $this->_adapter->quoteIdentifier('EVENT_OBJECT_SCHEMA')
+                . ' != ' . $this->_adapter->quote('INFORMATION_SCHEMA');
+        }
+
+        $results = $this->_adapter->query($sql);
+
+        $data = array();
+        foreach ($results as $row) {
+            $row = array_change_key_case($row, CASE_LOWER);
+            if (null !== $row['created']) {
+                $row['created'] = new DateTime($row['created']);
+            }
+            $data[$row['trigger_name']] = $row;
+        }
+        $this->_data['triggers'][$schema] = $data;
+
+        return $data;
+    }
+}
+
diff --git a/lib/Magento/Db/Object/View.php b/lib/Magento/Db/Object/View.php
new file mode 100644
index 00000000000..98a35e7263d
--- /dev/null
+++ b/lib/Magento/Db/Object/View.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category   Magento
+ * @package    Magento_Db
+ * @copyright  Copyright (c) 2012 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Magento_Db_Object_View
+ *
+ * @category    Magento
+ * @package     Magento_Db
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Magento_Db_Object_View extends Magento_Db_Object implements Magento_Db_Object_Interface
+{
+    const ALGORITHM_MERGE       = 'MERGE';
+    const ALGORITHM_TEMPTABLE   = 'TEMPTABLE';
+
+    /**
+     * @var string
+     */
+    protected $_dbType  = 'VIEW';
+
+    /**
+     * Create view from source
+     *
+     * @param $source
+     * @param string $algorithm
+     * @return Magento_Db_Object_View
+     */
+    public function createFromSource(Zend_Db_Select $source, $algorithm = self::ALGORITHM_MERGE)
+    {
+        $this->_adapter->query(
+            'CREATE ALGORITHM = ' . $algorithm . ' ' . $this->getDbType() . ' '
+                . $this->getObjectName() . ' AS ' . $source
+        );
+        return $this;
+    }
+
+    /**
+     * Describe Table
+     *
+     * @return array
+     */
+    public function describe()
+    {
+        return $this->_adapter->describeTable($this->_objectName, $this->_schemaName);
+    }
+
+    /**
+     * Check is object exists
+     *
+     * @return bool
+     */
+    public function isExists()
+    {
+        return $this->_adapter->isTableExists($this->_objectName, $this->_schemaName);
+    }
+}
diff --git a/lib/Magento/Db/Sql/Select.php b/lib/Magento/Db/Sql/Select.php
new file mode 100644
index 00000000000..4826cdcf026
--- /dev/null
+++ b/lib/Magento/Db/Sql/Select.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category   Magento
+ * @package    Magento_Db
+ * @copyright  Copyright (c) 2012 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Magento_Db_Sql_Select
+ *
+ * @category    Magento
+ * @package     Magento_Db
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Magento_Db_Sql_Select extends Varien_Db_Select
+{
+
+}
diff --git a/lib/Magento/Db/Sql/Trigger.php b/lib/Magento/Db/Sql/Trigger.php
new file mode 100755
index 00000000000..48dfb307fb8
--- /dev/null
+++ b/lib/Magento/Db/Sql/Trigger.php
@@ -0,0 +1,353 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category   Magento
+ * @package    Magento_Db
+ * @copyright  Copyright (c) 2012 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Magento_Db_Sql_Trigger
+ *
+ * @category    Magento
+ * @package     Magento_Db
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Magento_Db_Sql_Trigger
+{
+    const NAME      = 'name';
+    const TARGET    = 'target';
+    const TIME      = 'time';
+    const EVENT     = 'event';
+    const SCOPE     = 'scope';
+    const BODY      = 'body';
+
+    /**
+     * SQL constants
+     */
+    const SQL_TIME_BEFORE   = 'BEFORE';
+    const SQL_TIME_AFTER    = 'AFTER';
+    const SQL_EVENT_INSERT  = 'INSERT';
+    const SQL_EVENT_UPDATE  = 'UPDATE';
+    const SQL_EVENT_DELETE  = 'DELETE';
+    const SQL_FOR_EACH_ROW  = 'FOR EACH ROW';
+
+    /**
+     * Trigger parts
+     *
+     * @var array
+     */
+    protected $_parts = array();
+
+    /**
+     * Allowed time types
+     *
+     * @var array
+     */
+    protected $_timeTypes = array(
+        self::SQL_TIME_AFTER,
+        self::SQL_TIME_BEFORE
+    );
+
+    /**
+     * Allowed event types
+     *
+     * @var array
+     */
+    protected $_eventTypes = array(
+        self::SQL_EVENT_INSERT,
+        self::SQL_EVENT_UPDATE,
+        self::SQL_EVENT_DELETE
+    );
+
+    /**
+     * Initial trigger structure, for MySQL scope is always "FOR EACH ROW".
+     * Time "AFTER" is default
+     *
+     * @var array
+     */
+    protected static $_partsInit = array(
+        self::TARGET    => null,
+        self::TIME      => self::SQL_TIME_AFTER,
+        self::EVENT     => null,
+        self::SCOPE     => self::SQL_FOR_EACH_ROW,
+        self::BODY      => array()
+    );
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        $this->_parts = self::$_partsInit;
+    }
+
+    /**
+     * Validate where all trigger parts set?
+     *
+     * @return Magento_Db_Sql_Trigger
+     * @throws Exception
+     */
+    protected function _validateIsComplete()
+    {
+        foreach (array_keys(self::$_partsInit) as $part) {
+            if (empty($this->_parts[$part])) {
+                throw new Exception('Part [' . $part . '] should be set');
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Set trigger part
+     *
+     * @param $part
+     * @param $value
+     * @return Magento_Db_Sql_Trigger
+     * @throws InvalidArgumentException
+     */
+    protected function _setPart($part, $value)
+    {
+        if ($value != null) {
+            $this->_parts[$part] = $value;
+        } else {
+            throw new InvalidArgumentException('Part [' . $part . '] can not be empty');
+        }
+        return $this;
+    }
+
+    /**
+     * Set trigger part
+     *
+     * @param $part
+     * @return string|array
+     * @throws Exception
+     */
+    protected function _getPart($part)
+    {
+        if (isset($this->_parts[$part])) {
+            return $this->_parts[$part];
+        }
+
+        throw new Exception('Part [' . $part . '] does\'t exists');
+    }
+
+    /**
+     * Set body part to trigger
+     *
+     * @param $part
+     * @param $value
+     * @return Magento_Db_Sql_Trigger
+     * @throws InvalidArgumentException
+     */
+    public function setBodyPart($part, $value)
+    {
+        if ($value != null) {
+            $this->_parts[self::BODY][$part] = $value;
+        } else {
+            throw new InvalidArgumentException('Part [' . $part . '] can not be empty');
+        }
+        return $this;
+    }
+
+
+    /**
+     * Set body part to trigger
+     *
+     * @param string $part
+     * @return string
+     * @throws Exception
+     */
+    public function getBodyPart($part)
+    {
+        if (isset($this->_parts[self::BODY][$part])) {
+            return $this->_parts[self::BODY][$part];
+        }
+
+        throw new Exception('Part [' . $part . '] does\'t exists');
+    }
+
+    /**
+     * Generate trigger name
+     *
+     * @return string
+     */
+    protected function _generateTriggerName()
+    {
+        return strtolower('trg_' . $this->_parts[self::TARGET]
+            . '_' . $this->_parts[self::TIME]
+            . '_' . $this->_parts[self::EVENT]);
+    }
+
+    /**
+     * Set trigger time {BEFORE/AFTER}
+     * @param $time
+     * @return Magento_Db_Sql_Trigger
+     * @throws InvalidArgumentException
+     */
+    public function setTime($time)
+    {
+        if (in_array($time, $this->getTimeTypes())) {
+            $this->_setPart(self::TIME, $time);
+        } else {
+            throw new InvalidArgumentException('Unsupported time type!');
+        }
+        return $this;
+    }
+
+    /**
+     * Set trigger event {INSERT/UPDATE/DELETE}
+     *
+     * @param $event
+     * @return Magento_Db_Sql_Trigger
+     * @throws InvalidArgumentException
+     */
+    public function setEvent($event)
+    {
+        if (in_array($event, $this->getEventTypes())) {
+            $this->_setPart(self::EVENT, $event);
+        } else {
+            throw new InvalidArgumentException('Unsupported event type!');
+        }
+        return $this;
+    }
+
+    /**
+     * Set trigger target, table name
+     *
+     * @param $target
+     * @return Magento_Db_Sql_Trigger
+     */
+    public function setTarget($target)
+    {
+        $this->_setPart(self::TARGET, $target);
+        return $this;
+    }
+
+    /**
+     * Set trigger name
+     *
+     * @param $name
+     * @return Magento_Db_Sql_Trigger
+     */
+    public function setName($name)
+    {
+        $this->_setPart(self::NAME, $name);
+        return $this;
+    }
+
+    /**
+     * Retrieve trigger name.
+     * If trigger name does not exists generate it by template 'trg_{TARGET}_{TIME}_{EVENT}'.
+     *
+     * @return mixed
+     */
+    public function getName()
+    {
+        if (empty($this->_parts[self::NAME])) {
+            $this->_parts[self::NAME] = $this->_generateTriggerName();
+        }
+        return $this->_parts[self::NAME];
+    }
+
+    /**
+     * Set trigger body
+     *
+     * @param array|string $body
+     * @return Magento_Db_Sql_Trigger
+     */
+    public function setBody($body)
+    {
+        if (!is_array($body)) {
+            $body = array($body);
+        }
+        $this->_setPart(self::BODY, $body);
+        return $this;
+    }
+
+    /**
+     * Get body parts of trigger
+     *
+     * @return array
+     */
+    public function getBody()
+    {
+        return $this->_getPart(self::BODY);
+    }
+
+    /**
+     * Get trigger creating SQL script
+     *
+     * @return string
+     */
+    public function assemble()
+    {
+        $this->_validateIsComplete();
+        return "CREATE TRIGGER "
+            . $this->getName() . "\n"
+            . $this->_parts[self::TIME] . " " . $this->_parts[self::EVENT] . "\n"
+            . "ON " . $this->_parts[self::TARGET] . " " . $this->_parts[self::SCOPE] . "\n"
+            . "BEGIN\n"
+            . implode("\n", $this->_parts[self::BODY]) . "\n"
+            . "END;\n";
+    }
+
+    /**
+     * Implement magic method
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->assemble();
+    }
+
+    /**
+     * Retrieve list of allowed events
+     *
+     * @return array
+     */
+    public function getEventTypes()
+    {
+        return $this->_eventTypes;
+    }
+
+    /**
+     * Retrieve list of allowed time types
+     *
+     * @return array
+     */
+    public function getTimeTypes()
+    {
+        return $this->_timeTypes;
+    }
+
+    /**
+     * Reset trigger parts
+     *
+     * @return Magento_Db_Sql_Trigger
+     */
+    public function reset()
+    {
+        $this->_parts = self::$_partsInit;
+        return $this;
+    }
+}
diff --git a/lib/Magento/Exception.php b/lib/Magento/Exception.php
new file mode 100644
index 00000000000..a8dd1f785d2
--- /dev/null
+++ b/lib/Magento/Exception.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @category    Magento
+ * @package     Magento_Exception
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+class Magento_Exception extends Exception
+{
+
+}
diff --git a/lib/Magento/Profiler.php b/lib/Magento/Profiler.php
new file mode 100644
index 00000000000..42b40e4efa3
--- /dev/null
+++ b/lib/Magento/Profiler.php
@@ -0,0 +1,273 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @category    Magento
+ * @package     Magento_Profiler
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+/**
+ * Static class that represents profiling tool
+ */
+class Magento_Profiler
+{
+    /**
+     * Separator literal to assemble timer identifier from timer names
+     */
+    const NESTING_SEPARATOR = '->';
+
+    /**
+     * FETCH_* constants represent keys to retrieve profiling results
+     */
+    const FETCH_TIME    = 'sum';
+    const FETCH_COUNT   = 'count';
+    const FETCH_AVG     = 'avg';
+    const FETCH_REALMEM = 'realmem';
+    const FETCH_EMALLOC = 'emalloc';
+
+    /**
+     * Storage for timers statistics
+     *
+     * @var array
+     */
+    static private $_timers = array();
+
+    /**
+     * Whether profiling is active or not
+     *
+     * @var bool
+     */
+    static private $_enabled = false;
+
+    /**
+     * Nesting path that represents namespace to resolve timer names
+     *
+     * @var array
+     */
+    static private $_currentPath = array();
+
+    /**
+     * Collection of profiler outputs
+     *
+     * @var array
+     */
+    static private $_outputs = array();
+
+    /**
+     * Whether an initialization is done or not
+     *
+     * @var bool
+     */
+    static private $_isInitialized = false;
+
+    /**
+     * Supported timer statistics keys
+     *
+     * @var array
+     */
+    private static $_supportedFetchKeys = array(
+        self::FETCH_TIME,
+        self::FETCH_AVG,
+        self::FETCH_COUNT,
+        self::FETCH_EMALLOC,
+        self::FETCH_REALMEM,
+    );
+
+    /**
+     * Retrieve unique identifier among all timers
+     *
+     * @param string|null $timerName Timer name
+     * @return string
+     */
+    private static function _getTimerId($timerName = null)
+    {
+        $currentPath = self::$_currentPath;
+        if ($timerName) {
+            $currentPath[] = $timerName;
+        }
+        return implode(self::NESTING_SEPARATOR, $currentPath);
+    }
+
+    /**
+     * Enable profiling.
+     * Any call to profiler does nothing until profiler is enabled.
+     */
+    public static function enable()
+    {
+        if (!self::$_isInitialized) {
+            register_shutdown_function(array(__CLASS__, 'display'));
+            self::$_isInitialized = true;
+        }
+        self::$_enabled = true;
+    }
+
+    /**
+     * Disable profiling.
+     * Any call to profiler is silently ignored while profiler is disabled.
+     */
+    public static function disable()
+    {
+        self::$_enabled = false;
+    }
+
+    /**
+     * Reset collected statistics for specified timer or for whole profiler if timer name is omitted
+     *
+     * @param string|null $timerName
+     */
+    public static function reset($timerName = null)
+    {
+        if ($timerName === null) {
+            self::$_timers = array();
+            self::$_currentPath = array();
+            return;
+        }
+        $timerId = self::_getTimerId($timerName);
+        self::$_timers[$timerId] = array(
+            'start'             => false,
+            self::FETCH_TIME    => 0,
+            self::FETCH_COUNT   => 0,
+            self::FETCH_REALMEM => 0,
+            self::FETCH_EMALLOC => 0,
+        );
+    }
+
+    /**
+     * Start collecting statistics for specified timer
+     *
+     * @param string $timerName
+     * @throws Varien_Exception
+     */
+    public static function start($timerName)
+    {
+        if (!self::$_enabled) {
+            return;
+        }
+
+        if (strpos($timerName, self::NESTING_SEPARATOR) !== false) {
+            throw new Varien_Exception('Timer name must not contain a nesting separator.');
+        }
+
+        $timerId = self::_getTimerId($timerName);
+
+        if (empty(self::$_timers[$timerId])) {
+            self::reset($timerName);
+        }
+
+        /* Continue collecting timers statistics under the latest started one */
+        self::$_currentPath[] = $timerName;
+
+        self::$_timers[$timerId]['realmem_start'] = memory_get_usage(true);
+        self::$_timers[$timerId]['emalloc_start'] = memory_get_usage();
+        self::$_timers[$timerId]['start'] = microtime(true);
+        self::$_timers[$timerId][self::FETCH_COUNT]++;
+    }
+
+    /**
+     * Stop recording statistics for specified timer.
+     * Call with no arguments to stop the recently started timer.
+     * Only the latest started timer can be stopped.
+     *
+     * @param  string|null $timerName
+     * @throws Varien_Exception
+     */
+    public static function stop($timerName = null)
+    {
+        if (!self::$_enabled) {
+            return;
+        }
+
+        /* Get current time as quick as possible to make more accurate calculations */
+        $time = microtime(true);
+
+        $latestTimerName = end(self::$_currentPath);
+        if ($timerName !== null && $timerName !== $latestTimerName) {
+            if (in_array($timerName, self::$_currentPath)) {
+                $exceptionMsg = sprintf('Timer "%s" should be stopped before "%s".', $latestTimerName, $timerName);
+            } else {
+                $exceptionMsg = sprintf('Timer "%s" has not been started.', $timerName);
+            }
+            throw new Varien_Exception($exceptionMsg);
+        }
+
+        $timerId = self::_getTimerId();
+
+        self::$_timers[$timerId][self::FETCH_TIME] += ($time - self::$_timers[$timerId]['start']);
+        self::$_timers[$timerId]['start'] = false;
+        self::$_timers[$timerId][self::FETCH_REALMEM] += memory_get_usage(true);
+        self::$_timers[$timerId][self::FETCH_REALMEM] -= self::$_timers[$timerId]['realmem_start'];
+        self::$_timers[$timerId][self::FETCH_EMALLOC] += memory_get_usage();
+        self::$_timers[$timerId][self::FETCH_EMALLOC] -= self::$_timers[$timerId]['emalloc_start'];
+
+        /* Move one level up in timers nesting tree */
+        array_pop(self::$_currentPath);
+    }
+
+    /**
+     * Retrieve statistics on specified timer
+     *
+     * @param  string $timerId
+     * @param  string $key Information to return
+     * @return int|float
+     * @throws Varien_Exception
+     */
+    public static function fetch($timerId, $key = self::FETCH_TIME)
+    {
+        if (empty(self::$_timers[$timerId])) {
+            throw new Varien_Exception(sprintf('Timer "%s" does not exist.', $timerId));
+        }
+        if (!in_array($key, self::$_supportedFetchKeys)) {
+            throw new Varien_Exception(sprintf('Requested key "%s" is not supported.', $key));
+        }
+        /* FETCH_AVG = FETCH_TIME / FETCH_COUNT */
+        $isAvg = ($key == self::FETCH_AVG);
+        if ($isAvg) {
+            $key = self::FETCH_TIME;
+        }
+        $result = self::$_timers[$timerId][$key];
+        if ($key == self::FETCH_TIME && self::$_timers[$timerId]['start'] !== false) {
+            $result += (microtime(true) - self::$_timers[$timerId]['start']);
+        }
+        if ($isAvg) {
+            $result /= self::$_timers[$timerId][self::FETCH_COUNT];
+        }
+        return $result;
+    }
+
+    /**
+     * Retrieve the list of unique timer identifiers
+     *
+     * @return array
+     */
+    public static function getTimers()
+    {
+        return array_keys(self::$_timers);
+    }
+
+    /**
+     * Register profiler output instance to display profiling result at the end of execution
+     *
+     * @param Magento_Profiler_OutputAbstract $output
+     */
+    public static function registerOutput(Magento_Profiler_OutputAbstract $output)
+    {
+        self::enable();
+        self::$_outputs[] = $output;
+    }
+
+    /**
+     * Display collected statistics with registered outputs
+     */
+    public static function display()
+    {
+        if (!self::$_enabled) {
+            return;
+        }
+        /** @var $output Magento_Profiler_OutputAbstract */
+        foreach (self::$_outputs as $output) {
+            $output->display();
+        }
+    }
+}
diff --git a/lib/Magento/Profiler/Output/Csvfile.php b/lib/Magento/Profiler/Output/Csvfile.php
new file mode 100644
index 00000000000..870fce05fd8
--- /dev/null
+++ b/lib/Magento/Profiler/Output/Csvfile.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @category    Magento
+ * @package     Magento_Profiler
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+/**
+ * Class that represents profiler output in Html format
+ */
+class Magento_Profiler_Output_Csvfile extends Magento_Profiler_OutputAbstract
+{
+    /**
+     * @var string
+     */
+    protected $_filename;
+
+    /**
+     * @var string
+     */
+    protected $_delimiter;
+
+    /**
+     * @var string
+     */
+    protected $_enclosure;
+
+    /**
+     * Start output buffering
+     *
+     * @param string      $filename Target file to save CSV data
+     * @param string|null $filter Pattern to filter timers by their identifiers (SQL LIKE syntax)
+     * @param string      $delimiter Delimiter for CSV format
+     * @param string      $enclosure Enclosure for CSV format
+     */
+    public function __construct($filename, $filter = null, $delimiter = ',', $enclosure = '"')
+    {
+        parent::__construct($filter);
+
+        $this->_filename = $filename;
+        $this->_delimiter = $delimiter;
+        $this->_enclosure = $enclosure;
+    }
+
+    /**
+     * Display profiling results
+     */
+    public function display()
+    {
+        $fileHandle = fopen($this->_filename, 'w');
+        if (!$fileHandle) {
+            throw new Varien_Exception(sprintf('Can not open a file "%s".', $this->_filename));
+        }
+
+        $needLock = (strpos($this->_filename, 'php://') !== 0);
+        $isLocked = false;
+        while ($needLock && !$isLocked) {
+            $isLocked = flock($fileHandle, LOCK_EX);
+        }
+
+        $this->_writeFileContent($fileHandle);
+
+        if ($isLocked) {
+            flock($fileHandle, LOCK_UN);
+        }
+        fclose($fileHandle);
+    }
+
+    /**
+     * Write content into an opened file handle
+     *
+     * @param resource $fileHandle
+     */
+    protected function _writeFileContent($fileHandle)
+    {
+        foreach ($this->_getTimers() as $timerId) {
+            $row = array();
+            foreach ($this->_getColumns() as $columnId) {
+                $row[] = $this->_renderColumnValue($timerId, $columnId);
+            }
+            fputcsv($fileHandle, $row, $this->_delimiter, $this->_enclosure);
+        }
+    }
+}
diff --git a/lib/Magento/Profiler/Output/Firebug.php b/lib/Magento/Profiler/Output/Firebug.php
new file mode 100644
index 00000000000..47b340feb9c
--- /dev/null
+++ b/lib/Magento/Profiler/Output/Firebug.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @category    Magento
+ * @package     Magento_Profiler
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+/**
+ * Class that outputs profiling results to Firebug
+ */
+class Magento_Profiler_Output_Firebug extends Magento_Profiler_OutputAbstract
+{
+    /**
+     * @var Zend_Controller_Request_Abstract
+     */
+    private $_request;
+
+    /**
+     * @var Zend_Controller_Response_Abstract
+     */
+    private $_response;
+
+    /**
+     * Start output buffering
+     *
+     * @param string|null $filter Pattern to filter timers by their identifiers (SQL LIKE syntax)
+     */
+    public function __construct($filter = null)
+    {
+        parent::__construct($filter);
+        ob_start();
+    }
+
+    /**
+     * Request setter
+     *
+     * @param Zend_Controller_Request_Abstract $request
+     */
+    public function setRequest(Zend_Controller_Request_Abstract $request)
+    {
+        $this->_request = $request;
+    }
+
+    /**
+     * Response setter
+     *
+     * @param Zend_Controller_Response_Abstract $response
+     */
+    public function setResponse(Zend_Controller_Response_Abstract $response)
+    {
+        $this->_response = $response;
+    }
+
+    /**
+     * Display profiling results and flush output buffer
+     */
+    public function display()
+    {
+        $firebugMessage = new Zend_Wildfire_Plugin_FirePhp_TableMessage($this->_renderCaption());
+        $firebugMessage->setHeader(array_keys($this->_getColumns()));
+
+        foreach ($this->_getTimers() as $timerId) {
+            $row = array();
+            foreach ($this->_getColumns() as $columnId) {
+                $row[] = $this->_renderColumnValue($timerId, $columnId);
+            }
+            $firebugMessage->addRow($row);
+        }
+
+        Zend_Wildfire_Plugin_FirePhp::getInstance()->send($firebugMessage);
+
+        // setup the wildfire channel
+        $firebugChannel = Zend_Wildfire_Channel_HttpHeaders::getInstance();
+        $firebugChannel->setRequest($this->_request ? $this->_request : new Zend_Controller_Request_Http());
+        $firebugChannel->setResponse($this->_response ? $this->_response : new Zend_Controller_Response_Http());
+
+        // flush the wildfire headers into the response object
+        $firebugChannel->flush();
+
+        // send the response headers
+        $firebugChannel->getResponse()->sendHeaders();
+
+        ob_end_flush();
+    }
+
+    /**
+     * Render timer id column value
+     *
+     * @param string $timerId
+     * @return string
+     */
+    protected function _renderTimerId($timerId)
+    {
+        $nestingSep = preg_quote(Magento_Profiler::NESTING_SEPARATOR, '/');
+        return preg_replace('/.+?' . $nestingSep . '/', '. ', $timerId);
+    }
+}
diff --git a/lib/Magento/Profiler/Output/Html.php b/lib/Magento/Profiler/Output/Html.php
new file mode 100644
index 00000000000..be91218ffa2
--- /dev/null
+++ b/lib/Magento/Profiler/Output/Html.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @category    Magento
+ * @package     Magento_Profiler
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+/**
+ * Class that represents profiler output in Html format
+ */
+class Magento_Profiler_Output_Html extends Magento_Profiler_OutputAbstract
+{
+    /**
+     * Display profiling results
+     */
+    public function display()
+    {
+        $out  = '<table border="1" cellspacing="0" cellpadding="2">';
+        $out .= '<caption>' . $this->_renderCaption() . '</caption>';
+        $out .= '<tr>';
+        foreach (array_keys($this->_getColumns()) as $columnLabel) {
+            $out .= '<th>' . $columnLabel . '</th>';
+        }
+        $out .= '</tr>';
+        foreach ($this->_getTimers() as $timerId) {
+            $out .= '<tr>';
+            foreach ($this->_getColumns() as $columnId) {
+                $out .= '<td title="' . $timerId . '">' . $this->_renderColumnValue($timerId, $columnId) . '</td>';
+            }
+            $out .= '</tr>';
+        }
+        $out .= '</table>';
+
+        echo $out;
+    }
+
+    /**
+     * Render timer id column value
+     *
+     * @param string $timerId
+     * @return string
+     */
+    protected function _renderTimerId($timerId)
+    {
+        $nestingSep = preg_quote(Magento_Profiler::NESTING_SEPARATOR, '/');
+        return preg_replace('/.+?' . $nestingSep . '/', '&middot;&nbsp;&nbsp;', $timerId);
+    }
+}
diff --git a/lib/Magento/Profiler/OutputAbstract.php b/lib/Magento/Profiler/OutputAbstract.php
new file mode 100644
index 00000000000..7a15e8e4554
--- /dev/null
+++ b/lib/Magento/Profiler/OutputAbstract.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @category    Magento
+ * @package     Magento_Profiler
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+/**
+ * Abstract class that represents profiler output
+ */
+abstract class Magento_Profiler_OutputAbstract
+{
+    /**
+     * PCRE Regular Expression for filter
+     *
+     * @var null|string
+     */
+    private $_filter;
+
+    /**
+     * List of threshold (minimal allowed) values for profiler data
+     *
+     * @var array
+     */
+    private $_thresholds = array(
+        Magento_Profiler::FETCH_TIME    => 0.001,
+        Magento_Profiler::FETCH_COUNT   => 10,
+        Magento_Profiler::FETCH_EMALLOC => 10000,
+    );
+
+    /**
+     * Initialize profiler output with timer identifiers filter
+     *
+     * @param string|null $filter Pattern to filter timers by their identifiers.
+     *                            Supports syntax similar to SQL LIKE operator:
+     *                            % - Matches any number of characters, even zero characters
+     *                            _ - Matches exactly one character
+     */
+    public function __construct($filter = null)
+    {
+        $this->_filter = $filter;
+    }
+
+    /**
+     * Override in descendants to display profiling results in appropriate format
+     */
+    abstract public function display();
+
+    /**
+     * Retrieve the list of (column_label; column_id) pairs
+     *
+     * @return array
+     */
+    protected function _getColumns()
+    {
+        return array(
+            'Timer Id' => 'timer_id',
+            'Time'     => Magento_Profiler::FETCH_TIME,
+            'Avg'      => Magento_Profiler::FETCH_AVG,
+            'Cnt'      => Magento_Profiler::FETCH_COUNT,
+            'Emalloc'  => Magento_Profiler::FETCH_EMALLOC,
+            'RealMem'  => Magento_Profiler::FETCH_REALMEM,
+        );
+    }
+
+    /**
+     * Render statistics column value for specified timer
+     *
+     * @param string $timerId
+     * @param string $columnId
+     */
+    protected function _renderColumnValue($timerId, $columnId)
+    {
+        if ($columnId == 'timer_id') {
+            return $this->_renderTimerId($timerId);
+        }
+        $value = (string)Magento_Profiler::fetch($timerId, $columnId);
+        if (in_array($columnId, array(Magento_Profiler::FETCH_TIME, Magento_Profiler::FETCH_AVG))) {
+            $value = number_format($value, 6);
+        } else {
+            $value = number_format($value);
+        }
+        return $value;
+    }
+
+    /**
+     * Render timer id column value
+     *
+     * @param string $timerId
+     * @return string
+     */
+    protected function _renderTimerId($timerId)
+    {
+        return $timerId;
+    }
+
+    /**
+     * Retrieve timer ids sorted to correspond the nesting
+     *
+     * @return array
+     */
+    private function _getSortedTimers()
+    {
+        $timerIds = Magento_Profiler::getTimers();
+        if (count($timerIds) <= 2) {
+            /* No sorting needed */
+            return $timerIds;
+        }
+
+        /* Prepare PCRE once to use it inside the loop body */
+        $nestingSep = preg_quote(Magento_Profiler::NESTING_SEPARATOR, '/');
+        $patternLastTimerName = '/' . $nestingSep . '(?:.(?!' . $nestingSep . '))+$/';
+
+        $prevTimerId = $timerIds[0];
+        $result = array($prevTimerId);
+        for ($i = 1; $i < count($timerIds); $i++) {
+            $timerId = $timerIds[$i];
+            /* Skip already added timer */
+            if (!$timerId) {
+                continue;
+            }
+            /* Loop over all timers that need to be closed under previous timer */
+            while (strpos($timerId, $prevTimerId . Magento_Profiler::NESTING_SEPARATOR) !== 0) {
+                /* Add to result all timers nested in the previous timer */
+                for ($j = $i + 1; $j < count($timerIds); $j++) {
+                    if (strpos($timerIds[$j], $prevTimerId . Magento_Profiler::NESTING_SEPARATOR) === 0) {
+                        $result[] = $timerIds[$j];
+                        /* Mark timer as already added */
+                        $timerIds[$j] = null;
+                    }
+                }
+                /* Go to upper level timer */
+                $count = 0;
+                $prevTimerId = preg_replace($patternLastTimerName, '', $prevTimerId, -1, $count);
+                /* Break the loop if no replacements was done. It is possible when we are */
+                /* working with top level (root) item */
+                if (!$count) {
+                    break;
+                }
+            }
+            /* Add current timer to the result */
+            $result[] = $timerId;
+            $prevTimerId = $timerId;
+        }
+        return $result;
+    }
+
+    /**
+     * Retrieve the list of timer Ids
+     *
+     * @return array
+     */
+    protected function _getTimers()
+    {
+        $pattern = $this->_filter;
+        $timerIds = $this->_getSortedTimers();
+        $result = array();
+        foreach ($timerIds as $timerId) {
+            /* Filter by timer id pattern */
+            if ($pattern && !preg_match($pattern, $timerId)) {
+                continue;
+            }
+            /* Filter by column value thresholds */
+            $skip = false;
+            foreach ($this->_thresholds as $fetchKey => $minAllowedValue) {
+                $skip = (Magento_Profiler::fetch($timerId, $fetchKey) < $minAllowedValue);
+                /* First value not less than the allowed one forces to include timer to the result */
+                if (!$skip) {
+                    break;
+                }
+            }
+            if (!$skip) {
+                $result[] = $timerId;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Render a caption for the profiling results
+     *
+     * @return string
+     */
+    protected function _renderCaption()
+    {
+        $result = 'Code Profiler (Memory usage: real - %s, emalloc - %s)';
+        $result = sprintf($result, memory_get_usage(true), memory_get_usage());
+        return $result;
+    }
+
+    /**
+     * Set threshold (minimal allowed) value for timer column.
+     * Timer is being rendered if at least one of its columns is not less than the minimal allowed value.
+     *
+     * @param string $fetchKey
+     * @param int|float|null $minAllowedValue
+     */
+    public function setThreshold($fetchKey, $minAllowedValue)
+    {
+        if ($minAllowedValue === null) {
+            unset($this->_thresholds[$fetchKey]);
+        } else {
+            $this->_thresholds[$fetchKey] = $minAllowedValue;
+        }
+    }
+}
diff --git a/lib/PEAR/HTTP/HTTP.php b/lib/PEAR/HTTP/HTTP.php
index 6ebd6dbc9ab..71cf8e133a7 100644
--- a/lib/PEAR/HTTP/HTTP.php
+++ b/lib/PEAR/HTTP/HTTP.php
@@ -545,4 +545,4 @@ function raiseError($error = null, $code = null)
     }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/lib/Varien/Cache/Backend/Memcached.php b/lib/Varien/Cache/Backend/Memcached.php
index 67bcc5c9ea9..8843f106319 100644
--- a/lib/Varien/Cache/Backend/Memcached.php
+++ b/lib/Varien/Cache/Backend/Memcached.php
@@ -24,7 +24,12 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class Varien_Cache_Backend_Memcached 
+/**
+ * Class Varien_Cache_Backend_Memcached
+ *
+ * @deprecated after 1.7.0.2
+ */
+class Varien_Cache_Backend_Memcached
     extends Zend_Cache_Backend_Memcached
     implements Zend_Cache_Backend_ExtendedInterface
 {
diff --git a/lib/Varien/Cache/Core.php b/lib/Varien/Cache/Core.php
index 56fd6babe1c..cc3693f7d66 100644
--- a/lib/Varien/Cache/Core.php
+++ b/lib/Varien/Cache/Core.php
@@ -26,6 +26,60 @@
 
 class Varien_Cache_Core extends Zend_Cache_Core
 {
+    /**
+     * Specific slab size = 1Mb minus overhead
+     *
+     * @var array $_specificOptions
+     */
+    protected $_specificOptions = array('slab_size' => 0);
+
+    /**
+     * Used to tell chunked data from ordinary
+     */
+    const CODE_WORD = '{splitted}';
+
+    /**
+     * Constructor
+     *
+     * @throws Varien_Exception
+     * @param array|Zend_Config $options Associative array of options or Zend_Config instance
+     */
+    public function __construct($options = array())
+    {
+        parent::__construct($options);
+        if (!is_numeric($this->getOption('slab_size'))) {
+            throw new Varien_Exception("Invalid value for the node <slab_size>. Expected to be integer.");
+        }
+    }
+
+    /**
+     * Returns ID of a specific chunk on the basis of data's ID
+     *
+     * @param string $id    Main data's ID
+     * @param int    $index Particular chunk number to return ID for
+     * @return string
+     */
+    protected function _getChunkId($id, $index)
+    {
+        return "{$id}[{$index}]";
+    }
+
+    /**
+     * Remove saved chunks in case something gone wrong (e.g. some chunk from the chain can not be found)
+     *
+     * @param string $id     ID of data's info cell
+     * @param int    $chunks Number of chunks to remove (basically, the number after '{splitted}|')
+     * @return null
+     */
+    protected function _cleanTheMess($id, $chunks)
+    {
+        for ($i = 0; $i < $chunks; $i++) {
+            $this->remove($this->_getChunkId($id, $i));
+        }
+
+        $this->remove($id);
+    }
+
     /**
      * Make and return a cache id
      *
@@ -65,17 +119,74 @@ protected function _tags($tags)
      * @param  mixed $data           Data to put in cache (can be another type than string if automatic_serialization is on)
      * @param  string $id             Cache id (if not set, the last cache id will be used)
      * @param  array $tags           Cache tags
-     * @param  int $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
-     * @param  int   $priority         integer between 0 (very low priority) and 10 (maximum priority) used by some particular backends
-     * @throws Zend_Cache_Exception
+     * @param bool|int $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @param  int $priority         integer between 0 (very low priority) and 10 (maximum priority) used by some particular backends
      * @return boolean True if no problem
      */
     public function save($data, $id = null, $tags = array(), $specificLifetime = false, $priority = 8)
     {
         $tags = $this->_tags($tags);
+
+        if ($this->getOption('slab_size') && is_string($data) && (strlen($data) > $this->getOption('slab_size'))) {
+            $dataChunks = str_split($data, $this->getOption('slab_size'));
+
+            for ($i = 0, $cnt = count($dataChunks); $i < $cnt; $i++) {
+                $chunkId = $this->_getChunkId($id, $i);
+
+                if (!parent::save($dataChunks[$i], $chunkId, $tags, $specificLifetime, $priority)) {
+                    $this->_cleanTheMess($id, $i + 1);
+                    return false;
+                }
+            }
+
+            $data = self::CODE_WORD . '|' . $i;
+        }
+
         return parent::save($data, $id, $tags, $specificLifetime, $priority);
     }
 
+    /**
+     * Load data from cached, glue from several chunks if it was splitted upon save.
+     *
+     * @param  string  $id                     Cache id
+     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
+     * @param  boolean $doNotUnserialize       Do not serialize (even if automatic_serialization is true) => for internal use
+     * @return mixed|false Cached datas
+     */
+    public function load($id, $doNotTestCacheValidity = false, $doNotUnserialize = false)
+    {
+        $data = parent::load($id, $doNotTestCacheValidity, $doNotUnserialize);
+
+        if (is_string($data) && (substr($data, 0, strlen(self::CODE_WORD)) == self::CODE_WORD)) {
+            // Seems we've got chunked data
+
+            $arr = explode('|', $data);
+            $chunks = isset($arr[1]) ? $arr[1] : false;
+            $chunkData = array();
+
+            if ($chunks && is_numeric($chunks)) {
+                for ($i = 0; $i < $chunks; $i++) {
+                    $chunk = parent::load($this->_getChunkId($id, $i), $doNotTestCacheValidity, $doNotUnserialize);
+
+                    if (false === $chunk) {
+                        // Some chunk in chain was not found, we can not glue-up the data:
+                        // clean the mess and return nothing
+
+                        $this->_cleanTheMess($id, $chunks);
+                        return false;
+                    }
+
+                    $chunkData[] = $chunk;
+                }
+
+                return implode('', $chunkData);
+            }
+        }
+
+        // Data has not been splitted to chunks on save
+        return $data;
+    }
+
     /**
      * Clean cache entries
      *
@@ -127,4 +238,4 @@ public function getIdsNotMatchingTags($tags = array())
         $tags = $this->_tags($tags);
         return parent::getIdsNotMatchingTags($tags);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert.php b/lib/Varien/Convert.php
index 61806366622..72edae94fca 100644
--- a/lib/Varien/Convert.php
+++ b/lib/Varien/Convert.php
@@ -48,4 +48,4 @@ static public function convert($class, $method, $data, array $vars=array())
         $action->run();
         return $action->getData();
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Action.php b/lib/Varien/Convert/Action.php
index bbb50c8ad61..2faee1acb30 100644
--- a/lib/Varien/Convert/Action.php
+++ b/lib/Varien/Convert/Action.php
@@ -35,4 +35,4 @@
 class Varien_Convert_Action extends Varien_Convert_Action_Abstract
 {
 
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Action/Abstract.php b/lib/Varien/Convert/Action/Abstract.php
index 5ac5d252b68..b42ab98d16a 100644
--- a/lib/Varien/Convert/Action/Abstract.php
+++ b/lib/Varien/Convert/Action/Abstract.php
@@ -175,7 +175,7 @@ public function getContainer($name=null)
     public function run()
     {
         if ($method = $this->getParam('method')) {
-            if (!is_callable(array($this->getContainer(), $method))) {
+            if (!method_exists($this->getContainer(), $method)) {
                 $this->addException('Unable to run action method: '.$method, Varien_Convert_Exception::FATAL);
             }
 
@@ -196,4 +196,4 @@ public function run()
         return $this;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Action/Interface.php b/lib/Varien/Convert/Action/Interface.php
index e45cf91f522..f8f59a3e2d3 100644
--- a/lib/Varien/Convert/Action/Interface.php
+++ b/lib/Varien/Convert/Action/Interface.php
@@ -40,4 +40,4 @@ interface Varien_Convert_Action_Interface
      * @return Varien_Convert_Action_Abstract
      */
 	public function run();
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Adapter/Abstract.php b/lib/Varien/Convert/Adapter/Abstract.php
index 98755e0301d..8937f89339a 100644
--- a/lib/Varien/Convert/Adapter/Abstract.php
+++ b/lib/Varien/Convert/Adapter/Abstract.php
@@ -62,4 +62,4 @@ public function setResource($resource)
         $this->_resource = $resource;
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Adapter/Db/Table.php b/lib/Varien/Convert/Adapter/Db/Table.php
index ae0ea4117d4..bbccb254420 100644
--- a/lib/Varien/Convert/Adapter/Db/Table.php
+++ b/lib/Varien/Convert/Adapter/Db/Table.php
@@ -51,4 +51,4 @@ public function save()
     {
 
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Adapter/Http.php b/lib/Varien/Convert/Adapter/Http.php
index a1901f6636f..24e6dcea229 100644
--- a/lib/Varien/Convert/Adapter/Http.php
+++ b/lib/Varien/Convert/Adapter/Http.php
@@ -95,4 +95,4 @@ public function loadFile()
          }
          return $this;
      } // end
- }
\ No newline at end of file
+ }
diff --git a/lib/Varien/Convert/Adapter/Http/Curl.php b/lib/Varien/Convert/Adapter/Http/Curl.php
index 9c5bc00f9fc..d2f2df84635 100644
--- a/lib/Varien/Convert/Adapter/Http/Curl.php
+++ b/lib/Varien/Convert/Adapter/Http/Curl.php
@@ -70,4 +70,4 @@ public function save()
         // no save implemented
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Adapter/Interface.php b/lib/Varien/Convert/Adapter/Interface.php
index 4a43d3f1392..23b9317cd3a 100644
--- a/lib/Varien/Convert/Adapter/Interface.php
+++ b/lib/Varien/Convert/Adapter/Interface.php
@@ -37,4 +37,4 @@ interface Varien_Convert_Adapter_Interface
 	public function load();
     
     public function save();
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Adapter/Io.php b/lib/Varien/Convert/Adapter/Io.php
index 9f4cdca214a..61667913ea1 100644
--- a/lib/Varien/Convert/Adapter/Io.php
+++ b/lib/Varien/Convert/Adapter/Io.php
@@ -78,4 +78,4 @@ public function save()
          }
          return $this;
      }
- }
\ No newline at end of file
+ }
diff --git a/lib/Varien/Convert/Adapter/Soap.php b/lib/Varien/Convert/Adapter/Soap.php
index c7b03db4759..bba7150d309 100644
--- a/lib/Varien/Convert/Adapter/Soap.php
+++ b/lib/Varien/Convert/Adapter/Soap.php
@@ -43,4 +43,4 @@ public function save()
      {
          return $this;
      }
- }
\ No newline at end of file
+ }
diff --git a/lib/Varien/Convert/Adapter/Std.php b/lib/Varien/Convert/Adapter/Std.php
index 37394512f89..d55521f05cf 100644
--- a/lib/Varien/Convert/Adapter/Std.php
+++ b/lib/Varien/Convert/Adapter/Std.php
@@ -50,4 +50,4 @@ public function save()
          echo $this->getData();
          return $this;
      }
- }
\ No newline at end of file
+ }
diff --git a/lib/Varien/Convert/Adapter/Zend/Cache.php b/lib/Varien/Convert/Adapter/Zend/Cache.php
index 39b92973524..a24753e2701 100644
--- a/lib/Varien/Convert/Adapter/Zend/Cache.php
+++ b/lib/Varien/Convert/Adapter/Zend/Cache.php
@@ -53,4 +53,4 @@ public function save()
         $this->getResource()->save($this->getData(), $this->getVar('id'));
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Adapter/Zend/Db.php b/lib/Varien/Convert/Adapter/Zend/Db.php
index 513db8f0c1d..7dbf103a1b5 100644
--- a/lib/Varien/Convert/Adapter/Zend/Db.php
+++ b/lib/Varien/Convert/Adapter/Zend/Db.php
@@ -51,4 +51,4 @@ public function save()
     {
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Container/Abstract.php b/lib/Varien/Convert/Container/Abstract.php
index 118ee9f9e30..6d6a975623d 100644
--- a/lib/Varien/Convert/Container/Abstract.php
+++ b/lib/Varien/Convert/Container/Abstract.php
@@ -163,4 +163,4 @@ public function setPosition($position)
         $this->_position = $position;
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Container/Collection.php b/lib/Varien/Convert/Container/Collection.php
index 056dbe9b06b..5a3682dd484 100644
--- a/lib/Varien/Convert/Container/Collection.php
+++ b/lib/Varien/Convert/Container/Collection.php
@@ -70,4 +70,4 @@ public function hasItem($name)
     {
         return isset($this->_items[$name]);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Container/Generic.php b/lib/Varien/Convert/Container/Generic.php
index d87b6e7319c..b36187d053a 100644
--- a/lib/Varien/Convert/Container/Generic.php
+++ b/lib/Varien/Convert/Container/Generic.php
@@ -35,4 +35,4 @@
 class Varien_Convert_Container_Generic extends Varien_Convert_Container_Abstract
 {
     
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Container/Interface.php b/lib/Varien/Convert/Container/Interface.php
index 2204811441f..d2f455e1d52 100644
--- a/lib/Varien/Convert/Container/Interface.php
+++ b/lib/Varien/Convert/Container/Interface.php
@@ -35,4 +35,4 @@
 interface Varien_Convert_Container_Interface
 {
 	
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Exception.php b/lib/Varien/Convert/Exception.php
index 4cac3d8d755..46a25bb0646 100644
--- a/lib/Varien/Convert/Exception.php
+++ b/lib/Varien/Convert/Exception.php
@@ -77,4 +77,4 @@ public function setPosition($position)
         $this->_position = $position;
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Mapper/Abstract.php b/lib/Varien/Convert/Mapper/Abstract.php
index 46a1639d675..9df72a7c871 100644
--- a/lib/Varien/Convert/Mapper/Abstract.php
+++ b/lib/Varien/Convert/Mapper/Abstract.php
@@ -35,4 +35,4 @@
 abstract class Varien_Convert_Mapper_Abstract extends Varien_Convert_Container_Abstract implements Varien_Convert_Mapper_Interface
 {
 	
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Mapper/Column.php b/lib/Varien/Convert/Mapper/Column.php
index e3a850ce391..7dd96359044 100644
--- a/lib/Varien/Convert/Mapper/Column.php
+++ b/lib/Varien/Convert/Mapper/Column.php
@@ -57,4 +57,4 @@ public function map()
         $this->setData($mappedData);
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Mapper/Interface.php b/lib/Varien/Convert/Mapper/Interface.php
index bef750495cb..9d4e5c9174b 100644
--- a/lib/Varien/Convert/Mapper/Interface.php
+++ b/lib/Varien/Convert/Mapper/Interface.php
@@ -35,4 +35,4 @@
 interface Varien_Convert_Mapper_Interface
 {
 	public function map();
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Parser/Abstract.php b/lib/Varien/Convert/Parser/Abstract.php
index bbeeaa8d6fb..0f7289ecd41 100644
--- a/lib/Varien/Convert/Parser/Abstract.php
+++ b/lib/Varien/Convert/Parser/Abstract.php
@@ -35,4 +35,4 @@
 abstract class Varien_Convert_Parser_Abstract extends Varien_Convert_Container_Abstract implements Varien_Convert_Parser_Interface
 {
 	
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Parser/Csv.php b/lib/Varien/Convert/Parser/Csv.php
index d99dac2624d..5e712260214 100644
--- a/lib/Varien/Convert/Parser/Csv.php
+++ b/lib/Varien/Convert/Parser/Csv.php
@@ -167,4 +167,4 @@ public function unparse()
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Parser/Interface.php b/lib/Varien/Convert/Parser/Interface.php
index 667a26b2d3c..fa952eb64e9 100644
--- a/lib/Varien/Convert/Parser/Interface.php
+++ b/lib/Varien/Convert/Parser/Interface.php
@@ -37,4 +37,4 @@ interface Varien_Convert_Parser_Interface
 	public function parse();
     
     public function unparse();
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Parser/Serialize.php b/lib/Varien/Convert/Parser/Serialize.php
index 12f7c3ad18b..1f17c5a8aaf 100644
--- a/lib/Varien/Convert/Parser/Serialize.php
+++ b/lib/Varien/Convert/Parser/Serialize.php
@@ -45,4 +45,4 @@ public function unparse()
         $this->setData(serialize($this->getData()));
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Parser/Xml/Excel.php b/lib/Varien/Convert/Parser/Xml/Excel.php
index fe4d4d652a9..acd8d737565 100644
--- a/lib/Varien/Convert/Parser/Xml/Excel.php
+++ b/lib/Varien/Convert/Parser/Xml/Excel.php
@@ -133,7 +133,8 @@ public function unparse()
                     $xml .= '<ss:Row>';
                     foreach ($fields as $fieldName) {
                         $data = isset($row[$fieldName]) ? $row[$fieldName] : '';
-                        $xml .= '<ss:Cell><Data ss:Type="String">'.$data.'</Data></ss:Cell>';
+                        $fieldType = is_numeric($data) ? 'Number' : 'String';
+                        $xml .= '<ss:Cell><Data ss:Type="' . $fieldType . '">' . $data . '</Data></ss:Cell>';
                     }
                     $xml .= '</ss:Row>';
                 }
diff --git a/lib/Varien/Convert/Profile.php b/lib/Varien/Convert/Profile.php
index 468a878a997..60f7c623e8c 100644
--- a/lib/Varien/Convert/Profile.php
+++ b/lib/Varien/Convert/Profile.php
@@ -35,4 +35,4 @@
 class Varien_Convert_Profile extends Varien_Convert_Profile_Abstract
 {
     
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Profile/Abstract.php b/lib/Varien/Convert/Profile/Abstract.php
index b6821c5b48e..7d0311af805 100644
--- a/lib/Varien/Convert/Profile/Abstract.php
+++ b/lib/Varien/Convert/Profile/Abstract.php
@@ -117,4 +117,4 @@ public function run()
         }
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Profile/Collection.php b/lib/Varien/Convert/Profile/Collection.php
index 32e0ce8aba2..371b60ef6b9 100644
--- a/lib/Varien/Convert/Profile/Collection.php
+++ b/lib/Varien/Convert/Profile/Collection.php
@@ -157,4 +157,4 @@ public function importProfileXml($name)
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Validator/Abstract.php b/lib/Varien/Convert/Validator/Abstract.php
index f559f6d37fd..3d11e502948 100644
--- a/lib/Varien/Convert/Validator/Abstract.php
+++ b/lib/Varien/Convert/Validator/Abstract.php
@@ -35,4 +35,4 @@
 abstract class Varien_Convert_Validator_Abstract extends Varien_Convert_Container_Abstract implements Varien_Convert_Validator_Interface
 {
 	
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Validator/Column.php b/lib/Varien/Convert/Validator/Column.php
index 0c09f9fda08..af6e4b6c626 100644
--- a/lib/Varien/Convert/Validator/Column.php
+++ b/lib/Varien/Convert/Validator/Column.php
@@ -35,4 +35,4 @@
 class Varien_Convert_Validator_Column extends Varien_Convert_Validator_Abstract
 {
 	
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Validator/Dryrun.php b/lib/Varien/Convert/Validator/Dryrun.php
index c4715e8f57f..504f156a9b5 100644
--- a/lib/Varien/Convert/Validator/Dryrun.php
+++ b/lib/Varien/Convert/Validator/Dryrun.php
@@ -43,4 +43,4 @@ public function validate()
 	    }
 	    return $this;
 	}
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Convert/Validator/Interface.php b/lib/Varien/Convert/Validator/Interface.php
index ba5b5d09f41..d404b84a754 100644
--- a/lib/Varien/Convert/Validator/Interface.php
+++ b/lib/Varien/Convert/Validator/Interface.php
@@ -35,4 +35,4 @@
 interface Varien_Convert_Validator_Interface
 {
 	public function validate();
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Crypt.php b/lib/Varien/Crypt.php
index 04597755ef9..bae3f58214a 100644
--- a/lib/Varien/Crypt.php
+++ b/lib/Varien/Crypt.php
@@ -46,4 +46,4 @@ static public function factory($method='mcrypt')
         $className = 'Varien_Crypt_'.$uc;
         return new $className;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Crypt/Abstract.php b/lib/Varien/Crypt/Abstract.php
index 9f04b7d7bf3..1d72bf8c0e9 100644
--- a/lib/Varien/Crypt/Abstract.php
+++ b/lib/Varien/Crypt/Abstract.php
@@ -35,4 +35,4 @@
 abstract class Varien_Crypt_Abstract extends Varien_Object
 {
 
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Data/Form/Element/Button.php b/lib/Varien/Data/Form/Element/Button.php
index 2250c0fc183..5585143a65c 100644
--- a/lib/Varien/Data/Form/Element/Button.php
+++ b/lib/Varien/Data/Form/Element/Button.php
@@ -39,4 +39,4 @@ public function __construct($attributes=array())
         $this->setType('button');
         $this->setExtType('textfield');
     }
-}                           
\ No newline at end of file
+}                           
diff --git a/lib/Varien/Data/Form/Element/Checkbox.php b/lib/Varien/Data/Form/Element/Checkbox.php
index 737331c764a..6e9eb954044 100644
--- a/lib/Varien/Data/Form/Element/Checkbox.php
+++ b/lib/Varien/Data/Form/Element/Checkbox.php
@@ -76,4 +76,4 @@ public function setIsChecked($value=false)
     public function getIsChecked() {
         return $this->getData('checked');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Data/Form/Element/Checkboxes.php b/lib/Varien/Data/Form/Element/Checkboxes.php
index 8b27fbae75d..6db6ecedd69 100644
--- a/lib/Varien/Data/Form/Element/Checkboxes.php
+++ b/lib/Varien/Data/Form/Element/Checkboxes.php
@@ -199,4 +199,4 @@ protected function _optionToHtml($option)
             . "\n";
         return $html;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Data/Form/Element/Column.php b/lib/Varien/Data/Form/Element/Column.php
index 65ec1419690..8dd8e15459c 100644
--- a/lib/Varien/Data/Form/Element/Column.php
+++ b/lib/Varien/Data/Form/Element/Column.php
@@ -38,4 +38,4 @@ public function __construct($attributes = array())
         parent::__construct($attributes);
         $this->setType('column');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Data/Form/Element/Editor.php b/lib/Varien/Data/Form/Element/Editor.php
index 34b6bf78555..097c57a2b78 100644
--- a/lib/Varien/Data/Form/Element/Editor.php
+++ b/lib/Varien/Data/Form/Element/Editor.php
@@ -364,7 +364,7 @@ public function getConfig($key = null)
     public function translate($string)
     {
         $translator = $this->getConfig('translator');
-        if (is_object($translator) && is_callable(array($translator, '__'))) {
+        if (method_exists($translator, '__')) {
             $result = $translator->__($string);
             if (is_string($result)) {
                 return $result;
diff --git a/lib/Varien/Data/Form/Element/File.php b/lib/Varien/Data/Form/Element/File.php
index b079a6e202d..6c693c8318c 100644
--- a/lib/Varien/Data/Form/Element/File.php
+++ b/lib/Varien/Data/Form/Element/File.php
@@ -39,4 +39,4 @@ public function __construct($attributes=array())
         $this->setType('file');
         $this->setExtType('file');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Data/Form/Element/Hidden.php b/lib/Varien/Data/Form/Element/Hidden.php
index 31591feba8a..6da3a2597d2 100644
--- a/lib/Varien/Data/Form/Element/Hidden.php
+++ b/lib/Varien/Data/Form/Element/Hidden.php
@@ -48,4 +48,4 @@ public function getDefaultHtml()
         }
         return $html;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Data/Form/Element/Imagefile.php b/lib/Varien/Data/Form/Element/Imagefile.php
index 57dd06e0844..17e6f30e0be 100644
--- a/lib/Varien/Data/Form/Element/Imagefile.php
+++ b/lib/Varien/Data/Form/Element/Imagefile.php
@@ -42,4 +42,4 @@ public function __construct($attributes=array())
         $this->setData('autoSubmit', false);
         //$this->setExtType('file');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Data/Form/Element/Note.php b/lib/Varien/Data/Form/Element/Note.php
index 6386dcb4f21..5a1b9dfc303 100644
--- a/lib/Varien/Data/Form/Element/Note.php
+++ b/lib/Varien/Data/Form/Element/Note.php
@@ -46,4 +46,4 @@ public function getElementHtml()
         $html.= $this->getAfterElementHtml();
         return $html;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Data/Form/Element/Password.php b/lib/Varien/Data/Form/Element/Password.php
index aa2527e13e5..13196c12add 100644
--- a/lib/Varien/Data/Form/Element/Password.php
+++ b/lib/Varien/Data/Form/Element/Password.php
@@ -45,4 +45,4 @@ public function getHtml()
         $this->addClass('input-text');
         return parent::getHtml();
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Data/Form/Element/Radio.php b/lib/Varien/Data/Form/Element/Radio.php
index 5edcf6aa0a3..b4749b7053c 100644
--- a/lib/Varien/Data/Form/Element/Radio.php
+++ b/lib/Varien/Data/Form/Element/Radio.php
@@ -39,4 +39,4 @@ public function __construct($attributes=array())
         $this->setType('radio');
         $this->setExtType('radio');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Data/Form/Element/Reset.php b/lib/Varien/Data/Form/Element/Reset.php
index 0b850bb8b2f..e24f8c0a5a8 100644
--- a/lib/Varien/Data/Form/Element/Reset.php
+++ b/lib/Varien/Data/Form/Element/Reset.php
@@ -39,4 +39,4 @@ public function __construct($attributes=array())
         $this->setType('text');
         $this->setExtType('textfield');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Data/Form/Element/Select.php b/lib/Varien/Data/Form/Element/Select.php
index 75f182237a6..f6488c136fa 100644
--- a/lib/Varien/Data/Form/Element/Select.php
+++ b/lib/Varien/Data/Form/Element/Select.php
@@ -120,4 +120,4 @@ public function getHtmlAttributes()
     {
         return array('title', 'class', 'style', 'onclick', 'onchange', 'disabled', 'readonly', 'tabindex');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Data/Form/Element/Textarea.php b/lib/Varien/Data/Form/Element/Textarea.php
index 5f376d89717..f75e48a0b1c 100644
--- a/lib/Varien/Data/Form/Element/Textarea.php
+++ b/lib/Varien/Data/Form/Element/Textarea.php
@@ -56,4 +56,4 @@ public function getElementHtml()
         $html .= $this->getAfterElementHtml();
         return $html;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Data/Form/Element/Time.php b/lib/Varien/Data/Form/Element/Time.php
index 7bcd9b8973f..a9283170951 100644
--- a/lib/Varien/Data/Form/Element/Time.php
+++ b/lib/Varien/Data/Form/Element/Time.php
@@ -89,4 +89,4 @@ public function getElementHtml()
         $html.= $this->getAfterElementHtml();
         return $html;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Data/Tree/Db.php b/lib/Varien/Data/Tree/Db.php
index 8c118c7c4e1..20723af4b59 100644
--- a/lib/Varien/Data/Tree/Db.php
+++ b/lib/Varien/Data/Tree/Db.php
@@ -302,4 +302,4 @@ public function removeNode($node)
         parent::removeNode($node);
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Data/Tree/Node.php b/lib/Varien/Data/Tree/Node.php
index 4ee216dd222..ee0e1e98005 100644
--- a/lib/Varien/Data/Tree/Node.php
+++ b/lib/Varien/Data/Tree/Node.php
@@ -272,4 +272,4 @@ public function getName()
         return $this->_getData('name');
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Db/Adapter/Interface.php b/lib/Varien/Db/Adapter/Interface.php
index ca9706c999a..93b8bb39832 100644
--- a/lib/Varien/Db/Adapter/Interface.php
+++ b/lib/Varien/Db/Adapter/Interface.php
@@ -102,6 +102,15 @@ public function newTable($tableName = null, $schemaName = null);
      */
     public function createTable(Varien_Db_Ddl_Table $table);
 
+    /**
+     * Create temporary table from DDL object
+     *
+     * @param Varien_Db_Ddl_Table $table
+     * @throws Zend_Db_Exception
+     * @return Zend_Db_Statement_Interface
+     */
+    public function createTemporaryTable(Varien_Db_Ddl_Table $table);
+
     /**
      * Drop table from database
      *
@@ -111,6 +120,15 @@ public function createTable(Varien_Db_Ddl_Table $table);
      */
     public function dropTable($tableName, $schemaName = null);
 
+    /**
+     * Drop temporary table from database
+     *
+     * @param string $tableName
+     * @param string $schemaName
+     * @return boolean
+     */
+    public function dropTemporaryTable($tableName, $schemaName = null);
+
     /**
      * Truncate a table
      *
@@ -199,6 +217,16 @@ public function modifyColumnByDdl($tableName, $columnName, $definition, $flushDa
      */
     public function renameTable($oldTableName, $newTableName, $schemaName = null);
 
+    /**
+     * Rename several tables
+     *
+     * @param array $tablePairs array('oldName' => 'Name1', 'newName' => 'Name2')
+     *
+     * @return boolean
+     * @throws Zend_Db_Exception
+     */
+    public function renameTablesBatch(array $tablePairs);
+
     /**
      * Adds new column to the table.
      *
@@ -727,6 +755,18 @@ public function prepareColumnValue(array $column, $value);
      */
     public function getCheckSql($condition, $true, $false);
 
+    /**
+     * Generate fragment of SQL, that check value against multiple condition cases
+     * and return different result depends on them
+     *
+     * @param string $valueName Name of value to check
+     * @param array $casesResults Cases and results
+     * @param string $defaultValue value to use if value doesn't confirm to any cases
+     *
+     * @return Zend_Db_Expr
+     */
+    public function getCaseSql($valueName, $casesResults, $defaultValue = null);
+
     /**
      * Returns valid IFNULL expression
      *
@@ -747,6 +787,12 @@ public function getIfNullSql($expression, $value = 0);
      */
     public function getConcatSql(array $data, $separator = null);
 
+    /**
+     * Returns the configuration variables in this adapter.
+     * @return array
+     */
+    public function getConfig();
+
     /**
      * Generate fragment of SQL that returns length of character string
      * The string argument must be quoted
@@ -911,11 +957,21 @@ public function enableTableKeys($tableName, $schemaName = null);
      * @param Varien_Db_Select $select
      * @param string $table     insert into table
      * @param array $fields
-     * @param int $mode
+     * @param bool|int $mode
      * @return string
      */
     public function insertFromSelect(Varien_Db_Select $select, $table, array $fields = array(), $mode = false);
 
+    /**
+     * Get insert queries in array for insert by range with step parameter
+     *
+     * @param string $rangeField
+     * @param Varien_Db_Select $select
+     * @param int $stepCount
+     * @return array
+     */
+    public function selectsByRange($rangeField, Varien_Db_Select $select, $stepCount = 100);
+
     /**
      * Get update table query using select object for join and update
      *
@@ -998,10 +1054,44 @@ public function decodeVarbinary($value);
      */
     public function getSuggestedZeroDate();
 
+    /**
+     * Drop trigger
+     *
+     * @param string $triggerName
+     * @return Varien_Db_Adapter_Interface
+     */
+    public function dropTrigger($triggerName);
+
     /**
      * Get adapter transaction level state. Return 0 if all transactions are complete
      *
      * @return int
      */
     public function getTransactionLevel();
+
+    /**
+     * Convert date format to unix time
+     *
+     * @param string|Zend_Db_Expr $date
+     * @return mixed
+     */
+    public function getUnixTimestamp($date);
+
+    /**
+     * Convert unix time to date format
+     *
+     * @param int|Zend_Db_Expr $timestamp
+     * @return mixed
+     */
+    public function fromUnixtime($timestamp);
+
+    /**
+     * Create new table from provided select statement
+     *
+     * @param string $tableName
+     * @param Zend_Db_Select $select
+     * @param bool $temporary
+     * @return mixed
+     */
+    public function createTableFromSelect($tableName, Zend_Db_Select $select, $temporary = false);
 }
diff --git a/lib/Varien/Db/Adapter/Pdo/Mysql.php b/lib/Varien/Db/Adapter/Pdo/Mysql.php
index d5e9db67a7e..67ba3c25f9b 100644
--- a/lib/Varien/Db/Adapter/Pdo/Mysql.php
+++ b/lib/Varien/Db/Adapter/Pdo/Mysql.php
@@ -186,6 +186,13 @@ class Varien_Db_Adapter_Pdo_Mysql extends Zend_Db_Adapter_Pdo_Mysql implements V
      */
     protected $_ddlRoutines = array('alt', 'cre', 'ren', 'dro', 'tru');
 
+    /**
+     * DDL statements for temporary tables
+     *
+     * @var string
+     */
+    protected $_tempRoutines =  '#^\w+\s+temporary\s#im';
+
     /**
      * Allowed interval units array
      *
@@ -395,7 +402,9 @@ protected function _checkDdlTransaction($sql)
     {
         if (is_string($sql) && $this->getTransactionLevel() > 0) {
             $startSql = strtolower(substr(ltrim($sql), 0, 3));
-            if (in_array($startSql, $this->_ddlRoutines)) {
+            if (in_array($startSql, $this->_ddlRoutines)
+                && (preg_match($this->_tempRoutines, $sql) !== 1)
+            ) {
                 trigger_error(Varien_Db_Adapter_Interface::ERROR_DDL_MESSAGE, E_USER_ERROR);
             }
         }
@@ -407,7 +416,7 @@ protected function _checkDdlTransaction($sql)
      *
      * @param string|Zend_Db_Select $sql The SQL statement with placeholders.
      * @param mixed $bind An array of data or data itself to bind to the placeholders.
-     * @return Zend_Db_Pdo_Statement
+     * @return Zend_Db_Statement_Pdo
      * @throws Zend_Db_Adapter_Exception To re-throw PDOException.
      */
     public function query($sql, $bind = array())
@@ -896,7 +905,7 @@ public function changeColumn($tableName, $oldColumnName, $newColumnName, $defini
     {
         if (!$this->tableColumnExists($tableName, $oldColumnName, $schemaName)) {
             throw new Zend_Db_Exception(sprintf(
-                'Column "%s" does not exists on table "%s"',
+                'Column "%s" does not exist in table "%s".',
                 $oldColumnName,
                 $tableName
             ));
@@ -936,7 +945,7 @@ public function changeColumn($tableName, $oldColumnName, $newColumnName, $defini
     public function modifyColumn($tableName, $columnName, $definition, $flushData = false, $schemaName = null)
     {
         if (!$this->tableColumnExists($tableName, $columnName, $schemaName)) {
-            throw new Zend_Db_Exception(sprintf('Column "%s" does not exists on table "%s"', $columnName, $tableName));
+            throw new Zend_Db_Exception(sprintf('Column "%s" does not exist in table "%s".', $columnName, $tableName));
         }
         if (is_array($definition)) {
             $definition = $this->_getColumnDefinition($definition);
@@ -2039,6 +2048,29 @@ public function createTable(Varien_Db_Ddl_Table $table)
         return $this->query($sql);
     }
 
+    /**
+     * Create temporary table
+     *
+     * @param Varien_Db_Ddl_Table $table
+     * @throws Zend_Db_Exception
+     * @return Zend_Db_Pdo_Statement
+     */
+    public function createTemporaryTable(Varien_Db_Ddl_Table $table)
+    {
+        $sqlFragment    = array_merge(
+            $this->_getColumnsDefinition($table),
+            $this->_getIndexesDefinition($table),
+            $this->_getForeignKeysDefinition($table)
+        );
+        $tableOptions   = $this->_getOptionsDefinition($table);
+        $sql = sprintf("CREATE TEMPORARY TABLE %s (\n%s\n) %s",
+            $this->quoteIdentifier($table->getName()),
+            implode(",\n", $sqlFragment),
+            implode(" ", $tableOptions));
+
+        return $this->query($sql);
+    }
+
     /**
      * Retrieve columns and primary keys definition array for create table
      *
@@ -2312,8 +2344,10 @@ protected function _getColumnDefinition($options, $ddlType = null)
                 $cDefault = new Zend_Db_Expr('0 ON UPDATE CURRENT_TIMESTAMP');
             } else if ($cDefault == Varien_Db_Ddl_Table::TIMESTAMP_INIT_UPDATE) {
                 $cDefault = new Zend_Db_Expr('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP');
+            } else if ($cNullable && !$cDefault) {
+                $cDefault = new Zend_Db_Expr('NULL');
             } else {
-                $cDefault = false;
+                $cDefault = new Zend_Db_Expr('0');
             }
         } else if (is_null($cDefault) && $cNullable) {
             $cDefault = new Zend_Db_Expr('NULL');
@@ -2351,6 +2385,22 @@ public function dropTable($tableName, $schemaName = null)
         return true;
     }
 
+    /**
+     * Drop temporary table from database
+     *
+     * @param string $tableName
+     * @param string $schemaName
+     * @return boolean
+     */
+    public function dropTemporaryTable($tableName, $schemaName = null)
+    {
+        $table = $this->quoteIdentifier($this->_getTableName($tableName, $schemaName));
+        $query = 'DROP TEMPORARY TABLE IF EXISTS ' . $table;
+        $this->query($query);
+
+        return $this;
+    }
+
     /**
      * Truncate a table
      *
@@ -2413,6 +2463,42 @@ public function renameTable($oldTableName, $newTableName, $schemaName = null)
         return true;
     }
 
+    /**
+     * Rename several tables
+     *
+     * @param array $tablePairs array('oldName' => 'Name1', 'newName' => 'Name2')
+     *
+     * @return boolean
+     * @throws Zend_Db_Exception
+     */
+    public function renameTablesBatch(array $tablePairs)
+    {
+        if (count($tablePairs) == 0) {
+            throw new Zend_Db_Exception('Please provide tables for rename');
+        }
+
+        $renamesList = array();
+        $tablesList  = array();
+        foreach ($tablePairs as $pair) {
+            $oldTableName  = $pair['oldName'];
+            $newTableName  = $pair['newName'];
+            $renamesList[] = sprintf('%s TO %s', $oldTableName, $newTableName);
+
+            $tablesList[$oldTableName] = $oldTableName;
+            $tablesList[$newTableName] = $newTableName;
+        }
+
+        $query = sprintf('RENAME TABLE %s', implode(',', $renamesList));
+        $this->query($query);
+
+        foreach ($tablesList as $table) {
+            $this->resetDdlCache($table);
+        }
+
+        return true;
+    }
+
+
     /**
      * Add new index to table name
      *
@@ -2870,7 +2956,9 @@ public function getIfNullSql($expression, $value = 0)
      *
      * @param string $valueName Name of value to check
      * @param array $casesResults Cases and results
-     * @param string $defaultValue value to use if value doesn't confirm to any cases
+     * @param string $defaultValue value to use if value doesn't conform to any cases
+     *
+     * @return Zend_Db_Expr
      */
     public function getCaseSql($valueName, $casesResults, $defaultValue = null)
     {
@@ -3231,7 +3319,7 @@ public function enableTableKeys($tableName, $schemaName = null)
      * @param Varien_Db_Select $select
      * @param string $table     insert into table
      * @param array $fields
-     * @param int $mode
+     * @param bool|int $mode
      * @return string
      */
     public function insertFromSelect(Varien_Db_Select $select, $table, array $fields = array(), $mode = false)
@@ -3257,11 +3345,28 @@ public function insertFromSelect(Varien_Db_Select $select, $table, array $fields
                     }
                 }
             }
+
             $update = array();
-            foreach ($fields as $field) {
-                $update[] = sprintf('%1$s = VALUES(%1$s)', $this->quoteIdentifier($field));
-            }
+            foreach ($fields as $k => $v) {
+                $field = $value = null;
+                if (!is_numeric($k)) {
+                    $field = $this->quoteIdentifier($k);
+                    if ($v instanceof Zend_Db_Expr) {
+                        $value = $v->__toString();
+                    } elseif (is_string($v)) {
+                        $value = sprintf('VALUES(%s)', $this->quoteIdentifier($v));
+                    } elseif (is_numeric($v)) {
+                        $value = $this->quoteInto('?', $v);
+                    }
+                } elseif (is_string($v)) {
+                    $value = sprintf('VALUES(%s)', $this->quoteIdentifier($v));
+                    $field = $this->quoteIdentifier($v);
+                }
 
+                if ($field && $value) {
+                    $update[] = sprintf('%s = %s', $field, $value);
+                }
+            }
             if ($update) {
                 $query = sprintf('%s ON DUPLICATE KEY UPDATE %s', $query, join(', ', $update));
             }
@@ -3270,11 +3375,92 @@ public function insertFromSelect(Varien_Db_Select $select, $table, array $fields
         return $query;
     }
 
+    /**
+     * Get insert queries in array for insert by range with step parameter
+     *
+     * @param string $rangeField
+     * @param Varien_Db_Select $select
+     * @param int $stepCount
+     * @return array
+     * @throws Varien_Db_Exception
+     */
+    public function selectsByRange($rangeField, Varien_Db_Select $select, $stepCount = 100)
+    {
+        $queries = array();
+        $fromSelect = $select->getPart(Varien_Db_Select::FROM);
+        if (empty($fromSelect)) {
+            throw new Varien_Db_Exception('Select must have correct FROM part');
+        }
+
+        $tableName = array();
+        $correlationName = '';
+        foreach ($fromSelect as $correlationName => $formPart) {
+            if ($formPart['joinType'] == Varien_Db_Select::FROM) {
+                $tableName = $formPart['tableName'];
+                break;
+            }
+        }
+
+        $selectRange = $this->select()
+            ->from(
+                $tableName,
+                array(
+                    new Zend_Db_Expr('MIN(' . $this->quoteIdentifier($rangeField) . ') AS min'),
+                    new Zend_Db_Expr('MAX(' . $this->quoteIdentifier($rangeField) . ') AS max'),
+                )
+            );
+
+        $rangeResult = $this->fetchRow($selectRange);
+        $min = $rangeResult['min'];
+        $max = $rangeResult['max'];
+
+        while ($min <= $max) {
+            $partialSelect = clone $select;
+            $partialSelect->where(
+                $this->quoteIdentifier($correlationName) . '.'
+                    . $this->quoteIdentifier($rangeField) . ' >= ?', $min
+            )
+            ->where(
+                $this->quoteIdentifier($correlationName) . '.'
+                    . $this->quoteIdentifier($rangeField) . ' < ?', $min+$stepCount
+            );
+            $queries[] = $partialSelect;
+            $min += $stepCount;
+        }
+        return $queries;
+    }
+
+    /**
+     * Convert date format to unix time
+     *
+     * @param string|Zend_Db_Expr $date
+     * @throws Varien_Db_Exception
+     * @return Zend_Db_Expr
+     */
+    public function getUnixTimestamp($date)
+    {
+        $expr = sprintf('UNIX_TIMESTAMP(%s)', $date);
+        return new Zend_Db_Expr($expr);
+    }
+
+    /**
+     * Convert unix time to date format
+     *
+     * @param int|Zend_Db_Expr $timestamp
+     * @return mixed
+     */
+    public function fromUnixtime($timestamp)
+    {
+        $expr = sprintf('FROM_UNIXTIME(%s)', $timestamp);
+        return new Zend_Db_Expr($expr);
+    }
+
     /**
      * Get update table query using select object for join and update
      *
      * @param Varien_Db_Select $select
      * @param string|array $table
+     * @throws Varien_Db_Exception
      * @return string
      */
     public function updateFromSelect(Varien_Db_Select $select, $table)
@@ -3636,6 +3822,40 @@ protected function _getForeignKeyName($fkName)
         return $fkName;
     }
 
+    /**
+     * Drop trigger
+     *
+     * @param string $triggerName
+     * @return Varien_Db_Adapter_Interface
+     */
+    public function dropTrigger($triggerName)
+    {
+        $query = sprintf(
+            'DROP TRIGGER IF EXISTS %s',
+            $this->_getTableName($triggerName)
+        );
+        $this->query($query);
+        return $this;
+    }
+
+    /**
+     * Create new table from provided select statement
+     *
+     * @param string $tableName
+     * @param Zend_Db_Select $select
+     * @param bool $temporary
+     * @return mixed
+     */
+    public function createTableFromSelect($tableName, Zend_Db_Select $select, $temporary = false)
+    {
+        $query = sprintf(
+            'CREATE' . ($temporary ? ' TEMPORARY' : '') . ' TABLE `%s` AS (%s)',
+            $this->_getTableName($tableName),
+            (string)$select
+        );
+        $this->query($query);
+    }
+
     /**
      * Check if all transactions have been committed
      */
diff --git a/lib/Varien/Db/Ddl/Table.php b/lib/Varien/Db/Ddl/Table.php
index 845f3e33a6b..9187c846809 100644
--- a/lib/Varien/Db/Ddl/Table.php
+++ b/lib/Varien/Db/Ddl/Table.php
@@ -219,6 +219,7 @@ public function setSchema($name)
      * Set comment for table
      *
      * @param string $comment
+     * @return Varien_Db_Ddl_Table
      */
     public function setComment($comment)
     {
diff --git a/lib/Varien/Db/Tree/Node.php b/lib/Varien/Db/Tree/Node.php
index 736be766798..a85c64d281d 100644
--- a/lib/Varien/Db/Tree/Node.php
+++ b/lib/Varien/Db/Tree/Node.php
@@ -105,4 +105,4 @@ function isParent() {
             return false;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Db/Tree/Node/Exception.php b/lib/Varien/Db/Tree/Node/Exception.php
index 95a44405a80..dc6b3d4a60d 100644
--- a/lib/Varien/Db/Tree/Node/Exception.php
+++ b/lib/Varien/Db/Tree/Node/Exception.php
@@ -26,4 +26,4 @@
 
 
 class Varien_Db_Tree_Node_Exception extends Varien_Db_Tree_Exception
-{}
\ No newline at end of file
+{}
diff --git a/lib/Varien/Db/Tree/NodeSet.php b/lib/Varien/Db/Tree/NodeSet.php
index e93fc2847a8..ba2cee97972 100644
--- a/lib/Varien/Db/Tree/NodeSet.php
+++ b/lib/Varien/Db/Tree/NodeSet.php
@@ -80,4 +80,4 @@ function current() {
     function rewind() {
         $this->_current = 0;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Db/Tree/NodeSet/Exception.php b/lib/Varien/Db/Tree/NodeSet/Exception.php
index ff8dc040431..a1241325ba1 100644
--- a/lib/Varien/Db/Tree/NodeSet/Exception.php
+++ b/lib/Varien/Db/Tree/NodeSet/Exception.php
@@ -26,4 +26,4 @@
 
 
 class Varien_Db_Tree_NodeSet_Exception extends Varien_Db_Tree_Exception
-{}
\ No newline at end of file
+{}
diff --git a/lib/Varien/Directory/Collection.php b/lib/Varien/Directory/Collection.php
index ece73641523..9b907a484ad 100644
--- a/lib/Varien/Directory/Collection.php
+++ b/lib/Varien/Directory/Collection.php
@@ -458,4 +458,4 @@ public function addFilter($field, $value)
 
 
 
-?>
\ No newline at end of file
+?>
diff --git a/lib/Varien/Directory/Factory.php b/lib/Varien/Directory/Factory.php
index 904a78bcbcd..993afa10aba 100644
--- a/lib/Varien/Directory/Factory.php
+++ b/lib/Varien/Directory/Factory.php
@@ -55,4 +55,4 @@ static public function getFactory($path,$is_recursion = true,$recurse_level=0)
     }
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/Varien/Event.php b/lib/Varien/Event.php
index 0070c2fb09a..8762f6d173d 100644
--- a/lib/Varien/Event.php
+++ b/lib/Varien/Event.php
@@ -119,4 +119,4 @@ public function getBlock()
     {
         return $this->_getData('block');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Event/Collection.php b/lib/Varien/Event/Collection.php
index ed6a6306039..e0a903e6c9c 100644
--- a/lib/Varien/Event/Collection.php
+++ b/lib/Varien/Event/Collection.php
@@ -144,4 +144,4 @@ public function dispatch($eventName, array $data=array())
         $this->getGlobalObservers()->dispatch($event);
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Event/Observer.php b/lib/Varien/Event/Observer.php
index 0c907f9284a..110059e8c36 100644
--- a/lib/Varien/Event/Observer.php
+++ b/lib/Varien/Event/Observer.php
@@ -112,4 +112,4 @@ public function setEvent($data)
     {
         return $this->setData('event', $data);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Event/Observer/Collection.php b/lib/Varien/Event/Observer/Collection.php
index 8c535198d45..89d70cd1f31 100644
--- a/lib/Varien/Event/Observer/Collection.php
+++ b/lib/Varien/Event/Observer/Collection.php
@@ -108,4 +108,4 @@ public function dispatch(Varien_Event $event)
         }
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Event/Observer/Cron.php b/lib/Varien/Event/Observer/Cron.php
index f29cd9c09de..654d5342247 100644
--- a/lib/Varien/Event/Observer/Cron.php
+++ b/lib/Varien/Event/Observer/Cron.php
@@ -155,4 +155,4 @@ public function getNumeric($value)
                 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Event/Observer/Regex.php b/lib/Varien/Event/Observer/Regex.php
index 85f4293e190..8e5eb30170b 100644
--- a/lib/Varien/Event/Observer/Regex.php
+++ b/lib/Varien/Event/Observer/Regex.php
@@ -44,4 +44,4 @@ public function isValidFor(Varien_Event $event)
     {
         return preg_match($this->getEventRegex(), $event->getName());
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/File/CsvMulty.php b/lib/Varien/File/CsvMulty.php
index c9b2128b427..e20bf09ebc8 100644
--- a/lib/Varien/File/CsvMulty.php
+++ b/lib/Varien/File/CsvMulty.php
@@ -72,4 +72,4 @@ public function getDataPairs($file, $keyIndex=0, $valueIndex=1)
     }
 	
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/Varien/File/Uploader.php b/lib/Varien/File/Uploader.php
index 8a49e161bb1..59cdf5e8fd5 100644
--- a/lib/Varien/File/Uploader.php
+++ b/lib/Varien/File/Uploader.php
@@ -464,7 +464,7 @@ private function _getMimeType()
     private function _setUploadFileId($fileId)
     {
         if (empty($_FILES)) {
-            throw new Exception('$_FILES array is empty');
+            throw new Exception('$_FILES array is empty', self::TMP_NAME_EMPTY);
         }
 
         if (is_array($fileId)) {
diff --git a/lib/Varien/Filter/Array/Grid.php b/lib/Varien/Filter/Array/Grid.php
index 801846b4098..90352d60abb 100644
--- a/lib/Varien/Filter/Array/Grid.php
+++ b/lib/Varien/Filter/Array/Grid.php
@@ -35,4 +35,4 @@ function filter($grid)
         }
         return $out;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Filter/Email.php b/lib/Varien/Filter/Email.php
index fc5fa1cc2cc..6d4a19182a8 100644
--- a/lib/Varien/Filter/Email.php
+++ b/lib/Varien/Filter/Email.php
@@ -31,4 +31,4 @@ public function filter($value)
     {
         $atIndex = 0;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Filter/Money.php b/lib/Varien/Filter/Money.php
index 842998424c2..d1435e16c13 100644
--- a/lib/Varien/Filter/Money.php
+++ b/lib/Varien/Filter/Money.php
@@ -38,4 +38,4 @@ public function filter($value)
     {
         return money_format($this->_format, $value);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Filter/Object.php b/lib/Varien/Filter/Object.php
index cc47317e8dd..97f21a7b474 100644
--- a/lib/Varien/Filter/Object.php
+++ b/lib/Varien/Filter/Object.php
@@ -57,4 +57,4 @@ function filter($object)
         }
         return $out;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Filter/Object/Grid.php b/lib/Varien/Filter/Object/Grid.php
index f41bbe13fd4..f8cd1606b1c 100644
--- a/lib/Varien/Filter/Object/Grid.php
+++ b/lib/Varien/Filter/Object/Grid.php
@@ -37,4 +37,4 @@ function filter($grid)
         }
         return $out;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Filter/Sprintf.php b/lib/Varien/Filter/Sprintf.php
index a7a025bd113..1d43c7f122f 100644
--- a/lib/Varien/Filter/Sprintf.php
+++ b/lib/Varien/Filter/Sprintf.php
@@ -48,4 +48,4 @@ public function filter($value)
         $value = sprintf($this->_format, $value);
         return $value;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Filter/Template.php b/lib/Varien/Filter/Template.php
index bca16197ed1..5e9418dc8ce 100644
--- a/lib/Varien/Filter/Template.php
+++ b/lib/Varien/Filter/Template.php
@@ -131,9 +131,9 @@ public function filter($value)
                     continue;
                 }
                 try {
-					$replacedValue = call_user_func($callback, $construction);
+                    $replacedValue = call_user_func($callback, $construction);
                 } catch (Exception $e) {
-                	throw $e;
+                    throw $e;
                 }
                 $value = str_replace($construction[0], $replacedValue, $value);
             }
@@ -149,8 +149,8 @@ public function varDirective($construction)
             return $construction[0];
         }
 
-    	$replacedValue = $this->_getVariable($construction[2], '');
-    	return $replacedValue;
+        $replacedValue = $this->_getVariable($construction[2], '');
+        return $replacedValue;
     }
 
     public function includeDirective($construction)
@@ -212,9 +212,9 @@ protected function _getIncludeParameters($value)
         $tokenizer->setString($value);
         $params = $tokenizer->tokenize();
         foreach ($params as $key => $value) {
-        	if (substr($value, 0, 1) === '$') {
-        	    $params[$key] = $this->_getVariable(substr($value, 1), null);
-        	}
+            if (substr($value, 0, 1) === '$') {
+                $params[$key] = $this->_getVariable(substr($value, 1), null);
+            }
         }
         return $params;
     }
@@ -238,24 +238,22 @@ protected function _getVariable($value, $default='{no_value_defined}')
             if ($i == 0 && isset($this->_templateVars[$stackVars[$i]['name']])) {
                 // Getting of template value
                 $stackVars[$i]['variable'] =& $this->_templateVars[$stackVars[$i]['name']];
-            } else if (isset($stackVars[$i-1]['variable'])
-                       && $stackVars[$i-1]['variable'] instanceof Varien_Object) {
+            } elseif (isset($stackVars[$i-1]['variable']) && $stackVars[$i-1]['variable'] instanceof Varien_Object) {
                 // If object calling methods or getting properties
-                if($stackVars[$i]['type'] == 'property') {
-                    $caller = "get" . uc_words($stackVars[$i]['name'], '');
-                    if(is_callable(array($stackVars[$i-1]['variable'], $caller))) {
-                        // If specified getter for this property
-                        $stackVars[$i]['variable'] = $stackVars[$i-1]['variable']->$caller();
-                    } else {
-                        $stackVars[$i]['variable'] = $stackVars[$i-1]['variable']
-                                                        ->getData($stackVars[$i]['name']);
-                    }
-                } else if ($stackVars[$i]['type'] == 'method') {
+                if ($stackVars[$i]['type'] == 'property') {
+                    $caller = 'get' . uc_words($stackVars[$i]['name'], '');
+                    $stackVars[$i]['variable'] = method_exists($stackVars[$i-1]['variable'], $caller)
+                        ? $stackVars[$i-1]['variable']->$caller()
+                        : $stackVars[$i-1]['variable']->getData($stackVars[$i]['name']);
+                } elseif ($stackVars[$i]['type'] == 'method') {
                     // Calling of object method
-                    if (is_callable(array($stackVars[$i-1]['variable'], $stackVars[$i]['name'])) || substr($stackVars[$i]['name'],0,3) == 'get') {
-                        $stackVars[$i]['variable'] = call_user_func_array(array($stackVars[$i-1]['variable'],
-                                                                                $stackVars[$i]['name']),
-                                                                          $stackVars[$i]['args']);
+                    if (method_exists($stackVars[$i-1]['variable'], $stackVars[$i]['name'])
+                        || substr($stackVars[$i]['name'], 0, 3) == 'get'
+                    ) {
+                        $stackVars[$i]['variable'] = call_user_func_array(
+                            array($stackVars[$i-1]['variable'], $stackVars[$i]['name']),
+                            $stackVars[$i]['args']
+                        );
                     }
                 }
                 $last = $i;
diff --git a/lib/Varien/Filter/Template/Simple.php b/lib/Varien/Filter/Template/Simple.php
index 2a01ac03edf..bbd2b7e6050 100644
--- a/lib/Varien/Filter/Template/Simple.php
+++ b/lib/Varien/Filter/Template/Simple.php
@@ -41,4 +41,4 @@ public function filter($value)
 	{
 		return preg_replace('#'.$this->_startTag.'(.*?)'.$this->_endTag.'#e', '$this->getData("$1")', $value);
 	}
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Filter/Template/Tokenizer/Abstract.php b/lib/Varien/Filter/Template/Tokenizer/Abstract.php
index 9fb1618b368..3e2131639f5 100644
--- a/lib/Varien/Filter/Template/Tokenizer/Abstract.php
+++ b/lib/Varien/Filter/Template/Tokenizer/Abstract.php
@@ -118,4 +118,4 @@ public function isWhiteSpace() {
     
     abstract public function tokenize();
     
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Filter/Template/Tokenizer/Parameter.php b/lib/Varien/Filter/Template/Tokenizer/Parameter.php
index 71b02de60de..491d00fa093 100644
--- a/lib/Varien/Filter/Template/Tokenizer/Parameter.php
+++ b/lib/Varien/Filter/Template/Tokenizer/Parameter.php
@@ -95,4 +95,4 @@ public function getValue() {
         return $value;
     }
     
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Filter/Template/Tokenizer/Variable.php b/lib/Varien/Filter/Template/Tokenizer/Variable.php
index 956cf172988..70ab83b8ecd 100644
--- a/lib/Varien/Filter/Template/Tokenizer/Variable.php
+++ b/lib/Varien/Filter/Template/Tokenizer/Variable.php
@@ -182,4 +182,4 @@ public function getNumber() {
         return floatval($value);
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Image/Adapter/Abstract.php b/lib/Varien/Image/Adapter/Abstract.php
index 357c4cfcf9a..db7b9872af9 100644
--- a/lib/Varien/Image/Adapter/Abstract.php
+++ b/lib/Varien/Image/Adapter/Abstract.php
@@ -256,4 +256,4 @@ protected function _getFileAttributes()
         $this->_fileSrcPath = $pathinfo['dirname'];
         $this->_fileSrcName = $pathinfo['basename'];
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Image/Adapter/Gd2.php b/lib/Varien/Image/Adapter/Gd2.php
index e81afcefdcb..6b87f5f1956 100644
--- a/lib/Varien/Image/Adapter/Gd2.php
+++ b/lib/Varien/Image/Adapter/Gd2.php
@@ -43,14 +43,53 @@ class Varien_Image_Adapter_Gd2 extends Varien_Image_Adapter_Abstract
      */
     protected $_resized = false;
 
+    /**
+     * Opens image file.
+     *
+     * @param string $filename
+     * @throws Varien_Exception
+     */
     public function open($filename)
     {
         $this->_fileName = $filename;
         $this->getMimeType();
         $this->_getFileAttributes();
+        if ($this->_isMemoryLimitReached()) {
+            throw new Varien_Exception('Memory limit has been reached.');
+        }
         $this->_imageHandler = call_user_func($this->_getCallback('create'), $this->_fileName);
     }
 
+    /**
+     * Checks whether memory limit is reached.
+     *
+     * @return bool
+     */
+    protected function _isMemoryLimitReached()
+    {
+        $limit = $this->_convertToByte(ini_get('memory_limit'));
+        $size = getimagesize($this->_fileName);
+        $requiredMemory = $size[0] * $size[1] * 3;
+        return (memory_get_usage(true) + $requiredMemory) > $limit;
+    }
+
+    /**
+     * Converts memory value (e.g. 64M, 129KB) to bytes.
+     * Case insensitive value might be used.
+     *
+     * @param string $memoryValue
+     * @return int
+     */
+    protected function _convertToByte($memoryValue)
+    {
+        if (stripos($memoryValue, 'M') !== false) {
+            return (int)$memoryValue * 1024 * 1024;
+        } elseif (stripos($memoryValue, 'KB') !== false) {
+            return (int)$memoryValue * 1024;
+        }
+        return (int)$memoryValue;
+    }
+
     public function save($destination=null, $newName=null)
     {
         $fileName = ( !isset($destination) ) ? $this->_fileName : $destination;
diff --git a/lib/Varien/Io/Abstract.php b/lib/Varien/Io/Abstract.php
index 2e6c5fa2397..59539389837 100644
--- a/lib/Varien/Io/Abstract.php
+++ b/lib/Varien/Io/Abstract.php
@@ -115,4 +115,4 @@ public function allowedPath($haystackPath, $needlePath)
     {
         return strpos($this->getCleanPath($haystackPath), $this->getCleanPath($needlePath)) === 0;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Io/Exception.php b/lib/Varien/Io/Exception.php
index 2a820d5f246..39b6f716467 100644
--- a/lib/Varien/Io/Exception.php
+++ b/lib/Varien/Io/Exception.php
@@ -34,4 +34,4 @@
  */
 class Varien_Io_Exception extends Varien_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Io/Ftp.php b/lib/Varien/Io/Ftp.php
index cbcb60160f1..a8559888f94 100644
--- a/lib/Varien/Io/Ftp.php
+++ b/lib/Varien/Io/Ftp.php
@@ -324,4 +324,4 @@ protected function _tmpFilename($new=false)
         }
         return $this->_tmpFilename;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Io/Sftp.php b/lib/Varien/Io/Sftp.php
index 255a84f50c8..a6a9980451b 100644
--- a/lib/Varien/Io/Sftp.php
+++ b/lib/Varien/Io/Sftp.php
@@ -233,4 +233,4 @@ public function rawls()
         return $list;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Object/Cache.php b/lib/Varien/Object/Cache.php
index 647c082ebff..812f7183992 100644
--- a/lib/Varien/Object/Cache.php
+++ b/lib/Varien/Object/Cache.php
@@ -454,4 +454,4 @@ public function getAllReferencesByObject()
     {
         return $this->_referencesByObject;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Pear/Package.php b/lib/Varien/Pear/Package.php
index 7bbb8e13af0..690b4fdfd09 100644
--- a/lib/Varien/Pear/Package.php
+++ b/lib/Varien/Pear/Package.php
@@ -218,4 +218,4 @@ public function defineRelease()
     {
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Pear/Registry.php b/lib/Varien/Pear/Registry.php
index 98fd5f4ab1c..a1b94f6edcc 100644
--- a/lib/Varien/Pear/Registry.php
+++ b/lib/Varien/Pear/Registry.php
@@ -70,4 +70,4 @@ function _initializeDepDB()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Profiler.php b/lib/Varien/Profiler.php
index be14d549db0..5c6ac1a9f00 100644
--- a/lib/Varien/Profiler.php
+++ b/lib/Varien/Profiler.php
@@ -182,4 +182,4 @@ public static function getSqlProfiler($res) {
         }
         return $out;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Simplexml/Element.php b/lib/Varien/Simplexml/Element.php
index 76a8e295902..e9c3a2de392 100644
--- a/lib/Varien/Simplexml/Element.php
+++ b/lib/Varien/Simplexml/Element.php
@@ -327,7 +327,11 @@ public function xmlentities($value = null)
         }
         $value = (string)$value;
 
-        $value = str_replace(array('&', '"', "'", '<', '>'), array('&amp;', '&quot;', '&apos;', '&lt;', '&gt;'), $value);
+        $value = str_replace(
+            array('&', '"', "'", '<', '>'),
+            array('&amp;', '&quot;', '&apos;', '&lt;', '&gt;'),
+            $value
+        );
 
         return $value;
     }
@@ -412,7 +416,7 @@ public function extendChild($source, $overwrite=false)
             // handle string node
             if (isset($this->$sourceName)) {
                 // if target already has children return without regard
-                if ($this->$sourceName->children()) {
+                if ($this->$sourceName->hasChildren()) {
                     return $this;
                 }
                 if ($overwrite) {
diff --git a/lib/Zend/Barcode/Object/Code128.php b/lib/Zend/Barcode/Object/Code128.php
index 9dbdd14eb2c..6d0e994e1c0 100644
--- a/lib/Zend/Barcode/Object/Code128.php
+++ b/lib/Zend/Barcode/Object/Code128.php
@@ -388,4 +388,4 @@ protected function _validateText($value, $options = array())
     	// @TODO: add code128 validator
     	return true;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Barcode/Object/Planet.php b/lib/Zend/Barcode/Object/Planet.php
index ade56d30657..8a129deeb52 100644
--- a/lib/Zend/Barcode/Object/Planet.php
+++ b/lib/Zend/Barcode/Object/Planet.php
@@ -59,4 +59,4 @@ class Zend_Barcode_Object_Planet extends Zend_Barcode_Object_Postnet
         8 => "01101",
         9 => "01011"
     );
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/CodeGenerator/Exception.php b/lib/Zend/CodeGenerator/Exception.php
index 7b16b2dea95..dc57e254d5e 100644
--- a/lib/Zend/CodeGenerator/Exception.php
+++ b/lib/Zend/CodeGenerator/Exception.php
@@ -32,4 +32,4 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_CodeGenerator_Exception extends Zend_Exception
-{}
\ No newline at end of file
+{}
diff --git a/lib/Zend/CodeGenerator/Php/Docblock/Tag.php b/lib/Zend/CodeGenerator/Php/Docblock/Tag.php
index f919cb0c577..22bb05d7077 100644
--- a/lib/Zend/CodeGenerator/Php/Docblock/Tag.php
+++ b/lib/Zend/CodeGenerator/Php/Docblock/Tag.php
@@ -181,4 +181,4 @@ public function generate()
         return '@' . $this->_name . ' ' . $this->_description;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/CodeGenerator/Php/Docblock/Tag/License.php b/lib/Zend/CodeGenerator/Php/Docblock/Tag/License.php
index c83f2deec07..8e9bcd56264 100644
--- a/lib/Zend/CodeGenerator/Php/Docblock/Tag/License.php
+++ b/lib/Zend/CodeGenerator/Php/Docblock/Tag/License.php
@@ -95,4 +95,4 @@ public function generate()
         return $output;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/CodeGenerator/Php/Docblock/Tag/Return.php b/lib/Zend/CodeGenerator/Php/Docblock/Tag/Return.php
index 974142ee271..16a26ae542b 100644
--- a/lib/Zend/CodeGenerator/Php/Docblock/Tag/Return.php
+++ b/lib/Zend/CodeGenerator/Php/Docblock/Tag/Return.php
@@ -95,4 +95,4 @@ public function generate()
         return $output;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/CodeGenerator/Php/Member/Container.php b/lib/Zend/CodeGenerator/Php/Member/Container.php
index e0e613291b6..71d39a83d26 100644
--- a/lib/Zend/CodeGenerator/Php/Member/Container.php
+++ b/lib/Zend/CodeGenerator/Php/Member/Container.php
@@ -52,4 +52,4 @@ public function __construct($type = self::TYPE_PROPERTY)
         parent::__construct(array(), self::ARRAY_AS_PROPS);
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/CodeGenerator/Php/Parameter.php b/lib/Zend/CodeGenerator/Php/Parameter.php
index 099a3c31f52..97ecf71b664 100644
--- a/lib/Zend/CodeGenerator/Php/Parameter.php
+++ b/lib/Zend/CodeGenerator/Php/Parameter.php
@@ -247,4 +247,4 @@ public function generate()
         return $output;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/CodeGenerator/Php/Parameter/DefaultValue.php b/lib/Zend/CodeGenerator/Php/Parameter/DefaultValue.php
index 6b245d5eae6..3e75ff5152c 100644
--- a/lib/Zend/CodeGenerator/Php/Parameter/DefaultValue.php
+++ b/lib/Zend/CodeGenerator/Php/Parameter/DefaultValue.php
@@ -57,4 +57,4 @@ public function __toString()
     {
         return $this->_defaultValue;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Config.php b/lib/Zend/Config.php
index caa10dfe444..3150a9470b0 100644
--- a/lib/Zend/Config.php
+++ b/lib/Zend/Config.php
@@ -481,4 +481,4 @@ protected function _arrayMergeRecursive($firstArray, $secondArray)
 
         return $firstArray;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Config/Writer/FileAbstract.php b/lib/Zend/Config/Writer/FileAbstract.php
index 59a9d02275c..ce993fabd22 100644
--- a/lib/Zend/Config/Writer/FileAbstract.php
+++ b/lib/Zend/Config/Writer/FileAbstract.php
@@ -131,4 +131,4 @@ public function render()
     {
         return "";
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Crypt/DiffieHellman/Exception.php b/lib/Zend/Crypt/DiffieHellman/Exception.php
index fa5455da30e..ad223ecaf83 100644
--- a/lib/Zend/Crypt/DiffieHellman/Exception.php
+++ b/lib/Zend/Crypt/DiffieHellman/Exception.php
@@ -33,4 +33,4 @@
  */
 class Zend_Crypt_DiffieHellman_Exception extends Zend_Crypt_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Crypt/Exception.php b/lib/Zend/Crypt/Exception.php
index 07a4027fb17..b8dde1b3dfd 100644
--- a/lib/Zend/Crypt/Exception.php
+++ b/lib/Zend/Crypt/Exception.php
@@ -32,4 +32,4 @@
  */
 class Zend_Crypt_Exception extends Zend_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Crypt/Hmac.php b/lib/Zend/Crypt/Hmac.php
index c1304e480aa..8fa8ce8f338 100644
--- a/lib/Zend/Crypt/Hmac.php
+++ b/lib/Zend/Crypt/Hmac.php
@@ -178,4 +178,4 @@ protected static function _getMhashDefinition($hashAlgorithm)
         return $types[strtoupper($hashAlgorithm)];
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Crypt/Hmac/Exception.php b/lib/Zend/Crypt/Hmac/Exception.php
index a1625290491..2dce101e149 100644
--- a/lib/Zend/Crypt/Hmac/Exception.php
+++ b/lib/Zend/Crypt/Hmac/Exception.php
@@ -33,4 +33,4 @@
  */
 class Zend_Crypt_Hmac_Exception extends Zend_Crypt_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Crypt/Math/BigInteger.php b/lib/Zend/Crypt/Math/BigInteger.php
index 6aaadeea609..9b96d48c721 100644
--- a/lib/Zend/Crypt/Math/BigInteger.php
+++ b/lib/Zend/Crypt/Math/BigInteger.php
@@ -114,4 +114,4 @@ protected function _loadAdapter($extension = null)
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Crypt/Math/BigInteger/Bcmath.php b/lib/Zend/Crypt/Math/BigInteger/Bcmath.php
index 4c24b3684b7..292a758f27c 100644
--- a/lib/Zend/Crypt/Math/BigInteger/Bcmath.php
+++ b/lib/Zend/Crypt/Math/BigInteger/Bcmath.php
@@ -200,4 +200,4 @@ public function hexToDecimal($operand)
         return $return;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Crypt/Math/BigInteger/Exception.php b/lib/Zend/Crypt/Math/BigInteger/Exception.php
index 25e04ecebc9..d00c103c393 100644
--- a/lib/Zend/Crypt/Math/BigInteger/Exception.php
+++ b/lib/Zend/Crypt/Math/BigInteger/Exception.php
@@ -33,4 +33,4 @@
  */
 class Zend_Crypt_Math_BigInteger_Exception extends Zend_Crypt_Math_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Crypt/Math/BigInteger/Gmp.php b/lib/Zend/Crypt/Math/BigInteger/Gmp.php
index 3ee9cea4532..3fea8ae8adc 100644
--- a/lib/Zend/Crypt/Math/BigInteger/Gmp.php
+++ b/lib/Zend/Crypt/Math/BigInteger/Gmp.php
@@ -193,4 +193,4 @@ public function hexToDecimal($operand)
         return $return;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Crypt/Math/BigInteger/Interface.php b/lib/Zend/Crypt/Math/BigInteger/Interface.php
index f0cce8b5db2..edc6abad7c8 100644
--- a/lib/Zend/Crypt/Math/BigInteger/Interface.php
+++ b/lib/Zend/Crypt/Math/BigInteger/Interface.php
@@ -48,4 +48,4 @@ public function binaryToInteger($operand);
     public function integerToBinary($operand);
     public function hexToDecimal($operand);
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Crypt/Math/Exception.php b/lib/Zend/Crypt/Math/Exception.php
index 479df2bd6d1..4713de34c8b 100644
--- a/lib/Zend/Crypt/Math/Exception.php
+++ b/lib/Zend/Crypt/Math/Exception.php
@@ -33,4 +33,4 @@
  */
 class Zend_Crypt_Math_Exception extends Zend_Crypt_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Crypt/Rsa/Exception.php b/lib/Zend/Crypt/Rsa/Exception.php
index ba6a015f9ee..2737ff16744 100644
--- a/lib/Zend/Crypt/Rsa/Exception.php
+++ b/lib/Zend/Crypt/Rsa/Exception.php
@@ -33,4 +33,4 @@
  */
 class Zend_Crypt_Rsa_Exception extends Zend_Crypt_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Crypt/Rsa/Key.php b/lib/Zend/Crypt/Rsa/Key.php
index d384c3c68db..df3e80ec161 100644
--- a/lib/Zend/Crypt/Rsa/Key.php
+++ b/lib/Zend/Crypt/Rsa/Key.php
@@ -92,4 +92,4 @@ public function getType()
     {
         return $this->_details['type'];
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Crypt/Rsa/Key/Private.php b/lib/Zend/Crypt/Rsa/Key/Private.php
index cf771d10cb0..d3c1249079c 100644
--- a/lib/Zend/Crypt/Rsa/Key/Private.php
+++ b/lib/Zend/Crypt/Rsa/Key/Private.php
@@ -72,4 +72,4 @@ public function getPublicKey()
         return $this->_publicKey;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Crypt/Rsa/Key/Public.php b/lib/Zend/Crypt/Rsa/Key/Public.php
index 25972a7e19f..6ba12d09218 100644
--- a/lib/Zend/Crypt/Rsa/Key/Public.php
+++ b/lib/Zend/Crypt/Rsa/Key/Public.php
@@ -71,4 +71,4 @@ public function getCertificate()
         return $this->_certificateString;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Db/Adapter/Pdo/Mssql.php b/lib/Zend/Db/Adapter/Pdo/Mssql.php
index d76205ef23b..fd2b1725f8e 100644
--- a/lib/Zend/Db/Adapter/Pdo/Mssql.php
+++ b/lib/Zend/Db/Adapter/Pdo/Mssql.php
@@ -420,4 +420,4 @@ public function getServerVersion()
             return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Db/Statement/Mysqli.php b/lib/Zend/Db/Statement/Mysqli.php
index 1f1d432bd99..22d52431f79 100644
--- a/lib/Zend/Db/Statement/Mysqli.php
+++ b/lib/Zend/Db/Statement/Mysqli.php
@@ -359,4 +359,4 @@ public function rowCount()
         return $mysqli->affected_rows;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Db/Statement/Pdo/Ibm.php b/lib/Zend/Db/Statement/Pdo/Ibm.php
index c66d4956df5..e52b96e02bb 100644
--- a/lib/Zend/Db/Statement/Pdo/Ibm.php
+++ b/lib/Zend/Db/Statement/Pdo/Ibm.php
@@ -91,4 +91,4 @@ public function _bindParam($parameter, &$variable, $type = null, $length = null,
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Db/Statement/Pdo/Oci.php b/lib/Zend/Db/Statement/Pdo/Oci.php
index b32ed0efb47..6fd0044620b 100644
--- a/lib/Zend/Db/Statement/Pdo/Oci.php
+++ b/lib/Zend/Db/Statement/Pdo/Oci.php
@@ -88,4 +88,4 @@ public function fetch($style = null, $cursor = null, $offset = null)
 
         return $row;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Db/Table/Select.php b/lib/Zend/Db/Table/Select.php
index 3980b8698f6..0d5997a4f49 100644
--- a/lib/Zend/Db/Table/Select.php
+++ b/lib/Zend/Db/Table/Select.php
@@ -221,4 +221,4 @@ public function assemble()
 
         return parent::assemble();
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Feed/Builder/Header/Itunes.php b/lib/Zend/Feed/Builder/Header/Itunes.php
index 322a078d2e8..6757ccae44d 100644
--- a/lib/Zend/Feed/Builder/Header/Itunes.php
+++ b/lib/Zend/Feed/Builder/Header/Itunes.php
@@ -285,4 +285,4 @@ public function __unset($key)
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Feed/Reader/Extension/Podcast/Entry.php b/lib/Zend/Feed/Reader/Extension/Podcast/Entry.php
index d77b6a4f909..5874375effb 100644
--- a/lib/Zend/Feed/Reader/Extension/Podcast/Entry.php
+++ b/lib/Zend/Feed/Reader/Extension/Podcast/Entry.php
@@ -199,4 +199,4 @@ protected function _registerNamespaces()
     {
         $this->_xpath->registerNamespace('itunes', 'http://www.itunes.com/dtds/podcast-1.0.dtd');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Feed/Reader/Extension/Podcast/Feed.php b/lib/Zend/Feed/Reader/Extension/Podcast/Feed.php
index 67adc8a08fd..7401b3f873e 100644
--- a/lib/Zend/Feed/Reader/Extension/Podcast/Feed.php
+++ b/lib/Zend/Feed/Reader/Extension/Podcast/Feed.php
@@ -290,4 +290,4 @@ protected function _registerNamespaces()
     {
         $this->_xpath->registerNamespace('itunes', 'http://www.itunes.com/dtds/podcast-1.0.dtd');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Filter/Callback.php b/lib/Zend/Filter/Callback.php
index 31abde2f68f..b2f69ee35c0 100644
--- a/lib/Zend/Filter/Callback.php
+++ b/lib/Zend/Filter/Callback.php
@@ -149,4 +149,4 @@ public function filter($value)
 
         return call_user_func_array($this->_callback, $options);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Filter/Word/DashToUnderscore.php b/lib/Zend/Filter/Word/DashToUnderscore.php
index 4ad9b28fe4e..d74647926d4 100644
--- a/lib/Zend/Filter/Word/DashToUnderscore.php
+++ b/lib/Zend/Filter/Word/DashToUnderscore.php
@@ -42,4 +42,4 @@ public function __construct()
     {
         parent::__construct('-', '_');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Filter/Word/Separator/Abstract.php b/lib/Zend/Filter/Word/Separator/Abstract.php
index 87454197738..d4f95b8f68b 100644
--- a/lib/Zend/Filter/Word/Separator/Abstract.php
+++ b/lib/Zend/Filter/Word/Separator/Abstract.php
@@ -73,4 +73,4 @@ public function getSeparator()
         return $this->_separator;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Filter/Word/SeparatorToDash.php b/lib/Zend/Filter/Word/SeparatorToDash.php
index fd0f2786100..500e9747a94 100644
--- a/lib/Zend/Filter/Word/SeparatorToDash.php
+++ b/lib/Zend/Filter/Word/SeparatorToDash.php
@@ -43,4 +43,4 @@ public function __construct($searchSeparator = ' ')
         parent::__construct($searchSeparator, '-');
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Filter/Word/SeparatorToSeparator.php b/lib/Zend/Filter/Word/SeparatorToSeparator.php
index 34464def17a..464b3a2bec7 100644
--- a/lib/Zend/Filter/Word/SeparatorToSeparator.php
+++ b/lib/Zend/Filter/Word/SeparatorToSeparator.php
@@ -126,4 +126,4 @@ protected function _separatorToSeparatorFilter($value)
         return parent::filter($value);
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Filter/Word/UnderscoreToDash.php b/lib/Zend/Filter/Word/UnderscoreToDash.php
index daf0e7a8cd6..1480d8ac626 100644
--- a/lib/Zend/Filter/Word/UnderscoreToDash.php
+++ b/lib/Zend/Filter/Word/UnderscoreToDash.php
@@ -42,4 +42,4 @@ public function __construct()
     {
         parent::__construct('_', '-');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Form/Decorator/Tooltip.php b/lib/Zend/Form/Decorator/Tooltip.php
index 3d885001319..7b488a1ef3a 100644
--- a/lib/Zend/Form/Decorator/Tooltip.php
+++ b/lib/Zend/Form/Decorator/Tooltip.php
@@ -55,4 +55,4 @@ public function render($content)
         return $content;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Gdata/Gapps/Extension/Property.php b/lib/Zend/Gdata/Gapps/Extension/Property.php
index 277b436c565..002242df1f0 100644
--- a/lib/Zend/Gdata/Gapps/Extension/Property.php
+++ b/lib/Zend/Gdata/Gapps/Extension/Property.php
@@ -177,4 +177,4 @@ public function __toString()
                "\nProperty Value: " . $this->getValue();
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/Zend/Gdata/Gapps/GroupFeed.php b/lib/Zend/Gdata/Gapps/GroupFeed.php
index 1ca98711f16..f20b43ea00b 100644
--- a/lib/Zend/Gdata/Gapps/GroupFeed.php
+++ b/lib/Zend/Gdata/Gapps/GroupFeed.php
@@ -50,4 +50,4 @@ class Zend_Gdata_Gapps_GroupFeed extends Zend_Gdata_Feed
     protected $_entryClassName = 'Zend_Gdata_Gapps_GroupEntry';
     protected $_feedClassName = 'Zend_Gdata_Gapps_GroupFeed';
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Attribute.php b/lib/Zend/Ldap/Attribute.php
index 8c58a1588c9..60ee8e30eb9 100644
--- a/lib/Zend/Ldap/Attribute.php
+++ b/lib/Zend/Ldap/Attribute.php
@@ -414,4 +414,4 @@ private static function _valueFromLdapDateTime($value)
             }
         } else return null;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Collection.php b/lib/Zend/Ldap/Collection.php
index f6a08c1f3e6..9b8f1e22fa1 100644
--- a/lib/Zend/Ldap/Collection.php
+++ b/lib/Zend/Ldap/Collection.php
@@ -236,4 +236,4 @@ public function valid()
             return $this->_iterator->valid();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Collection/Iterator/Default.php b/lib/Zend/Ldap/Collection/Iterator/Default.php
index 08a5758448b..bf3270055ff 100644
--- a/lib/Zend/Ldap/Collection/Iterator/Default.php
+++ b/lib/Zend/Ldap/Collection/Iterator/Default.php
@@ -307,4 +307,4 @@ public function valid()
         return (is_resource($this->_current));
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Converter.php b/lib/Zend/Ldap/Converter.php
index 33a256b4a24..dcc862330c9 100644
--- a/lib/Zend/Ldap/Converter.php
+++ b/lib/Zend/Ldap/Converter.php
@@ -393,4 +393,4 @@ public static function fromLdapUnserialize($value)
         }
         return $v;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Converter/Exception.php b/lib/Zend/Ldap/Converter/Exception.php
index b72c6d2f48b..1ed0cb1dcb3 100644
--- a/lib/Zend/Ldap/Converter/Exception.php
+++ b/lib/Zend/Ldap/Converter/Exception.php
@@ -32,4 +32,4 @@
  */
 class Zend_Ldap_Converter_Exception extends Zend_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Dn.php b/lib/Zend/Ldap/Dn.php
index 0fda19730a7..706e583dbb7 100644
--- a/lib/Zend/Ldap/Dn.php
+++ b/lib/Zend/Ldap/Dn.php
@@ -791,4 +791,4 @@ public static function isChildOf($childDn, $parentDn)
         }
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Filter.php b/lib/Zend/Ldap/Filter.php
index 65474942f73..b274399f06d 100644
--- a/lib/Zend/Ldap/Filter.php
+++ b/lib/Zend/Ldap/Filter.php
@@ -262,4 +262,4 @@ public function __construct($attr, $value, $filtertype, $prepend = null, $append
         $filter = self::_createFilterString($attr, $value, $filtertype, $prepend, $append);
         parent::__construct($filter);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Filter/Abstract.php b/lib/Zend/Ldap/Filter/Abstract.php
index b8fbe07e502..a138d6321a4 100644
--- a/lib/Zend/Ldap/Filter/Abstract.php
+++ b/lib/Zend/Ldap/Filter/Abstract.php
@@ -154,4 +154,4 @@ public static function unescapeValue($values = array())
         }
         return (count($values) == 1) ? $values[0] : $values;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Filter/And.php b/lib/Zend/Ldap/Filter/And.php
index 9cafe41a86b..58c999bf83a 100644
--- a/lib/Zend/Ldap/Filter/And.php
+++ b/lib/Zend/Ldap/Filter/And.php
@@ -45,4 +45,4 @@ public function __construct(array $subfilters)
     {
         parent::__construct($subfilters, self::TYPE_AND);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Filter/Exception.php b/lib/Zend/Ldap/Filter/Exception.php
index d1e4438645a..4cd94a1fd94 100644
--- a/lib/Zend/Ldap/Filter/Exception.php
+++ b/lib/Zend/Ldap/Filter/Exception.php
@@ -34,4 +34,4 @@
  */
 class Zend_Ldap_Filter_Exception extends Zend_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Filter/Logical.php b/lib/Zend/Ldap/Filter/Logical.php
index d214d9c6244..2c6e97a3e07 100644
--- a/lib/Zend/Ldap/Filter/Logical.php
+++ b/lib/Zend/Ldap/Filter/Logical.php
@@ -104,4 +104,4 @@ public function toString()
         $return .= ')';
         return $return;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Filter/Mask.php b/lib/Zend/Ldap/Filter/Mask.php
index a783dc8ca83..4d5c18316f8 100644
--- a/lib/Zend/Ldap/Filter/Mask.php
+++ b/lib/Zend/Ldap/Filter/Mask.php
@@ -63,4 +63,4 @@ public function toString()
     {
         return $this->_filter;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Filter/Not.php b/lib/Zend/Ldap/Filter/Not.php
index 45d93fb2370..3d83d45fc8c 100644
--- a/lib/Zend/Ldap/Filter/Not.php
+++ b/lib/Zend/Ldap/Filter/Not.php
@@ -72,4 +72,4 @@ public function toString()
     {
         return '(!' . $this->_filter->toString() . ')';
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Filter/Or.php b/lib/Zend/Ldap/Filter/Or.php
index d64d99286a1..d033eece06c 100644
--- a/lib/Zend/Ldap/Filter/Or.php
+++ b/lib/Zend/Ldap/Filter/Or.php
@@ -45,4 +45,4 @@ public function __construct(array $subfilters)
     {
         parent::__construct($subfilters, self::TYPE_OR);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Filter/String.php b/lib/Zend/Ldap/Filter/String.php
index 4d0b7c83df0..df7e9eae522 100644
--- a/lib/Zend/Ldap/Filter/String.php
+++ b/lib/Zend/Ldap/Filter/String.php
@@ -62,4 +62,4 @@ public function toString()
     {
         return '(' . $this->_filter . ')';
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Ldif/Encoder.php b/lib/Zend/Ldap/Ldif/Encoder.php
index b56b0a06d3c..ad3e70245c6 100644
--- a/lib/Zend/Ldap/Ldif/Encoder.php
+++ b/lib/Zend/Ldap/Ldif/Encoder.php
@@ -301,4 +301,4 @@ protected function _encodeAttributes(array $attributes)
         }
         return trim($string, PHP_EOL);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Node.php b/lib/Zend/Ldap/Node.php
index df3f940d104..a382798d4a2 100644
--- a/lib/Zend/Ldap/Node.php
+++ b/lib/Zend/Ldap/Node.php
@@ -1098,4 +1098,4 @@ public function valid()
     {
         return $this->_iteratorRewind;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Node/Abstract.php b/lib/Zend/Ldap/Node/Abstract.php
index 9e8d3093968..6b6f119096d 100644
--- a/lib/Zend/Ldap/Node/Abstract.php
+++ b/lib/Zend/Ldap/Node/Abstract.php
@@ -482,4 +482,4 @@ public function count()
     {
         return count($this->_currentData);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Node/ChildrenIterator.php b/lib/Zend/Ldap/Node/ChildrenIterator.php
index 7fe66e400e3..1531bda5301 100644
--- a/lib/Zend/Ldap/Node/ChildrenIterator.php
+++ b/lib/Zend/Ldap/Node/ChildrenIterator.php
@@ -206,4 +206,4 @@ public function toArray()
         }
         return $data;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Node/Collection.php b/lib/Zend/Ldap/Node/Collection.php
index ec1e2d9c8a0..4b9eab7cac6 100644
--- a/lib/Zend/Ldap/Node/Collection.php
+++ b/lib/Zend/Ldap/Node/Collection.php
@@ -64,4 +64,4 @@ public function key()
     {
         return $this->_iterator->key();
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Node/RootDse.php b/lib/Zend/Ldap/Node/RootDse.php
index eeb7b411695..443e8c7c2bd 100644
--- a/lib/Zend/Ldap/Node/RootDse.php
+++ b/lib/Zend/Ldap/Node/RootDse.php
@@ -155,4 +155,4 @@ public function getSchemaDn()
         #require_once 'Zend/Ldap/Dn.php';
         return Zend_Ldap_Dn::fromString($schemaDn);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Node/RootDse/ActiveDirectory.php b/lib/Zend/Ldap/Node/RootDse/ActiveDirectory.php
index 0f635f5d9f9..e8d6ffc4a1a 100644
--- a/lib/Zend/Ldap/Node/RootDse/ActiveDirectory.php
+++ b/lib/Zend/Ldap/Node/RootDse/ActiveDirectory.php
@@ -244,4 +244,4 @@ public function getSchemaDn()
         #require_once 'Zend/Ldap/Dn.php';
         return Zend_Ldap_Dn::fromString($schemaDn);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Node/RootDse/OpenLdap.php b/lib/Zend/Ldap/Node/RootDse/OpenLdap.php
index fe9f2663e1f..d3908db58c3 100644
--- a/lib/Zend/Ldap/Node/RootDse/OpenLdap.php
+++ b/lib/Zend/Ldap/Node/RootDse/OpenLdap.php
@@ -99,4 +99,4 @@ public function getServerType()
     {
         return self::SERVER_TYPE_OPENLDAP;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Node/RootDse/eDirectory.php b/lib/Zend/Ldap/Node/RootDse/eDirectory.php
index 5f6bf1271e1..02105bd1225 100644
--- a/lib/Zend/Ldap/Node/RootDse/eDirectory.php
+++ b/lib/Zend/Ldap/Node/RootDse/eDirectory.php
@@ -157,4 +157,4 @@ public function getServerType()
     {
         return self::SERVER_TYPE_EDIRECTORY;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Node/Schema.php b/lib/Zend/Ldap/Node/Schema.php
index 1690530b728..ffcdc08e27b 100644
--- a/lib/Zend/Ldap/Node/Schema.php
+++ b/lib/Zend/Ldap/Node/Schema.php
@@ -117,4 +117,4 @@ public function getObjectClasses()
     {
         return array();
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Node/Schema/ActiveDirectory.php b/lib/Zend/Ldap/Node/Schema/ActiveDirectory.php
index 65e5ecd1fa9..74ca829a227 100644
--- a/lib/Zend/Ldap/Node/Schema/ActiveDirectory.php
+++ b/lib/Zend/Ldap/Node/Schema/ActiveDirectory.php
@@ -100,4 +100,4 @@ public function getObjectClasses()
     {
         return $this->_objectClasses;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php b/lib/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php
index 45be05e1be8..7c1dd81036d 100644
--- a/lib/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php
+++ b/lib/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php
@@ -101,4 +101,4 @@ public function getDescription()
     {
 
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Node/Schema/AttributeType/Interface.php b/lib/Zend/Ldap/Node/Schema/AttributeType/Interface.php
index c24d077204c..18ac7352037 100644
--- a/lib/Zend/Ldap/Node/Schema/AttributeType/Interface.php
+++ b/lib/Zend/Ldap/Node/Schema/AttributeType/Interface.php
@@ -72,4 +72,4 @@ public function isSingleValued();
      * @return string
      */
     public function getDescription();
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php b/lib/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php
index 213b542165c..43b6804831f 100644
--- a/lib/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php
+++ b/lib/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php
@@ -126,4 +126,4 @@ public function getParent()
             return $this->_parents[0];
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Node/Schema/Item.php b/lib/Zend/Ldap/Node/Schema/Item.php
index ed3e26a34da..5dddba79088 100644
--- a/lib/Zend/Ldap/Node/Schema/Item.php
+++ b/lib/Zend/Ldap/Node/Schema/Item.php
@@ -160,4 +160,4 @@ public function count()
     {
         return count($this->_data);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php b/lib/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php
index f75ad61460b..d04869f6697 100644
--- a/lib/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php
+++ b/lib/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php
@@ -112,4 +112,4 @@ public function getParentClasses()
     {
 
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Node/Schema/ObjectClass/Interface.php b/lib/Zend/Ldap/Node/Schema/ObjectClass/Interface.php
index fceafdd8086..157c777c6ee 100644
--- a/lib/Zend/Ldap/Node/Schema/ObjectClass/Interface.php
+++ b/lib/Zend/Ldap/Node/Schema/ObjectClass/Interface.php
@@ -80,4 +80,4 @@ public function getType();
      * @return array
      */
     public function getParentClasses();
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php b/lib/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php
index 19b835d0cac..624b12efc73 100644
--- a/lib/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php
+++ b/lib/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php
@@ -172,4 +172,4 @@ public function getParents()
     {
         return $this->_parents;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Loader/Exception.php b/lib/Zend/Loader/Exception.php
index c2883a0ac89..226666fcf17 100644
--- a/lib/Zend/Loader/Exception.php
+++ b/lib/Zend/Loader/Exception.php
@@ -32,4 +32,4 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Loader_Exception extends Zend_Exception
-{}
\ No newline at end of file
+{}
diff --git a/lib/Zend/Mail/Message/Interface.php b/lib/Zend/Mail/Message/Interface.php
index 833be6b44ad..2e8727ef379 100644
--- a/lib/Zend/Mail/Message/Interface.php
+++ b/lib/Zend/Mail/Message/Interface.php
@@ -52,4 +52,4 @@ public function hasFlag($flag);
      * @return array array with flags, key and value are the same for easy lookup
      */
     public function getFlags();
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Mail/Part/Interface.php b/lib/Zend/Mail/Part/Interface.php
index 2d8f6f89437..01505979d8b 100644
--- a/lib/Zend/Mail/Part/Interface.php
+++ b/lib/Zend/Mail/Part/Interface.php
@@ -133,4 +133,4 @@ public function __get($name);
      * @return string content
      */
     public function __toString();
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Mail/Storage/Writable/Interface.php b/lib/Zend/Mail/Storage/Writable/Interface.php
index 982b44eeb92..6b4aab65ee2 100644
--- a/lib/Zend/Mail/Storage/Writable/Interface.php
+++ b/lib/Zend/Mail/Storage/Writable/Interface.php
@@ -105,4 +105,4 @@ public function moveMessage($id, $folder);
      * @throws Zend_Mail_Storage_Exception
      */
     public function setFlags($id, $flags);
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Markup/Exception.php b/lib/Zend/Markup/Exception.php
index 29e9b9cb318..235e2db67cc 100644
--- a/lib/Zend/Markup/Exception.php
+++ b/lib/Zend/Markup/Exception.php
@@ -35,4 +35,4 @@
  */
 class Zend_Markup_Exception extends Zend_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Markup/Parser/Exception.php b/lib/Zend/Markup/Parser/Exception.php
index cdf523f24bd..e8621b244e9 100644
--- a/lib/Zend/Markup/Parser/Exception.php
+++ b/lib/Zend/Markup/Parser/Exception.php
@@ -37,4 +37,4 @@
  */
 class Zend_Markup_Parser_Exception extends Zend_Markup_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Markup/Parser/Textile.php b/lib/Zend/Markup/Parser/Textile.php
index 1c65302e94f..9cb705a8372 100644
--- a/lib/Zend/Markup/Parser/Textile.php
+++ b/lib/Zend/Markup/Parser/Textile.php
@@ -567,4 +567,4 @@ protected function _extractAttributes(array $matches)
         return $attributes;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Markup/Renderer/Exception.php b/lib/Zend/Markup/Renderer/Exception.php
index 7d141a99229..1eb829152aa 100644
--- a/lib/Zend/Markup/Renderer/Exception.php
+++ b/lib/Zend/Markup/Renderer/Exception.php
@@ -37,4 +37,4 @@
  */
 class Zend_Markup_Renderer_Exception extends Zend_Markup_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Oauth/Exception.php b/lib/Zend/Oauth/Exception.php
index 85ae8ec8d84..af6ccd8af91 100644
--- a/lib/Zend/Oauth/Exception.php
+++ b/lib/Zend/Oauth/Exception.php
@@ -30,4 +30,4 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Oauth_Exception extends Zend_Exception {}
\ No newline at end of file
+class Zend_Oauth_Exception extends Zend_Exception {}
diff --git a/lib/Zend/Paginator/Adapter/Array.php b/lib/Zend/Paginator/Adapter/Array.php
index 0a8f53245fa..88b8004a888 100644
--- a/lib/Zend/Paginator/Adapter/Array.php
+++ b/lib/Zend/Paginator/Adapter/Array.php
@@ -78,4 +78,4 @@ public function count()
     {
         return $this->_count;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Paginator/Adapter/DbTableSelect.php b/lib/Zend/Paginator/Adapter/DbTableSelect.php
index 0fca93afe00..a6e511476ea 100644
--- a/lib/Zend/Paginator/Adapter/DbTableSelect.php
+++ b/lib/Zend/Paginator/Adapter/DbTableSelect.php
@@ -45,4 +45,4 @@ public function getItems($offset, $itemCountPerPage)
 
         return $this->_select->getTable()->fetchAll($this->_select);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Paginator/Adapter/Iterator.php b/lib/Zend/Paginator/Adapter/Iterator.php
index 85a0f9be526..4780b4c30c3 100644
--- a/lib/Zend/Paginator/Adapter/Iterator.php
+++ b/lib/Zend/Paginator/Adapter/Iterator.php
@@ -99,4 +99,4 @@ public function count()
     {
         return $this->_count;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Paginator/Adapter/Null.php b/lib/Zend/Paginator/Adapter/Null.php
index 66d9df7a135..b0174c2d8f9 100644
--- a/lib/Zend/Paginator/Adapter/Null.php
+++ b/lib/Zend/Paginator/Adapter/Null.php
@@ -77,4 +77,4 @@ public function count()
     {
         return $this->_count;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Paginator/AdapterAggregate.php b/lib/Zend/Paginator/AdapterAggregate.php
index 2430f22323e..909d9fd40f8 100644
--- a/lib/Zend/Paginator/AdapterAggregate.php
+++ b/lib/Zend/Paginator/AdapterAggregate.php
@@ -37,4 +37,4 @@ interface Zend_Paginator_AdapterAggregate
      * @return Zend_Paginator_Adapter_Interface
      */
     public function getPaginatorAdapter();
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Paginator/Exception.php b/lib/Zend/Paginator/Exception.php
index 18062b3c526..7d3e0020cd1 100644
--- a/lib/Zend/Paginator/Exception.php
+++ b/lib/Zend/Paginator/Exception.php
@@ -32,4 +32,4 @@
  */
 class Zend_Paginator_Exception extends Zend_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Paginator/ScrollingStyle/All.php b/lib/Zend/Paginator/ScrollingStyle/All.php
index 0c46a9ec3ed..10e92c3ef8a 100644
--- a/lib/Zend/Paginator/ScrollingStyle/All.php
+++ b/lib/Zend/Paginator/ScrollingStyle/All.php
@@ -47,4 +47,4 @@ public function getPages(Zend_Paginator $paginator, $pageRange = null)
     {
         return $paginator->getPagesInRange(1, $paginator->count());
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Paginator/ScrollingStyle/Elastic.php b/lib/Zend/Paginator/ScrollingStyle/Elastic.php
index e08acf32251..a61bdba23ca 100644
--- a/lib/Zend/Paginator/ScrollingStyle/Elastic.php
+++ b/lib/Zend/Paginator/ScrollingStyle/Elastic.php
@@ -60,4 +60,4 @@ public function getPages(Zend_Paginator $paginator, $pageRange = null)
 
         return parent::getPages($paginator, $pageRange);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Paginator/ScrollingStyle/Interface.php b/lib/Zend/Paginator/ScrollingStyle/Interface.php
index abdfbc486d7..f9e689e4a55 100644
--- a/lib/Zend/Paginator/ScrollingStyle/Interface.php
+++ b/lib/Zend/Paginator/ScrollingStyle/Interface.php
@@ -35,4 +35,4 @@ interface Zend_Paginator_ScrollingStyle_Interface
      * @return array
      */
     public function getPages(Zend_Paginator $paginator, $pageRange = null);
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Paginator/ScrollingStyle/Jumping.php b/lib/Zend/Paginator/ScrollingStyle/Jumping.php
index 1d6b2de9afc..caec394f396 100644
--- a/lib/Zend/Paginator/ScrollingStyle/Jumping.php
+++ b/lib/Zend/Paginator/ScrollingStyle/Jumping.php
@@ -60,4 +60,4 @@ public function getPages(Zend_Paginator $paginator, $pageRange = null)
 
         return $paginator->getPagesInRange($lowerBound, $upperBound);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Paginator/ScrollingStyle/Sliding.php b/lib/Zend/Paginator/ScrollingStyle/Sliding.php
index 90cbdf170f8..bb9af9f1464 100644
--- a/lib/Zend/Paginator/ScrollingStyle/Sliding.php
+++ b/lib/Zend/Paginator/ScrollingStyle/Sliding.php
@@ -75,4 +75,4 @@ public function getPages(Zend_Paginator $paginator, $pageRange = null)
 
         return $paginator->getPagesInRange($lowerBound, $upperBound);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/ProgressBar/Adapter/Console.php b/lib/Zend/ProgressBar/Adapter/Console.php
index 2ec1b852ac1..c835167a0d8 100644
--- a/lib/Zend/ProgressBar/Adapter/Console.php
+++ b/lib/Zend/ProgressBar/Adapter/Console.php
@@ -531,4 +531,4 @@ protected function _outputData($data)
     {
         fwrite($this->getOutputStream(), $data);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Rest/Controller.php b/lib/Zend/Rest/Controller.php
index e3c7cef752c..cfa240b5441 100644
--- a/lib/Zend/Rest/Controller.php
+++ b/lib/Zend/Rest/Controller.php
@@ -67,4 +67,4 @@ abstract public function putAction();
      */
     abstract public function deleteAction();
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/Amazon/Exception.php b/lib/Zend/Service/Amazon/Exception.php
index e9cd1f45875..409206b6930 100644
--- a/lib/Zend/Service/Amazon/Exception.php
+++ b/lib/Zend/Service/Amazon/Exception.php
@@ -32,4 +32,4 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_Amazon_Exception extends Zend_Service_Exception
-{}
\ No newline at end of file
+{}
diff --git a/lib/Zend/Service/Amazon/Offer.php b/lib/Zend/Service/Amazon/Offer.php
index 0a35eb5ea60..5482bfacffc 100644
--- a/lib/Zend/Service/Amazon/Offer.php
+++ b/lib/Zend/Service/Amazon/Offer.php
@@ -108,4 +108,4 @@ public function __construct(DOMElement $dom)
             $this->IsEligibleForSuperSaverShipping = (bool) $result->item(0)->data;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/LiveDocx.php b/lib/Zend/Service/LiveDocx.php
index ad21d563f8f..16744efa69a 100644
--- a/lib/Zend/Service/LiveDocx.php
+++ b/lib/Zend/Service/LiveDocx.php
@@ -412,4 +412,4 @@ public function compareVersion($version)
     {
         return version_compare($version, $this->getVersion());
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/LiveDocx/Exception.php b/lib/Zend/Service/LiveDocx/Exception.php
index 6fde26ff8bb..96416c7dbc7 100644
--- a/lib/Zend/Service/LiveDocx/Exception.php
+++ b/lib/Zend/Service/LiveDocx/Exception.php
@@ -36,4 +36,4 @@
  */
 class Zend_Service_LiveDocx_Exception extends Zend_Service_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/LiveDocx/MailMerge.php b/lib/Zend/Service/LiveDocx/MailMerge.php
index c1024e65756..d41fadaae1e 100644
--- a/lib/Zend/Service/LiveDocx/MailMerge.php
+++ b/lib/Zend/Service/LiveDocx/MailMerge.php
@@ -1135,4 +1135,4 @@ public static function multiAssocArrayToArrayOfArrayOfString($multi)
 
     // -------------------------------------------------------------------------
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/ReCaptcha/Exception.php b/lib/Zend/Service/ReCaptcha/Exception.php
index 6de4683cb92..4371b265418 100644
--- a/lib/Zend/Service/ReCaptcha/Exception.php
+++ b/lib/Zend/Service/ReCaptcha/Exception.php
@@ -33,4 +33,4 @@
  * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Service_ReCaptcha_Exception extends Zend_Service_Exception
-{}
\ No newline at end of file
+{}
diff --git a/lib/Zend/Service/ReCaptcha/MailHide/Exception.php b/lib/Zend/Service/ReCaptcha/MailHide/Exception.php
index 98b71fa78ab..c482b932efe 100644
--- a/lib/Zend/Service/ReCaptcha/MailHide/Exception.php
+++ b/lib/Zend/Service/ReCaptcha/MailHide/Exception.php
@@ -33,4 +33,4 @@
  * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 class Zend_Service_ReCaptcha_MailHide_Exception extends Zend_Service_ReCaptcha_Exception
-{}
\ No newline at end of file
+{}
diff --git a/lib/Zend/Service/ReCaptcha/Response.php b/lib/Zend/Service/ReCaptcha/Response.php
index 95a2c04726b..30eac4b2625 100644
--- a/lib/Zend/Service/ReCaptcha/Response.php
+++ b/lib/Zend/Service/ReCaptcha/Response.php
@@ -156,4 +156,4 @@ public function setFromHttpResponse(Zend_Http_Response $response)
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/SlideShare/Exception.php b/lib/Zend/Service/SlideShare/Exception.php
index db2c47a4e84..534227cad56 100644
--- a/lib/Zend/Service/SlideShare/Exception.php
+++ b/lib/Zend/Service/SlideShare/Exception.php
@@ -35,4 +35,4 @@
  */
 class Zend_Service_SlideShare_Exception extends Zend_Service_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/SlideShare/SlideShow.php b/lib/Zend/Service/SlideShare/SlideShow.php
index e2164e67511..0f2c6b096c9 100644
--- a/lib/Zend/Service/SlideShare/SlideShow.php
+++ b/lib/Zend/Service/SlideShare/SlideShow.php
@@ -434,4 +434,4 @@ public function getNumViews()
     {
         return $this->_numViews;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDataSources.php b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDataSources.php
index 7c1b85b7237..e3596e4b904 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDataSources.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDataSources.php
@@ -88,4 +88,4 @@ public function __construct($overallQuotaInMB = 0)
             'directories'             		=> new Zend_Service_WindowsAzure_Diagnostics_ConfigurationDirectories()
         );
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDiagnosticInfrastructureLogs.php b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDiagnosticInfrastructureLogs.php
index f009b7b7298..08de94fefcf 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDiagnosticInfrastructureLogs.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDiagnosticInfrastructureLogs.php
@@ -64,4 +64,4 @@ public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinu
             'scheduledtransferloglevelfilter'	=> $scheduledTransferLogLevelFilter
         );
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDirectories.php b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDirectories.php
index 0171c590c0c..1b4f5cdf8e1 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDirectories.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDirectories.php
@@ -87,4 +87,4 @@ public function removeSubscription($path)
     		unset($this->_data['subscriptions'][$path]);
     	}
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationInstance.php b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationInstance.php
index 724e84a92ac..5a1a1ab08df 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationInstance.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationInstance.php
@@ -217,4 +217,4 @@ public function toXml()
 		// Return
 		return implode("\r\n", $returnValue);
 	}
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationLogs.php b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationLogs.php
index a52d326e82b..39d45d64ad2 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationLogs.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationLogs.php
@@ -64,4 +64,4 @@ public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinu
             'scheduledtransferloglevelfilter'	=> $scheduledTransferLogLevelFilter
         );
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php
index 5056c43af05..b82fdbeb1a4 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php
@@ -68,4 +68,4 @@ public function __get($name) {
 
         throw new Zend_Service_WindowsAzure_Diagnostics_Exception("Unknown property: " . $name);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationPerformanceCounters.php b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationPerformanceCounters.php
index 39daa1b9f82..05d938da147 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationPerformanceCounters.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationPerformanceCounters.php
@@ -86,4 +86,4 @@ public function removeSubscription($counterSpecifier)
     		unset($this->_data['subscriptions'][$counterSpecifier]);
     	}
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationWindowsEventLog.php b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationWindowsEventLog.php
index 2d118619a17..4cff0f44fb7 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationWindowsEventLog.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationWindowsEventLog.php
@@ -88,4 +88,4 @@ public function removeSubscription($filter)
     		unset($this->_data['subscriptions'][$filter]);
     	}
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/DirectoryConfigurationSubscription.php b/lib/Zend/Service/WindowsAzure/Diagnostics/DirectoryConfigurationSubscription.php
index 85a1e0142ca..d69a3cee152 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/DirectoryConfigurationSubscription.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/DirectoryConfigurationSubscription.php
@@ -59,4 +59,4 @@ public function __construct($path, $container, $directoryQuotaInMB = 1024)
         	'directoryquotainmb' 	=> $directoryQuotaInMB
         );
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/Exception.php b/lib/Zend/Service/WindowsAzure/Diagnostics/Exception.php
index 1eb0fb2fa81..1e26ef60c1a 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/Exception.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/Exception.php
@@ -35,4 +35,4 @@
 class Zend_Service_WindowsAzure_Diagnostics_Exception
 	extends Zend_Service_WindowsAzure_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/LogLevel.php b/lib/Zend/Service/WindowsAzure/Diagnostics/LogLevel.php
index 6660416b19a..608a082e0a6 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/LogLevel.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/LogLevel.php
@@ -36,4 +36,4 @@ class Zend_Service_WindowsAzure_Diagnostics_LogLevel
 	const WARNING 		= 'Warning';
 	const INFORMATION 	= 'Information';
 	const VERBOSE 		= 'Verbose';
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/Manager.php b/lib/Zend/Service/WindowsAzure/Diagnostics/Manager.php
index e7d70e6027a..6f7485413a7 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/Manager.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/Manager.php
@@ -188,4 +188,4 @@ public function setConfigurationForRoleInstance($roleInstance = null, Zend_Servi
 
 		$this->_blobStorageClient->putBlobData($this->_controlContainer, $roleInstance, $configuration->toXml(), array(), null, array('Content-Type' => 'text/xml'));
 	}
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/PerformanceCounterSubscription.php b/lib/Zend/Service/WindowsAzure/Diagnostics/PerformanceCounterSubscription.php
index 33d9a31ec6e..29b7e65565b 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/PerformanceCounterSubscription.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/PerformanceCounterSubscription.php
@@ -56,4 +56,4 @@ public function __construct($counterSpecifier, $sampleRateInSeconds = 1)
             'samplerateinseconds' 	=> $sampleRateInSeconds
         );
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php b/lib/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php
index 95ef7926794..5fcd0dedd50 100644
--- a/lib/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php
+++ b/lib/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php
@@ -55,4 +55,4 @@ public function execute($function, $parameters = array())
             throw $ex;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php b/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php
index 1961170e6e0..5753aaa2fb0 100644
--- a/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php
+++ b/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php
@@ -89,4 +89,4 @@ public function execute($function, $parameters = array())
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php b/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php
index 8b4675d980a..90a05fefe7c 100644
--- a/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php
+++ b/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php
@@ -74,4 +74,4 @@ public static function retryN($count = 1, $intervalBetweenRetries = 0)
     {
         return new Zend_Service_WindowsAzure_RetryPolicy_RetryN($count, $intervalBetweenRetries);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php b/lib/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php
index 5830bdb1756..7129a6e9753 100644
--- a/lib/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php
+++ b/lib/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php
@@ -347,4 +347,4 @@ public function __toString()
 	{
 		return $this->assembleQuery();
 	}
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Soap/Wsdl/Exception.php b/lib/Zend/Soap/Wsdl/Exception.php
index 97cd19b0b46..9ce354dbec8 100644
--- a/lib/Zend/Soap/Wsdl/Exception.php
+++ b/lib/Zend/Soap/Wsdl/Exception.php
@@ -34,4 +34,4 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Soap_Wsdl_Exception extends Zend_Exception { }
\ No newline at end of file
+class Zend_Soap_Wsdl_Exception extends Zend_Exception { }
diff --git a/lib/Zend/Soap/Wsdl/Strategy/AnyType.php b/lib/Zend/Soap/Wsdl/Strategy/AnyType.php
index fa6158d75d8..c20ac30f770 100644
--- a/lib/Zend/Soap/Wsdl/Strategy/AnyType.php
+++ b/lib/Zend/Soap/Wsdl/Strategy/AnyType.php
@@ -56,4 +56,4 @@ public function addComplexType($type)
     {
         return 'xsd:anyType';
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php b/lib/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php
index d6ac5ff26a3..62002d74300 100644
--- a/lib/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php
+++ b/lib/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php
@@ -142,4 +142,4 @@ protected function _getNestedCount($type)
     {
         return substr_count($type, "[]");
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Soap/Wsdl/Strategy/Composite.php b/lib/Zend/Soap/Wsdl/Strategy/Composite.php
index 0ee943fac89..0fb61bcb15b 100644
--- a/lib/Zend/Soap/Wsdl/Strategy/Composite.php
+++ b/lib/Zend/Soap/Wsdl/Strategy/Composite.php
@@ -185,4 +185,4 @@ public function addComplexType($type)
         $strategy->setContext($this->_context);
         return $strategy->addComplexType($type);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Soap/Wsdl/Strategy/Interface.php b/lib/Zend/Soap/Wsdl/Strategy/Interface.php
index d53d4f62ec9..db61220f368 100644
--- a/lib/Zend/Soap/Wsdl/Strategy/Interface.php
+++ b/lib/Zend/Soap/Wsdl/Strategy/Interface.php
@@ -45,4 +45,4 @@ public function setContext(Zend_Soap_Wsdl $context);
      * @return string XSD type
      */
     public function addComplexType($type);
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Test/DbAdapter.php b/lib/Zend/Test/DbAdapter.php
index 8f3856da857..ba648e19946 100644
--- a/lib/Zend/Test/DbAdapter.php
+++ b/lib/Zend/Test/DbAdapter.php
@@ -342,4 +342,4 @@ function getServerVersion()
     {
         return "1.0.0";
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Test/DbStatement.php b/lib/Zend/Test/DbStatement.php
index af878999106..af0afec4cec 100644
--- a/lib/Zend/Test/DbStatement.php
+++ b/lib/Zend/Test/DbStatement.php
@@ -401,4 +401,4 @@ public function setFetchMode($mode)
     {
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Test/PHPUnit/DatabaseTestCase.php b/lib/Zend/Test/PHPUnit/DatabaseTestCase.php
index b76d0667a4c..297d42012e5 100644
--- a/lib/Zend/Test/PHPUnit/DatabaseTestCase.php
+++ b/lib/Zend/Test/PHPUnit/DatabaseTestCase.php
@@ -148,4 +148,4 @@ protected function createDbRowset(Zend_Db_Table_Rowset_Abstract $rowset, $tableN
     {
         return new Zend_Test_PHPUnit_Db_DataSet_DbRowset($rowset, $tableName);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Test/PHPUnit/Db/Connection.php b/lib/Zend/Test/PHPUnit/Db/Connection.php
index 56fbedc5f00..75ec8d1fb17 100644
--- a/lib/Zend/Test/PHPUnit/Db/Connection.php
+++ b/lib/Zend/Test/PHPUnit/Db/Connection.php
@@ -146,4 +146,4 @@ public function getTruncateCommand()
     {
         return "DELETE";
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php b/lib/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php
index 13dda38c3f4..51c5e5e55f5 100644
--- a/lib/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php
+++ b/lib/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php
@@ -75,4 +75,4 @@ public function __construct(Zend_Db_Table_Rowset_Abstract $rowset, $tableName =
         $this->tableName = $tableName;
         $this->tableMetaData = new PHPUnit_Extensions_Database_DataSet_DefaultTableMetaData($this->tableName, $columns);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Test/PHPUnit/Db/DataSet/DbTable.php b/lib/Zend/Test/PHPUnit/Db/DataSet/DbTable.php
index 2e7c558ce76..2d39048d61d 100644
--- a/lib/Zend/Test/PHPUnit/Db/DataSet/DbTable.php
+++ b/lib/Zend/Test/PHPUnit/Db/DataSet/DbTable.php
@@ -122,4 +122,4 @@ protected function createTableMetaData()
             $this->tableMetaData = new PHPUnit_Extensions_Database_DataSet_DefaultTableMetaData($this->tableName, $this->_columns);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php b/lib/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php
index 6b3ac04529d..7676e106afd 100644
--- a/lib/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php
+++ b/lib/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php
@@ -100,4 +100,4 @@ public function getTableNames()
     {
         return array_keys($this->tables);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php b/lib/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php
index 9b92a50e8bc..5a71d554246 100644
--- a/lib/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php
+++ b/lib/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php
@@ -87,4 +87,4 @@ public function addTable($tableName, $query = NULL)
 
         $this->tables[$tableName] = new Zend_Test_PHPUnit_Db_DataSet_QueryTable($tableName, $query, $this->databaseConnection);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php b/lib/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php
index dceb82bdad3..18541595fe2 100644
--- a/lib/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php
+++ b/lib/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php
@@ -88,4 +88,4 @@ protected function createTableMetaData()
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Test/PHPUnit/Db/Exception.php b/lib/Zend/Test/PHPUnit/Db/Exception.php
index bce830f9ef5..5e8bac78fa7 100644
--- a/lib/Zend/Test/PHPUnit/Db/Exception.php
+++ b/lib/Zend/Test/PHPUnit/Db/Exception.php
@@ -37,4 +37,4 @@
  */
 class Zend_Test_PHPUnit_Db_Exception extends Zend_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Test/PHPUnit/Db/Metadata/Generic.php b/lib/Zend/Test/PHPUnit/Db/Metadata/Generic.php
index b2132eb4f22..0599070e4f7 100644
--- a/lib/Zend/Test/PHPUnit/Db/Metadata/Generic.php
+++ b/lib/Zend/Test/PHPUnit/Db/Metadata/Generic.php
@@ -164,4 +164,4 @@ public function allowsCascading()
     {
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php b/lib/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php
index ab6fe5b8fe6..6fc158c6e59 100644
--- a/lib/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php
+++ b/lib/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php
@@ -78,4 +78,4 @@ public function execute(PHPUnit_Extensions_Database_DB_IDatabaseConnection $conn
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Test/PHPUnit/Db/Operation/Insert.php b/lib/Zend/Test/PHPUnit/Db/Operation/Insert.php
index c8b5e5a12aa..5d380f915ac 100644
--- a/lib/Zend/Test/PHPUnit/Db/Operation/Insert.php
+++ b/lib/Zend/Test/PHPUnit/Db/Operation/Insert.php
@@ -101,4 +101,4 @@ protected function buildInsertValues(PHPUnit_Extensions_Database_DataSet_ITable
         }
         return $values;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Test/PHPUnit/Db/Operation/Truncate.php b/lib/Zend/Test/PHPUnit/Db/Operation/Truncate.php
index 64a07b58eff..9d5cf89b51d 100644
--- a/lib/Zend/Test/PHPUnit/Db/Operation/Truncate.php
+++ b/lib/Zend/Test/PHPUnit/Db/Operation/Truncate.php
@@ -127,4 +127,4 @@ private function _isMssqlOrOracle($db)
             $db instanceof Zend_Db_Adapter_Oracle
         );
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Test/PHPUnit/Db/SimpleTester.php b/lib/Zend/Test/PHPUnit/Db/SimpleTester.php
index a4070181411..76be930d77a 100644
--- a/lib/Zend/Test/PHPUnit/Db/SimpleTester.php
+++ b/lib/Zend/Test/PHPUnit/Db/SimpleTester.php
@@ -92,4 +92,4 @@ public function setUpDatabase(PHPUnit_Extensions_Database_DataSet_IDataSet $data
         $this->setDataSet($dataSet);
         $this->onSetUp();
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Framework/Action/Interface.php b/lib/Zend/Tool/Framework/Action/Interface.php
index 86898e56830..fda8ec4ed09 100644
--- a/lib/Zend/Tool/Framework/Action/Interface.php
+++ b/lib/Zend/Tool/Framework/Action/Interface.php
@@ -29,4 +29,4 @@
 interface Zend_Tool_Framework_Action_Interface
 {
     public function getName();
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Framework/Client/Config.php b/lib/Zend/Tool/Framework/Client/Config.php
index c681ad23fdd..0d783ef4f7d 100644
--- a/lib/Zend/Tool/Framework/Client/Config.php
+++ b/lib/Zend/Tool/Framework/Client/Config.php
@@ -241,4 +241,4 @@ protected function getConfigWriter()
         }
         return $writer;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Framework/Client/Console/ResponseDecorator/AlignCenter.php b/lib/Zend/Tool/Framework/Client/Console/ResponseDecorator/AlignCenter.php
index c539c11a7be..b1fa549c9f0 100644
--- a/lib/Zend/Tool/Framework/Client/Console/ResponseDecorator/AlignCenter.php
+++ b/lib/Zend/Tool/Framework/Client/Console/ResponseDecorator/AlignCenter.php
@@ -63,4 +63,4 @@ public function decorate($content, $lineLength)
         }
         return $content;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Framework/Client/Exception.php b/lib/Zend/Tool/Framework/Client/Exception.php
index 445751b2a5e..2a129d421e8 100644
--- a/lib/Zend/Tool/Framework/Client/Exception.php
+++ b/lib/Zend/Tool/Framework/Client/Exception.php
@@ -33,4 +33,4 @@
  */
 class Zend_Tool_Framework_Client_Exception extends Zend_Tool_Framework_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Framework/Client/Request.php b/lib/Zend/Tool/Framework/Client/Request.php
index 7fda55bd5c6..0377f86f3a7 100644
--- a/lib/Zend/Tool/Framework/Client/Request.php
+++ b/lib/Zend/Tool/Framework/Client/Request.php
@@ -296,4 +296,4 @@ public function isDispatchable()
         return $this->_isDispatchable;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Framework/Exception.php b/lib/Zend/Tool/Framework/Exception.php
index 7b4166ac703..3d365462d11 100644
--- a/lib/Zend/Tool/Framework/Exception.php
+++ b/lib/Zend/Tool/Framework/Exception.php
@@ -33,4 +33,4 @@
  */
 class Zend_Tool_Framework_Exception extends Zend_Exception
 {
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Framework/Loader/BasicLoader.php b/lib/Zend/Tool/Framework/Loader/BasicLoader.php
index c6349086e6a..8e9000925c3 100644
--- a/lib/Zend/Tool/Framework/Loader/BasicLoader.php
+++ b/lib/Zend/Tool/Framework/Loader/BasicLoader.php
@@ -154,4 +154,4 @@ private function _isProviderImplementation($reflectionClass)
         );
     }
     
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Framework/Metadata/Basic.php b/lib/Zend/Tool/Framework/Metadata/Basic.php
index 534d419e4fd..edc87d8d667 100644
--- a/lib/Zend/Tool/Framework/Metadata/Basic.php
+++ b/lib/Zend/Tool/Framework/Metadata/Basic.php
@@ -224,4 +224,4 @@ public function __toString()
     {
         return 'Type: ' . $this->_type . ', Name: ' . $this->_name . ', Value: ' . (is_array($this->_value) ? http_build_query($this->_value) : (string) $this->_value);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Framework/Provider/Exception.php b/lib/Zend/Tool/Framework/Provider/Exception.php
index de292e5d940..c2a27157942 100644
--- a/lib/Zend/Tool/Framework/Provider/Exception.php
+++ b/lib/Zend/Tool/Framework/Provider/Exception.php
@@ -34,4 +34,4 @@
 class Zend_Tool_Framework_Provider_Exception extends Zend_Tool_Framework_Exception
 {
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Framework/Provider/Signature.php b/lib/Zend/Tool/Framework/Provider/Signature.php
index f4d57e08410..8d85defbd1e 100644
--- a/lib/Zend/Tool/Framework/Provider/Signature.php
+++ b/lib/Zend/Tool/Framework/Provider/Signature.php
@@ -391,4 +391,4 @@ protected function _processActionableMethods()
         $this->_actionableMethods = $actionableMethods;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Framework/System/Action/Create.php b/lib/Zend/Tool/Framework/System/Action/Create.php
index fc67bd926b1..f884deb41d8 100644
--- a/lib/Zend/Tool/Framework/System/Action/Create.php
+++ b/lib/Zend/Tool/Framework/System/Action/Create.php
@@ -41,4 +41,4 @@
 class Zend_Tool_Framework_System_Action_Create extends Zend_Tool_Framework_Action_Base
 {
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Framework/System/Provider/Config.php b/lib/Zend/Tool/Framework/System/Provider/Config.php
index 7cc1ce3a003..9dd51b37ead 100644
--- a/lib/Zend/Tool/Framework/System/Provider/Config.php
+++ b/lib/Zend/Tool/Framework/System/Provider/Config.php
@@ -320,4 +320,4 @@ protected function _loadUserConfigIfExists()
 
         return $userConfig;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Context/Content/Engine.php b/lib/Zend/Tool/Project/Context/Content/Engine.php
index 1ae0c6b78d3..37051a61d49 100644
--- a/lib/Zend/Tool/Project/Context/Content/Engine.php
+++ b/lib/Zend/Tool/Project/Context/Content/Engine.php
@@ -103,4 +103,4 @@ public function getContent(Zend_Tool_Project_Context_Interface $context, $method
         return $content;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Context/Content/Engine/CodeGenerator.php b/lib/Zend/Tool/Project/Context/Content/Engine/CodeGenerator.php
index 96e9eedc811..cdb4ddf228c 100644
--- a/lib/Zend/Tool/Project/Context/Content/Engine/CodeGenerator.php
+++ b/lib/Zend/Tool/Project/Context/Content/Engine/CodeGenerator.php
@@ -95,4 +95,4 @@ public function getContent(Zend_Tool_Project_Context_Interface $context, $method
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Context/Content/Engine/Phtml.php b/lib/Zend/Tool/Project/Context/Content/Engine/Phtml.php
index 75ee9bc76ed..39f534db7b8 100644
--- a/lib/Zend/Tool/Project/Context/Content/Engine/Phtml.php
+++ b/lib/Zend/Tool/Project/Context/Content/Engine/Phtml.php
@@ -86,4 +86,4 @@ public function getContent(Zend_Tool_Project_Context_Interface $context, $method
         return $content;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Context/Filesystem/Abstract.php b/lib/Zend/Tool/Project/Context/Filesystem/Abstract.php
index 97671bb45bd..4b9fd7c9c28 100644
--- a/lib/Zend/Tool/Project/Context/Filesystem/Abstract.php
+++ b/lib/Zend/Tool/Project/Context/Filesystem/Abstract.php
@@ -162,4 +162,4 @@ abstract public function create();
      */
     abstract public function delete();
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Context/Filesystem/Directory.php b/lib/Zend/Tool/Project/Context/Filesystem/Directory.php
index b9b9ce73681..c5571577cca 100644
--- a/lib/Zend/Tool/Project/Context/Filesystem/Directory.php
+++ b/lib/Zend/Tool/Project/Context/Filesystem/Directory.php
@@ -84,4 +84,4 @@ public function delete()
         return $this;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Context/System/ProjectDirectory.php b/lib/Zend/Tool/Project/Context/System/ProjectDirectory.php
index 374e4f6f9ed..7de5a4fdb0b 100644
--- a/lib/Zend/Tool/Project/Context/System/ProjectDirectory.php
+++ b/lib/Zend/Tool/Project/Context/System/ProjectDirectory.php
@@ -125,4 +125,4 @@ public function create()
         return $this;
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Context/System/ProjectProvidersDirectory.php b/lib/Zend/Tool/Project/Context/System/ProjectProvidersDirectory.php
index 216cabbc209..4a2392fe838 100644
--- a/lib/Zend/Tool/Project/Context/System/ProjectProvidersDirectory.php
+++ b/lib/Zend/Tool/Project/Context/System/ProjectProvidersDirectory.php
@@ -84,4 +84,4 @@ public function loadProviders(Zend_Tool_Framework_Registry_Interface $registry)
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Context/Zf/ActionMethod.php b/lib/Zend/Tool/Project/Context/Zf/ActionMethod.php
index d9728c58a3a..a2aff8e2592 100644
--- a/lib/Zend/Tool/Project/Context/Zf/ActionMethod.php
+++ b/lib/Zend/Tool/Project/Context/Zf/ActionMethod.php
@@ -221,4 +221,4 @@ public static function hasActionMethod($controllerPath, $actionName)
         return $controllerCodeGenFile->getClass()->hasMethod($actionName . 'Action');
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Context/Zf/CacheDirectory.php b/lib/Zend/Tool/Project/Context/Zf/CacheDirectory.php
index ebfc2dccf3e..e050c5e74a9 100644
--- a/lib/Zend/Tool/Project/Context/Zf/CacheDirectory.php
+++ b/lib/Zend/Tool/Project/Context/Zf/CacheDirectory.php
@@ -54,4 +54,4 @@ public function getName()
         return 'CacheDirectory';
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Context/Zf/DataDirectory.php b/lib/Zend/Tool/Project/Context/Zf/DataDirectory.php
index e2ac8ac70f6..2d14d69af9f 100644
--- a/lib/Zend/Tool/Project/Context/Zf/DataDirectory.php
+++ b/lib/Zend/Tool/Project/Context/Zf/DataDirectory.php
@@ -54,4 +54,4 @@ public function getName()
         return 'DataDirectory';
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Context/Zf/DocsDirectory.php b/lib/Zend/Tool/Project/Context/Zf/DocsDirectory.php
index 976674de58b..5e7b70a4308 100644
--- a/lib/Zend/Tool/Project/Context/Zf/DocsDirectory.php
+++ b/lib/Zend/Tool/Project/Context/Zf/DocsDirectory.php
@@ -58,4 +58,4 @@ public function create(){
         parent::create();
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Context/Zf/LayoutsDirectory.php b/lib/Zend/Tool/Project/Context/Zf/LayoutsDirectory.php
index 2a5e3da6efa..6279837e37e 100644
--- a/lib/Zend/Tool/Project/Context/Zf/LayoutsDirectory.php
+++ b/lib/Zend/Tool/Project/Context/Zf/LayoutsDirectory.php
@@ -54,4 +54,4 @@ public function getName()
         return 'LayoutsDirectory';
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Context/Zf/LibraryDirectory.php b/lib/Zend/Tool/Project/Context/Zf/LibraryDirectory.php
index a0d05f5ee4d..145fda6052b 100644
--- a/lib/Zend/Tool/Project/Context/Zf/LibraryDirectory.php
+++ b/lib/Zend/Tool/Project/Context/Zf/LibraryDirectory.php
@@ -54,4 +54,4 @@ public function getName()
         return 'LibraryDirectory';
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Context/Zf/LogsDirectory.php b/lib/Zend/Tool/Project/Context/Zf/LogsDirectory.php
index a3435cbc493..f4e50b24dd8 100644
--- a/lib/Zend/Tool/Project/Context/Zf/LogsDirectory.php
+++ b/lib/Zend/Tool/Project/Context/Zf/LogsDirectory.php
@@ -54,4 +54,4 @@ public function getName()
         return 'LogsDirectory';
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Context/Zf/ModelFile.php b/lib/Zend/Tool/Project/Context/Zf/ModelFile.php
index 4026c046943..df7358e760c 100644
--- a/lib/Zend/Tool/Project/Context/Zf/ModelFile.php
+++ b/lib/Zend/Tool/Project/Context/Zf/ModelFile.php
@@ -99,4 +99,4 @@ public function getContents()
     }
     
     
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Context/Zf/SearchIndexesDirectory.php b/lib/Zend/Tool/Project/Context/Zf/SearchIndexesDirectory.php
index 566f6b5d215..fcbb79774eb 100644
--- a/lib/Zend/Tool/Project/Context/Zf/SearchIndexesDirectory.php
+++ b/lib/Zend/Tool/Project/Context/Zf/SearchIndexesDirectory.php
@@ -54,4 +54,4 @@ public function getName()
         return 'SearchIndexesDirectory';
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Context/Zf/TestApplicationControllerDirectory.php b/lib/Zend/Tool/Project/Context/Zf/TestApplicationControllerDirectory.php
index 67ece59cc1b..18834035dcf 100644
--- a/lib/Zend/Tool/Project/Context/Zf/TestApplicationControllerDirectory.php
+++ b/lib/Zend/Tool/Project/Context/Zf/TestApplicationControllerDirectory.php
@@ -54,4 +54,4 @@ public function getName()
         return 'TestApplicationControllerDirectory';
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Context/Zf/TestLibraryFile.php b/lib/Zend/Tool/Project/Context/Zf/TestLibraryFile.php
index a3e3f08aa8a..c4a8d8cd398 100644
--- a/lib/Zend/Tool/Project/Context/Zf/TestLibraryFile.php
+++ b/lib/Zend/Tool/Project/Context/Zf/TestLibraryFile.php
@@ -104,4 +104,4 @@ public function getContents()
         return $codeGenFile->generate();
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Context/Zf/ViewFiltersDirectory.php b/lib/Zend/Tool/Project/Context/Zf/ViewFiltersDirectory.php
index c0bbced7027..13b4d0df8e4 100644
--- a/lib/Zend/Tool/Project/Context/Zf/ViewFiltersDirectory.php
+++ b/lib/Zend/Tool/Project/Context/Zf/ViewFiltersDirectory.php
@@ -54,4 +54,4 @@ public function getName()
         return 'ViewFiltersDirectory';
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Profile.php b/lib/Zend/Tool/Project/Profile.php
index fc5d1ad9a9c..54b62b9aa06 100644
--- a/lib/Zend/Tool/Project/Profile.php
+++ b/lib/Zend/Tool/Project/Profile.php
@@ -234,4 +234,4 @@ public function __toString()
         }
         return $string;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Profile/FileParser/Interface.php b/lib/Zend/Tool/Project/Profile/FileParser/Interface.php
index 4021c36f4f6..e9a73fe84b9 100644
--- a/lib/Zend/Tool/Project/Profile/FileParser/Interface.php
+++ b/lib/Zend/Tool/Project/Profile/FileParser/Interface.php
@@ -51,4 +51,4 @@ public function serialize(Zend_Tool_Project_Profile $profile);
      */
     public function unserialize($data, Zend_Tool_Project_Profile $profile);
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Profile/FileParser/Xml.php b/lib/Zend/Tool/Project/Profile/FileParser/Xml.php
index e391be8a572..d00aa245f72 100644
--- a/lib/Zend/Tool/Project/Profile/FileParser/Xml.php
+++ b/lib/Zend/Tool/Project/Profile/FileParser/Xml.php
@@ -237,4 +237,4 @@ protected function _lazyLoadContexts()
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Profile/Iterator/EnabledResourceFilter.php b/lib/Zend/Tool/Project/Profile/Iterator/EnabledResourceFilter.php
index dee203720a2..399ac52a5c2 100644
--- a/lib/Zend/Tool/Project/Profile/Iterator/EnabledResourceFilter.php
+++ b/lib/Zend/Tool/Project/Profile/Iterator/EnabledResourceFilter.php
@@ -40,4 +40,4 @@ public function accept()
     {
         return $this->current()->isEnabled();
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Profile/Resource.php b/lib/Zend/Tool/Project/Profile/Resource.php
index 29a65908bc3..ae3ba8bca39 100644
--- a/lib/Zend/Tool/Project/Profile/Resource.php
+++ b/lib/Zend/Tool/Project/Profile/Resource.php
@@ -259,4 +259,4 @@ public function __call($method, $arguments)
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Profile/Resource/Container.php b/lib/Zend/Tool/Project/Profile/Resource/Container.php
index 3bad6914b33..b01c7f2f401 100644
--- a/lib/Zend/Tool/Project/Profile/Resource/Container.php
+++ b/lib/Zend/Tool/Project/Profile/Resource/Container.php
@@ -418,4 +418,4 @@ public function __clone()
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Profile/Resource/SearchConstraints.php b/lib/Zend/Tool/Project/Profile/Resource/SearchConstraints.php
index f087d5df6f5..ee0d2a921de 100644
--- a/lib/Zend/Tool/Project/Profile/Resource/SearchConstraints.php
+++ b/lib/Zend/Tool/Project/Profile/Resource/SearchConstraints.php
@@ -114,4 +114,4 @@ protected function _makeConstraint($name, $params)
         return new ArrayObject($value, ArrayObject::ARRAY_AS_PROPS);
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Provider/DbTable.php b/lib/Zend/Tool/Project/Provider/DbTable.php
index 729f1294a7d..1a51f085f12 100644
--- a/lib/Zend/Tool/Project/Provider/DbTable.php
+++ b/lib/Zend/Tool/Project/Provider/DbTable.php
@@ -217,4 +217,4 @@ protected function _convertTableNameToClassName($tableName)
         return $this->_nameFilter->filter($tableName);
     }
     
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Provider/Form.php b/lib/Zend/Tool/Project/Provider/Form.php
index 90948f583c9..971f442778e 100644
--- a/lib/Zend/Tool/Project/Provider/Form.php
+++ b/lib/Zend/Tool/Project/Provider/Form.php
@@ -177,4 +177,4 @@ public function create($name, $module = null)
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Tool/Project/Provider/Project.php b/lib/Zend/Tool/Project/Provider/Project.php
index 64c3713971b..36cefec8038 100644
--- a/lib/Zend/Tool/Project/Provider/Project.php
+++ b/lib/Zend/Tool/Project/Provider/Project.php
@@ -236,4 +236,4 @@ public static function getDefaultReadmeContents($caller = null)
 
 EOS;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Validate/Barcode.php b/lib/Zend/Validate/Barcode.php
index 6c1cf55b844..b3cfe521355 100644
--- a/lib/Zend/Validate/Barcode.php
+++ b/lib/Zend/Validate/Barcode.php
@@ -225,4 +225,4 @@ public function isValid($value)
 
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Validate/File/Crc32.php b/lib/Zend/Validate/File/Crc32.php
index 42d4f406648..46141ac0b09 100644
--- a/lib/Zend/Validate/File/Crc32.php
+++ b/lib/Zend/Validate/File/Crc32.php
@@ -176,4 +176,4 @@ public function isValid($value, $file = null)
 
         return $this->_throw($file, self::DOES_NOT_MATCH);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/Validate/Hostname/Com.php b/lib/Zend/Validate/Hostname/Com.php
index 413971fec5f..3437578e856 100644
--- a/lib/Zend/Validate/Hostname/Com.php
+++ b/lib/Zend/Validate/Hostname/Com.php
@@ -195,4 +195,4 @@
     79 => '/^[\x{20000}-\x{2A6DF}]{1,63}$/iu',
     80 => '/^[\x{2F800}-\x{2FA1F}]{1,63}$/iu'
 
-);
\ No newline at end of file
+);
diff --git a/lib/Zend/XmlRpc/Generator/DomDocument.php b/lib/Zend/XmlRpc/Generator/DomDocument.php
index e8cc47e0492..93dd9b25cd7 100644
--- a/lib/Zend/XmlRpc/Generator/DomDocument.php
+++ b/lib/Zend/XmlRpc/Generator/DomDocument.php
@@ -98,4 +98,4 @@ protected function _init()
         $this->_dom = new DOMDocument('1.0', $this->_encoding);
         $this->_currentElement = $this->_dom;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/XmlRpc/Generator/XmlWriter.php b/lib/Zend/XmlRpc/Generator/XmlWriter.php
index 7d3ef74bb40..e1fa7536b89 100644
--- a/lib/Zend/XmlRpc/Generator/XmlWriter.php
+++ b/lib/Zend/XmlRpc/Generator/XmlWriter.php
@@ -89,4 +89,4 @@ public function saveXml()
     {
         return $this->_xmlWriter->flush(false);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/XmlRpc/Value/Base64.php b/lib/Zend/XmlRpc/Value/Base64.php
index 0ff55460aae..a6f65c71670 100644
--- a/lib/Zend/XmlRpc/Value/Base64.php
+++ b/lib/Zend/XmlRpc/Value/Base64.php
@@ -65,4 +65,4 @@ public function getValue()
     {
         return base64_decode($this->_value);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/XmlRpc/Value/Boolean.php b/lib/Zend/XmlRpc/Value/Boolean.php
index 8335bb43202..73f76f6041c 100644
--- a/lib/Zend/XmlRpc/Value/Boolean.php
+++ b/lib/Zend/XmlRpc/Value/Boolean.php
@@ -60,4 +60,4 @@ public function getValue()
     {
         return (bool)$this->_value;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/XmlRpc/Value/Scalar.php b/lib/Zend/XmlRpc/Value/Scalar.php
index e7a081692d3..01e0a50a1af 100644
--- a/lib/Zend/XmlRpc/Value/Scalar.php
+++ b/lib/Zend/XmlRpc/Value/Scalar.php
@@ -50,4 +50,4 @@ protected function _generateXml()
                   ->closeElement($this->_type)
                   ->closeElement('value');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/XmlRpc/Value/String.php b/lib/Zend/XmlRpc/Value/String.php
index cd138f4dcf8..267d7cd28eb 100644
--- a/lib/Zend/XmlRpc/Value/String.php
+++ b/lib/Zend/XmlRpc/Value/String.php
@@ -57,4 +57,4 @@ public function getValue()
     {
         return (string)$this->_value;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/XmlRpc/Value/Struct.php b/lib/Zend/XmlRpc/Value/Struct.php
index dd52defc975..341066a4d4c 100644
--- a/lib/Zend/XmlRpc/Value/Struct.php
+++ b/lib/Zend/XmlRpc/Value/Struct.php
@@ -72,4 +72,4 @@ protected function _generateXML()
         $generator->closeElement('struct')
                   ->closeElement('value');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/googlecheckout/googlecart.php b/lib/googlecheckout/googlecart.php
index 5b4bde63575..34c8dfbffec 100644
--- a/lib/googlecheckout/googlecart.php
+++ b/lib/googlecheckout/googlecart.php
@@ -1610,4 +1610,4 @@ function MerchantPrivateItemData($data = array()) {
       $this->type = 'merchant-private-item-data';
     }
   }
-?>
\ No newline at end of file
+?>
diff --git a/lib/googlecheckout/googlerequest.php b/lib/googlecheckout/googlerequest.php
index 809716f76eb..1012f8e8400 100644
--- a/lib/googlecheckout/googlerequest.php
+++ b/lib/googlecheckout/googlerequest.php
@@ -778,4 +778,4 @@ function AddTrackingData($carrier, $tracking_no) {
     }
   }
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/googlecheckout/googleresponse.php b/lib/googlecheckout/googleresponse.php
index b8dd7647890..3fca99ad8b0 100644
--- a/lib/googlecheckout/googleresponse.php
+++ b/lib/googlecheckout/googleresponse.php
@@ -237,4 +237,4 @@ function GetParsedXML($request=null){
       return array($this->root, $this->data);
     }
   }
-?>
\ No newline at end of file
+?>
diff --git a/php.ini.sample b/php.ini.sample
index 27c8dd11194..e6c5376083b 100644
--- a/php.ini.sample
+++ b/php.ini.sample
@@ -32,3 +32,7 @@ zend.ze1_compatibility_mode = off
 ; and disables mcrypt if this line is missing in local php.ini
 
 extension=mcrypt.so
+
+; Disable PHP errors, notices and warnings output in production mode to prevent exposing sensitive information.
+
+display_errors = Off
diff --git a/shell/abstract.php b/shell/abstract.php
index 4f95af56b05..e32716ad6f1 100644
--- a/shell/abstract.php
+++ b/shell/abstract.php
@@ -68,6 +68,13 @@ abstract class Mage_Shell_Abstract
      */
     protected $_args        = array();
 
+    /**
+     * Factory instance
+     *
+     * @var Mage_Core_Model_Factory
+     */
+    protected $_factory;
+
     /**
      * Initialize application and parse input parameters
      *
@@ -78,6 +85,7 @@ public function __construct()
             require_once $this->_getRootPath() . 'app' . DIRECTORY_SEPARATOR . 'Mage.php';
             Mage::app($this->_appCode, $this->_appType);
         }
+        $this->_factory = new Mage_Core_Model_Factory();
 
         $this->_applyPhpVariables();
         $this->_parseArgs();
diff --git a/shell/indexer.php b/shell/indexer.php
index c9185395c31..d10261f2c5d 100644
--- a/shell/indexer.php
+++ b/shell/indexer.php
@@ -42,7 +42,7 @@ class Mage_Shell_Compiler extends Mage_Shell_Abstract
      */
     protected function _getIndexer()
     {
-        return Mage::getSingleton('index/indexer');
+        return $this->_factory->getSingleton($this->_factory->getIndexClassAlias());
     }
 
     /**
@@ -57,18 +57,23 @@ protected function _parseIndexerString($string)
         if ($string == 'all') {
             $collection = $this->_getIndexer()->getProcessesCollection();
             foreach ($collection as $process) {
+                if ($process->getIndexer()->isVisible() === false) {
+                    continue;
+                }
                 $processes[] = $process;
             }
         } else if (!empty($string)) {
             $codes = explode(',', $string);
-            foreach ($codes as $code) {
-                $process = $this->_getIndexer()->getProcessByCode(trim($code));
-                if (!$process) {
-                    echo 'Warning: Unknown indexer with code ' . trim($code) . "\n";
-                } else {
-                    $processes[] = $process;
+            $codes = array_map('trim', $codes);
+            $processes = $this->_getIndexer()->getProcessesCollectionByCodes($codes);
+            foreach($processes as $key => $process) {
+                if ($process->getIndexer()->getVisibility() === false) {
+                    unset($processes[$key]);
                 }
             }
+            if ($this->_getIndexer()->hasErrors()) {
+                echo implode(PHP_EOL, $this->_getIndexer()->getErrors()), PHP_EOL;
+            }
         }
         return $processes;
     }
@@ -103,17 +108,18 @@ public function run()
                         case Mage_Index_Model_Process::STATUS_REQUIRE_REINDEX:
                             $status = 'Require Reindex';
                             break;
-
                         case Mage_Index_Model_Process::STATUS_RUNNING:
                             $status = 'Running';
                             break;
-
                         default:
                             $status = 'Ready';
                             break;
                     }
                 } else {
                     switch ($process->getMode()) {
+                        case Mage_Index_Model_Process::MODE_SCHEDULE:
+                            $status = 'Update by schedule';
+                            break;
                         case Mage_Index_Model_Process::MODE_REAL_TIME:
                             $status = 'Update on Save';
                             break;
@@ -122,7 +128,7 @@ public function run()
                             break;
                     }
                 }
-                echo sprintf('%-30s ', $process->getIndexer()->getName() . ':') . $status ."\n";
+                echo sprintf('%-35s ', $process->getIndexer()->getName() . ':') . $status ."\n";
 
             }
         } else if ($this->getArg('mode-realtime') || $this->getArg('mode-manual')) {
@@ -152,17 +158,25 @@ public function run()
                 $processes = $this->_parseIndexerString('all');
             }
 
-            foreach ($processes as $process) {
-                /* @var $process Mage_Index_Model_Process */
-                try {
-                    $process->reindexEverything();
-                    echo $process->getIndexer()->getName() . " index was rebuilt successfully\n";
-                } catch (Mage_Core_Exception $e) {
-                    echo $e->getMessage() . "\n";
-                } catch (Exception $e) {
-                    echo $process->getIndexer()->getName() . " index process unknown error:\n";
-                    echo $e . "\n";
+            try {
+                Mage::dispatchEvent('shell_reindex_init_process');
+                foreach ($processes as $process) {
+                    /* @var $process Mage_Index_Model_Process */
+                    try {
+                        $process->reindexEverything();
+                        Mage::dispatchEvent($process->getIndexerCode() . '_shell_reindex_after');
+                        echo $process->getIndexer()->getName() . " index was rebuilt successfully\n";
+                    } catch (Mage_Core_Exception $e) {
+                        echo $e->getMessage() . "\n";
+                    } catch (Exception $e) {
+                        echo $process->getIndexer()->getName() . " index process unknown error:\n";
+                        echo $e . "\n";
+                    }
                 }
+                Mage::dispatchEvent('shell_reindex_finalize_process');
+            } catch (Exception $e) {
+                Mage::dispatchEvent('shell_reindex_finalize_process');
+                echo $e->getMessage() . "\n";
             }
 
         } else {
diff --git a/skin/adminhtml/default/default/below_ie7.css b/skin/adminhtml/default/default/below_ie7.css
index 59c21963d85..93d558c9caa 100644
--- a/skin/adminhtml/default/default/below_ie7.css
+++ b/skin/adminhtml/default/default/below_ie7.css
@@ -54,4 +54,4 @@
 .product-options .options-list li { zoom:1; }
 
 /* Hover Fix */
-iframe.hover-fix { position:absolute; left:-1px; top:-1px; z-index:-1; background:transparent; filter:progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0); }
\ No newline at end of file
+iframe.hover-fix { position:absolute; left:-1px; top:-1px; z-index:-1; background:transparent; filter:progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0); }
diff --git a/skin/adminhtml/default/default/ie7.css b/skin/adminhtml/default/default/ie7.css
index df926cfd202..05a4183b720 100644
--- a/skin/adminhtml/default/default/ie7.css
+++ b/skin/adminhtml/default/default/ie7.css
@@ -24,4 +24,4 @@
 .db-menu ul li a { background:transparent url(images/db-menu-bg-up.gif) repeat-x 0px 3px; height:26px; }
 .db-menu ul li a:hover, .db-menu ul li a.hover { background:transparent url(images/db-menu-bg-hov.gif) repeat-x 0px 3px; }
 .graph-block { height:auto; }
-.db-menu { width:947px; }
\ No newline at end of file
+.db-menu { width:947px; }
diff --git a/skin/adminhtml/default/default/images/xmlconnect/btn_edit.gif b/skin/adminhtml/default/default/images/xmlconnect/btn_edit.gif
new file mode 100644
index 00000000000..8a10a55c6b6
Binary files /dev/null and b/skin/adminhtml/default/default/images/xmlconnect/btn_edit.gif differ
diff --git a/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/mobile-home.css b/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/mobile-home.css
index f175161edf9..92e62546f41 100644
--- a/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/mobile-home.css
+++ b/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/mobile-home.css
@@ -178,4 +178,4 @@ body { margin: 0; padding: 0 }
 	text-align: center;
 	font: bold 11px arial;
 	color: #e9e9e9;
-}
\ No newline at end of file
+}
diff --git a/skin/adminhtml/default/default/images/xmlconnect/remove.png b/skin/adminhtml/default/default/images/xmlconnect/remove.png
new file mode 100644
index 00000000000..2237e92e65e
Binary files /dev/null and b/skin/adminhtml/default/default/images/xmlconnect/remove.png differ
diff --git a/skin/adminhtml/default/default/menu.css b/skin/adminhtml/default/default/menu.css
index 567c0ab8062..ac82cf30057 100644
--- a/skin/adminhtml/default/default/menu.css
+++ b/skin/adminhtml/default/default/menu.css
@@ -96,4 +96,4 @@
 #nav li.over ul li.over ul ul { left:-10000px;}
 #nav li.over ul li.over ul li.over ul { left:100px; }
 
-.nav-bar:after { content:"."; display:block; clear:both; font-size:0; line-height:0; height:0; overflow:hidden;  }
\ No newline at end of file
+.nav-bar:after { content:"."; display:block; clear:both; font-size:0; line-height:0; height:0; overflow:hidden;  }
diff --git a/skin/adminhtml/default/default/print.css b/skin/adminhtml/default/default/print.css
index fcb69d39665..07739591a1e 100644
--- a/skin/adminhtml/default/default/print.css
+++ b/skin/adminhtml/default/default/print.css
@@ -36,4 +36,4 @@ th,td { color:#333 !important;  border-color:#ccc !important; }
 #sales_order_grid_massaction,
 .content-header-floating,
 .content-header .form-buttons,
-.footer { display:none !important; }
\ No newline at end of file
+.footer { display:none !important; }
diff --git a/skin/adminhtml/default/default/reset.css b/skin/adminhtml/default/default/reset.css
index b15a76eb926..de8cbd82b43 100644
--- a/skin/adminhtml/default/default/reset.css
+++ b/skin/adminhtml/default/default/reset.css
@@ -70,4 +70,4 @@ dt                      { display:block; }
 
 /* Size */
 small                   { font-size:.9em; }
-big                     { font-size:1.25em; }
\ No newline at end of file
+big                     { font-size:1.25em; }
diff --git a/skin/adminhtml/default/default/xmlconnect/boxes.css b/skin/adminhtml/default/default/xmlconnect/boxes.css
index 809cb8f014e..0a4cf3073b1 100644
--- a/skin/adminhtml/default/default/xmlconnect/boxes.css
+++ b/skin/adminhtml/default/default/xmlconnect/boxes.css
@@ -47,4 +47,70 @@
 
 .ipad-portrait { margin:0 0 5px; overflow:hidden; }
 .ipad-landscape { margin:0 0 5px; }
-.ipad-tab-landscape { width:425px; }
\ No newline at end of file
+.ipad-tab-landscape { width:425px; }
+
+.save-application { border:solid #d6d6d6; border-width:0 1px 1px; font-weight:bold; margin-bottom:15px; padding:15px; text-align:center; }
+.recommended-size { font-size:11px; margin-bottom:15px; padding:0 15px 0 0; }
+
+.app-images { background:#fafafa; border:1px solid #d6d6d6; border-top:none; overflow:hidden; margin:0 0 15px; padding:0 0 0 15px; }
+.app-images ul { display:table; zoom:1; }
+.item-label { background:#ececec; border-bottom:1px solid #d6d6d6; border-top:1px solid #d6d6d6; clear:left; font-weight:bold; padding:2px 10px; margin:0 0 10px -15px; position:relative; }
+.image-item,
+.image-item-upload { display:inline-block; text-align:left; margin:0 12px 15px 0; position:relative; vertical-align:top; width:160px; }
+.image-item strong { float:left; }
+.image-item .edit-btn { background:url(../images/xmlconnect/btn_edit.gif) no-repeat 100% 2px; display:block; overflow:hidden; padding:0 10px 0 5px; }
+.image-item .image-placeholder,
+.image-item-upload .image-placeholder {
+    box-shadow:0 0 5px #000;
+    -webkit-box-shadow:0 0 5px #d3d3d3;
+       -moz-box-shadow:0 0 5px #d3d3d3;
+            box-shadow:0 0 5px #d3d3d3;
+    -webkit-box-shadow:0 0 5px rgba(0, 0, 0, .35);
+       -moz-box-shadow:0 0 5px rgba(0, 0, 0, .35);
+            box-shadow:0 0 5px rgba(0, 0, 0, .35);
+    line-height:115px;
+    text-align:left;
+    height:115px;
+    margin:0 0 5px;
+    padding-left:25px;
+    width:135px;
+}
+
+.image-item-upload .banner-image { }
+.image-item-upload .flex { position:absolute !important; top:50px; left:100px; }
+.image-item-upload .image-placeholder { background:#fff !important; border:1px solid #eee; margin-bottom:0; }
+
+.image-item .uploader .file-row-info,
+.image-item-upload .uploader .file-row-info { margin:0; }
+.image-item-upload .uploader .file-row { font-size:11px; margin:0; padding:5px; }
+.image-item-upload .uploader .file-row .progress-text { float:none; }
+.image-item-upload .uploader .file-row-info .file-info { display:none; }
+.image-item-upload .uploader .progress,
+.image-item-upload .uploader .complete,
+.image-item-upload .uploader .error { display:block; height:100px; text-align:center; }
+.image-item-upload .uploader .complete { text-align:center; line-height:95px; }
+.image-item-upload .uploader .file-row-info img { vertical-align:bottom; }
+.image-item-upload .uploader .file-row-narrow { margin:0; width:140px; }
+.image-item .validation-advice { margin:8px 0 0; text-align:left; width:auto; }
+.image-item .item-remove { background:url(../images/xmlconnect/remove.png?1) no-repeat 0 0; height:24px; width:24px; position:absolute; top:-12px; right:-12px; text-indent:-999em; }
+
+.banners-wrap { overflow:hidden; position:relative; }
+.banners { text-align:center; white-space:nowrap; position:relative; left:0; overflow:hidden; }
+.banners img { vertical-align:bottom; }
+.banners .gallery-item { float:left; text-align:center; }
+
+#image_edit_block { background:#fafafa; border:1px solid #d6d6d6; position:fixed; top:30%; left:50%; margin:0 0 0 -150px; width:300px; z-index:400; }
+.image-edit-popup-head { background:#6f8992; color:#fff; font-weight:bold; padding:2px 10px; }
+.image-edit-popup-content { padding:10px 10px 15px; }
+.image-edit-popup-content label { vertical-align:middle; }
+.image-edit-popup-content .autocomplete { top:21px !important; left:0 !important; }
+.image-edit-popup-content .autocomplete ul { overflow:auto; max-height:300px; }
+.image-edit-popup-content .action-select { border-bottom:1px solid #ddd; padding:0 0 10px; margin:0 0 10px; }
+.image-edit-popup-content .autocomplete-indicator { position:absolute; top:0px; right:2px; }
+.image-edit-popup-content .action { position:relative; }
+.image-edit-popup-content .action select,
+.image-edit-popup-content .action input { width:98%; }
+.image-edit-popup .buttons-set { margin:0; padding:0 10px 10px; text-align:right; }
+.image-edit-popup .buttons-set button { margin:0 0 0 5px; }
+.image-edit-popup .buttons-set button.delete { float:left; margin:0; }
+.image-edit-popup .buttons-set button.delete span { background:none; padding:0; }
diff --git a/skin/adminhtml/default/default/xmlconnect/dropdown.css b/skin/adminhtml/default/default/xmlconnect/dropdown.css
index e847ee5e733..a1a051a2b88 100644
--- a/skin/adminhtml/default/default/xmlconnect/dropdown.css
+++ b/skin/adminhtml/default/default/xmlconnect/dropdown.css
@@ -6,4 +6,4 @@
 .dropdown li.ddtitle a:hover { background:url(../images/xmlconnect/dropdown-arrow.gif) 100% 8px no-repeat; }
 .dropdown li.ddlist { background:#fff; left:0; position:absolute; border:1px solid #ccc; border-top:0; width:200px; margin:-1px 0 0 -1px !important; padding:1px 0 0 0; }
 .dropdown li { zoom:1; }
-/* .accordion dt { background:red !important; } */
\ No newline at end of file
+/* .accordion dt { background:red !important; } */
diff --git a/skin/adminhtml/default/default/xmlconnect/iestyles.css b/skin/adminhtml/default/default/xmlconnect/iestyles.css
new file mode 100644
index 00000000000..cc70e448521
--- /dev/null
+++ b/skin/adminhtml/default/default/xmlconnect/iestyles.css
@@ -0,0 +1,39 @@
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright  Copyright (c) 2010 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+
+*+html .image-item,
+*+html .image-item-upload { display:inline; zoom:1; }
+
+.banners-wrap { height:100%; }
+.image-item .image-placeholder,
+.image-item-upload .image-placeholder {
+    filter:
+        progid:DXImageTransform.Microsoft.Shadow(color='#d3d3d3', Direction=45, Strength=3)
+        progid:DXImageTransform.Microsoft.Shadow(color='#d3d3d3', Direction=135, Strength=3)
+        progid:DXImageTransform.Microsoft.Shadow(color='#d3d3d3', Direction=225, Strength=3)
+        progid:DXImageTransform.Microsoft.Shadow(color='#d3d3d3', Direction=315, Strength=3);
+    position:relative;
+    top:-6px;
+    left:-6px;
+    zoom:1;
+}
diff --git a/skin/adminhtml/default/default/xmlconnect/mobile-android.css b/skin/adminhtml/default/default/xmlconnect/mobile-android.css
index 88a6f10dc39..3c6f3eee500 100644
--- a/skin/adminhtml/default/default/xmlconnect/mobile-android.css
+++ b/skin/adminhtml/default/default/xmlconnect/mobile-android.css
@@ -285,4 +285,4 @@
             .catalog-page .cat-list .col-2 .availability {
                 color:#222;
                 font-size:11px;
-                }
\ No newline at end of file
+                }
diff --git a/skin/adminhtml/default/default/xmlconnect/mobile-ipad-catalog.css b/skin/adminhtml/default/default/xmlconnect/mobile-ipad-catalog.css
index fafad2f2b03..9232fa8757c 100644
--- a/skin/adminhtml/default/default/xmlconnect/mobile-ipad-catalog.css
+++ b/skin/adminhtml/default/default/xmlconnect/mobile-ipad-catalog.css
@@ -284,4 +284,4 @@
             }
         .ipad-catalog-landscape .sections .active {
             background:#f2f2f2;
-            }
\ No newline at end of file
+            }
diff --git a/skin/adminhtml/default/default/xmlconnect/remove.png b/skin/adminhtml/default/default/xmlconnect/remove.png
new file mode 100644
index 00000000000..788922a1e90
Binary files /dev/null and b/skin/adminhtml/default/default/xmlconnect/remove.png differ
diff --git a/skin/frontend/base/default/images/centinel/sc_learn_62x34.png b/skin/frontend/base/default/images/centinel/sc_learn_62x34.png
new file mode 100644
index 00000000000..d8029b48647
Binary files /dev/null and b/skin/frontend/base/default/images/centinel/sc_learn_62x34.png differ
diff --git a/skin/frontend/base/default/images/centinel/vbv_ltbg_71x57.png b/skin/frontend/base/default/images/centinel/vbv_ltbg_71x57.png
new file mode 100644
index 00000000000..a9629acb51d
Binary files /dev/null and b/skin/frontend/base/default/images/centinel/vbv_ltbg_71x57.png differ
diff --git a/skin/frontend/base/default/js/bundle.js b/skin/frontend/base/default/js/bundle.js
index e803e253c8c..f6f21635fdd 100644
--- a/skin/frontend/base/default/js/bundle.js
+++ b/skin/frontend/base/default/js/bundle.js
@@ -75,6 +75,12 @@ Product.Bundle.prototype = {
                 this.config.selected[parts[2]] = new Array();
             }
             this.populateQty(parts[2], selection.value);
+            var tierPriceElement = $('bundle-option-' + parts[2] + '-tier-prices'),
+                tierPriceHtml = '';
+            if (selection.value != '' && this.config.options[parts[2]].selections[selection.value].customQty == 1) {
+                tierPriceHtml = this.config.options[parts[2]].selections[selection.value].tierPriceHtml;
+            }
+            tierPriceElement.update(tierPriceHtml);
         }
         this.reloadPrice();
     },
@@ -116,6 +122,7 @@ Product.Bundle.prototype = {
             return 0;
         }
         var qty = null;
+        var tierPriceInclTax, tierPriceExclTax;
         if (this.config.options[optionId].selections[selectionId].customQty == 1 && !this.config['options'][optionId].isMulti) {
             if ($('bundle-option-' + optionId + '-qty-input')) {
                 qty = $('bundle-option-' + optionId + '-qty-input').value;
@@ -125,7 +132,6 @@ Product.Bundle.prototype = {
         } else {
             qty = this.config.options[optionId].selections[selectionId].qty;
         }
-
         if (this.config.priceType == '0') {
             price = this.config.options[optionId].selections[selectionId].price;
             tierPrice = this.config.options[optionId].selections[selectionId].tierPrice;
@@ -133,6 +139,8 @@ Product.Bundle.prototype = {
             for (var i=0; i < tierPrice.length; i++) {
                 if (Number(tierPrice[i].price_qty) <= qty && Number(tierPrice[i].price) <= price) {
                     price = tierPrice[i].price;
+                    tierPriceInclTax = tierPrice[i].priceInclTax;
+                    tierPriceExclTax = tierPrice[i].priceExclTax;
                 }
             }
         } else {
@@ -156,7 +164,10 @@ Product.Bundle.prototype = {
         }
 
         selection = this.config.options[optionId].selections[selectionId];
-        if (selection.priceInclTax !== undefined) {
+        if (tierPriceInclTax !== undefined && tierPriceExclTax !== undefined) {
+            priceInclTax = tierPriceInclTax;
+            price = tierPriceExclTax;
+        } else if (selection.priceInclTax !== undefined) {
             priceInclTax = selection.priceInclTax;
             price = selection.priceExclTax !== undefined ? selection.priceExclTax : selection.price;
         } else {
diff --git a/skin/frontend/base/default/js/msrp.js b/skin/frontend/base/default/js/msrp.js
index cccb19921b7..52af21f6a8d 100644
--- a/skin/frontend/base/default/js/msrp.js
+++ b/skin/frontend/base/default/js/msrp.js
@@ -262,11 +262,12 @@ Catalog.Map = {
             productAddToCartFormOld = productAddToCartForm;
             productAddToCartForm = new VarienForm('product_addtocart_form_from_popup');
             productAddToCartForm.submitLight = productAddToCartFormOld.submitLight;
-        }else if(!$('product_addtocart_form_from_popup')) {
+        } else if(!$('product_addtocart_form_from_popup')) {
             return false;
         } else if ('undefined' == typeof productAddToCartForm) {
             productAddToCartForm = new VarienForm('product_addtocart_form_from_popup');
         }
+
         productAddToCartForm.submit = function(button, url) {
             if (('undefined' != typeof productAddToCartFormOld) && productAddToCartFormOld) {
                 if (Catalog.Map.active) {
@@ -314,7 +315,7 @@ Catalog.Map = {
                     button.disabled = true;
                 }
             }
-        }.bind(productAddToCartForm);
+        };
     }
 };
 
diff --git a/skin/frontend/base/default/js/opcheckout.js b/skin/frontend/base/default/js/opcheckout.js
index 115db07a0ae..91ab7d7dec3 100644
--- a/skin/frontend/base/default/js/opcheckout.js
+++ b/skin/frontend/base/default/js/opcheckout.js
@@ -37,6 +37,8 @@ Checkout.prototype = {
         this.payment = '';
         this.loadWaiting = false;
         this.steps = ['login', 'billing', 'shipping', 'shipping_method', 'payment', 'review'];
+        //We use billing as beginning step since progress bar tracks from billing
+        this.currentStep = 'billing';
 
         this.accordion.sections.each(function(section) {
             Event.observe($(section).down('.step-title'), 'click', this._onSectionClick.bindAsEventListener(this));
@@ -54,7 +56,7 @@ Checkout.prototype = {
         var section = $(Event.element(event).up().up());
         if (section.hasClassName('allow')) {
             Event.stop(event);
-            this.gotoSection(section.readAttribute('id').replace('opc-', ''));
+            this.gotoSection(section.readAttribute('id').replace('opc-', ''), false);
             return false;
         }
     },
@@ -64,10 +66,21 @@ Checkout.prototype = {
     },
 
     reloadProgressBlock: function(toStep) {
-        var updater = new Ajax.Updater('checkout-progress-wrapper', this.progressUrl, {
-            method: 'get',
-            onFailure: this.ajaxFailure.bind(this),
-            parameters: toStep ? {toStep: toStep} : null
+        this.reloadStep(toStep);
+        if (this.syncBillingShipping) {
+            this.syncBillingShipping = false;
+            this.reloadStep('shipping');
+        }
+    },
+
+    reloadStep: function(prevStep) {
+        var updater = new Ajax.Updater(prevStep + '-progress-opcheckout', this.progressUrl, {
+            method:'get',
+            onFailure:this.ajaxFailure.bind(this),
+            onComplete: function(){
+                this.checkout.resetPreviousSteps();
+            },
+            parameters:prevStep ? { prevStep:prevStep } : null
         });
     },
 
@@ -108,12 +121,46 @@ Checkout.prototype = {
         this.loadWaiting = step;
     },
 
-    gotoSection: function(section)
-    {
-        var sectionElement = $('opc-'+section);
+    gotoSection: function (section, reloadProgressBlock) {
+
+        if (reloadProgressBlock) {
+            this.reloadProgressBlock(this.currentStep);
+        }
+        this.currentStep = section;
+        var sectionElement = $('opc-' + section);
         sectionElement.addClassName('allow');
-        this.accordion.openSection('opc-'+section);
-        this.reloadProgressBlock(section);
+        this.accordion.openSection('opc-' + section);
+        if(!reloadProgressBlock) {
+            this.resetPreviousSteps();
+        }
+    },
+
+    resetPreviousSteps: function () {
+        var stepIndex = this.steps.indexOf(this.currentStep);
+
+        //Clear other steps if already populated through javascript
+        for (var i = stepIndex; i < this.steps.length; i++) {
+            var nextStep = this.steps[i];
+            var progressDiv = nextStep + '-progress-opcheckout';
+            if ($(progressDiv)) {
+                //Remove the link
+                $(progressDiv).select('.changelink').each(function (item) {
+                    item.remove();
+                });
+                $(progressDiv).select('dt').each(function (item) {
+                    item.removeClassName('complete');
+                });
+                //Remove the content
+                $(progressDiv).select('dd.complete').each(function (item) {
+                    item.remove();
+                });
+            }
+        }
+    },
+
+    changeSection: function (section) {
+        var changeStep = section.replace('opc-', '');
+        this.gotoSection(changeStep, false);
     },
 
     setMethod: function(){
@@ -124,7 +171,7 @@ Checkout.prototype = {
                 {method: 'post', onFailure: this.ajaxFailure.bind(this), parameters: {method:'guest'}}
             );
             Element.hide('register-customer-password');
-            this.gotoSection('billing');
+            this.gotoSection('billing', true);
         }
         else if($('login:register') && ($('login:register').checked || $('login:register').type == 'hidden')) {
             this.method = 'register';
@@ -133,7 +180,7 @@ Checkout.prototype = {
                 {method: 'post', onFailure: this.ajaxFailure.bind(this), parameters: {method:'register'}}
             );
             Element.show('register-customer-password');
-            this.gotoSection('billing');
+            this.gotoSection('billing', true);
         }
         else{
             alert(Translator.translate('Please choose to register or to checkout as a guest').stripTags());
@@ -146,13 +193,13 @@ Checkout.prototype = {
         if (($('billing:use_for_shipping_yes')) && ($('billing:use_for_shipping_yes').checked)) {
             shipping.syncWithBilling();
             $('opc-shipping').addClassName('allow');
-            this.gotoSection('shipping_method');
+            this.gotoSection('shipping_method', true);
         } else if (($('billing:use_for_shipping_no')) && ($('billing:use_for_shipping_no').checked)) {
             $('shipping:same_as_billing').checked = false;
-            this.gotoSection('shipping');
+            this.gotoSection('shipping', true);
         } else {
             $('shipping:same_as_billing').checked = true;
-            this.gotoSection('shipping');
+            this.gotoSection('shipping', true);
         }
 
         // this refreshes the checkout progress column
@@ -173,19 +220,19 @@ Checkout.prototype = {
 
     setShipping: function() {
         //this.nextStep();
-        this.gotoSection('shipping_method');
+        this.gotoSection('shipping_method', true);
         //this.accordion.openNextSection(true);
     },
 
     setShippingMethod: function() {
         //this.nextStep();
-        this.gotoSection('payment');
+        this.gotoSection('payment', true);
         //this.accordion.openNextSection(true);
     },
 
     setPayment: function() {
         //this.nextStep();
-        this.gotoSection('review');
+        this.gotoSection('review', true);
         //this.accordion.openNextSection(true);
     },
 
@@ -197,7 +244,18 @@ Checkout.prototype = {
 
     back: function(){
         if (this.loadWaiting) return;
-        this.accordion.openPrevSection(true);
+        //Navigate back to the previous available step
+        var stepIndex = this.steps.indexOf(this.currentStep);
+        var section = this.steps[--stepIndex];
+        var sectionElement = $('opc-' + section);
+
+        //Traverse back to find the available section. Ex Virtual product does not have shipping section
+        while (sectionElement === null && stepIndex > 0) {
+            --stepIndex;
+            section = this.steps[stepIndex];
+            sectionElement = $('opc-' + section);
+        }
+        this.changeSection('opc-' + section);
     },
 
     setStepResponse: function(response){
@@ -212,11 +270,12 @@ Checkout.prototype = {
 
         if(response.duplicateBillingInfo)
         {
+            this.syncBillingShipping = true;
             shipping.setSameAsBilling(true);
         }
 
         if (response.goto_section) {
-            this.gotoSection(response.goto_section);
+            this.gotoSection(response.goto_section, true);
             return true;
         }
         if (response.redirect) {
@@ -329,9 +388,9 @@ Billing.prototype = {
     },
 
     /**
-        This method recieves the AJAX response on success.
-        There are 3 options: error, redirect or html with shipping options.
-    */
+     This method recieves the AJAX response on success.
+     There are 3 options: error, redirect or html with shipping options.
+     */
     nextStep: function(transport){
         if (transport && transport.responseText){
             try{
@@ -518,12 +577,12 @@ Shipping.prototype = {
         checkout.setStepResponse(response);
 
         /*
-        var updater = new Ajax.Updater(
-            'checkout-shipping-method-load',
-            this.methodsUrl,
-            {method:'get', onSuccess: checkout.setShipping.bind(checkout)}
-        );
-        */
+         var updater = new Ajax.Updater(
+         'checkout-shipping-method-load',
+         this.methodsUrl,
+         {method:'get', onSuccess: checkout.setShipping.bind(checkout)}
+         );
+         */
         //checkout.setShipping();
     }
 }
@@ -606,7 +665,7 @@ ShippingMethod.prototype = {
         payment.initWhatIsCvvListeners();
 
         if (response.goto_section) {
-            checkout.gotoSection(response.goto_section);
+            checkout.gotoSection(response.goto_section, true);
             checkout.reloadProgressBlock();
             return;
         }
@@ -640,7 +699,7 @@ Payment.prototype = {
 
     beforeInit : function() {
         (this.beforeInitFunc).each(function(init){
-           (init.value)();;
+            (init.value)();;
         });
     },
 
@@ -799,8 +858,8 @@ Payment.prototype = {
             }
         }
         /*
-        * if there is an error in payment, need to show error message
-        */
+         * if there is an error in payment, need to show error message
+         */
         if (response.error) {
             if (response.fields) {
                 var fields = response.fields.split(',');
@@ -894,7 +953,7 @@ Review.prototype = {
             }
 
             if (response.goto_section) {
-                checkout.gotoSection(response.goto_section);
+                checkout.gotoSection(response.goto_section, true);
             }
         }
     },
diff --git a/skin/frontend/default/default/css/styles.css b/skin/frontend/default/default/css/styles.css
index 428f2fba457..684658c50c1 100644
--- a/skin/frontend/default/default/css/styles.css
+++ b/skin/frontend/default/default/css/styles.css
@@ -189,11 +189,11 @@ input.input-text:focus,select:focus,textarea:focus { background-color:#edf7fd; }
 .form-list li.additional-row .btn-remove { float:right; margin:5px 0 0; }
 .form-list .input-range input.input-text { width:74px; }
 
-.form-list-narrow li  { margin-bottom:0; } 
+.form-list-narrow li  { margin-bottom:0; }
 .form-list-narrow li .input-box { margin-bottom:6px; }
-.form-list-narrow li.wide .input-box { width:260px; } 
-.form-list-narrow li.wide input.input-text, 
-.form-list-narrow li.wide textarea { width:254px } 
+.form-list-narrow li.wide .input-box { width:260px; }
+.form-list-narrow li.wide input.input-text,
+.form-list-narrow li.wide textarea { width:254px }
 .form-list-narrow li.wide select { width:260px; }
 
 /* Customer */
@@ -212,9 +212,6 @@ input.input-text:focus,select:focus,textarea:focus { background-color:#edf7fd; }
 .form-list .name-suffix select { width:55px; }
 .form-list .name-suffix input.input-text { width:49px; }
 
-.form-list .name-middlename { width:70px; }
-.form-list .name-middlename input.input-text { width:49px; }
-
 .form-list .customer-name-prefix-middlename-suffix .name-firstname,
 .form-list .customer-name-prefix-middlename .name-firstname { width:140px; }
 .form-list .customer-name-prefix-middlename-suffix .name-firstname input.input-text,
@@ -233,16 +230,19 @@ input.input-text:focus,select:focus,textarea:focus { background-color:#edf7fd; }
 .form-list .customer-name-prefix-suffix .name-lastname input.input-text { width:189px; }
 
 .form-list .customer-name-prefix .name-firstname,
-.form-list .customer-name-middlename .name-firstname { width:210px; }
+.form-list .customer-name-middlename .name-firstname,
+.form-list .customer-name-middlename .name-middlename { width:210px; }
 
 .form-list .customer-name-suffix .name-lastname,
 .form-list .customer-name-middlename .name-firstname,
+.form-list .customer-name-middlename .name-middlename,
 .form-list .customer-name-middlename-suffix .name-firstname,
 .form-list .customer-name-middlename-suffix .name-lastname { width:205px; }
 
 .form-list .customer-name-prefix .name-firstname input.input-text,
 .form-list .customer-name-suffix .name-lastname input.input-text,
 .form-list .customer-name-middlename .name-firstname input.input-text,
+.form-list .customer-name-middlename .name-middlename input.input-text,
 .form-list .customer-name-middlename-suffix .name-firstname input.input-text,
 .form-list .customer-name-middlename-suffix .name-lastname input.input-text { width:189px; }
 
@@ -622,6 +622,7 @@ tr.summary-details-excluded { font-style:italic; }
 .block-compare,
 .block-reorder,
 .block-poll,
+.block-gr-search,
 .block-viewed,
 .block-compared,
 .block-related,
@@ -743,6 +744,10 @@ tr.summary-details-excluded { font-style:italic; }
 .block-poll .answer { font-weight:bold; }
 .block-poll .votes { float:right; margin-left:10px; }
 
+/* Block: Orders and Returns */
+.block-gr-search li { padding:3px 9px; }
+.block-gr-search button.button span { border-color:#406a83; background:#618499; }
+
 /* Block: Tags */
 .block-tags .block-title strong { background-image:url(../images/i_block-tags.gif); }
 .block-tags .block-content .tags-list { background:none; border:0; font-size:12px; }
@@ -1368,6 +1373,13 @@ tr.summary-details-excluded { font-style:italic; }
 .block-progress .cards-list dd { border:0 none; margin:0; padding:0; }
 .block-progress .cards-list .info-table th { font-weight:normal; }
 
+/* show/hide "change" link for progress step depend on complete status
+ * should be placed in .css file */
+.opc-block-progress dt.complete a,
+.opc-block-progress dt.complete .separator { display: inline; }
+.opc-block-progress dt a,
+.opc-block-progress dt .separator { display: none; }
+
 .opc .buttons-set { margin-top:0; padding-top:2em; }
 .opc .buttons-set p.required { margin:0; padding:0 0 10px; }
 .opc .buttons-set .back-link small { display:none; }
diff --git a/skin/install/default/default/css/boxes.css b/skin/install/default/default/css/boxes.css
index cb03ca485d5..13ba9ad7a72 100644
--- a/skin/install/default/default/css/boxes.css
+++ b/skin/install/default/default/css/boxes.css
@@ -386,4 +386,4 @@ h1#logo { float:left; width:202px; margin:3px 0 0 12px; }
 .noscript p { margin:0; }
 
 /* For Demo store only */
-.demo-notice { margin:0; background:#d75f07; padding:5px 10px 6px 10px; color:#fff; line-height:1em; text-align:center; }
\ No newline at end of file
+.demo-notice { margin:0; background:#d75f07; padding:5px 10px 6px 10px; color:#fff; line-height:1em; text-align:center; }
diff --git a/skin/install/default/default/css/clears.css b/skin/install/default/default/css/clears.css
index ee2fa02eaba..9daba402920 100644
--- a/skin/install/default/default/css/clears.css
+++ b/skin/install/default/default/css/clears.css
@@ -66,4 +66,4 @@
 	visibility:hidden;
 	overflow:hidden;
 	}
-.middle {display:inline-block;}
\ No newline at end of file
+.middle {display:inline-block;}
diff --git a/skin/install/default/default/css/reset.css b/skin/install/default/default/css/reset.css
index 3ec0e2287a8..aa3e924cecb 100644
--- a/skin/install/default/default/css/reset.css
+++ b/skin/install/default/default/css/reset.css
@@ -69,4 +69,4 @@ small { font-size:.9em; }
 big { font-size:1.1em; }
 
 .nowrap { white-space:nowrap; }
-.bold { font-weight:bold; }
\ No newline at end of file
+.bold { font-weight:bold; }
diff --git a/var/package/Cm_RedisSession-1.8.0.0.xml b/var/package/Cm_RedisSession-1.8.0.0.xml
new file mode 100644
index 00000000000..f0cf0fc1655
--- /dev/null
+++ b/var/package/Cm_RedisSession-1.8.0.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Cm_RedisSession</name>
+    <version>1.8.0.0</version>
+    <stability>stable</stability>
+    <license uri="http://framework.zend.com/license/new-bsd">New BSD</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>Redis session</summary>
+    <description>Redis seesion</description>
+    <notes>1.8.0.0</notes>
+    <authors><author><name>Colin Mollenhour</name><user>core</user><email>colin@mollenhour.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:30:54</time>
+    <contents><target name="magecommunity"><dir name="Cm"><dir name="RedisSession"><dir name="etc"><file name="config.xml" hash="4173754174f995f9f7a141747f417abc"/></dir><dir name="Model"><file name="Session.php" hash="fd4d16e73989a8b93582f8c11f8fdc40"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Cm_RedisSession.xml" hash="f36278d589fa562d20d5182c8864a3dd"/></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Lib_Credis</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package></required></dependencies>
+</package>
diff --git a/var/package/Interface_Adminhtml_Default-1.8.0.0.xml b/var/package/Interface_Adminhtml_Default-1.8.0.0.xml
new file mode 100644
index 00000000000..a696bf39b61
--- /dev/null
+++ b/var/package/Interface_Adminhtml_Default-1.8.0.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Interface_Adminhtml_Default</name>
+    <version>1.8.0.0</version>
+    <stability>stable</stability>
+    <license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>Default interface for Adminhtml</summary>
+    <description>Default interface for Adminhtml</description>
+    <notes>1.8.0.0</notes>
+    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:30:54</time>
+    <contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="adminnotification.xml" hash="7acc4e08b1547ebc77d738c167309e21"/><file name="admin.xml" hash="3f67b9113990f8a9fc5064aa8402b1aa"/><file name="api2.xml" hash="a6e09e431f0db34fc54af4c950cf0cba"/><file name="authorizenet.xml" hash="f52103446bbae8227fbf4f4a418b9672"/><file name="bundle.xml" hash="07895a0fe4f3c9c616beb61d4e41b058"/><file name="captcha.xml" hash="57b5f3f6049299f4f47b6272ed38b9f2"/><file name="catalog.xml" hash="9b39b8e3113e0f5ed54abf6593e76995"/><file name="cms.xml" hash="b11e70d2737be5b12a4df97cef693195"/><file name="connect.xml" hash="44f937e1cb116bb4e7a27630e32efb5c"/><file name="currencysymbol.xml" hash="f4332c65caa28d94cf6e39a0107778c7"/><file name="customer.xml" hash="05fa9913be68f1158b18879718b12863"/><file name="dataflow.xml" hash="ed30760c1bda416acdfff76807b9250f"/><file name="downloadable.xml" hash="438b29d90e20c3113c2e5a605c958c47"/><file name="giftmessage.xml" hash="cdbee9efa50093594cb18b4043dd2de5"/><file name="importexport.xml" hash="90833e5f738675aec4d5e3912a243339"/><file name="index.xml" hash="69ba9702acd908708c3e0ac2c9789947"/><file name="main.xml" hash="af6c63aa72fd857703688684306271d2"/><file name="newsletter.xml" hash="907890091132fbddb80360984f32b934"/><file name="oauth.xml" hash="e736d51346a6b4f686d9397d3a721b3d"/><file name="pagecache.xml" hash="fdbd061be983631ce18ebd9fe80ffb94"/><file name="promo.xml" hash="aaa5d244fe1d45d0832bb527e23767e4"/><file name="report.xml" hash="32221b083a21ab7544ece85e4056aae2"/><file name="rss.xml" hash="c7938ce9bc21736f3c1d5a2dcaadb3de"/><file name="sales.xml" hash="0eb2a9f3240dce7d23ae769b8c63a799"/><file name="search.xml" hash="394769515b5419ad9170a41f36a2ea50"/><file name="tag.xml" hash="ebe1533056c85a577d01f409ecd68d68"/><file name="tax.xml" hash="64e9b8b9a207bd1450bb617483cbf47c"/><file name="widget.xml" hash="f174dc0efed5552d90cab15fd55d1a91"/></dir><dir name="locale"><dir name="en_US"><file name="translate.csv" hash="735c9ec66d1309f1206294f075fdcdd1"/></dir></dir><dir name="template"><file name="access_denied.phtml" hash="92823795c6d1d3150f90e5af6975087c"/><dir name="api"><file name="roleinfo.phtml" hash="a747b610ce1d303e6386699d6be4b124"/><file name="rolesedit.phtml" hash="bc311e31ae20a68f1c925d29378f614f"/><file name="roles.phtml" hash="d68d22cfba21927ecbe95db6ae7cee43"/><file name="rolesusers.phtml" hash="13ef3a4e3f2b9029145d77f5acb7cb7a"/><file name="role_users_grid_js.phtml" hash="4bbeb28571f69d12d2644e90969eaa81"/><file name="userinfo.phtml" hash="ac60e8332ae54b118b3004ac50c5de5d"/><file name="usernroles.phtml" hash="9110a1d0be02818c12f0d76353e6b230"/><file name="user_roles_grid_js.phtml" hash="7fa8d6ebc419f401c8472cb5c5abccda"/><file name="userroles.phtml" hash="2d779269a168d467e1b23dcaaa67b898"/><file name="users.phtml" hash="686451dcc0db658e0f342de6cb651478"/></dir><dir name="api2"><dir name="attribute"><file name="buttons.phtml" hash="3e4b92069b79a54b637f2c4b1c02e13c"/><file name="resource.phtml" hash="d450e1316d17eb7396313f7ccf9948a4"/></dir><dir name="permissions"><dir name="user"><dir name="edit"><dir name="tab"><dir name="roles"><file name="js.phtml" hash="98c0ac357aec9f6a39662016f8bcfff6"/></dir></dir></dir></dir></dir><dir name="role"><file name="buttons.phtml" hash="40e580be13fa41b73ab57fe6a58943c9"/><file name="users_grid_js.phtml" hash="6da62e3a16a1676e7c0c34d756addfef"/></dir></dir><dir name="authorizenet"><dir name="directpost"><file name="iframe.phtml" hash="327f46f045aae43b5d3f5362ad9e2ab9"/><file name="info.phtml" hash="29180c7561a3d53e83cd20f72b8fb9d6"/></dir></dir><dir name="backup"><file name="dialogs.phtml" hash="fc0361f93157b9d6da56419ee5bf8a9f"/><file name="left.phtml" hash="7a2cb973a79adeb20e4b254a9124819b"/><file name="list.phtml" hash="42fa810cc9266b75ebea879e47bf3a45"/></dir><dir name="bundle"><dir name="product"><dir name="composite"><dir name="fieldset"><dir name="options"><file name="bundle.phtml" hash="89499fbf2db2bbdd1f5ee179b854586c"/><dir name="type"><file name="checkbox.phtml" hash="e8f0bfbb365b2f6712f60026c9ce1b18"/><file name="multi.phtml" hash="0988351a515671f9aaa2b792d75c59bb"/><file name="radio.phtml" hash="6234abd48de61d70d1f35db13f689c7b"/><file name="select.phtml" hash="7724c1cf48980f85c6d4599a666cc095"/></dir></dir></dir></dir><dir name="edit"><dir name="bundle"><dir name="option"><file name="search.phtml" hash="a01bc3290a390209ecf388864ce8a2b7"/><file name="selection.phtml" hash="073848dfe3e5e5346cdd226a1cfb8c5f"/></dir><file name="option.phtml" hash="e7063e7b8018a893d4d37edce62b716c"/></dir><file name="bundle.phtml" hash="f9f28eb3f4688403ea4798fc289508a3"/></dir></dir><dir name="sales"><dir name="creditmemo"><dir name="create"><dir name="items"><file name="renderer.phtml" hash="9d9ee98449a3ce34a603108d60a692a6"/></dir></dir><dir name="view"><dir name="items"><file name="renderer.phtml" hash="2028751556d03e1a61d54d359f16eb36"/></dir></dir></dir><dir name="invoice"><dir name="create"><dir name="items"><file name="renderer.phtml" hash="0cb636a29f7362def0c8564368e5a02b"/></dir></dir><dir name="view"><dir name="items"><file name="renderer.phtml" hash="ccfc55b4bde21cecb8d3703a9c6df05f"/></dir></dir></dir><dir name="order"><dir name="view"><dir name="items"><file name="renderer.phtml" hash="85d91d7961c8065db6aa624f5951bdc4"/></dir></dir></dir><dir name="shipment"><dir name="create"><dir name="items"><file name="renderer.phtml" hash="9a40c0e11713e9ccd595aefdda832106"/></dir></dir><dir name="view"><dir name="items"><file name="renderer.phtml" hash="2784e8c94ea6a46c0145f74f9068e198"/></dir></dir></dir></dir></dir><dir name="captcha"><file name="zend.phtml" hash="fdb5192f0165fbd73020be831773b02f"/></dir><dir name="catalog"><dir name="category"><dir name="checkboxes"><file name="tree.phtml" hash="93341321e660e9315740b668b81b18b1"/></dir><dir name="edit"><file name="form.phtml" hash="64ae6507e31ef4be089c5073d6da8752"/></dir><file name="edit.phtml" hash="3e0737975a3f17b3b7a3a7d37fa346df"/><file name="tree.phtml" hash="a07f8c23d31ecee9b462fc8c10a7477c"/><dir name="widget"><file name="tree.phtml" hash="98c813f4f07624c2c5a6110f51b719cf"/></dir></dir><dir name="form"><dir name="renderer"><dir name="fieldset"><file name="element.phtml" hash="e8d0c3368acc77795b4b7b9c342caa03"/></dir></dir></dir><dir name="product"><dir name="attribute"><file name="js.phtml" hash="02e26715029a70679052ed6d2fa106d3"/><dir name="new"><file name="created.phtml" hash="151a091138128d99742f55d7c1b2110a"/></dir><file name="options.phtml" hash="da86ae5cf4a436ec0d249820dced47ed"/><dir name="set"><dir name="main"><dir name="tree"><file name="attribute.phtml" hash="7a98412b5e02a2337962f1cba1c0926f"/><file name="group.phtml" hash="7327296a5910e134bb27d921ba6faef9"/></dir></dir><file name="main.phtml" hash="000a4dbe286f9d1c197db26e06f96a92"/><dir name="toolbar"><file name="add.phtml" hash="f923b1a243a99ab1e1421016dfece85e"/><file name="main.phtml" hash="69135d84b55225c318764deb86911eb8"/></dir></dir></dir><dir name="composite"><file name="configure.phtml" hash="4691e35f72bc805b4a78cdb10d1b30aa"/><dir name="fieldset"><file name="configurable.phtml" hash="356bc1bda51444b3e689d75050c2546d"/><file name="grouped.phtml" hash="f1916f58ec361a017c66dabbcf828fb3"/><dir name="options"><file name="js.phtml" hash="dddc183fd7c1f9aef5f8956396168371"/><dir name="type"><file name="date.phtml" hash="751dd58c82ff3711b219a359fbbd7dc5"/><file name="default.phtml" hash="9d47d54a3b46055de7dd7d1bc159982d"/><file name="file.phtml" hash="79e6110614250e705ebc245c73b70953"/><file name="select.phtml" hash="dcb71b5942bc011ddc8bab0f143c97b1"/><file name="text.phtml" hash="711bb7e26fd1c912900b3bfd2fe4312e"/></dir></dir><file name="options.phtml" hash="291db960eefe6bc4ee11083cddc7f49b"/><file name="qty.phtml" hash="b2ecd8770549f70510c096155876b2dd"/></dir></dir><file name="created.phtml" hash="7ad824b374c094fce2694f639bbdff07"/><dir name="edit"><dir name="action"><file name="attribute.phtml" hash="135122ecde9c695a82d48c6bb12c58b8"/><file name="inventory.phtml" hash="0a6c1e7c27ec448cddd3c5ed39381976"/><file name="websites.phtml" hash="e70bdd8f8bb4d2837e8e3703dc6a6d8a"/></dir><file name="categories.phtml" hash="1c7e89cbb3b26bdf5e73a0129a02461d"/><dir name="options"><file name="option.phtml" hash="fa1a16330d836f2c726de65f8f83f3bd"/><dir name="type"><file name="date.phtml" hash="fe4dfbe4467eba7efba074e2bee082f6"/><file name="file.phtml" hash="0597a3a119484f1fe6e15985965ac12c"/><file name="select.phtml" hash="259b6fcd60668b02018544edfed0d434"/><file name="text.phtml" hash="99241a0b273953e8e7e5da01f11416af"/></dir></dir><file name="options.phtml" hash="1c83a9b7f656ef0db5350eea9a9921e0"/><dir name="price"><file name="group.phtml" hash="3772ae5ab7ccc1d48017d6c8111cc82e"/><file name="tier.phtml" hash="190db4bba7240e419566d0f4d9ed77f6"/></dir><file name="serializer.phtml" hash="c8277b360460b86e31d49723cb0a2e35"/><dir name="super"><file name="config.phtml" hash="c9d89d1db17c73a6602fb2d2c2a383a0"/></dir><file name="websites.phtml" hash="8828fcb86ab18e113744dbfa7f581e63"/></dir><file name="edit.phtml" hash="f0615d0ba774625beb4de2c4f8e20c39"/><dir name="helper"><file name="gallery.phtml" hash="5bf320f5189fc4b430b842ff5b4de94b"/></dir><file name="js.phtml" hash="0584d9fe8ec9fa4f2aeff8a754b4eda0"/><file name="price.phtml" hash="63805b0ca7598b1261f02cd8676e45c5"/><dir name="tab"><file name="alert.phtml" hash="a5568acabd6f3cfb28977390840646a5"/><file name="inventory.phtml" hash="6759a08e6afe766db7ed54814ea4676b"/></dir><dir name="widget"><dir name="chooser"><file name="container.phtml" hash="3043ccbabb4641105b3f241f156f8c4a"/></dir></dir></dir><file name="product.phtml" hash="7d7d72652c83ea5007431ede860241fe"/><dir name="wysiwyg"><file name="js.phtml" hash="79bf2f95fc47fb369accebab015405fe"/></dir></dir><dir name="cms"><dir name="browser"><dir name="content"><file name="files.phtml" hash="8bca646eb72689b0b9c261a8d43f6261"/><file name="newfolder.phtml" hash="84e15ba19934ba070b39fef40eb5b8c0"/><file name="uploader.phtml" hash="74334f78aadf103650e73cb3aba0cae3"/></dir><file name="content.phtml" hash="011898836d6c1abbaffa754ce6480f10"/><file name="js.phtml" hash="07caa78fabab177f9daded1115947155"/><file name="tree.phtml" hash="e658c33a04ad1c24e4ac66187ac9aebf"/></dir><dir name="page"><dir name="edit"><dir name="form"><dir name="renderer"><file name="content.phtml" hash="0aee2c89cab9c172f7754efb1e97c616"/></dir></dir></dir></dir></dir><file name="coming.phtml" hash="d5b559a738546ced442f00df92fe02d7"/><dir name="connect"><dir name="extension"><dir name="custom"><file name="authors.phtml" hash="f100935c95888e51526c58f384b2d7c4"/><file name="contents.phtml" hash="b7ce10e80c74c050abf341436d665758"/><file name="depends.phtml" hash="dcc96e497bbf24596010023b65a733f6"/><file name="load.phtml" hash="d63a2982e9fe2fe1f283e2b4c4b285dd"/><file name="package.phtml" hash="e8036f32b44fb6314a403b82c011ec01"/><file name="release.phtml" hash="b50329d60d68bff9ff0e8a5a5dc39b5d"/></dir></dir></dir><dir name="currencysymbol"><file name="grid.phtml" hash="d58794138d10de0194e8ddfa2aab43d1"/></dir><dir name="customer"><dir name="edit"><file name="js.phtml" hash="94a3d284e8a0b92789f690feed2a58f1"/><dir name="tab"><dir name="account"><dir name="form"><dir name="renderer"><file name="group.phtml" hash="63f0c218412d3ccae329ce6559eedf85"/></dir></dir></dir><dir name="view"><dir name="grid"><file name="item.phtml" hash="00e1569fba2eb47e193964b4e9a1fe7e"/></dir></dir></dir></dir><file name="online.phtml" hash="2de6f2d49e7e7299fd87021a74dc9b42"/><dir name="sales"><dir name="order"><dir name="create"><dir name="address"><dir name="form"><dir name="renderer"><file name="vat.phtml" hash="9745f3ffd9fef88d7405e4fc94fd2f00"/></dir></dir></dir></dir></dir></dir><dir name="system"><dir name="config"><file name="validatevat.phtml" hash="d66acd187bdfed31c3c2354f546442cd"/></dir></dir><dir name="tab"><file name="addresses.phtml" hash="ffe1db506f0d0b319d895121140eb14d"/><file name="cart.phtml" hash="5f91cd5a9af29c8357d0ecec393866e1"/><file name="newsletter.phtml" hash="217e3adaddfde5eebd69cb0b9ce3137c"/><dir name="view"><file name="sales.phtml" hash="21ccdd0aa155d124e31e9d14221fd2b5"/></dir><file name="view.phtml" hash="8cb1861837a4b6dfc5a928fd308696a1"/><file name="wishlist.phtml" hash="0fdd8fcd370831354501f87cc860fa24"/></dir></dir><dir name="dashboard"><dir name="graph"><file name="disabled.phtml" hash="a9f2f2fe66344d1ab52f2a8846b3ee19"/></dir><file name="graph.phtml" hash="6a61127c70fdb5e5a03cf3d813666919"/><file name="grid.phtml" hash="becc52bd2bdb27ecc64db3ec8c103ca5"/><file name="index.phtml" hash="2710fe9fb5394987de59b3cf8135604e"/><file name="salebar.phtml" hash="0ee90c82d5961b7d11653390ed1410e0"/><file name="searches.phtml" hash="cf00ce9257abcfe21c47d326830f6484"/><dir name="store"><file name="switcher.phtml" hash="70d22485908ab869cefb6e6e3e7adae4"/></dir><file name="totalbar.phtml" hash="16b05457a8d88bfea297010da868f01b"/></dir><dir name="directory"><dir name="js"><file name="optional_zip_countries.phtml" hash="82991cce214f70fd6f3069ffa054bab8"/></dir></dir><dir name="downloadable"><dir name="product"><dir name="composite"><dir name="fieldset"><file name="downloadable.phtml" hash="d6a42cc2317c05cfebceb41a1bb81357"/></dir></dir><dir name="edit"><dir name="downloadable"><file name="links.phtml" hash="ba61ab5dc51a98bb8a15657a7f717fec"/><file name="samples.phtml" hash="b634ad45d24b56dd03c77bd2b6522356"/></dir><file name="downloadable.phtml" hash="ca0899308ee8eb270e49accc9492e9ed"/></dir></dir><dir name="sales"><dir name="items"><dir name="column"><dir name="downloadable"><dir name="creditmemo"><file name="name.phtml" hash="1f3e085fbcca1e58454ea9c6f2d4fc2b"/></dir><dir name="invoice"><file name="name.phtml" hash="c88ad7b48b0e96e873e5e4717473692d"/></dir><file name="name.phtml" hash="dd921b62e3aa82657e557310fccb7657"/></dir></dir></dir><dir name="order"><dir name="creditmemo"><dir name="create"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="37b4104928cf082e65303b1253e703bb"/></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="326c8a28845c398f515f7855454ec345"/></dir></dir></dir></dir><dir name="invoice"><dir name="create"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="b36da3d2202cbf5c428c577eebe1f22a"/></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="45e721ee3f6a352d46db1ed35346afe8"/></dir></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="b37ebef39f0c278edf2982d1b27c9fcf"/></dir></dir></dir></dir></dir></dir><dir name="eav"><dir name="attribute"><dir name="edit"><file name="js.phtml" hash="7a98412b5e02a2337962f1cba1c0926f"/></dir><file name="options.phtml" hash="b256d2cced5639b490fd02f386b856c0"/></dir></dir><dir name="email"><dir name="order"><file name="items.phtml" hash="32d547712ab27288ba48f3409be68848"/></dir></dir><file name="empty.phtml" hash="85b5bcbacf33148afa9cb2e291ed9c29"/><file name="example.phtml" hash="fa6ad939de28c77f97c7661b70ae32b6"/><file name="forgotpassword.phtml" hash="9a6bb0557f28c75a8313be2c8344b30b"/><file name="formkey.phtml" hash="668f8c7327ebc6e52e81837e6d59883e"/><dir name="giftmessage"><file name="form.phtml" hash="8ee516dc74b127343fee0878f0bf9fea"/><file name="giftoptionsform.phtml" hash="63957f638434ce0a8d6db542ddef62dd"/><file name="helper.phtml" hash="bdd78c5dd5b3f8c6982aef0bf972926b"/><file name="popup.phtml" hash="a59c297c518a7b1da339a9a26f282ec1"/><dir name="sales"><dir name="order"><dir name="create"><file name="giftoptions.phtml" hash="093edda5e1e6c70305be5cd6a72a428c"/><file name="items.phtml" hash="de0f3a292bc3300485150c235b3c8baf"/></dir><dir name="view"><file name="giftoptions.phtml" hash="31f1e4a845d664c74167e4aaf8e60d92"/><file name="items.phtml" hash="6e13e1c989e036a70ce63985109ebf4b"/></dir></dir></dir></dir><dir name="googlebase"><file name="captcha.phtml" hash="4c757e7ae89a8d5d6f6a9b9442e9db06"/><file name="items.phtml" hash="6c36149414fdb1429aa538af780bd8cc"/><dir name="types"><dir name="edit"><file name="attributes.phtml" hash="c020a509f199500e302990d93d334cd9"/></dir></dir></dir><dir name="importexport"><file name="busy.phtml" hash="d262675a58d13c07e06758a8289a3835"/><dir name="export"><dir name="form"><file name="after.phtml" hash="3e764cd464cb459e97a83c2290db2211"/><file name="before.phtml" hash="404ce5d37d1a382e2686348e37927562"/></dir></dir><dir name="import"><dir name="form"><file name="after.phtml" hash="9bed43a35ee858d35cbb5ee6c22a7d7a"/><file name="before.phtml" hash="ff9c4f2494f974420f80f3af7f10e5bc"/></dir><dir name="frame"><file name="result.phtml" hash="4916fcf4a49ebd7c3a714c89f799c61a"/></dir></dir></dir><dir name="index"><file name="notifications.phtml" hash="da5caede6028791f5ad4d18f8849a10f"/></dir><file name="login.phtml" hash="06e47e38d714b6dcb0d05a4c58498a24"/><dir name="media"><file name="editor.phtml" hash="7a43efd27957c6af0be487bb9c575a9a"/><file name="uploader.phtml" hash="526fa29bfbe08b7db8a8f0b487a711aa"/></dir><dir name="newsletter"><dir name="preview"><file name="iframeswitcher.phtml" hash="a1fd201e45ac43760cd93cfd008e08b2"/><file name="store.phtml" hash="db953f03978e2c4fefd86060cb569297"/></dir><dir name="problem"><file name="list.phtml" hash="b87e241b95fa68260c6e34ac8ad3dc58"/></dir><dir name="queue"><file name="edit.phtml" hash="75d0bf23bb2a7583f5e8af836b62af93"/><file name="list.phtml" hash="a6a0648a213a57e7ad83f91c96d52717"/><file name="preview.phtml" hash="f1bea98facf19ca2ce34470e6b86cb87"/></dir><dir name="subscriber"><file name="list.phtml" hash="ad47057f0078b902d262d56143c9cade"/></dir><dir name="template"><file name="edit.phtml" hash="2ffe2af188c8c8d30f4993d9d3e8eddd"/><file name="list.phtml" hash="1266bfe62755075fc7f38b4598007a29"/><file name="preview.phtml" hash="f1bea98facf19ca2ce34470e6b86cb87"/></dir></dir><dir name="notification"><file name="baseurl.phtml" hash="1a5a7dffdfc83d740ef2843e54a12dd9"/><file name="security.phtml" hash="83362536d29fe224b474c063de3cd6ab"/><file name="survey.phtml" hash="08aca628ec979a2c69447429771de8df"/><file name="toolbar.phtml" hash="4d39b7bd8e45b04f8e554bf9de6202fb"/><file name="window.phtml" hash="5666027b927a760d0d1ab54fed5d791c"/></dir><dir name="oauth"><dir name="authorize"><file name="button.phtml" hash="8ef4e59f856e200ae9b4df6a9b11040a"/><file name="button-simple.phtml" hash="d9fc19bb662651816023670f0c541473"/><file name="confirm.phtml" hash="3fb68893fe222c965cba7bfe3b1d763f"/><file name="confirm-simple.phtml" hash="c6f9aad0568c1183be7758d4355566e8"/><dir name="form"><file name="login.phtml" hash="02bae281f86f343afbe82899abf2ecc9"/><file name="login-simple.phtml" hash="795a6e6ac738c592a1c6d8cb160107f2"/></dir><file name="head-simple.phtml" hash="025e93a7450094ebb292be787b3a6093"/><file name="reject.phtml" hash="ca1c10dcc85ecfa5803e46ea5960059d"/><file name="reject-simple.phtml" hash="239588bf20e2a78130178c9fe49b7bce"/></dir></dir><file name="overlay_popup.phtml" hash="23a40353e27d75eb0bbda6175f671796"/><dir name="page"><file name="footer.phtml" hash="2462a7315f44a7fd106f4ea5d2347215"/><file name="header.phtml" hash="b22db4d17af45d66789444f39bf427b2"/><file name="head.phtml" hash="5d95792ce437b953557e60e41cff7122"/><dir name="js"><file name="calendar.phtml" hash="34d10b8433102613bb6a4bed72f3e0f5"/><file name="translate.phtml" hash="6ee90249fc539ec676f51d827d42066d"/></dir><file name="menu.phtml" hash="a1b2fc6e23351ec660ebd297924d1cde"/><file name="notices.phtml" hash="3f8f0fb17d8642db0f1392ae239b6b4d"/></dir><dir name="pagecache"><dir name="cache"><file name="additional.phtml" hash="bd00566238cd0f5d38a6a32e8e029075"/></dir></dir><file name="page.phtml" hash="7953efb6d0cb2decb67dfbebf389a751"/><dir name="paygate"><dir name="form"><file name="cc.phtml" hash="b2c9edc6305ecd2d461960979dc6e04d"/></dir><dir name="info"><file name="cc.phtml" hash="a588d97b5f7d01e25da3086bbebbb58e"/><file name="pdf.phtml" hash="d3daafd51a71ac8ad82a5ad135341213"/></dir></dir><dir name="payment"><dir name="form"><file name="cc.phtml" hash="1f6cb5eb01602aad78b06f6d2e616fae"/><file name="ccsave.phtml" hash="b75ba46d35459c9f4eb76459c4230b91"/><file name="checkmo.phtml" hash="f678a5af0f38016946f0d2153d1c1c4c"/><file name="purchaseorder.phtml" hash="5ee44c5a12516febb7ea5e9fce0813e9"/></dir><dir name="info"><file name="banktransfer.phtml" hash="1cc12ea937a83ec7850c3e3c979ae090"/><file name="checkmo.phtml" hash="d60d2fbe95574f7c2ddc710684272044"/><file name="default.phtml" hash="cc873bf7b3e3d9724864ef6cbb3b8551"/><dir name="pdf"><file name="checkmo.phtml" hash="03abba9cccd1f9bee48c9f871970720e"/><file name="default.phtml" hash="70630d0f786194e1efd421a6c555731c"/><file name="purchaseorder.phtml" hash="15bb4ad5666e114e9b125b41fa4f4fff"/></dir><file name="purchaseorder.phtml" hash="f7861e98d8ad6d7bfc652c2e3ce2f9b5"/></dir></dir><dir name="paypal"><dir name="system"><dir name="config"><file name="api_wizard.phtml" hash="dab0fc1b5c82698253a334a81cc25964"/><dir name="fieldset"><file name="global.phtml" hash="637eedd4757ee1a5ad964d378455959c"/><file name="hint.phtml" hash="c0bcddc6efc5638bb5c361cee25bb391"/><file name="store.phtml" hash="6ae39364f3c985351da2d5d4e038b320"/></dir><dir name="payflowlink"><file name="advanced.phtml" hash="434c43cb233834700e474440a53d6fab"/><file name="info.phtml" hash="aa73ddfe78d99c1bd5374197d47c98c4"/></dir></dir></dir></dir><dir name="permissions"><file name="roleinfo.phtml" hash="3f98afc8ff32c5d0d5d72463e3599294"/><file name="rolesedit.phtml" hash="d5d142bdf1b725999eb84b5f40cd776f"/><file name="roles.phtml" hash="d68d22cfba21927ecbe95db6ae7cee43"/><file name="rolesusers.phtml" hash="13ef3a4e3f2b9029145d77f5acb7cb7a"/><file name="role_users_grid_js.phtml" hash="f4cb17fefcca73b09a5f2ae39234f34d"/><file name="userinfo.phtml" hash="ac60e8332ae54b118b3004ac50c5de5d"/><file name="usernroles.phtml" hash="9110a1d0be02818c12f0d76353e6b230"/><file name="user_roles_grid_js.phtml" hash="9267240bc35a6f42f6ade61b5575b137"/><file name="userroles.phtml" hash="2d779269a168d467e1b23dcaaa67b898"/><file name="users.phtml" hash="686451dcc0db658e0f342de6cb651478"/></dir><dir name="poll"><dir name="answers"><file name="list.phtml" hash="28b9547c2c6efdd970a5327413476661"/></dir></dir><file name="popup.phtml" hash="5fccd3a283b7d21c35f367a3974d4947"/><dir name="promo"><file name="fieldset.phtml" hash="d87248d0189fbfd6a00a3a5a245459cf"/><file name="form.phtml" hash="a3f5a0e8001ac56e822866a2fd453c89"/><file name="js.phtml" hash="2eafd0314cd42af30f6a7a08b3bf4ef7"/><file name="salesrulejs.phtml" hash="cec2eff46a015a52fc538609ade12821"/></dir><dir name="rating"><file name="detailed.phtml" hash="852c913d6a79e34aed3e5d05f19db991"/><file name="options.phtml" hash="d30cad80e36feb721ea4753947b3661a"/><dir name="stars"><file name="detailed.phtml" hash="a4ac92a52fa258181b0d708018c62108"/><file name="summary.phtml" hash="a83cfc4d046880aa3ec5f478bad36161"/></dir></dir><dir name="report"><dir name="grid"><file name="container.phtml" hash="8afae1e8f315820ea263abb7901756d0"/></dir><file name="grid.phtml" hash="cbcde35a2594a1d36b20b99291e32b22"/><dir name="refresh"><file name="statistics.phtml" hash="a8b531e672ff17aa78e35473f215739a"/></dir><dir name="store"><dir name="switcher"><file name="enhanced.phtml" hash="f5f5e64bb1c9dcb59434a4fc811acda2"/></dir><file name="switcher.phtml" hash="947b37780419beabcda34013a261d43d"/></dir><file name="wishlist.phtml" hash="fc6334b08f55a7f3f5f42f401a9a2574"/></dir><file name="resetforgottenpassword.phtml" hash="19e9019c7236f8232d398754be6e0d18"/><dir name="review"><file name="add.phtml" hash="f919e9d005e9982a809cd759bd1fa27a"/></dir><dir name="sales"><dir name="billing"><dir name="agreement"><file name="form.phtml" hash="c045bc446859e14f1f5096ad44be54de"/><dir name="view"><file name="form.phtml" hash="a38fecb1401080e69fc92e51863bf522"/><dir name="tab"><file name="info.phtml" hash="426577dc27aa90a734aa23f0fe93d673"/></dir></dir></dir></dir><dir name="items"><dir name="column"><file name="name.phtml" hash="d3d1d31a2a0bc7a57801f78756a62ecf"/><file name="qty.phtml" hash="37394503de14c09502b6b8b7542660a6"/></dir><dir name="renderer"><file name="default.phtml" hash="8f9b32e7bbe72e96178d9b6f9c75806a"/></dir></dir><dir name="order"><dir name="address"><file name="form.phtml" hash="14a681b992206d290b708b4df6839c32"/></dir><dir name="comments"><file name="view.phtml" hash="b1d7c4ff5d1d02ef95bc5dbdc789df0a"/></dir><dir name="create"><file name="abstract.phtml" hash="73bb65d4b51bed1be38cb18738cefdd0"/><dir name="billing"><dir name="method"><file name="form.phtml" hash="7f6d2c2571c3e94e882a84391163f2c4"/></dir></dir><file name="comment.phtml" hash="3ff56760d956ee9850fc899a6bf444cc"/><dir name="coupons"><file name="form.phtml" hash="9de66e86ddd6b1d90c5ff57bf1092fa5"/></dir><file name="data.phtml" hash="cfba996cee0ec9e3cb128a338aa97234"/><dir name="form"><file name="account.phtml" hash="4ef4d5d68f31f02cb7ac477804b9c729"/><file name="address.phtml" hash="9c73251984359ab1822c8ee784d0897b"/></dir><file name="form.phtml" hash="9f7e219d35d6f5f39e6c8aefcdee757c"/><file name="giftmessage.phtml" hash="61d994f507fc095324856d0f168dd0a2"/><dir name="items"><file name="grid.phtml" hash="98fdb5f6f50ece23b5ac171f4b338ebc"/></dir><file name="items.phtml" hash="4b8a4bbb55d1f3a10bce5c0f2a77c8c7"/><file name="js.phtml" hash="b135bc5e678ad509b3dcec73a19a8a23"/><dir name="newsletter"><file name="form.phtml" hash="8d924604782ce5b25ea93ba17b3e6b40"/></dir><dir name="shipping"><dir name="method"><file name="form.phtml" hash="baba59c0d805fb14f117d0395715e03c"/></dir></dir><dir name="sidebar"><file name="items.phtml" hash="fe201f2c2e0b9d8c0ab00caf83eba9c7"/></dir><file name="sidebar.phtml" hash="db99134846752d81956d4fa184286fe8"/><dir name="store"><file name="select.phtml" hash="d07c80543627993d8a390528ad173b99"/></dir><dir name="totals"><file name="default.phtml" hash="64c8c771680709c8045f05dee1d18d5b"/><file name="grandtotal.phtml" hash="3249e222a3a30d63afd9262e9cb1a4db"/><file name="shipping.phtml" hash="95bf72407796516b82d7d4fbfda67688"/><file name="subtotal.phtml" hash="60616ad2dc8be1486dbf08f5a833d6ff"/><file name="tax.phtml" hash="aa0d5c82921d7560f656a53c8d898702"/></dir><file name="totals.phtml" hash="e08335a53675cdcd8f59913b505156e5"/></dir><dir name="creditmemo"><dir name="create"><file name="form.phtml" hash="2e8a3360bac63dbbdf7791236abfddeb"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="b2cb388b1a243f99c59191105f96a142"/><file name="default.phtml" hash="d2983cb339c23814e299523804271e6e"/></dir></dir><file name="items.phtml" hash="2c92ec23f30e455369d2a9a3f08883cd"/><dir name="totals"><file name="adjustments.phtml" hash="ef48f10d014988a5854fa758c97b138e"/></dir></dir><dir name="view"><file name="form.phtml" hash="8b7613c7724df167f773733537f5f1ba"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="ede591d9e935ec600d574024a3ae0820"/><file name="default.phtml" hash="eeafd46d6cdaa5df4af4f77869b6cc5a"/></dir></dir><file name="items.phtml" hash="b35fe2e31670ac2801abdc1bcbff0102"/></dir></dir><file name="giftoptions.phtml" hash="b6f4197d3df032819254d0dac3413495"/><dir name="invoice"><dir name="create"><file name="form.phtml" hash="bf7f58f7a32c9bc13d609e24069591cb"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="088b6eea9beadf94e6aa52a1db06ca4c"/><file name="default.phtml" hash="200aa3cd483d1458a97f0a4fb0ee300e"/></dir></dir><file name="items.phtml" hash="4c05e6eb775ea5223ff5456c81304a86"/><file name="tracking.phtml" hash="66faab35a9ff18921bc3e6dbf4bd45f7"/></dir><dir name="view"><file name="form.phtml" hash="f976756a3c4669d424686cc46ea2568d"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="828128fc8ecac9272860c24e22267fd4"/><file name="default.phtml" hash="7e79921b0125ba89698ee9e57ff4d833"/></dir></dir><file name="items.phtml" hash="9e803123162b720873c6e6f4696da31a"/></dir></dir><dir name="shipment"><dir name="create"><file name="form.phtml" hash="c9ac15d1ab6833d34a0f768eae781b31"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="dc08d0b624b90949b181c803a450a36e"/><file name="default.phtml" hash="e2a433c941285b671529be0fb3876630"/></dir></dir><file name="items.phtml" hash="0f96e448f542a8e702b7ee214a548e11"/><file name="tracking.phtml" hash="3f8511262d928445696c6319bb2508dc"/></dir><dir name="packaging"><file name="grid.phtml" hash="7d394055313bf36836fd1f468a263b34"/><file name="packed.phtml" hash="ae3f97fb3cd3ded2e15e2a0b2eab50da"/><file name="popup.phtml" hash="b7becfc86ef5bc7935cc08e1814e342e"/></dir><dir name="tracking"><file name="info.phtml" hash="9d088e90071007f8a8408ff4b6bf1578"/></dir><dir name="view"><file name="form.phtml" hash="7307852d350cddf4096d7a78137d147a"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="5dd9560fce1605eb506188ab2810eec8"/><file name="default.phtml" hash="449d5cce4d2baff9737dd143b59f90b7"/></dir></dir><file name="items.phtml" hash="7bd98be6262f041d94d6df9132e6ea36"/><file name="tracking.phtml" hash="94a55a3a5064abbff7790feb76ef5ed4"/></dir></dir><file name="totalbar.phtml" hash="8862b3abf6166a0b106a8e20e5548531"/><dir name="totals"><file name="discount.phtml" hash="4d1ecb9291b25f5c3ab5c5d77f546071"/><file name="due.phtml" hash="3df55bcd0d58a9d72cb44977a03f25de"/><file name="footer.phtml" hash="75322b0a2e4832a1e0d87dde7aad0813"/><file name="grand.phtml" hash="31122d57bcd9d20a616264cf5b8170a3"/><file name="item.phtml" hash="4dfc650dff0e372fbbcbc98cb53bbc8d"/><file name="main.phtml" hash="1785c69f7cae82872bbcbab68b9b5409"/><file name="paid.phtml" hash="3fb004bd20c0d4e39eb8e2ee63c4e7bb"/><file name="refunded.phtml" hash="50bb53757008c84acc968e3afa3782b5"/><file name="shipping.phtml" hash="319fd258f733513d5d5eebf2d3c57d6f"/><file name="subtotal.phtml" hash="dc63cedb53d44617410e60919f1c6673"/><file name="tax.phtml" hash="96abbff5db724fa3eaefc33a78d5df9e"/></dir><file name="totals.phtml" hash="a3badd69a64601237ce416f39d91e3c9"/><dir name="view"><file name="form.phtml" hash="8eb9c9223952d17a1981350cdbc5bdfc"/><file name="giftmessage.phtml" hash="1c4ce68ee0b411f13742aaa11937f15e"/><file name="history.phtml" hash="8165e4cc586574291d6b6e91dd1700a6"/><file name="info.phtml" hash="d474ebaa1a5e310590bf0d17c643e19e"/><dir name="items"><dir name="renderer"><file name="default.phtml" hash="eea8a3c81551f4be47365214d3fe75bb"/></dir></dir><file name="items.phtml" hash="2eb186022637b87f7909758b271a52cf"/><dir name="tab"><file name="history.phtml" hash="2477fc121aa58235e0ac937121aa349d"/><file name="info.phtml" hash="175f3b53cdb4c933a9e43ba5e1957a81"/></dir><file name="tracking.phtml" hash="53f1b6e6409abb1c80857af51f2d70d8"/></dir></dir><dir name="payment"><dir name="form"><dir name="billing"><file name="agreement.phtml" hash="acba45d2b1f6e3c6069ca6c190e1c1cd"/></dir></dir></dir><dir name="recurring"><dir name="profile"><dir name="view"><file name="info.phtml" hash="764e11209b05bd561c6eb18dabef08c2"/></dir><file name="view.phtml" hash="86beef0c2b64e7942a5aaab3b879da88"/></dir></dir><dir name="transactions"><file name="detail.phtml" hash="7bebff6273aa9529f1ec30da31bbb9f2"/></dir></dir><dir name="store"><dir name="switcher"><file name="enhanced.phtml" hash="40b5f178cc4848725c4990603cb61144"/><dir name="form"><dir name="renderer"><dir name="fieldset"><file name="element.phtml" hash="d2c451e57d76bf1d85344b973e297267"/></dir><file name="fieldset.phtml" hash="6aee098a94a78080f510e8bf4de7e9ab"/></dir></dir></dir><file name="switcher.phtml" hash="374547385cf8c94599416ba39cb5207c"/></dir><dir name="system"><file name="autocomplete.phtml" hash="105da6d2311f0f7b205a3c7648b0be44"/><dir name="cache"><file name="additional.phtml" hash="59abda62641901a75285f1a9977ec5bb"/><file name="edit.phtml" hash="671183173835e10823ef33f5da573945"/><file name="notifications.phtml" hash="24b8f93e727f53d95632e9939ba842f8"/></dir><dir name="config"><file name="edit.phtml" hash="c1aa30cf44b85966407958b3931527e8"/><dir name="form"><dir name="field"><file name="array.phtml" hash="5d30c98d32ca0d89ac210f4f09bc20a2"/></dir></dir><file name="js.phtml" hash="8dd9b8501b4fe8775832b5faa3468045"/><file name="switcher.phtml" hash="f3ca933dc8199972a15c9b6930235066"/><dir name="system"><dir name="storage"><dir name="media"><file name="synchronize.phtml" hash="9d365a0794775cfc80405aa1ed42d3d5"/></dir></dir></dir><file name="tabs.phtml" hash="9421cf5ffc704a0c725d8fe12b3e47e4"/></dir><dir name="convert"><dir name="profile"><file name="process.phtml" hash="3b871eaf96142a6bfc73a228c491a2d9"/><file name="run.phtml" hash="8314278f7c72dd49f72bd1d23260f360"/><file name="upload.phtml" hash="0376f43508fe8248beade715e50b6380"/><file name="wizard.phtml" hash="27a6bf0670cc46eed2795665d75ed809"/></dir></dir><dir name="currency"><dir name="rate"><file name="matrix.phtml" hash="501aa16d089d1a6cc8de851a67ab2f5d"/><file name="services.phtml" hash="21443d86f7f8ecec1c52e1a3c00fca41"/></dir><file name="rates.phtml" hash="00992c94fd98af59bd884cf4a6afc5bf"/></dir><dir name="design"><file name="edit.phtml" hash="7cb45f6fd1822a4313f3d5b9bd2af8c5"/><file name="index.phtml" hash="73e90ef9565c3d65bf225a2d269a6870"/></dir><dir name="email"><dir name="template"><file name="edit.phtml" hash="6e69aa01e5937f09dd709a44e3004e8d"/><file name="list.phtml" hash="6c358ab194467f511a15fb52c11293dc"/><file name="preview.phtml" hash="5f5a1e8c84565775c11403a5cf0fbbf3"/></dir></dir><file name="info.phtml" hash="a6c1164a4c98c694c3e139635c59023b"/><dir name="shipping"><file name="applicable_country.phtml" hash="9dfc89cfd9712877c0b0143c90ab4d79"/><file name="ups.phtml" hash="a4fa51b2eda6290c99b7c0c0c6cfffc3"/></dir><dir name="variable"><file name="js.phtml" hash="8538abff6d312fb701fbbc3550951803"/></dir></dir><dir name="tag"><dir name="edit"><file name="container.phtml" hash="72887e68c2f5a5ec248a5607b4e1801d"/></dir><file name="index.phtml" hash="5bf61c4bc56186630c6889782d2cdc59"/></dir><dir name="tax"><dir name="class"><dir name="page"><file name="edit.phtml" hash="e1d76e3a3c4bde7487108fce74ca9b47"/></dir></dir><file name="importExport.phtml" hash="b6cd95136b50fd2d013e29bf2451bec0"/><file name="notifications.phtml" hash="764d203d842d1093c3bb96d3f6afcce0"/><dir name="rate"><file name="form.phtml" hash="1e2e7785dba03e796406e69ce3a769ae"/><file name="title.phtml" hash="c2eb1ee552f4cea7a102e4fa7ddfd0bb"/></dir><dir name="toolbar"><dir name="class"><file name="add.phtml" hash="4491c9722bd2331a2bdd304f031083b6"/><file name="save.phtml" hash="032714eae5624e7279dd193895e2ed8f"/></dir><dir name="rate"><file name="add.phtml" hash="032d165447fa3fae7e9f2ec9077ad4e7"/><file name="save.phtml" hash="ef208e4f3cc0d17fdb66bbbe91095274"/></dir><dir name="rule"><file name="add.phtml" hash="0dc115c883a8b54ce52a90700bd7ad2f"/><file name="save.phtml" hash="334317a26a36ea08f5a256a6905902ae"/></dir></dir></dir><dir name="urlrewrite"><file name="categories.phtml" hash="6f4495dea9e6cc3ca79b7f17405d21ae"/><file name="edit.phtml" hash="7c0db0d0650e40fee40fecc6edfd8429"/><file name="selector.phtml" hash="6094b7f69056c73542dcc4fb484fd45f"/></dir><dir name="usa"><dir name="dhl"><file name="unitofmeasure.phtml" hash="ab0c1fc151f0960904b72f5925ce72f3"/></dir></dir><dir name="weee"><dir name="renderer"><file name="tax.phtml" hash="1a03a17e003e282f305f5b98b76ec3a3"/></dir></dir><dir name="widget"><file name="accordion.phtml" hash="acf28e43dce33978945ee9a2f313c290"/><file name="breadcrumbs.phtml" hash="0f524150eeb162e84a3e0a2ea337c009"/><dir name="form"><file name="container.phtml" hash="6b7fcfc0cce370bd7dc2ea0d8e8b91df"/><dir name="element"><file name="gallery.phtml" hash="cc88955d39c4dca1c3cae2f1be11df71"/></dir><file name="element.phtml" hash="a9bcd0883785e27a3109e63c26091473"/><dir name="renderer"><file name="element.phtml" hash="3391b6b0186997220da62a58270d03e6"/><dir name="fieldset"><file name="element.phtml" hash="b404ad60631b57098b3fe47614d3c0ad"/></dir><file name="fieldset.phtml" hash="810c50c407a4e4002c38e33be96f9021"/></dir></dir><file name="form.phtml" hash="4ea8b1ce0e38792b8ea0a141e23f89cc"/><dir name="grid"><file name="container.phtml" hash="ddee399b4740f3cd8b16a319d6739825"/><file name="massaction.phtml" hash="35a4ca2a18dc9d0ecec321627619aa6a"/><file name="serializer.phtml" hash="8309b1d770991ade042a867531ccaab3"/></dir><file name="grid.phtml" hash="af5bb924c49ef99616309f0f9c9271a3"/><dir name="instance"><dir name="edit"><file name="layout.phtml" hash="594ee7f23240bb24219ea63b8b59168d"/></dir><file name="js.phtml" hash="f9cd0f08b4a7b12022c6df02e725578d"/></dir><file name="tabshoriz.phtml" hash="4b0d96893f2eb7eddde756d9a9725652"/><file name="tabsleft.phtml" hash="ba203148b588acb37cc4ae2f830f2feb"/><file name="tabs.phtml" hash="ff20c803cfb129521252118b10e23950"/><dir name="view"><file name="container.phtml" hash="25169c263daab90862150a40b7171c9f"/></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><file name="below_ie7.css" hash="b2bf3a91f389f2ea7912765a814ce10f"/><file name="boxes.css" hash="5903fadb2d1344922df0aafb49791df8"/><file name="custom.css" hash="30ed634c4e5d7521cf9961c880c3cba4"/><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><file name="ie7.css" hash="15db0c436a5438265a91b2c1e4ac4626"/><file name="iestyles.css" hash="89403be830634339c69a155aa824300d"/><dir name="images"><file name="accordion_close.gif" hash="875409122fc82f5f6705e20dd801fd3d"/><file name="accordion_close.png" hash="6213698b5f69bb2907a5c7bb94b5fe8d"/><file name="accordion_open.gif" hash="d9d50e220b0b676094c6134a9708194e"/><file name="accordion_open.png" hash="9fbc3aba23ce5e0465e4d1cf3f6a7aee"/><file name="add_btn_icon-disabled.gif" hash="c8f6a5cfb455ef121efb56a747821f82"/><file name="add_btn_icon.gif" hash="7300097305b577ee564dc49102822d16"/><file name="address_list_li.gif" hash="79b917b514e35ce0a7833a5e268fd9f7"/><file name="address_list_on_arrow.gif" hash="3a2884ddcc87ebd48883662530b9de1b"/><file name="address_list_over_arrow.gif" hash="e826883c71b1184bd4f29433e39c18ad"/><file name="address_list_over_bg.gif" hash="56291480cc89de9d817205a5f23b66dd"/><file name="ajax-loader.gif" hash="e2a38f1e23288e315af3c55416bc1ce7"/><file name="ajax-loader-tr.gif" hash="1ae32bc8232ff2527c627e5b38eb319a"/><file name="application_view_tile.gif" hash="f595a133bf466cb91be23d9686fe6281"/><file name="arrow_sort_move.gif" hash="f5ac151a2b0cb1f07d6e771b8aee0ea7"/><file name="bg_collapse.gif" hash="2333c68e38163ed4656da82b9bcf362b"/><file name="bg_create_order_totals.gif" hash="ff6ab75c050b959c539cc6a6fdff2934"/><file name="bg_notifications.gif" hash="a365594725a83585d989f722b3d8c458"/><file name="bg_window_mask.png" hash="93d6efad062d24c94c105802b138b6a5"/><file name="bkg_btn-close2.gif" hash="822457d78fb3c21dc12e9777d83eb4f1"/><file name="bkg_btn-close.gif" hash="df3f2332f0bad01e031deb22b81f630c"/><file name="bkg_config-advanced.png" hash="b898594a9f1849bf386c06979ef613a8"/><file name="bkg_config-nested.png" hash="7b0fdbf98746c3c916b432c37321ccc4"/><file name="bkg_config-shaddow.png" hash="9ee4318e3f4afc446d26e7f66d01cfbd"/><file name="bkg_tooltip.png" hash="56cfed3ed8a65b19f8de88946d1a0a01"/><file name="blank.gif" hash="5722d7bd0f1e1379d0a2005a0a9ea401"/><file name="box_bg.gif" hash="4c501bd6db9d361c18780f106a809b03"/><file name="breadcrumb_bg.gif" hash="72c4adf6c75b4640ca8f7cadffa42266"/><file name="btn_add-image_icon.gif" hash="1d42210fd29fc534d9ed6b41e811d40f"/><file name="btn_add-variable_icon.gif" hash="a2db02e318d107d5b57b444c8d80b8f8"/><file name="btn_add-widget_icon2.gif" hash="467acd3a14fb8be37191f5d2ec5a5b13"/><file name="btn_add-widget_icon.gif" hash="b4f66ca7f6097fbafd672e0b3f076ef4"/><file name="btn_back_bg.gif" hash="8be512788b8044fe31aa8d00cc16ba7b"/><file name="btn_bare_bg.gif" hash="ddbbab8c0d201c3e502d50e7d4a3d64b"/><file name="btn_bg-disabled.gif" hash="079971a9d2c385fe353d35716ec9f26b"/><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="btn_bg.png" hash="6e3b7003381f919e8f6533444afaa978"/><file name="btn_cancel_bg.gif" hash="fcb3506858fcfa8d1778b0683dc89f54"/><file name="btn_delete_bg.gif" hash="ad740d0c16f2f6603c8ef023004d6539"/><file name="btn_go.gif" hash="1bd787868713767cc205e2ee25e41f62"/><file name="btn_gr_bg.gif" hash="6cc324b79a512150fee24fb3517d22cb"/><file name="btn_gr_on.gif" hash="820c134df02f7bc12efa5a9ac3b4d3dd"/><file name="btn_gr_over.gif" hash="d4c8b807d64c1f493d17c6c9d2bab69a"/><file name="btn_loading-icon.gif" hash="45f500105be432a12c78fed2b4592cf9"/><file name="btn_login.gif" hash="79fa32d49d3f4e39d3fbf8327f9229e1"/><file name="btn_on_bg.gif" hash="709cf5b0be137db1ef8427688503bf37"/><file name="btn_over_bg.gif" hash="f91641168454c03d1fa72731ec97a2b3"/><file name="btn_show-hide_icon.gif" hash="0238c509b33ba56c25df9513bb48f804"/><file name="btn_task_bg.gif" hash="5e0594bd9cbfcc1e32ffa918d7f9c812"/><file name="button-close.png" hash="04d0907b2d7fc3240693497b199f64f5"/><file name="cancel_btn_active_bg.gif" hash="91ce403d286eef2b4e0c13733875882f"/><file name="cancel_btn_bg.gif" hash="26749cf4949ac27c30f597434d3bde65"/><file name="cancel_btn_icon.gif" hash="97e0cd94ed31d6f2a1181f627e60e9a3"/><file name="cancel_btn_over_bg.gif" hash="45eb4e883b17375961672f5390387c31"/><file name="cancel_icon.gif" hash="70a23b78353f0a7b9b118a937fcb7ea9"/><file name="config_tab_dt_bg.gif" hash="a33f71077ca4078caa794cae01d9fca7"/><file name="dashboard-close.gif" hash="5ae5afd61e937fcd2d5b84641255ee4d"/><file name="db-graph-bg.gif" hash="5d76efb7c3244f5684df2566782124ea"/><file name="db-graph-bottom-bg.gif" hash="b58ced87a38a10891106329ae882aa1c"/><file name="db-graph-line2-bg.gif" hash="744ebfdba20d050f4d252afc216394be"/><file name="db-graph-line-bg.gif" hash="f16bb08e040c2c0a3e23b3f35c54b79b"/><file name="db-graph-x-bg.png" hash="d5c26510718a78d22083916d80ef7a22"/><file name="db-header-bg.png" hash="3976cb6351e167686a501a85cf3a68e9"/><file name="db-menu-bg.gif" hash="ea534c3c09bb309e566b6ae876655e13"/><file name="db-menu-bg-hov.gif" hash="34ea76a6d105d90fcb63bf105aadb8f7"/><file name="db-menu-bg-up.gif" hash="b0f754872dff5f2f0dc57ba193fdfa4c"/><file name="db-menu-sep.gif" hash="7c5ae1cd59a189261cc3244358d5c1ad"/><file name="db-menu-sep-last.gif" hash="a01fe34854e1187e466fd58d462c4106"/><file name="db-menu-start.gif" hash="aa5cac2194d937cc7fa904ccfce70ecc"/><file name="db-scroll-bg.gif" hash="06d2411e3b5f350ab21b625439d2d69d"/><file name="db-scroll-but-bot.png" hash="25c0181e76ff8ceb3c0ec59071b8c72c"/><file name="db-scroll-but-bot-roll.png" hash="6bc5e482f3f6d8fb1fc5014ddea43706"/><file name="db-scroll-but-top.png" hash="de7df96e961596be9ff556924259b98b"/><file name="db-scroll-but-top-roll.png" hash="b7961f2a3b5b641694a9b0b30d58e46b"/><file name="db-scroll-roller.png" hash="e01dde7bd096c52179acf29a425a29e5"/><file name="db-tab-bottom-left-bg.gif" hash="124388d44ac58b029377c6311a4782d5"/><file name="db-tab-bottom-mid-bg.gif" hash="9c48f33aa8907cfcb227bc779c2e1dce"/><file name="db-tab-bottom-right-bg.gif" hash="1db45e6fd8abc67d59f96a676607b412"/><file name="db-tab-footer.gif" hash="cac8928acba75bc1edd73186ced78e5c"/><file name="db-tab-header.gif" hash="fdf493b9477fcff7e7be98405effc33d"/><file name="db-tab-header-sep.gif" hash="580312af7441b6a62f7e32081c40fb0f"/><file name="db-tab-left.gif" hash="3fe3c55267dbbdd1db2ff959ccc9e0be"/><file name="db-tab-right.gif" hash="b7a32c8b03efe2fbdb63215d0446e3be"/><file name="dotted_divider_dark.gif" hash="8bf1de196d9ea048bfb25155cedd2e9e"/><file name="dotted_divider_light.gif" hash="92e562bf2070110f6b0a15e29b845445"/><file name="edit_icon.gif" hash="dbda31751c78d964c04394e9d8533187"/><file name="entry_edit_head_arrow_down2.gif" hash="d68dd0fbc2819858a26ea2835c05df77"/><file name="entry_edit_head_arrow_down.gif" hash="985c3ce4439fbf8bb2216fc7e73a3f0b"/><file name="entry_edit_head_arrow_up.gif" hash="d2b90a1823fff9f3917f19b427410144"/><file name="entry_edit_head_bg.gif" hash="1086b7196e8b33c4f46e49fecef0f35f"/><file name="error_msg_icon.gif" hash="e4f28607f075a105e53fa3113d84bd26"/><file name="error-msg.png" hash="3cd27b642416dacdc28907c89d934886"/><file name="fam_account.gif" hash="c910fd1ff41b940d71b0835e02fc143e"/><file name="fam_application_form_delete.png" hash="972c2d998fc19572dd64af6b5e2e898e"/><file name="fam_application_view_tile.gif" hash="f595a133bf466cb91be23d9686fe6281"/><file name="fam_asterisk_orange.gif" hash="908d44da90de5e54185764d093bbdb77"/><file name="fam_bin.gif" hash="2fb388bc9f1d32d3802db8e91dc238bc"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><file name="fam_bullet_disk.gif" hash="9fe82691d960c18d3d315c3f9164af4f"/><file name="fam_bullet_error.gif" hash="008802f44288b732b59cfe9fdbfecefe"/><file name="fam_bullet_success.gif" hash="465a056a3ba3d94367f51c3c0b751391"/><file name="fam_calendar.gif" hash="0614207ce4e3e0a9bd631b39e7692e3c"/><file name="fam_cart.gif" hash="1f2fd2c8ac6574488ea78302b6856191"/><file name="fam_comment.gif" hash="5138f9a4b6019a5b14b8ff9a32a3cb89"/><file name="fam_creditcards.gif" hash="b75b8ce2f4fceb58f8082c48344560c7"/><file name="fam_folder_database.gif" hash="e86175ff0f389ade1fc7bf15e03346eb"/><file name="fam_folder_palette.gif" hash="c0941b9145e06d53cc0d17ac4c151764"/><file name="fam_folder_table.gif" hash="e2914ba75944acd2a9e2d338fa339e16"/><file name="fam_group.gif" hash="52d778dddbf48b8d04226bee9370a7ef"/><file name="fam_help.gif" hash="2b5ed4c13a8e24456207b757826c7b2c"/><file name="fam_house.gif" hash="8eb2d580c5a40b7974f4263ca64fb94a"/><file name="fam_layout.gif" hash="5366a5f02260d3a860ef0c4787282ad6"/><file name="fam_leaf.png" hash="078d4f24683331b4557356a59e67b125"/><file name="fam_link.gif" hash="78590d5d8375d1baabe7b66d7b9ceb7d"/><file name="fam_lorry.gif" hash="174e86e45e76e7008fa3510cefa85047"/><file name="fam_money_add.gif" hash="70ceed401fe9913305f2362f7e26225d"/><file name="fam_money.gif" hash="6996bad465222fb6487cab94b4607846"/><file name="fam_monitor.gif" hash="f3bc806ff9d0907320b03018ba2d00ea"/><file name="fam_newspaper_delete.gif" hash="41acabfc19102be92d3ccbc66d1fede3"/><file name="fam_newspaper_error.gif" hash="009bfa425298e1d2e44e38e58cd97938"/><file name="fam_newspaper.gif" hash="9e5fee06a543742045118a95f2debcb8"/><file name="fam_newspaper_go.gif" hash="eb43105f8e13e3a752d7ca33bb086831"/><file name="fam_package.gif" hash="bf9be09ef64d006455baa211b7c03983"/><file name="fam_package_go.gif" hash="e4f8d380c2f8e5a7345e360293433764"/><file name="fam_page_white_edit.gif" hash="a4f88300b74ad592a5c47ed54ff07af9"/><file name="fam_page_white.gif" hash="26940eb67826c5af72b6048c7c5a8335"/><file name="fam_rainbow.gif" hash="e8b04cc945b3582a181d4ddbc2d2325f"/><file name="fam_refresh.gif" hash="01bbef614023c0890812e76bc7ecf7e0"/><file name="fam_server_database.gif" hash="7901fa06ffd68ed730cf43bb560756fd"/><file name="fam_status_online.gif" hash="a80019ffa3a573f709772ed1099343fc"/><file name="fam_tag_orange.gif" hash="6ce735a0e590bda040b6e1614c42e58a"/><file name="fam_user_comment.gif" hash="014dfd31d9af40e3d5960b2b0d900da3"/><file name="fam_user_edit.gif" hash="f5b36e803060c6b82e639a4fad57b9f7"/><file name="fam_user.gif" hash="63bbdd6d9d7a27591907a7b87898e259"/><file name="filter_row_bg.gif" hash="013a0929a7b2ddc6823bdda17d08acc0"/><file name="footer_bg.gif" hash="7724711d3ca07a5e46a6030e86743a71"/><file name="gift-message-collapse.gif" hash="5b710f5faa9c7352a39c10e3ebbee6fc"/><file name="gift-message-expand.gif" hash="fd53a70cbb1ea048754657a63787e9cb"/><file name="gift-message-grid-column-bg.gif" hash="97a8a9b8cc4ab68e7404ccf1320f50a6"/><file name="grid-cal.gif" hash="b1468e5239504974c689eea5d93f86d4"/><file name="grid_sort_asc.gif" hash="b78c3a1a27ac9672a31b7d1bbac60322"/><file name="grid_sort_desc.gif" hash="d958b946eba3dba863d724530a0dba1a"/><file name="grid_th_bg.gif" hash="8f4349fac728858374e17edf03390977"/><file name="grid_th_onclick_bg.gif" hash="7bf331e2a41e5331c4210bdc6adc4383"/><file name="grouped_to_order_icon.png" hash="4bdae9a6199655027b8b8aeee8f80ce4"/><file name="header_bg.gif" hash="cbe510856afa5cb0c32642c1f9a8eceb"/><file name="header_top_bg.gif" hash="8440b04c5cb6b1451bb886bfbef260a5"/><file name="horiz_tabs_ul_bg.gif" hash="58dbd9c45f76993346c2bb788896248e"/><file name="icon_btn_add.gif" hash="7300097305b577ee564dc49102822d16"/><file name="icon_btn_back.gif" hash="89ed97cede3f68241446a62c96e3ce4c"/><file name="icon_btn_delete.gif" hash="dbde0b76d36cfd624bf0de166d0a265e"/><file name="icon_btn_save.gif" hash="f5da95ac65efff5f5cf9c8830202764d"/><file name="icon_edit_address.gif" hash="d1ca2bb3a5c86afd379f25d9fc4352e3"/><file name="icon-enabled.png" hash="5fa7c06b312cbea3675e844686e434af"/><file name="icon_export.gif" hash="9a13f20c6a17b41b9c357545c2da5636"/><file name="icon_export.png" hash="fb299dd13df666516eabe16f59193383"/><file name="icon_feed.gif" hash="0366583ed6e285d028442fcdebb05072"/><file name="icon_feed.png" hash="8537f6f88fcff4aac793247143d14e42"/><file name="icon_note_list.gif" hash="8d25ba225ca09b687a78bff510df5d10"/><file name="icon_remove_address.gif" hash="2de2b3d02c19adfb93e9e43a392db178"/><file name="icon-tooltip.png" hash="5767601cd66b23d0b6fe8defc10dd48d"/><file name="ico_success.gif" hash="0afb20898a704a106cb4c598868abf32"/><file name="i_notice.gif" hash="ebd56dc80b8346e10e93628bc0e6c372"/><file name="i_question-mark.png" hash="23201b7ac207eebd9be0776ea44098a4"/><file name="login_box_bg_auth.jpg" hash="d90a81db1064ec37b0cc92436725c24b"/><file name="login_box_bg.gif" hash="e4654826eaa8d5ebc0ab18e9bee71e1d"/><file name="login_box_bg.jpg" hash="404e37f4ee9f4ff9bfcb638741c7581d"/><file name="login_box_bottom.jpg" hash="038f15261e74bc381484f2fcfa45a73b"/><file name="login_box_legal_bg.gif" hash="528ac4dd480c4fc00ac808bf17394c05"/><file name="login_logo.gif" hash="9cc90e7aa1210883000fe5319862ce14"/><file name="logo.gif" hash="c7e9f290d965f707e4c4a61bfdab58cb"/><file name="logo-large.gif" hash="5c77654c424b0a35cc24d28df5166dc4"/><file name="massaction_bg.gif" hash="8b5f4db3ab3ea09cd5bd0164d67c4f0d"/><file name="massaction_button_bg.gif" hash="4c8262817e48d007237124ce0e7f4d18"/><file name="massaction_links_delimiter.gif" hash="9a0337183b5b67c0eed75993d7f14d10"/><file name="middle_bg.gif" hash="ba4f176d2c553201ebab4aba5c6d3d20"/><file name="more_arrow.gif" hash="38bb4c0e9270250151486d0bb36c476f"/><file name="nav1_active.gif" hash="a7f9ec7689a65c6b796f0d9b97582d01"/><file name="nav1_bg.gif" hash="a1d4ef5b590ce0a425dc04e45ed06cbe"/><file name="nav1_off.gif" hash="5286cbd5ac9ec1b6c027d5b48a74bdab"/><file name="nav1_on.gif" hash="a7f9ec7689a65c6b796f0d9b97582d01"/><file name="nav1_over.gif" hash="2c70d6175f1c965c27dda0598a67e63c"/><file name="nav1_sep.gif" hash="5286cbd5ac9ec1b6c027d5b48a74bdab"/><file name="nav2_last_li_bg.png" hash="279935c9799679fc5894337eaabc7cf0"/><file name="nav2_last_li_over_bg.png" hash="39536f00824293d11242888a76f40a5f"/><file name="nav2_li_bg.gif" hash="0a4f34b0e4436c519d31203f19503b83"/><file name="nav2_li_bg.png" hash="2fad219d162324e9a19f2745d5b6d562"/><file name="nav2_link_bg.gif" hash="dce00ddad351e72e83bc87274cbaa54a"/><file name="nav2_li_over_bg.png" hash="dc37c4a4aab40ea2ae44dea5ea133a9d"/><file name="nav2_parent_arrow.gif" hash="60e012a14a077bd2257343facc369c0c"/><file name="nav3_bg.png" hash="2bc7af80ad8886013da38401b63ab6df"/><file name="nav_bg.gif" hash="1b857c7d35f35ef9f6cae9e03a4e3dff"/><file name="nav_list_bg.gif" hash="7a4e2bdb887c12d8a1152bbcc8c02a3c"/><file name="nav_nest_link_bg.gif" hash="1d0c6b374bf02ac4b5aa012955c431de"/><file name="nav_nest_link_over_bg.gif" hash="fae3c579a4d432503b1f4f929d070609"/><file name="nav_on_bg.gif" hash="ac624b580cae5a76f6c92abc5a44191d"/><file name="nav_parent_arrow.gif" hash="3a95559263e569dc1c8065cb2d9b3f2c"/><file name="note_bg.gif" hash="105967d7c15ab4610726eea52d862a97"/><file name="note_cell_bg.gif" hash="71e656d42f8ba8c2d477c6866c499b71"/><file name="note_msg_icon.gif" hash="e774ee481a2820789c1a77112377c4e0"/><file name="notice-msg.png" hash="9cd1dfebccec8a2123d543fa49b17bd7"/><file name="pager_arrow_left.gif" hash="6e44f608dac8eb8be1d1ebee5a3285aa"/><file name="pager_arrow_left_off.gif" hash="30f5e56195ab3546b36f4016db5254be"/><file name="pager_arrow_right.gif" hash="cc79526156b7e0c8abce61fad3d53f77"/><file name="pager_arrow_right_off.gif" hash="f01b7dad9acf0180b5c62edbd7ea9939"/><dir name="paypal"><file name="logo-paypal.png" hash="d032551b47e48dced277c4fa344ac7f6"/><file name="pp-allinone.png" hash="c457fe4bfe28a18c90d0abd36fe3f880"/><file name="pp-alt.png" hash="c262d332b342a2f4063cd82a61d11107"/><file name="pp-gateways.png" hash="90acb72c2f46fa131351efe0492d52cf"/><file name="pp-uk.png" hash="e0830ccb14533051b8b0340471744228"/></dir><file name="paypal_logo.gif" hash="871e205a64292121f4c893373acfb581"/><file name="paypal_section.png" hash="d032551b47e48dced277c4fa344ac7f6"/><file name="paypal_tick.gif" hash="e8685c1fb7c4c106ae4fd24e9bbf5a27"/><dir name="placeholder"><file name="thumbnail.jpg" hash="5c73b5aa515b1719f7b398f5131f91a8"/></dir><file name="process_spinner.gif" hash="345b30b4d0b6088d0151ecfbdf48c036"/><file name="product_rating_blank_star.gif" hash="5e20a299c0ff16168be38b6dde580eda"/><file name="product_rating_full_star.gif" hash="dd5aae332178d928a7f49dea7691b5f6"/><file name="reload.png" hash="84cc4883f78ef850814ea9b53989b2a7"/><file name="rule-ajax-loader.gif" hash="32dc1f5901143d36fbd7a6df3950819f"/><file name="rule_chooser_trigger.gif" hash="9c498e789c3ce734f5301c2475e2a04c"/><file name="rule_component_add.gif" hash="7914e57701ca26f5c8bf23c6bc3e1f25"/><file name="rule_component_apply.gif" hash="3f9b9025551da6963a9ecf8d184a204a"/><file name="rule_component_remove.gif" hash="4d785bcecfbe716fa4d749d20738a8f0"/><file name="save_btn_icon.gif" hash="f5da95ac65efff5f5cf9c8830202764d"/><file name="sec_nav_bg.gif" hash="99c6741591cdb2a2a128668a1d32d668"/><file name="section_menu_bg.gif" hash="f9edd44c92743a0c9ae9535a7992d6b1"/><file name="section_menu_bottom.gif" hash="167d2ef46ff80158c807b4b916501b28"/><file name="section_menu_link_bg.gif" hash="bcabd4fea0d67b181f21779564c2284b"/><file name="section_menu_link_over_bg.gif" hash="7da7e56567633aab279cf3aec6f49d8d"/><file name="section_menu_over_span_bg.gif" hash="f5ea5292f15ed62b99f0f51d9fff2c66"/><file name="section_menu_span_bg.gif" hash="dbf3916358e794ee809b4cf33903af2c"/><file name="section_menu_ul_bg.gif" hash="3aea6e5452f548438ca34e17954a9d6b"/><file name="side_col_bg.gif" hash="b3691fd62663457af39eaf71dd8cda5a"/><file name="simple_container_bg.gif" hash="56f1ac91169eb4896b8c91384fc8bf15"/><file name="sort-arrow-down.gif" hash="fc2cd9f756ce510c4470478d720f81cd"/><file name="sort-arrow-down.png" hash="dc65160d9d4d6cdd6bfe1b397a931975"/><file name="sort-arrow-up.gif" hash="39026b0ff1f0c18091caa60384491163"/><file name="sort-arrow-up.png" hash="da54e5306bdce67551aa415f5d7f7ea7"/><file name="sort_heading_bg.gif" hash="6066d09f237f556b0a4770e4788e7598"/><file name="sort_on_bg.gif" hash="0cb36788ed4fbf19e657acbc75a3f1b8"/><file name="sort_row_bg.gif" hash="f2e1c5cb26b9f5211419b99d30745244"/><file name="spacer.gif" hash="df3e567d6f16d040326c7a0ea29a4f41"/><file name="sub_button_bg.gif" hash="e3f66dd60510f9f7e937e2e55442c30a"/><file name="success_msg_icon.gif" hash="834dfafd5f8b44c4b24a4c00add56fcf"/><file name="success-msg.png" hash="c64cb2acc3d0eeba48fdea83620913ed"/><file name="tabs_link_bg.gif" hash="34447929f5e6591ba9b5795b983fdfd4"/><file name="tabs_link_over_bg.gif" hash="2cf3f56884096055fb0bdf9474f280c9"/><file name="tabs_span_bg.gif" hash="bcabd4fea0d67b181f21779564c2284b"/><file name="tag_blue_edit.gif" hash="b2163ac3baf7d822b48593342846645a"/><file name="tn_cancel_bg.gif" hash="fcb3506858fcfa8d1778b0683dc89f54"/><file name="tooltip_bg.gif" hash="0aa4b866fc067a75f27ab749c1dabf74"/><file name="tooltip_corner.gif" hash="71146534671d5e0751505640b7c59859"/><file name="tooltip_top.gif" hash="032ff52a6ff5714cbdf6c1f62abaf7e5"/><dir name="tree_icons"><file name="joinbottom.gif" hash="4b3daa7f2cc584f1aac0d142275d7cba"/><file name="join.gif" hash="4d5d614e0da056df815a4306d6368692"/><file name="line.gif" hash="63ab38a6203262f15ca46c631232ea2c"/><file name="minusbottom.gif" hash="b09d684cca7135ef728141aaf2464baa"/><file name="minus.gif" hash="d647fbbd0ec410b8f3bb3357b62eedcf"/><file name="nolines_minus.gif" hash="eb2243a354ffcfac93ba0fe948f7167d"/><file name="nolines_plus.gif" hash="ec92b634b63608fb4b0dbf114e3b89e1"/></dir><file name="validation_advice_bg.gif" hash="b85432906de8985a8b14eeb2dc652d3c"/><file name="varien_logo.gif" hash="6f10d0fe572cb012947c164217e9e428"/><file name="warning_msg_icon.gif" hash="4cf6ec7f59ab09f9c18b3a4301714c6d"/><dir name="widget"><file name="catalog__category_widget_link.gif" hash="8435943009f1f774bbd6a4809c719eb8"/><file name="catalog__product_widget_link.gif" hash="62f2d7020143f98ba7514469eb612a7f"/><file name="catalog__product_widget_new.gif" hash="37a5af9f98ae73e180ad0cca05c95324"/><file name="cms__widget_block.gif" hash="b7b0b1517cc38b18b92841b33b312190"/><file name="cms__widget_page_link.gif" hash="b839dee210e61850a5858cc8634cbccd"/><file name="default.gif" hash="684143ae5531aa6ba22215f4fadeea6c"/><file name="reports__product_widget_compared.gif" hash="bd3e5a5015eb2c5c64f1d11835166dc4"/><file name="reports__product_widget_viewed.gif" hash="44d5cd71e4fb7235f9cff0c7e2b2f531"/></dir><file name="widget_placeholder.gif" hash="2bd8d72cf12f8d7d0a6a3268f97786ff"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/><file name="window_content.png" hash="08361df29783d46a2493cf0d8ad733a7"/><file name="window_top.png" hash="555a8db5efa3a252c2ead3d3dadd1075"/><dir name="wysiwyg"><file name="skin_image.png" hash="a521b0c60b001de4a3405e73c4a6cd4a"/></dir></dir><dir name="lib"><dir name="prototype"><dir name="windows"><dir name="themes"><dir name="magento"><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="content_bg.gif" hash="21278ea0da2d4256f4ced96b6080ba2e"/><file name="top_bg.gif" hash="26f28090de87d64f9b01bf624f89bfe2"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/></dir><file name="magento.css" hash="a0b153cee7655dad31ee2923657cc08a"/></dir></dir></dir></dir><dir name="media"><file name="editor.swf" hash="259afd515d7b2edee76f67973fea95a6"/><file name="flex.swf" hash="60a8c242ca2ff0e70ed9a038749f4cc1"/><file name="uploaderSingle.swf" hash="304dd960698c5786dcd64b0e138f80ca"/><file name="uploader.swf" hash="1c300001dadd932ef6e33a2fadf941e1"/></dir><file name="menu.css" hash="6f39c760b70b8250c193c5311885193a"/><file name="oauth-simple.css" hash="c8ba6fccc85ce28f4360b10b5b59adb9"/><file name="print.css" hash="db77a54f0e6a7146cad6566eb200a0d5"/><file name="reset.css" hash="d45948716e2dd828a40715b9a43e2115"/></dir></dir></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Adminhtml</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package><package><name>Lib_Js_Ext</name><channel>community</channel><min>1.7.0.0</min><max>1.8.0.0</max></package></required></dependencies>
+</package>
diff --git a/var/package/Interface_Frontend_Base_Default-1.8.0.0.xml b/var/package/Interface_Frontend_Base_Default-1.8.0.0.xml
new file mode 100644
index 00000000000..a5a7ac0d4f0
--- /dev/null
+++ b/var/package/Interface_Frontend_Base_Default-1.8.0.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Interface_Frontend_Base_Default</name>
+    <version>1.8.0.0</version>
+    <stability>stable</stability>
+    <license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>This is a Magento themes base</summary>
+    <description>This is a Magento themes base</description>
+    <notes>1.8.0.0</notes>
+    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:30:56</time>
+    <contents><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="etc"><file name="widget.xml" hash="7841e91642c07d049f6031c0a8b29968"/></dir><dir name="layout"><file name="authorizenet.xml" hash="ff4ae194cd550829d615f6626dfcacb3"/><file name="bundle.xml" hash="0990d5fb3da9521028ea1d507ac11ca7"/><file name="captcha.xml" hash="dbfae489e384e5f4509f91e7ce81be75"/><file name="cataloginventory.xml" hash="6cb9b9a4c99681b769e1ff439b55a0ce"/><file name="catalog_msrp.xml" hash="add0145199068eb0c16b3e03e7936b95"/><file name="catalogsearch.xml" hash="bd12d18c200b51e4f7fb4966fc467f38"/><file name="catalog.xml" hash="c12a09da3508982c50132a3fa6891739"/><file name="checkout.xml" hash="fe3715bb895566376aaf61c318fa848f"/><file name="cms.xml" hash="48e50d6294f859fa528278a7899d8c30"/><file name="contacts.xml" hash="c7c81f13d7deba797ede47e730278649"/><file name="core.xml" hash="b39a8c4b82a5a1fb34830e2763516efc"/><file name="customer.xml" hash="5bdf1625ffcdadf4d4f62600a566a15d"/><file name="directory.xml" hash="d30e05f8e4fe1eb024db1dbdcdd32414"/><file name="downloadable.xml" hash="41b9c74a3e787f07536e7ae24e5c8e80"/><file name="googleanalytics.xml" hash="7a34c27c3a4ec5f65aafe317d4e82f9a"/><file name="googlecheckout.xml" hash="fa4577aecbe0f36bce87e06bc652a062"/><file name="newsletter.xml" hash="c0043b6a9f5e6effe8ad9791c1d1c28a"/><file name="oauth.xml" hash="bfaded1209520e85687e4855114be425"/><file name="pagecache.xml" hash="ffa2ab2f6d87db688402cbefaf0bef19"/><file name="page.xml" hash="51344a8115e9c9b892e65be9a5de9b94"/><file name="payment.xml" hash="2d90077e1b2f846063a89c8aeb4d5fdb"/><file name="paypaluk.xml" hash="3fe895d16b62ad96476798a2e6077aab"/><file name="paypal.xml" hash="9aacf061f6056c66dcdb579a82660113"/><file name="persistent.xml" hash="55e430a56de4a4e62f94f045c4673bdc"/><file name="poll.xml" hash="ed6f016af222db0db3b17117977e87ac"/><file name="productalert.xml" hash="c83056d65e32214d23ae3b849ce849a4"/><file name="reports.xml" hash="0ed016155a3cf6bd366d482d92f41249"/><file name="review.xml" hash="435119eb74e4928c099e4b48ebfccf8a"/><file name="rss.xml" hash="16c16c677087920d3698e4e60b44b2b9"/><dir name="sales"><file name="billing_agreement.xml" hash="d510d75db1ce7fc999462e50be600497"/><file name="recurring_profile.xml" hash="052592ffb00251a440307c4e5a140ff7"/></dir><file name="sales.xml" hash="98042160869202debcf88e2b2c281b56"/><file name="sendfriend.xml" hash="12b612b48cda35223e36595179aefac1"/><file name="shipping.xml" hash="a2f266abff8dca19d01dc2d00e383a79"/><file name="tag.xml" hash="ffc5a935cb0713614fdfc9efc395fcfc"/><file name="weee.xml" hash="a4fc63dc72939c5180d288994d8da72b"/><file name="wishlist.xml" hash="cbbf15f8511ff6942be5a9a08225d787"/></dir><dir name="template"><dir name="authorizenet"><dir name="directpost"><file name="form.phtml" hash="4d3c5051c0d2c3c3c88dc516946947cd"/><file name="iframe.phtml" hash="6a628174882ee3db2bea73d72be15a2b"/><file name="info.phtml" hash="80267017d18a69690ffa2012bf16ea60"/></dir></dir><dir name="bundle"><dir name="catalog"><dir name="product"><dir name="list"><file name="partof.phtml" hash="ccce44c73d5841fb4a220166e1a53776"/></dir><file name="price.phtml" hash="7a300519728802570c4918c7846f6bd6"/><dir name="view"><dir name="options"><file name="notice.phtml" hash="cac90dc8b9a94c42d710e5bbc8e39f61"/></dir><file name="price.phtml" hash="e19a7489377de3fe934f2ad8a8b4e40f"/><file name="tierprices.phtml" hash="156c0fb91c4293e798145896ba7954c8"/><dir name="type"><dir name="bundle"><dir name="option"><file name="checkbox.phtml" hash="60f522edfadba0412a2abdd7090e6da2"/><file name="multi.phtml" hash="84f0a9c4ce3bfa7b3196921e0e67e83b"/><file name="radio.phtml" hash="a7708d52e39e6e2361c0d868b50ac247"/><file name="select.phtml" hash="376be44e6e793aeae1104543e9eda969"/></dir><file name="options.phtml" hash="d015eefd779fa786b934c3c630c805fc"/></dir><file name="bundle.phtml" hash="bef57a41d87a39442be57a7c8b219b8c"/></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="459ee036059c16dd5c3af203d07b1264"/></dir><dir name="invoice"><file name="default.phtml" hash="a680f24fa94bfdad117e4aa350ec71ff"/></dir><dir name="order"><file name="default.phtml" hash="68613900f0e092ee5506d03c70b6f144"/></dir><dir name="shipment"><file name="default.phtml" hash="05585c1ccbee57dab08a358d31906c68"/></dir></dir></dir></dir><dir name="rss"><dir name="catalog"><dir name="product"><file name="price.phtml" hash="d9d4b6e1d4268459bb9112a4c2fd9e30"/></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><file name="renderer.phtml" hash="82137b4b7e19b3c8166703a9a9fcf44b"/></dir></dir><dir name="invoice"><dir name="items"><file name="renderer.phtml" hash="d35a83c2899d417c8837657ef9bd87e8"/></dir></dir><dir name="items"><file name="renderer.phtml" hash="113506ee795061805ef490b747927230"/></dir><dir name="shipment"><dir name="items"><file name="renderer.phtml" hash="6307c71651e7a91d3e6dfdfd64c25079"/></dir></dir></dir></dir></dir><dir name="callouts"><file name="left_col.phtml" hash="2e560ea0fdde22566d59179b7b15b8e6"/><file name="right_col.phtml" hash="2e560ea0fdde22566d59179b7b15b8e6"/></dir><dir name="captcha"><file name="zend.phtml" hash="5480e8c35dd6124195fc71d85e86e2d9"/></dir><dir name="catalog"><dir name="category"><file name="page.phtml" hash="514593d873876e3225a4b1ae3643abff"/><file name="view.phtml" hash="a07e819e74bbe444a6f1131dc3ccd142"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="e5ebf3a71e72ad751a5415d75e89ece4"/><file name="link_inline.phtml" hash="16609d7a742e10e72da22449f92054bf"/></dir></dir></dir><dir name="layer"><file name="filter.phtml" hash="eac743dbcd2d881c42b6f18ec704eae9"/><file name="state.phtml" hash="ed374b6ffb814b13e2eba6ef02e99efc"/><file name="view.phtml" hash="561f244e27b6f6017d1d5bc365242b27"/></dir><dir name="msrp"><file name="popup.phtml" hash="c08375903f3f11f2af8f3a5a007f0c92"/></dir><dir name="navigation"><file name="left.phtml" hash="39bedcb075360fdc2a399535a6e792ae"/><file name="top.phtml" hash="72623b9b9c6b58a7df91284862be17ff"/></dir><dir name="product"><dir name="compare"><file name="list.phtml" hash="19383cc23c8f6c9fe556cceebfc34c07"/><file name="sidebar.phtml" hash="2e6a4a82e082d235a9329959381c4414"/></dir><file name="gallery.phtml" hash="f1f89fa5e982cddbd506e80630a57d99"/><dir name="list"><file name="related.phtml" hash="9e1dfd894fa6f0ce6a88c4e0ef79e2a2"/><file name="toolbar.phtml" hash="197911bc8235bc39f5b5c87882724ecd"/><file name="upsell.phtml" hash="8dd3aab7ebd869c8d4f40099f4716506"/></dir><file name="list.phtml" hash="7d7da624243ec149c96a41df9132bdce"/><file name="new.phtml" hash="f2c93ef5f556ba94229eed83f58abb57"/><file name="price_msrp_item.phtml" hash="6bbc7f3e3c3b73e009bc0ab8838d3d40"/><file name="price_msrp_noform.phtml" hash="1692b20a230588ca548f1459c285cc74"/><file name="price_msrp.phtml" hash="283e07fdb0701feb006bc02edd3f23a9"/><file name="price_msrp_rss.phtml" hash="6ee30cbc86da3aeea4187810da10a9e9"/><file name="price.phtml" hash="111aedf46fee15d709028a3d0d47672e"/><dir name="view"><file name="additional.phtml" hash="5d113b63135e535c5b6fe5695dc94ded"/><file name="addtocart.phtml" hash="d8b6b397a4a04c3266c0c82391aa4acb"/><file name="addto.phtml" hash="a430465fcac701cb788916da08c52b90"/><file name="attributes.phtml" hash="c184b99a88f08fa50704c399a37fcfbc"/><file name="description.phtml" hash="4e920e324b0a0d366127a3ad99e2328d"/><file name="media.phtml" hash="1be8f4ea6e54f9a97e220f28931c4f50"/><dir name="options"><file name="js.phtml" hash="160fcd9f5eade825dfa8f4121aac9778"/><dir name="type"><file name="date.phtml" hash="78a303ab99f3361028053bf0b977b976"/><file name="default.phtml" hash="4c599ba00a9e7ab0e39768f0c49d52c3"/><file name="file.phtml" hash="3a7fe05c434ec81f68229ba5365095cc"/><file name="select.phtml" hash="4385f417292667d74616d113de034d4c"/><file name="text.phtml" hash="c041996450010583ae8759480f87d317"/></dir><dir name="wrapper"><file name="bottom.phtml" hash="85655fc307d163ec6bffc07bef7f8924"/></dir><file name="wrapper.phtml" hash="a797d8924b27b63652255a8331bf8d44"/></dir><file name="options.phtml" hash="81a5b17ed13aabbca729c61b3f9b9111"/><file name="price_clone.phtml" hash="24e53a27dc39aa31afd2cdac7ab1656d"/><file name="price.phtml" hash="a6ab4e3bff155c7f2424568f60be1b89"/><file name="tierprices.phtml" hash="9eab82fafca8880c619276489bf99649"/><dir name="type"><file name="configurable.phtml" hash="e67c05bee0fa75df518c39929aa10187"/><file name="default.phtml" hash="cfab2e65accf5808fe352b52a00840de"/><file name="grouped.phtml" hash="a2cf1b972121dbee6a6159e0d13c180e"/><dir name="options"><file name="configurable.phtml" hash="08236b6638dc11992ab8da5385977271"/></dir><file name="simple.phtml" hash="e67c05bee0fa75df518c39929aa10187"/><file name="virtual.phtml" hash="e67c05bee0fa75df518c39929aa10187"/></dir></dir><file name="view.phtml" hash="de4d79d9f647634e02496a23f3ee7fbb"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="a6506809feaf1777e007864fc62ce26f"/><file name="link_inline.phtml" hash="351d332bd78df5f47bf6b66cb89a8297"/></dir><dir name="new"><dir name="column"><file name="new_default_list.phtml" hash="f908f845e582dea293d4526ef729e396"/><file name="new_images_list.phtml" hash="3f263b467a58c306286e32332fbaab43"/><file name="new_names_list.phtml" hash="b09275eec939d91f6d20397c9d184691"/></dir><dir name="content"><file name="new_grid.phtml" hash="41602b4011288669a196e5c35309251c"/><file name="new_list.phtml" hash="6073d9562d08044588c8406a81890a39"/></dir></dir></dir></dir><dir name="rss"><dir name="product"><file name="price.phtml" hash="1a1c258cb9a2561df2531a9a6d13d19f"/></dir></dir><dir name="seo"><dir name="sitemap"><file name="container.phtml" hash="9e809f0c7520508e73f22058ea127b3f"/></dir><file name="sitemap.phtml" hash="7e26f673c65ea756b09d7d2797bbaff9"/><file name="tree.phtml" hash="413ef1fa8c5e9943b1a44dd23ab9d69d"/></dir></dir><dir name="cataloginventory"><file name="qtyincrements.phtml" hash="3b48f42619900ad7b7cbf191d55f0ee1"/><dir name="stockqty"><file name="composite.phtml" hash="825737ef425d3911dd663e8586b4f68c"/><file name="default.phtml" hash="c4646015a5d2203ce5bf422c1fc31485"/></dir></dir><dir name="catalogsearch"><dir name="advanced"><file name="form.phtml" hash="d2f471111db7270891466b47ebef1ff7"/><file name="result.phtml" hash="5513b4ad4914f2b06c13983975e70faa"/></dir><file name="form.mini.phtml" hash="c6139cd74a134cb0d4364a4b0b53708f"/><file name="result.phtml" hash="fde05cf4fe8e540c5437820ec5edbbcf"/><file name="term.phtml" hash="32bf5a3d5960180b1c1603da350afa12"/></dir><dir name="checkout"><dir name="cart"><file name="coupon.phtml" hash="8a3f239d1f8afa5dfa3d45a1ca28baae"/><file name="crosssell.phtml" hash="186f8405ec7a86f7e48bfcb01adf7b2e"/><dir name="item"><dir name="configure"><file name="updatecart.phtml" hash="0fc6cc809c88704da74a915cf7e20918"/></dir><file name="default.phtml" hash="ef843033ce7057091a5eca85723f40be"/></dir><file name="noItems.phtml" hash="001f7d25b1c9468f532a13940fc8c7bb"/><dir name="render"><file name="default.phtml" hash="f5b6d21f8a80455daab898ea0f3f7c97"/><file name="simple.phtml" hash="15fb630f32aadbd48a892e8d90af3073"/></dir><file name="shipping.phtml" hash="6b774a841fc54c29a1f5d3a2af6a0944"/><dir name="sidebar"><file name="default.phtml" hash="b508e1e2007554fdd72570e9b1efbc92"/></dir><file name="sidebar.phtml" hash="8344c09dde70abe4e3b9c8861a1bb741"/><file name="totals.phtml" hash="5b69442fec9380e0e6d2afc6f95fd04a"/></dir><file name="cart.phtml" hash="34d41f366e05314baf7cbee9a37ad6bd"/><dir name="multishipping"><dir name="address"><file name="select.phtml" hash="5298b1c3f448f03685fb8bd0df88d97b"/></dir><file name="addresses.phtml" hash="234be7957d9cdf739c06c714ba04c372"/><file name="agreements.phtml" hash="ff0beb153b284b2e3c58b4370a4b8401"/><dir name="billing"><file name="items.phtml" hash="cabfbfb5d33255a4750ccc3d55c358d6"/></dir><file name="billing.phtml" hash="281597e3e36ba83a13cdb4fb6bdbc3f8"/><dir name="item"><file name="default.phtml" hash="0ff34fc5d79d1bbe12fcf297b8280f08"/></dir><file name="link.phtml" hash="70249f4132c971ec5888690ffd092403"/><dir name="overview"><file name="item.phtml" hash="e83def5645dc64adef382b849c8fbdbb"/></dir><file name="overview.phtml" hash="bcdab97360c0938600c5a08249d81d17"/><file name="shipping.phtml" hash="568b9a00ba97c7db001cd894bae675a1"/><file name="state.phtml" hash="070912c23e8ff11f007e22306217f6d5"/><file name="success.phtml" hash="ae7f8dda179230945ace59db76f8b017"/></dir><dir name="onepage"><file name="agreements.phtml" hash="a8f762dd61914b2d9eab9fe9ada1945a"/><file name="billing.phtml" hash="3627f62972b124c21cbb08fd67458552"/><file name="failure.phtml" hash="0b95128399f2521bf12837aceaa31836"/><file name="link.phtml" hash="323dcf7f1acb91a186595b618592be86"/><file name="login.phtml" hash="ea2fbe290afcefdc0077ac42835899e7"/><dir name="payment"><file name="info.phtml" hash="e3d23f5d3e0b135ca38ec7ab5b41f851"/><file name="methods.phtml" hash="b88d2e4a2f375b5fb4a3983539b2e81e"/></dir><file name="payment.phtml" hash="0f2094bb3da954aa9405c1af7b66ae2a"/><dir name="progress"><file name="billing.phtml" hash="e0c20674a6831364b055424dac493acb"/><file name="payment.phtml" hash="2c5af1d7ea230faa3963781f85e9f610"/><file name="shipping_method.phtml" hash="1fbb3446280be2b2ce831e6b0b26fd80"/><file name="shipping.phtml" hash="b26f2b46e5c12cda8de4ecb37f98c355"/></dir><file name="progress.phtml" hash="3eab47ed120f6efd05f85294da825544"/><dir name="review"><file name="button.phtml" hash="d7a54917e7d0ceec6875760a3910452f"/><file name="info.phtml" hash="60c527a672dc8ed0afbe180c1105f65b"/><file name="item.phtml" hash="4ff6deeabbe76339f9914075e49cf798"/><file name="totals.phtml" hash="0acb66397e2d390de49dbdfca15d9804"/></dir><file name="review.phtml" hash="5ffdd3cc23815519462e3dcb1fc6b81a"/><dir name="shipping_method"><file name="additional.phtml" hash="7f8751c51089c14316694e2aa6c5357d"/><file name="available.phtml" hash="779142c301923119db60c08ad90d4e06"/></dir><file name="shipping_method.phtml" hash="ca5074b35e9a6167298a4a4433ecf98b"/><file name="shipping.phtml" hash="0dd2ceb18da2763395701c6379cb9a77"/></dir><file name="onepage.phtml" hash="b9c5a5a822652a0890be7e3e4f05d6b1"/><file name="success.phtml" hash="2e15bd609848f9da5edcece36b75ee45"/><dir name="total"><file name="default.phtml" hash="0ee253b9c15115a9db2cf53a67eeadf2"/><file name="nominal.phtml" hash="d377962c59bffbf7d21ced50f23c6d16"/><file name="tax.phtml" hash="df7b9274149d74ff7d6cc7fa356be35c"/></dir></dir><dir name="cms"><file name="content_heading.phtml" hash="a2b29b501b3a02f95bd98ad43bc53b42"/><file name="content.phtml" hash="1b278f7d9d4d4b2c4ba8294521a260a3"/><dir name="default"><file name="home.phtml" hash="4644ecd59a71f6233fddd4192acd9353"/><file name="no-route.phtml" hash="f168035d93340896f94b242c1f194dfe"/></dir><file name="meta.phtml" hash="5190e68694de60ffe0c2a01085dec99e"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="0d724d6e82b951b747ba6a871086f8fc"/><file name="link_inline.phtml" hash="37afb408b4a92d42f202dee6d9eb9fac"/></dir><dir name="static_block"><file name="default.phtml" hash="57690772a8cf7edad4ae7cc23ba8c2cc"/></dir></dir></dir><dir name="contacts"><file name="form.phtml" hash="e6466daa2d07ccb502ec163cf44ec2aa"/></dir><dir name="core"><file name="formkey.phtml" hash="eaa615a1b1e1095f104d4399d5c3c137"/><file name="link.phtml" hash="4bea6e43805d53027ee3a7528bb589a7"/><file name="messages.phtml" hash="da5cb19c11803db955f7b67d7b15eabc"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="address.phtml" hash="0224cfb6bc389cae9d8e755d5ae91f81"/><file name="hello.phtml" hash="51393d123a78e7f6461aa0b4b3ee3691"/><file name="info.phtml" hash="27a57f2b321f63889c81aa0d75fabeb2"/><file name="newsletter.phtml" hash="689e47eeceff34400dd816449483a52e"/></dir><file name="dashboard.phtml" hash="07ce59e897cbadbab75d2cb5e69ee783"/><dir name="link"><file name="back.phtml" hash="966e18d09225d5ff1ee88139a0099455"/></dir><file name="navigation.phtml" hash="4fef6b277463f6cf1423b78016ff254a"/></dir><dir name="address"><file name="book.phtml" hash="f543dfa554dc389d8e0d9afce4574548"/><file name="edit.phtml" hash="4b853cf6b29231eb6add1a36ac73ffd8"/></dir><file name="address.phtml" hash="5e50f7e47656d3444c7e9069e4a1b902"/><file name="balance.phtml" hash="53aef61ff7baee49d1fb98861d424f33"/><dir name="form"><file name="address.phtml" hash="c284983647ff88bc457520c4acd5eb73"/><file name="changepassword.phtml" hash="29c707818823865b8bda3650ca5db11d"/><file name="confirmation.phtml" hash="2f1ce837f117b92cdec1b6d5cc48bb7f"/><file name="edit.phtml" hash="be4c7e278e89c04da9644386fa28696d"/><file name="forgotpassword.phtml" hash="4bda59c98f4e4e15b5a0e50b000800b1"/><file name="login.phtml" hash="57674faaf7006e1394e6f93bcc725519"/><file name="mini.login.phtml" hash="4c8bd38cd60f0de82f9e7c3450daac96"/><file name="newsletter.phtml" hash="33fd42a293e1f5e77d6d2cb2fb28b43d"/><file name="register.phtml" hash="2c5c3f29fb871006e0e54d14848bb3bd"/><file name="resetforgottenpassword.phtml" hash="462bf691601ec16fdda473db7a1ec1cd"/></dir><file name="logout.phtml" hash="4229e8c56b3abc016508579fa7a52c58"/><file name="orders.phtml" hash="13dec0788ff69f76f4a22bb42cff9004"/><dir name="widget"><file name="dob.phtml" hash="06d96d0861b9d6108a1a9f9a3a170fe6"/><file name="gender.phtml" hash="0e9a12d1cbe0a95c3539eb44395a62a1"/><file name="name.phtml" hash="f131bfd60b490899b025fe57663fe69c"/><file name="taxvat.phtml" hash="3bdbc005510b72cdd019624c971fa856"/></dir><file name="wishlist.phtml" hash="fdc628e68f98fb9fe09239c4d02eab31"/></dir><dir name="directory"><dir name="currency"><file name="switch.phtml" hash="6972ec9db0f291af6152876b0569e96a"/></dir><file name="currency.phtml" hash="e09f79b1fe19a3b0cc7bb1f93cd9df78"/><dir name="js"><file name="optional_zip_countries.phtml" hash="8298aa27f9789c72889abe31e89a0486"/></dir></dir><dir name="downloadable"><dir name="catalog"><dir name="product"><file name="links.phtml" hash="3c8cdd1ef8ea1e180de3c312545c61c5"/><file name="samples.phtml" hash="10a878cae989863fc18dab5d03a0cc94"/><file name="type.phtml" hash="e9cfafc367a9717d523269c40b9c9189"/></dir></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="ca0b3b8a8b41dc94a6e067b11c60e2c4"/></dir></dir><dir name="multishipping"><dir name="item"><file name="downloadable.phtml" hash="a54c79fadd74281c5587ec6f5f05f357"/></dir></dir><dir name="onepage"><dir name="review"><file name="item.phtml" hash="14c6b556be54f187fa88e23eb73b1ad1"/></dir></dir><file name="success.phtml" hash="e80c2fd04c41c3d91c9269a960c7dcde"/></dir><dir name="customer"><dir name="products"><file name="list.phtml" hash="7eb6d898559355673e16e6a67994b03f"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="downloadable.phtml" hash="5308947330e4c8a5ea31a5f478117764"/></dir><dir name="invoice"><file name="downloadable.phtml" hash="7f3d48155dc4034868099d8b64cafd56"/></dir><dir name="order"><file name="downloadable.phtml" hash="17e3f7933de13891e2a8512c872eea86"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="8534822f30d12582304bf178bf1f3a41"/></dir></dir></dir><dir name="invoice"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="bc6351f6937774b9fb038b6372170d64"/></dir></dir></dir><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="b23b662e74345e8d059518f5edb2e736"/></dir></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="creditmemo"><file name="items.phtml" hash="b47aec2b2a04f851e011861858f666d6"/></dir><dir name="invoice"><file name="items.phtml" hash="9df2db8a77da02023105df3537c88fda"/></dir><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="4bf5d0461d82a4c08a8f4f8f05b84712"/></dir><dir name="invoice"><file name="default.phtml" hash="4bf5d0461d82a4c08a8f4f8f05b84712"/></dir><dir name="order"><file name="default.phtml" hash="4dbe3dc7374114ce8daace23f22aa14b"/></dir><dir name="shipment"><file name="default.phtml" hash="9fb9140adb3fd720c9ee824646fd81ef"/></dir></dir><file name="items.phtml" hash="82514c6dd6cf89a9fe4dcc5915f8a0f8"/><dir name="shipment"><file name="items.phtml" hash="790ac5faaec91f570504804048e19be0"/><file name="track.phtml" hash="092417894365f0bd0dd1de8f5418bf75"/></dir></dir><dir name="productalert"><file name="price.phtml" hash="a06c3ff9a1407a2a700c640463b1c656"/><file name="stock.phtml" hash="d4f84e74595e86744dbd1591f724f061"/></dir></dir><dir name="giftmessage"><file name="inline.phtml" hash="64693c0a3e708784446c58bdf3fd2bad"/></dir><dir name="googleanalytics"><file name="ga.phtml" hash="c3f24c1411dd96ec0cb6da8cd4e5b54d"/></dir><dir name="googlecheckout"><file name="form.phtml" hash="903b67370a02be2b5363324f9e7e9c41"/><file name="link.phtml" hash="1421dc98e10f043f9148b392b8084016"/></dir><dir name="newsletter"><file name="subscribe.phtml" hash="b6d89597fe6ab55f24f1db71928659ca"/></dir><dir name="oauth"><dir name="authorize"><file name="button.phtml" hash="ab630b4316878e341c0611cfa51650aa"/><file name="button-simple.phtml" hash="b4106ed8604d849314aecdea831ca6fa"/><file name="confirm.phtml" hash="563d76e574a1a6c43945479c63ae711e"/><file name="confirm-simple.phtml" hash="80423693a0a07b13a9dbc5507fe74847"/><dir name="form"><file name="login.phtml" hash="98743d533dea9a5dca05f3474bd6dc3c"/><file name="login-simple.phtml" hash="7b80dd4355187f7fbbfcfd6c05e8ae41"/></dir><file name="head-simple.phtml" hash="bfd2884d2c8af4315dd919ced20235cc"/><file name="reject.phtml" hash="51593eb4eba331894dffb67c4ca2bce2"/><file name="reject-simple.phtml" hash="b5b7d2623b16e56ddc95fef5a5e7a2ac"/></dir><dir name="customer"><dir name="token"><file name="list.phtml" hash="0ed2ae29b0489f2dec0a6af03010fff5"/></dir></dir></dir><dir name="page"><file name="1column.phtml" hash="2ea1a339be90ced29b095ca4ceddcba4"/><file name="2columns-left.phtml" hash="b491cac040becb6be61d32d4ceadee79"/><file name="2columns-right.phtml" hash="c1767fa0eee114712a1ca8411795a3aa"/><file name="3columns.phtml" hash="207dff942b8b91987d19155f7a8a7009"/><file name="empty.phtml" hash="11d6841d6dfa2ad0c366fb11c26068af"/><dir name="html"><file name="breadcrumbs.phtml" hash="c034a339ee600b805c6271c83225944a"/><file name="footer.phtml" hash="4561fac2fb6e8c722a3f5be2825de65b"/><file name="header.phtml" hash="8dcf15fb7a3ef937b0ffeb2efcb7b4f3"/><file name="head.phtml" hash="8414479731562425a7dc6641486e74c5"/><file name="notices.phtml" hash="c3bf7f3cef2471eed531a3f35c98527f"/><file name="pager.phtml" hash="46cf49b484921cdacc6284bd8d1ff048"/><file name="top.links.phtml" hash="c5c2f18a6e5184206a2150dc58c01d04"/><file name="topmenu.phtml" hash="c7393f747b618c4668d5b5f39157232a"/><file name="wrapper.phtml" hash="99122df71779b8bf5146a6b0c40593d5"/></dir><dir name="js"><file name="calendar.phtml" hash="9461fd7deda2495b743ce17d405ecb28"/><file name="cookie.phtml" hash="ad57ca0a6409b2ce90448ae7c548e83f"/></dir><file name="popup.phtml" hash="97e855dcb940403ba9d3bcd64aa548de"/><file name="print.phtml" hash="e64d12aab7f325867fbaa303b8517307"/><file name="redirect.phtml" hash="8c3df16330cc29e52af3e13f32362e0c"/><dir name="switch"><file name="flags.phtml" hash="3d6dc469f573506ff0ed3b7258b23dbc"/><file name="languages.phtml" hash="f6c946bedc1e648efd462a8d7c029df4"/><file name="stores.phtml" hash="8d267ab0070362e52e37e5673bddf2c2"/></dir><dir name="template"><file name="container.phtml" hash="78db3f910f9f854d543cc803d72ca46c"/><file name="linksblock.phtml" hash="162aa23949d5aafa5b97ee383a59a102"/><file name="links.phtml" hash="1d4ec456ca6dbdc096e83ac2301f6fa5"/></dir></dir><dir name="pagecache"><file name="cookie.phtml" hash="5da6fe493e3e79ccd5a2fd8d9bd85f0f"/></dir><dir name="paygate"><dir name="form"><file name="cc.phtml" hash="a09ab0c7cd31ed6ee0baedb13dbae9ac"/></dir><dir name="info"><file name="cc.phtml" hash="c8e65d6b2aa010bbe9b204ab107f6157"/></dir></dir><dir name="payment"><dir name="catalog"><dir name="product"><dir name="view"><dir name="profile"><file name="options.phtml" hash="8fc392586cb4c66764382ffbc20a9393"/><file name="schedule.phtml" hash="fd48d09a03580f4a4f2f98f86de8b54a"/></dir></dir></dir></dir><dir name="form"><file name="banktransfer.phtml" hash="01644d6cf993bc5cfe2632e5a5bfdcc2"/><file name="cashondelivery.phtml" hash="9e55096120edfec835e07482bc483096"/><file name="cc.phtml" hash="23ec898742ca57a628437f21bd6101ea"/><file name="ccsave.phtml" hash="b52e20c18cf71c8200e46193cb51e58f"/><file name="checkmo.phtml" hash="9e0b5fe468c281f82f4ec1351f084e02"/><file name="purchaseorder.phtml" hash="ff79af2ed766da3a9e412b4b438b0377"/></dir><dir name="info"><file name="banktransfer.phtml" hash="e2403ade862ab927944c0d67982bed40"/><file name="checkmo.phtml" hash="df97b19db1e1c0bfc991f3d230bf00a2"/><file name="default.phtml" hash="41c1d133402c8274dd78bad60a89fbc8"/><file name="purchaseorder.phtml" hash="11574613b69778e02e20a7b1767512c4"/></dir></dir><dir name="paypal"><dir name="express"><dir name="review"><file name="address.phtml" hash="0ceee8f979be1d6a44ed6919af122016"/><file name="details.phtml" hash="d9cfdaa646d2d6693002bf6f00064201"/><dir name="shipping"><file name="method.phtml" hash="f71cbdfc5a8fe543eb03c8475a1818d3"/></dir></dir><file name="review.phtml" hash="0ee4d1c4e2055ca9050ef964b4ac0a94"/><file name="shortcut.phtml" hash="227924ef1ed156953734d44c0a0cfda0"/></dir><dir name="hss"><file name="form.phtml" hash="f25fda88eae3556b410e4c86e3754785"/><file name="iframe.phtml" hash="700aa309bc3e2cb15fc5969204df470d"/><file name="info.phtml" hash="6ae7f528f71dc914365a9c638b61520d"/><file name="js.phtml" hash="4e57e37572a7c69e1e6c8e479a6950c1"/><file name="redirect.phtml" hash="c89c02eae033723d9fd5f8a8db70f80a"/><dir name="review"><file name="button.phtml" hash="359132746414e4ae696ba6047e2d3e98"/></dir></dir><dir name="partner"><file name="logo.phtml" hash="831fa2f4041657c5c2f3eb4acf14f788"/></dir><dir name="payflowadvanced"><file name="form.phtml" hash="991804f0ad7a6871df9bed2529746c8a"/><file name="iframe.phtml" hash="f72cbcfa9e63a56ab8b78a0e4a403706"/><file name="info.phtml" hash="4bb273041a60c52e5428b453598886c2"/><file name="redirect.phtml" hash="6c2037bdfd6603e1cd9b911da70e75dd"/></dir><dir name="payflowlink"><file name="form.phtml" hash="f25fda88eae3556b410e4c86e3754785"/><file name="iframe.phtml" hash="98df72e2f3a9bdc44c97d28bf02eef29"/><file name="info.phtml" hash="d2a18e1bfc3d3716f060962c198ec61a"/><file name="redirect.phtml" hash="e756182507ca509d1e2a396cf38ba639"/></dir><dir name="payment"><file name="mark.phtml" hash="0442986e7a40f3c2b9e7861edd206b3e"/><file name="redirect.phtml" hash="7de0a6668e72671ab6d10d08fc8e0070"/></dir></dir><dir name="paypaluk"><dir name="express"><file name="review.phtml" hash="7510838614cdbd9e15e0d26b958427c8"/></dir></dir><dir name="persistent"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="fc58c50dba0ecbd0c3caac7eeb43fbff"/><file name="login.phtml" hash="34b965fabb7762ac9e2c2738344c184f"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="ed3e797256dd9f9c06fa63c8cb315cca"/><file name="register.phtml" hash="ed544c1d7e80463bd8d03cfb8b3a934e"/></dir></dir><file name="remember_me.phtml" hash="3c2c3fd5313a71d4503b5bdd70cd9ff5"/><file name="remember_me_tooltip.phtml" hash="da09485dab530b5ebce8235e655329ec"/></dir><dir name="poll"><file name="active.phtml" hash="28ba7a63284f6b6fcc4c5be76e46e238"/><file name="result.phtml" hash="215fc6adbc8c4bb647723021576b3545"/></dir><dir name="productalert"><file name="price.phtml" hash="48125dd56110e5168a1693e5fba801c5"/><dir name="product"><file name="view.phtml" hash="7d502c7725566089a9ec824783cb4ace"/></dir><file name="stock.phtml" hash="48125dd56110e5168a1693e5fba801c5"/></dir><dir name="rating"><file name="detailed.phtml" hash="fd0413a654744d23ce6eea412221a2e4"/><file name="empty.phtml" hash="2b5189dccbaa36740993f45bd6f11214"/></dir><dir name="reports"><file name="home_product_compared.phtml" hash="3246ad747921cf31aece83e6ce55f759"/><file name="home_product_viewed.phtml" hash="a284ecdbfc6964004b0e4658620ae2dd"/><file name="product_compared.phtml" hash="afc280da1526d6f2badb14671b5997db"/><file name="product_viewed.phtml" hash="865b89ca10602feaefca198b309b8d88"/><dir name="widget"><dir name="compared"><dir name="column"><file name="compared_default_list.phtml" hash="bd898d390260c74fa678b4b24c2e86a6"/><file name="compared_images_list.phtml" hash="1d109a4aa32b86a7e5569657c950fcd4"/><file name="compared_names_list.phtml" hash="d403f06d34f8bfda35fbbfec6a3dff13"/></dir><dir name="content"><file name="compared_grid.phtml" hash="e6b8367c27c67df49196836bd225d086"/><file name="compared_list.phtml" hash="822896f074525b39ab7eb6cfd392c16f"/></dir></dir><dir name="viewed"><dir name="column"><file name="viewed_default_list.phtml" hash="27b595aa16fabb2972a20f8b1e5743c5"/><file name="viewed_images_list.phtml" hash="af17684fe97e1ca6240d6e8320994aba"/><file name="viewed_names_list.phtml" hash="e27a188a161cfb6a6774545274c0698e"/></dir><dir name="content"><file name="viewed_grid.phtml" hash="762882c24518862005f76bcb1eb31e01"/><file name="viewed_list.phtml" hash="6946d8b2c6bf6acbe5fa726270bc12e4"/></dir></dir></dir></dir><dir name="review"><dir name="customer"><file name="list.phtml" hash="aa6b0ddc97f52f74d7309c508758c1a6"/><file name="recent.phtml" hash="db2da0952d12c186927fa0e5de73ef92"/><file name="view.phtml" hash="f829a98a214c59676589063ef427aadf"/></dir><file name="form.phtml" hash="00345bebc1480d567bf229ec31e89891"/><dir name="helper"><file name="summary.phtml" hash="7c15b7078c848df9d2346ccd1d13cad5"/><file name="summary_short.phtml" hash="3235ad0cf2262197433a415c30fcadc2"/></dir><dir name="product"><dir name="view"><file name="count.phtml" hash="4330b226b0de0c1e151ea0e8cfc60bec"/><file name="list.phtml" hash="c45ef4b227ce16adeac9a66cc41b236e"/><file name="other.phtml" hash="0f7a97276b6b495e1b3dedf488018625"/></dir></dir><file name="view.phtml" hash="0aeb91cca40ccadffc2cde36918af5d6"/></dir><dir name="rss"><file name="list.phtml" hash="639a0c032698bdf5078cfa3110f0919d"/><file name="nofeed.phtml" hash="6f6fc72b022ef05a3799070ba3677aeb"/><dir name="order"><file name="details.phtml" hash="2861b91f790d93c3fbe8981e2802adc9"/></dir></dir><dir name="sales"><dir name="billing"><dir name="agreement"><file name="view.phtml" hash="15901f66f3d2cb13cc6cb48eb3878ca7"/></dir><file name="agreements.phtml" hash="4f3fbdec473f49180470e036042a19cd"/></dir><dir name="guest"><file name="form.phtml" hash="96cd89fe53104f88439d6825ec8196a9"/></dir><dir name="order"><file name="comments.phtml" hash="77f3e95650ad0f6a90f4cb6d163b6349"/><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="14ed3f65d83349b62f0becf2f018ae5a"/></dir></dir><file name="items.phtml" hash="986605cb8f6d86ecadb1bba6eef911ef"/></dir><file name="creditmemo.phtml" hash="dc24a51ef84241ec9a35b556311e70b7"/><file name="details.phtml" hash="7c34b1bff0d8de0276818dacc1b66d5f"/><file name="history.phtml" hash="3f3a7a713ce72e2e4060a70ee0c7c426"/><dir name="info"><file name="buttons.phtml" hash="cbb5bdeb8d78eb95b699b8c92b7404a0"/></dir><file name="info.phtml" hash="333fe60a5570c41928186065ef71b42c"/><dir name="invoice"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="da6c6fcb460db8fa518c78d1dbb48136"/></dir></dir><file name="items.phtml" hash="229ff219a495ae5ef2e56d8ce3b5d1f9"/></dir><file name="invoice.phtml" hash="373113354854d0ef46e044ff30254b5d"/><dir name="items"><dir name="renderer"><file name="default.phtml" hash="0808ea2e55731cf4dff9588c2913618d"/></dir></dir><file name="items.phtml" hash="94914e5aef876233b3f42f37e20d044c"/><dir name="print"><file name="creditmemo.phtml" hash="533dfad8bc9e4b8a93306bab2c91b53f"/><file name="invoice.phtml" hash="0a5dbf9447b2d78f2c73ca5941053cb8"/><file name="shipment.phtml" hash="679c12ad01f721514926cdf476d4567d"/></dir><file name="print.phtml" hash="8cd264b3b7a9adee78385a059d1b402b"/><file name="recent.phtml" hash="60e7a7e36a960f6a8380042a1880dacd"/><dir name="shipment"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="f6edf268e181e3213120d50a617ce56e"/></dir></dir><file name="items.phtml" hash="46e6bcda7059d1de070723b362e3ee2c"/></dir><file name="shipment.phtml" hash="91d67ce7e9014e7ac3414561dbe1a776"/><file name="totals.phtml" hash="3c18ba1dc8367621c8edca23b7bc7adf"/><file name="trackinginfo.phtml" hash="0132a39a5c29091406ac6e2ff5823ae3"/><file name="view.phtml" hash="514ca6354adfffc674a45863de4267b1"/></dir><dir name="payment"><dir name="form"><dir name="billing"><file name="agreement.phtml" hash="55e695e1f2a2e2a0a304be27c3feda0a"/></dir></dir></dir><dir name="recurring"><file name="grid.phtml" hash="5dd2a80bdc5b6f821d92c05395a15ff6"/><dir name="profile"><dir name="view"><file name="info.phtml" hash="5b6aa541b1a9f7c71ec0bbc4490264cc"/></dir><file name="view.phtml" hash="61f0a32de037e052e9d9cfe9d1c26371"/></dir><file name="profiles.phtml" hash="e1dbb7ff1be0313200119a133ca3b6ca"/></dir><dir name="reorder"><file name="sidebar.phtml" hash="b598ad2c6dd06ce9fdd85bd0edc3e43c"/></dir><dir name="widget"><dir name="guest"><file name="form.phtml" hash="4bd5afecd985f239e9b5e4a34d3f9083"/></dir></dir></dir><dir name="sendfriend"><file name="send.phtml" hash="7babde26ad2c6cce943d37da7a2d0b66"/></dir><dir name="shipping"><dir name="tracking"><file name="ajax.phtml" hash="64ef10c5b304a1dc4ecb81ab7cab8f17"/><file name="popup.phtml" hash="f60fed812f2b7583cf523a9b9771134a"/></dir></dir><dir name="tag"><file name="cloud.phtml" hash="71b12c0baf6c2051e1352c8728decd1d"/><dir name="customer"><file name="recent.phtml" hash="06c5c4ea55dd8c4fdc21c084d2f4fc15"/><file name="tags.phtml" hash="1f9189426b1f55843aa6d7626a436661"/><file name="view.phtml" hash="f69f606ae1b530c8621d129570ff3f1a"/></dir><file name="list.phtml" hash="bdc85e7907f29b7d882629b1f1fe9c4a"/><file name="popular.phtml" hash="5acb50261292e223a1c2c2315c280e29"/></dir><dir name="tax"><dir name="checkout"><file name="discount.phtml" hash="c3232e4e0e91d1e3d58fd5ccb0286d15"/><file name="grandtotal.phtml" hash="eb53b2a888da032176e3500feab7dac3"/><file name="shipping.phtml" hash="1a65fd85d96b84ec1f68930c53194fc6"/><file name="subtotal.phtml" hash="10c31870d3d53b269e431360e0e91963"/><file name="tax.phtml" hash="9bd7d2d16b3df413aff4da9c4cd14e2b"/></dir><dir name="order"><file name="tax.phtml" hash="b9f66bc0554932c2408d64b475537bdc"/></dir></dir><dir name="wishlist"><dir name="button"><file name="share.phtml" hash="46fd019f2f64613834bc27588e6e0983"/><file name="tocart.phtml" hash="4b53bf90afa812a4ba1a31518cc174ee"/><file name="update.phtml" hash="b6d940e368b875082132220e8257e4c9"/></dir><dir name="email"><file name="items.phtml" hash="80006df1da4246533f72982231cbdced"/><file name="rss.phtml" hash="edfe5c16de2121d0526837966cda3da9"/></dir><dir name="item"><dir name="column"><file name="cart.phtml" hash="1f858cc0b01637cdc912a37ec72c2d77"/><file name="image.phtml" hash="db17bcd781abcd6d5ed353a71088105e"/><file name="info.phtml" hash="97c60f354ce7cfb3a1b5160673ae1e9b"/><file name="remove.phtml" hash="e6b9ea47c1fb9a1ed703e767fa62376f"/></dir><dir name="configure"><file name="addto.phtml" hash="2785e846cfc4f3f2ac670c6e7b75d4e7"/></dir><file name="list.phtml" hash="826c654a2414a4961f9e08e72e232fdc"/></dir><file name="options_list.phtml" hash="82edb5ed56d3bd797056aa7a2e07ff28"/><dir name="render"><dir name="item"><file name="price_msrp_item.phtml" hash="7a3c31fbf52d1f74b7ffb9ca25f79cb4"/><file name="price_msrp_rss.phtml" hash="288d268cce8b3c8a055ba19d5270f4e8"/><file name="price.phtml" hash="f47600f3dba84c055840a9ae2ea1934e"/></dir></dir><file name="shared.phtml" hash="07be81c4eb489e6c178b1659039a6de6"/><file name="sharing.phtml" hash="ac8d3b2f1752a7c6aa279faf96022363"/><file name="sidebar.phtml" hash="4fb9cfd8a5dddd98141374d9b1a04478"/><file name="view.phtml" hash="9bf78d4c0948784507f4a5c8bd33236f"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="widgets.css" hash="4732f4eb6427aff580ed48ed524c9ccd"/></dir><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><dir name="images"><file name="calendar.gif" hash="b1468e5239504974c689eea5d93f86d4"/><dir name="catalog"><dir name="product"><dir name="placeholder"><file name="image.jpg" hash="097ab8a3051bc037ea3de0e17f440540"/><file name="small_image.jpg" hash="f825d16f97a640453553c79c48ebaa73"/><file name="thumbnail.jpg" hash="b2b682d28a08a748a73d2cda70ab5a57"/></dir></dir></dir><dir name="cookies"><file name="firefox.png" hash="425e1b2ddc38c0bba431fb54357c66a4"/><file name="ie6-1.gif" hash="5c27700e245762bc89ed8c3ee7183f21"/><file name="ie6-2.gif" hash="d8c55e15e1f711e5c259300a9c19551b"/><file name="ie7-1.gif" hash="d61edcc8a514a3c81ea116b7d38ddcb6"/><file name="ie7-2.gif" hash="0526a654e94c54866cad977c0a47d3e5"/><file name="ie7-3.gif" hash="4fb142def3f6cfd8d8d23e1315528a1e"/><file name="ie7-4.gif" hash="575c276231c6a91e28935ec98215e146"/><file name="ie7-5.gif" hash="3ae5fcc11fe89da91674d183872337c1"/><file name="ie7-6.gif" hash="95a4981a41785a8cde273c9b2edbfbc7"/><file name="opera.png" hash="34070d92180d4ee0e37b1dd8bb731cd7"/></dir><file name="cvv.gif" hash="83cdd38bf110b0f9c52fe84b56f45298"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><file name="reload.png" hash="84cc4883f78ef850814ea9b53989b2a7"/><dir name="widgets"><file name="i_block-list.gif" hash="fe8424127ecbe4b0d893bcf6f253dc1a"/><file name="i_widget-link.gif" hash="1bf753578171f147f0203e7b13bdd0c4"/><file name="i_widget-new.gif" hash="a75377ffed51b711cbc608ffaa1a2e7d"/></dir></dir><dir name="js"><file name="bundle.js" hash="758eba2fa873bcd77d4bf60d5bddfc08"/><dir name="checkout"><file name="review.js" hash="689b8d6d30484eaca413d5303360ec81"/></dir><file name="giftmessage.js" hash="6e0d23b1b4c0f0a59abec709eb6b5dc4"/><file name="ie6.js" hash="46173fb9f7c45fd107ba4df4df397ffb"/><file name="msrp.js" hash="c22fa5f0f4bb239bfa44276fe674be72"/><file name="opcheckout.js" hash="c39c87c8f78abf7d0ab7fad3726de7d6"/></dir><dir name="lib"><dir name="prototype"><dir name="windows"><dir name="themes"><dir name="magento"><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="content_bg.gif" hash="21278ea0da2d4256f4ced96b6080ba2e"/><file name="top_bg.gif" hash="26f28090de87d64f9b01bf624f89bfe2"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/></dir><file name="magento.css" hash="25386a0f30a2a185e728251733431f96"/></dir></dir></dir></dir></dir></dir></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package></required></dependencies>
+</package>
diff --git a/var/package/Interface_Frontend_Default-1.8.0.0.xml b/var/package/Interface_Frontend_Default-1.8.0.0.xml
new file mode 100644
index 00000000000..8dbbf0d6dda
--- /dev/null
+++ b/var/package/Interface_Frontend_Default-1.8.0.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Interface_Frontend_Default</name>
+    <version>1.8.0.0</version>
+    <stability>stable</stability>
+    <license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>Default interface for Frontend</summary>
+    <description>Default interface for Frontend</description>
+    <notes>1.8.0.0</notes>
+    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:30:57</time>
+    <contents><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="etc"><file name="widget.xml" hash="b1c0b19e7eff596702b1c0747c9a5ee6"/></dir><dir name="locale"><dir name="en_US"><file name="translate.csv" hash="793e1ff86039f24caff6fad87a094fa1"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="default"><dir name="css"><file name="oauth-simple.css" hash="67904fdf64804b5099b269b6ed195559"/><file name="print.css" hash="7e33379ce10c8eefe3a996a4747147e2"/><file name="styles.css" hash="33d1f66777cf4b793286484541bc1d97"/><file name="styles-ie.css" hash="c84e639708d3f4aca7481da19d9ab527"/></dir><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><dir name="images"><file name="best_selling_tr_even_bg.gif" hash="5022d648379090e306f00cd64738b146"/><file name="best_selling_tr_odd_bg.gif" hash="926622704f53796801bb5d097e116c8e"/><file name="bkg_account_box.gif" hash="dd98174b6e3e5605a3f9551a59c66841"/><file name="bkg_block-actions.gif" hash="da2970eac0a22c850b19ee3680475d51"/><file name="bkg_block-currency.gif" hash="bfaad1b64557c05ad6f4b124ad3d3532"/><file name="bkg_block-layered1.gif" hash="607167f198572e83a0e728b6b9383a70"/><file name="bkg_block-layered-dd.gif" hash="6ae6f8184e87de496fb74eeec65737c9"/><file name="bkg_block-layered-dt.gif" hash="ba8229068657b80f2c42111c5a1a307e"/><file name="bkg_block-layered-label.gif" hash="14687dfa3921cfd12d2149c1497d9765"/><file name="bkg_block-layered-li.gif" hash="753ebb76a4fc2b5b6915c536fcf4d487"/><file name="bkg_block-layered-title.gif" hash="c92e29b30af7abf4e0bc3f714a246f55"/><file name="bkg_block-title-account.gif" hash="a64f1df5a7e3d0f6a58b017f74311cb1"/><file name="bkg_block-title.gif" hash="f8c1f130ad69464fe7aff2f589b2ec75"/><file name="bkg_body.gif" hash="82bfc5bfe346c8e974cd33b1314b0acf"/><file name="bkg_buttons-set1.gif" hash="2c641e927bc83156b7004ea37920513c"/><file name="bkg_checkout.gif" hash="11258fe49feff5513c9608f2ea486776"/><file name="bkg_collapse.gif" hash="2333c68e38163ed4656da82b9bcf362b"/><file name="bkg_collapse-gm.gif" hash="37418f23e65006dcfde07ce9b249e057"/><file name="bkg_divider1.gif" hash="260ebae91ffb1b7c663906b29a069925"/><file name="bkg_form-search.gif" hash="2ca36eb80ea705e063409153f3821f78"/><file name="bkg_grand-total.gif" hash="10f1c3d82d78170706fa3e9c4baa7e04"/><file name="bkg_grid.gif" hash="a6f64fedbac51fb1b86184cd488cc4e6"/><file name="bkg_header.jpg" hash="0211c47be1493bd0ec72949c47932b81"/><file name="bkg_login-box.gif" hash="5538675d7f1c35d96a2b8013948f42a6"/><file name="bkg_main1.gif" hash="a8f5717873dc6cf8f6bd22924b5838fe"/><file name="bkg_main2.gif" hash="cf18ba9f7c7e6b058b439cde1a897e9c"/><file name="bkg_nav0.jpg" hash="f9ac3f31e293cf075471d2d3fe07353a"/><file name="bkg_nav1.gif" hash="f4e26840c8cca0e74aba5b810341c5c0"/><file name="bkg_nav2.gif" hash="a64c8f5165b239e432d26a62ae5f79b6"/><file name="bkg_opc-title-off.gif" hash="f69b40b5331ab3760f54d038daf287eb"/><file name="bkg_pipe1.gif" hash="7852290f6a443000ead96b8cec5cd7c7"/><file name="bkg_pipe2.gif" hash="7da64eefaf4da3855ab6ee76dbced0c2"/><file name="bkg_pipe3.gif" hash="11bfac1e590f0c77fb12f37d7f05cd3c"/><file name="bkg_product_collateral.gif" hash="1d4d6b22e5108aefae52709d3934f397"/><file name="bkg_product-view.gif" hash="7078a7f2827156d5ae0a1cb59da3c418"/><file name="bkg_rating.gif" hash="0a8777c815350ddf1e316a537ad0c335"/><file name="bkg_sp-methods.gif" hash="17d68b5449adaa87dafc62ae0afa1b9a"/><file name="bkg_tfoot.gif" hash="da2970eac0a22c850b19ee3680475d51"/><file name="bkg_th.gif" hash="f249911b08f2822fc0b561b7f98575d2"/><file name="bkg_th-v.gif" hash="b0d17555dfc6060941e0c067718189df"/><file name="bkg_toolbar.gif" hash="fb7ed019476eaa1643af922b59ede4fb"/><file name="btn_checkout.gif" hash="d2060501e14e86c29e28137130e5726e"/><file name="btn_edit.gif" hash="df3565eb4e4d0dc578201df60de54b47"/><file name="btn_gm-close.gif" hash="346e26eece27449a2f224aef76ae372e"/><file name="btn_google_checkout.gif" hash="843d75249ce05b5d87ca5419f37b1c3b"/><file name="btn_paypal_checkout.gif" hash="6edd61270b7b5632eafad10557129114"/><file name="btn_place_order.gif" hash="d35219f86ae2c983ee1a31557e37b612"/><file name="btn_previous.gif" hash="63473a1520a73bb0c9b47b685d17cd21"/><file name="btn_proceed_to_checkout_dis.gif" hash="9e152c01d5d88f690dc52cb62428f3b6"/><file name="btn_proceed_to_checkout.gif" hash="4daac687b514fecfd1068539500ac3d7"/><file name="btn_remove2.gif" hash="234bddc4c5878c5ef16407a944824236"/><file name="btn_remove.gif" hash="6182e723aa2a253dc6cf334a3dfaaa84"/><file name="btn_search.gif" hash="2d93b43c0a1c1182358677661e26a978"/><file name="btn_trash.gif" hash="bcb22f558a0eb32243a2a36645189e9f"/><file name="btn_window_close.gif" hash="c83f3cbbb2aedfc580dff78d5cfb63ed"/><file name="calendar.gif" hash="b1468e5239504974c689eea5d93f86d4"/><dir name="catalog"><dir name="product"><dir name="placeholder"><file name="image.jpg" hash="097ab8a3051bc037ea3de0e17f440540"/><file name="small_image.jpg" hash="f825d16f97a640453553c79c48ebaa73"/><file name="thumbnail.jpg" hash="b2b682d28a08a748a73d2cda70ab5a57"/></dir></dir></dir><file name="cvv.gif" hash="83cdd38bf110b0f9c52fe84b56f45298"/><file name="cvv.jpg" hash="e27210d810bbab732935d9410936ef87"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><file name="free_shipping_callout.jpg" hash="cbf2e494ef7ca50acf8826321d739559"/><file name="grid-cal.gif" hash="b1468e5239504974c689eea5d93f86d4"/><file name="home_left_callout.jpg" hash="ee99a5586cf52e85c986d1275958a7da"/><file name="home_main_callout.jpg" hash="e6d1c119d5b24a5916fe394cb4b5cdc3"/><file name="i_arrow-top.gif" hash="3dbb0584e8eb1d96cc3d3c40c17d7aaf"/><file name="i_asc_arrow.gif" hash="40aa554212d6a1f60593c27d78d85fa3"/><file name="i_availability_only_arrow.gif" hash="0cf32b72fefc94b89b74e4f3f02c2e93"/><file name="i_availability_only.gif" hash="bca1f00a50864171ad98317b778e869c"/><file name="i_block-cart.gif" hash="cc19e21f9c89b70cc10354ff588ca8ab"/><file name="i_block-currency.gif" hash="643024bcae5ece554fdbbc041aeb297c"/><file name="i_block-list.gif" hash="fe8424127ecbe4b0d893bcf6f253dc1a"/><file name="i_block-poll.gif" hash="52d778dddbf48b8d04226bee9370a7ef"/><file name="i_block-related.gif" hash="4e277173b6372b1a90b0f19e0388ad54"/><file name="i_block-subscribe.gif" hash="9e5fee06a543742045118a95f2debcb8"/><file name="i_block-tags.gif" hash="67d1255c2c3e9ed1a5c845f8d4e4a3ba"/><file name="i_block-viewed.gif" hash="67d1255c2c3e9ed1a5c845f8d4e4a3ba"/><file name="i_block-wishlist.gif" hash="8f8cda89ca20ba4a9b2f8c91f73fdff9"/><file name="i_desc_arrow.gif" hash="92fd194bfae4ce5ae3354e1e47d7ac7d"/><file name="i_discount.gif" hash="908d44da90de5e54185764d093bbdb77"/><file name="i_folder-table.gif" hash="bf006ddb591d8ac95d2e895bf2fdbc8d"/><file name="i_ma-info.gif" hash="91259557447ee80eb1110fe0c85cb3b5"/><file name="i_ma-reviews.gif" hash="859c97695ec396c0b284a0c3c7c416ad"/><file name="i_ma-tags.gif" hash="1e83e3b0b677c92b3aa8a252268f7b86"/><file name="i_msg-error.gif" hash="e4f28607f075a105e53fa3113d84bd26"/><file name="i_msg-note.gif" hash="e774ee481a2820789c1a77112377c4e0"/><file name="i_msg-success.gif" hash="834dfafd5f8b44c4b24a4c00add56fcf"/><file name="i_notice.gif" hash="ebd56dc80b8346e10e93628bc0e6c372"/><file name="i_page1.gif" hash="704f7d4eccbdf9cabbad7770f18856ff"/><file name="i_page2.gif" hash="57a04ca584e05e28dc94c7e68f0af62e"/><file name="i_pager-next.gif" hash="ed4d6640624c2b6edeab4c212314bd6d"/><file name="i_pager-prev.gif" hash="75973b020105dccbaf34e49d7852552d"/><file name="i_print.gif" hash="0aed138181495642e9ab29e55d194d40"/><file name="i_rss-big.png" hash="6cf70e7c52a3f3d7b833ccadb041a555"/><file name="i_rss.gif" hash="e5bbc388d818c142868b4a1df0b48793"/><file name="i_search_criteria.gif" hash="cf67b9cc5c311ae3f99e68cd29ae17be"/><file name="i_shipping.gif" hash="91a0d2cc2eb2391f90ec8a75c04b3183"/><file name="i_tag_add.gif" hash="a736baa992aa55b6fb71e8742a04dc82"/><file name="i_tier.gif" hash="c5189e25afeb7c1a8c4902a42832593e"/><file name="i_type_grid.gif" hash="a1e5d8ac36fb2891ea16e729b95c552c"/><file name="i_type_list.gif" hash="61333d383ec142b8d270abe77324aa5d"/><file name="logo_email.gif" hash="8de347192e0524cff7a69e4020182dbd"/><file name="logo.gif" hash="48b7eb03807fdf80bdfb19b872cf84b8"/><file name="logo_print.gif" hash="8de347192e0524cff7a69e4020182dbd"/><file name="magnifier_handle.gif" hash="238fbdd7959f517db11c6f57ee4daaf4"/><file name="map_popup_arrow.gif" hash="6383b40a9e7bd3c95260bef4fbb1b163"/><dir name="media"><file name="404_callout1.jpg" hash="834e53a03e2921a2fd3c135c0c7189df"/><file name="404_callout2.jpg" hash="016984b4a1579df34147f9407098db73"/><file name="about_us_img.jpg" hash="726f36dd75b5a709a1a14acab1660188"/><file name="best_selling_img01.jpg" hash="5e7337a4061a636df8ee4bf979a092ac"/><file name="best_selling_img02.jpg" hash="b9a49c0964938ec72fb834cb166b9352"/><file name="best_selling_img03.jpg" hash="e3581487fb4589baecc553f2ce8d5247"/><file name="best_selling_img04.jpg" hash="7e59bf99f5f813e327595c52d3320174"/><file name="best_selling_img05.jpg" hash="e396892daec7ffcf7244082b3e596911"/><file name="best_selling_img06.jpg" hash="2702839637efbe0fd0a4bad41cd6a551"/><file name="cell_phone_landing_banner1.jpg" hash="b25562360fc470f1091ca7ea014a3290"/><file name="col_left_callout.jpg" hash="5f762006021e046f9bd536f37ea7c463"/><file name="col_right_callout.jpg" hash="dae22f37a542da272a35195ec286ec25"/><file name="electronics_cellphones.jpg" hash="8f6badbc32ce806c6109c788df6ef5e9"/><file name="electronics_digitalcameras.jpg" hash="953b8d7db6f0bdcd53b1d6b1386962b9"/><file name="electronics_laptops.jpg" hash="e050e92d72000e6bdc763a7b5888ec8a"/><file name="furniture_callout_spot.jpg" hash="28edc7d72486ab2362324995550d87af"/><file name="furnitures_bed_room.jpg" hash="b8616c5bffc23a92d2a1c97dae57b262"/><file name="furnitures_living_room.jpg" hash="2663737f3997cb1a49ce24d07dc8aefb"/><file name="head_electronics_cellphones.gif" hash="a69425966444ea597fb7c629114d5165"/><file name="head_electronics_digicamera.gif" hash="bde3cec3fc16b2d0ae57e7783eb00652"/><file name="head_electronics_laptops.gif" hash="b2c55387ffa92277315bdedeb4cb9b8f"/><file name="laptop_callout_mid1.jpg" hash="4ffb50bd3b7b32a78fd059b1571c202e"/><file name="laptop_callout_mid2.jpg" hash="662cf3881b06b090e9500496b19b03e4"/><file name="laptop_callout_mid3.jpg" hash="22aa71ecfe0aa9b6936a1eddb62d889e"/><file name="laptop_callout_spot.jpg" hash="2e469d1bd871355eaef6076487a973db"/><file name="shirts_landing_banner1.jpg" hash="4acc8620b009d835e5c25587671ea25d"/></dir><file name="np_cart_thumb.gif" hash="e9fdd943e0947e15f0638506f477e358"/><file name="np_more_img.gif" hash="ace357bfe3e81ffb62137cd5b25ae5e1"/><file name="np_product_main.gif" hash="d0cccda76de50efa025215ce85dacb1c"/><file name="np_thumb2.gif" hash="8502866cdabc5c74aca7d7bd32a06a03"/><file name="np_thumb.gif" hash="e46270c89358ecc8341d1565c14644b8"/><file name="opc-ajax-loader.gif" hash="e805ea7eca1f34c75ba0f93780d32d38"/><file name="pager_arrow_left.gif" hash="75973b020105dccbaf34e49d7852552d"/><file name="pager_arrow_right.gif" hash="ed4d6640624c2b6edeab4c212314bd6d"/><file name="ph_callout_left_rebel.jpg" hash="0ce8ad0026d8b8a83ed7acdf6209129b"/><file name="ph_callout_left_top.gif" hash="f17a036d75e5065eb76bafbb2c8ad7ff"/><file name="product_zoom_overlay_magnif.gif" hash="83834893e162221d6d9257fe67847370"/><file name="slider_bg.gif" hash="87bc1b46d87de4f6252c7216216627c3"/><file name="slider_btn_zoom_in.gif" hash="ef0fc67f77f30827ee67f4e744b60781"/><file name="slider_btn_zoom_out.gif" hash="68b3d1c28dc5aec4f6b64d70a6996b6f"/><file name="spacer.gif" hash="df3e567d6f16d040326c7a0ea29a4f41"/><file name="validation_advice_bg.gif" hash="b85432906de8985a8b14eeb2dc652d3c"/><dir name="xmlconnect"><dir name="catalog"><dir name="category"><dir name="placeholder"><file name="image.jpg" hash="097ab8a3051bc037ea3de0e17f440540"/><file name="small_image.jpg" hash="f825d16f97a640453553c79c48ebaa73"/><file name="thumbnail.jpg" hash="b2b682d28a08a748a73d2cda70ab5a57"/></dir></dir></dir><file name="tab_account.png" hash="0498d73e47ed47179e5546dc15c17dc7"/><file name="tab_cart.png" hash="9055ba76e256a51d3fee53a8c41d5226"/><file name="tab_home.png" hash="07d0af93e167b9366d3d4fb3d6cdb31c"/><file name="tab_more.png" hash="b9fc21feb8d7655bc9c2985c37b0de2f"/><file name="tab_page.png" hash="ca05dbc42f944b8d4255f6675f6dd93a"/><file name="tab_search.png" hash="25e880eb2a4d06828e2e1c3f32d22400"/><file name="tab_shop.png" hash="fe602fc2e7093efef5ecc0b027a32d91"/></dir></dir></dir></dir></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package></required></dependencies>
+</package>
diff --git a/var/package/Interface_Install_Default-1.8.0.0.xml b/var/package/Interface_Install_Default-1.8.0.0.xml
new file mode 100644
index 00000000000..faa1ec1db73
--- /dev/null
+++ b/var/package/Interface_Install_Default-1.8.0.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Interface_Install_Default</name>
+    <version>1.8.0.0</version>
+    <stability>stable</stability>
+    <license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>Default interface for Install</summary>
+    <description>Default interface for Install</description>
+    <notes>1.8.0.0</notes>
+    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:30:58</time>
+    <contents><target name="magedesign"><dir name="install"><dir name="default"><dir name="default"><dir name="layout"><file name="main.xml" hash="709bd700577b0bd646aa413c72afd476"/></dir><dir name="template"><dir name="install"><file name="begin.phtml" hash="1b8e5b66b7487dcd19bf1d1bb27844d5"/><file name="config.phtml" hash="a3f069c7e6b939eb3fbb26d623eb64eb"/><file name="create_admin.phtml" hash="b82609defcf9a322fdbd71b1b9e6ef33"/><dir name="db"><file name="main.phtml" hash="05680c8312a77e03fb109d79d07b4751"/><file name="mysql4.phtml" hash="0b06033c470f3974e56f3a8d1921cb88"/></dir><file name="download.phtml" hash="ba317ec3e9b6e8b56ac31eec74553f24"/><file name="end.phtml" hash="61f541f047c523f41678d713267d95b5"/><file name="locale.phtml" hash="046287c2bfa2f8483a071dd903e977aa"/><file name="state.phtml" hash="33f3a4af91df1ab0d9433172258c0952"/></dir><file name="page.phtml" hash="7c8e9baebb67a5c7a4a6041a1fd3cbb1"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="install"><dir name="default"><dir name="default"><dir name="css"><file name="boxes.css" hash="31da7dcdca502c3fca21cbddc160f581"/><file name="clears.css" hash="4018383aa0ccf4a455b30714905d53a5"/><file name="ie7minus.css" hash="b973a69ca4e691f21ee58b258f5bf12c"/><file name="iestyles.css" hash="7fd4d1acd42b155b7b7ae10272b235d6"/><file name="reset.css" hash="e9397eec4802597f92bf50ccd982f840"/></dir><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><dir name="images"><file name="error_msg_icon.gif" hash="e4f28607f075a105e53fa3113d84bd26"/><file name="footer_bg.gif" hash="d59784af16fd95ea82226e5708a89232"/><file name="footer_container_bg.gif" hash="d468e3943943cbbf711586e69d40ca42"/><file name="footer_informational_bg.gif" hash="72d37f4b2ea747bf8969c2654ad1d1e0"/><file name="footer_info_separator.gif" hash="7da64eefaf4da3855ab6ee76dbced0c2"/><file name="footer_left.gif" hash="2b15a54bea9409a75c142d14a62f0149"/><file name="footer_legality_bg.gif" hash="4eb1602e3369dccd901ffe98ea0fd4b3"/><file name="footer_right.gif" hash="a45eaf35c8797d299bd4d9b936528e8f"/><file name="header_bg.gif" hash="795c6de754d0d49717ed08d5cd8168c8"/><file name="header_nav_bg.gif" hash="80c6a18686eb0243e06d6176506a2502"/><file name="header_top_bg.jpg" hash="143f524392ee62fcc8183f5930d7258b"/><file name="header_top_container_bg.jpg" hash="294c18f3f6b838bba06ae41dd3c3d638"/><file name="i_notice.gif" hash="ebd56dc80b8346e10e93628bc0e6c372"/><file name="logo.gif" hash="48b7eb03807fdf80bdfb19b872cf84b8"/><file name="main_bg.gif" hash="cf18ba9f7c7e6b058b439cde1a897e9c"/><file name="main_container_bg.gif" hash="a8f5717873dc6cf8f6bd22924b5838fe"/><file name="note_msg_icon.gif" hash="e774ee481a2820789c1a77112377c4e0"/><file name="success_msg_icon.gif" hash="834dfafd5f8b44c4b24a4c00add56fcf"/><file name="validation_advice_bg.gif" hash="b85432906de8985a8b14eeb2dc652d3c"/></dir></dir></dir></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package></required></dependencies>
+</package>
diff --git a/var/package/Lib_Cm-1.8.0.0.xml b/var/package/Lib_Cm-1.8.0.0.xml
new file mode 100644
index 00000000000..960147b9270
--- /dev/null
+++ b/var/package/Lib_Cm-1.8.0.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Lib_Cm</name>
+    <version>1.8.0.0</version>
+    <stability>stable</stability>
+    <license uri="http://framework.zend.com/license/new-bsd">New BSD</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>Redis adapter for Zend_Cache</summary>
+    <description>Redis adapter for Zend_Cache</description>
+    <notes>1.8.0.0</notes>
+    <authors><author><name>Colin Mollenhour</name><user>core</user><email>colin@mollenhour.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:30:58</time>
+    <contents><target name="magelib"><dir name="Cm"><dir name="Cache"><dir name="Backend"><file name="Redis.php" hash="d904f3d17d9554a79e635957ed60d0a4"/></dir></dir></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Lib_Credis</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package></required></dependencies>
+</package>
diff --git a/var/package/Lib_Credis-1.8.0.0.xml b/var/package/Lib_Credis-1.8.0.0.xml
new file mode 100644
index 00000000000..9af5a4ec83c
--- /dev/null
+++ b/var/package/Lib_Credis-1.8.0.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Lib_Credis</name>
+    <version>1.8.0.0</version>
+    <stability>stable</stability>
+    <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>Credis Library</summary>
+    <description>Credis Library</description>
+    <notes>1.8.0.0</notes>
+    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:30:58</time>
+    <contents><target name="magelib"><dir name="Credis"><file name="Client.php" hash="7bf903229fda050175c4f52b317c13b3"/></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
+</package>
diff --git a/var/package/Lib_Google_Checkout-1.8.0.0.xml b/var/package/Lib_Google_Checkout-1.8.0.0.xml
new file mode 100644
index 00000000000..1a90aaecd26
--- /dev/null
+++ b/var/package/Lib_Google_Checkout-1.8.0.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Lib_Google_Checkout</name>
+    <version>1.8.0.0</version>
+    <stability>stable</stability>
+    <license>Apache License</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>Google Checkout Library</summary>
+    <description>Google Checkout Library</description>
+    <notes>1.8.0.0</notes>
+    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:30:58</time>
+    <contents><target name="magelib"><dir name="googlecheckout"><file name="googlecart.php" hash="5b11319b8489cd2cb50bf2f38797fbb0"/><file name="googleitem.php" hash="2305b454c0b524f835e489a224070c1b"/><file name="googlelog.php" hash="402dfa7bf30450451d6dd76db20e8996"/><file name="googlemerchantcalculations.php" hash="2b8ca5d31c7dfc5f1b305ad0f0f8dc8d"/><file name="googlerequest.php" hash="75dff9be768461893ca5b2c6391ce261"/><file name="googleresponse.php" hash="4af0da6d2d9f461e9e072a81512a205e"/><file name="googleresult.php" hash="9643ea49bfeb16224f43a8ea79571094"/><file name="googleshipping.php" hash="ba2aa1ce3d1375b48a214fba19f589ff"/><file name="googletax.php" hash="55b8cd73340e491a47f62f8b887404ed"/><dir name="xml-processing"><file name="gc_xmlbuilder.php" hash="8b008a09d4ff42408fb601980f965dac"/><file name="gc_xmlparser.php" hash="9845e8a617eef46f0209140c9f26a90b"/></dir></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
+</package>
diff --git a/var/package/Lib_Js_Mage-1.8.0.0.xml b/var/package/Lib_Js_Mage-1.8.0.0.xml
new file mode 100644
index 00000000000..88fb4bc582f
--- /dev/null
+++ b/var/package/Lib_Js_Mage-1.8.0.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Lib_Js_Mage</name>
+    <version>1.8.0.0</version>
+    <stability>stable</stability>
+    <license>Mixed</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>Javascript Libraries for Magento</summary>
+    <description>Javascript Libraries for Magento</description>
+    <notes>1.8.0.0</notes>
+    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:30:58</time>
+    <contents><target name="mageweb"><dir name="js"><dir name="lib"><file name="boxover.js" hash="a5ade77452e8d5066cb84dcac3d34ed5"/><file name="ccard.js" hash="d3e849be0977d53de4af933b40293ff6"/><file name="dropdown.js" hash="59f4f83e1dabf0a755e563f352ca897d"/><file name="ds-sleight.js" hash="85af457d444865d1587bfe4875bd4fc6"/><file name="FABridge.js" hash="64244d8d58abd42bd71f0ee3309767ad"/><file name="flex.js" hash="2833054f3e3040e98014621b60bbbb85"/></dir><dir name="mage"><dir name="adminhtml"><file name="accordion.js" hash="b6161df7432f44074a240295ece00532"/><file name="backup.js" hash="28cb096d1f81542b314a36e0bca8638c"/><file name="browser.js" hash="79a10c4a78aa109efe0c96fec10c885f"/><file name="events.js" hash="732067f6a9ee289849901daf650e7279"/><file name="flexuploader.js" hash="46eb45e3285df0e1eac97a5112e753b3"/><file name="form.js" hash="2db66b43acabc8e3ec13ac84a95f3c5c"/><file name="giftmessage.js" hash="a552774c6b91722bc7d525f603e20cc1"/><dir name="giftoptions"><file name="tooltip.js" hash="07d82234a7680e7222e6b2ac667caed7"/></dir><file name="grid.js" hash="822246fc687e2164680a6587ea2f4ce8"/><file name="hash.js" hash="7ef7287161eda370f5856eeb8b40b91d"/><file name="image.js" hash="1f71519a2eb2326acef74fa2defe2d73"/><file name="loader.js" hash="8bdf6c1bc16c458711ca3597922931b0"/><file name="magento-all.js" hash="3d521110ba9afbbffcb20e4238c62b11"/><dir name="product"><dir name="composite"><file name="configure.js" hash="a9bd5bbc7a7619fffd859aa8b7d0a2d2"/></dir></dir><file name="product.js" hash="000826460eca2d405b98ef57a4890bf3"/><file name="rules.js" hash="a827fe4f2bdaea5fe0dcac206c958355"/><dir name="sales"><file name="packaging.js" hash="9941efa8ecb61004504ca1cfe0b6b856"/></dir><file name="sales.js" hash="26c8fd113b4e51aeffe200ce7880b67a"/><file name="scrollbar.js" hash="2b303f431f23ff6b58bafeb6599c97aa"/><file name="tabs.js" hash="6b912991ccb7805b5038b633a435de00"/><file name="tools.js" hash="c5f8f2f8c69ca53546a966065cca5d9e"/><file name="uploader.js" hash="ef900af8fd343fee143abafbc42b2da8"/><file name="variables.js" hash="0d3a859eaa32b35f048bf946fd496244"/><dir name="wysiwyg"><dir name="tiny_mce"><dir name="plugins"><dir name="magentovariable"><file name="editor_plugin.js" hash="33aa3999aec905d1f32199426ad78570"/><dir name="img"><file name="icon.gif" hash="682b29a0e734f952cb2edabede6a25d1"/></dir></dir><dir name="magentowidget"><file name="editor_plugin.js" hash="7e3cc1adc243559bf55d9eb4c836aec8"/><dir name="img"><file name="icon.gif" hash="532c141286373f098f1f4362e001c7f8"/></dir></dir></dir><file name="setup.js" hash="58bff8b95d60c93efd8d686e35b7a2b9"/><dir name="themes"><dir name="advanced"><dir name="skins"><dir name="default"><file name="content.css" hash="787fd97c0640646b1a471b3b84b559fe"/><file name="dialog.css" hash="70c98cab1e2eef43ca68429720f946b0"/></dir></dir></dir></dir></dir><file name="widget.js" hash="48dd1877b3731a775c8a41d1981e339e"/></dir></dir><file name="captcha.js" hash="ff5ecf8cf78c4cc1b2a61157878d1913"/><file name="centinel.js" hash="aa8036d10159786454413df2b3dba6bd"/><file name="cookies.js" hash="3b9f031ab2859f553bac1dcee4614cad"/><file name="directpost.js" hash="43c9ce054295bd2bf99272d3a21ffcb5"/><file name="translate_inline.css" hash="6adbdc441637a5ec8409e4272309df35"/><file name="translate_inline.js" hash="af5ab4a6192b9f30aa76c3bbbdb9dc2c"/><file name="translate.js" hash="33fd17d71ec8ef4ee1de5f10a69d0b7d"/></dir><dir name="varien"><file name="accordion.js" hash="9e2631995ce93f0c905b14a5c831b441"/><file name="configurable.js" hash="11e2fc14a2f3a09c2dffdc57b6f72fe3"/><file name="form.js" hash="97f4e9bb5c9b78bff3de601dd3447975"/><file name="iehover-fix.js" hash="3c6179bd66597c07fe825798a3606ce3"/><file name="js.js" hash="fff0a9a07982c134d54b5b00c0c8884c"/><file name="menu.js" hash="6a914283a1414a66771bc915f4ca9dd9"/><file name="payment.js" hash="09eba80d26ae8fda53fdb6b296a1fa62"/><file name="product.js" hash="90ab2ca1e4303cc4ba3e41140b038f68"/><file name="telephone.js" hash="d3cead00e1fd7c1d805cad8cd2fbaada"/><file name="weee.js" hash="b743eab978648fbf67c2e99baa756ab8"/></dir><file name="blank.html" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="index.php" hash="9a76023de59c1958cac0473ef31efa26"/><file name="spacer.gif" hash="df3e567d6f16d040326c7a0ea29a4f41"/><dir name="flash"><file name="AC_RunActiveContent.js" hash="3e038cea960c1b650442b85cea237053"/></dir></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Lib_Js_Prototype</name><channel>community</channel><min>1.7.0.0.4</min><max>1.7.1.0</max></package></required></dependencies>
+</package>
diff --git a/var/package/Lib_Js_Prototype-1.7.0.0.4.xml b/var/package/Lib_Js_Prototype-1.7.0.0.4.xml
new file mode 100644
index 00000000000..f83f13a0ab8
--- /dev/null
+++ b/var/package/Lib_Js_Prototype-1.7.0.0.4.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Lib_Js_Prototype</name>
+    <version>1.7.0.0.4</version>
+    <stability>stable</stability>
+    <license>Mixed</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>Prototype and Scriptaculous Javascript Libraries for Magento</summary>
+    <description>Prototype and Scriptaculous Javascript Libraries for Magento</description>
+    <notes>1.7.0.0.4</notes>
+    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:30:58</time>
+    <contents><target name="mageweb"><dir name="js"><dir name="prototype"><file name="debug.js" hash="d5990eabf728ade1f34496737455c8ff"/><file name="effects.js" hash="91e1b7d8c6043dff4eadbe054a90e3a7"/><file name="extended_debug.js" hash="cc706bc76bb1c5a2610fc296cd85e053"/><file name="prototype.js" hash="3b4b13dad33b475e11feb26fd3468ecc"/><file name="tooltip.js" hash="8509b04b1594b7e6382d7cfdf4ee1236"/><file name="tooltip_manager.js" hash="6b9759cbad296fda3c18d7669d6b5af0"/><file name="validation.js" hash="acfb21f1302a9960ee7eb85bf4ee2ed2"/><file name="window_effects.js" hash="3c0b47a0f3cd41753a3992d01c118c3d"/><file name="window_ext.js" hash="5ab45fe5f734927890c95b9d5547f47f"/><file name="window.js" hash="0f8fa2f5fda42d7c0890743e93685ed9"/><file name="window_readme.txt" hash="97306d2a8c4be2ec65f66d2ec233289c"/><dir name="windows"><file name="MIT-LICENSE" hash="a839f717f1675b571481268a4e4a4ee2"/><file name="README" hash="75b8b2e714cbcb48337540a451655967"/><dir name="themes"><dir name="alert"><file name="bottom.gif" hash="e859e3bc00c4f10360fa81a659aa673f"/><file name="bottom_left.gif" hash="53585b1a0351d599e76a85ccc26f7980"/><file name="bottom_right.gif" hash="8170abe3fec71fd17612869a2f036cd6"/><file name="left.gif" hash="4f235c4e6afb0d386d220638c49e4545"/><file name="overlay.png" hash="f4ddcee6f819975bc9c5643b570de6dc"/><file name="progress.gif" hash="86b1ac6d1c485d54efa3a53643e91ceb"/><file name="right.gif" hash="838ade41815529e7a63f99c93b3a01f7"/><file name="top.gif" hash="8702ca9b81c19f6220ce81c4ea215878"/><file name="top_left.gif" hash="a8c097bcb67bddf640c2bd9161b79476"/><file name="top_right.gif" hash="05ef4e1a417a5a2c81fc816406a4842a"/></dir><file name="alert.css" hash="27df86baae5a6fa2e3556bdf1b85ccc6"/><file name="alert_lite.css" hash="fbeaff8f185cd3b302f1a8db5efa0110"/><dir name="alphacube"><file name="bottom-left-c.gif" hash="434cdfc5298f33efb108264cf3370e1c"/><file name="bottom-middle.gif" hash="3f882dd32d57a29a785f448bbba5ed26"/><file name="bottom-right-c.gif" hash="4c37ad7b94fc901a1cfaf54a1742d5fd"/><file name="button-close-focus.gif" hash="99c44a6df2733b58083af7a4d9522116"/><file name="button-max-focus.gif" hash="408cd33fa89269b8395bf10afe69d456"/><file name="button-min-focus.gif" hash="ae06210658bad8bcc88dea377c4dc908"/><file name="frame-left.gif" hash="1bb1207b43425d214d4dc0da108f5449"/><file name="frame-right.gif" hash="8b9c36079881aa15c27a137666c56a38"/><file name="left-top.gif" hash="1ea936a090b4dfe8160fcb3a90ddb145"/><file name="right-top.gif" hash="e1b641feab640cb4207fa52160715e32"/><file name="top-middle.gif" hash="7f94c1018d023832c7c9e1fa468a9555"/></dir><file name="alphacube.css" hash="27c968911eaef53df158c55083ef0c84"/><file name="behavior.htc" hash="5588dff36ad5595f8353730e853044e5"/><dir name="darkX"><file name="button-close-focused.png" hash="5090b529a86a79679e0a26ccb0e1b0c6"/><file name="button-maximize-focused.png" hash="0f84bfcc9626d2cb1826291268b29f20"/><file name="button-minimize-focused.png" hash="630cd8cdd7124d412c6253e5c7cfc32a"/><file name="frame-bottom-left-focused.png" hash="8a34a3be2f349315dfd287ec15148332"/><file name="frame-bottom-mid-focused.png" hash="f1dbacdb64a19e00a485d426126f26db"/><file name="frame-bottom-right-focused.png" hash="17acb7874856dc68c3c017238d42054a"/><file name="frame-left-focused.png" hash="f30ab13888b2e48d0637991164a8f748"/><file name="frame-right-focused.png" hash="1115115c62507971b2f5eed3c2c5c2d0"/><file name="titlebar-left-focused.png" hash="491130dedbdbb3b2682f37424347b14c"/><file name="titlebar-mid-focused.png" hash="ae46975fc8a5e5a9f73f810d0c88809a"/><file name="titlebar-right-focused.png" hash="9560eb10dee94985f3ebe935833e2ae4"/></dir><file name="darkX.css" hash="16a964cfe57a2c979ad3d97831673b79"/><file name="debug.css" hash="63ee9aa7b7d80e0bb5e311407746ccd3"/><dir name="default"><file name="bottom_left.gif" hash="fb99ffa815a8648f95f42698fe5dfaa1"/><file name="bottom_mid.gif" hash="49b9ca7025562ea7f070a9111282364b"/><file name="bottom_right.gif" hash="e46768f632765cd86c5fe5d0166dcf2c"/><file name="bottom_right_resize.gif" hash="1b35a4ec3b734dfe37e31ba87bcc7d99"/><file name="center_left.gif" hash="bd567580b4ee16a7a2734057cfbbe219"/><file name="center_right.gif" hash="eef184d5d89d1710313581a2ccf408e8"/><file name="clear.gif" hash="7af1206eeb0e7834a75e69d70676060d"/><file name="close.gif" hash="8a08f243c37a8e25a88d4ac135b2f07d"/><file name="inspect.gif" hash="aa2a0961067aad5c54b8634919af863b"/><file name="maximize.gif" hash="e73cd71c4979ebeadeb9e27d40a9e8fb"/><file name="minimize.gif" hash="2d2f4b1bd0506f342425f80ab76c49a3"/><file name="overlay.png" hash="536d40e87cda0c7ae7b11f1721aa52d0"/><file name="resize.gif" hash="320f534b5d444b39701e0b679529e779"/><file name="sizer.gif" hash="1b35a4ec3b734dfe37e31ba87bcc7d99"/><file name="top_left.gif" hash="9c5e5920bfc189a45cc618099af93aa8"/><file name="top_mid.gif" hash="a12ff2b944025ad2d127d033dae5e9e1"/><file name="top_right.gif" hash="0cf1ec5b93f8ac8fcce0e2f72cf7f45e"/></dir><file name="default.css" hash="16014098f441d12d06c088135e2fde28"/><dir name="iefix"><file name="blank.gif" hash="56398e76be6355ad5999b262208a17c9"/><file name="iepngfix.css" hash="da3154c9a817850376f73a7976bfcb13"/><file name="iepngfix.htc" hash="b50c4e352a64254c5ceb6c63bcd0b176"/></dir><dir name="lighting"><file name="background_buttons.gif" hash="e66e67aaaf08a7b24f3cd1ba22584b42"/><file name="bottom-left-blue.png" hash="7c9e91d421945141315fc105d464a99f"/><file name="bottom-left-darkblue.png" hash="e88c2380acf403ee28597c6045988cc6"/><file name="bottom-left-green.png" hash="ee25ce8a12229b009fbfd91f7ba51e26"/><file name="bottom-left-grey.png" hash="5fdb3eae397ac7279aa5a7fdaad3dcc2"/><file name="bottom-middle-blue.png" hash="e93cc9d31d88f45c047a98a66be04354"/><file name="bottom-middle-darkblue.png" hash="763c88c424e0900e675042d3f0958bd4"/><file name="bottom-middle-green.png" hash="77e0a22afd2c55a83b5c7fa98a12ef25"/><file name="bottom-middle-grey.png" hash="3a2ebdeff74e2ff63c4471575568dd01"/><file name="bottom-right-blue.png" hash="0bc11a61047e8716451a283ebff897e5"/><file name="bottom-right-darkblue.png" hash="88e33ea702a304ae237edd57bc8447d6"/><file name="bottom-right-green.png" hash="7bce162df013eba43a659ae6e780ae4b"/><file name="bottom-right-grey.png" hash="86eb476492d911aac5688c9747fe7a1d"/><file name="button-close-blue.png" hash="42ae1a35caf8a9a275d6e748c27769fb"/><file name="button-close-darkblue.png" hash="50dbcd898dc519c1e6ac0d3a478978cd"/><file name="button-close-green.png" hash="b4273572fa91cba909a0a3e15b994d19"/><file name="button-close-grey.png" hash="124964b634ba67f2bb6dd08cf8cafd5a"/><file name="button-maximize-blue.png" hash="85b79237d85b09c205e09166dd8f4af0"/><file name="button-maximize-darkblue.png" hash="108d10619214e3365820aa4ab008aed5"/><file name="button-maximize-green.png" hash="90f5527705e4fd81997564e81c6ac2a3"/><file name="button-maximize-grey.png" hash="c46a8c014bd14be167f4c6a2f2dd52ed"/><file name="button-minimize-blue.png" hash="1fd738b99877a4dfa5656491cc3d8e6b"/><file name="button-minimize-darkblue.png" hash="b6d9da1cdf51ab54682fa75a6df2c40d"/><file name="button-minimize-green.png" hash="9e7d26298a0a49ffee3fbab6ea838e01"/><file name="button-minimize-grey.png" hash="0432701c2425cb3a5143d8a04bda0d87"/><file name="left-blue.png" hash="0a6acf0a863c04845a93b681769527cd"/><file name="left-darkblue.png" hash="44cdce8a75de4425d7eb7763092cc38d"/><file name="left-green.png" hash="d83116c49d62dc46bff0b7b4200b4ecf"/><file name="left-grey.png" hash="f3486d3293ae98b5edb8889c4b4082ef"/><file name="pngbehavior.htc" hash="b94c44e30423fd18a8b82bda5a139db3"/><file name="right-blue.png" hash="2c9b6b80d4a6b190b8e38a1c101e828c"/><file name="right-darkblue.png" hash="9b3267c5d36bb3f4588167cc3e78e569"/><file name="right-green.png" hash="4436968c2adbe6ed7c475c225631bc7c"/><file name="right-grey.png" hash="36b3de47bcbbd6b53e2f6e06843ee6e8"/><file name="spinner.gif" hash="c7b3cbb3ec8249a7121b722cdd76b870"/><file name="top-left-blue.png" hash="a5cb9eaa82f67df223d6784a52b26f1f"/><file name="top-left-darkblue.png" hash="e4a3af23d2cae7909331eb1995963c82"/><file name="top-left-green.png" hash="eb4cb604177c342998023d3dcd3aa5b0"/><file name="top-left-grey.png" hash="9f6f39abc4ae9539a0f54567a4a5d4f8"/><file name="top-middle-blue.png" hash="6d01df8637385bbe592b8df369294c8d"/><file name="top-middle-darkblue.png" hash="2c91ea6462e72a29cd07300d4102b88a"/><file name="top-middle-green.png" hash="e0f56311091bfb370fc6783fc7e71068"/><file name="top-middle-grey.png" hash="8c02881b730d602589fe9ed4bcaeb689"/><file name="top-right-blue.png" hash="4afefb06dc63c864211724a6348f25ad"/><file name="top-right-darkblue.png" hash="d8a9031987f648f170af67023179618d"/><file name="top-right-green.png" hash="b38813f9200440051273bdd622f5e545"/><file name="top-right-grey.png" hash="d7f7332ddf8686fb9810e4170767bf52"/></dir><file name="lighting.css" hash="d13de730c8ee7ef04167d361bdf8eebd"/><file name="mac_os_x.css" hash="65204ef34c1eeff0be29c53b0614076a"/><file name="mac_os_x_dialog.css" hash="0b7cd9d6a9e8f940f50bc4a080f54b1b"/><dir name="nuncio"><file name="bottom_left.png" hash="d9be5c7b432a342c6da5ef9b10148267"/><file name="bottom_mid.png" hash="facee2e7ee7c572a8f412750b0ce5387"/><file name="bottom_right.png" hash="6f3c124a066a11ff225897112de8e9d7"/><file name="center_left.png" hash="a11bee83f99addccc0d5eff3d2e82b8f"/><file name="center_right.png" hash="bf6b023ad1751d5f60f9820eea72ac28"/><file name="close.png" hash="46744062a7b54416c8767f8e0ccf1c41"/><file name="minimize.png" hash="bc911a3e90fc0640e0899856759a5e01"/><file name="overlay.png" hash="5ccd88855e923eb8a1bd9da1dec9d7fe"/><file name="top_left.png" hash="d3105aacc2c69954df11af953875a12e"/><file name="top_mid.png" hash="cb679a8c77e9b7485b5f0eca547eb103"/><file name="top_right.png" hash="e65d6fc6bf53891c487e414db16f1038"/></dir><file name="nuncio.css" hash="e30e31b94d96b0b27c80ad6d943d7010"/><dir name="spread"><file name="bottom-left-c.gif" hash="84641d08576f68a11f717103365dfb83"/><file name="bottom-middle.gif" hash="20ab265c67355c5b72cdcdc8739af555"/><file name="bottom-right-c.gif" hash="cb27b72623e997badc599e76024a6e44"/><file name="button-close-focus.gif" hash="99c44a6df2733b58083af7a4d9522116"/><file name="button-max-focus.gif" hash="408cd33fa89269b8395bf10afe69d456"/><file name="button-min-focus.gif" hash="ae06210658bad8bcc88dea377c4dc908"/><file name="frame-left.gif" hash="63dc99b0c4ba0518688f7eca1f1628ca"/><file name="frame-right.gif" hash="a03585eec830f37898c7041d557dafc5"/><file name="left-top.gif" hash="7c78b8b59976d19191acf940cbfc04fb"/><file name="right-top.gif" hash="597530287fe1dc491278f855749f7e01"/><file name="top-middle.gif" hash="fa6fd6b90945c47f8d1718d9139d0a75"/><file name=".gif" hash="9dd39829e7cfdd06f3317a931bdc177e"/></dir><file name="spread.css" hash="a804413d7f1f9550c134477f6f9219ee"/></dir></dir></dir><dir name="scriptaculous"><file name="builder.js" hash="1174f6fc34ca5d54ba10b0c719386e7c"/><file name="controls.js" hash="8c414e1787c0ac9f10b16b252361c8b2"/><file name="dragdrop.js" hash="046759400db7a6096376e50110104edd"/><file name="effects.js" hash="d795089f95a22306cca9b337c439c65a"/><file name="scriptaculous.js" hash="d59eba4e0b14b672208b0862ae1c2196"/><file name="slider.js" hash="6043f96a71d2685fecd02e2ab99e84d9"/><file name="sound.js" hash="0f0fab23fa2cb1bc7717fd2bdf45402e"/><file name="unittest.js" hash="99969698b22272f77bdf4c64586862b3"/></dir></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
+</package>
diff --git a/var/package/Lib_Mage-1.8.0.0.xml b/var/package/Lib_Mage-1.8.0.0.xml
new file mode 100644
index 00000000000..51cc2153e30
--- /dev/null
+++ b/var/package/Lib_Mage-1.8.0.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Lib_Mage</name>
+    <version>1.8.0.0</version>
+    <stability>stable</stability>
+    <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>Mage Library</summary>
+    <description>Mage Library</description>
+    <notes>1.8.0.0</notes>
+    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:30:58</time>
+    <contents><target name="magelib"><dir name="Mage"><dir name="Archive"><file name="Abstract.php" hash="6324215ec8ab3c55730c57976b7cd4f7"/><file name="Bz.php" hash="6485bb0cd67f6f5dfa11b8ba29e23d43"/><file name="Gz.php" hash="7f75dbebd125a0d4c27803d4ca4983f4"/><dir name="Helper"><dir name="File"><file name="Bz.php" hash="ec70e019f9031c2c2f16c9f910434352"/><file name="Gz.php" hash="84d1f376a78efa1898f888c854faf040"/></dir><file name="File.php" hash="8a0383c1b32cdbc8c53ba551c7814bda"/></dir><file name="Interface.php" hash="283914c36fdcf9851ec651149176fff7"/><file name="Tar.php" hash="123ee3d7c52d7319de903bf3e9422aa9"/></dir><file name="Archive.php" hash="1e0342bbcb89d417c7ee77ad3387938d"/><dir name="Autoload"><file name="Simple.php" hash="0112e880807596fbe8822be12314f14f"/></dir><dir name="Backup"><file name="Abstract.php" hash="4ab32913f5831b4e449486a5cf84d07e"/><dir name="Archive"><file name="Tar.php" hash="b6b2731bfa267b6b5fcb28d3f8f8cdbf"/></dir><file name="Db.php" hash="58001faa3a70a54441f45de8cb77aacb"/><dir name="Exception"><file name="CantLoadSnapshot.php" hash="67e47d7b54e466ebf0230810bec31158"/><file name="FtpConnectionFailed.php" hash="54cc1c76345d5fc601f7cf3af67151f6"/><file name="FtpValidationFailed.php" hash="51847fdeb1539094b9eca84b601ca241"/><file name="NotEnoughFreeSpace.php" hash="5a95f8877b4b8ca8936c0fc88a1a65ac"/><file name="NotEnoughPermissions.php" hash="b89a417fc74cc6b45371967c9c7a3e92"/></dir><file name="Exception.php" hash="b10632f40d57f0768f8d1058b0fd10fc"/><dir name="Filesystem"><file name="Helper.php" hash="981b2a7ff2ffc271c541c77e137f1627"/><dir name="Iterator"><file name="File.php" hash="0bfe672a2e72af47c777f7321b0752aa"/><file name="Filter.php" hash="f994e954d22007498e4078345aeadd20"/></dir><dir name="Rollback"><file name="Abstract.php" hash="90a2781c3c6443e08aeb3b6f1d21f97f"/><file name="Fs.php" hash="c76f9c2e09d37d4dcc785fab7d4e02b0"/><file name="Ftp.php" hash="ebea4f77dee7cc83444da16b7d51e397"/></dir></dir><file name="Filesystem.php" hash="8da3a28a9f90091105121dee17cfa142"/><file name="Interface.php" hash="5507294967fc6a5472aa82df60a1bf69"/><file name="Media.php" hash="fd2d608b2b5afaab2f33f67b5155e14b"/><file name="Nomedia.php" hash="da38dbea4586952e20d327b3af1347ae"/><file name="Snapshot.php" hash="2e4ce7ed1b78c4dbad25221abbb4aaf2"/></dir><file name="Backup.php" hash="56bf7a531ab332a0f10821e5d583afc4"/><dir name="Cache"><dir name="Backend"><file name="File.php" hash="42f4f35ddc14528a2351cad9c6861a8e"/><file name="Redis.php" hash="830130fc2d5acabbe171920e5e14d982"/></dir></dir><dir name="Connect"><dir name="Channel"><file name="Generator.php" hash="a1f115e909680bca8c1b1f0940244b13"/><file name="Parser.php" hash="ec2e7380ec4bca81de2795f96975e778"/><file name="VO.php" hash="870a1b9b28d85dd72b2b1e2529dca354"/></dir><dir name="Command"><file name="Channels_Header.php" hash="934366a4daa1ebe87b25cb9dfa061798"/><file name="Channels.php" hash="12f730285615329cba0b570385009837"/><file name="Config_Header.php" hash="119a103ed71b326993756961b6c7c2a0"/><file name="Config.php" hash="5091776f35732d8b0ff12c8ff3561c69"/><file name="Install_Header.php" hash="71f0b6bad2f745235352d181bcc66645"/><file name="Install.php" hash="2f7227a1f4003d6ce6edec4a0ce02e0f"/><file name="Package_Header.php" hash="dc3840a95f89ef844df40c585582815d"/><file name="Package.php" hash="b36bdc6a3c0f6bc9d7766a37c046a481"/><file name="Registry_Header.php" hash="559edbac0f3d267c8ca289e526b940d1"/><file name="Registry.php" hash="f9fde28940ff38dbc336335d575a295d"/><file name="Remote_Header.php" hash="4b56cd683710de6c81241f902570ba25"/><file name="Remote.php" hash="6f959617993d58aec974d578921b6212"/></dir><file name="Command.php" hash="0d474da0956a292aa83e88da4975c527"/><file name="Config.php" hash="511f752123ccc6c148a6a308fc3f81b2"/><file name="Converter.php" hash="1cde84613c6079050bb3824aba3b380d"/><dir name="Frontend"><file name="CLI.php" hash="86e6631d9345d5bf9d15148cfdace3bf"/></dir><file name="Frontend.php" hash="0a97c590fdc9844b225638d631315d35"/><file name="Ftp.php" hash="2b87de89c19712ae22756b11c763e137"/><dir name="Loader"><file name="Ftp.php" hash="0ca46737d25bf0eb321414f2d8b7ced0"/></dir><file name="Loader.php" hash="009d6f986d5ff406f7e94d2b395f6e25"/><dir name="Package"><file name="Extension.php" hash="68b329da9893e34099c7d8ad5cb9c940"/><file name="Hotfix.php" hash="850bd23783a77dbf6f50b4f169c2c7b3"/><file name="Maintainer.php" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="Reader.php" hash="ca384e066ac21168e0a7aebc5da869c1"/><file name="Target.php" hash="351af5965f7870d3f4e960d402805b17"/><file name="VO.php" hash="9ffbdff9210474b68db7caddf9a5fe5a"/><file name="Writer.php" hash="431f107ab2ffd1977f74a94ae16481d1"/></dir><file name="Package.php" hash="bf5af87c29959f229de7b69d1d94f1e0"/><file name="Packager.php" hash="42efcb63cc3b9dbbc5e8eb98b2d8d08e"/><dir name="Repository"><file name="Abstract.php" hash="d41d8cd98f00b204e9800998ecf8427e"/><dir name="Channel"><file name="Abstract.php" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="Commercial.php" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="Community.php" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="Core.php" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><file name="Channel.php" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="Local.php" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><file name="Repository.php" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="Rest.php" hash="ba2d2365fc989274940e1fdff6476875"/><file name="Singleconfig.php" hash="975c04d57cbce24327e84a93d9f5443e"/><dir name="Structures"><file name="Graph.php" hash="b85283fd2af6fd54fb748cb6ea933842"/><file name="Node.php" hash="26a7e4041c3d2fd93bfdc3c692c85ede"/></dir><file name="Validator.php" hash="3ac1b21ec703073d5dd9b5dda3471fe8"/></dir><dir name="DB"><file name="Exception.php" hash="e0b55d77af8e215135ef223f593832ad"/><file name="Mysqli.php" hash="5057ea65f441bbb00c7e55298e9252a4"/></dir><file name="Exception.php" hash="807f6335110c3d6fa0cf5072e2be7892"/><dir name="HTTP"><dir name="Client"><file name="Curl.php" hash="f537a9879781ec3fe2748677bee43737"/><file name="Socket.php" hash="7a889fed729d92eba849d6fdfa32d7d6"/></dir><file name="Client.php" hash="7072f9366680bc5ebc1c447700193cb4"/><file name="IClient.php" hash="88a4a88a31a05a2154d430d7b4308ff6"/></dir><dir name="System"><file name="Args.php" hash="46467e1069edf432030d14dd59fa73df"/><file name="Dirs.php" hash="4edad790aedfbd404df28af9d2f2bea6"/><file name="Ftp.php" hash="6fc28c56dde7613be3da7b9f766caa51"/></dir><dir name="Xml"><file name="Generator.php" hash="0ddc93b0c75885f67d049d0a38c630fa"/><file name="Parser.php" hash="b2bdc0880cd5bc2d82468ee075e783a2"/></dir></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
+</package>
diff --git a/var/package/Lib_Magento-1.8.0.0.xml b/var/package/Lib_Magento-1.8.0.0.xml
new file mode 100644
index 00000000000..5ab6e9d26c5
--- /dev/null
+++ b/var/package/Lib_Magento-1.8.0.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Lib_Magento</name>
+    <version>1.8.0.0</version>
+    <stability>stable</stability>
+    <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>Magento Library</summary>
+    <description>Magento Library</description>
+    <notes>1.8.0.0</notes>
+    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:30:58</time>
+    <contents><target name="magelib"><dir name="Magento"><file name="Crypt.php" hash="0375279e6d5f6fe5c355e55ed567d50c"/><dir name="Db"><dir name="Adapter"><dir name="Pdo"><file name="Mysql.php" hash="4c72a737a41d548d816b9b23846d6d55"/></dir></dir><dir name="Object"><file name="Interface.php" hash="75538d642ffbd217e6b4f0d6c47ee41d"/><file name="Table.php" hash="4782020387d53b62131ccedaa84a1c07"/><file name="Trigger.php" hash="33e76ea340956805d2951e2d7b166323"/><file name="View.php" hash="e813377fd04712667ad00d6c2cc295cf"/></dir><file name="Object.php" hash="b61d21392c22ed7c035d7232b05997b7"/><dir name="Sql"><file name="Select.php" hash="666a857be35c4cfa3fb153ef757e19b6"/><file name="Trigger.php" hash="2364b625b934404de9965c120d84ca0f"/></dir></dir><file name="Exception.php" hash="d6af7ed137881f7bb5b1687ab0c71626"/><dir name="Profiler"><dir name="Output"><file name="Csvfile.php" hash="4d26324422704578a6f0f10f24b206b1"/><file name="Firebug.php" hash="188662da429ea2f349adeb5dbd30736d"/><file name="Html.php" hash="eb0b933bdd9061385aafdded108db6a0"/></dir><file name="OutputAbstract.php" hash="3a16286d897eae373dc0f8bf5f28d4d3"/></dir><file name="Profiler.php" hash="00b200d890f107c748794e2e31dad910"/></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
+</package>
diff --git a/var/package/Lib_Varien-1.8.0.0.xml b/var/package/Lib_Varien-1.8.0.0.xml
new file mode 100644
index 00000000000..20bf1ffeda9
--- /dev/null
+++ b/var/package/Lib_Varien-1.8.0.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Lib_Varien</name>
+    <version>1.8.0.0</version>
+    <stability>stable</stability>
+    <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>Varien Library</summary>
+    <description>Varien Library</description>
+    <notes>1.8.0.0</notes>
+    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:30:58</time>
+    <contents><target name="magelib"><dir name="Varien"><file name="Autoload.php" hash="96a0c175e6a98562f058f9a02c167bbb"/><dir name="Cache"><dir name="Backend"><file name="Database.php" hash="09535993a910ade50a2cd763da0f6d9e"/><file name="Eaccelerator.php" hash="00bc01db2c4457fdad760835992ae2dc"/><file name="Memcached.php" hash="8e542eb6c54f6764dd41fff4488c5ae2"/></dir><file name="Core.php" hash="d571f5f03d00925708328a6e6d42f58f"/></dir><dir name="Convert"><dir name="Action"><file name="Abstract.php" hash="2a6bb67a679a6e20cbe9478e80be582f"/><file name="Interface.php" hash="fe9129227525ffc1f862c6f1f85e83f1"/></dir><file name="Action.php" hash="ee3a0baf50c1bb0f1c0b67721f1965e6"/><dir name="Adapter"><file name="Abstract.php" hash="0c53dc267b75e595518365ab8f1d8ab4"/><dir name="Db"><file name="Table.php" hash="d6b8a1bfe2de4ed908ca0367fb226d2c"/></dir><dir name="Http"><file name="Curl.php" hash="76e12f13e1eb48eb3e8c36cea9a6ece3"/></dir><file name="Http.php" hash="afb44986f4d6ba1cf84819bbb31004b2"/><file name="Interface.php" hash="2c4834f37eede972be48c8b3a2857661"/><file name="Io.php" hash="a9ceb53b810de3e183b439ba1bb1ba57"/><file name="Soap.php" hash="4b67a9ea45b12dfffabd26d2cb8942f2"/><file name="Std.php" hash="225b4e11d9ffcd1db8f99d54dc749687"/><dir name="Zend"><file name="Cache.php" hash="845fcb65276b05714b8d231c6b30f651"/><file name="Db.php" hash="794cb6226590ff7d2a7d1fbce26fcc05"/></dir></dir><dir name="Container"><file name="Abstract.php" hash="8f836665d0dec3c7cc7d93714e9c99b4"/><file name="Collection.php" hash="b1ef8a70ea806deb351b5413d6cfacef"/><file name="Generic.php" hash="bef8559c7a10ecf3ebb3f147795a2597"/><file name="Interface.php" hash="870470de0ec947f1039aa415d37d0f82"/></dir><file name="Exception.php" hash="58c9437dd946d5251234f55de3648d3f"/><dir name="Mapper"><file name="Abstract.php" hash="e1d9d87a1270ad6a499549dd87f9ac62"/><file name="Column.php" hash="7f74158a73fd8fa83052625ef07b1749"/><file name="Interface.php" hash="d8a8b98cece9ae38302914bbc910c094"/></dir><dir name="Parser"><file name="Abstract.php" hash="3559203bdcdb019daddd9ed558f596a7"/><file name="Csv.php" hash="f68d8dc8c0695296cc32b1ca716a8276"/><file name="Interface.php" hash="016ab96988f7ae02d2e84ed4878513ca"/><file name="Serialize.php" hash="52a93cacd5f3d3e0267bbffc74d7d715"/><dir name="Xml"><file name="Excel.php" hash="1edf1b7b7071c45baada29670ea656b8"/></dir></dir><dir name="Profile"><file name="Abstract.php" hash="c038c0b7a209c7a189beb6aa21df617b"/><file name="Collection.php" hash="2ff1f76cafa7e36826063069efdba8ad"/></dir><file name="Profile.php" hash="9b63f8909ed29bf5a3c729bc5934cb9c"/><dir name="Validator"><file name="Abstract.php" hash="3fdf8a0fcd2366563e330c30456f19b9"/><file name="Column.php" hash="da9bb1ffa8d6026a6d26365da4cec289"/><file name="Dryrun.php" hash="70f63aa2f6146c67658dc7bfd04ddf02"/><file name="Interface.php" hash="59c7a5d323e0a3bb6928754f3f4393ad"/></dir></dir><file name="Convert.php" hash="441a61c66ee524a024c7ffe8b7c7c3c2"/><dir name="Crypt"><file name="Abstract.php" hash="73980e75bef5f58855ea924c3693522d"/><file name="Mcrypt.php" hash="3c62cbb2f8e763e0da985b7bc054c5c3"/></dir><file name="Crypt.php" hash="cb28cabbc8a02fd86705bc0b52d7204b"/><dir name="Data"><dir name="Collection"><file name="Db.php" hash="7a4be602c7a6acf3ac5dcfb26f83e50f"/><file name="Filesystem.php" hash="8c2e8522e1782dbea4d52f44566cd02a"/></dir><file name="Collection.php" hash="e55f81c3fdf4b39d05bbbce7573e0de8"/><dir name="Form"><file name="Abstract.php" hash="4978be2832783e6ab2f7c4e291bbf4d5"/><dir name="Element"><file name="Abstract.php" hash="a8982e3215fc63a5cb40a4e964f6d3ea"/><file name="Button.php" hash="98c64b5da29dff22cfae938caa5833c8"/><file name="Checkboxes.php" hash="fdc32833161b60139e9859f387bce6c7"/><file name="Checkbox.php" hash="7992114fdc4aefafceebac2a08c1a434"/><file name="Collection.php" hash="cade28ccfd09e8b55394bf3a7d595d70"/><file name="Column.php" hash="b6d1d32aca981ae0fd1c6a83fc655c9a"/><file name="Date.php" hash="3f5c8628e329cbc87c33c7e622a3b946"/><file name="Editor.php" hash="13d5c80395365db6c47c0c004967c4bf"/><file name="Fieldset.php" hash="f78031a222ad4263826adf2f35622c72"/><file name="File.php" hash="463e8c8e106fe2018fdbf117e330423e"/><file name="Gallery.php" hash="6cb83ebc8efae252978fbd22c001642b"/><file name="Hidden.php" hash="ae6275e5d3b7df411bfda4fb4f995a8c"/><file name="Imagefile.php" hash="2d6ed40fef1c2927ab22dea7d29336db"/><file name="Image.php" hash="c4d7be9bf6b1b19590d44bf9837eb748"/><file name="Label.php" hash="ced6668e926c5cd10e5dfc93e1764070"/><file name="Link.php" hash="fb213bbbce4e46ea03a96923defbfbb3"/><file name="Multiline.php" hash="087bd60ff98b4b9c094b9adec040f166"/><file name="Multiselect.php" hash="9e0d04674a743602438fd4190040944c"/><file name="Note.php" hash="f5b71ebcf5a2b774393d9f4d1581dc35"/><file name="Obscure.php" hash="b61a077fbdea1b93be0aafc2f2c2f391"/><file name="Password.php" hash="a15263e7b0fabe8bd6abf8487f43efcb"/><file name="Radio.php" hash="4b32afab119091759d93ec99fb2fd53b"/><file name="Radios.php" hash="9004386a01f6c2b09435f39bf9b5bb36"/><dir name="Renderer"><file name="Interface.php" hash="61baa8c8755a9a7e8eaac5786ae38f42"/></dir><file name="Reset.php" hash="51bc11836e12bd64390476e3ff393c13"/><file name="Select.php" hash="4402f264e6e2cae5fbad26bc44aa21fe"/><file name="Submit.php" hash="5b9e9e3db9bc70757030312b7d002b7e"/><file name="Textarea.php" hash="b88d00399b8f6846d56055c9416dd0bb"/><file name="Text.php" hash="2e798cfd096ac0a87f9d9055000af3c3"/><file name="Time.php" hash="f35d8d1dc0a90dd6f044f17c22d8dc4a"/></dir><dir name="Filter"><file name="Date.php" hash="80eee9775448a21a5332f3e5cb7edcc9"/><file name="Escapehtml.php" hash="0c02fdfbae30158aa14f45b937332249"/><file name="Interface.php" hash="4542e15af14cc92d7bf5a863d4bf5ddd"/><file name="Striptags.php" hash="2c4cd0905e4e3b99ba373ffeb9ab7d38"/></dir></dir><file name="Form.php" hash="407eee6f100c7befa18ca586b3c3ae04"/><dir name="Tree"><file name="Db.php" hash="d06e9a49ddb1ea94892f4f10e1b3fea1"/><file name="Dbp.php" hash="4bd7f5b9047870f125459dbf523f73a2"/><dir name="Node"><file name="Collection.php" hash="941c88db98d69ec170674380fe3413d5"/></dir><file name="Node.php" hash="e985629bbea05cd0e52d7ac82fc2ee27"/></dir><file name="Tree.php" hash="e39d73757e0535493badc5bea8459834"/></dir><file name="Date.php" hash="7830b6da8a6a54b5ef8d17b7f0d248f0"/><dir name="Db"><dir name="Adapter"><file name="Interface.php" hash="17af4b595d92f534eb7097f5a5fbff0a"/><file name="Mysqli.php" hash="4e6e03a6ddf127f58ab0326c4cfe9956"/><dir name="Pdo"><file name="Mysql.php" hash="97a9f11bd2c3591a93ef2d2bd0f0ed55"/></dir></dir><dir name="Ddl"><file name="Table.php" hash="2567ce531a4c978e5fff70b84f69f5ad"/></dir><file name="Exception.php" hash="93966b32e96f793f031244716ff37eed"/><file name="Helper.php" hash="eee52d2574360dabe7a5e830bc0a67b8"/><file name="Select.php" hash="62250da9eb320e684a4c121c3a40d473"/><dir name="Statement"><file name="Parameter.php" hash="8d688f64d6780d18e517921ea5eb9ccb"/><dir name="Pdo"><file name="Mysql.php" hash="e82abad90774a126efb8bd27bc0f43f7"/></dir></dir><dir name="Tree"><file name="Exception.php" hash="6a00d12bbed94d648a974d213a816a4b"/><dir name="Node"><file name="Exception.php" hash="f890d0fc36e89aefd7cf04ae6c10a88e"/></dir><file name="Node.php" hash="6b048bbe2b2c46e405ffae8bca23e579"/><dir name="NodeSet"><file name="Exception.php" hash="2caa6a4b09846fe3b941563aa55d3c5f"/></dir><file name="NodeSet.php" hash="5e589b0c1221caf2693fe6f7d07e1ad3"/></dir><file name="Tree.php" hash="c7cc99ac052aa5d1ac721619d47506e6"/></dir><file name="Debug.php" hash="ec721f169e5a16524a17abba094d651d"/><dir name="Directory"><file name="a.txt" hash="026e450c46ac92ea375302955a4f42fb"/><file name="Collection.php" hash="59faf0b57bc10bdf3daade69b51fd142"/><file name="Factory.php" hash="112fda936935de43f45bf0e1b1ebfd23"/><file name="IFactory.php" hash="bb7a2578774f58922f7d5b3a90c34e3e"/></dir><dir name="Event"><file name="Collection.php" hash="cb422c6c7abb160fa3d7d54669bf2b2e"/><dir name="Observer"><file name="Collection.php" hash="b9c7d52c9563a19d15723bbc4a85fac6"/><file name="Cron.php" hash="0e04e63cf24f5cce3031f5896c439b68"/><file name="Regex.php" hash="f97f5a4435d560e073d725681cb15264"/></dir><file name="Observer.php" hash="eff7b66ce01d3f8fc4c00d974a2d5440"/></dir><file name="Event.php" hash="1836bb96f191e616d59178f17e407277"/><file name="Exception.php" hash="6beb1561720cc6c7a894a955ff2251b7"/><dir name="File"><file name="CsvMulty.php" hash="af4518063d4d9f03cfbfca832c1b9d76"/><file name="Csv.php" hash="5736e17051a3e778c59b99ed669caee5"/><file name="Object.php" hash="86116483e252e66c516208e43b3bb920"/><dir name="Transfer"><dir name="Adapter"><file name="Http.php" hash="c71dc1460cdcf062adb97b577e621923"/></dir></dir><dir name="Uploader"><file name="Image.php" hash="2655d6497c074c8c4998c58320d60c14"/></dir><file name="Uploader.php" hash="ff32029ded0cb07486ef40ae38f56b50"/></dir><dir name="Filter"><dir name="Array"><file name="Grid.php" hash="14bd2f5ab60e7255557fc2dff7f24a37"/></dir><file name="Array.php" hash="a38e3d26f47d1bfaf4e023662d9a3dad"/><file name="Email.php" hash="067f3ea6f1597ea2501455865977d789"/><file name="Money.php" hash="8bec682670cb4cbf48e4b4264e2ab188"/><dir name="Object"><file name="Grid.php" hash="e3c3fa92761e5a1e1401192d8362301e"/></dir><file name="Object.php" hash="5b85aaff354eb0770e14efcfebda263b"/><file name="Sprintf.php" hash="0dd85ddc3d4b737d7cc6308afc12db18"/><dir name="Template"><file name="Simple.php" hash="b342cd136c10a6630d2d7dccd4137387"/><dir name="Tokenizer"><file name="Abstract.php" hash="d737a3d6599939b2a12b55975c9af780"/><file name="Parameter.php" hash="140ab2548a3da859473a46c7b0d44504"/><file name="Variable.php" hash="4ba64c31b234db22c2ff1799a49e7798"/></dir></dir><file name="Template.php" hash="48c08c9c1c9199e43e53f682df53ceae"/></dir><dir name="Http"><dir name="Adapter"><file name="Curl.php" hash="6d7dd607c55582ac08416f1940f3868c"/></dir><file name="Client.php" hash="eac22d5beaca06c1678c327a13e7f45d"/></dir><dir name="Image"><dir name="Adapter"><file name="Abstract.php" hash="0ac17ab0c82dea6289caf0985be0c47d"/><file name="Gd2.php" hash="7d7c4751697adac77961431a297fc6a3"/></dir><file name="Adapter.php" hash="edbab0bcfa931ae1d8f813f467e6b311"/></dir><file name="Image.php" hash="dfec3144e465eb2558a76a84f4736254"/><dir name="Io"><file name="Abstract.php" hash="53e7055dfe0ca7d133b94cfbf3621693"/><file name="Exception.php" hash="493365429caf5d2170c00137b081b195"/><file name="File.php" hash="4d0613516c6d3824d1ec4442c99a6b8a"/><file name="Ftp.php" hash="f349b9b833133853c902abb493d4f3bd"/><file name="Interface.php" hash="0b26ea223a4bed00df9b7b808b2acf80"/><file name="Sftp.php" hash="461d458eb368ed01f3b9194bafc4030d"/></dir><dir name="Object"><file name="Cache.php" hash="a87d2ae2d015a4e2f2fc1b611feccfcd"/><file name="Mapper.php" hash="1180b9b29c366d886e8af05181aebbce"/></dir><file name="Object.php" hash="0d5d06e7eb4439372bf90e2e41e998d7"/><dir name="Pear"><file name="Frontend.php" hash="61a9a308d54eca9e0a0bbc09296189f1"/><file name="Package.php" hash="a4261d73ebc059785fe418c6350bb4e5"/><file name="Registry.php" hash="5780af5995ea9af32032d3ebe496e251"/></dir><file name="Pear.php" hash="d60801531ef3ac16b26e302961310c53"/><file name="Profiler.php" hash="d434c08a6dd3ef8eb168e3a3d46f057f"/><dir name="Simplexml"><dir name="Config"><dir name="Cache"><file name="Abstract.php" hash="6dbbd6f1bc63c1b7ee086399da30f4e0"/><file name="File.php" hash="f99292ec6d04d5464a1313a2c52880d4"/></dir></dir><file name="Config.php" hash="a957b7feccdf430239af81610a6ac281"/><file name="Element.php" hash="fca2dddf067b1e038834b27cb5a746a4"/></dir></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Lib_ZF</name><channel>community</channel><min>1.11.1.0</min><max>1.12.0.0</max></package><extension><name>PDO</name><min></min><max></max></extension><extension><name>SPL</name><min></min><max></max></extension><extension><name>curl</name><min></min><max></max></extension><extension><name>SimpleXML</name><min></min><max></max></extension><extension><name>dom</name><min></min><max></max></extension><extension><name>gd</name><min></min><max></max></extension><extension><name>iconv</name><min></min><max></max></extension><extension><name>pdo_mysql</name><min></min><max></max></extension><extension><name>mcrypt</name><min></min><max></max></extension><extension><name>pcre</name><min></min><max></max></extension><extension><name>Reflection</name><min></min><max></max></extension><extension><name>session</name><min></min><max></max></extension></required></dependencies>
+</package>
diff --git a/var/package/Mage_All_Latest-1.8.0.0.xml b/var/package/Mage_All_Latest-1.8.0.0.xml
new file mode 100644
index 00000000000..f1373fe3f69
--- /dev/null
+++ b/var/package/Mage_All_Latest-1.8.0.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Mage_All_Latest</name>
+    <version>1.8.0.0</version>
+    <stability>stable</stability>
+    <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>Metapackage for latest Magento 1.8.0.0 release</summary>
+    <description>Metapackage for latest Magento 1.8.0.0 release</description>
+    <notes>1.8.0.0</notes>
+    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:30:59</time>
+    <contents><target name="mage"><dir name="pkginfo"><file name="Mage_All_Latest.txt" hash="1286e940f547efd8cd12b69a2b32fae0"/></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.8.0.0</min><max>1.8.0.0</max></package><package><name>Mage_Core_Adminhtml</name><channel>community</channel><min>1.8.0.0</min><max>1.8.0.0</max></package><package><name>Interface_Adminhtml_Default</name><channel>community</channel><min>1.8.0.0</min><max>1.8.0.0</max></package><package><name>Interface_Frontend_Default</name><channel>community</channel><min>1.8.0.0</min><max>1.8.0.0</max></package><package><name>Interface_Install_Default</name><channel>community</channel><min>1.8.0.0</min><max>1.8.0.0</max></package><package><name>Mage_Downloader</name><channel>community</channel><min>1.8.0.0</min><max>1.8.0.1</max></package><package><name>Mage_Centinel</name><channel>community</channel><min>1.8.0.0</min><max>1.8.0.0</max></package><package><name>Interface_Frontend_Base_Default</name><channel>community</channel><min>1.8.0.0</min><max>1.8.0.0</max></package><package><name>Phoenix_Moneybookers</name><channel>community</channel><min>1.3.2</min><max>1.3.2</max></package><package><name>Mage_Compiler</name><channel>community</channel><min>1.8.0.0</min><max>1.8.0.0</max></package><package><name>Magento_Mobile</name><channel>community</channel><min>1.8.0.0.23.1</min><max>1.8.0.1</max></package><package><name>Lib_Cm</name><channel>community</channel><min>1.8.0.0</min><max>1.8.0.0</max></package><package><name>Cm_RedisSession</name><channel>community</channel><min>1.8.0.0</min><max>1.8.0.0</max></package></required></dependencies>
+</package>
diff --git a/var/package/Mage_Centinel-1.8.0.0.xml b/var/package/Mage_Centinel-1.8.0.0.xml
new file mode 100644
index 00000000000..ce006871e0a
--- /dev/null
+++ b/var/package/Mage_Centinel-1.8.0.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Mage_Centinel</name>
+    <version>1.8.0.0</version>
+    <stability>stable</stability>
+    <license>mixed</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>3D Secure Card Validation</summary>
+    <description>An integration with Cardinalcommerce Centinel service. Provides option to validate Visa and Mastercard cards for eliminating possible fraudlent order placement attempts. Adds information about Electronic Commerce Identifier, that designates liability for chargeback.</description>
+    <notes>1.8.0.0</notes>
+    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:30:59</time>
+    <contents><target name="magecore"><dir name="Mage"><dir name="Centinel"><dir name="Block"><dir name="Adminhtml"><dir name="Validation"><file name="Form.php" hash="81e7518d6adfeecf8b3b8fe117f8c3b0"/></dir><file name="Validation.php" hash="6360a587192752a772712a581930d562"/></dir><dir name="Authentication"><file name="Complete.php" hash="05ab4cf6c7454d30aa6dcd59b82f1926"/><file name="Start.php" hash="34bfc7ec762ca748c5e023647e608003"/></dir><file name="Authentication.php" hash="8a336e112a39b8fd5cad0336259f4492"/><file name="Logo.php" hash="75cf6f66217efb1986ce0e53536ae0d3"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Centinel"><file name="IndexController.php" hash="49c507c8051b2bc031b8ddb7a4f681c1"/></dir></dir><file name="IndexController.php" hash="067bfe76406db653c84ec9050771242b"/></dir><dir name="etc"><file name="config.xml" hash="338979152761c8c3c36900472091d273"/><file name="system.xml" hash="3e045b43603beaa4bfb425f14d3e708c"/></dir><dir name="Helper"><file name="Data.php" hash="918542a7c996fc0625b2295e51ebd2ce"/></dir><dir name="Model"><file name="Api.php" hash="1bfc586aa36277da00727a95b555e1ca"/><file name="Config.php" hash="db1405f167fbfa82c3c43b4486df4ff5"/><file name="Observer.php" hash="dad0d5857c38447f9c61a905a2bfbff9"/><file name="Service.php" hash="3fc3c2a00339d03a9969d0524ebbb7f0"/><file name="Session.php" hash="643e797d144a27a4d8644059da8eaaf3"/><dir name="State"><file name="Jcb.php" hash="7869be882f17bd0182f76693e1c6e5fd"/><file name="Mastercard.php" hash="d280e0d204d5f19dfceb03d96aaff304"/><file name="Visa.php" hash="594355c95df10d9cd877f2dd6e77ddf2"/></dir><file name="StateAbstract.php" hash="47d5d9dd9bcfc9039dd72fc54b04caf1"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_Centinel.xml" hash="443a339065a107551d2e4308b336c0ab"/></dir></target><target name="mageweb"><dir name="js"><dir name="mage"><dir name="adminhtml"><dir name="sales"><file name="centinel.js" hash="b00cdd0925c9ffc43bb6caaed0b0cb28"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="centinel"><dir name="authentication"><file name="complete.phtml" hash="c747233c15dd9208df2a6e4f61358577"/><file name="start.phtml" hash="32d32bbd6475ac6da23b217b4ee695ab"/></dir><dir name="validation"><file name="form.phtml" hash="727ae7bd5f25c867ad2d47c699b4f8b6"/></dir></dir></dir><dir name="layout"><file name="centinel.xml" hash="daf473ff45825101ac597b0ee64cb7a1"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="centinel"><dir name="authentication"><file name="complete.phtml" hash="b415603cf2541786f09a920d13098029"/><file name="start.phtml" hash="a04ba1e0f59496c432076711c3f693de"/></dir><file name="authentication.phtml" hash="1766a17e2d349d11dec8862e6ced6b50"/><file name="logo.phtml" hash="7d40e9a7603422f8a72ab9a1cb14b417"/></dir></dir><dir name="layout"><file name="centinel.xml" hash="5d491860f275772f6a900f2e451435d4"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Mage_Centinel.csv" hash="20f331c149ccf32faabdd406626805e0"/></dir></target><target name="magelib"><dir name="3Dsecure"><file name="CentinelClient.php" hash="e8459bd7d542e38058529e9bbb27ca25"/><file name="CentinelErrors.php" hash="e99aa9e865cc56beb2cf99d616ff0ceb"/><file name="XMLParser.php" hash="d089f3a81ac81378c889eee73a52f413"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="centinel"><file name="sc_learn_62x34.png" hash="7d6ec4b19f8eeb6baa2cddd5d4274f87"/><file name="v_activate_steps.gif" hash="005312b14c6aed41e8a47c4acaac7c1a"/><file name="vbv_ltbg_71x57.png" hash="324e5de7f6c75dc3cecb61646113ac41"/></dir></dir></dir></dir></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package></required></dependencies>
+</package>
diff --git a/var/package/Mage_Compiler-1.8.0.0.xml b/var/package/Mage_Compiler-1.8.0.0.xml
new file mode 100644
index 00000000000..4b0e309569f
--- /dev/null
+++ b/var/package/Mage_Compiler-1.8.0.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Mage_Compiler</name>
+    <version>1.8.0.0</version>
+    <stability>stable</stability>
+    <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>This module compiles all files of a Magento installation and creates a single include path to increase performance</summary>
+    <description>This module compiles all files of a Magento installation and creates a single include path to increase performance</description>
+    <notes>1.8.0.0</notes>
+    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:30:59</time>
+    <contents><target name="magecore"><dir name="Mage"><dir name="Compiler"><dir name="Block"><file name="Process.php" hash="bdd27073085e9d8aefd5ac4a56fd3a94"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Compiler"><file name="ProcessController.php" hash="ac96b97c938e0c11019ea88e5981745f"/></dir></dir><file name="ProcessController.php" hash="9604147932702196c9ff9800f4b04205"/></dir><dir name="etc"><file name="adminhtml.xml" hash="74bd3c01fc08a2b72831c3157eb01afb"/><file name="compilation.xml" hash="77125ad53ff85e61ad320888546e1b7e"/><file name="config.xml" hash="ac0d1e369a564d01cda1fb1e3e937cb0"/></dir><dir name="Helper"><file name="Data.php" hash="a4f0b87ee0235ef5186a00dafc48773a"/></dir><dir name="Model"><file name="Process.php" hash="fb7a3143435a955d10c652ee253a0d28"/></dir></dir></dir></target><target name="mage"><dir name="includes"><file name="config.php" hash="8400dea44d09cc57209d8a64cdd207d7"/><file name=".htaccess" hash="72617d60821288133a367f70bf39ad93"/><file name=".htaccess" hash="72617d60821288133a367f70bf39ad93"/></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_Compiler.xml" hash="940de89b5bff441cdc8dfe5d9155bf22"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="compiler.xml" hash="831dbe3b9eba16bcca03cd6110eb3537"/></dir><dir name="template"><dir name="compiler"><file name="process.phtml" hash="ff97257336769e703f26cc5a223c4d9c"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Mage_Compiler.csv" hash="caa1d67e6c508421a8c8c234ae204c5d"/></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package><package><name>Mage_Core_Adminhtml</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package></required></dependencies>
+</package>
diff --git a/var/package/Mage_Core_Adminhtml-1.8.0.0.xml b/var/package/Mage_Core_Adminhtml-1.8.0.0.xml
new file mode 100644
index 00000000000..a7bae927912
--- /dev/null
+++ b/var/package/Mage_Core_Adminhtml-1.8.0.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Mage_Core_Adminhtml</name>
+    <version>1.8.0.0</version>
+    <stability>stable</stability>
+    <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>Magento Administration Panel</summary>
+    <description>Magento Administration Panel</description>
+    <notes>1.8.0.0</notes>
+    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:30:59</time>
+    <contents><target name="magecore"><dir name="Mage"><dir name="Adminhtml"><dir name="Block"><file name="Abstract.php" hash="14cb362bffff27094d5d40a2f8d09c3d"/><dir name="Api"><file name="Buttons.php" hash="b88a052c3abd4c1f99763c8bd909b103"/><file name="Editroles.php" hash="97867ad74f00b1aef797f1433847c8e8"/><file name="Edituser.php" hash="4f93c75a7ec99b0b9499ad35a00fd72f"/><dir name="Grid"><file name="Role.php" hash="d096e114c2796b278a24e5f4569a68c9"/></dir><dir name="Role"><dir name="Grid"><file name="User.php" hash="93d8ad3b7a9e9a8d5ff641e2850b1a75"/></dir></dir><file name="Role.php" hash="15921497cd290df469b2685ac03d47e1"/><file name="Roles.php" hash="406b676e8251e7079ff309a205423bbb"/><dir name="Tab"><file name="Roleinfo.php" hash="43d6a8ec894b233ce09b70354ef7e9c7"/><file name="Rolesedit.php" hash="6609e636c5a2af464ef935bb26e8c0dc"/><file name="Rolesusers.php" hash="f9e75f281e23f4c624ee835f073e7ac6"/><file name="Userroles.php" hash="a0ba48a929493dd39f274a2d4cd94244"/></dir><dir name="User"><dir name="Edit"><file name="Form.php" hash="5c91a2e9761c9613379e22656628f4e1"/><dir name="Tab"><file name="Main.php" hash="4cb3bf33f7398181002643b44a214ffe"/><file name="Roles.php" hash="54734fb27a8191aeb0fdc40d9ae6a9fd"/></dir><file name="Tabs.php" hash="6b5f8af76b6cd621540cea52450b02c8"/></dir><file name="Edit.php" hash="e5140eb1a374c30379ea08cf4ab10413"/><file name="Grid.php" hash="513a97062650b07d5e210382f4c10371"/></dir><file name="User.php" hash="9222ec95b7b0bc69f81ba3f759fad714"/><file name="Users.php" hash="36bde29a13236084d6364435a92b5df7"/></dir><dir name="Backup"><file name="Dialogs.php" hash="6e6f3eaa99c455f3836e1ad514d22035"/><file name="Grid.php" hash="747b811a07a9939e51d81ee87a00049a"/></dir><file name="Backup.php" hash="b69dce7ad1c53e642978ae130bc9ef36"/><dir name="Cache"><file name="Additional.php" hash="c5bc97443fec7b8bbcf4a3e2c929df3a"/><file name="Grid.php" hash="bd1d000f2980b1ebe2d83e4762eb2663"/><file name="Notifications.php" hash="388dda202b693036eec27ce5011bcf93"/></dir><file name="Cache.php" hash="d86cbf0e7c22401890fd2b5bb1bec886"/><dir name="Catalog"><dir name="Category"><file name="Abstract.php" hash="1112e6e678d4acd89c0cf37b5b8827e5"/><dir name="Checkboxes"><file name="Tree.php" hash="ccf68799e117733b1e50f494f7597a5b"/></dir><dir name="Edit"><file name="Form.php" hash="b0d6dd61478207b22fad10316e4af4ef"/></dir><file name="Edit.php" hash="38630444c73e55fd5b48bf5c805a0790"/><dir name="Helper"><file name="Image.php" hash="d1b9196f793147820dda51209d872435"/><file name="Pricestep.php" hash="66671a52dcbe6a862942142fa03864b1"/><dir name="Sortby"><file name="Available.php" hash="ad9a6dcc65c192ee1d672328decf4605"/><file name="Default.php" hash="89255ca3c1dbfaf55c7406c1e8927e33"/></dir></dir><dir name="Tab"><file name="Attributes.php" hash="b9cdab71a46ac5b106dde1c7cd12f445"/><file name="Design.php" hash="7c3000ef4a17f72e168b8d0df7f65f0c"/><file name="General.php" hash="50b19c7cbd30d43eab9e6c21fb7ce74e"/><file name="Product.php" hash="b8c0e08335fac58a555ad9b28787eef6"/></dir><file name="Tabs.php" hash="9dcfca19cc9da6130cdf5f636a20c907"/><file name="Tree.php" hash="3cefd2f3f2937f152980ede00d0197c3"/><dir name="Widget"><file name="Chooser.php" hash="df9a1c81afe40ba929a49c19a624cfd3"/></dir></dir><dir name="Form"><dir name="Renderer"><dir name="Attribute"><file name="Urlkey.php" hash="c15687f8541d95b4af15ac8cbb426775"/></dir><dir name="Config"><file name="DateFieldsOrder.php" hash="47d8033c29a49cdec197f71726275793"/><file name="YearRange.php" hash="aa8920d86864f8cac6883482f598ad6e"/></dir><dir name="Fieldset"><file name="Element.php" hash="74abe367d87fbb50b6d8786cda57cc6d"/></dir></dir></dir><file name="Form.php" hash="742e963ac3ce2270b59eb5b0ae716bbe"/><dir name="Helper"><dir name="Form"><dir name="Wysiwyg"><file name="Content.php" hash="87fffa31b7e03c655c3903e26f14b02e"/></dir><file name="Wysiwyg.php" hash="cf81aea12fbc13652a1910e492a238c7"/></dir></dir><dir name="Product"><dir name="Attribute"><dir name="Edit"><file name="Form.php" hash="ccc4f15e4252623ae1d27b7b1d935910"/><dir name="Tab"><file name="Front.php" hash="f9c938a6bee0412f0e5af68171bf0022"/><file name="Main.php" hash="7bbb39a9fe16aaa888f4a62439164019"/><file name="Options.php" hash="3a0279d9246383f8c5e85b481fe4f9a7"/><file name="System.php" hash="5c5cb3c429d273cdc31c27f956d99bfc"/></dir><file name="Tabs.php" hash="4a69bc27f06b870c31f18c27cd75f18b"/></dir><file name="Edit.php" hash="22b444febe618045ab9af8dd9baa3b0d"/><file name="Grid.php" hash="ff8f4d30acfa2f309121dd68e5f167a1"/><dir name="New"><dir name="Product"><file name="Attributes.php" hash="d5381bcb99a6d22529dec268f81bd806"/><file name="Created.php" hash="a4344992672bf2b191d0cf384af94a8e"/></dir></dir><dir name="Set"><file name="Grid.php" hash="fc522805e635a05d80c491b23f621280"/><dir name="Main"><file name="Formattribute.php" hash="9ec94fcbdb0a7c92219d2521e4b708c0"/><file name="Formgroup.php" hash="37231d6065456106e3f7c8c2cf005aa7"/><file name="Formset.php" hash="1a65bb9afc6dcfd3da3bdbcb9c6f420d"/><dir name="Tree"><file name="Attribute.php" hash="b3408bf680934359ad61fb3a1ff03628"/><file name="Group.php" hash="8821cc1f50c9f329074418e0f3d314b1"/></dir></dir><file name="Main.php" hash="1f3f620ab1dc738cbad6cfb714bfa942"/><dir name="Toolbar"><file name="Add.php" hash="e753748a4339fc8ad2ceeae257adf75b"/><dir name="Main"><file name="Filter.php" hash="d298aca345319fedf1585992b7cc8d86"/></dir><file name="Main.php" hash="30e4186060e3a0b1dca3cf26946126a0"/></dir></dir></dir><file name="Attribute.php" hash="45bf06134deae7923f0a7f4533df0a12"/><dir name="Composite"><file name="Configure.php" hash="0784eb10c936a5414c51f529e51ff331"/><file name="Error.php" hash="945d29ecd1de125d6b4ea5fb0b341832"/><dir name="Fieldset"><file name="Configurable.php" hash="48daa4b8b1f69863e4fc83aa246de919"/><file name="Grouped.php" hash="465bcc1d31eb11821340656034408c67"/><file name="Options.php" hash="1b42181fbd64a1de3681389d43de1b38"/><file name="Qty.php" hash="ef10caf49eb55dfeaeacf8f369ad10cc"/></dir><file name="Fieldset.php" hash="6632839adb08b0e6c97de5cbb5de5eb5"/><dir name="Update"><file name="Result.php" hash="b09291d09fab7535574aacf4fa975b63"/></dir></dir><file name="Created.php" hash="259988d8e38f210e3140051a3d59770c"/><dir name="Edit"><dir name="Action"><dir name="Attribute"><dir name="Tab"><file name="Attributes.php" hash="e8b79b8dd9d2893fb19a8b92d8427dc0"/><file name="Inventory.php" hash="1337342385f31ffa5d22e05bb69e411f"/><file name="Websites.php" hash="0182de6100b35b7c0af00d0714dfae08"/></dir><file name="Tabs.php" hash="8f00ecefd9e0104595190f84c7d35787"/></dir><file name="Attribute.php" hash="bd5d105afcf566faaaa25c322d597cf4"/></dir><file name="Js.php" hash="44078b3f7313d60a30bf5dbdfa764dc7"/><dir name="Tab"><dir name="Ajax"><file name="Serializer.php" hash="1b450f5a5a5f5de1ffd2772791f84e17"/></dir><dir name="Alerts"><file name="Price.php" hash="b363ebcb98f6c5c055c2d1e58db64b82"/><file name="Stock.php" hash="f12d0c7736878e28e62c5808bf38ba79"/></dir><file name="Alerts.php" hash="beb1cf5e9f4ef73752a13ed9526f8447"/><dir name="Attributes"><file name="Create.php" hash="6b294d7a4a969d5c8b716fb7000d8d60"/></dir><file name="Attributes.php" hash="4fb21f67cb10a6cfc431534f52748d53"/><file name="Categories.php" hash="cdae4ae6e52fa305df433b8b10b82eb8"/><file name="Crosssell.php" hash="1a9c5d5023d1630a56a426288b88e85d"/><file name="Inventory.php" hash="4c6d52e12379280cd46c77dd1fe0ec2a"/><dir name="Options"><file name="Option.php" hash="a59987c123bae49aee8f0e6f3332d47c"/><dir name="Type"><file name="Abstract.php" hash="51859dac305b92c5fb12b552db46282c"/><file name="Date.php" hash="5670278435db055b5763011935588aa2"/><file name="File.php" hash="00c30b2d5d4aa7cc22b4e453afb875a2"/><file name="Select.php" hash="54867cdac0116e2c5a852653e69c8a7d"/><file name="Text.php" hash="7fb4f3b46adb5c0ec519533092e6dfce"/></dir></dir><file name="Options.php" hash="448dfbf24cd6fafe6a2a179eb10e2018"/><dir name="Price"><dir name="Group"><file name="Abstract.php" hash="9cdf699d4570a0c599f8f4f5e1aed799"/></dir><file name="Group.php" hash="c47f46dcb490443a27c17d7403bcd11f"/><file name="Recurring.php" hash="d0472610e4a387493e9c282942bdf6c8"/><file name="Tier.php" hash="a0a282f951884b0b0cf6e813babafb0c"/></dir><file name="Price.php" hash="46f7d20d3e4e00ebeb5228154792505a"/><file name="Related.php" hash="9d228c80b7489b17e448959f15995e47"/><file name="Reviews.php" hash="b8206b11a3a0a875f59c6383fdc4aaeb"/><file name="Settings.php" hash="49d758cf938b859a87ed88e5ca54cd8f"/><dir name="Super"><dir name="Config"><dir name="Grid"><dir name="Filter"><file name="Inventory.php" hash="ea7cb2f697e8c51beb285492e4a60042"/></dir><dir name="Renderer"><file name="Checkbox.php" hash="955bdd8ce67f3b232e3447e6e3f3f3d2"/><file name="Inventory.php" hash="5b6370ec0ac9682f4ad97eefb10c2524"/></dir></dir><file name="Grid.php" hash="e309831229afdbcf68a6425b476e27b0"/><file name="Simple.php" hash="cb24a075df9ee9c404c71a0cd2ade1ed"/></dir><file name="Config.php" hash="71ff33bcf600fb545d2f27b403cb65d0"/><file name="Group.php" hash="eb57b88bb5a7c09e7b27ccff1105810d"/><file name="Settings.php" hash="abf83b4fa8348b9d1ef470625594c3f6"/></dir><dir name="Tag"><file name="Customer.php" hash="ec07a085255ccdb45c03cc1e9a8dc0f7"/></dir><file name="Tag.php" hash="d02a5da8396370bbac019bdd2bd4e9b6"/><file name="Upsell.php" hash="4fee45193bcc93b46c25510740c938c0"/><file name="Websites.php" hash="8b853e86b29bde0c99811fda3f9a9c4e"/></dir><dir name="Tabs"><file name="Configurable.php" hash="efde18999697c318131f27ca5e572621"/><file name="Grouped.php" hash="7f3439a0ccf81b8a4e7f6ec8b726406b"/></dir><file name="Tabs.php" hash="e28787cb8d8978f351a5e0b5d1b2f022"/></dir><file name="Edit.php" hash="8e83a1b7acfb8fe35d08d9034e21a3e4"/><dir name="Frontend"><dir name="Product"><file name="Watermark.php" hash="62b7cb33879e04a77bebccad63ee525a"/></dir></dir><file name="Grid.php" hash="ede4059c6bca26c58e810c52b9ee18c1"/><dir name="Helper"><dir name="Form"><file name="Apply.php" hash="675987f1d38fce4cb9144c78f117ffa3"/><file name="Boolean.php" hash="c99d1aa6d355e685d184cc108557b80a"/><file name="Config.php" hash="d49b50ee5755e3074fac0f6537419876"/><dir name="Gallery"><file name="Content.php" hash="e1deba14a684451062484a3fae124f1c"/></dir><file name="Gallery.php" hash="fb13d3e1654c33048db19363ae5621a1"/><file name="Image.php" hash="b7a50470db78522f8872710e4af7ed4a"/><dir name="Msrp"><file name="Enabled.php" hash="b45025ff3d16c566cd664d2d9350fd4b"/><file name="Price.php" hash="f4c522fecdd1e565b6c9a87318346d03"/></dir><file name="Price.php" hash="73f7da319d1eb13badea41ddb5bf04de"/><file name="Weight.php" hash="7f39529754ca42688407b5ad0a4f4e80"/></dir></dir><file name="Price.php" hash="a4f2ee075e1086eacb613981e9ee2658"/><dir name="Widget"><dir name="Chooser"><file name="Container.php" hash="5fe5ff2288fed89d37647efe3b372864"/></dir><file name="Chooser.php" hash="c1de913e4d4b6e1a120cdcb349b3d112"/></dir></dir><file name="Product.php" hash="9f690c50a78f178ebf4344904c6c5a92"/><dir name="Search"><dir name="Edit"><file name="Form.php" hash="33ec365913b607598ff047c0f337f4c7"/></dir><file name="Edit.php" hash="c26b273a575cf62515e39ae8658faeea"/><file name="Grid.php" hash="0d2026341e706c5e2ff5fe9704525079"/></dir><file name="Search.php" hash="12fd8b56295b279a62e687ddc7f64747"/></dir><file name="Catalog.php" hash="2c8497e22f59c8e804a917d36d5ad977"/><dir name="Checkout"><dir name="Agreement"><dir name="Edit"><file name="Form.php" hash="2b0f1e7e7ff642107a4c64ced9c8cc92"/></dir><file name="Edit.php" hash="78ac4bd7b13e7d1ac2cf3cf6ad2b48e0"/><file name="Grid.php" hash="343a879d649448b08d4369068e9c448b"/></dir><file name="Agreement.php" hash="10d76b08239b43c3ef47c2e3c67c7335"/></dir><dir name="Cms"><dir name="Block"><dir name="Edit"><file name="Form.php" hash="ffaa5799e9992cc09fe4a678a1badb6c"/></dir><file name="Edit.php" hash="793afd1e9c8f8a6bb946ac6e2f16c767"/><file name="Grid.php" hash="1b5955a1894ae99cb97c9bd658140f83"/><dir name="Widget"><file name="Chooser.php" hash="c88cddd4fa1fc3a46d153b9d37dcb74a"/></dir></dir><file name="Block.php" hash="af60e48d124808aaecf583c807e93b39"/><dir name="Page"><dir name="Edit"><file name="Form.php" hash="0b9c963b53dec1b432ecd43bcce23c3c"/><dir name="Tab"><file name="Content.php" hash="4b23915762aae0ff0633ebb194ca7f9c"/><file name="Design.php" hash="b51f81b488a19c6e65251e2da8ffb313"/><file name="Main.php" hash="190ff9649974dfa81159753f5d0b8a2f"/><file name="Meta.php" hash="a1d981ba7dccdcffd177cd987cb970cf"/></dir><file name="Tabs.php" hash="3e9aa8e45f415ed28ecf1028fba18653"/></dir><file name="Edit.php" hash="da702114c7f9ada67916cc30d8bc9796"/><dir name="Grid"><dir name="Renderer"><file name="Action.php" hash="0d36fdbc56100784b74977ae73c1ed7b"/></dir></dir><file name="Grid.php" hash="f7beb17eba61dfcac691942ac274065f"/><dir name="Widget"><file name="Chooser.php" hash="4e703c779233062862a6ba7b9bcac700"/></dir></dir><file name="Page.php" hash="2be7d92a7dd5fddb99370eb9781983ed"/><dir name="Wysiwyg"><dir name="Images"><dir name="Content"><file name="Files.php" hash="357f07252b79a0c80a6e6b8f043a825b"/><file name="Newfolder.php" hash="cb6b50354a192e43e079f5af003b00cb"/><file name="Uploader.php" hash="a52b83fa44051cbda35ef49952cc1991"/></dir><file name="Content.php" hash="b72e8c3b9bee8f46fc7c609da85e669f"/><file name="Tree.php" hash="15810fd1150a4ecd88871b436fe003be"/></dir></dir></dir><dir name="Customer"><dir name="Edit"><file name="Form.php" hash="7163f1239491b5d5451802b0fe26e65e"/><dir name="Renderer"><dir name="Attribute"><file name="Group.php" hash="b4b59b9fbfc18e349200dfbae813caef"/></dir><file name="Newpass.php" hash="bebe934efbb0abdeec30ea5b4290dbe7"/><file name="Region.php" hash="8020a6171db9c85473d97d96d6c048b0"/></dir><dir name="Tab"><file name="Account.php" hash="3e460eb76c82c1a465032ca7d1da3fda"/><file name="Addresses.php" hash="be6930630b2d5837c611fef87f610fe6"/><file name="Cart.php" hash="a7a818f2d0793a6b429705411c8be7d0"/><file name="Carts.php" hash="d8473761d22e1c2d360d1d3e0973c7ca"/><dir name="Newsletter"><dir name="Grid"><dir name="Filter"><file name="Status.php" hash="403ec26afaaa5d2ee144c7cc2cb87a14"/></dir><dir name="Renderer"><file name="Action.php" hash="b4aa613945bfc4c6f8be7fcbfbbca3b8"/><file name="Status.php" hash="d4d1a2bf5984c09f1faf51688d89102c"/></dir></dir><file name="Grid.php" hash="6da41f1dffe7a8c1955cfcac60ad22a8"/></dir><file name="Newsletter.php" hash="40e1737f72103e67ea4cee7aa62d18aa"/><file name="Orders.php" hash="a7d5ae033fe46990f0719fd96dd9715a"/><file name="Reviews.php" hash="a31fc211d7c6d27d6dda801ea8d0892c"/><file name="Tag.php" hash="51dfc3e50fe857b5b2153c087a171037"/><file name="Tags.php" hash="1bfed4615b2a8f0baa64fe030cf449b9"/><dir name="View"><file name="Accordion.php" hash="2dd9b05b154cea0dabf30a5f6fa8c831"/><file name="Cart.php" hash="6282a3a2ee476d4014de5e24156a663f"/><dir name="Grid"><dir name="Renderer"><file name="Item.php" hash="c1e9329b6a726d92504914687d7171f7"/></dir></dir><file name="Orders.php" hash="e2c7bbdd3e924dae411da352a967b8fe"/><file name="Sales.php" hash="be7d50b2cfa68c5c94c969da9b987ac3"/><file name="Wishlist.php" hash="69e7fb0df89c410daab955f04dd70ac4"/></dir><file name="View.php" hash="d45cc800e0d29164b4a0568e5f200804"/><dir name="Wishlist"><dir name="Grid"><dir name="Renderer"><file name="Description.php" hash="02931c040a80d0bfe719763f648b7c35"/></dir></dir></dir><file name="Wishlist.php" hash="f50d5b09c0f38ba510fd71bc7e95fc0f"/></dir><file name="Tabs.php" hash="4d248cbcc82b95796dc2078b3753eb14"/></dir><file name="Edit.php" hash="a98f296115c00a2d59d033447709c2b4"/><dir name="Form"><dir name="Element"><file name="Boolean.php" hash="e6da8b6c3504197a3effe2beda8879d2"/><file name="File.php" hash="938a3345843258f90e74104a954bbfba"/><file name="Image.php" hash="9b88bca33c77eca116c7455e4bffba3e"/></dir></dir><dir name="Grid"><dir name="Filter"><file name="Country.php" hash="67f2cca4eca2212f80b7b84b7547554f"/></dir><dir name="Renderer"><file name="Multiaction.php" hash="de08e6cd2cf21b78a672ee44c10ede45"/></dir></dir><file name="Grid.php" hash="ca3a015399ffecab96d70572ca3d7525"/><dir name="Group"><dir name="Edit"><file name="Form.php" hash="163e3d6542ffc919a8e865660662fcc5"/></dir><file name="Edit.php" hash="9222090ba1539bd872593ba2dd4d7cbd"/><file name="Grid.php" hash="618135a3d0614fe00af29ea9c6f535d4"/></dir><file name="Group.php" hash="b3d390228b5508deae5e61d60754177f"/><dir name="Online"><file name="Filter.php" hash="0088b1768bb5e8f1f2a74877faaf7c22"/><dir name="Grid"><dir name="Renderer"><file name="Ip.php" hash="09be79e4961433db4d76d870ea0050d2"/><file name="Type.php" hash="b1b1f709d41bd6d2631be57870c6b4f5"/><file name="Url.php" hash="d92d55396ee11ac29c3637c4b82a96bd"/></dir></dir><file name="Grid.php" hash="8eb99587d67117a30190aad1b52eb311"/></dir><file name="Online.php" hash="121f09da47bec7e5cca6baa14965033f"/><dir name="Sales"><dir name="Order"><dir name="Address"><dir name="Form"><dir name="Renderer"><file name="Vat.php" hash="acba77ceb6bffe8c668bec145ba41943"/></dir></dir></dir></dir></dir><dir name="System"><dir name="Config"><file name="Validatevat.php" hash="f2ed3d595c50354946d6fcf41c71510e"/></dir></dir></dir><file name="Customer.php" hash="6d6d5e87baf467ebda1d267318f4074a"/><dir name="Dashboard"><file name="Abstract.php" hash="a36dc104c3400a56916452ce633c8011"/><file name="Bar.php" hash="1bf3a24629af068f059bb654b7c16eff"/><file name="Diagrams.php" hash="8d0f4c71ae0d2856f145967e2f156fe2"/><file name="Graph.php" hash="8c30fa033cec29ca79d7e79be16b3fa5"/><file name="Grid.php" hash="23aa358c30bc8a6edc36f50986105326"/><file name="Grids.php" hash="24c947c6d70ac5d5f985812ee77bc0bc"/><dir name="Orders"><file name="Grid.php" hash="4ecd91c21006047b8e8c4e92c7238917"/></dir><file name="Sales.php" hash="8fb1120b5b3176865377f2b1d7a00eb3"/><dir name="Searches"><file name="Last.php" hash="3e640538917ea8de44bb76e921a7a0e6"/><dir name="Renderer"><file name="Searchquery.php" hash="a4bf4f1c263a580a0466e0393ed8ed47"/></dir><file name="Top.php" hash="387cb6d3a30fe9e8d369f37b285b2e4f"/></dir><dir name="Tab"><file name="Amounts.php" hash="b06bead5a575bf0f36e2bb2b6b357d74"/><dir name="Customers"><file name="Most.php" hash="51e07baa4e78d9698b59f787df2a9c77"/><file name="Newest.php" hash="2b1dc0a542b5e9f17fd735ea431b43f2"/></dir><file name="Orders.php" hash="ce4d338a75a4396cda3f888be5769d3b"/><dir name="Products"><file name="Ordered.php" hash="cb34feff3a85b39efbad6503d5d0fb36"/><file name="Viewed.php" hash="de39b81a7a7e0f15cbac7d45af9704ef"/></dir></dir><file name="Totals.php" hash="06af3a4eb34ee58e2e0abc8de2d06289"/></dir><file name="Dashboard.php" hash="fb6b29885f8fff4dbb214a25477ce539"/><file name="Denied.php" hash="4fec62f2e6a8058c7a07517e690fd3f9"/><dir name="Html"><file name="Date.php" hash="2f84ad9b99a205a4dc15529cc2e21fe6"/><file name="Select.php" hash="ecbfc8969ba69152c6342e336a10b9a3"/></dir><dir name="Media"><file name="Editor.php" hash="bd8c864a18d0f0132127b40697fb8f94"/><file name="Uploader.php" hash="200c48716d2a34619e43284c37fc6da2"/></dir><file name="Messages.php" hash="0a29c702e281b4de7df1a038a51e390d"/><dir name="Newsletter"><dir name="Problem"><dir name="Grid"><dir name="Filter"><file name="Checkbox.php" hash="da7f694ce51e4916dce9d89a630f7760"/></dir><dir name="Renderer"><file name="Checkbox.php" hash="db05e0b64ade0c37fa1163716280a8a1"/></dir></dir><file name="Grid.php" hash="94396e38a63eab9a9f5b099c80dc140c"/></dir><file name="Problem.php" hash="7e5060913521778cc8c400cca198d340"/><dir name="Queue"><dir name="Edit"><file name="Form.php" hash="2f6f7944479d267334d71681db0236fd"/></dir><file name="Edit.php" hash="7413b36133d3e06137ef8081c44003e2"/><dir name="Grid"><dir name="Renderer"><file name="Action.php" hash="63d1ff52a759c3051c7689af81597cd3"/></dir></dir><file name="Grid.php" hash="3a950bf2f862429fb7fa344c4c087c32"/><dir name="Preview"><file name="Form.php" hash="ea77143e1acf70d5459077bdd3cb1f38"/></dir><file name="Preview.php" hash="4a9e6415bef952f6effc01e1ea9d31ec"/></dir><file name="Queue.php" hash="3dd36b863c30121aa8608fa56b168766"/><dir name="Subscriber"><dir name="Grid"><dir name="Filter"><file name="Checkbox.php" hash="4b6e4ed38f3882ea8c1fe70e67dc784f"/><file name="Website.php" hash="0794bd7ebe6eb00347879b7591b72fca"/></dir><dir name="Renderer"><file name="Checkbox.php" hash="ed639b27a8fe8f7caa01a5b3045610ba"/></dir></dir><file name="Grid.php" hash="264b5ae7ca64abb48adb9372cce5e5ba"/></dir><file name="Subscriber.php" hash="413e7c5740af2647c7d87fb16a7cafd6"/><dir name="Template"><dir name="Edit"><file name="Form.php" hash="c2502e6ee49d578b7379052b1449100c"/></dir><file name="Edit.php" hash="0ea688d39e042db79823133dfc34d57d"/><dir name="Grid"><dir name="Renderer"><file name="Action.php" hash="f05d436b05872aca71a056957c40214a"/><file name="Sender.php" hash="10094ac7718d48e6082caa3a03f8eeac"/></dir></dir><file name="Grid.php" hash="151e05ba5fd9d782b48f2880680be89c"/><dir name="Preview"><file name="Form.php" hash="c50956932c646bbcce873b5277a499c2"/></dir><file name="Preview.php" hash="de8aed06b3b9d7f84e0baceffb859c8d"/></dir><file name="Template.php" hash="4e87e1680cedec541ab20ee5097d3f8c"/></dir><dir name="Notification"><file name="Baseurl.php" hash="ed669430401d7e99a76ebdea2d73af7e"/><dir name="Grid"><dir name="Renderer"><file name="Actions.php" hash="cdbe2a01a1f5dc1404f5096e9629d56c"/><file name="Notice.php" hash="db7c7cc37eae9ed2b51dc64d67f7ee1d"/><file name="Severity.php" hash="8cd84e7f55f25abf0615cdb11713f080"/></dir></dir><file name="Grid.php" hash="7e2906df85f9450a4eff595818f25936"/><file name="Inbox.php" hash="efd6fffbc059667116257e5123da7118"/><file name="Security.php" hash="2a2844968b92349f6db64fa9829b368c"/><file name="Survey.php" hash="4404541e27c4531b80e4a6982b01fd1b"/><file name="Toolbar.php" hash="97abf0069682d6f2930ad6b483701268"/><file name="Window.php" hash="5b9bae6b0d0c261f2bff366c5de8adaa"/></dir><dir name="Page"><file name="Footer.php" hash="e392f1aaa1f61ef43c1e2a4882bf18e6"/><file name="Header.php" hash="431f28c73ae1725bb285fdabfa14bb01"/><file name="Head.php" hash="9aaff3c4e142619ea3043b0ab9313103"/><file name="Menu.php" hash="42ca2782f613336e4d9dc269ea507610"/><file name="Notices.php" hash="96ecf97e216c865366373fc875a90f76"/></dir><file name="Page.php" hash="9e0b034ec13fee581c4383158e6b2fe3"/><dir name="Permissions"><file name="Buttons.php" hash="ecf2014403ac043ab4e75d8a5ce13d6a"/><file name="Editroles.php" hash="c52b46cb6826770ad1cd86552f9436e2"/><file name="Edituser.php" hash="c63a0e2f336a34b719ee7f8e98a43d95"/><dir name="Grid"><file name="Role.php" hash="18a8e32ef7e8756bc53985ba71c7b305"/><file name="User.php" hash="9f00f22ea0dee6457b551365c406152d"/></dir><dir name="Role"><dir name="Grid"><file name="User.php" hash="29d2961cd85be771217b13c6d7994b65"/></dir></dir><file name="Role.php" hash="71d68b364bce13cec8b07b45ed2b45d9"/><file name="Roles.php" hash="40ca7b6cfd4a0b8b52ac350b2f993b3f"/><dir name="Tab"><file name="Roleinfo.php" hash="fb6a692dde5a500b36deef24a309ff40"/><file name="Rolesedit.php" hash="ae1797aa3103efc14a19cf0ca606a23e"/><file name="Rolesusers.php" hash="bcd8644fcacefd8d63d781ed95237d4a"/><file name="Useredit.php" hash="16da77fc23483aa3727cbac8194ed705"/><file name="Userroles.php" hash="b25a1526b328eaec65b56d5d066f0734"/></dir><dir name="User"><dir name="Edit"><file name="Form.php" hash="14a72b79040e7c96a7d78861fca48a26"/><dir name="Tab"><file name="Main.php" hash="9b02a7d52f4fa832ed9397a87887c7a0"/><file name="Roles.php" hash="0c6a68836763efd4a3567223b5264465"/></dir><file name="Tabs.php" hash="594015aafd5b4c43e1ef38355638c6f0"/></dir><file name="Edit.php" hash="62c908fad037ac02689ab4a1fa8f3fed"/><file name="Grid.php" hash="96782741949a6b5b71107615eaa399fa"/></dir><file name="Usernroles.php" hash="d10a1612394b106e1e162a985939a54b"/><file name="User.php" hash="075580423ad9317288648f46d8e4dbcb"/><file name="Users.php" hash="aa22bace6247915ed3bef9df1f7ee6d7"/></dir><dir name="Poll"><dir name="Answer"><dir name="Edit"><file name="Form.php" hash="9a540c458f849f9f8a1c5f1216d1bb1f"/></dir><file name="Edit.php" hash="564f062fd0538a86e6742d7f49e90708"/></dir><dir name="Edit"><file name="Form.php" hash="978eb9aadd8408502eeb89864ae875f3"/><dir name="Tab"><dir name="Answers"><file name="Form.php" hash="1bc8dffb03fda161ecfe02202c622cae"/><file name="Grid.php" hash="ea340816c6505d1172142d666d39315e"/><file name="List.php" hash="2e854f8f725b372e57318eaa57ff59ae"/></dir><file name="Answers.php" hash="926e09cf27de1291fb95c1bf7fb5df68"/><file name="Form.php" hash="68ff275b1fa52e7c40ae19dc51d0d10e"/></dir><file name="Tabs.php" hash="57dbf9318b9d695bf14d679b88c89933"/></dir><file name="Edit.php" hash="db220c4c513edc1a1a71077b057db253"/><file name="Grid.php" hash="085dd44aed93cd1a4e6cd25d26be1169"/><file name="Poll.php" hash="02b909547f48814624ecd10b3c791813"/></dir><dir name="Promo"><dir name="Catalog"><dir name="Edit"><file name="Form.php" hash="ef420b8b7a63d7c63b1cfb03424568c8"/><file name="Js.php" hash="d864a4d0feee20c815e861a1d5ae0824"/><dir name="Tab"><file name="Actions.php" hash="07b9a6ed88b76faf7bfc797ee3058082"/><file name="Conditions.php" hash="5520f7fad26b32c9b43ef61c9cf3e553"/><file name="Main.php" hash="ce0c35fe91b7076ba845589ecd91e1eb"/></dir><file name="Tabs.php" hash="b66c0a1928f4651a9b217752cb636e6c"/></dir><file name="Edit.php" hash="74730b4f241f98c6cd42e15d72ea3d03"/><file name="Grid.php" hash="efa2ad1c81ad569a40f3ef5f745f39c3"/></dir><file name="Catalog.php" hash="57bfb7a27d987bc2628e21f915fe0f07"/><dir name="Quote"><dir name="Edit"><file name="Form.php" hash="f6864f70badbad2ee38fd7491d1825d4"/><dir name="Tab"><file name="Actions.php" hash="9aa7da2f6c5a1c8b4b20b2df422cb045"/><file name="Conditions.php" hash="7fb38c723f410065058f53dd057d1833"/><dir name="Coupons"><file name="Form.php" hash="546d893cf82faa870f8b25846e43979a"/><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="Used.php" hash="88cfb7fe30734b3db14196cc441bc6f8"/></dir></dir></dir><file name="Grid.php" hash="19787770d519f7ef91a403265f00e8cd"/></dir><file name="Coupons.php" hash="ea2aa8ed16ab2ebafdeee8bf410f3756"/><file name="Labels.php" hash="977dd120bf6ac8e6b01e5e5b3c1e75c2"/><dir name="Main"><dir name="Renderer"><file name="Checkbox.php" hash="20dc7c993a2adbd905b1527d92334cce"/></dir></dir><file name="Main.php" hash="96e4d03680f8db8f6667ab834c145bf6"/></dir><file name="Tabs.php" hash="69dccedaa48caaed4d06a61a3c9698a7"/></dir><file name="Edit.php" hash="5b3b3f86eb275bb4ff32d6d1444d58ab"/><file name="Grid.php" hash="35dd1fc3dd29c441d2cb51910474ea39"/></dir><file name="Quote.php" hash="97971c68e20338d3a3a24e6a81fb0e95"/><dir name="Widget"><dir name="Chooser"><file name="Daterange.php" hash="577c34b3b1339bfdffcfd0f782758bea"/><file name="Sku.php" hash="94889cdaae2a6fb79c5058c085518d53"/></dir><file name="Chooser.php" hash="1f009ebd37b1a62cfbc9e63a82c53f90"/></dir></dir><dir name="Rating"><dir name="Edit"><file name="Form.php" hash="430121d5ed0eb10ae6323f10f16ecf1e"/><dir name="Tab"><file name="Form.php" hash="1f5e43627940d5b893d13471a5e9bbec"/><file name="Options.php" hash="090a7dd0e0ab742e8c18552089b5245c"/></dir><file name="Tabs.php" hash="e256cb896c3f975e06eb3696e660494f"/></dir><file name="Edit.php" hash="01298c0d33ea52ef7f18335126dbcb30"/><file name="Grid.php" hash="70acebd0de58b5abc2feb70c14469152"/><file name="Rating.php" hash="fde8997d4eef64d0e505bead4b2b859d"/></dir><dir name="Report"><dir name="Config"><dir name="Form"><dir name="Field"><file name="MtdStart.php" hash="44f27dfadbdc65aca58662c9cfbd7bf4"/><file name="YtdStart.php" hash="f181c04a401a981abb3f76c9fd097c32"/></dir></dir></dir><dir name="Customer"><dir name="Accounts"><file name="Grid.php" hash="3f003382d54451bbebe9b17749264b12"/></dir><file name="Accounts.php" hash="c7a860194ab322bfee42156f03bfff5b"/><dir name="Orders"><file name="Grid.php" hash="1d927e20db8ee28c68d86acc16d97244"/></dir><file name="Orders.php" hash="e1f3092b2e08fbcfff3d338c64da6c8c"/><dir name="Totals"><file name="Grid.php" hash="fa9ca8d598493c86c3c324d905bdbce3"/></dir><file name="Totals.php" hash="40d2ce448285c3838a799137c3399bbb"/></dir><dir name="Filter"><file name="Form.php" hash="62fe6c9667c81dd6b5fa51eae4bd0f08"/></dir><dir name="Grid"><file name="Abstract.php" hash="95bbf048dd79b7d3e44045aa902c082f"/><dir name="Column"><dir name="Renderer"><file name="Blanknumber.php" hash="debf137c7adf1b62ae716c6251aa5bf4"/><file name="Currency.php" hash="cc408af6e96cfd241bdb43420a2371a8"/><file name="Customer.php" hash="4cd1282a9ccadf4b947c7e8db0a64a28"/><file name="Product.php" hash="a61575514229da9c22908bb27a310b28"/></dir></dir><file name="Shopcart.php" hash="bd3c7a8b5dcc1d829649b711b9a63773"/></dir><file name="Grid.php" hash="7ef17e39ad8115cdd6c43308325b63c5"/><dir name="Product"><dir name="Downloads"><file name="Grid.php" hash="f67179386a2798d4996045d16e0cb4ba"/><dir name="Renderer"><file name="Purchases.php" hash="1179574d3f272078af71e89a16d54cc4"/></dir></dir><file name="Downloads.php" hash="5cffca76e018bf7b11db69a951357466"/><file name="Grid.php" hash="e191dd17a1f14c390f58749ae5cf070f"/><dir name="Lowstock"><file name="Grid.php" hash="6778017c010cc9f79e9c7c53a94408bd"/></dir><file name="Lowstock.php" hash="164ba3126eb226f26c1f712873a8af2d"/><dir name="Ordered"><file name="Grid.php" hash="3ce0dac7257356f978152453db5d04f5"/></dir><file name="Ordered.php" hash="3017610110ea5d7621cf2bdcf9db81e4"/><dir name="Sold"><file name="Grid.php" hash="8516b82102d49da16fb6947cdb1171f8"/></dir><file name="Sold.php" hash="3c30831e84f811ae84963156cf9953bf"/><dir name="Viewed"><file name="Grid.php" hash="181ed980ec96072f52dcb775c45e894c"/></dir><file name="Viewed.php" hash="272d6ed097974db758c389d082a53286"/></dir><file name="Product.php" hash="8fd09b2628eebb2c354f0ba16d49ba91"/><dir name="Refresh"><dir name="Statistics"><file name="Grid.php" hash="e8f4227a66117f0659fbcb39129dac09"/></dir><file name="Statistics.php" hash="404ba5b889697e4781275ead89beb1c5"/></dir><dir name="Review"><dir name="Customer"><file name="Grid.php" hash="32847c1a51df06bd55da6ef8038ee2d2"/></dir><file name="Customer.php" hash="a1c8daf984a870daa61e93b303c9c971"/><dir name="Detail"><file name="Grid.php" hash="96798ccd432c60de49e952e38e1255a4"/></dir><file name="Detail.php" hash="e1079aa0c7fc23917efeca7bfbf92772"/><dir name="Product"><file name="Grid.php" hash="bcd96fb23bb3a46b79c95e402c103250"/></dir><file name="Product.php" hash="9c96863d2ecac7b97bb51c9e690d2a6f"/></dir><dir name="Sales"><dir name="Bestsellers"><file name="Grid.php" hash="6da7947e5d4bbdc3231b5dfa4fa384c5"/></dir><file name="Bestsellers.php" hash="0eb48b01584454b645bc85910d8252b9"/><dir name="Coupons"><file name="Grid.php" hash="133ba4ace7598339ae336379dc2c43e7"/></dir><file name="Coupons.php" hash="409bb4ff9e83b09666c8d756c488dc5c"/><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="Date.php" hash="927cb353a3528ebe1db09dd7e51eaa9a"/></dir></dir></dir><dir name="Invoiced"><file name="Grid.php" hash="d0e8ebb2a05b444ed91756fd8ed7bc2b"/></dir><file name="Invoiced.php" hash="51bdc596c652873d82e5e005f21af65b"/><dir name="Refunded"><file name="Grid.php" hash="892eec6453923f4526bc462c115a3d19"/></dir><file name="Refunded.php" hash="8eabd6bd8495ad2e64114cbd9891785a"/><dir name="Sales"><file name="Grid.php" hash="7bd6cd702f50888d1685568b62fab707"/></dir><file name="Sales.php" hash="77bb1a42e11aa46700544e036b1d35ea"/><dir name="Shipping"><file name="Grid.php" hash="dd774bbb4a3458afb40e8eb5fd651e87"/></dir><file name="Shipping.php" hash="0c86a66f6f87f69bc64b9e813284be78"/><dir name="Tax"><file name="Grid.php" hash="4c324ae338298c65c06c62500ace762a"/></dir><file name="Tax.php" hash="201b9e0e1c7a3a4edfe65b1d901189be"/></dir><dir name="Search"><file name="Grid.php" hash="c26ec785a1e350bc1450daba4d538f46"/></dir><file name="Search.php" hash="07be064721f7ac978c1fb1c299dbe9c2"/><dir name="Shopcart"><dir name="Abandoned"><file name="Grid.php" hash="bd4ae49600d0efabda1b0ebffba3286d"/></dir><file name="Abandoned.php" hash="ca00120c7eada02d16024e7f1e05c177"/><dir name="Customer"><file name="Grid.php" hash="26c05e5cd6278f90715aab8bc23a3007"/></dir><file name="Customer.php" hash="600f168aec42adaf952c192262bd0920"/><dir name="Product"><file name="Grid.php" hash="dd226d7e189873c0eaa730a1c87ebf26"/></dir><file name="Product.php" hash="e028e99a7aaa222caf3c55083b66ae4a"/></dir><dir name="Tag"><dir name="Customer"><dir name="Detail"><file name="Grid.php" hash="b974045ed1560194cca1b14e49910dad"/></dir><file name="Detail.php" hash="5dd18c4c984e8381b50d8fc8c1e8c4af"/><file name="Grid.php" hash="bf553cc6bf6b62b750417f3675054164"/></dir><file name="Customer.php" hash="12750f521d729ffff5b8f4a20e5644b4"/><dir name="Popular"><dir name="Detail"><file name="Grid.php" hash="b8ca4e406bb5a7f0270b5373e67aefba"/></dir><file name="Detail.php" hash="3de19477e41a514f30d8f55b6ead9fa9"/><file name="Grid.php" hash="c9c3f36fff6025b39c2f1e6901264573"/></dir><file name="Popular.php" hash="174f00f41bbb895ff51a475d0fb992de"/><dir name="Product"><dir name="Detail"><file name="Grid.php" hash="621974317f3703a2bdeace084c90e9e3"/></dir><file name="Detail.php" hash="b1441fe912c951295154d9049d2041ea"/><file name="Grid.php" hash="470b8a360f3c3a12cc39a5448784480e"/></dir><file name="Product.php" hash="9f42acb7cdb9ff5570366531d4eda76f"/></dir><dir name="Wishlist"><file name="Grid.php" hash="ca98a205f7bf889357ed448f8c34f0dc"/></dir><file name="Wishlist.php" hash="a7bf6cbea34d3b466756318bfa3663c1"/></dir><dir name="Review"><dir name="Add"><file name="Form.php" hash="bf4e0963b93994a4ea31225b22edf2c6"/></dir><file name="Add.php" hash="16b8c9cdde11db0ab72b892f8f7606f4"/><dir name="Edit"><file name="Form.php" hash="3f5074f9bcd6082953ab1b68c101c3e3"/></dir><file name="Edit.php" hash="aea02cddaad078ee62058f77f4ffb6b7"/><dir name="Grid"><dir name="Filter"><file name="Type.php" hash="387b73dcecb38a4a347eecb07e448585"/></dir><dir name="Renderer"><file name="Type.php" hash="84dc97e3885d4df68b35ef7a3abe9001"/></dir></dir><file name="Grid.php" hash="cb254d7bce58d7990f13b2e238526b27"/><file name="Main.php" hash="1579e82e9a27cfd2cc5caa5ca4e8de88"/><dir name="Product"><file name="Grid.php" hash="1a9447b2465999bc2223ad9485dd5694"/></dir><dir name="Rating"><file name="Detailed.php" hash="2b5c4e709af8ed1df7c57b5b962b576e"/><file name="Summary.php" hash="6186544ce23c9584688a93246db67316"/></dir></dir><dir name="Sales"><dir name="Creditmemo"><file name="Grid.php" hash="dc61484b0588009d332f7c4a3b800841"/></dir><file name="Creditmemo.php" hash="ffe836b370a615ea01397bddf01f11c5"/><dir name="Invoice"><file name="Grid.php" hash="656819e8fc696410454cd0f2a4c1b409"/></dir><file name="Invoice.php" hash="5975815d6b56700822ca0e12d5454f57"/><dir name="Items"><file name="Abstract.php" hash="d570fa035c4cdf8d63f81524b5e9e083"/><dir name="Column"><file name="Default.php" hash="61ea8aa52392cec5de9f33798ce295a6"/><dir name="Name"><file name="Grouped.php" hash="3d87444eed40e68d9ad189d409b3e4ee"/></dir><file name="Name.php" hash="974129ef40a57fed70f53680b7078ec5"/><file name="Qty.php" hash="ccac172ac7e2d81cc96b85708dc5c49e"/></dir><dir name="Renderer"><file name="Configurable.php" hash="9ea19d9bee45a483ceac6f0699e9b06b"/><file name="Default.php" hash="ccc7a9994a62c6021a8156ad86df9c4b"/></dir></dir><dir name="Order"><file name="Abstract.php" hash="ec2c96e71b4c4de477b9ed9da8edd7a6"/><dir name="Address"><file name="Form.php" hash="32b4be23563bdaa58134cf578996c43a"/></dir><file name="Address.php" hash="0779f4b970daf3e147cba8d0910db5a4"/><dir name="Comments"><file name="View.php" hash="14c698dc1e4d42ae70690fe753ea8e4d"/></dir><dir name="Create"><file name="Abstract.php" hash="74ae162e8cee0a7cc92d17cf8d56866d"/><dir name="Billing"><file name="Address.php" hash="22283077b3d10f5c472899b3de3f1249"/><dir name="Method"><file name="Form.php" hash="ab8b309840407ffe9d962f5cfc6f53b1"/></dir><file name="Method.php" hash="93a8d7566b24d082cfdd094ae2474501"/></dir><file name="Comment.php" hash="dca3b9934829f4e888de3f6d94c2aa6d"/><dir name="Coupons"><file name="Form.php" hash="1fca56321fc5ab2dfd60170963d5885d"/></dir><file name="Coupons.php" hash="9e2a86f46919a8e1d2109dcf554c2259"/><dir name="Customer"><file name="Grid.php" hash="572a672850a0ef6fa457391bab514069"/></dir><file name="Customer.php" hash="126e1e675d3e0e55fa1534d8d80bb158"/><file name="Data.php" hash="14a6a084c95e113d4970f9b692c95bc5"/><dir name="Form"><file name="Abstract.php" hash="54111d57141c005fdc6c8e47eaa719d4"/><file name="Account.php" hash="3edb9d85ee53623af6a9afd2404cee9a"/><file name="Address.php" hash="b8741a14578949121e888b29c4135e6f"/></dir><file name="Form.php" hash="f4a35158033fff56c9b91a202b0c3f77"/><dir name="Giftmessage"><file name="Form.php" hash="dfcb7a46124ef3f2a84ecfdd34c71c91"/></dir><file name="Giftmessage.php" hash="da0a10fc1e8ebf61ecf6fe99620b8b26"/><file name="Header.php" hash="87958e201a91352c465236f683f6797c"/><dir name="Items"><file name="Grid.php" hash="c3db64f8a23244765fa8e747c084e578"/></dir><file name="Items.php" hash="0c1a43756a7fabdc6d58f7b6ebf4274e"/><file name="Load.php" hash="c33d51c647b7dfb331b40d2e9555ced5"/><file name="Messages.php" hash="d49f5057d43621acf58652e7987df918"/><dir name="Newsletter"><file name="Form.php" hash="7fafc7311e15204f092a3cac1f727ae1"/></dir><file name="Newsletter.php" hash="db41296072cbc669f9a818c18aad274b"/><dir name="Search"><dir name="Grid"><dir name="Renderer"><file name="Giftmessage.php" hash="b5065591ca844c05b6cb2ea66d0c8293"/><file name="Price.php" hash="5c3a94df24c5ff39ba28924886894fda"/><file name="Product.php" hash="392ca6ca4bdba0a557b00b7347513bc2"/><file name="Qty.php" hash="9785a0f427454b315212dc5457d960d1"/></dir></dir><file name="Grid.php" hash="84d400c7a85e3f7507616331a068f476"/></dir><file name="Search.php" hash="9ac6c1aa7e483ff674b29da4035a51b5"/><dir name="Shipping"><file name="Address.php" hash="61400acd6e41214eec61928b912d65a6"/><dir name="Method"><file name="Form.php" hash="f4c5754c60e197e9cc569d507f99d72f"/></dir><file name="Method.php" hash="b429f731ec978249ae7ffd8e59a5ed7f"/></dir><dir name="Sidebar"><file name="Abstract.php" hash="1b6f499476d6103436872cc550d2eaa2"/><file name="Cart.php" hash="02139a25c44fec341ff2eae5fe520219"/><file name="Compared.php" hash="de3024f552a88e1879ee74fe87eb9dd0"/><file name="Pcompared.php" hash="513db20edddcc2200739b54255216f9d"/><file name="Pviewed.php" hash="0e04980589a260ca2b1062aeafb9d194"/><file name="Reorder.php" hash="bf5aba74de2816b4618f0b7951ca7f30"/><file name="Viewed.php" hash="22c4239f794de4257defa80782c8ce40"/><file name="Wishlist.php" hash="51450a4b61f032579233b5d27a8cc272"/></dir><file name="Sidebar.php" hash="15b49562996b9b039eeac76a9cff81c2"/><dir name="Store"><file name="Select.php" hash="bfe4f1e4cba4137f0d0fa3152fa55d37"/></dir><file name="Store.php" hash="bb350449eab4b7a3ffcfa2fa0fb2da5a"/><dir name="Totals"><file name="Default.php" hash="b94afd742cf2c094240182a43d775ce6"/><file name="Discount.php" hash="2b50452d43af4d9de68c3550a37ed68a"/><file name="Grandtotal.php" hash="7d16fa944c1967492cc4082c6909cedb"/><file name="Shipping.php" hash="3f8657fc5c427d3e061131abe15b1e5b"/><file name="Subtotal.php" hash="b15890486227f4f8ce001286da22a4e4"/><file name="Table.php" hash="ebfd101bb8eca71b3606a9c2f0c2e82e"/><file name="Tax.php" hash="a26e7b4283cdc06537268e5ffda2607b"/></dir><file name="Totals.php" hash="05edfdd8711a652b5e5142ae4225388f"/></dir><file name="Create.php" hash="877f5054baadce4991768863343425f2"/><dir name="Creditmemo"><dir name="Create"><file name="Adjustments.php" hash="3b75b612da964c93ca9e0debb5875174"/><file name="Form.php" hash="b4e307769236c78e31b1d9ed6c6d7370"/><file name="Items.php" hash="3dd0fdc8c89a4933d3634d0aa8b4a992"/></dir><file name="Create.php" hash="74f4760b643b3d8f3c09b4a9c646a499"/><file name="Totals.php" hash="a9495571f47fb4e8e5d2a56f6769f22e"/><dir name="View"><file name="Comments.php" hash="caa3c8b88ee140d67f0d685a8aa88c98"/><file name="Form.php" hash="df301b49df326116ffb73b44a645a598"/><file name="Items.php" hash="46dfc949f036509879cba13dd87f57c6"/></dir><file name="View.php" hash="2026006cc97994480ec9473cffd35ff6"/></dir><file name="Grid.php" hash="61a4cec7446fc8d71b1dd86118738f9f"/><dir name="Invoice"><dir name="Create"><file name="Form.php" hash="bff70cce5ab6a54d83e804585ba89c39"/><file name="Items.php" hash="8c7655890c21ec11e4f0bb1684cf6449"/><file name="Tracking.php" hash="c5580d9bb29137a58aa3d5b9c0c7d42f"/></dir><file name="Create.php" hash="ddd2c9a11e35256f84cabb7e77409b62"/><file name="Totals.php" hash="d6ecac385c53c66d50d93c26794142ea"/><dir name="View"><file name="Comments.php" hash="31507034121df9afd8c2b646b4e6ed37"/><file name="Form.php" hash="d1d49356e7816a7dcf47527047ce3586"/><file name="Items.php" hash="baf269b2293f4b73b2c6bb093bb1a604"/></dir><file name="View.php" hash="eb6070e356348f4f8c480ab32784f19a"/></dir><file name="Payment.php" hash="68de123264c2bb2913ef6cc2b7458fc1"/><dir name="Shipment"><dir name="Create"><file name="Form.php" hash="7d39ccdcd23bf1620e8d7a4040864742"/><file name="Items.php" hash="5a6781a034e4357b3e8c7baceb860498"/><file name="Tracking.php" hash="3a9cbabe93c8199b6875dae459458c79"/></dir><file name="Create.php" hash="2a6b77e5e41be0f008e6a7be50ff43ac"/><dir name="Packaging"><file name="Grid.php" hash="1122801249db45983e439d2184cad4a5"/></dir><file name="Packaging.php" hash="eca49fd770f11107b68b759bded1abf5"/><dir name="Tracking"><file name="Info.php" hash="4c1c9120054a59438250ea221cb01ca8"/></dir><dir name="View"><file name="Comments.php" hash="8a15344a9b5d886409f08b46288bc2d1"/><file name="Form.php" hash="7257cfbb71101ad0deb7e40d97150999"/><file name="Items.php" hash="f5f890b726951384772112a729566029"/><file name="Tracking.php" hash="4dbcd29f5bfc80ed06ca12df15c7ec46"/></dir><file name="View.php" hash="22e74725c79838f580e11d0f6cab1f5d"/></dir><dir name="Status"><dir name="Assign"><file name="Form.php" hash="ccfb44485437a53f80ae4342b3a52e3b"/></dir><file name="Assign.php" hash="bc065040c3bef24cfaf98d39c61a7060"/><dir name="Edit"><file name="Form.php" hash="485d3db49d79b1598b2864401a3b53e2"/></dir><file name="Edit.php" hash="2a67a4d2e31b79cd1ebb2d5edc34c35a"/><file name="Grid.php" hash="3575a1a06a0dfc29cf0573a48287916b"/><dir name="New"><file name="Form.php" hash="756999ffd438e2bcd2d1dbf802048e2d"/></dir><file name="New.php" hash="189284878ab4ad3fd5bf45f9bfe85b06"/></dir><file name="Status.php" hash="ddc0a661f02c854bba3963b476b6a011"/><file name="Totalbar.php" hash="d5387ee3f481eb0a9fa94e33f44adadb"/><dir name="Totals"><file name="Item.php" hash="c42d13f149e316dc87a8773b1ab020cc"/><file name="Tax.php" hash="193dd7fb0c216706c63c00768383d0e0"/></dir><file name="Totals.php" hash="0086df18a48e9494f041024b8862ecae"/><dir name="View"><file name="Form.php" hash="21c65ef7813259def8b8ebff5aba9138"/><file name="Giftmessage.php" hash="d975b54fd78f7190927188f238310977"/><file name="History.php" hash="0f7d3ebda74b3b93c5aae03f7b68ea2b"/><file name="Info.php" hash="3c39d3bab29827dfbf156955a9a89c05"/><dir name="Items"><dir name="Renderer"><file name="Default.php" hash="7b165f0bf36757ec989ce939771484d4"/></dir></dir><file name="Items.php" hash="9616fabdbd3aef41dc936cfda0a3e44e"/><file name="Messages.php" hash="df16c071516d176dd562aa8ab9811132"/><dir name="Tab"><file name="Creditmemos.php" hash="a4ac2eda83c00ecadfe92ed0affdfe25"/><file name="History.php" hash="83bcbedc3834f0667114eedad60adca6"/><file name="Info.php" hash="bee5dd720fbedb805eb8b4c5f3f9a643"/><file name="Invoices.php" hash="c71df05848f4c2b4d3badf3517d28bfb"/><file name="Shipments.php" hash="a9f7b5f9ae62b09c40b02503cf3df391"/><file name="Transactions.php" hash="d8e6d40ce09acd50075f154568c3d9e6"/></dir><file name="Tabs.php" hash="ff134b80984fd3f4659b3e8defb7b889"/></dir><file name="View.php" hash="8328b940ecd7827d05cc2a1c520fc372"/></dir><file name="Order.php" hash="8f79dadc6952acd640988b5056e769c1"/><dir name="Reorder"><dir name="Renderer"><file name="Action.php" hash="f61432c0aae12bde34d3217b760b8979"/></dir></dir><dir name="Shipment"><file name="Grid.php" hash="234c145d5b84642ebbfb19aa980e5810"/></dir><file name="Shipment.php" hash="a732151690df6da90dead1bf094b0541"/><file name="Totals.php" hash="2d5e88b5201ee57f7853a66f60e60d8b"/><dir name="Transactions"><dir name="Child"><file name="Grid.php" hash="a1f6b53c090c9264beb8e21def4c1384"/></dir><dir name="Detail"><file name="Grid.php" hash="5355b2a8b49d22f9f4241da40f9cd32b"/></dir><file name="Detail.php" hash="d3561017f86fb542c85f42b96e7c7d4d"/><file name="Grid.php" hash="e33628560f021a4459c2767f5db92112"/></dir><file name="Transactions.php" hash="77b62bbb585b281d3787973efcfd4259"/></dir><file name="Sales.php" hash="358f5e19c76f75f8508e08dbbad7007f"/><dir name="Shipping"><dir name="Carrier"><dir name="Tablerate"><file name="Grid.php" hash="35eaaebb42b61d4bbf9a59042e8404c8"/></dir></dir></dir><dir name="Sitemap"><dir name="Edit"><file name="Form.php" hash="2854bee962e3b9e9e20e8e41f89b6e12"/></dir><file name="Edit.php" hash="9b911253680077f4f34ccbde7aca2861"/><dir name="Grid"><dir name="Renderer"><file name="Action.php" hash="4b5f1379762971b29c2ec75a0a61807c"/><file name="Link.php" hash="c2d737275e4a75b75cf95e02eae39288"/><file name="Time.php" hash="bd2953078214ddeca384e844cdfd124a"/></dir></dir><file name="Grid.php" hash="6ea041ce2e32a3dd33fe821af7915b32"/></dir><file name="Sitemap.php" hash="d250d04cd3e80762998839cc37fc149c"/><dir name="Store"><dir name="Switcher"><dir name="Form"><dir name="Renderer"><dir name="Fieldset"><file name="Element.php" hash="ec646aef0e422b97de57008fe9a75f7c"/></dir><file name="Fieldset.php" hash="49379e33d4881ce32553e0dbe8d55b05"/></dir></dir></dir><file name="Switcher.php" hash="84bd47070917a33b9cc6e8c892ae01bd"/></dir><dir name="System"><dir name="Account"><dir name="Edit"><file name="Form.php" hash="ddccb6c88d84af45c623c511f2dcb44a"/></dir><file name="Edit.php" hash="d8dd0f9b978baabcb90652f8936235ba"/></dir><dir name="Cache"><file name="Edit.php" hash="630b9bbc66915705886476fa25f74b4c"/><file name="Form.php" hash="06344dd249f05f2c5e396d6a2ddcec5b"/></dir><dir name="Config"><file name="Dwstree.php" hash="61cf3485186d02128d078ba7b90bdfe1"/><file name="Edit.php" hash="75c383cf92c973718200d0b9716ba93f"/><dir name="Form"><dir name="Field"><dir name="Array"><file name="Abstract.php" hash="4e1f7b0165d18b34c903ab6f2aed6821"/></dir><file name="Datetime.php" hash="a423c05c7a5dae1514d649bf012af581"/><file name="Export.php" hash="0dc1a515631a57ec70805df6849d29ee"/><file name="File.php" hash="c83352c3aa973adf77cc9704abc35e4b"/><file name="Heading.php" hash="eaa165a4f20d7bca565ae797bd88efbb"/><file name="Image.php" hash="af252eb046916be7a50fbc47168b4839"/><file name="Import.php" hash="7ba70bbf225858238a3fecc3f78b544e"/><file name="Notification.php" hash="9090787cab58913816cd49b4e099b5d3"/><file name="Regexceptions.php" hash="68ee2ae38e9c6e82bf0061f5ab52bbbe"/><dir name="Select"><file name="Allowspecific.php" hash="33ee4a2188fb0e5687d0d98a41768fe7"/><file name="Flatcatalog.php" hash="65f3813a3ef3794f88abb4321a7c0c48"/><file name="Flatproduct.php" hash="9a4676e6655fa12298b30c8264cfb41e"/></dir></dir><file name="Field.php" hash="ef2603567f5da732fdbae9c82e0cef03"/><dir name="Fieldset"><dir name="Modules"><file name="DisableOutput.php" hash="2cf27298c5ad07fbd6ebafdf1a4dae13"/></dir><dir name="Order"><file name="Statuses.php" hash="1691d8b45b3e3ec9f6d8b7794e9b6cae"/></dir></dir><file name="Fieldset.php" hash="a2d9e48719d127539d96082d8a8b4490"/></dir><file name="Form.php" hash="da889a27baeb5ef9198682eeffc73a68"/><file name="Switcher.php" hash="5494a491d8176bc571ac7e53d9f86261"/><dir name="System"><dir name="Storage"><dir name="Media"><file name="Synchronize.php" hash="acdf1c0133e57f6db36e961bb204e4ef"/></dir></dir></dir><file name="Tabs.php" hash="4b861023efd9b83492302be2f5b25de9"/></dir><dir name="Convert"><dir name="Gui"><dir name="Edit"><file name="Form.php" hash="b7bda9dcbe61d810994b58a7d8d29c49"/><dir name="Tab"><file name="Upload.php" hash="c5b176ae1a905666fedc96bd36cca857"/><file name="View.php" hash="822318577616588146d5e6a59ce1b632"/><file name="Wizard.php" hash="8badd54921f747ea85b06244cf11d861"/></dir><file name="Tabs.php" hash="07c10d61e013b4bb7e7925db43f680ab"/></dir><file name="Edit.php" hash="f3a5e98a5a43082725c942be20916fc8"/><file name="Grid.php" hash="018cd347d41f0a9eb9bd029c6a987825"/></dir><file name="Gui.php" hash="3906c646051d78b72021a76c14aff173"/><dir name="Profile"><dir name="Edit"><dir name="Filter"><file name="Action.php" hash="b8a37a8186f25a270143b14757dc5e72"/></dir><file name="Form.php" hash="3694af72af22ca40ddc5c7c83ace7d22"/><dir name="Renderer"><file name="Action.php" hash="638f92c2fd37833bbf01d815ddaf17b7"/></dir><dir name="Tab"><file name="Edit.php" hash="6f7457d1ff0fdc7641d45e81a168b124"/><file name="History.php" hash="c6efd7ca8c34ebd138a051ada7666586"/><file name="Run.php" hash="0eb5ebf1d2dd17f5e7fd3d697a1a48cf"/></dir><file name="Tabs.php" hash="e293ec12fc8e25073737c049bb647122"/></dir><file name="Edit.php" hash="49b37bd1c9c798637f324b04e24b13ed"/><file name="Grid.php" hash="58aeab2a1473ea7356d5322eb7c64a11"/><file name="Run.php" hash="f3ccb0381da6e38990880be27e8b8925"/></dir><file name="Profile.php" hash="c93fdb3c066ce2b9946b24863ab8c197"/></dir><dir name="Currency"><dir name="Edit"><file name="Form.php" hash="3c92834e9dd3a8f026c1bad90b0b71a6"/><dir name="Tab"><file name="Main.php" hash="22954e10e2aae7a7a3aab3181955b887"/><file name="Rates.php" hash="f325044ce396fe08780b5989cbf80745"/></dir><file name="Tabs.php" hash="1188422957863ed1e9463710ff73c6d5"/></dir><dir name="Rate"><file name="Matrix.php" hash="36764666ad710f9a33890beb567b8df0"/><file name="Services.php" hash="f9770c48561ec29b207c5fa97ff425db"/></dir></dir><file name="Currency.php" hash="4817d79131d14541fef9d75450a9d9b9"/><dir name="Design"><dir name="Edit"><dir name="Tab"><file name="General.php" hash="58c447ee8977cec3598a47ade7206464"/></dir><file name="Tabs.php" hash="33a9e8fe3d29f35ae5567551a8a769f0"/></dir><file name="Edit.php" hash="d593e84aef95c95bfb2d8e06bf6a0e34"/><file name="Grid.php" hash="98c96d732e2323b629bca3be406dc285"/></dir><file name="Design.php" hash="9b0dc56ab7dc9c17f78b0b0784ca2a7c"/><dir name="Email"><dir name="Template"><dir name="Edit"><file name="Form.php" hash="78c55e5de0ddd340f87e9d2f7fb6c693"/></dir><file name="Edit.php" hash="a809018608ff3a4764bbe61b3e2b1989"/><dir name="Grid"><dir name="Filter"><file name="Type.php" hash="320095e4873cb25b6c27e08c66c601a9"/></dir><dir name="Renderer"><file name="Action.php" hash="daead924a364b4970f67c38e9ee3939c"/><file name="Sender.php" hash="65b7b2b11dafebaae01be28cf6cc8d19"/><file name="Type.php" hash="36397fc14119ca57375cf3295579bc9b"/></dir></dir><file name="Grid.php" hash="02b4ea9ef2e48a37b1daa3fd4566f3a3"/><file name="Preview.php" hash="97dcd17cafe97fe98b7dacc12b0c7fe3"/></dir><file name="Template.php" hash="fd5c789dfef5f117f9bde21a929c0e65"/></dir><dir name="Store"><dir name="Delete"><file name="Form.php" hash="ad804555f02e82cd2f5987223d391297"/><file name="Group.php" hash="187341ff388195eb76a0a1762fd29865"/><file name="Website.php" hash="97202e675e85c88e59a8f21706e73a13"/></dir><file name="Delete.php" hash="68721974bb804f94eea65284846a4623"/><dir name="Edit"><file name="Form.php" hash="bbd2fd5a01db0b83cb1a3c8408b2f928"/></dir><file name="Edit.php" hash="19bbece1a9051a52f73958d6cc44bd61"/><dir name="Grid"><dir name="Render"><file name="Group.php" hash="a57a91f11924d381e8b06d0788155d5d"/><file name="Store.php" hash="660546f1ba9cfbaf3629ea6520a6cb91"/><file name="Website.php" hash="2f316c84ad8f016ed7b3c22c4948390d"/></dir></dir><file name="Grid.php" hash="4f35467eb7d04b98dd0eb4dae69efa5e"/><file name="Store.php" hash="5d097ae9579b26b1085696490fe1b32a"/></dir><dir name="Variable"><dir name="Edit"><file name="Form.php" hash="189bf98ee9d32aceaa34945715a4d97d"/></dir><file name="Edit.php" hash="2ef0ee3aab94be340d99cd756178ba22"/><file name="Grid.php" hash="ae79e80557ea72e1962d64e8d6ac1366"/></dir><file name="Variable.php" hash="22ffd92cfe537f85db91cc187cfc937e"/></dir><dir name="Tag"><dir name="Assigned"><file name="Grid.php" hash="262395a487d3f7ac507f6b06645c64b7"/></dir><dir name="Customer"><file name="Grid.php" hash="cdbe009dd128a2bcd56c9a0c182dec05"/></dir><file name="Customer.php" hash="e7851969a3ab6c75738a851750df4106"/><dir name="Edit"><file name="Accordion.php" hash="5a8325f5532f9907d3760e37b549edab"/><file name="Assigned.php" hash="ba3f13448771ca6601c6590b295cd086"/><file name="Form.php" hash="a1bc371fc437a77db046608f49a66b33"/></dir><file name="Edit.php" hash="926a1c11b55a81ef96b64721bc12cc0b"/><dir name="Grid"><file name="All.php" hash="890803b30098d8fe753d0d3218864f35"/><file name="Customers.php" hash="eacde2cd0e12d59f1e8722533b09581f"/><file name="Pending.php" hash="279b4b7ab758abd80a63716e178f22b2"/><file name="Products.php" hash="bf7a26134368853c24e5dec098d1d4e3"/></dir><file name="Pending.php" hash="f778cc501f1c760a775cd7eb1ea39d08"/><dir name="Product"><file name="Grid.php" hash="b409865d955963c939811a294d39739d"/></dir><file name="Product.php" hash="fe7e9a0d935c77fa09af56e4715b03fc"/><dir name="Store"><file name="Switcher.php" hash="55e0ff589d171fe58186e61da96c3b82"/></dir><dir name="Tag"><dir name="Edit"><file name="Form.php" hash="dd20a8c7f77f8314c2fc2e9a5fe49852"/></dir><file name="Edit.php" hash="5a5ead13178fd076d1cd9e5978592092"/><file name="Grid.php" hash="a1f47bb9aac9221c2e15ee2a2cf851dc"/></dir><file name="Tag.php" hash="4678ce75018fe4b62f4add4a60f5984e"/></dir><file name="Tag.php" hash="b4250808c5eb762658a12044166f6279"/><dir name="Tax"><dir name="Class"><dir name="Edit"><file name="Form.php" hash="24255303a1912cb300b4baf3ec42974a"/></dir><file name="Edit.php" hash="1f61ceaf1830a1e5c95d5aa962117194"/><file name="Grid.php" hash="01663b0fd59fa591dbc97feaa1dc34c0"/></dir><file name="Class.php" hash="87b324633ef3be76a7c80643c972ff34"/><dir name="Rate"><file name="Form.php" hash="70da9e1865f9175127f812372a07e790"/><dir name="Grid"><dir name="Renderer"><file name="Country.php" hash="3e81c3816f0967f960134ccef70f54cf"/><file name="Data.php" hash="57b6050de5b66b66fd71b5e859adb99b"/></dir></dir><file name="Grid.php" hash="f4bc5d1f4e2053b01fc29cf19a9d4742"/><file name="ImportExport.php" hash="6f9ee869e72cdd12fdd8c339c84ebf76"/><dir name="Title"><file name="Fieldset.php" hash="e88c086dbd03c3fc2bf49eba58cb51c2"/></dir><file name="Title.php" hash="b14c33d6c4eb3e29576b0230c2d2003a"/><dir name="Toolbar"><file name="Add.php" hash="17d4fee12cdc093fef720a85e430bcb1"/><file name="Save.php" hash="4993895140e075506dbca66ab2d2511b"/></dir></dir><dir name="Rule"><dir name="Edit"><file name="Form.php" hash="b4a45f1cd91a2bf5ec66c54e938a5979"/></dir><file name="Edit.php" hash="f098612c60c106c7ad3e1a60b4dd30c0"/><file name="Grid.php" hash="40f407ae8f3aaf8efe3f1d7317a06837"/></dir><file name="Rule.php" hash="ffb863d9f8d16baf2e577a0bfb5b7082"/></dir><file name="Template.php" hash="4dd0e902ac10071214bef7a28bb98af3"/><dir name="Text"><file name="List.php" hash="b6c9d4d2fff4129a1bd8cb511f8cb904"/></dir><dir name="Urlrewrite"><dir name="Category"><file name="Tree.php" hash="fa67719ac38a8fdb0542eb480e180839"/></dir><dir name="Edit"><file name="Form.php" hash="b20d4a8b28c2c5de23d72c5d3c660bc9"/></dir><file name="Edit.php" hash="3f40b0906145e893c8343e7993bdeac2"/><file name="Grid.php" hash="c8f8161d9621414a8a43032c930cebf1"/><file name="Link.php" hash="f08633ff8c568810e608e659b6c06003"/><dir name="Product"><file name="Grid.php" hash="411121e2f3c07e76fd433a58da852eb4"/></dir><file name="Selector.php" hash="b1b01a7f0c62b3be33bb850e19f7e31e"/></dir><file name="Urlrewrite.php" hash="dc559873b7552bc0fda08de7fa4abe38"/><dir name="Widget"><dir name="Accordion"><file name="Item.php" hash="6b58d4d76483dd9b7b863811474f342c"/></dir><file name="Accordion.php" hash="0eab591ae6ba8b0a06b05d6e3c261a5a"/><file name="Breadcrumbs.php" hash="0fd744f39a7eb5172822c70901931f98"/><file name="Button.php" hash="155d4b66796fddf105302cf16b870c43"/><file name="Container.php" hash="2413ce89359b559eb085829c27266092"/><dir name="Form"><file name="Container.php" hash="e0122e68119ad1a0f5da9097e59ea39f"/><dir name="Element"><file name="Dependence.php" hash="45cdfa039cb621525225dbbd68d8d2e4"/><file name="Gallery.php" hash="45ee8119965fcb57b8073b933e3d0d99"/></dir><file name="Element.php" hash="258128802e370e43a153352bf106c03f"/><dir name="Renderer"><file name="Element.php" hash="6949759fa3ca9e45577a61402458dc68"/><dir name="Fieldset"><file name="Element.php" hash="fe5faccf4487000daa5385d45ae229b0"/></dir><file name="Fieldset.php" hash="436daed1f5a9ca5b29feacade9f960c1"/></dir></dir><file name="Form.php" hash="1c4c40c8694351592664f605ea96429d"/><dir name="Grid"><file name="Block.php" hash="ff6e2dfbb4227ea6b9238bdbdd8552a0"/><dir name="Column"><dir name="Filter"><file name="Abstract.php" hash="0cebe4fc6aad7f61590b9881b2ac89bc"/><file name="Checkbox.php" hash="61cc780e91dbcb48b39e5161b094da44"/><file name="Country.php" hash="f65c07fa36d513421a0239c05ebdd1b3"/><file name="Date.php" hash="807f7c8f6727823886f2d0c153a25c51"/><file name="Datetime.php" hash="f1b480d9c3a6d7bb74e2f52ef1a55af8"/><file name="Interface.php" hash="56c239edde3c3de6c92e887ad61f7166"/><file name="Massaction.php" hash="c372fc3ce9e2fbcd12e2ed13d5513f51"/><file name="Price.php" hash="2f344bc359d47aaf5b942048bb2c8f9a"/><file name="Radio.php" hash="e63b2168fda1b749e84bfa26dd19a5a2"/><file name="Range.php" hash="cc0074d8cad4820f0e590892e1dcc73b"/><file name="Select.php" hash="b45f339f95dfacf8d4a72dfede4674a6"/><file name="Store.php" hash="1361dc52620fb9950bfb5d1a533c49b9"/><file name="Text.php" hash="d5aac85a05b584b39e488f2c56f143e4"/><file name="Theme.php" hash="14d8cc304489af9bda62b61b44b6c881"/></dir><dir name="Renderer"><file name="Abstract.php" hash="8071d47fe61369ab03cb30dfc9615fe4"/><file name="Action.php" hash="0c92eec9fb6af714c83e411a031d2b58"/><file name="Checkbox.php" hash="a9ac9dcbcff71919755e45a33f0618b8"/><file name="Concat.php" hash="b2c2bec4f98b9c98430dba83f31b32f4"/><file name="Country.php" hash="fd0598714e3124e43b2bb361bd2fe22e"/><file name="Currency.php" hash="cfeae94739fff049453c2e84e80c7e7d"/><file name="Date.php" hash="1dd03b0df3e2ab3fd74df96aeff60f71"/><file name="Datetime.php" hash="427b1930cd06b20bbb9fd5e3a3c02841"/><file name="Input.php" hash="6fab4f8f4584b082a86ca95749d8f79e"/><file name="Interface.php" hash="ea1f36c3051cee7dc52ee49703698bf8"/><file name="Ip.php" hash="f73383e45f92babe678fd44b5b095ad3"/><file name="Longtext.php" hash="7a8fd3b7135190ec675f1f510765a416"/><file name="Massaction.php" hash="f6035b737df2aa2290f641d1adeb7aee"/><file name="Number.php" hash="d52c5fea7b3861b76d3387add42289f7"/><file name="Options.php" hash="84144f05bbaf987578fe18cda34afa4d"/><file name="Price.php" hash="ac1e9032f003921b06aec655dc0e612f"/><file name="Radio.php" hash="da70c1bfda67c98651fe866923649b3e"/><file name="Select.php" hash="57b462763e2c9dd3ca3b16f1838cd733"/><file name="Store.php" hash="0370b51504c3047221c5fee90862eff1"/><file name="Text.php" hash="3314430d7ab112c6e5574ab6a955fc0a"/><file name="Theme.php" hash="0762a4162f2c0b9c3451678f0dff8e54"/><file name="Wrapline.php" hash="07ff85eb753ba17294ef561325dc60d1"/></dir></dir><file name="Column.php" hash="cdeb777b461a422b8a0d06b9612a4cc0"/><file name="Container.php" hash="9e54a2951f538c5139f1092b57ff77ba"/><dir name="Massaction"><file name="Abstract.php" hash="ba0b70af51d74a2ef74fc9f389681ef8"/><dir name="Item"><dir name="Additional"><file name="Default.php" hash="6dbeb432da25149d2f2aa059290cd0d2"/><file name="Interface.php" hash="616f28b116cd4bea9cf27f146c6cbab9"/></dir></dir><file name="Item.php" hash="f780b960e96f4c34c97bd39022e15873"/></dir><file name="Massaction.php" hash="f5aff40aaa61a328abff52f168c7e45a"/><file name="Serializer.php" hash="da9cfdd58247ac453cab384813cb8b5a"/></dir><file name="Grid.php" hash="e23c2b9c0c82a893b426f5911e86a8f8"/><dir name="Tab"><file name="Interface.php" hash="0fb2855258dfe855e95c8221912d8e5b"/></dir><file name="Tabs.php" hash="346d2f6095b8fb3b86b6a6f73fec97ef"/><file name="Tree.php" hash="4ce65e63aaa2bf80fd8f8e842e5dfec7"/><dir name="View"><file name="Container.php" hash="e574a3de99c054135ee6e7fd855d8c6e"/></dir></dir><file name="Widget.php" hash="b53a98a37df81cd59a22d46e1378b2a7"/></dir><dir name="Controller"><file name="Action.php" hash="bf94219e482724386c4434de145575a6"/><dir name="Report"><file name="Abstract.php" hash="59c681a4c331f3a7c68929ebbc8ab01c"/></dir><dir name="Sales"><file name="Creditmemo.php" hash="e8ad721be046e9f225e049b6875d6605"/><file name="Invoice.php" hash="8fe8aee9073c653cf2e553a53f9ed4a1"/><file name="Shipment.php" hash="cff59c4f838e240235869a2a8d7a34d9"/></dir></dir><dir name="controllers"><file name="AjaxController.php" hash="3f015c5b40909f77c4f7eddc1022ca02"/><dir name="Api"><file name="RoleController.php" hash="6e52ef593ffd51bbeb98c0c6a5a2fb10"/><file name="UserController.php" hash="be4782c8750ca0bafd8e25fe57bc5a5e"/></dir><file name="CacheController.php" hash="f2414644d2e1e986473b689643e39551"/><dir name="Catalog"><dir name="Category"><file name="WidgetController.php" hash="f792b9c468c9d233b8cac2b508434c9c"/></dir><file name="CategoryController.php" hash="e76265ef3d5d6479c0f2965ae418d826"/><dir name="Product"><dir name="Action"><file name="AttributeController.php" hash="61cecb68b01f81a2ffb0eb862e8c4f98"/></dir><file name="AttributeController.php" hash="937bb3acb5b40220f61052acb4ba8dee"/><file name="DatafeedsController.php" hash="5e2b970bb08715347c9f6ce8bae734ef"/><file name="GalleryController.php" hash="06a55db29a85974a392bd8fea4dbd70f"/><file name="GroupController.php" hash="262351333569872d619c149eab13693c"/><file name="ReviewController.php" hash="6f50de1b34410db3b1fa24ec849c4750"/><file name="SetController.php" hash="65c0b6fd63d8f0cdc859dfeea0f04e24"/><file name="WidgetController.php" hash="64b2c72183ae7a649eced8b6643c274f"/></dir><file name="ProductController.php" hash="c52e83c8d0448a1f54da7fd8f037f7c9"/><file name="SearchController.php" hash="814026941f5070a30371ca3858a8fb5b"/></dir><file name="CatalogController.php" hash="ef55e0acdb1e1ed84e9db0419cc93d3b"/><dir name="Checkout"><file name="AgreementController.php" hash="47acc47c5901feeda4fb84db37e5fd21"/></dir><dir name="Cms"><dir name="Block"><file name="WidgetController.php" hash="32b37f11ef7b49951c61a420aba4edb1"/></dir><file name="BlockController.php" hash="9984ff7cb60a08e239d1516e776bdf27"/><dir name="Page"><file name="WidgetController.php" hash="2a39dc54a3d48af94df11664cb9366e7"/></dir><file name="PageController.php" hash="96640c497ad01a4aa9e238e3de3beb71"/><dir name="Wysiwyg"><file name="ImagesController.php" hash="ae007ff21751f8e507dfecd4ff178192"/></dir><file name="WysiwygController.php" hash="3116b058088206d28a814dc00daa8e35"/></dir><dir name="Customer"><dir name="Cart"><dir name="Product"><dir name="Composite"><file name="CartController.php" hash="839f4c8314ed3acf32450850a6b5c2fa"/></dir></dir></dir><file name="ConfigController.php" hash="7e00ffaaaa1a612292f0c494a402501e"/><file name="GroupController.php" hash="01288a334cb45a01e419eb2a06648e21"/><file name="OnlineController.php" hash="21036192b71c5744727ccce2044df0dd"/><dir name="System"><dir name="Config"><file name="ValidatevatController.php" hash="c9f4c9efcee0651240c859345c2fbebe"/></dir></dir><dir name="Wishlist"><dir name="Product"><dir name="Composite"><file name="WishlistController.php" hash="bbc5fdb7b811a7da63a70154f1dd27d2"/></dir></dir></dir></dir><file name="CustomerController.php" hash="1fdf362cdf72876544607ffd9cc99726"/><file name="DashboardController.php" hash="bf77cba89919434d31126f5e1577f4a2"/><file name="IndexController.php" hash="9426d51906bd904978760682cad794e9"/><file name="JsonController.php" hash="fb1dd09071491cbccde5bc3d5742ee24"/><dir name="Media"><file name="EditorController.php" hash="7f684964c721a24ae1be2e345a766c5f"/><file name="UploaderController.php" hash="a640d0fa8a2e6acf7b2e9500f2cade4d"/></dir><dir name="Newsletter"><file name="ProblemController.php" hash="fff6adbd0bcefbdab32d30981297dd4b"/><file name="QueueController.php" hash="d343633feeedd3d9bad5cdd699c38d78"/><file name="SubscriberController.php" hash="0ee8d4f82926baad2b9e6fe5f0060ecb"/><file name="TemplateController.php" hash="e81a0ea6442ec5edf902b15cf6fb33e9"/></dir><file name="NotificationController.php" hash="cdef5ab915cb9c66bf471878dd0a7a74"/><dir name="Permissions"><file name="RoleController.php" hash="7955143a4ebac8fbe75dd43ad333f176"/><file name="UserController.php" hash="db4848a25ec547511465a6333244fbcf"/></dir><dir name="Poll"><file name="AnswerController.php" hash="cd4f27973bb30db4da8177446bb79527"/></dir><file name="PollController.php" hash="c6918546920a1e4d7cf8597caece5e35"/><dir name="Promo"><file name="CatalogController.php" hash="8492c48930cdc7a42e94f1c8462e7f91"/><file name="QuoteController.php" hash="57158c39c845b844539e62a545d849d9"/><file name="WidgetController.php" hash="271212e499c1ea7f57cd20703a988f2a"/></dir><file name="PromoController.php" hash="ba362e93f841c52849f329183b4512bc"/><file name="RatingController.php" hash="b86decc2995d12b2e5a867e5e7668e2b"/><dir name="Report"><file name="CustomerController.php" hash="ec608e21a92d9da9d7ab412e8f20c694"/><file name="ProductController.php" hash="e937797e8d8796677f44a2a68f61b59a"/><file name="ReviewController.php" hash="e87b929a7a02e9671b495e0dc6206228"/><file name="SalesController.php" hash="1786ea33faf2e4a929b73cfc2595e476"/><file name="ShopcartController.php" hash="658f089c6f66b3f8e88a3fef9c34ca83"/><file name="StatisticsController.php" hash="d121c1ac7639508fce83b192748fc3b5"/><file name="TagController.php" hash="784e31c5eefb07ed713e0b3d207dddf8"/></dir><file name="ReportController.php" hash="3868d26148c9e969eb306454d5e029f8"/><dir name="Rss"><file name="CatalogController.php" hash="d01cc915d43dd5eb3aedd0ed060873c0"/><file name="OrderController.php" hash="619d3de2d334cb897ed6622c5e871609"/></dir><dir name="Sales"><dir name="Billing"><file name="AgreementController.php" hash="52a3eec0309cc05d340ea327fe260493"/></dir><file name="CreditmemoController.php" hash="03bfd7bb5d837ae96243635fd8b956aa"/><file name="InvoiceController.php" hash="65ccced3c2d242e8de9bcb3c59f9598b"/><dir name="Order"><file name="CreateController.php" hash="f2769391812d1a906b318cd1f5654207"/><file name="CreditmemoController.php" hash="88d652a02108d577f749d89d90932158"/><file name="EditController.php" hash="cfa6e31341e6c7db8b8a348eb0e7a083"/><file name="InvoiceController.php" hash="4a36dfcf0a59e434a5719d6d9430ea1e"/><file name="ShipmentController.php" hash="3117f9ea1f80fda8668645c240f45805"/><file name="StatusController.php" hash="1b4f0d40a53e6afafd7048c17cda2318"/><dir name="View"><file name="GiftmessageController.php" hash="6e9719551a250f5d0a796a4a988c378f"/></dir></dir><file name="OrderController.php" hash="abeca3291ece2395b121e4a53c63aacb"/><dir name="Recurring"><file name="ProfileController.php" hash="25711f1ddcfde83d78bb074911df3ef2"/></dir><file name="ShipmentController.php" hash="30f07910ca5c04373e7496bcc8d7d440"/><file name="TransactionsController.php" hash="973cce2907a88a2c0fdfad5f6d454142"/></dir><file name="SalesController.php" hash="9ea67bd3f2fcd75cda0d656f3da1a7e7"/><file name="SitemapController.php" hash="4a853a5f2c54b4b4c7191df500e5b31a"/><file name="SurveyController.php" hash="d6984b6f6c10ca865b6a6963b77b33e8"/><dir name="System"><file name="AccountController.php" hash="1197e4221ac01d38c279597d569b91c5"/><file name="BackupController.php" hash="63ee579686f94da34bf3078b173b8a4f"/><file name="CacheController.php" hash="c33a3b7f5a903ede232647b67e04335e"/><dir name="Config"><dir name="System"><file name="StorageController.php" hash="660ab768b6aa4b428882626126821513"/></dir></dir><file name="ConfigController.php" hash="c1a43ca018972512842ea4bc9a5f91d5"/><dir name="Convert"><file name="GuiController.php" hash="38a6f916eb98e58bef098b457c0c7b87"/><file name="ProfileController.php" hash="de71275d584f5983e23f060f2093e64a"/></dir><file name="CurrencyController.php" hash="b1836d91c88596d3aafae9d4257f3068"/><file name="DesignController.php" hash="93f93e9e90bcd5e950c5af76b3342908"/><dir name="Email"><file name="TemplateController.php" hash="d75f095b2f971a01a988ab76932a4e2c"/></dir><file name="StoreController.php" hash="6931072b6d6884e57dbc5e721ffe28df"/><file name="VariableController.php" hash="56d3e318f274aaae94f518be06a19c8c"/></dir><file name="SystemController.php" hash="4ba17965739f4e86b0383d00de990983"/><file name="TagController.php" hash="80f6963468f63dafe9b68fc5dad8e9b9"/><dir name="Tax"><dir name="Class"><file name="CustomerController.php" hash="654a769edf513cb30615d213821275d3"/><file name="ProductController.php" hash="06b424dcad41488eef5641ca55b04ef4"/></dir><file name="ClassController.php" hash="1c696f4a38e3fed2869f88cf85420ae0"/><file name="RateController.php" hash="1d7436a2c82ef4a085d1a8359998bb0c"/><file name="RuleController.php" hash="466c278e887fd4e8dc2e7c367a2e7fee"/></dir><file name="TaxController.php" hash="ace9a98440056b57e57fb9526520d5d2"/><file name="UrlrewriteController.php" hash="98b094e70c4a8fd4bf8cea3580614f97"/></dir><dir name="etc"><file name="adminhtml.xml" hash="0037556b319726d0efead1ad7a1d6cf0"/><file name="config.xml" hash="4159a8c8ea39c5134f9c9271081063a1"/><file name="jstranslator.xml" hash="28ff351540a20a45c4ae734f91d4cb23"/></dir><file name="Exception.php" hash="69d108ee3bd1abefe5bdbc545d3d9f33"/><dir name="Helper"><file name="Addresses.php" hash="bde92caa00a1e1ef6fea6e4c2fbd1a79"/><dir name="Catalog"><dir name="Product"><file name="Composite.php" hash="261174e58c58172849e0288ca11912b2"/><dir name="Edit"><dir name="Action"><file name="Attribute.php" hash="fed567cdfa0fff9a684eedb7b25f66d8"/></dir></dir></dir></dir><file name="Catalog.php" hash="5e98e70f14a850ca5092079c6148703e"/><dir name="Dashboard"><file name="Abstract.php" hash="2c2b8f5183e07c64e561b7d31fee0457"/><file name="Data.php" hash="b9e687f31e617786523d2c0627edc9cb"/><file name="Order.php" hash="aed42e5e47bfe8a41377be241371bf0b"/></dir><file name="Data.php" hash="40f042811e9a6d8cbfb9ba63c49470de"/><file name="Js.php" hash="8282f5d21e76b5b75ab0fd2f5854bda3"/><dir name="Media"><file name="Js.php" hash="d233bf73190efbcbdda7b038250ad58b"/></dir><file name="Rss.php" hash="28ca908c6c739fbd5e7f2b16ade3df59"/><file name="Sales.php" hash="809dda967d34ac01f2507e06649101be"/></dir><dir name="Model"><dir name="Config"><file name="Data.php" hash="fc78e857a6ed892286071cf0b85d7ad1"/></dir><file name="Config.php" hash="52074ba07928ab6b07d372cc474659b7"/><dir name="Customer"><dir name="Renderer"><file name="Region.php" hash="54ea22f5b0f063ab25c809d068005968"/></dir></dir><dir name="Email"><file name="Template.php" hash="e6dc2b4312754a24944f3ea686b664d0"/></dir><file name="Extension.php" hash="e033d92cfe37b6a219e6ea49a677d3ff"/><dir name="Giftmessage"><file name="Save.php" hash="dbf8760ae4c8a0c7519593628977d856"/></dir><dir name="LayoutUpdate"><file name="Validator.php" hash="e91d93c2d850f40c42ff3e38d7e5aff1"/></dir><dir name="Newsletter"><dir name="Renderer"><file name="Text.php" hash="c4d306f625f721c5525a18867d48cda5"/></dir></dir><file name="Observer.php" hash="65832c54177e231963266895f9968dc2"/><dir name="Report"><file name="Item.php" hash="bcf980f26e8c0a45e2369215a76ba106"/></dir><dir name="Sales"><dir name="Order"><file name="Create.php" hash="1396133fae0fce77501b7215bb4091ca"/><file name="Random.php" hash="44e7477e5a01710ee2cd41f8cda07d16"/></dir><file name="Order.php" hash="4a745e3563a62f6db3f84b353f9676ed"/></dir><dir name="Search"><file name="Catalog.php" hash="7c7582e8324ceb907de74ddb0ae42ecd"/><file name="Customer.php" hash="f1f36d5389447155225ce27f1139b736"/><file name="Order.php" hash="6c938d5565c33dd4c4c38420eb43fe8d"/></dir><dir name="Session"><file name="Quote.php" hash="de3113a5d1a529931db95d5068e54b92"/></dir><file name="Session.php" hash="553fcace1933d96adb0bcc970a5c59d1"/><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Admin"><file name="Custompath.php" hash="5942309a56bbcb7fd1983f8fa3556b17"/><file name="Custom.php" hash="430667fb816b5e54b50f70d25d7f6321"/><file name="Observer.php" hash="c7892b3be04781d752279fe0a4643c63"/><dir name="Password"><dir name="Link"><file name="Expirationperiod.php" hash="c111d27bb8f96a7ee95b79fb509e6665"/></dir></dir><file name="Usecustompath.php" hash="a8fc9ab6d911ce3b792f3fa673603581"/><file name="Usecustom.php" hash="0320a50fb472d5177f4cf5079a2febb7"/><file name="Usesecretkey.php" hash="a8a6e3d743ee52feb752d1bc2a87473d"/></dir><file name="Baseurl.php" hash="4b8229a26e622f6b05c4b89a2111d1d3"/><file name="Cache.php" hash="faba159558453c47f1ff8cb9b7c0c99b"/><dir name="Catalog"><dir name="Inventory"><file name="Managestock.php" hash="386bbced868078f229f89c5ca7b0dd2f"/></dir><dir name="Search"><file name="Type.php" hash="25f69a094faca6832a067ced53c95d75"/></dir></dir><file name="Category.php" hash="4a22c1377538d2e3aac58fcc4e3ff505"/><file name="Cookie.php" hash="7f2e830fdb3a65fdc33a4df1e2e2f825"/><dir name="Currency"><file name="Abstract.php" hash="621878f6cb098464011635cd938d3a73"/><file name="Allow.php" hash="7de02afe7ca6b20a8089ec181e90f8a1"/><file name="Base.php" hash="f95ad1c06bcc2e2a317be890b5708d94"/><file name="Cron.php" hash="331f7fa5655edb36a9c36c5c6977f821"/><file name="Default.php" hash="6355a28f04df59520038bbf0b99775de"/></dir><dir name="Customer"><dir name="Address"><file name="Street.php" hash="f2f86a1d2c745149dec47540b686142f"/></dir><dir name="Password"><dir name="Link"><file name="Expirationperiod.php" hash="075ff1ff57cf1fc8597ffb2de563cdbe"/></dir></dir><dir name="Show"><file name="Address.php" hash="c4e6cc0eb67c29c41de9e45d611656ce"/><file name="Customer.php" hash="ffdc8cc46e9aa5de2c66d8a3b5a199c9"/></dir></dir><file name="Datashare.php" hash="c4be86d5d75af0b7b837b4866c5eeb6c"/><dir name="Design"><file name="Exception.php" hash="12ef1288d47309070a56e0ddc8e2d1f3"/><file name="Package.php" hash="0f5bf9bb16f7c9175d6fc93b5f08cf05"/></dir><dir name="Email"><file name="Address.php" hash="06b526b38882c7bf28a0533b95d6ffd5"/><file name="Logo.php" hash="f5326822d8d520583b82466de0879e7a"/><file name="Sender.php" hash="065a8a57815502adef5610b2846a1533"/></dir><file name="Encrypted.php" hash="c37c71c323901bc16ab10e1e0d702f7e"/><file name="Filename.php" hash="5953e5bd17e3e1094d67a0ed49636d2d"/><file name="File.php" hash="dbb99074253f65a73e53b164e56ad7e0"/><dir name="Image"><file name="Favicon.php" hash="1b6adb473d15fe0c0458be72445a7cc1"/><file name="Pdf.php" hash="eedfa1e0d51e95cbd4d425dbd860fbd0"/></dir><file name="Image.php" hash="08b2ff9ce47d4bfc2042f2c9d2f94063"/><dir name="Layer"><file name="Children.php" hash="24507527b224f7bb022f5f916785afdd"/></dir><dir name="Locale"><file name="Timezone.php" hash="40ca91bb8ac2e0d9729dc787c687f351"/></dir><file name="Locale.php" hash="a386e2ebc0a1ef6298ba117cb0fd69b2"/><dir name="Log"><file name="Cron.php" hash="a24f33aa740b960c44d33b39eb7028f7"/></dir><dir name="Price"><file name="Scope.php" hash="18b19a409fb134e026960faa5131bb80"/></dir><dir name="Product"><dir name="Alert"><file name="Cron.php" hash="27c88d2a4a857ae29de6f1bad60c9b5b"/></dir></dir><file name="Secure.php" hash="4262bf6375d779d6b1788b1c8c6580c2"/><dir name="Seo"><file name="Product.php" hash="f91ae68b2ea4b655db6dd229723766a0"/></dir><dir name="Serialized"><file name="Array.php" hash="f05603ace2c4a884ee55042e7798a646"/></dir><file name="Serialized.php" hash="1f3f3d4addc465d580e15cb3670633bf"/><dir name="Shipping"><file name="Tablerate.php" hash="5a75c810e3a52e37abbfa8356b4e8a7d"/></dir><dir name="Sitemap"><file name="Cron.php" hash="e458eb34cd129ece45d82d146cd9254f"/></dir><file name="Sitemap.php" hash="cbe0c11c58c8fcc7c7c55a8b8462b77f"/><dir name="Storage"><dir name="Media"><file name="Database.php" hash="9a205727553c6813645241cf594985e0"/></dir></dir><file name="Store.php" hash="6adebc9bb0beefebb81df2bc87bc7318"/><file name="Translate.php" hash="172246c2719804b26b048cbeae024456"/></dir><dir name="Clone"><dir name="Media"><file name="Image.php" hash="5daa8ac4983dace294e7615aa2eee6f7"/></dir></dir><dir name="Source"><dir name="Admin"><file name="Page.php" hash="f9a0c57db9c272f4cf18c6a8deeae617"/></dir><file name="Allregion.php" hash="ab2f8099ce326cb1fb263b5d2e84216b"/><dir name="Catalog"><file name="GridPerPage.php" hash="d281112f7422328718a1f24ad4dd8439"/><file name="ListMode.php" hash="cfa54a3823ae764782441edb2511b384"/><file name="ListPerPage.php" hash="b366a5917dbaa701f74dc457ca26e724"/><file name="ListSort.php" hash="483b463d3e8a7b234bcf9016202bd295"/><dir name="Search"><file name="Type.php" hash="7eed563a21cd34e2204983afb31bf99f"/></dir><file name="TimeFormat.php" hash="b6e5d76f85d99c72d311c62762b7883e"/></dir><file name="Category.php" hash="e8be2455d37599676e3683a49971daab"/><file name="Checktype.php" hash="ad88f0b215c461362846f5cc6cb8b693"/><dir name="Cms"><file name="Page.php" hash="1bc5df99c611471d2efffe5f158d54a0"/><dir name="Wysiwyg"><file name="Enabled.php" hash="793bdff1fc42bacbe635801940ef8815"/></dir></dir><dir name="Country"><file name="Full.php" hash="26477d2ded04c1cdce70b19af203d389"/></dir><file name="Country.php" hash="a20c5900136e7a57cb17f2a13d9c890a"/><dir name="Cron"><file name="Frequency.php" hash="7684a98dff8855d0101f61017ccb8bbf"/></dir><dir name="Currency"><file name="Service.php" hash="9f55c5675dff6d66e7d2586f83cdcdf9"/></dir><file name="Currency.php" hash="00ec327bdddc1346b4be5b30ad6bec35"/><dir name="Customer"><dir name="Address"><file name="Type.php" hash="8f71303d7d65a8199735a6b013d12ea8"/></dir><dir name="Group"><file name="Multiselect.php" hash="83c5c6431652e81244e5dc37a0cea612"/></dir><file name="Group.php" hash="7ba64224f9eadca13829a2c8f8f1c51d"/></dir><dir name="Date"><file name="Short.php" hash="49d896d54154b2ef5cc8e9a598e94cad"/></dir><dir name="Design"><file name="Package.php" hash="fba07b7815732fb98652a7de2f59d061"/><file name="Robots.php" hash="928cb6b78e80f23f56a1b77f9c2e06b3"/></dir><dir name="Dev"><file name="Dbautoup.php" hash="abfbfff2f1696c58b3499de6f4b3bf1b"/></dir><dir name="Email"><file name="Identity.php" hash="03fbedd442d1e2fcc9adf6f0824e8d8c"/><file name="Method.php" hash="b864d853e871e6b3c3859ea6389009de"/><file name="Smtpauth.php" hash="1a259e7cd590dd160abd453ef82b9e06"/><file name="Template.php" hash="3f07eabd2707fe20290d46dce039fba2"/></dir><file name="Enabledisable.php" hash="7cbbb723d4311d348b582d9de5a8be1a"/><file name="Frequency.php" hash="7455078214654c342097336f53240cc3"/><file name="Language.php" hash="d9a2dc84d1deec2504c56a0d77fdc2f1"/><dir name="Locale"><file name="Country.php" hash="03b8d1369cba6dc2fad68d5b9a174e75"/><dir name="Currency"><file name="All.php" hash="98d087b2b6b2e6815f7c838be87107d9"/></dir><file name="Currency.php" hash="9a165c18a5ba4361d35dc28f0ef19737"/><file name="Timezone.php" hash="f69fc68327ce9f94f36892f8f51cbf34"/><file name="Weekdaycodes.php" hash="adc5d102c7ece4e8efee9f576b7b1526"/><file name="Weekdays.php" hash="f5853e71eaee555f697a9f99065ae45f"/></dir><file name="Locale.php" hash="5c32fb7c03f4597e35004fc07ce1ce09"/><file name="Nooptreq.php" hash="4b7fdfd06d7008b6fc1da9f41b0bc442"/><dir name="Notification"><file name="Frequency.php" hash="31152cf1dba8de0845e822436df293c0"/></dir><dir name="Order"><dir name="Status"><file name="New.php" hash="4aca62dfb10891fa82bf06a68b1f4748"/><file name="Newprocessing.php" hash="c6beb7667d09a698d11a8e1ba72901e7"/><file name="Processing.php" hash="db0eae4039f5e23c6f28080a7a74221b"/></dir><file name="Status.php" hash="af51dc72091bb0371cd18447b8befbe0"/></dir><dir name="Payment"><file name="Allmethods.php" hash="da36ab1c4724d0385de95ec26e32afa6"/><file name="Allowedmethods.php" hash="9ec8978b16fa48692a3fbc1f94def4a0"/><file name="Allspecificcountries.php" hash="3357331e9beb25b8c34f094b05dd9319"/><file name="Cctype.php" hash="71e99f1d3ffc08ebfb3c3ab45c68dd4b"/></dir><dir name="Price"><file name="Scope.php" hash="4dd719340685a5f4562d98a4d3e97326"/><file name="Step.php" hash="ad3154f6ca7bcc004fa2280c51fde745"/></dir><dir name="Product"><dir name="Options"><file name="Price.php" hash="afa82dabfe8f30fd6576e2709739092b"/><file name="Type.php" hash="20b64ff04837819b1536b99fad579d70"/></dir><file name="Thumbnail.php" hash="bc1267f7c8e6b87934333b6ab1eb5abb"/></dir><dir name="Reports"><file name="Scope.php" hash="711afa6dec984311df82ca9afc1741c1"/></dir><dir name="Shipping"><file name="Allmethods.php" hash="f176857c49a6e97ecf646da639a79ea8"/><file name="Allowedmethods.php" hash="22492392525bed28af6d81eb141ef72c"/><file name="Allspecificcountries.php" hash="6eb3ebd0b85d78f03bba20409e8b55b2"/><file name="Flatrate.php" hash="6d7536de960ec439dd70385e583eb2be"/><file name="Tablerate.php" hash="6c439f4d0f9b2deaa3134f5231a02610"/><file name="Taxclass.php" hash="b25b1092a002c9692deb3e1444424a78"/></dir><dir name="Storage"><dir name="Media"><file name="Database.php" hash="dde851839f43a997e935b30fe953f04c"/><file name="Storage.php" hash="9a082b13981dead6103a18b6d0845863"/></dir></dir><file name="Store.php" hash="8433d131816c0aa1accdfbed1364ccfd"/><dir name="Tax"><dir name="Apply"><file name="On.php" hash="93e776dacc0803f7ef49e407cec37b81"/></dir><file name="Basedon.php" hash="72b88f1c39bd6b8049445ff9cbb3bb91"/><file name="Catalog.php" hash="d946fce1b89d627574c59b9fc54a1bd6"/></dir><dir name="Watermark"><file name="Position.php" hash="d6114250a47a4e690b477b30e2fac6cf"/></dir><dir name="Web"><file name="Protocol.php" hash="087447e01697f12a29971a164c3ada31"/><file name="Redirect.php" hash="8889b88265efa5bb9f51b310a5ed0611"/></dir><file name="Website.php" hash="9961cff233d7cf243d87d5446769130f"/><file name="Yesnocustom.php" hash="621fe7ccca08100c114d7aa29ee635bc"/><file name="Yesno.php" hash="2a033b5968617136021cdd5d631896fd"/></dir></dir><file name="Store.php" hash="245ea02c8e0de759d6c569357d9e0859"/></dir><file name="Url.php" hash="0df084e1de17a1e756f9e5c6a2a1f53c"/></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Mage_Adminhtml.csv" hash="e3901acde204f924baf932a72ba0e27a"/></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package><package><name>Lib_Js_Calendar</name><channel>community</channel><min>1.51.1.1</min><max>1.52</max></package><package><name>Lib_Js_Ext</name><channel>community</channel><min>1.7.0.0</min><max>1.8.0.0</max></package><package><name>Lib_LinLibertineFont</name><channel>community</channel><min>2.8.14.1</min><max>2.9.0.0</max></package><package><name>Lib_Js_TinyMCE</name><channel>community</channel><min>3.4.7.0</min><max>3.5.0.0</max></package></required></dependencies>
+</package>
diff --git a/var/package/Mage_Core_Modules-1.8.0.0.xml b/var/package/Mage_Core_Modules-1.8.0.0.xml
new file mode 100644
index 00000000000..239fcb9a16c
--- /dev/null
+++ b/var/package/Mage_Core_Modules-1.8.0.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Mage_Core_Modules</name>
+    <version>1.8.0.0</version>
+    <stability>stable</stability>
+    <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>Collection of Magento Core Modules</summary>
+    <description>Collection of Magento Core Modules</description>
+    <notes>1.8.0.0</notes>
+    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:31:01</time>
+    <contents><target name="magecore"><dir name="Mage"><dir name="Admin"><dir name="data"><dir name="admin_setup"><file name="data-install-1.6.0.0.php" hash="145a2a947b022b4fb4c38131b76dd943"/></dir></dir><dir name="etc"><file name="config.xml" hash="caad1e5653e24067c18bbed08e61c61b"/></dir><dir name="Helper"><file name="Data.php" hash="668d3fe6b16e2eb92dcf30910e0a01d3"/></dir><dir name="Model"><dir name="Acl"><dir name="Assert"><file name="Ip.php" hash="09ca9f02dbbe8b2fb6d62ba287e5d1f5"/><file name="Time.php" hash="9f6fbafa1161abcecd883044b5688a3e"/></dir><file name="Resource.php" hash="a4658b7f68bfd400f1f514eee6b8a822"/><dir name="Role"><file name="Generic.php" hash="042ca3f0a8e902fa64856f4787b6979c"/><file name="Group.php" hash="e196e83a26393d1047cc3c0589331d6a"/><file name="Registry.php" hash="327f2e1e7999037d189f03fcb5e3c581"/><file name="User.php" hash="f7da37ae0cf2dc9f3c0a017a9b2f2119"/></dir><file name="Role.php" hash="e77178106cbcd931ce251495ac086a92"/></dir><file name="Acl.php" hash="7eeaad0d0d98c70911e55042198040d4"/><file name="Config.php" hash="8e528a2b4dfe6776b7102b3c5ecc3590"/><dir name="Mysql4"><dir name="Acl"><dir name="Role"><file name="Collection.php" hash="a5b81d0dff9fc0b929acf5f073fd428a"/></dir><file name="Role.php" hash="6e8bdbb010cc9b1efc45aa974445309e"/></dir><file name="Acl.php" hash="d321bc784428a5e168791e922f015895"/><dir name="Permissions"><file name="Collection.php" hash="fea132672160416132d69320e533ada2"/></dir><dir name="Role"><file name="Collection.php" hash="f09e5dd5edc1b4263b40f74a4e2719e4"/></dir><file name="Role.php" hash="fd55f2cdd8c0f9f8d89380d823dccaa0"/><dir name="Roles"><file name="Collection.php" hash="eb17bb1e70e56317bd17de2305021701"/><dir name="User"><file name="Collection.php" hash="b203780708193eccb6493a81ecad86c4"/></dir></dir><file name="Roles.php" hash="9e178b69ee60bb1179654fcdcc23bb9c"/><dir name="Rules"><file name="Collection.php" hash="ea803529fd9ef2e48e6feab01cd3a279"/></dir><file name="Rules.php" hash="7901e937e2f7da7d4e7eb4c93cd0ac05"/><dir name="User"><file name="Collection.php" hash="132b6cc8832b4b41c87444c69c823995"/></dir><file name="User.php" hash="db76170b2f03aa18526d9b97292ca8df"/></dir><file name="Observer.php" hash="c6aa2d5d3c5ea95645a1af5892da255f"/><dir name="Resource"><dir name="Acl"><dir name="Role"><file name="Collection.php" hash="d0adfc1d049205c338133e8bf68fa1e7"/></dir><file name="Role.php" hash="deea95ad0a7f10af2aa4c947560db5d5"/></dir><file name="Acl.php" hash="82f85e03260d9830ff91e972175a7ca3"/><dir name="Permissions"><file name="Collection.php" hash="79b202930881903afbca9ab7157fc65c"/></dir><dir name="Role"><file name="Collection.php" hash="96d2d7ac5d047e27be15f8b6e4176bb5"/></dir><file name="Role.php" hash="288f6fbaf9facbd576f5a51369750c07"/><dir name="Roles"><file name="Collection.php" hash="3099d94db4e9cf48a968cdd1255542b0"/><dir name="User"><file name="Collection.php" hash="b2fdf6252412264c1fc91fa49c9e8734"/></dir></dir><file name="Roles.php" hash="c98c7036dbc5020e660bdd63202bc588"/><dir name="Rules"><file name="Collection.php" hash="dae98d63254bfea24c35df3721167301"/></dir><file name="Rules.php" hash="98f0675056e03a40bff735697a9b7b91"/><dir name="User"><file name="Collection.php" hash="db9d4080c147be6243635958bd6c7a5c"/></dir><file name="User.php" hash="99705a0518dd1d094f98b27e83b5a577"/></dir><file name="Role.php" hash="45fda2123797cb25f43373a164f90a8c"/><file name="Roles.php" hash="1b17350bed603de4ad41fba3c1871ab4"/><file name="Rules.php" hash="0d5634ad56eaa2ba6595890f6684c4a3"/><file name="Session.php" hash="38d89a1366a458ce79b2cd6fb8c32d6f"/><file name="User.php" hash="41b3e013c5f2de84611e7e8b830f23da"/></dir><dir name="sql"><dir name="admin_setup"><file name="install-1.6.0.0.php" hash="25f5d7648d1a665394c54873d9e910af"/><file name="mysql4-install-0.7.0.php" hash="45ce399e8df548c998c0ceca281e0208"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="2311e2793599ce5a3d09d112f117c404"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="288aafaeec8cbac3a2d5dbd440d889fb"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="867643eb4a5bf049cbdb165e3b786f5e"/><file name="upgrade-1.6.0.0-1.6.1.0.php" hash="849eff25332a59a55d3951e4ccf267c3"/><file name="upgrade-1.6.1.0-1.6.1.1.php" hash="bd73aa097ca356c7dcbfcde5652e8883"/></dir></dir></dir><dir name="AdminNotification"><dir name="etc"><file name="adminhtml.xml" hash="86e3bacfe609ee63353e260347c0c2bd"/><file name="config.xml" hash="9f82ab304a52b8bcf653a75916a23fcc"/><file name="system.xml" hash="e4457f70e46e2b685c4ce30783dbc07a"/></dir><dir name="Helper"><file name="Data.php" hash="7f253422718144321f3f7a994dddf326"/></dir><dir name="Model"><file name="Feed.php" hash="db6d04052177d3e6dd6685ca80b78078"/><file name="Inbox.php" hash="533804c7b223c269421c05ef2b40e8a5"/><dir name="Mysql4"><dir name="Inbox"><file name="Collection.php" hash="fee472f0f76d7722490fb52c3191e36f"/></dir><file name="Inbox.php" hash="c454f8b9cd5c8838462a76285cbf9bb6"/></dir><file name="Observer.php" hash="b9906fad6abfa189e53355429aa27f19"/><dir name="Resource"><dir name="Inbox"><file name="Collection.php" hash="e3500364d4438fc9c96064cfb700c168"/></dir><file name="Inbox.php" hash="b6000b4c25af36bacf2494a93044f018"/></dir><file name="Survey.php" hash="97453ac8be654cf8a3393c43c3fcb692"/></dir><dir name="sql"><dir name="adminnotification_setup"><file name="install-1.6.0.0.php" hash="14bc50375fb60e7e4564188cc53bb2d7"/><file name="mysql4-install-1.0.0.php" hash="4aa462c6c1c4e7b5c348f99100858893"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="03def0c5cee75fcc6a78a035d79f46dd"/></dir></dir></dir><dir name="Api"><dir name="Controller"><file name="Action.php" hash="a8f3b2058a3bad4b0d352fc82586d3ef"/></dir><dir name="controllers"><file name="IndexController.php" hash="a6874a1a8ed50b6198897047ddde5120"/><file name="SoapController.php" hash="32eaa0e1d452aa8e6195b009fedc7a3a"/><dir name="V2"><file name="SoapController.php" hash="f8e468005f5106cd51b965bfd52c87c1"/></dir><file name="XmlrpcController.php" hash="2c38549c96d7b51953d853bd937d0925"/></dir><dir name="etc"><file name="adminhtml.xml" hash="6a38418261fef5893bd8d9170a4d046d"/><file name="api.xml" hash="e91e9705af4246e6307c27ff7d9885bf"/><file name="config.xml" hash="57a0da8d7925a5353d45b1ad192309d0"/><file name="system.xml" hash="1e4cfcd92a41481a622b790219658101"/><file name="wsdl2.xml" hash="7d527421ba4b63a8a812ab6b1095891d"/><file name="wsdl.xml" hash="f0db676b04733b38f310355bb44bc3cb"/><file name="wsi.xml" hash="9fb1700cf935a26e7fada90a07fae7fe"/></dir><file name="Exception.php" hash="1c122cc217beddf4b15014584e28a1cf"/><dir name="Helper"><file name="Data.php" hash="3da188e6c4617162ae9a648b6dfa4b5a"/></dir><dir name="Model"><dir name="Acl"><dir name="Assert"><file name="Ip.php" hash="bae122c2007ca32ae03657607c6847bd"/><file name="Time.php" hash="ebf9df996baf7fe1791b5cb76851495b"/></dir><file name="Resource.php" hash="889760b07d1e2f5c56617f7874e7f9bc"/><dir name="Role"><file name="Generic.php" hash="b34f7897ca6764786abae8747f2a91ce"/><file name="Group.php" hash="7c3f381e1159d1807dc3f94d271f46f3"/><file name="Registry.php" hash="73e5aece47e3d9ea89aa61dc4c2c550e"/><file name="User.php" hash="67575e18879df254344941083824ae5f"/></dir><file name="Role.php" hash="838fd0ff956328983211cf46dc4a0c3b"/></dir><file name="Acl.php" hash="94c993762d0d0d67177e4706a1ad069f"/><file name="Config.php" hash="b3c12b2d800a8d228668c2a6c3e36489"/><dir name="Mysql4"><dir name="Acl"><dir name="Role"><file name="Collection.php" hash="60dd9a326d6a905eaadd8dea8da51891"/></dir><file name="Role.php" hash="fc426cadd4110bc0bd19b1f210c36131"/></dir><file name="Acl.php" hash="66f59ed378f0745c5c0d00d488276447"/><dir name="Permissions"><file name="Collection.php" hash="4642101400e27eb6fba716e07d5d0e82"/></dir><dir name="Role"><file name="Collection.php" hash="42687893bd5ea809330c0bd5631851b4"/></dir><file name="Role.php" hash="17d123850f594e9780219b02c4805d9e"/><dir name="Roles"><file name="Collection.php" hash="3e7fc78510f2c3ee681c9391a5a7eafa"/><dir name="User"><file name="Collection.php" hash="55c032d6936f59d8fad0bfbebc1f9f73"/></dir></dir><file name="Roles.php" hash="a10ceb1f198cb62b35bb1478f98e0312"/><dir name="Rules"><file name="Collection.php" hash="c786c21f8704777861faf53d1e250c37"/></dir><file name="Rules.php" hash="0ada834fb583567a00a74b297dd4961a"/><dir name="User"><file name="Collection.php" hash="928eb5966a3fb9efd72fbc1964b865ee"/></dir><file name="User.php" hash="36d641654ce3ac176897ea7032c06f1a"/></dir><dir name="Resource"><file name="Abstract.php" hash="cfdd0c7bbd3aa117b632913036305513"/><dir name="Acl"><dir name="Role"><file name="Collection.php" hash="83cd3129cb181c4e4003e5fe3c8a8f2c"/></dir><file name="Role.php" hash="233a59bba7fa30a5c05b663b6c29a744"/></dir><file name="Acl.php" hash="98e22c223f86fc01e26abd5cf7694127"/><dir name="Permissions"><file name="Collection.php" hash="8c286a5f5001f803255e70be3b81770b"/></dir><dir name="Role"><file name="Collection.php" hash="1637dd4afa80313ec4024894a836f330"/></dir><file name="Role.php" hash="f8581cbc351494d30d72ec80b333f166"/><dir name="Roles"><file name="Collection.php" hash="ef3d8fc2af1ddd73a221f6d47fd6066d"/><dir name="User"><file name="Collection.php" hash="756f58f2614086dfa1f4a348ee60463b"/></dir></dir><file name="Roles.php" hash="e808d8a9af3c07da49b5a8624982aa6f"/><dir name="Rules"><file name="Collection.php" hash="202bfa186d729c73d71a5b2ab99ff1cf"/></dir><file name="Rules.php" hash="034339290396d16d4f16cdfe720b9505"/><dir name="User"><file name="Collection.php" hash="0e4781fdcb94399e127f6515cae89088"/></dir><file name="User.php" hash="87981c7634dd3c24d03b74a8d7768912"/></dir><file name="Role.php" hash="5204604d372bd9d8aea637d3c5ee8050"/><file name="Roles.php" hash="a42dacd9b0598fc8469a9eac8ce430b2"/><file name="Rules.php" hash="f467c0270a2c5c72046f835bc84189b4"/><dir name="Server"><dir name="Adapter"><file name="Interface.php" hash="ee1620d933aa1f24893527eb981f86e4"/><file name="Soap.php" hash="959f050f42d5f57c8520dd6bb901a646"/><file name="Xmlrpc.php" hash="e8d5968756a8c7a0c3a5ee08f95956a0"/></dir><dir name="Handler"><file name="Abstract.php" hash="b33b97080cb9030bc09110e42d7d9ee7"/></dir><file name="Handler.php" hash="ea79748e8a24c32abe609799670d836c"/><dir name="V2"><dir name="Adapter"><file name="Soap.php" hash="e4aee88d94e9e79cc63874ed65e041d8"/></dir><file name="Handler.php" hash="a91364bdc7e703281a2ed1617cd37ab4"/></dir><dir name="Wsi"><dir name="Adapter"><file name="Soap.php" hash="968a68e449fc84ab1c96152be5c06915"/></dir><file name="Handler.php" hash="5fc667ab2c7dafe8d7f246de398a7310"/></dir></dir><file name="Server.php" hash="0908159c36ff3fd7093ae0893f0ae593"/><file name="Session.php" hash="59ed98a84bdce5cd9f4c77aa0b11305b"/><file name="User.php" hash="f8ae074806c936c0b83615e0897c3d52"/><dir name="Wsdl"><dir name="Config"><file name="Base.php" hash="0a941cc124d1d550faab0696029560be"/><file name="Element.php" hash="20410378f8897be74fae74e99f6aa239"/></dir><file name="Config.php" hash="11bdc1e2e7cc5e308af96a906c24e207"/></dir></dir><dir name="sql"><dir name="api_setup"><file name="install-1.6.0.0.php" hash="78e30fde7e978bf199beab7e53532ea4"/><file name="mysql4-install-0.7.0.php" hash="dcbb27856e26d4b3eb6cbb64eb0eebbc"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="79c32c8823935ba7cc5407a323d8dea3"/><file name="mysql4-upgrade-0.8.0-0.8.1.php" hash="8fdc2b417ee88b86fe1c2401a0701ab4"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="a262afd5ebc6b659b61126fcdb739e9a"/><file name="mysql4-upgrade-1.6.0.0-1.6.0.1.php" hash="f4865db815ed678d191fd471f0eadd86"/></dir></dir></dir><dir name="Api2"><dir name="Block"><dir name="Adminhtml"><dir name="Attribute"><file name="Buttons.php" hash="9ecdddb2f1928c93910bb30fa2b89c95"/><dir name="Edit"><file name="Form.php" hash="f29e8e329b2155c65d3d518e5450a2a6"/></dir><file name="Edit.php" hash="9d083386afa2f7e41673ccdd0bb6dacf"/><file name="Grid.php" hash="7e14536d71709f369d4a48eb551d8ccf"/><dir name="Tab"><file name="Resource.php" hash="8634e8a6fb97acfe3b212845dc5ef73a"/></dir><file name="Tabs.php" hash="c68526ef313329ad6ae69ab5a60a7a4b"/></dir><file name="Attribute.php" hash="3802c01411f3c5282b5b2ce492d71086"/><dir name="Permissions"><dir name="User"><dir name="Edit"><dir name="Tab"><file name="Roles.php" hash="9d031a1838df7d93312b025e2437123b"/></dir></dir></dir></dir><dir name="Roles"><file name="Buttons.php" hash="b67a5b67526627e8e8e58bad35469529"/><file name="Grid.php" hash="f060e2d3f35cff4bd0e2e6544356dc2c"/><dir name="Tab"><file name="Info.php" hash="22e4cbf7904c56fe4af5ecb48de37cd7"/><file name="Resources.php" hash="5136e98eccac7c005cd2e486976765ee"/><file name="Users.php" hash="60cd1b41e9a756cf4b6958b38db8b321"/></dir><file name="Tabs.php" hash="ed30e80b1fee765a768a5af9bc596e94"/></dir><file name="Roles.php" hash="b5dae51542657b5e76150ba63ddbfc47"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Api2"><file name="AttributeController.php" hash="e63636ea85ff5718de65bf1b3cc9e455"/><file name="RoleController.php" hash="e6eb721e3be943fcf1591fe4f234df1b"/></dir></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="2068b7725e8fa27082e72856a20cfe65"/><file name="config.xml" hash="c5aacdd03cf19fcb3e6710d774af711a"/></dir><file name="Exception.php" hash="b29a53ff1cf0a7ecd04eb8a2163f7ccd"/><dir name="Helper"><file name="Data.php" hash="280bb0a60a35e53ba8e560e25919aab0"/></dir><dir name="Model"><dir name="Acl"><dir name="Filter"><dir name="Attribute"><file name="Operation.php" hash="e16ee400525266e1f8fa39173d12c08c"/><file name="ResourcePermission.php" hash="12a5ec98f51a2fca0a64ce814081da9d"/></dir><file name="Attribute.php" hash="716b3d32061c90ef46257997fdda008d"/></dir><file name="Filter.php" hash="14dd710602108f02eb3ccfb78d6f6fcf"/><dir name="Global"><file name="Role.php" hash="1611511edf95095cf8f8889696d6f120"/><dir name="Rule"><file name="Permission.php" hash="55cad88a4ec9ac8d624c18a20957bfc5"/><file name="Privilege.php" hash="9a3024a2f2cb57aa4a236619bfbc7731"/><file name="ResourcePermission.php" hash="3b23c225caac870fe48d0663a513673c"/><file name="Tree.php" hash="78ebd17cf328173e89253ec84431de6e"/></dir><file name="Rule.php" hash="1a82ed5b621061bbae8deb88fadbcd79"/></dir><file name="Global.php" hash="f2738380fc6367d91a490a988a28dcc3"/><file name="PermissionInterface.php" hash="e26bf209bb98b2d677c4bc85ef5fdf58"/></dir><file name="Acl.php" hash="1e32e2df6daf16aa03d6be149837c985"/><dir name="Auth"><dir name="Adapter"><file name="Abstract.php" hash="5c826c1443b8fcd34a8ede8551122610"/><file name="Oauth.php" hash="9bc1d44870ef0418a0b5804be5bb3add"/></dir><file name="Adapter.php" hash="2ee482ea37b78f0888329df956c199b4"/><dir name="User"><file name="Abstract.php" hash="6c2f172f43c543349931e08c21866e56"/><file name="Admin.php" hash="ce233fff344a484386ab167907d477f0"/><file name="Customer.php" hash="8b73ae6abfef78dc48ea56a12be9de8f"/><file name="Guest.php" hash="a4f31e650783ad6e029a6436fe927870"/></dir><file name="User.php" hash="9ed82368bd00dbe4eefb1e03fcfbef6a"/></dir><file name="Auth.php" hash="d628cd8bf088f803e1441d759cc92fd6"/><file name="Config.php" hash="c27da92b13d60e03739ded5ff6b9a868"/><file name="Dispatcher.php" hash="1cc135a7c3de8dd35f9dcc5989d42829"/><file name="Multicall.php" hash="82381a36fe0172bef2b2d0497b660c15"/><file name="Observer.php" hash="29e4fc9f2c1a8a36542b53b628e0e081"/><dir name="Renderer"><file name="Interface.php" hash="c1ec874fcc29f7bfc8be8f95cfd2039a"/><file name="Json.php" hash="ec87eb53de1ac4e3eb7bc4644b8194a9"/><file name="Query.php" hash="7724211281e1b2f7cfcef9a35ed9d3ce"/><dir name="Xml"><file name="Writer.php" hash="3d0f2f64b44ef17476275b122c0ed941"/></dir><file name="Xml.php" hash="bc062055ba76472094bd5c51ec353fbe"/></dir><file name="Renderer.php" hash="48702b5883f50e131826053e7d0769c6"/><dir name="Request"><file name="Internal.php" hash="4f0d44aa88967126c7c00dec8cf804cf"/><dir name="Interpreter"><file name="Interface.php" hash="5b0e958f1d505eed2399974b98c7f7b4"/><file name="Json.php" hash="7a2d29b25edd612667f35fc652f1d096"/><file name="Query.php" hash="98e654fca2e4f1abd1eb7bb5505eb51e"/><file name="Xml.php" hash="a19373703fc0cb43b975ad143edd52cc"/></dir><file name="Interpreter.php" hash="656dfd5fc3f5b2c101600399e892f676"/></dir><file name="Request.php" hash="7805a97ec78ba461a4aa39068aad53f3"/><dir name="Resource"><dir name="Acl"><dir name="Filter"><dir name="Attribute"><file name="Collection.php" hash="56158fc3aa9d4e3776ca6989d09c3dfe"/></dir><file name="Attribute.php" hash="dffc8853799f80022de534c2e4e59821"/></dir><dir name="Global"><dir name="Role"><file name="Collection.php" hash="c985d7ca9add94d15360d9befd1d63d4"/></dir><file name="Role.php" hash="1e5c802f1e2d7f7753e8abd287f2696e"/><dir name="Rule"><file name="Collection.php" hash="98eab9e16e67c5060106016e3365ad26"/></dir><file name="Rule.php" hash="5f229b8223c7fada0e2d9d926927cb21"/></dir></dir><file name="Setup.php" hash="d5b30593a486fb00f1336f9eef1bf1c9"/><dir name="Validator"><file name="Eav.php" hash="741268e643216bb90242f185a2ae07f5"/><file name="Fields.php" hash="b2276308adb78e988e954dcf0b0ff367"/></dir><file name="Validator.php" hash="dd67405dc65f57d2808b9485ff155b5a"/></dir><file name="Resource.php" hash="4313dd190ec4b1e306db3602683f5daf"/><file name="Response.php" hash="97f6dc59cc30189b9c6e3cc47453dfdf"/><dir name="Route"><file name="Abstract.php" hash="d77246ad3914881dc74424d1cfb7d8e1"/><file name="ApiType.php" hash="f40e89c2f37e4605d89b8aec1cfb7b21"/><file name="Interface.php" hash="00228f30409a155c399e8b6c4e511141"/><file name="Rest.php" hash="f4a679f6097a6f0c414c04f5ad3196f0"/></dir><file name="Router.php" hash="014fd4756228be2a4adf32b261339b04"/><file name="Server.php" hash="9b5558ffd2d990ee797fed16524f1aca"/></dir><dir name="sql"><dir name="api2_setup"><file name="install-1.0.0.0.php" hash="5c6a317ab60cf0f960396ed0eb69ba9c"/></dir></dir></dir><dir name="Authorizenet"><dir name="Block"><dir name="Directpost"><file name="Form.php" hash="7a6409c81b9baddb198037f566135672"/><file name="Iframe.php" hash="4e1b67512653e2806a8a6bc0ada769fe"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Authorizenet"><dir name="Directpost"><file name="PaymentController.php" hash="9cb24c731cd86b9b1cf0715ecd07ac45"/></dir></dir></dir><dir name="Directpost"><file name="PaymentController.php" hash="4fdb387f046c3dd9a0c2df68165b994d"/></dir></dir><dir name="etc"><file name="config.xml" hash="b18d889cfeac2d56c0cb5b0b342efd35"/><file name="system.xml" hash="d133f8404ad586339b1d6c35e319883e"/></dir><dir name="Helper"><file name="Data.php" hash="f4e636c2039d466184adb581954e4cdb"/></dir><dir name="Model"><dir name="Directpost"><file name="Observer.php" hash="fa06a00e65801d15bbb35ca952b77867"/><file name="Request.php" hash="7bce89c7393fde8ecdc407253b20cab2"/><file name="Response.php" hash="cd4a125f7ccff990dbad778a2b187e9e"/><file name="Session.php" hash="2370edefb1f71d07896485482ae3fd2d"/></dir><file name="Directpost.php" hash="38b3a76a733de6816dbdd90d5ca07c5f"/></dir></dir><dir name="Backup"><dir name="etc"><file name="adminhtml.xml" hash="83d62ca297818cbb66efd2ae8e9375cd"/><file name="config.xml" hash="eca96f3c87241804a1224384a783899e"/><file name="system.xml" hash="62dbde5c31ffe8d5991bc6f83955650f"/></dir><file name="Exception.php" hash="63a7102e9fabf9cb75a5929c465f1979"/><dir name="Helper"><file name="Data.php" hash="9b880ad6f4f7a3b19b76a563908bf049"/></dir><dir name="Model"><file name="Backup.php" hash="acaba10b83754af56efdec0e7c64c2e1"/><dir name="Config"><dir name="Backend"><file name="Cron.php" hash="7c4bf81fea3fba44c5ba40a49a01fb90"/></dir><dir name="Source"><file name="Type.php" hash="4fa2eb9cdbc276c73d4ac4189537a362"/></dir></dir><file name="Db.php" hash="791d8c84737cfd1e4ee0e7f6af645708"/><dir name="Fs"><file name="Collection.php" hash="658f22a214ce21e9d19ef2aad7bc0062"/></dir><dir name="Mysql4"><file name="Db.php" hash="77b9c8c0572b93f26b6664b3a4c84630"/></dir><file name="Observer.php" hash="58490c328305ea18d686119591b76390"/><dir name="Resource"><file name="Db.php" hash="5e0a8cdf278c5cf528b554dfdf304f87"/><dir name="Helper"><file name="Mysql4.php" hash="374ac97d2efe43d3c6103532dbd092db"/></dir></dir></dir></dir><dir name="Bundle"><dir name="Block"><dir name="Adminhtml"><dir name="Catalog"><dir name="Product"><dir name="Composite"><dir name="Fieldset"><file name="Bundle.php" hash="4eedc42fcf235b2a75b365136b06a7c9"/><dir name="Options"><dir name="Type"><file name="Checkbox.php" hash="6824ac88334a5cadb485e09c05e0c385"/><file name="Multi.php" hash="4098687cd6dd1dfc63e3bb49f43bd0f3"/><file name="Radio.php" hash="fbad0e2b095e08d212ac2337a323360a"/><file name="Select.php" hash="70c309398788fa17c06289954ed4033a"/></dir></dir></dir></dir><dir name="Edit"><dir name="Tab"><dir name="Attributes"><file name="Extend.php" hash="159f6fe7c7b060d7b0b245240e438226"/><file name="Special.php" hash="75e46f3fde0da13649a1bb53d88b19e8"/></dir><file name="Attributes.php" hash="d42dcc47500071a6108e1ab375cfb9e4"/><dir name="Bundle"><dir name="Option"><dir name="Search"><file name="Grid.php" hash="a9b9509f13bfb4509aec65f83b958d60"/></dir><file name="Search.php" hash="ff26c15818d6c398bbe5a8f514aded1c"/><file name="Selection.php" hash="7ef1c34cbc5d8fc218d391feaa52f6ba"/></dir><file name="Option.php" hash="2c67b923ceb7be10ba78de4ccfdb1552"/></dir><file name="Bundle.php" hash="8d5cc8cb1e9c1de5e887618ff5af14e9"/></dir><file name="Tabs.php" hash="e0df01128851d1df611424d135912015"/></dir></dir></dir><dir name="Sales"><dir name="Order"><dir name="Items"><file name="Renderer.php" hash="0e24bbfcb1e1fc66c6e9268f1fc67aa4"/></dir><dir name="View"><dir name="Items"><file name="Renderer.php" hash="9b86421d4a5fee896ee3aa428529f086"/></dir></dir></dir></dir></dir><dir name="Catalog"><dir name="Product"><dir name="List"><file name="Partof.php" hash="cd09aa6d05e71fb0617e94a761afc709"/></dir><file name="Price.php" hash="1ec610f56e3cda328bd227f1c743c439"/><dir name="View"><dir name="Type"><dir name="Bundle"><dir name="Option"><file name="Checkbox.php" hash="ac0774edcfae8c954578766a639e8703"/><file name="Multi.php" hash="303739b57e341ce0c8771d9c54066d29"/><file name="Radio.php" hash="cbf154899c8cfeb37c27fa1c7f407790"/><file name="Select.php" hash="b25f77eb2feb5ca6a08624524370e9cb"/></dir><file name="Option.php" hash="f20ec67f16bc943a331ee74fd94816a3"/></dir><file name="Bundle.php" hash="a8e6bb4adf8f950cba40b33e99d126e3"/></dir></dir><file name="View.php" hash="2d99bef5e10e53997e80c7e68eb74f4f"/></dir></dir><dir name="Checkout"><dir name="Cart"><dir name="Item"><file name="Renderer.php" hash="cb25cbbb6fe5bb404046f18e25cd8634"/></dir></dir></dir><dir name="Sales"><dir name="Order"><dir name="Items"><file name="Renderer.php" hash="66ba7dff54ff3cd3c2c2de2589d1d92b"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Bundle"><dir name="Product"><file name="EditController.php" hash="f35878447cbd3283bdf620e7231fb847"/></dir><file name="SelectionController.php" hash="d40b74c51f96c85d930d697bb3b01f83"/></dir></dir><dir name="Product"><file name="EditController.php" hash="1a90f5062b635818b25a82f96520a538"/></dir><file name="SelectionController.php" hash="65b6943a2d5c622fc19a550329ca99c3"/></dir><dir name="data"><dir name="bundle_setup"><file name="data-install-1.6.0.0.php" hash="704f36ca3adfcdb5593d89b6938ca14e"/></dir></dir><dir name="etc"><file name="config.xml" hash="89528bd70878f0505994bce17329e0b1"/></dir><dir name="Helper"><dir name="Catalog"><dir name="Product"><file name="Configuration.php" hash="dc317de1d5c2fe81193c000666edb540"/></dir></dir><file name="Data.php" hash="88f016b3f3d4975dc7336860cf458c35"/></dir><dir name="Model"><dir name="CatalogIndex"><dir name="Data"><file name="Bundle.php" hash="49cdcb0b8a21a9863d05f433500488a6"/></dir></dir><dir name="Mysql4"><file name="Bundle.php" hash="290e69849efc355a8829c54152045db6"/><dir name="Indexer"><file name="Price.php" hash="febc7d36d92ba7838dd5cd9a483aa2db"/><file name="Stock.php" hash="140200e1ec7fb52357057feba89d91e9"/></dir><dir name="Option"><file name="Collection.php" hash="e69efe03d6c7ee502ad5f07902f5c251"/></dir><file name="Option.php" hash="478d876dd2c2b7b515d27e39daca4de5"/><dir name="Price"><file name="Index.php" hash="d7229eccb5c1818f354945005aecd6a6"/></dir><dir name="Selection"><file name="Collection.php" hash="b86c75c38aead1f8c19301674c57b6ac"/></dir><file name="Selection.php" hash="42ab6145a2d6730824e1262290374001"/></dir><file name="Observer.php" hash="684fd3cb4ba4ccb01b81c7c665d49abb"/><file name="Option.php" hash="9fb2b11de818eac23bdde9e11ee7806f"/><dir name="Price"><file name="Index.php" hash="08eb9eed194dca5329a1a9dd4c7f2dc2"/></dir><dir name="Product"><dir name="Attribute"><dir name="Source"><dir name="Price"><file name="View.php" hash="8f63ded9adc2ed0de625605a957f8a93"/></dir></dir></dir><file name="Price.php" hash="95f84b52dc3a3b28052d442b38cd895a"/><file name="Type.php" hash="9b3b5e34ef4f04e5ca09fbad72be3a23"/></dir><dir name="Resource"><file name="Bundle.php" hash="7b960e8bab4fd3a54af061b728ea563e"/><dir name="Indexer"><file name="Price.php" hash="62a65576cb7972754aa3c97584cd3d34"/><file name="Stock.php" hash="4241160781909ff2c364156d5cf423ce"/></dir><dir name="Option"><file name="Collection.php" hash="7b82c57c6d687165d2cf44beae7a8be7"/></dir><file name="Option.php" hash="f2cdd5bed549090dcdbe13461666eac7"/><dir name="Price"><file name="Index.php" hash="22268ab62259559faaa0a6a7faecbd08"/></dir><dir name="Selection"><file name="Collection.php" hash="5dee04b12e2a33b4f1b17e1053c40c41"/></dir><file name="Selection.php" hash="04c2fa578b41350d002fa1ec4f403d39"/></dir><dir name="Sales"><dir name="Order"><dir name="Pdf"><dir name="Items"><file name="Abstract.php" hash="84f52d958ffbefe58327490cf3787e19"/><file name="Creditmemo.php" hash="18756e38915d33b0598886a0714f00b2"/><file name="Invoice.php" hash="10d1ee44aee326ca2783871e362bd24c"/><file name="Shipment.php" hash="b660cd96424be3625bd2cbc0d5af2924"/></dir></dir></dir></dir><file name="Selection.php" hash="e0dd7c8bf0bf9dc26ae083a73b4bff9f"/><dir name="Source"><dir name="Option"><dir name="Selection"><dir name="Price"><file name="Type.php" hash="22152d93f3443deb8ec9fcd40fd3ec0c"/></dir></dir><file name="Type.php" hash="5837e9163832f0b2de322eba8ae5d811"/></dir></dir></dir><dir name="sql"><dir name="bundle_setup"><file name="install-1.6.0.0.php" hash="b226cb28e8ad8ecd381b2e308fc1b195"/><file name="mysql4-data-upgrade-0.1.13-0.1.14.php" hash="1d90a8f6ce0c6afe2b84e0998095be6c"/><file name="mysql4-install-0.1.0.php" hash="08d75e37d46fddc418159508e6152e19"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="ec87533b7e5ee419cb00333ed2d7d67c"/><file name="mysql4-upgrade-0.1.10-0.1.11.php" hash="329909b16d5fb794a7beb343fc34987c"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="9f26bf582848205065163c1a3a2dec50"/><file name="mysql4-upgrade-0.1.11-0.1.12.php" hash="acdb9dd20d747b4890035b308a55fba8"/><file name="mysql4-upgrade-0.1.12-0.1.13.php" hash="e593bd07036a34ad7e128faa808f4130"/><file name="mysql4-upgrade-0.1.2-0.1.3.php" hash="0e4cbd51fa2a7fd8b14185671a9b7746"/><file name="mysql4-upgrade-0.1.3-0.1.4.php" hash="2e3737201d5251f638da211cf999b653"/><file name="mysql4-upgrade-0.1.4-0.1.5.php" hash="78f08a804f8e2db12a99ead0498b92f4"/><file name="mysql4-upgrade-0.1.5-0.1.6.php" hash="6c575e141e96d6d7f0ce756ab09e978b"/><file name="mysql4-upgrade-0.1.6-0.1.7.php" hash="03c48db53620b075f962b7fe11bee0ba"/><file name="mysql4-upgrade-0.1.7-0.1.8.php" hash="337df5b43b9ca6fe25ae047cf007f9db"/><file name="mysql4-upgrade-0.1.8-0.1.9.php" hash="3d7071a15b19daea388308356cf5a8ef"/><file name="mysql4-upgrade-0.1.9-0.1.10.php" hash="27f1ef0531c3d967f8697d29c3ac7ee9"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="e1da936caf443d5239bc5fffacfa12a0"/><file name="mysql4-upgrade-1.6.0.0-1.6.0.0.1.php" hash="cc181aa01c3efd2829a5770a288899b2"/><file name="upgrade-1.6.0.0-1.6.0.0.1.php" hash="407879fe21df83f7dd30aa178f526e2f"/></dir></dir></dir><dir name="Captcha"><dir name="Block"><dir name="Captcha"><file name="Zend.php" hash="ffbf8d995bb75f3c8803fded8a4768db"/></dir><file name="Captcha.php" hash="ce5035cddf38029b45585f473ee47c6a"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="RefreshController.php" hash="ee0396034fc9f0e2b3e3b6e2a98581b9"/></dir><file name="RefreshController.php" hash="239b8055322ac27a294209f80e016ef6"/></dir><dir name="etc"><file name="config.xml" hash="12f6b073cf078146d00d62ef51651cf3"/><file name="system.xml" hash="690658c5a492270714d0bcc72550f103"/></dir><dir name="Helper"><file name="Data.php" hash="6f42cf12a0b962f97a0114d3cfd3cc27"/></dir><dir name="Model"><dir name="Config"><file name="Font.php" hash="1c62aedef1dd4a737f66da848abbaf70"/><dir name="Form"><file name="Abstract.php" hash="c9bbc3df33430641b456a1ef5cf445b5"/><file name="Backend.php" hash="cfdf863563a57502d71257ba9b11806c"/><file name="Frontend.php" hash="cdccc239c91602b5204d6675a87aa29e"/></dir><file name="Mode.php" hash="2a23c39de34e9a330fffd2e3cfd3fe22"/></dir><file name="Interface.php" hash="dbce8a3a499e2a8c1bc370036506a6e7"/><file name="Observer.php" hash="7ff26aafb866ea6a2476eafd511d6228"/><dir name="Resource"><file name="Log.php" hash="16a36311b7707fc6fa8fe9e308805c30"/></dir><file name="Zend.php" hash="7d4b905070efa21847ffbfd8cc6029cd"/></dir><dir name="sql"><dir name="captcha_setup"><file name="install-1.7.0.0.0.php" hash="7e140705a745857abf931fd505800426"/></dir></dir></dir><dir name="Catalog"><dir name="Block"><file name="Breadcrumbs.php" hash="dc9e922b228221db5ea70baffacc6676"/><dir name="Category"><file name="View.php" hash="24b0772ece662f018e6f8d0285011d25"/><dir name="Widget"><file name="Link.php" hash="51943311af899a10efd72e811f04a46a"/></dir></dir><dir name="Layer"><dir name="Filter"><file name="Abstract.php" hash="569759c08edaab1cdb5b6c259194381b"/><file name="Attribute.php" hash="e1b8a2fa5bc884eae8484c272ce207f0"/><file name="Category.php" hash="fa2df4e73dadd13b44d62d4a6d5ff25d"/><file name="Decimal.php" hash="605afd83a2ecb3941cd803cc567b1b1a"/><file name="Price.php" hash="c58bd4e7805195d2bd288b953b3a21c3"/></dir><file name="State.php" hash="e218ddafb70baa69e0d9082e7ec15a5e"/><file name="View.php" hash="c008a96f5e5fc6f4d367d47bee377b2a"/></dir><file name="Navigation.php" hash="15a50431173e196a6225fa88ace520bb"/><dir name="Product"><file name="Abstract.php" hash="059f66b8c66bf0eb5f2137ea1a004cee"/><dir name="Compare"><file name="Abstract.php" hash="78269ca45e70312138222e66d47ce0c5"/><file name="List.php" hash="5d8a8f0aa187ed8fc4b78218b56cddf0"/><file name="Sidebar.php" hash="63d0b9ae33733b0e78d4ad9f10e0e4b0"/></dir><file name="Gallery.php" hash="ceb0e1200f3504da31f68882ff6e8293"/><dir name="List"><file name="Crosssell.php" hash="b1e827a260196c3055939572237f60b5"/><file name="Promotion.php" hash="925ad8794cbd45d78d3ca2222369e944"/><file name="Random.php" hash="2b29b91cb4dfc1902bbb6e06ae21518a"/><file name="Related.php" hash="7388a2c16bc5c735ad80c19d9eed4a38"/><file name="Toolbar.php" hash="27ffcf367d419757fadcaf07965d3f21"/><file name="Upsell.php" hash="ac71dbeb570db3c8b0eae5587264c65d"/></dir><file name="List.php" hash="1cac6521c378360a1a6776bb0fb02f06"/><file name="New.php" hash="da1c08708b00346aa8eaf67540ed7294"/><dir name="Price"><file name="Template.php" hash="4f40d083dd3346932770a76dbe58f87b"/></dir><file name="Price.php" hash="be0601a984203f26bba5cdab288a657c"/><file name="Send.php" hash="0fb7118c94fc9fbd62afec4a7c38daef"/><dir name="View"><file name="Abstract.php" hash="bc0aae10b8b4a1cc828715d42ae00202"/><file name="Additional.php" hash="ad4116b8d16d1a4a42baeae7e928e0fc"/><file name="Attributes.php" hash="20f63c86e08129836c24153c6191c06b"/><file name="Description.php" hash="249ea0103d9d1bceb95b581d9eefe229"/><file name="Media.php" hash="28392b486ee1cb2520e2b93e02f7ed44"/><dir name="Options"><file name="Abstract.php" hash="8cfc7077188d68a5c6ed0e590c1b96c2"/><dir name="Type"><file name="Date.php" hash="d8d6f664fd350af6ef24339555137e89"/><file name="Default.php" hash="662faa975468e743d10ca0874d2806a2"/><file name="File.php" hash="e954fe2d3afca765c289e18fa6fbb399"/><file name="Select.php" hash="0c91bc6f8ff123f68cea46dc03548e0d"/><file name="Text.php" hash="c61f008cf7f940e27ca79284b9da0706"/></dir></dir><file name="Options.php" hash="27f57059c4b3b47150a14192c3c61df6"/><file name="Price.php" hash="0de63fad2d2765724137151c113e7ddb"/><file name="Tabs.php" hash="3818f4cebeb3c163a69f127d152045d6"/><dir name="Type"><file name="Configurable.php" hash="f6505827a6f6b904c73920c68f6e89c2"/><file name="Grouped.php" hash="f5c26394a55341522d043c3e1b9217ae"/><file name="Simple.php" hash="40dbb32b8d8f8ab18034af3c8fb89353"/><file name="Virtual.php" hash="e1f378e2265d6ec2181531449abb9065"/></dir></dir><file name="View.php" hash="31d671b8c3b8e241acd2a5284510e035"/><dir name="Widget"><dir name="Html"><file name="Pager.php" hash="7d9cc90487248a2ce8816c733febc2e5"/></dir><file name="Link.php" hash="a465566af5823d8d61973fd1511c429c"/><file name="New.php" hash="876fc482bd5c2dc5862fcd36a44fd35e"/></dir></dir><file name="Product.php" hash="8ceda690e095cfb529dfb89841a0eba5"/><dir name="Seo"><dir name="Sitemap"><file name="Abstract.php" hash="042a3e9d4f68986607793993a3b61b92"/><file name="Category.php" hash="2b03d8b59dd4d9ec59834dee4cec37c3"/><file name="Product.php" hash="db09ffc8393a23bd2a2bee64b77da16d"/><dir name="Tree"><file name="Category.php" hash="7e1b8c0ea353c7fa1cf82da49a212ce8"/><file name="Pager.php" hash="50703d82266da06084ade6709b43bc6a"/></dir></dir></dir><dir name="Widget"><file name="Link.php" hash="407ddfa8c96400eb9b130db91595d675"/></dir></dir><dir name="controllers"><file name="CategoryController.php" hash="032b5040829fa6fd0510bcf4023b3eeb"/><file name="IndexController.php" hash="beb90e52fa1b684861506c374baf158f"/><dir name="Product"><file name="CompareController.php" hash="40378a25f23699876e0509c756ed6fc6"/></dir><file name="ProductController.php" hash="2b60853942ee3aa4db8110e96f5cdd14"/><dir name="Seo"><file name="SitemapController.php" hash="65837364f9e0d4beffb64b9f06faccf4"/></dir></dir><dir name="data"><dir name="catalog_setup"><file name="data-install-1.6.0.0.php" hash="fbab910c7aa98246e46741274f17c72f"/><file name="data-upgrade-1.6.0.0.12-1.6.0.0.13.php" hash="3911aeb53668e40f7fb2272820790df9"/><file name="data-upgrade-1.6.0.0.13-1.6.0.0.14.php" hash="7306c67e63e71befcb56aa2ecde853bd"/><file name="data-upgrade-1.6.0.0.4-1.6.0.0.5.php" hash="9ccfe35014822fad827e39269574e7b9"/><file name="data-upgrade-1.6.0.0.8-1.6.0.0.9.php" hash="8459521031dffb50b88e9329a019ed0e"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="40beeeb31015db0ab3c34a54754999f9"/><file name="api2.xml" hash="9a778e459c7d57a8d05b4f88d81f7a5b"/><file name="api.xml" hash="c7045f94f3c0b8783d77eefcade87a85"/><file name="config.xml" hash="502ae6beee4c5154f8c3886af0848694"/><file name="convert.xml" hash="5af43903b4013d0952b569c2fb8cf418"/><file name="system.xml" hash="63e1da750fb8ed9fc1c82b5b9d427ee5"/><file name="widget.xml" hash="b03efa2295a3e667817c9c16212bdf14"/><file name="wsdl.xml" hash="5d8cb83637ec17fee6d788a8e6e971db"/><file name="wsi.xml" hash="1e5b98550e17d40a89dac371f747e929"/></dir><file name="Exception.php" hash="e4d7f8084f644da43a48f40a373dc2e1"/><dir name="Helper"><dir name="Category"><file name="Flat.php" hash="7ff07e03b6aa68b1b8562290dd74b8f3"/><dir name="Url"><dir name="Rewrite"><file name="Interface.php" hash="5e9320dc71fcd7cfbe67c4f4a58845a9"/></dir><file name="Rewrite.php" hash="627f104af145d0c7b6408b551e9fd91a"/></dir></dir><file name="Category.php" hash="b3391bbdb0ff672a33aba084471138ab"/><file name="Data.php" hash="03ecc2c8611d8c2c2c70dbe8771f8eb4"/><dir name="Flat"><file name="Abstract.php" hash="fa7225d63b763b053807e38ebd113ff1"/></dir><file name="Image.php" hash="70a2c674704ccb0ba1314a332077e984"/><file name="Map.php" hash="ce44179e8add0a6161ef1682df9c1eb8"/><file name="Output.php" hash="1a1f57a48a0ad1c343cb3bfe5e9086a2"/><dir name="Product"><file name="Compare.php" hash="f60307adcfefedbe5055cf19118f0da4"/><dir name="Configuration"><file name="Interface.php" hash="c095f59ce8ced6c87b3c116a096c52ae"/></dir><file name="Configuration.php" hash="04162bc060a553c95a325f93d446c46c"/><file name="Flat.php" hash="cefde54b79adfe5ef6e75ba464039e72"/><file name="Options.php" hash="f988c4f33eaa09438eee95ed3dc19dee"/><dir name="Url"><dir name="Rewrite"><file name="Interface.php" hash="4f060547161deff9f3313dfffb5c989c"/></dir><file name="Rewrite.php" hash="b9edba0f196802cfac2fe7559646678b"/></dir><file name="Url.php" hash="d265be34f3a67227bf2a86a63518a7b4"/><file name="View.php" hash="95181c79f2ae347ad5bb664bb0cff616"/></dir><file name="Product.php" hash="43046780e28df17716851d9dab202413"/></dir><dir name="Model"><file name="Abstract.php" hash="c281e885017d917455c4049104560a98"/><dir name="Api"><file name="Resource.php" hash="f3ae6f09bcbf5b3c7d58684ab98d23a4"/></dir><dir name="Api2"><dir name="Product"><dir name="Category"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="d7463365a68cc7698dbd952e4cc52970"/></dir><dir name="Customer"><file name="V1.php" hash="4897a1b88c4f08748e6eed7986ed3f3b"/></dir><dir name="Guest"><file name="V1.php" hash="89671a164cd1c5a59df1b22737cdb136"/></dir></dir><file name="Rest.php" hash="52f88cfde6aa54fac964ca5f49018c61"/></dir><file name="Category.php" hash="e228a73b6bad4b66397da9e7edcf7549"/><dir name="Image"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="7947cc5b90273de24139f05848b456ad"/></dir><dir name="Customer"><file name="V1.php" hash="e143921ca571fa41f2003379ed25e0c9"/></dir><dir name="Guest"><file name="V1.php" hash="2caef43ca7f3f588ed7cba057820306f"/></dir></dir><file name="Rest.php" hash="002f73eac76b368efb5d63f6eb36adac"/><dir name="Validator"><file name="Image.php" hash="43631447def8a029998ae04c8b04f889"/></dir></dir><file name="Image.php" hash="e0f3a3b7e3a3b72194720237289aef3b"/><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="27ef43f101b205c0ad22baa5392400df"/></dir><dir name="Customer"><file name="V1.php" hash="14a090b850abd03fbac17ead1ef6e40c"/></dir><dir name="Guest"><file name="V1.php" hash="37422a66a336b27f86df7bbb49479011"/></dir></dir><file name="Rest.php" hash="9c92c62d53932d54e53b28a57f53c467"/><dir name="Validator"><file name="Product.php" hash="bf95835adfed0a8911ecb8dac4db87b6"/></dir><dir name="Website"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="6b19391c139022f1f7ac021b43af2e3d"/></dir></dir><file name="Rest.php" hash="037f6b2f10421acfb952fe3b9a898264"/><dir name="Validator"><dir name="Admin"><file name="Website.php" hash="0e433d584ccca99b9acefd79bdab7fbc"/></dir></dir></dir><file name="Website.php" hash="641130e49b954337362c6a0488e52d21"/></dir><file name="Product.php" hash="42ce3a97fa396b42b7ff557b39f48cc0"/></dir><dir name="Attribute"><dir name="Backend"><file name="Customlayoutupdate.php" hash="f4ab7237def9ac94d33c03ec7eb09b44"/><dir name="Urlkey"><file name="Abstract.php" hash="45c67002c7753aec68d5419899dd489c"/></dir></dir></dir><dir name="Category"><dir name="Api"><file name="V2.php" hash="ec3fe9b7b86e1b6e1a012dfb1c18e191"/></dir><file name="Api.php" hash="48aa19e1c476773401a29ebf1a1fcee8"/><dir name="Attribute"><dir name="Api"><file name="V2.php" hash="f61fafde3b521c79f0101751609180ba"/></dir><file name="Api.php" hash="24605e5a575fcb8413073d61696e95e5"/><dir name="Backend"><file name="Image.php" hash="21ce9a5861450e48eef722887089f8eb"/><file name="Sortby.php" hash="b468e2f87d5dc712c238ac9c7260f644"/><file name="Urlkey.php" hash="9bba4c1dc7de04fb067ce5937cb38f69"/></dir><dir name="Source"><file name="Layout.php" hash="0e1cfcd254acee0bc655a1487388be19"/><file name="Mode.php" hash="b373a227f514ce26e1cda5e6938738a1"/><file name="Page.php" hash="97ad2b9da37e5002896afca12f61053e"/><file name="Sortby.php" hash="e2eee4b2f530328b5c6779605dcdc498"/></dir></dir><dir name="Indexer"><file name="Flat.php" hash="ff6b6d5e6326f58d56101a78b37f783b"/><file name="Product.php" hash="5f124ee71507c928d6c36efc4a9c7ab5"/></dir><file name="Url.php" hash="4e299fc4747eef04c5847115dcda1374"/></dir><file name="Category.php" hash="d8560050cc8e54db844184bdc1737ce7"/><file name="Config.php" hash="1fdf1ef67200887b33a80ff6172633c6"/><dir name="Convert"><dir name="Adapter"><file name="Catalog.php" hash="6c306896cec102b3598369b526ddd356"/><file name="Product.php" hash="e755fcc3a3b9d7386a9a8d77fee9c210"/></dir><dir name="Parser"><file name="Product.php" hash="5566eb7ef892e726d8e203d348906305"/></dir></dir><file name="Convert.php" hash="0337af3205a0971f20f0b32fdec3aa6c"/><file name="Design.php" hash="6e3c4bcf1ab14f24eea6a0a3191c7bf6"/><dir name="Entity"><file name="Attribute.php" hash="c667fd05f7c4b687500b9ab5b7e8e1c2"/><dir name="Product"><dir name="Attribute"><dir name="Design"><dir name="Options"><file name="Container.php" hash="e15f240921abc513c1c935d674afa2bb"/></dir></dir><dir name="Frontend"><file name="Image.php" hash="a5f142e07896ed343a51c89a29eb6ae4"/></dir></dir></dir></dir><file name="Factory.php" hash="a4f1a0cd7d3466f6fa9dd7f353e601a9"/><dir name="Indexer"><file name="Url.php" hash="b95a2d41553be1b7f48e31c5ada9764d"/></dir><file name="Index.php" hash="c2e37bb2c5b2e2c08bfdb8d5d5a82f08"/><dir name="Layer"><dir name="Filter"><file name="Abstract.php" hash="41f5bc312733ae1a8c7b6535476f2613"/><file name="Attribute.php" hash="2e25571187dfb6fb77d3099738d3f27c"/><file name="Category.php" hash="5d68e5cb2b338051f3465b4433876b49"/><file name="Decimal.php" hash="b8c45bedc4da0945ef09f22e7f0d12d6"/><file name="Item.php" hash="57a35e5fb7a897dfb6c15f2660ad1ffe"/><dir name="Price"><file name="Algorithm.php" hash="2c03f4df49550186c835dd2b26902be8"/></dir><file name="Price.php" hash="ed1265732b7624a2a3deea47a0396345"/></dir><file name="State.php" hash="a062acfe79a1c474990efd20d8139c1f"/></dir><file name="Layer.php" hash="3b59a186f95fac9850a7f8fc34a960b3"/><file name="Observer.php" hash="d9e5814c881485d38c7dbcf9114993a9"/><dir name="Product"><file name="Action.php" hash="d797dff6b9954a507e7e6dea103c505e"/><dir name="Api"><file name="V2.php" hash="ef05176e4faa490d4f8165859e9b6bcf"/></dir><file name="Api.php" hash="96247a452d6553ce35cc66ae5299867b"/><dir name="Attribute"><dir name="Api"><file name="V2.php" hash="d1b09b971caf68f6438d5acca09fa9d7"/></dir><file name="Api.php" hash="b0ca0ea5d13a8ee83545490eb23c8ca1"/><dir name="Backend"><file name="Boolean.php" hash="5d43b16dc03c8a17802d596f883bf5b5"/><dir name="Groupprice"><file name="Abstract.php" hash="1c464745115074ab1b75b35e366cd2ac"/></dir><file name="Groupprice.php" hash="05214af58303f852d1443a960cbe166a"/><file name="Media.php" hash="952b0ee5782a7649bfbf4ba7e1b6437c"/><file name="Msrp.php" hash="093ecdb7cc1d111c5cb6a6e346f235e8"/><file name="Price.php" hash="cf88ffa6a5cae7754649c3de65301294"/><file name="Recurring.php" hash="52ad084292a8d47d3ef47f0446f6bb47"/><file name="Sku.php" hash="5611966c68d03dd736ea8170a8c32cff"/><file name="Startdate.php" hash="f53e683ae7a658664c34a1d10fa249b6"/><file name="Tierprice.php" hash="4a2256c2a482a9c4888bc39b6e4ad217"/><file name="Urlkey.php" hash="1cf1a12d4f0c2fd2fb442abe9eb3a7c1"/></dir><dir name="Frontend"><file name="Image.php" hash="38a31a3ffa45775be209ed3fa4c59b9c"/></dir><file name="Group.php" hash="6051422dc8b3913a0bab046d9d25f639"/><dir name="Media"><dir name="Api"><file name="V2.php" hash="52458780d3a1103f9eb83a08b9d8a3df"/></dir><file name="Api.php" hash="3e78783c90a07384d0bc65cafec70825"/></dir><dir name="Set"><dir name="Api"><file name="V2.php" hash="38265b6ebcaecec52ede6c9dbd1ff575"/></dir><file name="Api.php" hash="d14893520702cfa5066d778daf8c0c61"/></dir><dir name="Source"><file name="Boolean.php" hash="0435bc68402916bc1bb9d83a6d18caab"/><file name="Countryofmanufacture.php" hash="5cd6d2e092352038061b3d56ff927b60"/><file name="Inputtype.php" hash="5211f52f96d9488ac3de0ba713aedd60"/><file name="Layout.php" hash="0cb39e26eda6df97c32ef5296e21ae05"/><dir name="Msrp"><dir name="Type"><file name="Enabled.php" hash="d82969a6d96c579857cb648f8c8428be"/><file name="Price.php" hash="de36e234ab22ef16540f68584b6ced6d"/></dir><file name="Type.php" hash="b6af2b9765e0dbd524f9eb72203db3ea"/></dir></dir><dir name="Tierprice"><dir name="Api"><file name="V2.php" hash="d46ec821e7072555f117056ee9287f8e"/></dir><file name="Api.php" hash="96793f25dd6f50995a37cbf14a724716"/></dir></dir><dir name="Compare"><file name="Item.php" hash="203d61ed118de7123dcebf595c9c6109"/><file name="List.php" hash="04d592bd07f4afcc039539d3cf7a3fd7"/></dir><dir name="Condition"><file name="Interface.php" hash="4123d8ead26f8b3d23cdc28f7cdda245"/></dir><file name="Condition.php" hash="4abf9e7c55fb78c59ecdcb7750761ef0"/><dir name="Configuration"><dir name="Item"><file name="Interface.php" hash="e33e94e74d7f5a8a1c31a63848f0f49a"/><dir name="Option"><file name="Interface.php" hash="c4100fea0a1092d1d9b2dc9c07b6340f"/></dir><file name="Option.php" hash="d7357c87274336c7b1f5c0a1b112503b"/></dir></dir><dir name="Flat"><file name="Flag.php" hash="f7bf904d892fac8e508abbf85f059aa6"/><file name="Indexer.php" hash="4bc262508a1a250d17f8420b166049d1"/><file name="Observer.php" hash="d56f0fbfcba79137e696dae413463c89"/></dir><file name="Image.php" hash="18ce2e2f48725521bbe8294ed4a4389b"/><dir name="Indexer"><file name="Eav.php" hash="b63e63aefc592e89c9e5cde2bbffca42"/><file name="Flat.php" hash="9f4c0484a2d6b8319df6494d0f8e76d1"/><file name="Price.php" hash="4f3b0c62e9e1d14cb4e1496590f2c2ca"/></dir><dir name="Link"><dir name="Api"><file name="V2.php" hash="597c076466a91df78258561b6697e01c"/></dir><file name="Api.php" hash="8d3acc8ad49a3c6944af0270bb470c34"/></dir><file name="Link.php" hash="2e9f26a075c75923667eebf9c15b4cff"/><dir name="Media"><file name="Config.php" hash="35263379f5d038a1f65495c14da95029"/></dir><dir name="Option"><dir name="Api"><file name="V2.php" hash="e34f6414ecb4c6a41146576bd8220183"/></dir><file name="Api.php" hash="98485a7c350344957c5a033ab871c612"/><file name="Observer.php" hash="dcdda369df03de933ca3907b578f3d2b"/><dir name="Type"><file name="Date.php" hash="efa9939248f48416abde4d1b05151b36"/><file name="Default.php" hash="034fa57259e0fede27cf46771f1abadd"/><file name="File.php" hash="fc009f745a8a3aaf475675e56df90187"/><file name="Select.php" hash="d23ba582720ce91e317315ef23da65c1"/><file name="Text.php" hash="31e80b4c587b8b2adbb3f993476efa72"/></dir><dir name="Value"><dir name="Api"><file name="V2.php" hash="1861092d45f3e44c6d4e998f9401ea8d"/></dir><file name="Api.php" hash="017e4295fea23f32492a1f9e0e553f1e"/></dir><file name="Value.php" hash="0067c50022591d8ce5d4a44aef403a80"/></dir><file name="Option.php" hash="86bfbd9ae590ec240285b576665a5d95"/><file name="Status.php" hash="b75a2d3e06a96368e7087ca93c7e98cc"/><dir name="Type"><file name="Abstract.php" hash="c39c757513a231937c1de3e02cd9d604"/><dir name="Api"><file name="V2.php" hash="3b0282ac4c4b655bae81d233c4b19035"/></dir><file name="Api.php" hash="8428eac3af499ac819048c87124718ab"/><dir name="Configurable"><file name="Attribute.php" hash="d204d9b64e356bb4235905080514ad0b"/><file name="Price.php" hash="6fc1458f4d17dfafac38ecdb229f2b89"/></dir><file name="Configurable.php" hash="064656d08e0c2ab778c0861a45e6ac7e"/><dir name="Grouped"><file name="Price.php" hash="baea4892f5aaf3cba6c5724fb62b5488"/></dir><file name="Grouped.php" hash="887b651e2869b4f01e4c700d233d0911"/><file name="Price.php" hash="6b9d4635a15ba577441ab7e9fdc75a8e"/><file name="Simple.php" hash="aee9e32012bfe6ca319868d97e874ad2"/><file name="Virtual.php" hash="25c9a032d4034566f523ff085c9e0145"/></dir><file name="Type.php" hash="3292c47e166dc1cd7f3a3d582c29a307"/><file name="Url.php" hash="31433f0ef54a50a7df0a7dbb526891c1"/><file name="Visibility.php" hash="b661bcce5b13c7a965db54c91726b9d5"/><file name="Website.php" hash="4f8c82955fbef1ec9b480cdfb3ffb0b4"/></dir><file name="Product.php" hash="b46e3627a75733a0d1cbbcf4ee145bf7"/><dir name="Resource"><file name="Abstract.php" hash="e11953fbeeaca598a1686e7de29f1ff6"/><file name="Attribute.php" hash="26504bb8d633845aaf4d4d5e8af7bd73"/><dir name="Category"><dir name="Attribute"><file name="Collection.php" hash="58936d1eccb09f1e00c409016160dfa5"/><dir name="Frontend"><file name="Image.php" hash="b4a53ea143ab7a300e403a66fe0ebdc7"/></dir><dir name="Source"><file name="Layout.php" hash="0f88b9f23cacaf040f9c11d160d1bfe6"/><file name="Mode.php" hash="9ea870023eb8ab6b9b47ff0cd36ef177"/><file name="Page.php" hash="557d5271400bdb65ffed1c31c33d1c9f"/></dir></dir><file name="Collection.php" hash="8cb67cc913e44c130289433b8fae6220"/><dir name="Flat"><file name="Collection.php" hash="7009be903240d0e3f11e4c6f61bb40e9"/></dir><file name="Flat.php" hash="65290f7b31d40c7291c106b1f74da524"/><dir name="Indexer"><file name="Product.php" hash="d24c19cdc021b0f599b8fc8ab62c9b36"/></dir><file name="Tree.php" hash="6dd71f99cfd237ac2b60541e75175bec"/></dir><file name="Category.php" hash="3274d1b6cee403313412468574d2c500"/><dir name="Collection"><file name="Abstract.php" hash="960e831ee7482fb2c863422de7321448"/></dir><file name="Config.php" hash="f0751d1bc0fe0917eb2114843fe469b5"/><dir name="Eav"><file name="Attribute.php" hash="5d38030672070332a3b96c399987300e"/><dir name="Mysql4"><file name="Abstract.php" hash="fec5ae896ed48dc0400c6bec078ce26f"/><file name="Attribute.php" hash="3cd9977f7f6f5cd55472a7ca8eee5d6c"/><dir name="Category"><dir name="Attribute"><file name="Collection.php" hash="e2ef88f78cc1743d888416112a9fb19e"/><dir name="Frontend"><file name="Image.php" hash="3b4bbb408fa469e390d8a23be3b5812c"/></dir><dir name="Source"><file name="Layout.php" hash="1ff45522651f53774670049ea761f6da"/><file name="Mode.php" hash="1a906f1c7d3ee735ee2c10585a35a1ab"/><file name="Page.php" hash="9f55b6962d18bb7562639e902296220c"/></dir></dir><file name="Collection.php" hash="a9c85649d2f1b1be6009e4fc337bcb09"/><dir name="Flat"><file name="Collection.php" hash="078192dc43424ae4e0e2060b62cba1a4"/></dir><file name="Flat.php" hash="1d674915d323e5614e60e1eea390fe9c"/><dir name="Indexer"><file name="Product.php" hash="5b9b697f13db78f46b33fb277d189a94"/></dir><file name="Tree.php" hash="1dcdee5288f75bda0387a9227ae2f47c"/></dir><file name="Category.php" hash="b8d250d3bbd7229866e83646055c6553"/><dir name="Collection"><file name="Abstract.php" hash="f0d3da3442bbd8ed41ae16723fdf1b20"/></dir><file name="Config.php" hash="467ec207f03fb54e7d25c3836381b5b9"/><dir name="Layer"><dir name="Filter"><file name="Attribute.php" hash="7d80489e6ea0c19670f62d845cea7df3"/><file name="Decimal.php" hash="b94b49abeada423022843d28a85ae39d"/><file name="Price.php" hash="00d4392df59fd6699152c016657b5689"/></dir></dir><dir name="Product"><file name="Action.php" hash="1f51c2b55a40c0e0aca8f7f8444c4c4d"/><dir name="Attribute"><dir name="Backend"><file name="Image.php" hash="2e775535a28167e3d8796fda21d94e0e"/><file name="Media.php" hash="4765cd26146659850e1d131ecd37fd40"/><file name="Tierprice.php" hash="93984939d06a090b100c313b62d4ca2a"/><file name="Urlkey.php" hash="4a77f9e363e9e4a4bb6b123ba1a3e586"/></dir><file name="Collection.php" hash="2396580a34957aa888018fde54294919"/><dir name="Frontend"><file name="Image.php" hash="bd4966494eeb1f05ea7ca52fedae40a7"/><file name="Tierprice.php" hash="4fd1416f762278dc713f4b19165f85c5"/></dir></dir><file name="Collection.php" hash="050506ce256fda2e015c2ae8b4fcbce8"/><dir name="Compare"><dir name="Item"><file name="Collection.php" hash="4f6cbedfb7b83105bbc4492a5f22ffd1"/></dir><file name="Item.php" hash="c9cc3cd5ea2d190d1a35b2b69f3c7a5d"/></dir><dir name="Flat"><file name="Indexer.php" hash="589a7e68689e17fcbb335c5732a6cf8d"/></dir><file name="Flat.php" hash="eca948eb7ace497105c509e4223404f3"/><dir name="Indexer"><file name="Abstract.php" hash="18a0d49dfc3031ce4d6fc0691965e57e"/><dir name="Eav"><file name="Abstract.php" hash="fe08264627b29aa1aa49511a6a6926ed"/><file name="Decimal.php" hash="bb1a0e68127a4b2e052e14213174b6a6"/><file name="Source.php" hash="21f8a6333f52c92030b59a89630759f6"/></dir><file name="Eav.php" hash="542ccf752ce59f3c8aa51e91407c833a"/><dir name="Price"><file name="Configurable.php" hash="741ba6c2a77604ddd83a3e73f7d44535"/><file name="Default.php" hash="fa7e137fce414bc3d564cf48f845cbae"/><file name="Grouped.php" hash="632cb9262af8925aff9fc766a3067b37"/><file name="Interface.php" hash="721633f30ee0c94d5325091329ef882d"/></dir><file name="Price.php" hash="b3f651ea4b47138f8d501c99388dcd41"/></dir><dir name="Link"><file name="Collection.php" hash="a7a7c84016d4b0d3ebd7932607360957"/><dir name="Product"><file name="Collection.php" hash="ff8f31e04293ae0439090f4b58e9fe91"/></dir></dir><file name="Link.php" hash="6dc93b2a6c467acb24849199a333fdbb"/><dir name="Option"><file name="Collection.php" hash="4c0bd5299489d93173a85c21c4f97a08"/><dir name="Value"><file name="Collection.php" hash="56a46ae9076e1343802dd7a6bd9fa21e"/></dir><file name="Value.php" hash="a12d798dc0e154896bba73732378d451"/></dir><file name="Option.php" hash="aef68a293d35b76735dbb3c7d586f737"/><file name="Relation.php" hash="9f1f38762dc49d15f88d194ba786a125"/><file name="Status.php" hash="c3d1d93f92128e897c2084a5c9338f94"/><dir name="Type"><dir name="Configurable"><dir name="Attribute"><file name="Collection.php" hash="3ce9b172d0f135d22c9447bfcfbe3695"/></dir><file name="Attribute.php" hash="5f66e38a4b18b5c2a61a3013cbeb36f1"/><dir name="Product"><file name="Collection.php" hash="76a60de645b1cf7e83281dd1f330cc84"/></dir></dir><file name="Configurable.php" hash="2e5de82551035112b4a32995eba29c52"/></dir><file name="Website.php" hash="8ac7919ab6445402f9c2da77a2915fb8"/></dir><file name="Product.php" hash="dc7e8ec8dc8b1fcc33783e1d2dd4c045"/><dir name="Sendfriend"><file name="Collection.php" hash="59042bef7888faf4785700b041764066"/></dir><file name="Sendfriend.php" hash="d6ab684eac529ef563075f3908ec522b"/><file name="Setup.php" hash="04290127a98dcfdf08d5b6f00c629afc"/><file name="Url.php" hash="f5b271ed01262736003047147a31f035"/></dir></dir><dir name="Helper"><file name="Mysql4.php" hash="11438e483612518abea5575579b49266"/></dir><dir name="Layer"><dir name="Filter"><file name="Attribute.php" hash="371bfffeb8b70149931ff8b38bbf801a"/><file name="Decimal.php" hash="76554717f86f55fd148f31be71810b36"/><file name="Price.php" hash="48376110c5346e18c80ffbca2547296d"/></dir></dir><dir name="Product"><file name="Action.php" hash="0d6bf5ae194c3522e15c98f31f37e78b"/><dir name="Attribute"><dir name="Backend"><dir name="Groupprice"><file name="Abstract.php" hash="a6e3e267cdf11af6f2ae1fcc948f173d"/></dir><file name="Groupprice.php" hash="214ace8c07913f70857fefc8a3091c0b"/><file name="Image.php" hash="95c78004fb3e9c20d566b30cee310b67"/><file name="Media.php" hash="47fd9d8f048a20a635b8edbd7ca5812a"/><file name="Tierprice.php" hash="f0e692f7bf1d29e667a9a71414bbb9b0"/><file name="Urlkey.php" hash="0605a3595dfc96acaeeecdbb84766807"/></dir><file name="Collection.php" hash="b33fa37d5fa8cb161fefd6d4c0753fa7"/><dir name="Frontend"><file name="Image.php" hash="e72df9dead7c27415e03e3b454085e14"/><file name="Tierprice.php" hash="81c63277524ed1b2b70bd9694d18c33a"/></dir></dir><file name="Collection.php" hash="d5a59183693a8f3a983c0e92318a1e3b"/><dir name="Compare"><dir name="Item"><file name="Collection.php" hash="9ba5594d68d345053bfc1fef3bdf90bb"/></dir><file name="Item.php" hash="a0619e7fb617034731cf65b8254b45a0"/></dir><dir name="Flat"><file name="Indexer.php" hash="0f37bc3f3a9e4d80758276e1ca14bd65"/></dir><file name="Flat.php" hash="b7134dc04eaa5f4816818a84f885da0e"/><dir name="Indexer"><file name="Abstract.php" hash="a26b5496f5a4c01c095e6d5337d0a7fc"/><dir name="Eav"><file name="Abstract.php" hash="878027ae169af53df47dd81ff5c4efac"/><file name="Decimal.php" hash="352267095b95f183f8d05c4b2da65dfd"/><file name="Source.php" hash="0f87e7cf65932cc08d22e78058cb4921"/></dir><file name="Eav.php" hash="21f382c28fe53739401a7d7b1631a252"/><dir name="Price"><file name="Configurable.php" hash="98e0d7ad60a4ba2362645da44459a156"/><file name="Default.php" hash="5d576b371baf194478dddc357976db74"/><file name="Grouped.php" hash="22c1c9360f2f795a404114331f045326"/><file name="Interface.php" hash="b8647f719b87f050dabcbe65f45e310d"/></dir><file name="Price.php" hash="99157d8fa86d3ed5be75c729e1577ab6"/></dir><dir name="Link"><file name="Collection.php" hash="56cab4cf9838358bcec7dff5fde2d384"/><dir name="Product"><file name="Collection.php" hash="b13cd35c223f3a7e6e4d9ba23ae2c0dd"/></dir></dir><file name="Link.php" hash="9352804e22afde329113e28069f5a016"/><dir name="Option"><file name="Collection.php" hash="8b9153db40d540e67b39119571925ab9"/><dir name="Value"><file name="Collection.php" hash="7c85bdbb63fb94b971bd97de4afc78d9"/></dir><file name="Value.php" hash="c5a31ad9328f651ac0f7890c8dd8db61"/></dir><file name="Option.php" hash="e76c073bd5d74d790c40b4b8478d6d63"/><file name="Relation.php" hash="0df8f410acf3ca869909c2057483bb23"/><file name="Status.php" hash="5cdcc578414e085cff014758db4a24d1"/><dir name="Type"><dir name="Configurable"><dir name="Attribute"><file name="Collection.php" hash="1ec0097d014793bc56770bc4f43a4d2a"/></dir><file name="Attribute.php" hash="7dba7704392f32cdc4ac004aa063abba"/><dir name="Product"><file name="Collection.php" hash="f07a3451715df0d8a15dc78285dea26c"/></dir></dir><file name="Configurable.php" hash="77f1e34c147dd0ebdc75d843f773dca1"/></dir><file name="Website.php" hash="327a5306a6f6cb15de7039c44b0497ee"/></dir><file name="Product.php" hash="e6703ac8bd516deb358a5762f8a1a8a0"/><file name="Setup.php" hash="f1c56f2dde18c6a5b7920a89ce416fa5"/><file name="Url.php" hash="a8f0db7dd902d57c84d7559c3006fc8a"/></dir><file name="Session.php" hash="c98c1c30ad83e073310c12204e76e108"/><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Catalog"><dir name="Category"><file name="Flat.php" hash="804cc67fcf6ca8db4fd3939b604c7cd9"/></dir><dir name="Product"><file name="Flat.php" hash="28a32826393ce3dc927b5b61c799136c"/></dir><dir name="Url"><dir name="Rewrite"><file name="Suffix.php" hash="804f66f8abddd0770e5a8d58469f3691"/></dir></dir></dir></dir></dir></dir><dir name="Template"><file name="Filter.php" hash="12a65323e1eacc536e9c14436d27173b"/></dir><file name="Url.php" hash="5b01d1ebce6cc01efd52c20f4818bf41"/></dir><dir name="sql"><dir name="catalog_setup"><file name="install-1.6.0.0.php" hash="982fb6352e0e7a49fd61d518b456eb8a"/><file name="mysql4-data-upgrade-0.7.57-0.7.58.php" hash="dfc18bb800cfde6020a951265fe62f8e"/><file name="mysql4-data-upgrade-0.7.63-0.7.64.php" hash="d91c5493cd2a597edcbf556e212d4741"/><file name="mysql4-data-upgrade-1.4.0.0.28-1.4.0.0.29.php" hash="3818bedb30f945f3146620ef330847ef"/><file name="mysql4-data-upgrade-1.4.0.0.42-1.4.0.0.43.php" hash="88ef36bdc70492ec1ce27c8abd585fc6"/><file name="mysql4-install-0.7.0.php" hash="6d56c529f68ef31ed41d47b97fe8d6c0"/><file name="mysql4-install-1.4.0.0.0.php" hash="32c7ddec7d7938f9923b222b0f699429"/><file name="mysql4-upgrade-0.6.40-0.7.0.php" hash="14d330802d294c4bbbcb23ca3b4e7a61"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="1c98efca82784e87a2bc17a5b8e6e466"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="fbeb032d50fdd80fd987d8d15bcdde60"/><file name="mysql4-upgrade-0.7.11-0.7.12.php" hash="32b043fbe235b2a6095969666766701f"/><file name="mysql4-upgrade-0.7.12-0.7.13.php" hash="2c333a67ccb85b3b0c3fe6594a9c9fc6"/><file name="mysql4-upgrade-0.7.13-0.7.14.php" hash="f3e99f8f7908706550d8440e16e509b3"/><file name="mysql4-upgrade-0.7.14-0.7.15.php" hash="311aaa9e49e770e527216c5a338df154"/><file name="mysql4-upgrade-0.7.15-0.7.16.php" hash="1f7b814ed6b28ffdce0e0d68b54f31af"/><file name="mysql4-upgrade-0.7.16-0.7.17.php" hash="2c333a67ccb85b3b0c3fe6594a9c9fc6"/><file name="mysql4-upgrade-0.7.17-0.7.18.php" hash="df70feec51961c39c06b09ab7f970a46"/><file name="mysql4-upgrade-0.7.18-0.7.19.php" hash="dbe182f5c9ea854e5ba1c2b18117e87b"/><file name="mysql4-upgrade-0.7.19-0.7.20.php" hash="32b043fbe235b2a6095969666766701f"/><file name="mysql4-upgrade-0.7.20-0.7.21.php" hash="220f6ea6cf76e77996b823ec1a1d6e44"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="cf27fb0124081d1fefc1c04946adf6de"/><file name="mysql4-upgrade-0.7.21-0.7.22.php" hash="a379adafcda21596148a2f8bf1d9682b"/><file name="mysql4-upgrade-0.7.22-0.7.23.php" hash="54b90012bd748bcb5924333126f0ab12"/><file name="mysql4-upgrade-0.7.23-0.7.24.php" hash="1e696686066ac38039f6042db6b82fbe"/><file name="mysql4-upgrade-0.7.24-0.7.25.php" hash="598f21eaf3188b66d71e5158a951526b"/><file name="mysql4-upgrade-0.7.25-0.7.26.php" hash="598f21eaf3188b66d71e5158a951526b"/><file name="mysql4-upgrade-0.7.26-0.7.27.php" hash="129381d8fcc97e872f78a4b9dccb708d"/><file name="mysql4-upgrade-0.7.27-0.7.28.php" hash="0aa391a4784e266e5e3b322fc7433fae"/><file name="mysql4-upgrade-0.7.28-0.7.29.php" hash="fbbf953870d2f65651720b3b1eca714e"/><file name="mysql4-upgrade-0.7.29-0.7.30.php" hash="4719d1b78ecfcb4c16a69f0af900ad67"/><file name="mysql4-upgrade-0.7.30-0.7.31.php" hash="b8399457e4ced2ad07491c3801895b8f"/><file name="mysql4-upgrade-0.7.31-0.7.32.php" hash="a76dac5f02b400884701a90382b268cb"/><file name="mysql4-upgrade-0.7.32-0.7.33.php" hash="392cd84f23752470fb6b7109e833de96"/><file name="mysql4-upgrade-0.7.33-0.7.34.php" hash="11bbfcfc6a131f1c1f262a962b40b05d"/><file name="mysql4-upgrade-0.7.34-0.7.35.php" hash="a1bd0eb394d10ee477bc06d7f8249d86"/><file name="mysql4-upgrade-0.7.35-0.7.36.php" hash="cee71fbbb5fb15dfe8aa79226f97aa42"/><file name="mysql4-upgrade-0.7.36-0.7.37.php" hash="0b019772e287ffe4160df566d4d2d588"/><file name="mysql4-upgrade-0.7.37-0.7.38.php" hash="400ab90a2d546f9f223cd5c260a720c0"/><file name="mysql4-upgrade-0.7.38-0.7.39.php" hash="3fd3d22a84af39c690e66e0988acb8a2"/><file name="mysql4-upgrade-0.7.39-0.7.40.php" hash="e35ef7bd4cd9ef46cfd54c1ae55bec83"/><file name="mysql4-upgrade-0.7.40-0.7.41.php" hash="214c49286c4facddfbccc50aadb50366"/><file name="mysql4-upgrade-0.7.4-0.7.5.php" hash="4108821c59117b57eaa51624fafa5e2c"/><file name="mysql4-upgrade-0.7.41-0.7.42.php" hash="92ca2b8befc3b446e1dbfbd5a7f432d9"/><file name="mysql4-upgrade-0.7.43-0.7.44.php" hash="4c772d38f1082bc1bb954b34c2ca9afa"/><file name="mysql4-upgrade-0.7.44-0.7.45.php" hash="fe1d11ca2fc0da4507a7bd0fcf8abfd1"/><file name="mysql4-upgrade-0.7.45-0.7.46.php" hash="771bad200ed8686a93d01f78adb0339c"/><file name="mysql4-upgrade-0.7.46-0.7.47.php" hash="283e3a0206033c523b7e4d8e2ac2a2fa"/><file name="mysql4-upgrade-0.7.47-0.7.48.php" hash="d54ed8cecc525b225bf8e72ac802f192"/><file name="mysql4-upgrade-0.7.48-0.7.49.php" hash="c09b37865b84f0e36bd3f199de743ffc"/><file name="mysql4-upgrade-0.7.49-0.7.50.php" hash="5fe092cf7191551179204f6d0acd0632"/><file name="mysql4-upgrade-0.7.50-0.7.51.php" hash="58d529dacfc06d7da6a94918ea646240"/><file name="mysql4-upgrade-0.7.5-0.7.6.php" hash="9110a8b68711e77c791d2ad9cc156bc4"/><file name="mysql4-upgrade-0.7.51-0.7.52.php" hash="4a916a4a3557ea131ff1865e74dd7a34"/><file name="mysql4-upgrade-0.7.52-0.7.53.php" hash="e7d94166d4d6a80c28731371282ae2ba"/><file name="mysql4-upgrade-0.7.53-0.7.54.php" hash="15c9ca280bdf99305b63281327555974"/><file name="mysql4-upgrade-0.7.54-0.7.55.php" hash="578d3eaae3e22ac5d4d366aabf36e03e"/><file name="mysql4-upgrade-0.7.55-0.7.56.php" hash="61e4a0df6e4bceb5863cfff29fc162df"/><file name="mysql4-upgrade-0.7.56-0.7.57.php" hash="f10bd4e0fe09b189e672cfdea1ca195b"/><file name="mysql4-upgrade-0.7.57-0.7.58.php" hash="53f71b8ad2571a6980b6eed1e20a7f41"/><file name="mysql4-upgrade-0.7.58-0.7.59.php" hash="6cd94ecd75f6d9b86f7b9903b6d12f79"/><file name="mysql4-upgrade-0.7.59-0.7.60.php" hash="e619a24252aadd843a5eaa9273528e21"/><file name="mysql4-upgrade-0.7.60-0.7.61.php" hash="a5990ab2248a9632f8e57a2d9fcd0468"/><file name="mysql4-upgrade-0.7.6-0.7.7.php" hash="32b043fbe235b2a6095969666766701f"/><file name="mysql4-upgrade-0.7.61-0.7.62.php" hash="762847b725d5fd594beba37f03363163"/><file name="mysql4-upgrade-0.7.62-0.7.63.php" hash="bee5f46108602066f28d5b8c53295305"/><file name="mysql4-upgrade-0.7.63-0.7.64.php" hash="95574b3b50ffb43f0048a00fd68b9db0"/><file name="mysql4-upgrade-0.7.64-0.7.65.php" hash="e2fb72d2fab5b8d0ac6c0df34f6af12e"/><file name="mysql4-upgrade-0.7.65-0.7.66.php" hash="133cd07a7501c6b0f769c6fcd09e55c8"/><file name="mysql4-upgrade-0.7.66-0.7.67.php" hash="dd74be8f48ddedde01bb5bf3c94cb950"/><file name="mysql4-upgrade-0.7.67-0.7.68.php" hash="d325bf970a80b2eb51040c26d0f0836f"/><file name="mysql4-upgrade-0.7.68-0.7.69.php" hash="8af4a3d517b329b3e0871d4a23f77117"/><file name="mysql4-upgrade-0.7.69-0.7.70.php" hash="e4aad2635fa22ef142a47fd929e68949"/><file name="mysql4-upgrade-0.7.70-0.7.71.php" hash="13c1c3aa4b1e59f5a8488492911ef85c"/><file name="mysql4-upgrade-0.7.7-0.7.8.php" hash="1e81214c778693970143870774b30369"/><file name="mysql4-upgrade-0.7.71-0.7.72.php" hash="5b045571a2e662f10e784fe7a27e6eaa"/><file name="mysql4-upgrade-0.7.72-0.7.73.php" hash="725b0b5ac584a5db4c4ac4024efa4ff6"/><file name="mysql4-upgrade-0.7.73-1.4.0.0.0.php" hash="b197fcfdc43aa685116d3b40e4e6a89f"/><file name="mysql4-upgrade-0.7.8-0.7.9.php" hash="54e1ab8f464f948952c51e25984683c8"/><file name="mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php" hash="b22a7d04eaed58de2d7ea6ef21bb51ac"/><file name="mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php" hash="b5e5b0f2caa137097a3c4cd31483ff1f"/><file name="mysql4-upgrade-1.4.0.0.11-1.4.0.0.12.php" hash="a9326930bf3bf128ae62417c9ca57b71"/><file name="mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php" hash="7d60933a7353919405908b05a4cab6ad"/><file name="mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php" hash="3a19c9b4a2a660aa4c28477450e7edb8"/><file name="mysql4-upgrade-1.4.0.0.13-1.4.0.0.14.php" hash="13ba066ce8d561246ef97ed4e8101530"/><file name="mysql4-upgrade-1.4.0.0.14-1.4.0.0.15.php" hash="ac867e50fb46d6ce8aceb83e4c401cf7"/><file name="mysql4-upgrade-1.4.0.0.15-1.4.0.0.16.php" hash="9cf5bab7b0d76f2cc81b0c2e76585f68"/><file name="mysql4-upgrade-1.4.0.0.16-1.4.0.0.17.php" hash="96ce2ff7f4cf967e07c4561790c84955"/><file name="mysql4-upgrade-1.4.0.0.17-1.4.0.0.18.php" hash="a9a3b58a1bc7812de03643f74876f3fa"/><file name="mysql4-upgrade-1.4.0.0.18-1.4.0.0.19.php" hash="f9c9e2d8a6e143df652232c5be3f289d"/><file name="mysql4-upgrade-1.4.0.0.19-1.4.0.0.20.php" hash="1ead9ab71bd0a5579780ad05092a351b"/><file name="mysql4-upgrade-1.4.0.0.20-1.4.0.0.21.php" hash="54358351366d3bb3d048a3a22491cf05"/><file name="mysql4-upgrade-1.4.0.0.21-1.4.0.0.22.php" hash="7822d6b18f17b48e3f0f2b838abfd37f"/><file name="mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php" hash="1db498452bc698b2f8f54c704c95b68e"/><file name="mysql4-upgrade-1.4.0.0.22-1.4.0.0.23.php" hash="bdc31bcafa9ad7fa9adfbb24b92ab916"/><file name="mysql4-upgrade-1.4.0.0.23-1.4.0.0.24.php" hash="3819ad8993293b85ca4cc93bb4f8a2b5"/><file name="mysql4-upgrade-1.4.0.0.24-1.4.0.0.25.php" hash="21e940cefa00a40a7ab29bf4809ef660"/><file name="mysql4-upgrade-1.4.0.0.25-1.4.0.0.26.php" hash="e1265bc263b705541430b8ab677b6244"/><file name="mysql4-upgrade-1.4.0.0.26-1.4.0.0.27.php" hash="c0ce662f94cc14d92c0fcc83ac3cb970"/><file name="mysql4-upgrade-1.4.0.0.27-1.4.0.0.28.php" hash="8e77a8896817b458b3a05a456161e4d8"/><file name="mysql4-upgrade-1.4.0.0.28-1.4.0.0.29.php" hash="934df90496b8c4c54aa20ac306305f9b"/><file name="mysql4-upgrade-1.4.0.0.30-1.4.0.0.31.php" hash="c2b135eae6838a795c533d911707390d"/><file name="mysql4-upgrade-1.4.0.0.31-1.4.0.0.32.php" hash="a75f6db7e7079ae8e86e3fb593015dda"/><file name="mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php" hash="60488ba899ac280017b6b74b32825ba5"/><file name="mysql4-upgrade-1.4.0.0.32-1.4.0.0.33.php" hash="df2810115655224359101f1e2e503d0c"/><file name="mysql4-upgrade-1.4.0.0.33-1.4.0.0.34.php" hash="858b0b7870d1ea3f2aa27ed9f8dbea60"/><file name="mysql4-upgrade-1.4.0.0.34-1.4.0.0.35.php" hash="621583cb65c9f66eec97f80ebaa74252"/><file name="mysql4-upgrade-1.4.0.0.35-1.4.0.0.36.php" hash="c2a258fa122b120a5dcc7562a0420c76"/><file name="mysql4-upgrade-1.4.0.0.36-1.4.0.0.37.php" hash="7613c541fc91b024d45841f06cc1cc62"/><file name="mysql4-upgrade-1.4.0.0.37-1.4.0.0.38.php" hash="f1067df5b98e728051e50b829bb0a303"/><file name="mysql4-upgrade-1.4.0.0.38-1.4.0.0.39.php" hash="13708f8b08f42abf0609258cc0906158"/><file name="mysql4-upgrade-1.4.0.0.39-1.4.0.0.40.php" hash="c6e890c3b1c5aa48efcf21d1233ecc64"/><file name="mysql4-upgrade-1.4.0.0.40-1.4.0.0.41.php" hash="8dfb06efe3d3145030730ac06f04796b"/><file name="mysql4-upgrade-1.4.0.0.41-1.4.0.0.42.php" hash="de02f83acccc228664a6fcaa28b10bf9"/><file name="mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php" hash="4a7b3d044d1d345c322e5c8de10b7c01"/><file name="mysql4-upgrade-1.4.0.0.43-1.4.0.0.44.php" hash="59ba96b8b6f4feeeb35d0b56da570c58"/><file name="mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php" hash="d20d5182f7047e64b5be39cc5ed2d427"/><file name="mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php" hash="ea4be62dd4b9fdffb2e4ff7958909be7"/><file name="mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php" hash="2f57e3d83a2b7a23966cfcc8a3070623"/><file name="mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php" hash="4e9c449b4e0a0debc26f670127a24bee"/><file name="mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php" hash="bfcd201cdf917b3bae73fd07ce257e85"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="411b20fedb1689c0226b886807445ec6"/><file name="mysql4-upgrade-1.6.0.0.8-1.6.0.0.9.php" hash="a03f0f16ac3bc565f547103974871a63"/><file name="upgrade-1.6.0.0.10-1.6.0.0.11.php" hash="c57992c4fd0168a5649d0914da6a8aa1"/><file name="upgrade-1.6.0.0.11-1.6.0.0.12.php" hash="112937031398e6f18be90b5ac3020196"/><file name="upgrade-1.6.0.0.1-1.6.0.0.2.php" hash="1df97005797ee1347aa92fa1c86d52cf"/><file name="upgrade-1.6.0.0.14-1.6.0.0.15.php" hash="c3be6d470138e508f59f8a0e1a6b6a8b"/><file name="upgrade-1.6.0.0.15-1.6.0.0.18.php" hash="6857e664e5bf33655f80509571dabfce"/><file name="upgrade-1.6.0.0-1.6.0.0.1.php" hash="1f174d3f3a36bdc468c419d1ba51e8de"/><file name="upgrade-1.6.0.0.2-1.6.0.0.3.php" hash="20ae5b3ae184a64f06ab4a1a8eac8266"/><file name="upgrade-1.6.0.0.3-1.6.0.0.4.php" hash="25c45a8eb6ed1da8d78e5c898fd2378f"/><file name="upgrade-1.6.0.0.4-1.6.0.0.5.php" hash="c9a58b29d41804208479121cfca91b0f"/><file name="upgrade-1.6.0.0.5-1.6.0.0.6.php" hash="2a3b132ddc02277d7f2680babe7dd015"/><file name="upgrade-1.6.0.0.6-1.6.0.0.7.php" hash="ff6032305fd04e2d37e0cc988774add8"/><file name="upgrade-1.6.0.0.7-1.6.0.0.8.php" hash="6a657e8dd4a49f348bba1b0f9bdc471e"/><file name="upgrade-1.6.0.0.9-1.6.0.0.10.php" hash="d0679e6cddc9465a6fcd49f4c2be1472"/></dir></dir></dir><dir name="CatalogIndex"><dir name="etc"><file name="config.xml" hash="cebed1209dcba034a684d003ee164a26"/></dir><dir name="Model"><file name="Aggregation.php" hash="d31e49e4021a25c8f0b8002b2df8f3eb"/><file name="Attribute.php" hash="8216005a3b312041d757b2f3141ed544"/><dir name="Catalog"><dir name="Index"><file name="Flag.php" hash="728d0d63881d0b92ffc306ec38fa4b38"/><dir name="Kill"><file name="Flag.php" hash="f692c8bb0d0971fb48fefb8fe7805efc"/></dir></dir></dir><dir name="Data"><file name="Abstract.php" hash="8e2c4bb22434751a580849560a0cb9e4"/><file name="Configurable.php" hash="99dba1fe074934df8a4bec5778a48139"/><file name="Grouped.php" hash="4567ab11ecf80d24feeb7b97588c7efe"/><file name="Simple.php" hash="9f7f40c69f9a7e6bc8851aa3ac0db6b1"/><file name="Virtual.php" hash="137215f3def15a5d66cc081b4d85bfeb"/></dir><dir name="Indexer"><file name="Abstract.php" hash="6ebb9a615befc97f163effbe3a337a57"/><file name="Eav.php" hash="48b369448ea565d1119e376fe0a10683"/><file name="Interface.php" hash="acdcc5ce1636212a561eddc59c3d5901"/><file name="Minimalprice.php" hash="883207d73852f406bc14da408c87238f"/><file name="Price.php" hash="d3ae232790da240f246a8d8cb2ad51b4"/><file name="Tierprice.php" hash="cb4390bd83f138bfdaa416280b8b070b"/></dir><file name="Indexer.php" hash="eaff59988ae56d15eb9299a393d9691d"/><dir name="Mysql4"><file name="Abstract.php" hash="523c30db0456b0a4d76a9bbd61aa1776"/><file name="Aggregation.php" hash="2186d569ca18fae53e2499f35e3d8bb6"/><file name="Attribute.php" hash="f61020eba9f656d9c581605331bd4b29"/><dir name="Data"><file name="Abstract.php" hash="0dbcb1e2e9cd55b95da9babb1c368978"/><file name="Configurable.php" hash="3e789a4925423e77bba4fec002a27e1f"/><file name="Grouped.php" hash="e3565acd1c7c98d576513a0a36867542"/></dir><dir name="Indexer"><file name="Abstract.php" hash="e8a0f9b01068bd9cdb3f54b9e2bbe9f6"/><file name="Eav.php" hash="ca386fb5c4d18025865af05efa5450fb"/><file name="Minimalprice.php" hash="f7053c7fd96aa26c6d385cb6e78a7f63"/><file name="Price.php" hash="6fa37730276d08f0599a7cee047a0ae1"/></dir><file name="Indexer.php" hash="ff634d986f1df8b265f576ab582f380d"/><file name="Price.php" hash="2e57ec66396ad0a1d33e2dcf836d372b"/><file name="Retreiver.php" hash="65dce2aa9cfbfd1d493f9da051895e8f"/><file name="Setup.php" hash="736cb9b99704d1d598c5526927743eb4"/></dir><file name="Observer.php" hash="d5031f11f182cd2c45d8c6d8c29bf53a"/><file name="Price.php" hash="00aa112b88eb078b61f5dabdec0293aa"/><dir name="Resource"><file name="Abstract.php" hash="b920d7e7d112815e18a505d3f9dd2b46"/><file name="Aggregation.php" hash="bb47797aefe50331eebc86956db3d505"/><file name="Attribute.php" hash="fceeb63c9a269a608c21b09dbf5277a3"/><dir name="Data"><file name="Abstract.php" hash="81efe64c5fa7122a30c4ed9ad87a66b0"/><file name="Configurable.php" hash="6e66e5369c0a2e9c85452c525d042a43"/><file name="Grouped.php" hash="70ccf67828dec422cc145e6f6e99983c"/></dir><dir name="Indexer"><file name="Abstract.php" hash="68414164d4ca4999af35421dfa7ba818"/><file name="Eav.php" hash="846addf70a651913144821681505f897"/><file name="Minimalprice.php" hash="4979be41b6e0f47210cc2977d80a178a"/><file name="Price.php" hash="808a3c1854ef88da56d2c04045826a38"/></dir><file name="Indexer.php" hash="210c0051d7e1840ad319260053774063"/><file name="Price.php" hash="dbfb03440574a3a591c54a8653ddea38"/><file name="Retreiver.php" hash="76f160263f80ce8906fa3c79c18aec77"/><file name="Setup.php" hash="ff6b8df2c48eb62465e6fb4bb704d746"/></dir><file name="Retreiver.php" hash="ad9dc6f9fe7744cd8053ee17cccb890c"/></dir><dir name="sql"><dir name="catalogindex_setup"><file name="install-1.6.0.0.php" hash="860ecb17811929019c3a6a6c0f4d6a7f"/><file name="mysql4-install-0.7.0.php" hash="1a4e1811125019c9356a150eca8de536"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="945cbff1870a44283b7fc382412dff76"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="1a126427d9bce784ef15ee7616da30a7"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="93fc44a3c00ee722c8cf98837e46f863"/><file name="mysql4-upgrade-0.7.3-0.7.4.php" hash="3ede4b2b68b2f346cff2893c25365903"/><file name="mysql4-upgrade-0.7.4-0.7.5.php" hash="e2e9b65960a14bb68370d109bfc97f36"/><file name="mysql4-upgrade-0.7.5-0.7.6.php" hash="66f4e131d6ae952954d3e1cf94882a9c"/><file name="mysql4-upgrade-0.7.6-0.7.7.php" hash="ab51d401b05f7e6e1e60ccff902a8618"/><file name="mysql4-upgrade-0.7.7-0.7.8.php" hash="ad87f9a12f527b713ce5016f2cf470d3"/><file name="mysql4-upgrade-0.7.8-0.7.9.php" hash="2f1dbe24ccbd7f8339ea0939747e61b7"/><file name="mysql4-upgrade-0.7.9-0.7.10.php" hash="5215cbfd7585b9008237d62cfe3227b8"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="59ac52b921d06c5d1e0b92b84f7b2453"/></dir></dir></dir><dir name="CatalogInventory"><dir name="Block"><dir name="Adminhtml"><dir name="Form"><dir name="Field"><file name="Customergroup.php" hash="0498233e3abf33b20e6b09f602a5d2aa"/><file name="Minsaleqty.php" hash="d5a530a0fa1a96f1f4fa0ef3a93614b3"/></dir></dir></dir><file name="Qtyincrements.php" hash="3d1dfa08d508213b95336415ae9c61bc"/><dir name="Stockqty"><file name="Abstract.php" hash="f6d1c072c97daa2e7644b503916935c2"/><file name="Composite.php" hash="5446215704ddf0eccb0552da10683bf1"/><file name="Default.php" hash="e34ac54facdf2a4341360025f538759c"/><dir name="Type"><file name="Configurable.php" hash="030d96a3b4e47180f303f22495e705c1"/><file name="Grouped.php" hash="cb09313a5d12922efea9ad0554e5eacb"/></dir></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="b17aca3af7c9b6f4d74ddb0d60d32d46"/><file name="api2.xml" hash="39f61c116e921d8c809780f45ddd2072"/><file name="api.xml" hash="341d5615343ca642faa846961a07a43a"/><file name="config.xml" hash="64da0ae1099eb28df78d9c16bbf0932d"/><file name="system.xml" hash="fe8fc14697c4056b750a2cead503f8f3"/><file name="wsdl.xml" hash="cfad5924eb32b8fb7ccf79309e5966df"/><file name="wsi.xml" hash="ec7bdd8cb2bc5dd12c0a4d865fe3d313"/></dir><dir name="Helper"><file name="Data.php" hash="4474095b8f0f7df69a780e9e91b7bcad"/><file name="Minsaleqty.php" hash="50de78c2d77ca61c14a0da39596a3b5f"/></dir><dir name="Model"><dir name="Api2"><dir name="Stock"><dir name="Item"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="d2750ff1cf07a2a841fbfef5d94e45fc"/></dir></dir><file name="Rest.php" hash="ff5ac4da52ee994b62aa7e0c7b490129"/><dir name="Validator"><file name="Item.php" hash="dd54a19910798771a536d48ab091e7db"/></dir></dir><file name="Item.php" hash="08bf42c3ae095995d25be2c8ef260eed"/></dir></dir><dir name="Indexer"><file name="Stock.php" hash="c980c19adbd3d5328393dd13d9a992fe"/></dir><dir name="Mysql4"><dir name="Indexer"><dir name="Stock"><file name="Configurable.php" hash="758cc6a7fabe488fb211e9e773791da1"/><file name="Default.php" hash="e8de50709391dde190379b7a1a1e51ee"/><file name="Grouped.php" hash="477a78ee8f78dbcdff286a8f865a1c56"/><file name="Interface.php" hash="ec5d055223a7fa3b29f51b47e27739e8"/></dir><file name="Stock.php" hash="a718e7580c584474251ef1fa6c1767ed"/></dir><dir name="Stock"><dir name="Item"><file name="Collection.php" hash="edee6ba7e7afa1470c9dd93244441491"/></dir><file name="Item.php" hash="99d4ac7b1db4b366a1aebf46ff13601e"/><file name="Status.php" hash="2845db012621452afb827f783ed30e71"/></dir><file name="Stock.php" hash="31c806ccca7b815a934815cdf7df8ea8"/></dir><file name="Observer.php" hash="d04a655b588b064a497f68a08c648be9"/><dir name="Resource"><dir name="Indexer"><dir name="Stock"><file name="Configurable.php" hash="eebcbc9337eee04eeb803d364fbb5579"/><file name="Default.php" hash="1019d4309ea8b9a5367823e2247523b9"/><file name="Grouped.php" hash="9374c4605bc457c74b1bd6db1f4f7ce5"/><file name="Interface.php" hash="5fc78d99b18a885ba29dfa162ef1323e"/></dir><file name="Stock.php" hash="7f81f24dc748a4b0038de8c46df3be45"/></dir><dir name="Stock"><dir name="Item"><file name="Collection.php" hash="8d4a97ad236196c1399b8970220e21e3"/></dir><file name="Item.php" hash="9e4e7422e75ed3297e2bbc786a270208"/><file name="Status.php" hash="6343582af9d0e202f3305db3c5ef9b01"/></dir><file name="Stock.php" hash="22c041ea9ed0de9ccc85fc86d2a0ddce"/></dir><dir name="Source"><file name="Backorders.php" hash="cf37f61676f9b7cd1537212a135d0003"/><file name="Stock.php" hash="10cbe3d356bd410faa68b3b0be15db04"/></dir><dir name="Stock"><dir name="Item"><dir name="Api"><file name="V2.php" hash="7fd26b45378a8b055f504a3a3eb198a5"/></dir><file name="Api.php" hash="e066c3bfcfe24b3959105e5fca1e977a"/></dir><file name="Item.php" hash="a307fac47a364d05c502702b03cdf415"/><file name="Status.php" hash="a39f6081db8f6579b51a8b340fd5b234"/></dir><file name="Stock.php" hash="9250bc10daf246bb45535a8b60a8855d"/><dir name="System"><dir name="Config"><dir name="Backend"><file name="Minqty.php" hash="e447a9a06aa8cc32c4016dbacf726898"/><file name="Minsaleqty.php" hash="ab2e9a7ca9f0f62977c9354cbe339c69"/><file name="Qtyincrements.php" hash="691c45b58ac705d8e7ed724825304aa2"/></dir></dir></dir></dir><dir name="sql"><dir name="cataloginventory_setup"><file name="install-1.6.0.0.php" hash="d2be040a825afd6214a26690c49a0cab"/><file name="mysql4-install-0.7.0.php" hash="b57e148f4fdea171ed2364dde009ffe1"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="e75d3bc6081ebee614933421f4a66d26"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="56fe7c36081664263d7e73889a48fe4d"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="25e0385b2d6353e4fd6caedad18318c3"/><file name="mysql4-upgrade-0.7.3-0.7.4.php" hash="5bee2a36440e1ae1505ed299f8203be3"/><file name="mysql4-upgrade-0.7.4-0.7.5.php" hash="8a4a14d587c4d5edec4a349888c1e539"/><file name="mysql4-upgrade-0.7.5-0.7.6.php" hash="5806390faabe64ee57ca1b6403e3cc4a"/><file name="mysql4-upgrade-0.7.6-0.7.7.php" hash="bd765a760d859e14d3a1aa68ee42b788"/><file name="mysql4-upgrade-0.7.7-0.7.8.php" hash="75d577f989a5595a17a29f84fe68ad5a"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="3dd540283ab6f7e9f66d9eb89764d739"/><file name="mysql4-upgrade-1.6.0.0-1.6.0.0.1.php" hash="e10cd368b68d2941fb9932b43197707d"/><file name="upgrade-1.6.0.0.1-1.6.0.0.2.php" hash="c9c61c8aee26892ce145f8be817fb4b7"/></dir></dir></dir><dir name="CatalogRule"><dir name="etc"><file name="adminhtml.xml" hash="018a68862ea89b44e871ab45f9c73543"/><file name="config.xml" hash="2b36fd0b69e0397afa26e74fd837928c"/></dir><dir name="Helper"><file name="Data.php" hash="88dd5fddb543c461faa7628c10a3766e"/></dir><dir name="Model"><dir name="Action"><dir name="Index"><dir name="Refresh"><file name="Row.php" hash="ba790cf19863c2dc24e040339ae183de"/></dir><file name="Refresh.php" hash="87ebccfc331c32d1fc590c13e7a68827"/></dir></dir><file name="Flag.php" hash="dab979c0515ff7ea791a6730b5f8c3a0"/><dir name="Mysql4"><dir name="Rule"><file name="Collection.php" hash="7a7603221700e83bdb5ab790d6e485ad"/><dir name="Product"><dir name="Price"><file name="Collection.php" hash="94794e2ff9a463ec00f0ff4bbd668686"/></dir><file name="Price.php" hash="99082930f79b87aa3dc3414103fe8075"/></dir></dir><file name="Rule.php" hash="4fb7bc501442dbaa6f19c7b23844fc28"/></dir><file name="Observer.php" hash="27928f107ed450072c427ff72ef9c3fc"/><dir name="Resource"><dir name="Rule"><file name="Collection.php" hash="6a17484a8b544d687dc17db8caa59d36"/><dir name="Product"><dir name="Price"><file name="Collection.php" hash="21a82e18647999f730292b77bcf0de45"/></dir><file name="Price.php" hash="1ca151e66b728d718e46bcae3d92c5a9"/></dir></dir><file name="Rule.php" hash="c9e0c97fadbe91803d95e8fd22cc8f6d"/></dir><dir name="Rule"><dir name="Action"><file name="Collection.php" hash="841d1b98c6df02294b077095cfaf20e8"/><file name="Product.php" hash="050fa52e3d3fd8841cfa648f59596f0f"/></dir><dir name="Condition"><file name="Combine.php" hash="c3ca1cbcccbe8fcd8591ff962e51d837"/><file name="Product.php" hash="7d2f2ccea8db76f9854f909838ccc197"/></dir><dir name="Product"><file name="Price.php" hash="070b4168d15c4cbad49155f08bb062d9"/></dir></dir><file name="Rule.php" hash="e190448d373f271156c6e40e6d10da23"/></dir><dir name="sql"><dir name="catalogrule_setup"><file name="install-1.6.0.0.php" hash="8647198997fdfd53ddbe91849c8d5367"/><file name="mysql4-install-0.7.0.php" hash="30bb62824df1fb5ca4f1cdece6f903db"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="cd45d2d0de0690e5afd405739327a1ea"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="ee393138d8e0b9d12f703aabdaa60df9"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="dde3fb667ecad49eb51e250d0408cf95"/><file name="mysql4-upgrade-0.7.3-0.7.4.php" hash="7831f348547c2b4445e5ed1af42ad08d"/><file name="mysql4-upgrade-0.7.4-0.7.5.php" hash="279dfffc07bc9b7fdf53ac466459a39b"/><file name="mysql4-upgrade-0.7.5-0.7.6.php" hash="3dd0652fb28fddf5af88dd88235c064e"/><file name="mysql4-upgrade-0.7.6-0.7.7.php" hash="624cd603f5e2dd5c7f53782b86516013"/><file name="mysql4-upgrade-0.7.7-0.7.8.php" hash="4a3237c84e5b0c31ae10a25e10a46955"/><file name="mysql4-upgrade-0.7.8-0.7.9.php" hash="4dac14552c92eea58d7331432e78187f"/><file name="mysql4-upgrade-0.7.9-0.7.10.php" hash="dbd3379543eab37f57e2937445e58b7f"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="ed26249c627adaca4dbcb2042e07406d"/><file name="upgrade-1.6.0.0-1.6.0.1.php" hash="b52d869687af6062f1ee30ff7b881ffe"/><file name="upgrade-1.6.0.1-1.6.0.2.php" hash="d38baf71a49c81338e05052260b6e279"/><file name="upgrade-1.6.0.2-1.6.0.3.php" hash="dcfbd14db4e00bf539c03640adca51dd"/></dir></dir></dir><dir name="CatalogSearch"><dir name="Block"><dir name="Advanced"><file name="Form.php" hash="9bcee8af4a6266723667a95c4416c701"/><file name="Result.php" hash="6a4bfa47742489fe354d8b2300f793e6"/></dir><file name="Autocomplete.php" hash="ce49fdff1b1b27e537f42e9e1112e63d"/><dir name="Layer"><dir name="Filter"><file name="Attribute.php" hash="2b25b33a5d50e9a777a2abd9d36cad25"/></dir></dir><file name="Layer.php" hash="c6710073ca2271ef34ddadeb176c7edf"/><file name="Result.php" hash="f883ee8baa2df0281dbed937fb3309a5"/><file name="Term.php" hash="9b28f96049c33602054100bdb50fb3ec"/></dir><dir name="controllers"><file name="AdvancedController.php" hash="498aa9679d3e7781ebb0117bb5771b44"/><file name="AjaxController.php" hash="9b7b237a0e6d3f341c77fe8b98c4658f"/><file name="ResultController.php" hash="6807b302606a33cb8b04fa9a577332e4"/><file name="TermController.php" hash="82e958818353f74417d9ba8c0b1cc674"/></dir><dir name="etc"><file name="adminhtml.xml" hash="e08e0df767b8ca1d9784b46b526165f5"/><file name="config.xml" hash="a9df768dc162759a459ba3ecd9080807"/><file name="system.xml" hash="525d2f29f07ba11fad6d254d96b456b2"/></dir><dir name="Helper"><file name="Data.php" hash="dcb5f6c1343c96ef74abf9e339f22a02"/></dir><dir name="Model"><file name="Advanced.php" hash="9d35c203ea49bf6d60d2b5015895d4f9"/><dir name="Fulltext"><file name="Observer.php" hash="d908ae2847e466c59c5d8d202f586d07"/></dir><file name="Fulltext.php" hash="c16f9ac4c0b7636f1f90b31f6c38292a"/><dir name="Indexer"><file name="Fulltext.php" hash="ce7566291fffbe7d4bbbd21f7b7daeb7"/></dir><dir name="Layer"><dir name="Filter"><file name="Attribute.php" hash="e1d0ab63463857b987729d8e6db84d12"/></dir></dir><file name="Layer.php" hash="c0888219027262e120bcd22cc3731437"/><dir name="Mysql4"><dir name="Advanced"><file name="Collection.php" hash="9e1bc81e2ea0076649a3a50aa7305c5e"/></dir><file name="Advanced.php" hash="5a8f9130ea06c931ccc0845a25247799"/><dir name="Fulltext"><file name="Collection.php" hash="ecbc5c6b6458e4fe673dcc95f4db60fe"/><file name="Engine.php" hash="9240bf0a6cb48fe163cfc96638fe8587"/></dir><file name="Fulltext.php" hash="112505d321cacb2bd7ed482b095e6907"/><dir name="Indexer"><file name="Fulltext.php" hash="34f7143487177721a75cde041a0765fb"/></dir><dir name="Query"><file name="Collection.php" hash="78eab5ce9c4d4449d7930d59ca58ea37"/></dir><file name="Query.php" hash="e94e75700baf44ef3b0708cf46f0e849"/><dir name="Search"><file name="Collection.php" hash="746730d3ccd1412d6e52b25d431fda45"/></dir></dir><file name="Query.php" hash="fe49a8eda184d8e322e5ca2999f52b12"/><dir name="Resource"><dir name="Advanced"><file name="Collection.php" hash="803b45cf70551b580402d50891be1a89"/></dir><file name="Advanced.php" hash="78afe82b617efeaff140d202a742acc5"/><dir name="Fulltext"><file name="Collection.php" hash="9d529834b506a0dde8600b584d13b797"/><file name="Engine.php" hash="957ed76dc9d0139123f03c2ac12359f5"/></dir><file name="Fulltext.php" hash="e52bbe6e254b484383e6c39a1647985c"/><dir name="Helper"><file name="Mysql4.php" hash="f625168d95a7d0343f63bf38de9681a4"/></dir><dir name="Indexer"><file name="Fulltext.php" hash="8b83be6ace7a750f9fc3a4a5524b50fb"/></dir><dir name="Query"><file name="Collection.php" hash="75602dde2b833cb4d311b71530cb6817"/></dir><file name="Query.php" hash="29057de0700bccecd33dcdb5a7a7acde"/><dir name="Search"><file name="Collection.php" hash="6f8c4e7a54577a2f075b5fa203544861"/></dir></dir><file name="Session.php" hash="c6ed3524fcb78805a996cb8f1d48f934"/><dir name="System"><dir name="Config"><dir name="Backend"><file name="Sitemap.php" hash="a0a3ab54e8f1a72da79327a31af15d95"/></dir></dir></dir></dir><dir name="sql"><dir name="catalogsearch_setup"><file name="install-1.6.0.0.php" hash="8e418826108665e64a6fa8b1f3acbe1c"/><file name="mysql4-install-0.7.0.php" hash="7dec78028211de0e717ba46c998120eb"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="a6c3b7716ccf81add863940649196e47"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="2f119fd2af710b97b6294df41e8b2d1e"/><file name="mysql4-upgrade-0.7.3-0.7.4.php" hash="2ed349b8a14ebc9217e263f6ad80dee7"/><file name="mysql4-upgrade-0.7.4-0.7.5.php" hash="688b09ce96282fa566ba54eae0e068cc"/><file name="mysql4-upgrade-0.7.5-0.7.6.php" hash="c534564410db7ce8bd53c467a6d13caf"/><file name="mysql4-upgrade-0.7.6-0.7.7.php" hash="e691a335ae15a78b516378581eb69437"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="f979a354003609bf8412249b6c476f11"/></dir></dir></dir><dir name="Checkout"><dir name="Block"><file name="Agreements.php" hash="f32f01463d6bcb6b8e532edbf37680c6"/><dir name="Cart"><file name="Abstract.php" hash="1c4323edfecc1bc5d638a4364a543742"/><file name="Coupon.php" hash="24b37f09465eb5cf3ac892cd1da72471"/><file name="Crosssell.php" hash="832cc52a6a0a012c7dcfb0b5f84fbde7"/><dir name="Item"><file name="Configure.php" hash="b0cbf337bafea5e431a4f22f83b69abd"/><dir name="Renderer"><file name="Configurable.php" hash="1569fe73631a5f291921b5ca782483ea"/><file name="Grouped.php" hash="21fc6300c199a4fcc63e65573c8667b7"/></dir><file name="Renderer.php" hash="5351c2fb03e9c0475dd40baecbb7f76e"/></dir><file name="Shipping.php" hash="a7a8d27af384dbc2479f801e283db893"/><file name="Sidebar.php" hash="59721df7c72a13ba0b48a590ad1e8833"/><file name="Totals.php" hash="2ad8e2ed4784125ae3e7b9338c6c55dc"/></dir><file name="Cart.php" hash="855a53a7111d15384fe747603c557684"/><file name="Links.php" hash="0ddfa33bf29b7a0e059b450e99bf12d6"/><dir name="Multishipping"><file name="Abstract.php" hash="3c7c478c24774bf06dab3cb1ba93e237"/><dir name="Address"><file name="Select.php" hash="4bb89f228f678fee3767436ff6d978b3"/></dir><file name="Addresses.php" hash="11e84faf57e605f841431c907c8e977d"/><dir name="Billing"><file name="Items.php" hash="2969f6313e30374279e107bd6564b252"/></dir><file name="Billing.php" hash="a61ec69be71fc006da0c1f7b30c79220"/><file name="Link.php" hash="a4459fbf533bf5e3d9f538948a5dadde"/><file name="Overview.php" hash="d7971c40a4e0f269783ec670a302ad0c"/><dir name="Payment"><file name="Info.php" hash="52a3975182b862b6d7ea8e3512215372"/></dir><file name="Shipping.php" hash="3e4ac9bea370e7e48fb31822e1df3719"/><file name="State.php" hash="035d683a8f1132ff72e98628a3f88a17"/><file name="Success.php" hash="c348035feaeccee757d11b8b475a2466"/></dir><dir name="Onepage"><file name="Abstract.php" hash="fd8671019473e80b647bf60a6fd5b72a"/><file name="Billing.php" hash="6cfc735012d0bdb260cb79bfb0adbd0c"/><file name="Failure.php" hash="53df1a06a269ccdb7394c055f1a066e6"/><file name="Link.php" hash="02180863ab252ea1d1b2d1a76ed2b58d"/><file name="Login.php" hash="849dee3698c3b77d7dadbd89db33bb06"/><dir name="Payment"><file name="Info.php" hash="55755913bd2f2cb0646d7e3a2bbc255c"/><file name="Methods.php" hash="e178a6d508711d77e8156b076ede4e6c"/></dir><file name="Payment.php" hash="ce00f30aed0f4d880e2a7c24cc49dc4f"/><file name="Progress.php" hash="25fb4c9fb54804b49974206d0150d798"/><dir name="Review"><file name="Info.php" hash="2c0f1b6903f622bec431878a78fe3edf"/></dir><file name="Review.php" hash="70a8f63d4c8145082fafb337f5be2583"/><dir name="Shipping"><dir name="Method"><file name="Additional.php" hash="dce7cb83d1f41eb4fa79248a01e0178a"/><file name="Available.php" hash="735eb2286ad049d997f9acc8fc890637"/></dir><file name="Method.php" hash="ce928ddbb936592a7e49809c6b118d24"/></dir><file name="Shipping.php" hash="4ccd3acad8ad5da2f85bb874cec5c326"/><file name="Success.php" hash="56fdb6969a2d65aa57f0a9b190645ecb"/></dir><file name="Onepage.php" hash="866f261f1b72beaa823b572d46afd863"/><file name="Success.php" hash="b18b7150af82f962062db366df7039a6"/><dir name="Total"><file name="Default.php" hash="038bf549bbdfe00b4a507f1c57cba108"/><file name="Nominal.php" hash="6202ca5112e9dd463504c6c4b1ee92a2"/><file name="Tax.php" hash="c66ae8078055044ceeae6bc4d522491e"/></dir></dir><dir name="Controller"><file name="Action.php" hash="c9f4ed5f0de6f8f4416d0cdcb28e885f"/></dir><dir name="controllers"><file name="CartController.php" hash="e3c03f02b7f1aaff286f27e1c4ceabb6"/><file name="IndexController.php" hash="cdb7dce888886353403814f91355926c"/><dir name="Multishipping"><file name="AddressController.php" hash="899d1b5e33fa250e26a8d20d7ed4fa14"/></dir><file name="MultishippingController.php" hash="0c41105cd385832715bc9e58d4e2a85c"/><file name="OnepageController.php" hash="6cacd468286fcdbe1423e010f5609346"/></dir><dir name="etc"><file name="adminhtml.xml" hash="788c8c0e9eede6205cc0bab56ad42884"/><file name="api.xml" hash="1219d93e3ae5d86fe52cb8fbcf0dee1e"/><file name="config.xml" hash="33f21ae7b4783e782d21a6e72e3ad9f7"/><file name="jstranslator.xml" hash="5a2bb916060ed6f57242c6909f45906b"/><file name="system.xml" hash="5032057ed76a0a96b1aa843453aaccff"/><file name="wsdl.xml" hash="9a10e25803e84713f5031a168dd0c624"/><file name="wsi.xml" hash="2567bee4ef18e1b426c700ce66c3bcb1"/></dir><file name="Exception.php" hash="04b7d293c0dd6c3bf7c5f357ec6e2a28"/><dir name="Helper"><file name="Cart.php" hash="6e1a4ca0c6cbbeb44f86b843a3ada7ca"/><file name="Data.php" hash="0f9ce0a292b5252d41e213c856239e89"/><file name="Url.php" hash="030d5bdf146b3b99cc9d8746c7926503"/></dir><dir name="Model"><file name="Agreement.php" hash="df3962ddcf7955accf00d714c5ead8e9"/><dir name="Api"><dir name="Resource"><file name="Customer.php" hash="6afd7bb0cb922ec8bda8cadb29451c95"/><file name="Product.php" hash="3e7be8a835660a8420a407d118010575"/></dir><file name="Resource.php" hash="c1f177cee11d0abc00480858da5ab41f"/></dir><dir name="Cart"><dir name="Api"><file name="V2.php" hash="077e21659fffece19616e060eacb48e2"/></dir><file name="Api.php" hash="0d889353860bfddd133d4d1f71b6de9a"/><dir name="Coupon"><dir name="Api"><file name="V2.php" hash="3819cccab8c750c686fd32f1519744ee"/></dir><file name="Api.php" hash="8ac75499c8c55708480f0b6ae51af119"/></dir><dir name="Customer"><dir name="Api"><file name="V2.php" hash="00d35835ad9d92aacfa1839d023904f3"/></dir><file name="Api.php" hash="8be5ae4a793eb93fe0044d735b7b1df8"/></dir><file name="Interface.php" hash="ebc9bcbcd56b5d434ba77ed7ff720bc8"/><dir name="Payment"><dir name="Api"><file name="V2.php" hash="6a4b038c801888694de6c44b3443c423"/></dir><file name="Api.php" hash="0a67d858dcff5e96329b016825490f88"/></dir><dir name="Product"><dir name="Api"><file name="V2.php" hash="d770d4e0ed45ffde564259aa31df4949"/></dir><file name="Api.php" hash="14005534953369616945876a9010e67e"/></dir><dir name="Shipping"><dir name="Api"><file name="V2.php" hash="d9a882d9ffafd6565519d0fb16cf0c77"/></dir><file name="Api.php" hash="8da33e2502d97f7183e399a9eec9a342"/></dir></dir><file name="Cart.php" hash="18b28a107260e5156794e2b72f46a190"/><dir name="Config"><dir name="Source"><dir name="Cart"><file name="Summary.php" hash="a02787d864ebfae10582d174868d96f1"/></dir></dir></dir><dir name="Mysql4"><dir name="Agreement"><file name="Collection.php" hash="382a91375e387aa34a22f2bff32e0664"/></dir><file name="Agreement.php" hash="410fb5df15e05f6280b260ff92d1519b"/><file name="Cart.php" hash="f71a9c3f9f8833c9a4111946c1173a1e"/><file name="Setup.php" hash="30411aeed997b72d15eab8b569ea293f"/></dir><file name="Observer.php" hash="d381013d2e1d180f64c4de1a951323a5"/><dir name="Resource"><dir name="Agreement"><file name="Collection.php" hash="4a726a585c363e1f03ba5a0bf3bbccb1"/></dir><file name="Agreement.php" hash="59a884f3339d51bcc6bfd4e5e52e662c"/><file name="Cart.php" hash="3ff0fd5a962ee131c36955a6d3710ca6"/><file name="Setup.php" hash="c54ad902cccbd093f61132257f622b9d"/></dir><file name="Session.php" hash="3b7230f751645b683eea043f70c5373d"/><dir name="Type"><file name="Abstract.php" hash="b81065dc35a709901f5aa219c484027c"/><dir name="Multishipping"><file name="State.php" hash="ee82bfca6f53192b100bbb682f747703"/></dir><file name="Multishipping.php" hash="399d388fe83466612fb1ea86d6f27fe2"/><file name="Onepage.php" hash="d035aa49f176b26640bb8eb62bc7696f"/></dir></dir><dir name="sql"><dir name="checkout_setup"><file name="install-1.6.0.0.php" hash="4469d343a5a08520291501615162782c"/><file name="mysql4-install-0.9.1.php" hash="43edc180bb20b77293f781a7766d64fe"/><file name="mysql4-upgrade-0.9.0-0.9.1.php" hash="779c10141182bab401a325704f465685"/><file name="mysql4-upgrade-0.9.1-0.9.2.php" hash="e4b33012e23340674bb734eafcade2c1"/><file name="mysql4-upgrade-0.9.2-0.9.3.php" hash="c31f984331e9c1c5786b06ea9bfe7c22"/><file name="mysql4-upgrade-0.9.3-0.9.4.php" hash="b5570bfcb3f219c23f5614d89f35d808"/><file name="mysql4-upgrade-0.9.4-0.9.5.php" hash="5d8713068dfa71f3be43a7a68d210fb4"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="390d29e552409bbd74baf088722d2ecc"/></dir></dir></dir><dir name="Cms"><dir name="Block"><file name="Block.php" hash="cd41391541ff3bfdeef4a2fca9312a15"/><file name="Page.php" hash="4a917b06112e6ee15ee849a613f244ce"/><dir name="Widget"><file name="Block.php" hash="743b41e6e6916c45414a622ec71a7d35"/><dir name="Page"><file name="Link.php" hash="6c94e75e10fae6746cf8884b19cd5576"/></dir></dir></dir><dir name="Controller"><file name="Router.php" hash="01e004e9497c92084a5273a9fa860a3a"/></dir><dir name="controllers"><file name="IndexController.php" hash="a0428df0501a68673f1177d0dbd2150b"/><file name="PageController.php" hash="46982d49f38d4070d1900c27a490bcc3"/></dir><dir name="data"><dir name="cms_setup"><file name="data-install-1.6.0.0.php" hash="3d3af93f64a56c81dd5b1849266b9a34"/><file name="data-upgrade-1.6.0.0.0-1.6.0.0.1.php" hash="918695cad1c49a1fa2d57caedc260ba7"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="3650744e9dee2e44233f1e500bbaa18e"/><file name="config.xml" hash="47a5aad49cd73f5b8cdcc355574d64af"/><file name="system.xml" hash="a3eef090aea13bf5143d6a7afebe103b"/><file name="widget.xml" hash="cce68d9bba54481a18ecf478bcda6283"/></dir><dir name="Helper"><file name="Data.php" hash="2ffa36f756131d8ebdf545a50f556d9b"/><file name="Page.php" hash="e178f42904942dda21b7bdbd04d788ff"/><dir name="Wysiwyg"><file name="Images.php" hash="ffa1f918c511e0e00e241bd20444ec53"/></dir></dir><dir name="Model"><file name="Block.php" hash="d315f5abaf7aa534a2847ca11072230c"/><dir name="Mysql4"><dir name="Block"><file name="Collection.php" hash="f114990e8139a6bb5af7fc535cb7deae"/></dir><file name="Block.php" hash="f342eeb583536cb204c259007ea3268b"/><dir name="Page"><file name="Collection.php" hash="35f5994643ac1b4e80272a48ad9d9a93"/><file name="Service.php" hash="42a55d20b1a66d6f5630c885f85086a2"/></dir><file name="Page.php" hash="d6e59c0c6d993bb3b9a2f3a303d4d1fb"/></dir><file name="Observer.php" hash="087435a085bb7faa76b1f7e694073236"/><file name="Page.php" hash="6ec25e8cbdecad68c9288dd4e3901060"/><dir name="Resource"><dir name="Block"><file name="Collection.php" hash="86d4b7cad3eefb334d2e9807c96f9104"/></dir><file name="Block.php" hash="00427267d39835bc711330cf09c83de8"/><dir name="Page"><file name="Collection.php" hash="5fcec317a2fc3874788324c4836bc66c"/><file name="Service.php" hash="58beeb725144ae8954cffad25d8b4d3d"/></dir><file name="Page.php" hash="ce8b43b2ea6032c4ba027b4b4a324a60"/></dir><dir name="Template"><file name="Filter.php" hash="fba9d583282cb7bab313214b2057c136"/></dir><dir name="Wysiwyg"><file name="Config.php" hash="f1dc9181c9b9a9f0fdd5de649e131c40"/><dir name="Images"><dir name="Storage"><file name="Collection.php" hash="fd6a930d67ecd61c7b3652a2951db865"/></dir><file name="Storage.php" hash="79a3998f2ae5fd3fce44cd3ca53e3a2c"/></dir></dir></dir><dir name="sql"><dir name="cms_setup"><file name="install-1.6.0.0.php" hash="2f325ff06947a8939f4f388fd7ecf096"/><file name="mysql4-install-0.7.0.php" hash="ba982a891d42004013ec0d0ae591ae25"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="da7d6308764a8fbf50fd1841eeaf4361"/><file name="mysql4-upgrade-0.7.10-0.7.11.php" hash="4421811dd029a0c02c38ab34e860e3f0"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="b7b865bed3b4468420425808bbdc5b1e"/><file name="mysql4-upgrade-0.7.11-0.7.12.php" hash="6cf87fd5c6286202d603b5fd90c7e5bc"/><file name="mysql4-upgrade-0.7.12-0.7.13.php" hash="4a886e9bc5e7ca2d8523aa48f078a3fd"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="94f9c6fbe93a15e086317d836e8b84d4"/><file name="mysql4-upgrade-0.7.4-0.7.5.php" hash="694ce5a5adae8a8d2bf9b688c54a270e"/><file name="mysql4-upgrade-0.7.5-0.7.6.php" hash="51d0bb48fe741b0bb405fef6dd11c35b"/><file name="mysql4-upgrade-0.7.7-0.7.8.php" hash="3a96a9f7d2bbdc449966c463a07c30e6"/><file name="mysql4-upgrade-0.7.8-0.7.9.php" hash="2709bed5b1ebb7adedd1b35a7f9b2a59"/><file name="mysql4-upgrade-0.7.9-0.7.10.php" hash="538fc08e5372ac6f80fff61ded413bb1"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="6c998bf371b9a71cf99c9a09ac151068"/></dir></dir></dir><dir name="Connect"><dir name="Block"><dir name="Adminhtml"><dir name="Extension"><dir name="Custom"><dir name="Edit"><file name="Form.php" hash="1383c04c2961d52cbc1bec39a201ac57"/><dir name="Tab"><file name="Abstract.php" hash="42261d5834b5f3c74f56bdced164435c"/><file name="Authors.php" hash="396e94163dfdd04577ae3ffe3c1be6df"/><file name="Contents.php" hash="acbdacab8bf1e6e7b2a430bd4e0ef96f"/><file name="Depends.php" hash="554a746b123df54b5984b438222e47c3"/><file name="Grid.php" hash="147163ca10710f8db50aa1889d2eb3c4"/><file name="Load.php" hash="894f3f70ab3d52eec6aee33910fb6a55"/><file name="Local.php" hash="5dea8fd3743b82f3202de683ada2d5af"/><file name="Package.php" hash="55f6e44d8ba3af305d77b2263c4abebf"/><file name="Release.php" hash="9405933e664d77b837ac8745414b6d89"/></dir><file name="Tabs.php" hash="a6091bf6766e33021b1255a8f6e46dec"/></dir><file name="Edit.php" hash="6bed39d39269b1e6efc17f5579c2da01"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Extension"><file name="CustomController.php" hash="740701a788bcc201895be39bd552719b"/><file name="LocalController.php" hash="b5f37e8195d7be89892aafe5aef455eb"/></dir></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="970bf51e02b86448b906cce43d11e048"/><file name="config.xml" hash="e974d3d2b4ac7464724a68222dd1800b"/></dir><dir name="Helper"><file name="Data.php" hash="5d8b4f9e8473195278078b84e822dff2"/></dir><dir name="Model"><dir name="Extension"><file name="Collection.php" hash="5fe952fe339cd51bca9478bbb1b2025e"/></dir><file name="Extension.php" hash="79cb6010aaac04ae6acae90fe283b875"/><file name="Session.php" hash="d5cc98d3b5bf71ebc8fe99d6e14f3ec9"/></dir></dir><dir name="Contacts"><dir name="controllers"><file name="IndexController.php" hash="36d90b47828bbe05fbbc2b1804c33471"/></dir><dir name="etc"><file name="adminhtml.xml" hash="6ba42f01f1d9b99d6e1edd020965c8ac"/><file name="config.xml" hash="2a1d11475c5c81eee38231630eb05a5b"/><file name="system.xml" hash="889b6e1509e248fd3681731c840c86c6"/></dir><dir name="Helper"><file name="Data.php" hash="cfd50692c06ff83bf1e31cf8617a3b4d"/></dir><dir name="Model"><dir name="System"><dir name="Config"><dir name="Backend"><file name="Links.php" hash="123757fdd0f36f5e6c0a26adaf57ed67"/></dir></dir></dir></dir><dir name="sql"><dir name="contacts_setup"><file name="install-1.6.0.0.php" hash="9de64c84aac321bdb88540c11f740f2f"/><file name="mysql4-install-0.7.1.php" hash="e9dab0dc609d3953f4ba457af60ac756"/><file name="mysql4-install-0.8.0.php" hash="93303f2687d9007afe65d7f68d6bafc8"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="d0feefaea070d94faaa20f787b0cd9df"/></dir></dir></dir><dir name="Core"><dir name="Block"><file name="Abstract.php" hash="82256e331ac78c2c52eb864ce250bf1c"/><file name="Flush.php" hash="d514b0279c4e43d755a083cd15eb3dba"/><dir name="Html"><file name="Calendar.php" hash="b7d5d8194b8aecd63fcd340db391968f"/><file name="Date.php" hash="aed6462ed4baf396ff86699b5a50b96e"/><file name="Link.php" hash="7e697d46edc5177a6c9ecda200fa0500"/><file name="Select.php" hash="6dc6fc73c778728a98c3264a832b7012"/></dir><file name="Messages.php" hash="2dd730afad2d9b06b883714860c6ca9e"/><file name="Profiler.php" hash="b0a9bd6c05ed8bb6d676e6fda7ee1ea2"/><dir name="Store"><file name="Switcher.php" hash="a4fb26a88eb683bcbfd801d8707afd32"/></dir><dir name="Template"><file name="Facade.php" hash="869603ba40daaedbfbfeb729c415dc99"/><file name="Smarty.php" hash="ceaf6731283fdfad4c3935ea9bff09d8"/><file name="Zend.php" hash="3ac43e2fc39ef57200a9a984f4f473d2"/></dir><file name="Template.php" hash="1386d912dc332ea09ca6ceabe099ab41"/><dir name="Text"><dir name="List"><file name="Item.php" hash="951ad839e1969adb392b0fd2f255abc0"/><file name="Link.php" hash="eadf8bde0ba92f1e7241236856464f62"/></dir><file name="List.php" hash="2a7b394d7af275d47bd65203b76ea186"/><dir name="Tag"><dir name="Css"><file name="Admin.php" hash="2e2584dbd2234df9cdcba3c5ca0a4f10"/></dir><file name="Css.php" hash="534007c5ece24139c6eee235c6f6859d"/><file name="Debug.php" hash="e70cb0add1b88940d4129c4171aefb75"/><file name="Js.php" hash="78f6f915c1ecb51df068c70edd4116f6"/><file name="Meta.php" hash="0e8a2418f23e82bb428413e4043190aa"/></dir><file name="Tag.php" hash="d2f28f3f5a112e2a4d30bfa0dd295957"/></dir><file name="Text.php" hash="1be038de2bc3963ad91e3abe3ac12eea"/></dir><dir name="Controller"><dir name="Front"><file name="Action.php" hash="74a0d88299ad03d25b862e988dc8fffa"/><file name="Router.php" hash="68ea2f2a4d3a1da37db5ceb240a105b6"/></dir><dir name="Request"><file name="Http.php" hash="ccb56f23ea96618bc5c2a594f7cb4241"/></dir><dir name="Response"><file name="Http.php" hash="17d51f23b4d406882e9fe6c7da031c6c"/></dir><dir name="Varien"><file name="Action.php" hash="741b30665a51a5f931f22990b5055cc7"/><file name="Exception.php" hash="372cc26a1355f2a105ea66e05669c623"/><file name="Front.php" hash="7de091295bb9d96551d912d02a0a9d1c"/><dir name="Router"><file name="Abstract.php" hash="8c6f5123d15e132c8c921e99546a30d4"/><file name="Admin.php" hash="7b6d51491b5999c35ff8ccff95ded4be"/><file name="Default.php" hash="e573239d21d5ea824abbb16151d16850"/><file name="Standard.php" hash="cb74f1440d282b3770c364474134d495"/></dir></dir></dir><dir name="controllers"><file name="AjaxController.php" hash="65910c3321c4acd31ae5f54b197884d3"/><file name="IndexController.php" hash="a2906692eb07188d7393b0c965fa6c1e"/></dir><dir name="etc"><file name="api.xml" hash="b8c71c08732ab438695f8144eab877aa"/><file name="config.xml" hash="940e7157e44795dddbd75a308b60fcd0"/><file name="jstranslator.xml" hash="89e90097389307a2dc2c1ecc52b99fc6"/><file name="system.xml" hash="74645630a0cdb97de31a720eba9b9a29"/><file name="wsdl.xml" hash="79501d6ccf39846b5dd551e85880dcb8"/><file name="wsi.xml" hash="31fa195d527181c946019bcd44d819d6"/></dir><file name="Exception.php" hash="0974b264a37f2a3ee278fde81a2ed80d"/><file name="functions.php" hash="dd250f04f8a18a289ded06470a557eec"/><dir name="Helper"><file name="Abstract.php" hash="6816767936e20a9171b633f602c13883"/><file name="Cookie.php" hash="c9fdeb23abfad6a9a78b781f250cfbec"/><file name="Data.php" hash="cfef221878937b07bcd3c2418b21f789"/><dir name="File"><dir name="Storage"><file name="Database.php" hash="3386578adfaf6dc7c68f67c7a79b090f"/></dir><file name="Storage.php" hash="283426826b39928144a20067c5bd1d41"/></dir><file name="Hint.php" hash="628da9bf92ef07007e6578c83aa2e58c"/><file name="Http.php" hash="0578082a1dcda489dd451ea8e257c76d"/><file name="Js.php" hash="78cef1513fc24feafe8561eda4ad42eb"/><file name="String.php" hash="67fc836a5b1e800a40bb58c34a7936c4"/><file name="Translate.php" hash="51d3acc916931652116eafd2f5aa7923"/><dir name="Url"><file name="Rewrite.php" hash="0f72823b730eb422df5bee8195de71e2"/></dir><file name="Url.php" hash="0d894098825a5788028542f4bcf100c1"/></dir><dir name="Model"><file name="Abstract.php" hash="92871f9888cad306e87371c68699e785"/><dir name="App"><file name="Area.php" hash="05b78decedfcdd33fa88aae4640f437a"/><file name="Emulation.php" hash="ac0e6aabaf5081dafb897d5f0206a298"/></dir><file name="App.php" hash="359d716d3e6749e6c94e91552f9082e0"/><file name="Cache.php" hash="a5fe2ce1d115d92f389a80269412c78a"/><file name="Calculator.php" hash="2defa83829be22a6111ec97812d8a581"/><dir name="Config"><file name="Base.php" hash="7d6d83e0f46655211a018e041d673d8d"/><file name="Data.php" hash="2b11250583c57a9013f87bf7529e6bd0"/><file name="Element.php" hash="41faddf5aa5acd667b1f51c7f80dd013"/><file name="Options.php" hash="7ce60ac8790716d4c678c4b2ce3f9797"/><file name="System.php" hash="9c26236242ea6099fee3f15bb3c0a35c"/></dir><file name="Config.php" hash="58e7d9a8903ca9bb3758d23699707dc6"/><file name="Convert.php" hash="b3e47a80738ebc487893ba371957b42f"/><file name="Cookie.php" hash="e1b64bc4e9cc3a6d9ec34492451216d0"/><file name="Date.php" hash="01392e3305186069e77946b28a79a81d"/><dir name="Design"><file name="Package.php" hash="6b964865a772dd44d3dad5a56c279dae"/><dir name="Source"><file name="Apply.php" hash="10829421eecec7fc18c1aac58969b508"/><file name="Design.php" hash="bf63679529657037ec2c4de3d94eadb1"/></dir></dir><file name="Design.php" hash="1ebf3a504f944748cbd70e822b05bd73"/><dir name="Email"><file name="Info.php" hash="d3627d819b5db67c86c70cde9a558fd8"/><dir name="Template"><file name="Filter.php" hash="e912590ca3c59df5d76e45f8631d235d"/><file name="Mailer.php" hash="313268e9163a6bfa4feaa08973b72cbd"/></dir><file name="Template.php" hash="27c15e38c359a6030806752f106964d9"/><file name="Transport.php" hash="bba455ff293edebca0de33d98444aa43"/></dir><file name="Email.php" hash="7f7821d5e8b94a5fcaafef8dac58a6f9"/><file name="Encryption.php" hash="5ad82d565c8b81f5443a3f4f94635e40"/><file name="Factory.php" hash="522514bd62c02dcd060e2496e0bbfc57"/><dir name="File"><dir name="Storage"><file name="Abstract.php" hash="50a9c54ac538990fa3360fba28e9cb7d"/><dir name="Database"><file name="Abstract.php" hash="688a6c2bde07b012dd96742fc4d56fd8"/></dir><file name="Database.php" hash="b287fe2143d4def32037b146f028d47f"/><dir name="Directory"><file name="Database.php" hash="875e025ded446ffce81a4838addfb0d0"/></dir><file name="File.php" hash="5409c58bcef26a275d9532040a9a9d0a"/><file name="Flag.php" hash="020fcab951b9228ecb67b6828d93e90b"/></dir><file name="Storage.php" hash="5c6f55b51360ab027cd7304cab7f6835"/><file name="Uploader.php" hash="a4fb426d8b7030a439d5907b3c7bcbb8"/><dir name="Validator"><file name="AvailablePath.php" hash="123be1c8c6837a9993108299fec6171a"/><file name="NotProtectedExtension.php" hash="18616a51f342e61e1852b43c3b8160dc"/></dir></dir><file name="Flag.php" hash="8ca3a531b9a533f042a23cca22b2641e"/><dir name="Input"><dir name="Filter"><file name="MaliciousCode.php" hash="576b9b4a6f1a955c6c21e95b1d6d135c"/></dir><file name="Filter.php" hash="cc89eb6c553ac09cf0d7c67e3a069e35"/></dir><file name="Language.php" hash="63cb88b1e4737b7c61522cbe53c6ee89"/><dir name="Layout"><file name="Data.php" hash="2ef2490a266ac8dfbe91992743a6396a"/><file name="Element.php" hash="8513ff9108f29b39a4553913580938df"/><file name="Update.php" hash="4b6862c459da2cb3d3332a66b9d2b58c"/></dir><file name="Layout.php" hash="1b50105321f94faca3e987602c243b03"/><dir name="Locale"><file name="Config.php" hash="641d6fdfd47cc912143c9a833106e61b"/></dir><file name="Locale.php" hash="f3c0e9bdf1f6b8929071db9c21f3dc63"/><dir name="Log"><file name="Adapter.php" hash="a458c6e59759a4e427153c4a1e234a52"/></dir><file name="Logger.php" hash="433f74eabc1b5c50444cbb385db900b6"/><dir name="Magento"><dir name="Api"><file name="V2.php" hash="9fec085743cc4a61661dced84122dd7d"/></dir><file name="Api.php" hash="bf8a71947750a64e33659c4f451d5612"/></dir><dir name="Message"><file name="Abstract.php" hash="9427fb9f476e6dce05cf5794785528fe"/><file name="Collection.php" hash="66f2ddc4075d6a985742c87ff74374eb"/><file name="Error.php" hash="c4800b42fa88b65be8aa154246bee095"/><file name="Notice.php" hash="a5beb5665acef097d02f05eccda9bba4"/><file name="Success.php" hash="61eb0b56ecb95795a7baaeb502e10a0b"/><file name="Warning.php" hash="b7f47d2928afef1a3e4a1fe1ad332ea9"/></dir><file name="Message.php" hash="e280f0708fc4680520b85a845224a782"/><dir name="Mysql4"><file name="Abstract.php" hash="39332001536e64d7ee99a806b0c36d1a"/><file name="Cache.php" hash="7adace09d8eef27188eb69ac940fe7f4"/><dir name="Collection"><file name="Abstract.php" hash="99dc4a24279c296e6f1c63749623fd30"/></dir><dir name="Config"><dir name="Data"><file name="Collection.php" hash="7097527cbc4e5deec22179ff1f553d40"/></dir><file name="Data.php" hash="44f9e7d7a3aa00cdffa0e32b726374de"/></dir><file name="Config.php" hash="fe460ffbdadcfcd73d258973b6bea8b1"/><dir name="Design"><file name="Collection.php" hash="b103e71ce7fe9b79135e5824c4b00934"/><dir name="Package"><file name="Collection.php" hash="6c8c7fc5284530fb1489ae0e66a260e5"/></dir><dir name="Theme"><file name="Collection.php" hash="ce8814e87fb299de2c45ca783ccd11ee"/></dir></dir><file name="Design.php" hash="3a7042029ff4a7623fac3c9439e6f3c6"/><dir name="Email"><dir name="Template"><file name="Collection.php" hash="2562b12dc3c34c65447d975f2cc7b342"/></dir><file name="Template.php" hash="8e76c6d5890bf3533d30e4a9c06b8be4"/></dir><dir name="File"><dir name="Storage"><file name="Abstract.php" hash="7ef46e183f2e2d3aca130bf291622ba8"/><file name="Database.php" hash="36883f2262fa261fe0b6bd7e06cb02da"/><dir name="Directory"><file name="Database.php" hash="fef9e094903fd97e4b84b0acd4896343"/></dir><file name="File.php" hash="475fa518331fc393b592bfe2864c0ffe"/></dir></dir><file name="Flag.php" hash="0383258e5c7d60933cc4f890ece8543b"/><dir name="Language"><file name="Collection.php" hash="a0abeab432e62cc7bbe2612777532894"/></dir><file name="Language.php" hash="9ef76521c3d531301243c3a84b391a26"/><file name="Layout.php" hash="699d1b1097bfe84ad8a21e54815f3d2a"/><file name="Resource.php" hash="93ad6e8130895c562e707883c86e8d21"/><file name="Session.php" hash="21a9b65264050c12517264851a8b5af0"/><dir name="Store"><file name="Collection.php" hash="a6c4095db952594c142d856197dcca26"/><dir name="Group"><file name="Collection.php" hash="76c4ed4f18697e41e5f5081d2d160b8a"/></dir><file name="Group.php" hash="3722ae4812666c831dffa9b02e8f3d2c"/></dir><file name="Store.php" hash="eca08a2749d5e81ae3efc007d2cb73ba"/><dir name="Translate"><file name="String.php" hash="7739d7d6a8ba9c44e2f429f13b23d057"/></dir><file name="Translate.php" hash="761cb9bda0641a2a2029f593a86b3028"/><dir name="Url"><dir name="Rewrite"><file name="Collection.php" hash="8635c8956ddf3c9676340bc57e995a41"/></dir><file name="Rewrite.php" hash="f0cf2f12f8ba3434dd8f21abeee4119e"/></dir><dir name="Variable"><file name="Collection.php" hash="a11cb34b9f7987b4cdc5ac74d9107eb7"/></dir><file name="Variable.php" hash="0556d675a8329a116e61fd50e4c1e633"/><dir name="Website"><file name="Collection.php" hash="dc320bd6e59c2543dd4b3a7c10673061"/></dir><file name="Website.php" hash="64252dabefd42c6b0a7dfbc00a6cbacd"/></dir><file name="Observer.php" hash="5533dd099586604731b30a366b0e5dec"/><dir name="Resource"><file name="Abstract.php" hash="533f2d803ef51f71cdb42062d9f7144c"/><file name="Cache.php" hash="8d943911084bc72b6a76618a4e14b70f"/><dir name="Config"><dir name="Data"><file name="Collection.php" hash="c87f59133ae5932e15f00b4f0f266155"/></dir><file name="Data.php" hash="23f45f6c878259a60124c641bf4f1e82"/></dir><file name="Config.php" hash="faf82cfca5e3ca23f39af08066ea59a9"/><dir name="Db"><file name="Abstract.php" hash="d0e58bda35a24de22665fbebda8b59cd"/><dir name="Collection"><file name="Abstract.php" hash="6f101c4c2b7836b5a227da21f8c439be"/></dir></dir><dir name="Design"><file name="Collection.php" hash="8a74da3d12c7ca51d022e80a268aa30c"/><dir name="Package"><file name="Collection.php" hash="c15b81b31dace4ddbc7dfa6c8a57aa57"/></dir></dir><file name="Design.php" hash="998caf6fa4e178d36b2f2403119cad1a"/><dir name="Email"><dir name="Template"><file name="Collection.php" hash="7fe31320ce6fa17f727ec23e94f3df3d"/></dir><file name="Template.php" hash="4239433c8efb889ad1eba2ec501c02bf"/></dir><dir name="Entity"><file name="Abstract.php" hash="631273eae70ece532311def7c9312919"/><file name="Table.php" hash="79700d2f8193fb586f12f1994415abf5"/></dir><dir name="File"><dir name="Storage"><file name="Abstract.php" hash="bff876072be5a848f2cc43e69d60e3cf"/><file name="Database.php" hash="b0a13ec6275c537d894abd6cf3323b12"/><dir name="Directory"><file name="Database.php" hash="175a6e3c00f11128f3693eb84b0dd789"/></dir><file name="File.php" hash="35aa426f80e2db1f506b5d39402581be"/></dir></dir><file name="Flag.php" hash="3e921eb46b35fce16630162d10069609"/><dir name="Helper"><file name="Abstract.php" hash="765fcde4da91029e0b85b0841645efc0"/><file name="Mysql4.php" hash="28c910adaa3d68bc7888dc9c09864ad5"/></dir><file name="Iterator.php" hash="def53b3d72df498955fe06ccc9630e6b"/><dir name="Language"><file name="Collection.php" hash="9c90543ec3797727c50c43f914f535e5"/></dir><file name="Language.php" hash="084fd5a4f3687a105666df59887c868d"/><file name="Layout.php" hash="d8ba832ed6b990738be539bcf527f616"/><file name="Resource.php" hash="ec971cd6eb0000818fa1b4997dd331ea"/><file name="Session.php" hash="955464382903367e19851023ac03d412"/><dir name="Setup"><dir name="Query"><file name="Modifier.php" hash="59f9c9270c168212eb1cee2f6e350723"/></dir></dir><file name="Setup.php" hash="db0d98e5063113decbcfa15151534509"/><dir name="Store"><file name="Collection.php" hash="10e06b78482295d88459e37739b6cc00"/><dir name="Group"><file name="Collection.php" hash="9e7f335d8eaf02984578d0e2df689717"/></dir><file name="Group.php" hash="57bd8bfaec0ecd85d26508b1275b27f2"/></dir><file name="Store.php" hash="fa2c934d69827786c75d252ca7644d52"/><file name="Transaction.php" hash="97b89bd584b128a187d9d1adf5c5b916"/><dir name="Translate"><file name="String.php" hash="8cd0aa3f5c7c30aad3fd0fcd165cc720"/></dir><file name="Translate.php" hash="68b58a58b7ef47e8aed0bb79491a38f4"/><dir name="Type"><file name="Abstract.php" hash="07c31641fc2d2823229c49816b6ef570"/><dir name="Db"><dir name="Mysqli"><file name="Setup.php" hash="3cf0a09e1c7e731c9dae3d5b3afff4e7"/></dir><file name="Mysqli.php" hash="36f70719b0310a02391d83aa3dbdedfd"/><dir name="Pdo"><file name="Mysql.php" hash="86c11192008640210f5fa5fc0b3deafe"/></dir></dir><file name="Db.php" hash="b09e37229d7d40eee4dd16b0eb6907c7"/></dir><dir name="Url"><dir name="Rewrite"><file name="Collection.php" hash="e75527e332151ca01f35f971c917dcf7"/></dir><file name="Rewrite.php" hash="b5c8af2cc2ab413518506b15a4ed504b"/></dir><dir name="Variable"><file name="Collection.php" hash="838d97522785722aa461c6f9fe2def30"/></dir><file name="Variable.php" hash="e591445a13f86a4eeb771a557d5a9034"/><dir name="Website"><file name="Collection.php" hash="c2b3e1105e3d69602f7f472293231fc2"/></dir><file name="Website.php" hash="de29c0cc660e16151378a336a5fb61c7"/></dir><file name="Resource.php" hash="9527d36fa5e2aa75187ff4c049f697ff"/><dir name="Session"><dir name="Abstract"><file name="Varien.php" hash="e7740959b34ad951d4630c0a4daa3164"/><file name="Zend.php" hash="72308b2d11ab000588d25d4df25150e1"/></dir><file name="Abstract.php" hash="ac95bc37f2165214c041991a275b2771"/><file name="Exception.php" hash="98839131586ab9bb8fb3a35e601a4f52"/></dir><file name="Session.php" hash="455a0d0855993fea73d72f03aec1621a"/><dir name="Source"><dir name="Email"><file name="Variables.php" hash="82be90144f94a06b71bf27807c7d107d"/></dir></dir><dir name="Store"><dir name="Api"><file name="V2.php" hash="e6cc0a3ed846b4ebf71127e97baa1ff4"/></dir><file name="Api.php" hash="a8a47906c88f28347b38b7e153a16651"/><file name="Exception.php" hash="d1e31c1cc1505c1c266f4af2cd0bf498"/><file name="Group.php" hash="30964e160110fcc2f0ce59f4f81d67fb"/><file name="Observer.php" hash="8cb68f3c084ceff07f686a2ad8a09057"/></dir><file name="Store.php" hash="3d9e0aaa53b5a4b1fedbd91745fa8ac4"/><file name="Template.php" hash="11abdbe9095ecab9a7a4b41616b3286e"/><dir name="Translate"><file name="Expr.php" hash="89e7e11868c16b2c1a8c56d3518cd664"/><file name="Inline.php" hash="ccf2256e9b570310ec8d15f0366f39cf"/><file name="String.php" hash="64c7aaef4b2c4230198c986db3a39906"/></dir><file name="Translate.php" hash="300e03f6505372907280c435b6d9b1f7"/><dir name="Url"><dir name="Rewrite"><file name="Interface.php" hash="a385334dd67b0f705b323ecae16780f6"/><file name="Request.php" hash="fe73343df5f2361271c83c1a9183b4ee"/></dir><file name="Rewrite.php" hash="0e710ac59c1081104a491323e9b9a40b"/><file name="Validator.php" hash="45cfba7e2f2df169e3fb9b2d4f7a766d"/></dir><file name="Url.php" hash="cad05661f9f09624d78241ce97a47868"/><dir name="Variable"><file name="Config.php" hash="71309347cdb795a981b235b8157b7957"/><file name="Observer.php" hash="3b94cc6bc1e793ff721b49aac6ebc18e"/></dir><file name="Variable.php" hash="6ec4f6f72dbbc8f49a652cd9e800ff34"/><file name="Website.php" hash="dc2d1fad015f020f80e38987e6bc1778"/></dir><dir name="sql"><dir name="core_setup"><file name="install-1.6.0.0.php" hash="774e5e49bbf1e87d5c962021a0cd2e65"/><file name="mysql4-data-upgrade-1.6.0.2-1.6.0.3.php" hash="d3b1209b8d9c4266ff6b4c14ae3c938e"/><file name="mysql4-install-0.7.0.php" hash="3ae49979a6faacfa5db7f3ea1f2e6fbf"/><file name="mysql4-install-0.8.0.php" hash="1b852beb9c45d6186c776c4abbfd0a6d"/><file name="mysql4-upgrade-0.6.26-0.7.0.php" hash="9e4c60efe83690f72d57c97e9a9baa92"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="8fa0e5181a55ae5afa7fbc06aa54555b"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="073d25959a3e4bf165cd6020360f194d"/><file name="mysql4-upgrade-0.7.3-0.7.4.php" hash="cfbcb5cdf775395eae0a391b79148c57"/><file name="mysql4-upgrade-0.7.4-0.7.5.php" hash="b6efdcbdbc52c5cd04a1dd589be38cbd"/><file name="mysql4-upgrade-0.7.5-0.7.6.php" hash="3fba8368c3a4243cc7bdb0ce91bc5e6e"/><file name="mysql4-upgrade-0.7.6-0.7.7.php" hash="3e70058014814055129c221bf0b7b537"/><file name="mysql4-upgrade-0.7.7-0.7.8.php" hash="04eebbaa204660f46e9d0089ce004baa"/><file name="mysql4-upgrade-0.7.8-0.7.9.php" hash="3741b30ead80a24b76b40f5db5d5fd1c"/><file name="mysql4-upgrade-0.8.0-0.8.1.php" hash="9a11702898a5e2df4425d1d1538736ab"/><file name="mysql4-upgrade-0.8.10-0.8.11.php" hash="46191d1b92235ea78ab7d9b54717d8fb"/><file name="mysql4-upgrade-0.8.1-0.8.2.php" hash="c53289e81586f87c494d07e0ea29d39e"/><file name="mysql4-upgrade-0.8.11-0.8.12.php" hash="ca6a6706bfcdc8f470c889019b69fa12"/><file name="mysql4-upgrade-0.8.12-0.8.13.php" hash="afe2edd992d3cc32b494089d740aa910"/><file name="mysql4-upgrade-0.8.13-0.8.14.php" hash="9f92e4a05d09f12a8830ead23276cb09"/><file name="mysql4-upgrade-0.8.14-0.8.15.php" hash="0d95f61a511a0137b2b2cb9c523139a4"/><file name="mysql4-upgrade-0.8.15-0.8.16.php" hash="687698e8bea775e51d640f0ffbdc1ef1"/><file name="mysql4-upgrade-0.8.16-0.8.17.php" hash="5132926360c0e0866ffbb25b87a8106d"/><file name="mysql4-upgrade-0.8.17-0.8.18.php" hash="4f25a42e71ffd35a7e2853d1f2cd3263"/><file name="mysql4-upgrade-0.8.18-0.8.19.php" hash="90a043d70163f673f4de7e43811ea8bc"/><file name="mysql4-upgrade-0.8.19-0.8.20.php" hash="dc6a7ab95f741061bba0025ea246f297"/><file name="mysql4-upgrade-0.8.20-0.8.21.php" hash="8f2a893467f078ec86f375cd0fd11891"/><file name="mysql4-upgrade-0.8.2-0.8.3.php" hash="a9537c660ce867aa741fe980527052a4"/><file name="mysql4-upgrade-0.8.21-0.8.22.php" hash="98143b6228c3b923f7a2ca4642680b4c"/><file name="mysql4-upgrade-0.8.22-0.8.23.php" hash="8f82208b444c39ab80934eac6b5b2091"/><file name="mysql4-upgrade-0.8.23-0.8.24.php" hash="aba8ec42952aa998964b4645d8050919"/><file name="mysql4-upgrade-0.8.24-0.8.25.php" hash="87ceb0c0480b3a94afdc276b325ba97d"/><file name="mysql4-upgrade-0.8.25-0.8.26.php" hash="70a0ce49c08e2c6a2c8b8a27684e0681"/><file name="mysql4-upgrade-0.8.26-0.8.27.php" hash="dcbb3cac0555c4737d9ef293aea8b0fd"/><file name="mysql4-upgrade-0.8.27-0.8.28.php" hash="32f9193a5cdb114854cf7c4bdad6f1a3"/><file name="mysql4-upgrade-0.8.3-0.8.4.php" hash="5f403a49ee786185ce30823c631a4ec1"/><file name="mysql4-upgrade-0.8.4-0.8.5.php" hash="cbfb928674adc40c3336c862d4b117db"/><file name="mysql4-upgrade-0.8.5-0.8.6.php" hash="0ef6546a015a5caa06bb6c0638708294"/><file name="mysql4-upgrade-0.8.6-0.8.7.php" hash="8f9476af25731a0f8f2683ab509b9fa7"/><file name="mysql4-upgrade-0.8.7-0.8.8.php" hash="07c713b6c27686eeeec4ddf2ba8b92ae"/><file name="mysql4-upgrade-0.8.8-0.8.9.php" hash="9a87a148c4c817944f02ff3337491452"/><file name="mysql4-upgrade-0.8.9-0.8.10.php" hash="b5e0af48288aae03dec9a19c0dc4a65f"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="d94144fbdb93139d4b26fc34fd1040be"/><file name="upgrade-1.6.0.1-1.6.0.2.php" hash="677b033cbfcb4a353f553da20968dd31"/><file name="upgrade-1.6.0.2-1.6.0.3.php" hash="4d28c3fed61de1207f85b121b5a7f062"/></dir></dir></dir><dir name="Cron"><dir name="etc"><file name="config.xml" hash="575300fbf78a4e39d6c7c74a850c5014"/><file name="system.xml" hash="b91aac8f1e7b2f4194d8acc16e101476"/></dir><file name="Exception.php" hash="e88795f5b211d37223ae01b8607e5661"/><dir name="Helper"><file name="Data.php" hash="7d7d8d6e596634692e03c6b7f0e9a082"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Schedule"><file name="Collection.php" hash="8700a67949cbd86229884818ef850870"/></dir><file name="Schedule.php" hash="0cb13b9f30787bb112ffc7f99d90005b"/></dir><file name="Observer.php" hash="9d88a212101711843bff04604456e710"/><dir name="Resource"><dir name="Schedule"><file name="Collection.php" hash="d202a05b8c5bcdd40874fefc347a4d36"/></dir><file name="Schedule.php" hash="45b1097088855382a14064ff17870760"/></dir><file name="Schedule.php" hash="a9fcc94de83679a3503cff3876570bfc"/></dir><dir name="sql"><dir name="cron_setup"><file name="install-1.6.0.0.php" hash="bc67842c49d3e3084004fe4571cfe4c3"/><file name="mysql4-install-0.7.0.php" hash="d67f5bae07d592a74c6fba2e1b5c5c23"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="d58f230a2761383c816202cc37a19ffa"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="e2852b31880174092f7a5b52dc00e5aa"/></dir></dir></dir><dir name="CurrencySymbol"><dir name="Block"><dir name="Adminhtml"><dir name="System"><file name="Currencysymbol.php" hash="2420b903cdac65f32ef9b34e12df8cf6"/></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="System"><file name="CurrencysymbolController.php" hash="acc72c43ff94e747b572f4fc95f8447d"/></dir></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="d2f660fb94dbe08ec1cd9d6dcead5385"/><file name="config.xml" hash="990db1257d1bb6341b32385232563cdc"/></dir><dir name="Helper"><file name="Data.php" hash="d401559c1674748d8fd83027a42f21ac"/></dir><dir name="Model"><file name="Observer.php" hash="952980650e6f41602910d4f45626c089"/><dir name="System"><file name="Currencysymbol.php" hash="ba3c94102d9c5f5ec06546e33f982e7d"/></dir></dir></dir><dir name="Customer"><dir name="Block"><dir name="Account"><dir name="Dashboard"><file name="Address.php" hash="6e9159a75e4aa8a83e6d91e85bb87e0d"/><file name="Block.php" hash="34c51d3cd66e8a3eadf58508f375db6f"/><file name="Hello.php" hash="1c280c347ffcb5200aa8cb426c26c7c5"/><file name="Info.php" hash="62d5edda23e10a1a55ad4a57e04ab238"/><file name="Newsletter.php" hash="68e77e54e35997603e80e2766ec7bd19"/><file name="Sidebar.php" hash="4f5e309afccfbe6c7605fdd11424527c"/></dir><file name="Dashboard.php" hash="85b0dbd0760aa71301b05340eca8c9bb"/><file name="Forgotpassword.php" hash="d2be186d931b95927369956514c19002"/><file name="Navigation.php" hash="1e52d544a1af959927d9d4382c53a4fe"/><file name="Resetpassword.php" hash="54db212c29e68fce33a3e2288698d276"/></dir><file name="Account.php" hash="1044133d2c6ccf832529d80b34868e93"/><dir name="Address"><file name="Book.php" hash="8cfc98566d53ffae9d3bde593d07fe36"/><file name="Edit.php" hash="6325d4b5774c467c26e013688816b066"/><dir name="Renderer"><file name="Default.php" hash="86a91ca248cb89df0f7f42470d890be5"/><file name="Interface.php" hash="e75acbb252ed40b20321ca39950b1137"/></dir></dir><dir name="Form"><file name="Edit.php" hash="9def0573840f98df0a51c3c353fd8141"/><file name="Login.php" hash="0537fad0ca7ec67e1453fbb31de7020b"/><file name="Register.php" hash="f8b6758961d84ce5a3992875d0ec847b"/></dir><file name="Newsletter.php" hash="d8679147156129e0d9c36150cfd7ac24"/><dir name="Widget"><file name="Abstract.php" hash="cc4a9267251d08378b6acc16f75d58ac"/><file name="Dob.php" hash="2d60d4c0ee0dc85e4756cc2cd76a080f"/><file name="Gender.php" hash="2c71c164f703bb8087a7b89c9470b849"/><file name="Name.php" hash="2ef45cd7827e821c8f57c6b398e42499"/><file name="Taxvat.php" hash="ce61bdc5cb66301a4cb11da2c53d1bda"/></dir></dir><dir name="controllers"><file name="AccountController.php" hash="337a635b0d7223922b53100c07113de0"/><file name="AddressController.php" hash="9d33926df8708ddb681d61a78884827c"/><file name="ReviewController.php" hash="9bd76e984049f8a495072a4d2885e299"/></dir><dir name="etc"><file name="adminhtml.xml" hash="8f262211c7f4a1877ddab0296c530bd4"/><file name="api2.xml" hash="03cac279f220d4662cb5bdde9a630b96"/><file name="api.xml" hash="daaad1af1d2196a9a8dee40e6fcbe8e7"/><file name="config.xml" hash="d2e12771206cff25db36c5fe5764d0f9"/><file name="system.xml" hash="b9826ea3d24abbc0423711918515c1f9"/><file name="wsdl.xml" hash="ee377e78b3435b0493ce59957d0fc1f3"/><file name="wsi.xml" hash="7cf579d2b5ee2eb66eee6e8194617404"/></dir><file name="Exception.php" hash="e2bab042c7bb2d198efe893aaf90bfe5"/><dir name="Helper"><file name="Address.php" hash="d3d2dc2d9b0f88292a397872586828eb"/><file name="Data.php" hash="e28d1cd3cc3bb6c0c08449481eefd783"/></dir><dir name="Model"><dir name="Address"><file name="Abstract.php" hash="0c64751b83a28f808b548cd92f5c7db4"/><dir name="Api"><file name="V2.php" hash="d2e4dd2e0a62762122ca3384b710ea84"/></dir><file name="Api.php" hash="ffe5654257fd8c76a4a20104b449efd5"/><file name="Config.php" hash="39307cd4c060d658391a4c3a07c66a00"/></dir><file name="Address.php" hash="f642fcea28891883cdcd6d6567915cac"/><dir name="Api"><file name="Resource.php" hash="2e3b72e52202dbf9843b338c962ada01"/></dir><dir name="Api2"><dir name="Customer"><dir name="Address"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="cd6fb2c8d7da24f9a12d57f46730178c"/></dir><dir name="Customer"><file name="V1.php" hash="86e5677e15f9f5fa85a58d0779e63f10"/></dir></dir><file name="Rest.php" hash="bed3c53fcd7850f2df4d29a541052314"/><file name="Validator.php" hash="75694da19e5abafdb7ccb63587d21eaf"/></dir><file name="Address.php" hash="37d92cb2f2d05a182faa81751e86b8a9"/><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="aeaafc49023607ab4162c2944d9285c9"/></dir><dir name="Customer"><file name="V1.php" hash="eabd1d45db4fedce73b7f290d5fd2d74"/></dir></dir><file name="Rest.php" hash="2b62a7e453d9a5b99ea5aaeda9f470f3"/></dir><file name="Customer.php" hash="72d0eadbe14e96de082a8e64be94a4c6"/></dir><dir name="Attribute"><dir name="Backend"><dir name="Data"><file name="Boolean.php" hash="c43d852b887b33608d92c6bbba966b6b"/></dir></dir><dir name="Data"><file name="Abstract.php" hash="719affca7e10245e8387cc1ffbed5601"/><file name="Boolean.php" hash="8d0b765518eef12130ebc5a986936e30"/><file name="Date.php" hash="779139744992a374d8d86ef940b13236"/><file name="File.php" hash="5b03efa0e46b4c0bd563373274837714"/><file name="Hidden.php" hash="dd8be7c6da027cf41e1848703f8ddfe7"/><file name="Image.php" hash="c70f5759042b4c58be8fc83cdc16cb60"/><file name="Multiline.php" hash="13b29e691ffc3c289f3715d7ac2cc6c7"/><file name="Multiselect.php" hash="bb876771d402809d45390cb0995a5503"/><file name="Postcode.php" hash="ab422addf5aff0f12cab68cab4999c33"/><file name="Select.php" hash="d191f532051b54ddf96c165a1b0022c2"/><file name="Textarea.php" hash="52e3c544bafc808f4d3855af27afecb7"/><file name="Text.php" hash="ff0d18fbb3529a8f64d0a39309ca6b8b"/></dir><file name="Data.php" hash="26896ca03ae10c661eae8955b1ed2c68"/></dir><file name="Attribute.php" hash="6f2849ac067026a3efb609c917d6a883"/><dir name="Config"><file name="Share.php" hash="a3f83b4693f570dbec69f052c246d67f"/></dir><dir name="Convert"><dir name="Adapter"><file name="Customer.php" hash="b6aafa6d6f2f61683a7d2c10146c4efa"/></dir><dir name="Parser"><file name="Customer.php" hash="3dd4ea42c2277c27302fe78ccd0232fa"/></dir></dir><dir name="Customer"><dir name="Api"><file name="V2.php" hash="6bfe3b3ae9029896d0347de43401f659"/></dir><file name="Api.php" hash="fca9df265e8b05846daaf15e04f98acb"/><dir name="Attribute"><dir name="Backend"><file name="Billing.php" hash="5508eb212020e468960c49db21afa798"/><file name="Password.php" hash="134b9b11d4b807da0ca024a68f757c77"/><file name="Shipping.php" hash="2c7e13d10bc1153d91227d4666b6faca"/><file name="Store.php" hash="3d95721f77483a8e0f9845cd62fbfdb8"/><file name="Website.php" hash="5f6b2fa61ee00c1bf735ca9d3eaa45c7"/></dir><dir name="Source"><file name="Group.php" hash="c22870e048053096d0ef6b0ee9d377fa"/><file name="Store.php" hash="db5df4dbf7b0a13757a325f25f7c3f4d"/><file name="Website.php" hash="71eab49b32063c493ed7cf6b6e1cb78f"/></dir></dir></dir><file name="Customer.php" hash="e3acf9086b2ee0dfe32f3110627e5307"/><dir name="Entity"><dir name="Address"><dir name="Attribute"><dir name="Backend"><file name="Region.php" hash="2db41df75616e9a6abde54730a90bdbf"/><file name="Street.php" hash="709004dc6540b028abfdd5ce943f4d50"/></dir><file name="Collection.php" hash="1e41fa62c80815a9c6e33820218a69ec"/><dir name="Source"><file name="Country.php" hash="079d14b77a9c211c7766120e8ce41973"/><file name="Region.php" hash="1db757cfbb3c5f52a2d61bb70655f941"/></dir></dir><file name="Collection.php" hash="2a4885334c43745b52cedfe1b9541c9f"/></dir><file name="Address.php" hash="b9f02b4ec095303b4906fd534be1a112"/><dir name="Attribute"><file name="Collection.php" hash="fe8ef3942a0ed1ff3c81d652779956c8"/></dir><file name="Attribute.php" hash="8764f35fb182eb7f1893eefffed2d43c"/><dir name="Customer"><file name="Collection.php" hash="ed3797cf2610d224264ff311fa2354cb"/></dir><file name="Customer.php" hash="01f68d7acf54b436d54f4306a73a5c5b"/><dir name="Form"><dir name="Attribute"><file name="Collection.php" hash="0e2ec5722da271f7c8a78fa888a861a4"/></dir><file name="Attribute.php" hash="ad4fe06f5cc25eca5f18af0b46b525f7"/></dir><dir name="Group"><file name="Collection.php" hash="ebd1e0bdc05f220e275e1ed0d2f8a9fc"/></dir><file name="Group.php" hash="95c2f7e8a95b975c4fbe5c4f8aa86f71"/><file name="Setup.php" hash="760cb7a6581653fce441825ace5487c0"/><dir name="Wishlist"><file name="Collection.php" hash="6c456b0efe16741ddc823685500a9c1e"/></dir></dir><file name="Form.php" hash="cd2edce875d3684cf7c213e5f105081d"/><dir name="Group"><dir name="Api"><file name="V2.php" hash="cf2ea4825d3a5d12f6932fa6b6fbe16d"/></dir><file name="Api.php" hash="a95262a7e0c74c9a520d8d32c697ddde"/></dir><file name="Group.php" hash="6ab564a97c312985571a535992ad2365"/><file name="Observer.php" hash="ec291c2167456521b759b8f3672f5b79"/><dir name="Resource"><dir name="Address"><dir name="Attribute"><dir name="Backend"><file name="Region.php" hash="c7056f48250a8f36b3f85c4249ca1d81"/><file name="Street.php" hash="bfb890d08d4aa16d047b95e59d7c7555"/></dir><file name="Collection.php" hash="b2ca7c83d838c85e463514033bf80761"/><dir name="Source"><file name="Country.php" hash="1daaf1f384d2d6deca8f642e2ee01a08"/><file name="Region.php" hash="b5f3784989f9b42b35afca1bb6d51942"/></dir></dir><file name="Collection.php" hash="0f3dc05bb7509277a3f5fd174c1450b3"/></dir><file name="Address.php" hash="ebff6ddb74301c07a214574160ceba20"/><dir name="Attribute"><file name="Collection.php" hash="f87cfd3ec113de1b14dd0b5556dcca56"/></dir><file name="Attribute.php" hash="3e74d16932a2c3a0b4394e3ead7135ad"/><dir name="Customer"><file name="Collection.php" hash="0c35bfeb804d4a4a4cc1e54e7231a0cf"/></dir><file name="Customer.php" hash="db6f1f65202a015739e81130ebf1bb8c"/><dir name="Form"><dir name="Attribute"><file name="Collection.php" hash="b613c6dc7fa13167ec09317527ccc3e8"/></dir><file name="Attribute.php" hash="02bf5fc3ad369ccc0501be85945fac51"/></dir><dir name="Group"><file name="Collection.php" hash="a2aa4fb9b65df04411878086ef468b92"/></dir><file name="Group.php" hash="2fc1621733dd4fed901152bc09fe0de1"/><file name="Setup.php" hash="f20c1b2067b6416eb89bb516e21ae7b7"/><dir name="Wishlist"><file name="Collection.php" hash="ef8fde2e8822133ff34c45c024f33cd7"/></dir></dir><file name="Session.php" hash="012900f557f267e3246d9ce5b69f1e37"/></dir><dir name="sql"><dir name="customer_setup"><file name="install-1.6.0.0.php" hash="e550331b662d7fc0347cb5c414484153"/><file name="mysql4-data-upgrade-1.4.0.0.11-1.4.0.0.12.php" hash="631dd02c4639bbb59ffe5eeb1c2f3508"/><file name="mysql4-data-upgrade-1.4.0.0.13-1.4.0.0.14.php" hash="d19025b10c5fd1c01915a8c975ce7b47"/><file name="mysql4-data-upgrade-1.4.0.0.7-1.4.0.0.8.php" hash="587cb24f1b333871930099415095e60e"/><file name="mysql4-data-upgrade-1.4.0.0.8-1.4.0.0.9.php" hash="d464f5e1edb3749957766cea16d5d616"/><file name="mysql4-install-0.7.0.php" hash="b2680ce071d0447086a38f9b08247890"/><file name="mysql4-install-0.8.0.php" hash="ef5d85d5ec05a66de096001e280f12f0"/><file name="mysql4-install-1.4.0.0.0.php" hash="825c615799adc3ba0df1209ba14ad40a"/><file name="mysql4-upgrade-0.6.1-0.7.0.php" hash="be68e51325e112aa014c3e33e7cee836"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="1491af6e46f68abe4744817062b82d9c"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="21e0832d2feaa9c249efba5a9cf2a679"/><file name="mysql4-upgrade-0.8.0-0.8.1.php" hash="877aa414cca237e5921510ce046a09d8"/><file name="mysql4-upgrade-0.8.10-0.8.11.php" hash="ed53b9ce78cdc7f1e4edc555c249ff72"/><file name="mysql4-upgrade-0.8.11-0.8.12.php" hash="73aa0b642b9199712bcd1f6b870dd17d"/><file name="mysql4-upgrade-0.8.12-1.4.0.0.0.php" hash="70e4317324e02468737da0e75b328e6b"/><file name="mysql4-upgrade-0.8.4-0.8.5.php" hash="48cef2dc2134fac01b284ed1995dd6af"/><file name="mysql4-upgrade-0.8.5-0.8.6.php" hash="6a0a6d19564652c9e5b4fab87ae8cadd"/><file name="mysql4-upgrade-0.8.6-0.8.7.php" hash="74c252ca559f1018e9e908326c6df77b"/><file name="mysql4-upgrade-0.8.7-0.8.8.php" hash="ceabb289a773f0fbfea1a0e0286df0d2"/><file name="mysql4-upgrade-0.8.8-0.8.9.php" hash="e8a67a99c38a8b4bca471d167b119cec"/><file name="mysql4-upgrade-0.8.9-0.8.10.php" hash="e99095d5122127da7143d0c33ac7e8e5"/><file name="mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php" hash="66e46752993f980a14cdd38dca591676"/><file name="mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php" hash="7832b0027d8aeafd6d389f04649cdecf"/><file name="mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php" hash="06e178ae93b3822074acff6b019fc726"/><file name="mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php" hash="df116d2a0bb9720c26f220118f724e5c"/><file name="mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php" hash="f7ec1198653c489e9f65f2b4f7d55086"/><file name="mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php" hash="44f63a45cefac2d763548552f04d3309"/><file name="mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php" hash="ec7b8f479e12ae31a4c6b75dc19e6baa"/><file name="mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php" hash="b605b717ed3193902738bba563066742"/><file name="mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php" hash="08ff5779d81efb07a7833d15d8a2a893"/><file name="mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php" hash="a34a35b7976546adacb1ff28f72b0a5b"/><file name="mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php" hash="683216e87dac2bbb12907913eebedb55"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="b18e2e88f5358fd1b3c0bfcd680124fe"/><file name="mysql4-upgrade-1.6.0.0-1.6.1.0.php" hash="20f22e44f8232f6720cc51ddaa266977"/><file name="upgrade-1.6.1.0-1.6.2.0.php" hash="e8af27a80d7a66ecba09a732aec65d24"/><file name="upgrade-1.6.2.0-1.6.2.0.1.php" hash="7f35443747a01396b918ff694ef990f2"/></dir></dir></dir><dir name="Dataflow"><dir name="data"><dir name="dataflow_setup"><file name="data-install-1.6.0.0.php" hash="195f641182f0a642c7197a96a59180d8"/></dir></dir><dir name="etc"><file name="config.xml" hash="9ae264687597840fc0d0a9cfcd41bf34"/></dir><dir name="Helper"><file name="Data.php" hash="94ea892ec5100face7778bbadf9dc9f2"/></dir><dir name="Model"><dir name="Batch"><file name="Abstract.php" hash="41a76d255a5b7c84c163c5da171385ef"/><file name="Export.php" hash="2342b21bc678433c81948d647a425fcc"/><file name="Import.php" hash="ceb18fa47cab0f437ddee1e79bd2a80b"/><file name="Io.php" hash="a99e787106b7d1524aeae3299b485a59"/></dir><file name="Batch.php" hash="4c5426fc61a59fd9e807f5d2ea8ce3a1"/><dir name="Convert"><dir name="Action"><file name="Abstract.php" hash="e1948d2e8fe96ac15f4b6497dbdbd104"/><file name="Interface.php" hash="0eb1d54c86350f859003a915ba086788"/></dir><file name="Action.php" hash="ffc0d5b9b4e8f821d7d784cd5af2402c"/><dir name="Adapter"><file name="Abstract.php" hash="e2f63428a6f0e81b6764adcc37ab8b4f"/><dir name="Db"><file name="Table.php" hash="c9cbd429a934d0bfb8ca3f4ebcabbbe3"/></dir><dir name="Http"><file name="Curl.php" hash="cf99745f245740dcc58b079f3b16cf6a"/></dir><file name="Http.php" hash="260038519358251b72fb9773412436ff"/><file name="Interface.php" hash="27a65f50911cb10cfdad1fb60bd303d0"/><file name="Io.php" hash="02b7b84b38be2627164ce457a7eac054"/><file name="Soap.php" hash="60ae8995f47fab93899cd17dbca1d42e"/><file name="Std.php" hash="a453839d9aa122d333da7f596af292e0"/><dir name="Zend"><file name="Cache.php" hash="5566150708783923a775c1c3a1a3ebeb"/><file name="Db.php" hash="4357273ecffb3ec5f1e1c503c242d098"/></dir></dir><dir name="Container"><file name="Abstract.php" hash="5a60f6eefaa561da914eb43e13dbf106"/><file name="Collection.php" hash="f03d5843071b4046a052b501134906b7"/><file name="Generic.php" hash="f5709a1bf93f2cebe970b346f51f8a1b"/><file name="Interface.php" hash="384dbf84229755cbe9f1e31887fdaf5c"/></dir><file name="Exception.php" hash="cea84bd39c2f9ec7f1da2f9fe9d3af4e"/><dir name="Iterator"><dir name="File"><file name="Csv.php" hash="b611694adc398b61348811e95763bbe1"/></dir><file name="Http.php" hash="94382495b2ff119941491b9bcb70387c"/><file name="Interface.php" hash="c380df886e777964e807a07fdc2c4e7d"/></dir><file name="Iterator.php" hash="b28265ffd82bcdc63c11c0b8d98d2264"/><dir name="Mapper"><file name="Abstract.php" hash="e54ca8c4a10b7f434b42b28464ef7a9a"/><file name="Column.php" hash="9271a7aa643092ce357d2eb88a24ced3"/><file name="Interface.php" hash="2e3d8c0691de7a28a7bb8cb4daa8fb6b"/></dir><dir name="Parser"><file name="Abstract.php" hash="0318a0e81176f547638625cbcfba6bc0"/><file name="Csv.php" hash="75c753c85e344d11275bed5dba602547"/><file name="Interface.php" hash="85d3fcb69fa7a5ef5219ff3651e6cb86"/><file name="Serialize.php" hash="717879cf28ad47cdb5dc8ecc5bbc478b"/><dir name="Xml"><file name="Excel.php" hash="ab35f1205eccb0d1d44ca6f616447501"/></dir></dir><dir name="Profile"><file name="Abstract.php" hash="0699e1a71dcca85883f89d8fb3737518"/><file name="Collection.php" hash="db9b4afbbe44367e2457f2b15445847a"/><file name="Interface.php" hash="80bbb1f1dca1895df957926d989d96f3"/></dir><file name="Profile.php" hash="4ff187e9f0e757bc2eb8aa94ecc810dc"/><dir name="Validator"><file name="Abstract.php" hash="80ad0e1d109127bb09cb387348aec528"/><file name="Column.php" hash="2d3b3dea742eefda7a09e156d20dbb86"/><file name="Dryrun.php" hash="0b498d30c3739a96078561d906096c5d"/><file name="Interface.php" hash="6d67d5d320df8c7c4d7d6c06a7455c00"/></dir></dir><file name="Convert.php" hash="29031d99d9ed6453c4660be496ca2c26"/><file name="Import.php" hash="1b7cbc3d5d380840b77495318be92abf"/><dir name="Mysql4"><dir name="Batch"><file name="Abstract.php" hash="5fd3a348516a16e5d2507be8f7cd91f1"/><file name="Collection.php" hash="d5461d8c4a0eb4c49e8d98b8e2487df7"/><file name="Export.php" hash="057056843517aa184ecbd194af97ad8b"/><file name="Import.php" hash="6c13499abf1dbd6963a865dece2675ab"/></dir><file name="Batch.php" hash="725e10b441fa1ec3775e6018a73f25e3"/><file name="Catalogold.php" hash="ef7ee4fba4da66ccd1d470a331d50224"/><dir name="Import"><file name="Collection.php" hash="10c2f2822df0c3c1b3fff0017898f507"/></dir><file name="Import.php" hash="82724b71ecf32fa7ec1e104c52bf36f7"/><dir name="Profile"><file name="Collection.php" hash="8786bd6706e6ea81bf390027c475684a"/><dir name="History"><file name="Collection.php" hash="aae9f224583b5da2f7839378d5fcb2f2"/></dir><file name="History.php" hash="acf0f11841917de639b4515cb86317af"/></dir><file name="Profile.php" hash="f1fd5425070fdaf55baeb47129169f58"/><file name="Session.php" hash="d237701967bf5bbe185b41bd8f10e90f"/></dir><dir name="Profile"><file name="History.php" hash="73d919b1b2cdf310021563895aa1f730"/></dir><file name="Profile.php" hash="d37746b7eb9437ad2478a98c875e8bd3"/><dir name="Resource"><dir name="Batch"><file name="Abstract.php" hash="80a4334d779c8c81613e01c2b71715fb"/><file name="Collection.php" hash="c6dfe467f3948dab03ef87158a52f032"/><file name="Export.php" hash="f5bfde2968f27bb4024557db9fe9312e"/><file name="Import.php" hash="6b22271b77ef9c8d2e3a8806661baee5"/></dir><file name="Batch.php" hash="f11259deb623dcaa5619e35d684b84b1"/><dir name="Import"><file name="Collection.php" hash="e5f066f77f3c36ad738f70b82ec21106"/></dir><file name="Import.php" hash="7d29d4c3eb56823ecb1df61d8f40eb05"/><dir name="Profile"><file name="Collection.php" hash="8d0de95c988bb1f08806be4613cae3ab"/><dir name="History"><file name="Collection.php" hash="c0400b619dd43190f06682a4b22d3f3c"/></dir><file name="History.php" hash="64598bb34195f93d855fba7f70431a1b"/></dir><file name="Profile.php" hash="be2fc6b2e12e9e08c8bfb99bb9165950"/><file name="Session.php" hash="50df569772cdee91c4101b0254ef7e67"/></dir><dir name="Session"><dir name="Adapter"><file name="Http.php" hash="d36d9e9918e7a949a0cf738ba47e5a26"/></dir><dir name="Parser"><file name="Csv.php" hash="7dd65312094c29daab2e89fcb646d762"/></dir></dir><file name="Session.php" hash="a6a164408701d00b68fad01568ea8af7"/></dir><dir name="sql"><dir name="dataflow_setup"><file name="install-1.6.0.0.php" hash="12e49e1ef025261cde22087024e07bb5"/><file name="mysql4-install-0.7.0.php" hash="2021b68cee83637c9dd36b434a7fe0c3"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="28f2fd13c13310236814964bac107e5d"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="af1dc1f0e49ec3802517ac0e3135b866"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="56cf728f46656ef1a40106ad6e64a073"/><file name="mysql4-upgrade-0.7.3-0.7.4.php" hash="99bfc9b32757e91e8c096cb5e1c9e927"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="994c3af240a6c67e6b13f9fc6390269f"/></dir></dir></dir><dir name="Directory"><dir name="Block"><dir name="Adminhtml"><dir name="Frontend"><dir name="Currency"><file name="Base.php" hash="4e0219ddc658d4cdf84d759b5d4df613"/></dir><dir name="Region"><file name="Updater.php" hash="5e68af3786fc11d21ddd286978b030f1"/></dir></dir></dir><file name="Currency.php" hash="42f582d5b4251fdf862886f0b75231b3"/><file name="Data.php" hash="a1fcfe2e6758342aea0084f6f010ce51"/></dir><dir name="controllers"><file name="CurrencyController.php" hash="ed96beef0629a58183193022b66d4a69"/></dir><dir name="data"><dir name="directory_setup"><file name="data-install-1.6.0.0.php" hash="a86d5c5cb802e3eee0b42f584d54c362"/><file name="data-upgrade-1.6.0.0-1.6.0.1.php" hash="e161f73f4f57bf8e4fefde7931be613d"/></dir></dir><dir name="etc"><file name="api.xml" hash="57681bc4db1db3db1351604942fb42c3"/><file name="config.xml" hash="d5ca5f290857076f656751886d3f1d35"/><file name="system.xml" hash="20d24918ea12aca0bbe47a2bee302480"/><file name="wsdl.xml" hash="cc488b81c0eae648a0ee360d6e2d9960"/><file name="wsi.xml" hash="66de37cc17e24c0c66f74c52e2df616e"/></dir><file name="Exception.php" hash="d7b214200b3cf7bd09edd22ca180abcc"/><dir name="Helper"><file name="Data.php" hash="e301fd08443818d1aff745aa0d072557"/><file name="Url.php" hash="7f9de744f02cc081acddf6ee102df54d"/></dir><dir name="Model"><dir name="Country"><dir name="Api"><file name="V2.php" hash="5155e2d7e4823c272881ac215cbd953e"/></dir><file name="Api.php" hash="31d0e213789a5ae666156c89aca73246"/><file name="Format.php" hash="9fa00a645f1e0eda5ce5842044706d88"/></dir><file name="Country.php" hash="b5d86dabad5ba152f927eef9f661cf49"/><dir name="Currency"><file name="Filter.php" hash="5f464402aa2eae8be8a93d0c3be9326a"/><dir name="Import"><file name="Abstract.php" hash="68e956fc83456523aa63c796adce8232"/><file name="Webservicex.php" hash="0fb99338060d79965474c8547a1b600b"/></dir></dir><file name="Currency.php" hash="d37685712df8ba13a4ade3648899302b"/><dir name="Mysql4"><dir name="Country"><file name="Collection.php" hash="7ac4ff7a1806d9d1e7967b765b9cbe83"/><dir name="Format"><file name="Collection.php" hash="1ddc239d9ae7572c8d023ed607d76ca6"/></dir><file name="Format.php" hash="7cf0c3e12781d008e2232b8002d3f91c"/></dir><file name="Country.php" hash="836920bbb94abfc49a9ef34dce36d6d4"/><dir name="Currency"><file name="Collection.php" hash="ce409aeef7d41f682a593faf89274d9f"/></dir><file name="Currency.php" hash="8640c219167a4fae5f2ecd8bff4b8557"/><dir name="Region"><file name="Collection.php" hash="0b56d26af59226df7d756891e00fec67"/></dir><file name="Region.php" hash="a5216b3e3b0897a1cc56dd7a7096a4f4"/></dir><file name="Observer.php" hash="6bf84c84efe131e0aaf6a54547f00f30"/><dir name="Region"><dir name="Api"><file name="V2.php" hash="2d02de099b8a19fc71f9d0bea3bf8e8c"/></dir><file name="Api.php" hash="29f91b917fdbb213a47685e907dd2a72"/></dir><file name="Region.php" hash="9cd8556ff685d2840acb63a62fe7023b"/><dir name="Resource"><dir name="Country"><file name="Collection.php" hash="fb74a34fa68f2953591c31e2cd524cc3"/><dir name="Format"><file name="Collection.php" hash="d86522253addf9ed6f5311138be52a6e"/></dir><file name="Format.php" hash="fb3cc349d35353b3d66ddd4ed72afbe9"/></dir><file name="Country.php" hash="dc42379e40a67d5e09f73f5664a1b5a1"/><dir name="Currency"><file name="Collection.php" hash="7c9434a049dcc27a2c71e782118f19ec"/></dir><file name="Currency.php" hash="a2968750dbcbf8affd8af639583dfc93"/><dir name="Region"><file name="Collection.php" hash="0d336cb273211eb6cf249d8b1a57e845"/></dir><file name="Region.php" hash="122ec8cd245f112919e886e65f866967"/></dir></dir><dir name="sql"><dir name="directory_setup"><file name="install-1.6.0.0.php" hash="a35b3e1ae3f66ce0d1d5c8671eee47e5"/><file name="mysql4-install-0.7.0.php" hash="4b33300b59cd41e2d582f08748a701a9"/><file name="mysql4-install-0.8.0.php" hash="8961747d608c56bb1cf23c4379b4f4b0"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="db7d9ffc49764800aa5f5546646dd268"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="382f23acde90bf81206465eb8daf2ea5"/><file name="mysql4-upgrade-0.8.0-0.8.1.php" hash="7de811903a150170101637e802ceae9e"/><file name="mysql4-upgrade-0.8.10-0.8.11.php" hash="26b365ae87cf5b0f64f774b1330d2da5"/><file name="mysql4-upgrade-0.8.1-0.8.2.php" hash="b1a46462d8d509b1035e8d359335466f"/><file name="mysql4-upgrade-0.8.2-0.8.3.php" hash="281917321769b6870d33a730ff186651"/><file name="mysql4-upgrade-0.8.3-0.8.4.php" hash="31ebee443000a8bdc4f8dd0ff8452306"/><file name="mysql4-upgrade-0.8.4-0.8.5.php" hash="ac25242cc2a4daf94d3a98aefa126446"/><file name="mysql4-upgrade-0.8.5-0.8.6.php" hash="61f15e6487c21db687c3a0a2eb85138a"/><file name="mysql4-upgrade-0.8.6-0.8.7.php" hash="a57dbcbd880cc219f049a2636312c485"/><file name="mysql4-upgrade-0.8.7-0.8.8.php" hash="ee895e1005826725d0838bdb5cd54410"/><file name="mysql4-upgrade-0.8.8-0.8.9.php" hash="5b18848a16a0aeb185cedfb669761ebc"/><file name="mysql4-upgrade-0.8.9-0.8.10.php" hash="e9a28da7c649ffd4ab3459b1cc10e0e8"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="cc4da2053e41f6340de5ce9d6550fda3"/><file name="upgrade-1.6.0.1-1.6.0.2.php" hash="c711270d7c3d4db1fca8b5a966c7b2b0"/></dir></dir></dir><dir name="Downloadable"><dir name="Block"><dir name="Adminhtml"><dir name="Catalog"><dir name="Product"><dir name="Composite"><dir name="Fieldset"><file name="Downloadable.php" hash="9743b9c5456f134f904daee986c2bbdc"/></dir></dir><dir name="Edit"><dir name="Tab"><dir name="Downloadable"><file name="Links.php" hash="7f4689fa6ee54e0d760c763be4e16ec3"/><file name="Samples.php" hash="2e274125fde854239288c39c4a5e0e89"/></dir><file name="Downloadable.php" hash="5649222a58544ae2c83a225ae7f6a4f3"/></dir></dir></dir></dir><dir name="Sales"><dir name="Items"><dir name="Column"><dir name="Downloadable"><file name="Name.php" hash="e1c1f719e3519af7a8b3a5a81da82571"/></dir></dir></dir></dir></dir><dir name="Catalog"><dir name="Product"><file name="Links.php" hash="cad6f5c305fbe73e85559b539cc4c37d"/><file name="Samples.php" hash="2630a0998d2d0d3b9e52737b07c2e702"/><dir name="View"><file name="Type.php" hash="10506f5a7e8e6f6c74fb381de8627262"/></dir></dir></dir><dir name="Checkout"><dir name="Cart"><dir name="Item"><file name="Renderer.php" hash="a8c53262706cc9da0b02d31d5b275336"/></dir></dir><file name="Success.php" hash="a12f6d8532a162409b8855e2175d6ccf"/></dir><dir name="Customer"><dir name="Products"><file name="List.php" hash="8045558ff93b1aeb35f7c8d8e096a108"/></dir></dir><dir name="Sales"><dir name="Order"><dir name="Email"><dir name="Items"><file name="Downloadable.php" hash="1f1ba9a367d9c120c173834a293a6508"/><dir name="Order"><file name="Downloadable.php" hash="31b5717f6bdd5da175859c68f6f8efe9"/></dir></dir></dir><dir name="Item"><dir name="Renderer"><file name="Downloadable.php" hash="fdcef26acc053a0267718aaa8041a97d"/></dir></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Downloadable"><file name="FileController.php" hash="598eba2daa241edcc49b1221b7fbc5c8"/><dir name="Product"><file name="EditController.php" hash="be6f9a301e655f232d926414ae54a323"/></dir></dir></dir><file name="CustomerController.php" hash="645871bf4129e5c171125b953c01bafa"/><file name="DownloadController.php" hash="4af30c6691efd7eb00d1e5af3ccd54e6"/><file name="FileController.php" hash="7dc886921b70c106bc56fbd2269c5f5e"/><dir name="Product"><file name="EditController.php" hash="9c6b9ab7d96a84d059da807e4cc6cb23"/></dir></dir><dir name="data"><dir name="downloadable_setup"><file name="data-install-1.6.0.0.php" hash="ba3f650af06d4922ff2c96ee8630a610"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="62a69fa1d9955df4a80eb9199236d11a"/><file name="api.xml" hash="80dfc0d8f4e584428b430c752260a297"/><file name="config.xml" hash="d5306cfbe33cb0fe6e44d7c7a688dc6b"/><file name="system.xml" hash="4343c64c3c83fe226317e731f2a08ad3"/><file name="wsdl.xml" hash="b3935ff3bf7e2ca40ddd304b4c78577f"/><file name="wsi.xml" hash="7eef36b29c2abf88596e63b6a042626d"/></dir><dir name="Helper"><dir name="Catalog"><dir name="Product"><file name="Configuration.php" hash="1b0f2e373dbbbbd463a6a52d944dd0d0"/></dir></dir><file name="Data.php" hash="43d3e8dfb3273e1efa594e1151dc1c21"/><file name="Download.php" hash="0181b50a7ffa367b4700380c8b3542a4"/><file name="File.php" hash="85af4a0fc9381f34c2ea212ef13451bc"/></dir><dir name="Model"><dir name="CatalogIndex"><dir name="Data"><file name="Downloadable.php" hash="ca0585e62a4d207238f010d57f6f8fcb"/></dir></dir><dir name="Link"><dir name="Api"><file name="Uploader.php" hash="368ddafdaa4724f45859d1944ad914f0"/><file name="V2.php" hash="2dbaae76b6275b788f85ca79b8c2a6f3"/><file name="Validator.php" hash="e971c4c834a10d1dda6fa4cbb435ddaa"/></dir><file name="Api.php" hash="6c5d906b6d82f3a2d70c33552982390b"/><dir name="Purchased"><file name="Item.php" hash="5409895d11ab323fb06dc5b6b0adfe37"/></dir><file name="Purchased.php" hash="c103d9bb43e1fbc8860293ed513ca645"/></dir><file name="Link.php" hash="3e40dff13ee7290bf5c5c82f1f738e34"/><dir name="Mysql4"><dir name="Indexer"><file name="Price.php" hash="68ceb3428f44bba2080b88144152e1d5"/></dir><dir name="Link"><file name="Collection.php" hash="075614b09b2da42307801be926649966"/><dir name="Purchased"><file name="Collection.php" hash="278e21d2e92c65a8c283485af934100d"/><dir name="Item"><file name="Collection.php" hash="0b426f7128f86f35fde40cb7033c10c2"/></dir><file name="Item.php" hash="ffc5b72853f0027201abd8e321af49c4"/></dir><file name="Purchased.php" hash="c5aec78e19aebe4d4e4cc3acb75c1dd2"/></dir><file name="Link.php" hash="d837a9755b0ad4a206c93961f9399118"/><dir name="Sample"><file name="Collection.php" hash="12a0c3cf9ed3be2773b9def10624fa88"/></dir><file name="Sample.php" hash="99290dedaa12fe19e5a314bd92a94ba7"/></dir><file name="Observer.php" hash="596891b801f12e36a07a293b16147da8"/><dir name="Product"><file name="Price.php" hash="5069197d38100dc5ca6d534c857cb339"/><file name="Type.php" hash="ae26804a7c88f862c44ad2ffe257ad81"/></dir><dir name="Resource"><dir name="Indexer"><file name="Price.php" hash="bb47d44ce24a0246e591ff2c37b24bcb"/></dir><dir name="Link"><file name="Collection.php" hash="5c0a9e2f769789f0086315c12581fd9e"/><dir name="Purchased"><file name="Collection.php" hash="5954f63b5f9425b2efb0ecc0743bd7d6"/><dir name="Item"><file name="Collection.php" hash="03afa669e1013c030652a145999e602b"/></dir><file name="Item.php" hash="86ae589ca268928acf8b19f12c5a5e8a"/></dir><file name="Purchased.php" hash="3619c06db548ac379f287a9227780858"/></dir><file name="Link.php" hash="082b74575e6ff6c34742804b657b196e"/><dir name="Sample"><file name="Collection.php" hash="59ea3d7e6ec3c6ea002f98c2a4137023"/></dir><file name="Sample.php" hash="c0b238d602b757aa9ee39874c1734d74"/></dir><dir name="Sales"><dir name="Order"><dir name="Pdf"><dir name="Items"><file name="Abstract.php" hash="9c4e651ef209353c74f3039a3fa9aea1"/><file name="Creditmemo.php" hash="bc6aa03309998c31da386f5539ca751c"/><file name="Invoice.php" hash="08cb50eacad71be54280e15bea9292c9"/></dir></dir></dir></dir><file name="Sample.php" hash="7302b1af79603dc61153315834797031"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Contentdisposition.php" hash="a953a92d9c47521598d7bb4d3b6a54e1"/><file name="Orderitemstatus.php" hash="464e857052d410f48dc98dc87147c11b"/></dir></dir></dir></dir><dir name="sql"><dir name="downloadable_setup"><file name="install-1.6.0.0.php" hash="02f4364d17a0ce35134fd935a1e6b53e"/><file name="mysql4-install-0.1.0.php" hash="227c2e7e46b178e9c5726a36ebd0735d"/><file name="mysql4-install-1.4.0.0.php" hash="ed8e4add4b2dd3e6c8b018d6f7d5ccca"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="a5f6fc0c9e29f307a40508a90a9a1fb8"/><file name="mysql4-upgrade-0.1.10-0.1.11.php" hash="0482cdc3cc0959f0c8c8ae773eab3a02"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="ef4354ac783bd97bcf065754a16ae644"/><file name="mysql4-upgrade-0.1.11-0.1.12.php" hash="e543e5f43f95c2fac46d5a1b12c3ac7a"/><file name="mysql4-upgrade-0.1.12-0.1.13.php" hash="6d21b51e1d21a6c7598c2206fe016b3e"/><file name="mysql4-upgrade-0.1.13-0.1.14.php" hash="882de82e3b9c6015b2300fe3f936dfbe"/><file name="mysql4-upgrade-0.1.14-0.1.15.php" hash="a25d671905f5d8c1818243712b7f245c"/><file name="mysql4-upgrade-0.1.15-0.1.16.php" hash="22bfc8474a03ab76c2c55c913ef21e57"/><file name="mysql4-upgrade-0.1.2-0.1.3.php" hash="59c33ab499a598f0b8bf949965c14e59"/><file name="mysql4-upgrade-0.1.3-0.1.4.php" hash="cdfe7fb66566ca86879bbd8338a0424e"/><file name="mysql4-upgrade-0.1.4-0.1.5.php" hash="1535fdfa990054392d990c83a535b010"/><file name="mysql4-upgrade-0.1.5-0.1.6.php" hash="b9148c21ad8fb6806cded2dcb8389138"/><file name="mysql4-upgrade-0.1.6-0.1.7.php" hash="1ea623c7c894ccbd021c41a6f002d17d"/><file name="mysql4-upgrade-0.1.7-0.1.8.php" hash="91353b8f4e6ca0272ffa65613e26f657"/><file name="mysql4-upgrade-0.1.8-0.1.9.php" hash="2b389b29fb30cd6bf8a69df321a8e587"/><file name="mysql4-upgrade-0.1.9-0.1.10.php" hash="47737b2130151e1ce36e14203078645b"/><file name="mysql4-upgrade-1.3.9-1.4.0.0.php" hash="14c4dc3baf66bed7e057bfe2a8c55b59"/><file name="mysql4-upgrade-1.4.0.0-1.4.0.1.php" hash="75fb2e1939b579d613d2d708dac3f0dd"/><file name="mysql4-upgrade-1.4.0.1-1.4.0.2.php" hash="acb92743d5297ad5ad149a6a1aff6b85"/><file name="mysql4-upgrade-1.4.0.2-1.4.0.3.php" hash="ad8d2e0bba89fcbb3988d2c35539121b"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="d62e0d5ac4acfed8e382ce0eee068f10"/><file name="mysql4-upgrade-1.6.0.0.1-1.6.0.0.2.php" hash="f4d80ff0b7a41d376283fa02d3c40e0f"/><file name="upgrade-1.6.0.0.1-1.6.0.0.2.php" hash="ec7654928055a671b943abc7ef8d2dcf"/><file name="upgrade-1.6.0.0-1.6.0.0.1.php" hash="2a3569ee4caa76733a3ca097876e00b5"/></dir></dir></dir><dir name="Eav"><dir name="Block"><dir name="Adminhtml"><dir name="Attribute"><dir name="Edit"><file name="Js.php" hash="6bd3f1047ee52819c81ddffc762dc67c"/><dir name="Main"><file name="Abstract.php" hash="03937f29656f33467ce49f11509953a1"/></dir><dir name="Options"><file name="Abstract.php" hash="1f11738b7d90eb9049b4f6de3fae4374"/></dir></dir><dir name="Grid"><file name="Abstract.php" hash="79a45bbecc91dbed1c4397a2d311b372"/></dir></dir></dir></dir><dir name="etc"><file name="config.xml" hash="72a1f547c53309a5e66b502fdb37fcc7"/></dir><file name="Exception.php" hash="338399700b128bcce788f4bcbca88761"/><dir name="Helper"><file name="Data.php" hash="3a33423ece0105efcf1df6e8d14bf3cd"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><dir name="Inputtype"><file name="Validator.php" hash="8b595c6b0ec8f6a3d19063bb4c1f2b56"/></dir><file name="Inputtype.php" hash="7a9615f77c6bfca0c2f568c5b358b76f"/></dir></dir></dir></dir><dir name="Attribute"><dir name="Data"><file name="Abstract.php" hash="0bf1040a56a7b6a1c401a4a5d2bd0716"/><file name="Boolean.php" hash="85f8246ab9df1a4870741f8274ea8769"/><file name="Date.php" hash="91aa527ab9cbc83024627273fe9e4923"/><file name="File.php" hash="2e4c4deb9e3accbb2ca1362add9a7aa1"/><file name="Hidden.php" hash="39d410dc998edd387d52ee8edb546dfd"/><file name="Image.php" hash="69b8d41d0772d97e4d020692af9d6d4d"/><file name="Multiline.php" hash="ed7a9ad5a39261332e05330fbdaed856"/><file name="Multiselect.php" hash="5964b3d8c521bddb9f06d2771d11e573"/><file name="Select.php" hash="668515f2360f457cad2797aeb8de1094"/><file name="Textarea.php" hash="4d224719761bb38ce4c1190315218d52"/><file name="Text.php" hash="871791d3800b518cdbc08d932a40e3af"/></dir><file name="Data.php" hash="0f9b7ba6ceef1324d86f551133432325"/></dir><file name="Attribute.php" hash="3c31e0bd526be009675337eea94eb78c"/><file name="Config.php" hash="cc5aaf752d45906cde626ae9f2bf3f7e"/><dir name="Convert"><dir name="Adapter"><file name="Entity.php" hash="5f9d8faf2969481156c271389cf3e2d0"/><file name="Grid.php" hash="6533de09fb0389a27e3b6053a50ff7f0"/></dir><dir name="Parser"><file name="Abstract.php" hash="ba7bc17f061f5021b2f6b94ecec3d5d2"/></dir></dir><dir name="Entity"><file name="Abstract.php" hash="4edc1881cc6722de83e420b2960fd5ec"/><dir name="Attribute"><file name="Abstract.php" hash="18595a457115ec00dddc2488e3ba2343"/><dir name="Backend"><file name="Abstract.php" hash="c8646c593c58e7fec60c66f8259b2f68"/><file name="Array.php" hash="23519e1ab8b8a72fdce09bc1eae461fb"/><file name="Datetime.php" hash="43b634a5a755d3b64787fe8b8bfba3c1"/><file name="Default.php" hash="32cc4823e0b56d1195f0725e43bd86cf"/><file name="Increment.php" hash="ab3015246d6ecd82b9441eab503c6103"/><file name="Interface.php" hash="c9a2578454e24b87f46732a008714596"/><file name="Serialized.php" hash="f8b805e4a4236ec998abd4a182e519dd"/><file name="Store.php" hash="657bc44a8b1d8cf92897f0dff0b7f40a"/><dir name="Time"><file name="Created.php" hash="2366d479080a84b5bf7a50ea0adbeba0"/><file name="Updated.php" hash="1c61c3075fed948dc91d51ffbb12bd42"/></dir></dir><file name="Exception.php" hash="f037ec93cb28523b2b0641d4b8e77c90"/><dir name="Frontend"><file name="Abstract.php" hash="4f7887cd11f268ac5150cadb29d3d5c3"/><file name="Datetime.php" hash="c6f3fbc642ebebeebc3054f76238f258"/><file name="Default.php" hash="1d6551c2d9ac8d26cd65dd53d19d7e62"/><file name="Interface.php" hash="999a04fd1409a331aecc5bb3b34f9ac3"/></dir><file name="Group.php" hash="5eeaf283a2139a6e83e3ad14b4eabf3f"/><file name="Interface.php" hash="e8affc9c93a5d2fe880c092f93e782fc"/><file name="Option.php" hash="590e76834235fab10bbe9915a5e3174c"/><file name="Set.php" hash="50f1578e055ccf74197e088af60e9d81"/><dir name="Source"><file name="Abstract.php" hash="e2f5dc4e642fcda1649b9727da01fa7a"/><file name="Boolean.php" hash="2fca44d30189bea98e23445ecf9d95b9"/><file name="Config.php" hash="07a4aa8d71f026cb2997aa8e85a7cb04"/><file name="Interface.php" hash="f52efa4af13384ab400a2b63ca9be9fe"/><file name="Store.php" hash="67f93424f0c6a01c704e0f54f0a02822"/><file name="Table.php" hash="2f6d92a8e98da36b65ca2b73cd187ec5"/></dir></dir><file name="Attribute.php" hash="d3312c8323d8b5c5e73855b4df78e3e5"/><dir name="Collection"><file name="Abstract.php" hash="1e363cd4a43ebb51fa6d8ae617ac553b"/></dir><file name="Collection.php" hash="7c79f30f012e8d8e38c20193c8fcc34d"/><dir name="Increment"><file name="Abstract.php" hash="e93f16f31763486aa9c0712ab875a932"/><file name="Alphanum.php" hash="8aaa683164a8a7bd714a59bca784512a"/><file name="Interface.php" hash="4e0ad4e7ea651b8e7dda244c5a65394d"/><file name="Numeric.php" hash="0e29003149592b1a3d38610d1a369dc2"/></dir><file name="Interface.php" hash="f6d1bedebd05898f0914b7b3a93ced04"/><file name="Setup.php" hash="410966b07a93f4d2741f8964f2dcd607"/><file name="Store.php" hash="53edea3ce2ea0d7b127d740c8d4bf990"/><file name="Type.php" hash="f823562f2c834b512a13cd7feb1b7d57"/></dir><file name="Entity.php" hash="8f33d8a0716b491f3819703ef790bce3"/><dir name="Form"><file name="Element.php" hash="51bd50a79f7345fe78b61c8bc0c537d1"/><file name="Fieldset.php" hash="5b327fc5bcbc4f920619c69205b9d315"/><file name="Type.php" hash="547af9c49ac72b5149792284174c9272"/></dir><file name="Form.php" hash="85c70d7b53d2430cb09bcf8fb142ec9e"/><dir name="Mysql4"><file name="Config.php" hash="35b923a5c0ae169b11433d8bab9d7d25"/><dir name="Entity"><dir name="Attribute"><file name="Collection.php" hash="4ced2061fe6878cf7899c9f80af2eb63"/><dir name="Group"><file name="Collection.php" hash="20508679cf88971ec4c929ecfa69b3ca"/></dir><file name="Group.php" hash="648305ff4127434fa5913abf4b828873"/><dir name="Option"><file name="Collection.php" hash="faf2f2a782f8285e73d5e41780e724b3"/></dir><file name="Option.php" hash="3cf86f635368c030a3954db35704bb4f"/><dir name="Set"><file name="Collection.php" hash="afee03dcb7a2d12dcd011b08668c0bf0"/></dir><file name="Set.php" hash="452f7cd8550a4e3489276643cf45c19e"/></dir><file name="Attribute.php" hash="839c5a69dde545df4f28f72153bd8069"/><file name="Store.php" hash="4a35da3d15186a3fabc197b945f4e673"/><dir name="Type"><file name="Collection.php" hash="74b88f6bf0ab426a743d191f885d932e"/></dir><file name="Type.php" hash="da89cba104dcd004b74e19ba4ef057ee"/></dir><dir name="Form"><dir name="Element"><file name="Collection.php" hash="54b9e9e7336a6d2e8bd3d6d2a0a2e6bd"/></dir><file name="Element.php" hash="09b0aea95ac80aec4cbde424a5aed58e"/><dir name="Fieldset"><file name="Collection.php" hash="78d7525ac55b7a3d26b02434b53a5c8c"/></dir><file name="Fieldset.php" hash="6b13a9229903aedb28ab1be9876cbca0"/><dir name="Type"><file name="Collection.php" hash="9efa45f3889a2725d55779bde24089e6"/></dir><file name="Type.php" hash="a751818c1ec9de31777c6b3d6e42eb9b"/></dir></dir><dir name="Resource"><dir name="Attribute"><file name="Collection.php" hash="dcbfa9127eadf942a51008a1c9e522b7"/></dir><file name="Attribute.php" hash="751ee0776a5915351a99c2450a142fb8"/><file name="Config.php" hash="6e30f1fd65fece5d070be80a22d04998"/><dir name="Entity"><dir name="Attribute"><file name="Collection.php" hash="914e238a790229b91f66729b995f4eb5"/><dir name="Group"><file name="Collection.php" hash="742ad6a7852ad660c2d385e495e5f0ef"/></dir><file name="Group.php" hash="1974cdbc75e0d2cc86b0a60432b31b36"/><dir name="Option"><file name="Collection.php" hash="4454fd614fe06a946f4ea42fff8073be"/></dir><file name="Option.php" hash="0feff64acecfa8528b1c58c511b4da68"/><dir name="Set"><file name="Collection.php" hash="67bb5968dd39e2c54f8ca0e2db7ff04d"/></dir><file name="Set.php" hash="bf6ede65e7075deaa089bf98accd1803"/></dir><file name="Attribute.php" hash="0abdc6be25274d8012336cca657ca0d9"/><file name="Store.php" hash="186e168577df45c5a0495262bb305481"/><dir name="Type"><file name="Collection.php" hash="f10c326eff0e8f32151696f9b7bc4ea8"/></dir><file name="Type.php" hash="9aaa21dd6c47d83f5e46b6cdbf5f6ab5"/></dir><dir name="Form"><dir name="Attribute"><file name="Collection.php" hash="409860a23f62ad96d34aad57537611e5"/></dir><file name="Attribute.php" hash="47ababb365add5b8ef945e047fe936c2"/><dir name="Element"><file name="Collection.php" hash="6ba5d7dbc8c2853a73837d0fb6b7d628"/></dir><file name="Element.php" hash="f871f9ba2fcd1abe20d6bcdfedbc6143"/><dir name="Fieldset"><file name="Collection.php" hash="bc541f521c172a86c89b19dcd6cce01f"/></dir><file name="Fieldset.php" hash="9928bbd128d60f96376a6ee134513408"/><dir name="Type"><file name="Collection.php" hash="9bbe502527b13556e879569f722c2ddc"/></dir><file name="Type.php" hash="ad3ef1393c0e773fd76ebd35ea73f90f"/></dir><dir name="Helper"><file name="Mysql4.php" hash="5781f9be5ce2ad9e132bb1723e1f0a50"/></dir></dir></dir><dir name="sql"><dir name="eav_setup"><file name="install-1.6.0.0.php" hash="4c879572ac1cb2c34976ddb9d3a3414e"/><file name="mysql4-install-0.7.0.php" hash="006fc42fa1b7c90b3bb6c2ef873f27ab"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="6ae0811afcf81b536e2ca327eeb03769"/><file name="mysql4-upgrade-0.7.10-0.7.11.php" hash="1302bc1e7b234c805b3985e21f520ca7"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="7bf60ce8f70c5ca9fe28e40fdfdb985b"/><file name="mysql4-upgrade-0.7.11-0.7.12.php" hash="bb4eef59a74692d523312cb6f6a4aa33"/><file name="mysql4-upgrade-0.7.12-0.7.13.php" hash="b441d99ae9c5f6775992b8606124ff88"/><file name="mysql4-upgrade-0.7.13-0.7.14.php" hash="b85a21b371153272a7b44e9dc181ffb3"/><file name="mysql4-upgrade-0.7.14-0.7.15.php" hash="2118a3462bf3decab4420d3fe753f5c9"/><file name="mysql4-upgrade-0.7.15-0.7.16.php" hash="ae2a30a6c2f02c24882940dedbe2a855"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="3660cbe5bbd307c87363c93047319a99"/><file name="mysql4-upgrade-0.7.3-0.7.4.php" hash="e6000b6a9329c4300623b9ab259dfd4d"/><file name="mysql4-upgrade-0.7.4-0.7.5.php" hash="e61eb261e574a446660e0a6d6e5bebbb"/><file name="mysql4-upgrade-0.7.5-0.7.6.php" hash="0da9d8014f7651a1b3dce9665a170c6d"/><file name="mysql4-upgrade-0.7.6-0.7.7.php" hash="acf89bc6fd73bd5821981e666b697350"/><file name="mysql4-upgrade-0.7.7-0.7.8.php" hash="b29fa91cd8d6e850cf46324e4b9c65f4"/><file name="mysql4-upgrade-0.7.8-0.7.9.php" hash="edb1a4b16d6adcba2e27f4964fefcfd6"/><file name="mysql4-upgrade-0.7.9-0.7.10.php" hash="10fe3e3889a23c26ef734c38239c4685"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="39e9b18a34eeb85ceb918cab7c27d112"/></dir></dir></dir><dir name="GiftMessage"><dir name="Block"><dir name="Adminhtml"><dir name="Product"><dir name="Helper"><dir name="Form"><file name="Config.php" hash="56ebc0a4dd6d99dc890cbbc158e1f09b"/></dir></dir></dir><dir name="Sales"><dir name="Order"><dir name="Create"><file name="Form.php" hash="171dd4046dda0d537572c0297c7a44a9"/><file name="Giftoptions.php" hash="5a16e6298d4dcc4988eb02f1766412c9"/><file name="Items.php" hash="663524a023391474dcc20482567a531f"/></dir><dir name="View"><file name="Form.php" hash="a24a42f898ad898d60c534e99f760251"/><file name="Giftoptions.php" hash="0e4a729c38e88ce8d590e690fa633481"/><file name="Items.php" hash="86345f1348f2ca44d87108415c7ca7de"/></dir></dir></dir></dir><dir name="Message"><file name="Form.php" hash="9312fce35bb031623871901aa3dac3d9"/><file name="Helper.php" hash="c1c414359a1610b40923fb2727ddca27"/><file name="Inline.php" hash="ac6f6062de6b202f90d20b1ff980d198"/></dir></dir><dir name="controllers"><file name="IndexController.php" hash="4f71bc1d255540c5c28b127b1bd11785"/></dir><dir name="etc"><file name="api.xml" hash="bcc10f7d6527bd56996c491f7d0705e5"/><file name="config.xml" hash="3c63349cb9e3fcd60ff99477b6f5da68"/><file name="system.xml" hash="6fcc04ad5ceccc2af6065890e08da11b"/><file name="wsdl.xml" hash="b99aaaac0126c6e09a7ba59fa4dbcf30"/><file name="wsi.xml" hash="ab77c7cfecb0f5d6cb7b07c0b5abc1d1"/></dir><dir name="Helper"><file name="Data.php" hash="7b31d380f028bd3f04ab82d41de3e77b"/><file name="Message.php" hash="46a883a412475741a6ef2a2b9fbc0c44"/><file name="Url.php" hash="8b273c62bc34acda2d8d681717ed66a4"/></dir><dir name="Model"><dir name="Api"><file name="V2.php" hash="80bdb07f32cff6142bdedda79c7019f7"/></dir><file name="Api.php" hash="72e256cfc90094cdb713e6ecc6bae938"/><dir name="Entity"><dir name="Attribute"><dir name="Backend"><dir name="Boolean"><file name="Config.php" hash="456786371d3d4bf1fc234153a6c0c866"/></dir></dir><dir name="Source"><dir name="Boolean"><file name="Config.php" hash="cd4b51b5f44883afcf0608bcbfd1fdb6"/></dir></dir></dir></dir><file name="Message.php" hash="406263bf9b01af39c41ef01c791eeb42"/><dir name="Mysql4"><dir name="Message"><file name="Collection.php" hash="f08d27f42dd172e970a9b4aff1c75131"/></dir><file name="Message.php" hash="af13604ac0fc21d75db321576b267053"/><file name="Setup.php" hash="ebd64361351d867d5cff6d284d05e8dd"/></dir><file name="Observer.php" hash="012f370ce4393bfb99933358f9b8002a"/><dir name="Resource"><dir name="Message"><file name="Collection.php" hash="ead26a627f946fb57b0ac10e169afdbf"/></dir><file name="Message.php" hash="02701550266c809527c45a725bdabf26"/><file name="Setup.php" hash="237612c1539848d706ae7c1f64d2930c"/></dir></dir><dir name="sql"><dir name="giftmessage_setup"><file name="install-1.6.0.0.php" hash="71fa43b0ff0badefeacf5fe8766a6c0a"/><file name="mysql4-install-0.7.0.php" hash="43fed0b5c896d34ada69dc0376716e13"/><file name="mysql4-upgrade-0.1.3-0.7.0.php" hash="e23b6afa04a41debd8572e6abeb8a98e"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="4b7f3394351e7b4f0ea4e404f36d2757"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="dc7e14f0cb6fa8144771681920c521e1"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="019911d9734c393ef629b6bb57b4abfc"/><file name="mysql4-upgrade-0.7.3-0.7.4.php" hash="0960b891751b8b3ce014fbd585227e22"/><file name="mysql4-upgrade-0.7.4-0.7.5.php" hash="b1cc7462b89813f8dc8eb152e55be6e1"/><file name="mysql4-upgrade-0.7.5-0.7.6.php" hash="06f78b3eb8f8947696e5325f53598759"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="ee49836989d289c4efef5cea40a36954"/></dir></dir></dir><dir name="GoogleAnalytics"><dir name="Block"><file name="Ga.php" hash="5b8233decf84b4c379b02e87d193d19a"/></dir><dir name="etc"><file name="adminhtml.xml" hash="03bff1cbc8a4d47641fc2cdaea16e8a1"/><file name="config.xml" hash="af1769d01842a31a5be7fb050eb6aa0e"/><file name="system.xml" hash="a3a36dd9e064643b9df9152cc01da29a"/></dir><dir name="Helper"><file name="Data.php" hash="b8ccc9d6ea561bd56433d940454269f2"/></dir><dir name="Model"><file name="Observer.php" hash="ba43fb15f7910d792a8c60e7894d7141"/></dir></dir><dir name="GoogleBase"><dir name="Block"><dir name="Adminhtml"><file name="Captcha.php" hash="11d35ca98e02940c1a9f809cd15cae5e"/><dir name="Items"><file name="Item.php" hash="b924bff61044962dc1666b1fc616fce0"/><file name="Product.php" hash="a75c067400bb11381c318926f0c76136"/><dir name="Renderer"><file name="Id.php" hash="30869ffce8f2a931db958aa83a42600f"/></dir></dir><file name="Items.php" hash="ab01bf2db057a12321a53b8ff68e8d2a"/><dir name="Store"><file name="Switcher.php" hash="b05f1f0f7f3b7cefbcfce6dcc2de05e5"/></dir><dir name="Types"><dir name="Edit"><file name="Attributes.php" hash="bb5194cd5035103bad818d43964d4032"/><file name="Form.php" hash="fbb8df5c3436288f4653951582ce1742"/></dir><file name="Edit.php" hash="653117dfc9b4f56e0fdbdbc46b3ff15a"/><file name="Grid.php" hash="4bb662a4de3c01538feb43ecf98ae62b"/><dir name="Renderer"><file name="Country.php" hash="037f73f00c88591d64f9f3f1a6735f63"/></dir></dir><file name="Types.php" hash="0fc3ac1cdc8c72d2abb5292a5902a64f"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Googlebase"><file name="ItemsController.php" hash="619511f52eadd06f8c707b6b3ad4b818"/><file name="SelectionController.php" hash="0207170667b739b668e780d87694bfd2"/><file name="TypesController.php" hash="cb4c27dd4d35826fec1a564cb25f4c7d"/></dir></dir><file name="ItemsController.php" hash="e085476d3570a9db4e0416cb6a1593a9"/><file name="SelectionController.php" hash="c513207288ddf64260bb132b89fc4642"/><file name="TypesController.php" hash="178b5e996d847aced024df13580a907d"/></dir><dir name="etc"><file name="adminhtml.xml" hash="9b5d0300d279b66d942dc99cc1c5a143"/><file name="config.xml" hash="17000770847a4d00b34857ff64e7662d"/><file name="system.xml" hash="3ce42884279b43bb9eae70d925efcbeb"/></dir><dir name="Helper"><file name="Data.php" hash="1ecfb400cfbe9793602ae5b9bc8a4bac"/></dir><dir name="Model"><file name="Attribute.php" hash="881f6ff8630a0fc7c7058394f2d40cb7"/><file name="Config.php" hash="fa085226b80f876729df3ef5536a5d1e"/><file name="Item.php" hash="7f0e3721d23ad455aad38614a51b2385"/><dir name="Mysql4"><dir name="Attribute"><file name="Collection.php" hash="80a200732f55c28eb748b1607b93f932"/></dir><file name="Attribute.php" hash="7b065434473b90568d58526ac2d34327"/><dir name="Item"><file name="Collection.php" hash="18377f6175716f42f0109c3082354261"/></dir><file name="Item.php" hash="30df6296f7fd6048c6e2c47d651cc2b0"/><dir name="Type"><file name="Collection.php" hash="655254e8bd73564c00e9668a50aebeef"/></dir><file name="Type.php" hash="65f0ac23b619bc691263c871ac1d281a"/></dir><file name="Observer.php" hash="d5424472c73d999610077296d8627232"/><dir name="Resource"><dir name="Attribute"><file name="Collection.php" hash="b93ccc40ea7186a15973403ca5c6e994"/></dir><file name="Attribute.php" hash="30c13b4c9295bbb88c06251120260ff9"/><dir name="Item"><file name="Collection.php" hash="1db2fdd63421b671590188bc0c260852"/></dir><file name="Item.php" hash="d7094884556b824015d2daecdf70b871"/><dir name="Type"><file name="Collection.php" hash="803fa1cb79dc3f3291a0f2c971f45732"/></dir><file name="Type.php" hash="a2fd82d425ca3b0e28b65bf9c6591b05"/></dir><dir name="Service"><file name="Feed.php" hash="c24ea40285240bc6b898b9a74fb0e49d"/><file name="Item.php" hash="eca216c852002600ca4aa943ffe5953f"/></dir><file name="Service.php" hash="daa83f849957f45c20f11f30a8ff8987"/><dir name="Source"><file name="Accounttype.php" hash="dbd14cc47e6d96f3611b703a8a41ffbf"/><file name="Authtype.php" hash="e2f1ea0e5a140e77bca30954ea565eca"/><file name="Country.php" hash="8f025ee185da9f3d5d87d96957558337"/><file name="Statuses.php" hash="eefecdef5ddc01cc09e456e82ae5247b"/></dir><file name="Type.php" hash="67d0312b1b2b74c26f4a4546529eb266"/></dir><dir name="sql"><dir name="googlebase_setup"><file name="install-1.6.0.0.php" hash="8a19cd7e0e990fc2472ad0917107a6b0"/><file name="mysql4-install-0.1.0.php" hash="d41c2b21d7e560a75b86cbe86685368c"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="6269576c23f677938082f96e52786641"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="41834668441873ce3c22913272c57494"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="bf5ebba307f2e9df0279a23e742dd620"/></dir></dir></dir><dir name="GoogleCheckout"><dir name="Block"><dir name="Adminhtml"><dir name="Shipping"><dir name="Applicable"><file name="Countries.php" hash="2d87988a05d5f864b81702c49d79eb43"/></dir><file name="Merchant.php" hash="b1e62fa388c138b1d43608a0b8e1236c"/></dir></dir><file name="Form.php" hash="78e2c28dcf00cabea35fc7960a6dd53e"/><file name="Link.php" hash="b7dcb5128c272b80b85d4ad79956d380"/><file name="Redirect.php" hash="922ddf15c5a9cd70a6a0e0e530fe26a7"/></dir><dir name="controllers"><file name="ApiController.php" hash="4762dbe6e79b338f17869b5df33fcfdb"/><file name="RedirectController.php" hash="b95fb5eb9d812d2b73400ccf2b60bf9a"/></dir><dir name="etc"><file name="adminhtml.xml" hash="262f293d6ed542223573e0e18d28c59e"/><file name="config.xml" hash="b2d4aff569e2f9c78ebcbaed361fab3e"/><file name="system.xml" hash="bb9023835a8720d150388ea20edb39cf"/><file name="wsdl.xml" hash="6afabc0271d6e7e1fd11b3d4ee76aa86"/><file name="wsi.xml" hash="7d4dabc90cbde5a078f6beeaac4df3ab"/></dir><file name="Exception.php" hash="ad28999c1fbf2d672e8565a7a0dfed9d"/><dir name="Helper"><file name="Data.php" hash="5a5fd536c5eef1bc9d3ac6b560c91b3d"/></dir><dir name="Model"><dir name="Api"><file name="Debug.php" hash="916c2afbe544b5623583fc63bff6178c"/><dir name="Xml"><file name="Abstract.php" hash="a209f824449a68bd48d865adfd143d71"/><file name="Calculate.php" hash="d2305b16fd3b584aa81e15d3c8eae2e5"/><file name="Callback.php" hash="98ab8ba14a71461ad122f4a101ad818c"/><file name="Checkout.php" hash="1727c1c01f2a46269778068190fbfe40"/><file name="Order.php" hash="9a4b96544ea90d6a3056a6d376196f65"/></dir></dir><file name="Api.php" hash="fdf76ecb25a36b511999b6053e6ca51c"/><dir name="Mysql4"><dir name="Api"><dir name="Debug"><file name="Collection.php" hash="4b8c6c757efad4e5352d1351c68b7a5d"/></dir><file name="Debug.php" hash="8a988b61fe5c82ac92320316b6549c33"/></dir><file name="Notification.php" hash="e3aa7bca37128eff83eb7ad8ab82756a"/><file name="Setup.php" hash="b8aea813f39f73ec9ebfb785fae08f90"/><file name="Tax.php" hash="1ad5e89e11e4d730285b2b0dc5d0a3f3"/></dir><file name="Notification.php" hash="6f23a6f52ae8feae7534437cba90f9de"/><file name="Observer.php" hash="e6f4f5c84d87da2d18513732ad8dd9f0"/><file name="Payment.php" hash="4f0ec5077ac3debf79f4b3f61e06bd42"/><dir name="Resource"><dir name="Api"><dir name="Debug"><file name="Collection.php" hash="2e7fe79dede155d0f6604b411f9f7c6d"/></dir><file name="Debug.php" hash="0786e903ed126ccb9578c6ba22d30ec6"/></dir><file name="Notification.php" hash="d023a61494d9ce282b306088b6b3c8c4"/><file name="Setup.php" hash="d923b4b4f964c3715a539a6d450ea970"/><file name="Tax.php" hash="8cfe344a37db5fe2f773f738cae65571"/></dir><file name="Shipping.php" hash="3f57f3a588787749ae62978aa3c0dc43"/><dir name="Source"><dir name="Checkout"><file name="Image.php" hash="1d02c0938b8ea6303c547a0bcc88b691"/></dir><file name="Locale.php" hash="e144b68d78177b2ead67910e98d3ca05"/><dir name="Shipping"><file name="Carrier.php" hash="a599ac14da1eb99698d0a3196cb94ebc"/><file name="Category.php" hash="e0a3c9a550f6656bfc5d912769fcc0c8"/><file name="Units.php" hash="f1c4cf8aa0d6b31d208b9830f99477df"/><dir name="Virtual"><file name="Method.php" hash="bc7c8ce6a73dce1e711c77ece72184f7"/><file name="Schedule.php" hash="73fe0c592996fc456a941b9440acf3b4"/></dir></dir></dir></dir><dir name="sql"><dir name="googlecheckout_setup"><file name="install-1.6.0.0.php" hash="3e7d0e5cda716082d927f8b3e5e0b00c"/><file name="mysql4-install-0.7.0.php" hash="f082a5fb8f90dfdaa0099ae6b240b270"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="3717fb4e7f03abb51cb8a70aa1ce2c9b"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="f960735bc96a3347e0ef5041bfab9d27"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="1dbf5f76a075d856523889cad873c426"/><file name="mysql4-upgrade-0.7.3-0.7.4.php" hash="881c273ffd40e2c3e9659c0bd9346208"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="d0d1c37f748aaa985808f3e6be003e95"/><file name="mysql4-upgrade-1.6.0.0-1.6.0.1.php" hash="75ad6726a715c107c67c14c5fa48d8de"/></dir></dir></dir><dir name="ImportExport"><dir name="Block"><dir name="Adminhtml"><dir name="Export"><dir name="Edit"><file name="Form.php" hash="1f8cc14307d73eeab2bc05ae7082afac"/></dir><file name="Edit.php" hash="0f6b1f7c730fce6e42593c0ca96c30e8"/><file name="Filter.php" hash="dd41b2e540678b2b080ab3bf0c93baf8"/></dir><dir name="Import"><dir name="Edit"><file name="Form.php" hash="8c828d1b20d7b383776033a166b2bd41"/></dir><file name="Edit.php" hash="16768787bd9ab901b75382fb3117a986"/><dir name="Frame"><file name="Result.php" hash="e92fc3e25c9c4d668cb2756cfb33fece"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="ExportController.php" hash="7ef85cb30a20b9f573915f33a38e5cbb"/><file name="ImportController.php" hash="270277dd5325bbaef53854902f0a0afe"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="ce7cdf4c196b16e94e3de02aae57a49e"/><file name="config.xml" hash="046e25cb72a79eb3ff0376f9807f7261"/></dir><dir name="Helper"><file name="Data.php" hash="b49c8c88d4d9484750c2f9702397ea72"/></dir><dir name="Model"><file name="Abstract.php" hash="c2cfa876b764b44432ecacd12a0cc021"/><file name="Config.php" hash="b7d0d95535bd85a072a5675580fe4176"/><dir name="Export"><dir name="Adapter"><file name="Abstract.php" hash="345e6e8a4c0573cb47d42f70854374e4"/><file name="Csv.php" hash="fb08a18befa44a4a438368b9c4685e39"/></dir><dir name="Entity"><file name="Abstract.php" hash="05badc6914078e29de15060bb5d1f979"/><file name="Customer.php" hash="bfd7a7ed406402a25d4f7b573ac7c53d"/><dir name="Product"><dir name="Type"><file name="Abstract.php" hash="b32e7b7ed013704dccc989d1d1f6cffc"/><file name="Configurable.php" hash="d060a9c76c61dafdf48a3774124677d8"/><file name="Grouped.php" hash="057bb1d7ad344dcff932cb764fd8870f"/><file name="Simple.php" hash="4a6f3fd00866c544a2d41b8dc8ebb7ab"/></dir></dir><file name="Product.php" hash="f6cdae1fc1df9978228d352850b14689"/></dir></dir><file name="Export.php" hash="bdab9c8901fbe634a88a5aaa83aaf0b9"/><dir name="Import"><dir name="Adapter"><file name="Abstract.php" hash="43b51ccc5d4cf3bfadc539971a75b2cf"/><file name="Csv.php" hash="07c3817e258b3ab277356bfa8861b0d5"/></dir><file name="Adapter.php" hash="f521ad7a655ec08d1af07381585e9353"/><dir name="Entity"><file name="Abstract.php" hash="4104436823467c80593e80ce26eeea56"/><dir name="Customer"><file name="Address.php" hash="3ccbc2321b52cc83abbc8d0105370b57"/></dir><file name="Customer.php" hash="194bfbfb96af86b22f9dd0f2fe00f51c"/><dir name="Product"><dir name="Type"><file name="Abstract.php" hash="128f83adeccc56b1d4f4d0e94bc96380"/><file name="Configurable.php" hash="20c6dfee01fad5b262d07382fd8a497f"/><file name="Grouped.php" hash="a7384b3ecf7c8fdb4a65503afa4aa4dc"/><file name="Simple.php" hash="393bb8e57ab8491288a458c8fe8c318c"/></dir></dir><file name="Product.php" hash="b7991b0249c601a49940bbb373ef68b5"/></dir><dir name="Proxy"><dir name="Product"><file name="Resource.php" hash="1839273d424e4df568ac2819547c50f7"/></dir><file name="Product.php" hash="fe1c8b143f4a6eeaab2d600b14b86a18"/></dir><file name="Uploader.php" hash="30e4b4916064567bc15b1eb1e81d3bb3"/></dir><file name="Import.php" hash="7dc8c49a334e4266215d2e72e7c65106"/><dir name="Mysql4"><dir name="Import"><file name="Data.php" hash="c226a9cd451fff5c59b99860adf70b85"/></dir><file name="Setup.php" hash="c7c15e7117934ac37a15629421b95ccb"/></dir><dir name="Product"><dir name="Attribute"><dir name="Backend"><file name="Urlkey.php" hash="288236a04d30bb6b2760ad853dba3275"/></dir></dir></dir><dir name="Resource"><dir name="Helper"><file name="Mysql4.php" hash="e57bb631a54c685d0bc3c2d70b558c61"/></dir><dir name="Import"><file name="Data.php" hash="cd4eb4355ed21bb18e8a15ddcc781aaa"/></dir><file name="Setup.php" hash="c96e4654498cd257b818add804956318"/></dir><dir name="Source"><dir name="Export"><file name="Entity.php" hash="0d921dc609e4e444620831f641fbb6b9"/><file name="Format.php" hash="2d4195f9a0db6ff344e9b0f3135e57fc"/></dir><dir name="Import"><file name="Behavior.php" hash="03693e092e980161e81b73d879f36f2f"/><file name="Entity.php" hash="02b9ba84d31773615f6c1259ee539882"/></dir></dir></dir><dir name="sql"><dir name="importexport_setup"><file name="install-1.6.0.0.php" hash="389a0bb4e6fed9f82f91e16b2ba60abe"/><file name="mysql4-install-0.1.0.php" hash="5967da7bd544d58a669203adb09fd56a"/><file name="mysql4-upgrade-1.6.0.1-1.6.0.2.php" hash="d586052bdcd33a447bd9fb0fca73adc5"/></dir></dir></dir><dir name="Index"><dir name="Block"><dir name="Adminhtml"><file name="Notifications.php" hash="dfafc1d35b5705985ed322b84b807f73"/><dir name="Process"><dir name="Edit"><file name="Form.php" hash="23f792c9c6294a31838c41f379d9d07d"/><dir name="Tab"><file name="Main.php" hash="0ac3fd82274e9fd1797d47ef2d3e741e"/></dir><file name="Tabs.php" hash="e3a387be0568a3f20448cf2503409ed8"/></dir><file name="Edit.php" hash="11281c80727aecb11c6d860b547bf12a"/><dir name="Grid"><file name="Massaction.php" hash="1268b64e97b0189f5cd086ea905395e3"/></dir><file name="Grid.php" hash="0b5f93254fe95f21829e42164a06f926"/></dir><file name="Process.php" hash="c75365cf9420d8cb875a713f7e1c4f64"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="ProcessController.php" hash="4b89a84dfa45a70324d8423f7b0e71e6"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="cfd5f0284b6ce5ce0dbd097c7551b4f6"/><file name="config.xml" hash="7e4bd24175911a8a73c046bc28db5257"/></dir><dir name="Helper"><file name="Data.php" hash="4788bf8d391f1a14fdafdcaaaec180b5"/></dir><dir name="Model"><file name="Event.php" hash="0d15ed384ed12c3a38ab53d96fb27020"/><dir name="Indexer"><file name="Abstract.php" hash="e40afd11339fc098b31d988abb9404ac"/></dir><file name="Indexer.php" hash="854a9789588dec1f6f4dc706c8a5ca3a"/><dir name="Mysql4"><file name="Abstract.php" hash="3bed8b3facf6a58b355159bf8ceae30d"/><dir name="Event"><file name="Collection.php" hash="da5bb0c786097ea5fe9015f4cfcfd7b7"/></dir><file name="Event.php" hash="4120731c55117a4786d0105213570cc5"/><dir name="Process"><file name="Collection.php" hash="75bc067c1e321d6547deaf1ee5920796"/></dir><file name="Process.php" hash="36f201f62b2ff6f53d4bf3803f193019"/><file name="Setup.php" hash="9586dd20141587e527872b253b396e7a"/></dir><file name="Observer.php" hash="a7c0f6f819da166a25fb19e18c91fed6"/><file name="Process.php" hash="cb3d7ea754bb5ccc1ad38df6976af3a8"/><dir name="Resource"><file name="Abstract.php" hash="9841c446a01d1fe536682313f62f8b4a"/><dir name="Event"><file name="Collection.php" hash="6785f29bff5092b066554dc5310e85ca"/></dir><file name="Event.php" hash="48ee9c5470d7974b869cf3999b28f119"/><dir name="Helper"><file name="Mysql4.php" hash="eb700536d57a6144b502d382ab3ae067"/></dir><dir name="Process"><file name="Collection.php" hash="3dc6326339d71342f13922f492f8a31e"/></dir><file name="Process.php" hash="86014bf500b2990e47f829bb97602843"/><file name="Setup.php" hash="6e1d9dbdf767451bc63b86da214a8945"/></dir></dir><dir name="sql"><dir name="index_setup"><file name="install-1.6.0.0.php" hash="d0f65c6f8e47e0551be8c8aebce5d0ff"/><file name="mysql4-install-1.4.0.0.php" hash="3d4cbdaae6af1e1dc0ea104213740c85"/><file name="mysql4-upgrade-1.4.0.0-1.4.0.1.php" hash="5d483bdc4d485de6adfb93087a20bfe0"/><file name="mysql4-upgrade-1.4.0.1-1.4.0.2.php" hash="128ccef7c327b8971d788a3531aefa6a"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="4f2427c1c36ee6423d5ae104fce26e36"/></dir></dir></dir><dir name="Install"><dir name="Block"><file name="Abstract.php" hash="ccc416686e311be2dc283d74f91d7b9a"/><file name="Admin.php" hash="4d8291f7e703c720f53ea7c87750cfcb"/><file name="Begin.php" hash="51c006bfa6f0fb1537578ce406b1a02d"/><file name="Config.php" hash="cf809114a42e0c4643fa4e869e7d1764"/><dir name="Db"><file name="Main.php" hash="ee664b34bfc5e7bd27dbc8532decdd2f"/><dir name="Type"><file name="Mysql4.php" hash="cc617cc432230a6982fa6ec58b1b2857"/></dir><file name="Type.php" hash="8f22663b3a384e321ea3cf91b8148ec8"/></dir><file name="Download.php" hash="cff48437b846f6656c96efe559f7d7dc"/><file name="End.php" hash="5c204e585bc0500d1518cf81c57e7b4e"/><file name="Locale.php" hash="2ff57cb39292502dbef7d470226b5c4e"/><file name="State.php" hash="61e46db6de917b3f15bf4038db946c88"/></dir><dir name="Controller"><file name="Action.php" hash="6d97384e3e692984445880e4fa1f693a"/></dir><dir name="controllers"><file name="IndexController.php" hash="5c9763d824968f02f3345911601b92f6"/><file name="WizardController.php" hash="6bfa0ec4cc08744a25efe3b453cec3be"/></dir><dir name="etc"><file name="config.xml" hash="f17873de30cff1e5d2a6ca7aaa734c9d"/><file name="install.xml" hash="de6c943b26e8239685f9abc9dc6afcc6"/></dir><dir name="Helper"><file name="Data.php" hash="cb55517f699c021ac482a4ee4ca39989"/></dir><dir name="Model"><file name="Config.php" hash="4bd45e27e1032f71db9008dcb7ebc21b"/><dir name="Installer"><file name="Abstract.php" hash="a3e53ed8a4d483e47a72f7af4bd370c9"/><file name="Config.php" hash="5883118cb6d13026846161e9e35e6671"/><file name="Console.php" hash="66d342a7cfa3a45d4640d99cf36fc276"/><file name="Data.php" hash="0183279f43b6b396095925d7363c51f0"/><dir name="Db"><file name="Abstract.php" hash="f1ceca0a1abf4041e20b50068cb0f776"/><file name="Mysql4.php" hash="3a1f20470f0303e99f34bfacfa7e5379"/></dir><file name="Db.php" hash="044e76741ede7fcafb9c5f3e1748f8c4"/><file name="Env.php" hash="b6891aacfe70774792b9f154ec9950d7"/><file name="Filesystem.php" hash="3f3e1696b5ffe8dd7fbff3ef230b8d69"/><file name="Pear.php" hash="0f652d25c541995d6957bf5001dfd871"/></dir><file name="Installer.php" hash="c3693e3285b3cdc20640023e02ee6df5"/><file name="Observer.php" hash="b88db2fd39679f65e9e7598e72700410"/><file name="Session.php" hash="3a93ffe0704d020b7d515a1a41e4cafe"/><file name="Wizard.php" hash="4937d69b57ddc0c6116fe743848a4d80"/></dir></dir><dir name="Log"><dir name="data"><dir name="log_setup"><file name="data-install-1.6.0.0.php" hash="18e0546079f0e810abba1c52c8df13f1"/></dir></dir><dir name="etc"><file name="config.xml" hash="2918bb186d96d3b3af9384a73a06b1ea"/><file name="system.xml" hash="acd41c2f6c891f460dcc211d161761d7"/></dir><dir name="Helper"><file name="Data.php" hash="7b06cb53be5c5b1ba30a613dcfb4fc4d"/></dir><dir name="Model"><file name="Aggregation.php" hash="ea4805b5799032d5382f9c190d0944d1"/><file name="Cron.php" hash="d5369f4ad5e05b60ad4b3b7af170a91c"/><file name="Customer.php" hash="914739f34ba902e801f764ae39256aad"/><file name="Log.php" hash="703b7e232e54c0990842711069a54c18"/><dir name="Mysql4"><file name="Aggregation.php" hash="b8830fa1849d19c61dea9abf9faa0c81"/><file name="Customer.php" hash="ad802602f8ee37c15338308db095876f"/><file name="Log.php" hash="5e928cfddc29f305c78a7fe260e16b25"/><dir name="Visitor"><file name="Collection.php" hash="631246721edd073f33526a9617d50699"/><dir name="Online"><file name="Collection.php" hash="0f4ea8a17eae3306e099dc16aeb7fca6"/></dir><file name="Online.php" hash="fa5aac8a5cf9dbb39ddcd454c22a58af"/></dir><file name="Visitor.php" hash="62cce8f9fdee2e7e74455ce38e5502ea"/></dir><dir name="Resource"><file name="Aggregation.php" hash="294fa73306eeb9141187c1528486a311"/><file name="Customer.php" hash="4941fe04d861c247b4d477975611ae28"/><file name="Log.php" hash="d1001b9e4ff165a41da45f28180d65d4"/><dir name="Visitor"><file name="Collection.php" hash="c2cf4c48661fb8fa5ecfe5ccf184b38e"/><dir name="Online"><file name="Collection.php" hash="285639b28f757b611ce3a05ff3935320"/></dir><file name="Online.php" hash="1275c85a053c339b6b0419e2328ca630"/></dir><file name="Visitor.php" hash="aec53c145fa4181b4acd757f7f9125af"/></dir><dir name="Visitor"><file name="Online.php" hash="706d0496938cb2a8ff9619996b7278c9"/></dir><file name="Visitor.php" hash="cedc39717d4da81075538c00bebffd8d"/></dir><dir name="sql"><dir name="log_setup"><file name="install-1.6.0.0.php" hash="3c7df5f5245bb1c0086522aecc2f6ade"/><file name="mysql4-install-0.7.0.php" hash="9d4affa349aaeda4b1567e129ff973d8"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="d42a53396d6f93c44977b8fbe5e88c3a"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="3127cd46c0e0be56c7493773c0e2f0d6"/><file name="mysql4-upgrade-0.7.3-0.7.4.php" hash="e62d115d1f28798413f7fd2e37af9b35"/><file name="mysql4-upgrade-0.7.4-0.7.5.php" hash="0a8fca14ec255cf00389512072aea918"/><file name="mysql4-upgrade-0.7.5-0.7.6.php" hash="58040afde114b6503a9ba3ae789d45f4"/><file name="mysql4-upgrade-0.7.6-0.7.7.php" hash="d53f398917bc121bf54923030f10c9b2"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="b6713df90e577d06c21973d742ea9c29"/></dir></dir></dir><dir name="Media"><dir name="etc"><file name="config.xml" hash="e849345faf2d84e953f6d4cdccbe7d53"/></dir><dir name="Helper"><file name="Data.php" hash="e8a812a865eb115e82d2809ddfdbd55a"/></dir><dir name="Model"><dir name="File"><file name="Image.php" hash="dadfd33d4a602936917175711aec1586"/></dir><dir name="Image"><dir name="Config"><file name="Interface.php" hash="07873395bce51eeab4f019ffac2baa25"/></dir></dir><file name="Image.php" hash="256abf2af363b287aa3463df56667930"/></dir></dir><dir name="Newsletter"><dir name="Block"><file name="Subscribe.php" hash="5c37203a6863e9e39851508c5e3c8eaf"/></dir><dir name="controllers"><file name="ManageController.php" hash="336d04127bd5d7c690d1cc814c29f5ae"/><file name="SubscriberController.php" hash="23a317ef974d3b67d28739486c12c9f8"/></dir><dir name="data"><dir name="newsletter_setup"><file name="data-upgrade-1.6.0.0-1.6.0.1.php" hash="c61a5973895f394c9ca73e2f331c009e"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="2546abd23047622109ca31239f75ed06"/><file name="config.xml" hash="3c42ba31bbf72e2ea467d45c574d2458"/><file name="system.xml" hash="6b76126fbf1f16f77e81e8ac30bc3ef0"/></dir><dir name="Helper"><file name="Data.php" hash="4994467bb617fb9aaf92a33dfcad0e99"/></dir><dir name="Model"><file name="Message.php" hash="088bc71aed55295d57043eb887b2d223"/><dir name="Mysql4"><dir name="Problem"><file name="Collection.php" hash="c7ff2d27861554dd6f46851fba42bf89"/></dir><file name="Problem.php" hash="c3ae973f360cf0b815c8aa5e96f3b114"/><dir name="Queue"><file name="Collection.php" hash="6ec5e25c0a862d20dc9a290388810b7b"/></dir><file name="Queue.php" hash="1ba620a81cab8e5b86182443a1e26eb7"/><dir name="Subscriber"><file name="Collection.php" hash="6f81234609258a6b3d829a9bc8e96e44"/></dir><file name="Subscriber.php" hash="0f080247ecf0496c68dd4380ae3b233d"/><dir name="Template"><file name="Collection.php" hash="7d9b82ef00b549886b0d562c87b0fd11"/></dir><file name="Template.php" hash="daa1f2f39cc60d39765d43087ead8c30"/></dir><file name="Observer.php" hash="f69ac54ca7ca32bc66dc5ddd58281e06"/><file name="Problem.php" hash="3c26de81269564ad223c6e30645e2040"/><file name="Queue.php" hash="c22b3da85a9eed7d12e5724cc72082f6"/><dir name="Resource"><dir name="Problem"><file name="Collection.php" hash="db54e1432a67f3fe18d80d538f6c1d0b"/></dir><file name="Problem.php" hash="83abef7ec71e3d0a2310650989e21384"/><dir name="Queue"><file name="Collection.php" hash="10b4210ba1cb95aa7eefea9bd08cd99f"/></dir><file name="Queue.php" hash="91fe9fcc396a2855b2ffbac8de6d39a5"/><dir name="Subscriber"><file name="Collection.php" hash="4f13e0545ca69a2eac68675c7dd4185c"/></dir><file name="Subscriber.php" hash="9c6af6b6e386704de704e097771b9ff5"/><dir name="Template"><file name="Collection.php" hash="6055403188059d714f47e1d3b52948d4"/></dir><file name="Template.php" hash="237a399347c9c2ab328a0f2e26506334"/></dir><file name="Session.php" hash="d0410abbebf207506726475fe002496b"/><file name="Subscriber.php" hash="37dd45587df67a5f1b3fd7b8305e400b"/><dir name="Template"><file name="Filter.php" hash="cb3f7282cfd5122ba5dc44e866a73cc6"/></dir><file name="Template.php" hash="b144f3dcafb6b6c0f77ea9a7ca6215e4"/></dir><dir name="sql"><dir name="newsletter_setup"><file name="install-1.6.0.0.php" hash="ab8b788a51f57d04cd8f1bf3ea47c4d1"/><file name="mysql4-install-0.7.0.php" hash="60bd08cdae51e3947bbf46d619ecd90b"/><file name="mysql4-install-0.8.0.php" hash="7dbdcea83c2a4dc18ebcc2a1b143d34d"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="073951b2d83763bce12c8dea56b2f749"/><file name="mysql4-upgrade-0.8.0-0.8.1.php" hash="d1643eb7fe4065eceb9b76f670d26e71"/><file name="mysql4-upgrade-0.8.1-0.8.2.php" hash="0b0eb7f8184bb770553f1e7057709de4"/><file name="mysql4-upgrade-0.8.2-0.8.3.php" hash="b1cbdbfc9ab0ec2aa512c953578c6a6b"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="fb1cd5d6ccb81111187d383c7f1b36ab"/></dir></dir></dir><dir name="Oauth"><dir name="Block"><dir name="Adminhtml"><dir name="Oauth"><dir name="Admin"><dir name="Token"><file name="Grid.php" hash="fc970422a0522f4f12efb7cb4ea755ee"/></dir><file name="Token.php" hash="f67e12705823c159a9cb1f823a534a5a"/></dir><dir name="Authorize"><file name="Button.php" hash="b007a310c75829fa0dfd1460aa7ca70b"/></dir><dir name="AuthorizedTokens"><file name="Grid.php" hash="59b94767c2d874c249357d435e1210cc"/></dir><file name="AuthorizedTokens.php" hash="e33fdcb021eedaa16c1209fe116a5d01"/><file name="Authorize.php" hash="0e9e007f72fe1d1bb59a1850634a2b5e"/><dir name="Consumer"><dir name="Edit"><file name="Form.php" hash="b4501387b738015babb646abe9671d6c"/></dir><file name="Edit.php" hash="7aceba86baa8cefcc97792b5fe04d087"/><file name="Grid.php" hash="3a6b126275b19ae2c833eae33ed27852"/></dir><file name="Consumer.php" hash="33f9e4652db5930b056683e217156379"/></dir></dir><dir name="Authorize"><file name="Abstract.php" hash="6f8d74712b577d92c1ebcd206fe205c0"/><file name="ButtonBaseAbstract.php" hash="9b3ad19b4eb6c01ff16057516484bbac"/><file name="Button.php" hash="22e376ba5376924a4c512e53ee68631c"/></dir><file name="AuthorizeBaseAbstract.php" hash="2132de56a5905d3b549a3c6ad7abaad3"/><file name="Authorize.php" hash="4b1c6feb3f463ac372bc7ccd489deec6"/><dir name="Customer"><dir name="Token"><file name="List.php" hash="d67d4d4dcb061cf398c2cd63a5ed45fc"/></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Oauth"><dir name="Admin"><file name="TokenController.php" hash="60e29a85ac6c7a800ba9cee92b5f45d0"/></dir><file name="AuthorizeController.php" hash="64cd078c8905130aca59620e54d57c80"/><file name="AuthorizedTokensController.php" hash="37f6ff41c587d07f38c2824b4b13bb75"/><file name="ConsumerController.php" hash="3b8c38be5f05f878c032ee6ea67bd5e3"/></dir></dir><file name="AuthorizeController.php" hash="44817a6b3cf922d35a9ec92297a78c5b"/><dir name="Customer"><file name="TokenController.php" hash="27501a939f63fa89a7225347e1704c6f"/></dir><file name="InitiateController.php" hash="9dae6bd1d2ca4e569ad47721541cd7c8"/><file name="TokenController.php" hash="f1454d21ff2504e8fcce5db27a8663e5"/></dir><dir name="etc"><file name="adminhtml.xml" hash="9970ff9ba532adb4f0c8fcf6433e0fc8"/><file name="config.xml" hash="11045502b3dab8a4d1d781e5cbeffdd6"/><file name="system.xml" hash="0ddd5b1e3370249379811b171ed0f3a8"/></dir><file name="Exception.php" hash="0e7333244c5f7efeafcab95e3102a130"/><dir name="Helper"><file name="Data.php" hash="219bbd24e6d604e8815c009f1f052400"/></dir><dir name="Model"><dir name="Consumer"><dir name="Validator"><file name="KeyLength.php" hash="d9d2ccf46f76b2e46281a178836475cc"/></dir></dir><file name="Consumer.php" hash="759d92e59053521fc1951abffcf38d74"/><file name="Nonce.php" hash="d957311b79ac24d570591f9bd840cb3a"/><file name="Observer.php" hash="e0749e684fc8bb9954f03634e414361f"/><dir name="Resource"><dir name="Consumer"><file name="Collection.php" hash="556ae9a72a26662912fad21debda7ff8"/></dir><file name="Consumer.php" hash="34b2b045cb25ca5d64621af67e0a0fca"/><dir name="Nonce"><file name="Collection.php" hash="6dc8e515caf18d42135aa09309fa36ba"/></dir><file name="Nonce.php" hash="d0896d071e8a715ecf75d031e0d4d3aa"/><file name="Setup.php" hash="2d4b59ff63bdc8f1d175b50faef7f955"/><dir name="Token"><file name="Collection.php" hash="829fc11161d64a9601a3f3360468025c"/></dir><file name="Token.php" hash="d0452e878e8805d21f327c35c738afff"/></dir><file name="Server.php" hash="ec0ab06f5d68d9488880f84d7d2fafdb"/><file name="Token.php" hash="7607fea6bee8988e6df77dd1445b2cc7"/></dir><dir name="sql"><dir name="oauth_setup"><file name="install-1.0.0.0.php" hash="be55ee7c09fde3568302254ce81e05f2"/></dir></dir></dir><dir name="Page"><dir name="Block"><dir name="Html"><file name="Breadcrumbs.php" hash="a3e875ac773fdb36e5e4bcd52b9fda9d"/><file name="Footer.php" hash="6a1ac1bbac21f9f650fc23122fe0b021"/><file name="Header.php" hash="49206c235132aaf5742f16b40d89a3b5"/><file name="Head.php" hash="c48ce8df32333a768ca8e5111d3ba7e4"/><file name="Notices.php" hash="1faf2692443d5eeaa0e2e37bfebb2633"/><file name="Pager.php" hash="d778e7d57bc03d1bf39453700c0394fe"/><file name="Toplinks.php" hash="8eef80780a96b03cbad8660ff701a1df"/><file name="Topmenu.php" hash="6d8aadc5fc281a2963cc89128c0b7b65"/><file name="Welcome.php" hash="e8faa496fd5aaf2b6a10e788a4884513"/><file name="Wrapper.php" hash="8a32cb1a6055ca78607176a475057aff"/></dir><file name="Html.php" hash="acfffb4a26c286791ddd557135d54ad9"/><dir name="Js"><file name="Cookie.php" hash="ecc21170aac5fd5a65725ecbc29d9c1b"/><file name="Translate.php" hash="13a5721d7224901455902385abd0f5f0"/></dir><file name="Redirect.php" hash="593393edca80c9feecad5bb3cac3d77e"/><file name="Switch.php" hash="1fd6f0101aa0937758d79d3e41c25c08"/><dir name="Template"><file name="Container.php" hash="89694f4adf947b41650f0017268f9f07"/><dir name="Links"><file name="Block.php" hash="122e99bed5a49375e3bd303f8df70b21"/></dir><file name="Links.php" hash="3fe2f282343b5996daea97d7b10ebb6e"/></dir></dir><dir name="etc"><file name="config.xml" hash="2f7f049d3eb0cbddaf2c76243f6883e8"/><file name="system.xml" hash="ec99dc32af677977662036146681d09e"/></dir><dir name="Helper"><file name="Data.php" hash="3c11747b579b8a33fd3a2a00e6ff6204"/><file name="Html.php" hash="bbc2e3c5ca0fa5428b2c124a0bd24e81"/><file name="Layout.php" hash="8204c54ff6f758ca00a6bc5d0ef1f37c"/></dir><dir name="Model"><file name="Config.php" hash="1863a8c310dd8ebf87947b9625dd2ea6"/><dir name="Source"><file name="Layout.php" hash="7c4005209930d7e0a9480589fc591bd0"/></dir></dir></dir><dir name="PageCache"><dir name="Block"><dir name="Adminhtml"><dir name="Cache"><file name="Additional.php" hash="d7f4fc20b6abc5e7837f5cf29aaf332f"/></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="PageCacheController.php" hash="d68e87faf81e71e19e6a81101961c8dd"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="3ffc83694c1a7ac7349d15a0a208d601"/><file name="config.xml" hash="8e8f4f2fa01f2235c3d8b5d876654cd7"/><file name="system.xml" hash="4206d203d213fe3686b9ed6b4a1d4c0b"/></dir><dir name="Helper"><file name="Data.php" hash="4a11d0d970f06e6b0e6eea555e7d028b"/></dir><dir name="Model"><dir name="Control"><file name="Interface.php" hash="f96c6dba6bb7998f58ab75d6a0e5a1d9"/><file name="Zend.php" hash="7e0332800e7a731267cdf8995cd5b37a"/></dir><file name="Observer.php" hash="bc095ebd1ac9e8c2a090da5ecf0d3b7a"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Controls.php" hash="e901f801436bedf60b4e8520089c0243"/></dir></dir></dir></dir></dir><dir name="Paygate"><dir name="Block"><dir name="Authorizenet"><dir name="Form"><file name="Cc.php" hash="1ee3adf34b7195a1f6bd898a6865088c"/></dir><dir name="Info"><file name="Cc.php" hash="c798a05ed284013b1c56bcf28022c6fb"/></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Paygate"><dir name="Authorizenet"><file name="PaymentController.php" hash="5566273064aea1dbb401a064c6570712"/></dir></dir></dir><dir name="Authorizenet"><file name="PaymentController.php" hash="be192ee82fd2f3f27f4b2ffa55c4b516"/></dir></dir><dir name="etc"><file name="config.xml" hash="437c88af79ef6528e7e405c0927c91ca"/><file name="system.xml" hash="1d89f7e280e6077c4aae6f7f711c4fe6"/></dir><dir name="Helper"><file name="Data.php" hash="68b7a8f021ce4ec1abfac5a23e1c825e"/></dir><dir name="Model"><dir name="Authorizenet"><file name="Cards.php" hash="e68924419b173ca60bfe9964583f97c7"/><file name="Debug.php" hash="8701fdcd74bddda978d279ebea7a652e"/><file name="Request.php" hash="e92c449aa75215a1751bde81e15cb292"/><file name="Result.php" hash="037b37bac231f359b010ccd430c9984c"/><dir name="Source"><file name="Cctype.php" hash="785dabf6ea4d90133e687013fc1eb82a"/><file name="PaymentAction.php" hash="fa44dae26cc25ea497711ef18bf14e8d"/></dir></dir><file name="Authorizenet.php" hash="22841b141855df2f6c621107890e9ea6"/><dir name="Mysql4"><dir name="Authorizenet"><dir name="Debug"><file name="Collection.php" hash="9a48149883e80929d5152c5ab3194e3b"/></dir><file name="Debug.php" hash="c7d54b54057bd832de84e3fd56025a74"/></dir></dir><dir name="Resource"><dir name="Authorizenet"><dir name="Debug"><file name="Collection.php" hash="b6b7889d57e70790dbcbc672b5e7f69c"/></dir><file name="Debug.php" hash="b68e0bd66b490561a5d07845cde8e7de"/></dir></dir></dir><dir name="sql"><dir name="paygate_setup"><file name="install-1.6.0.0.php" hash="132150574acab1b7491d37cd6c27d6af"/><file name="mysql4-data-upgrade-0.7.0-0.7.1.php" hash="6fd40d9f34f13fa672f2f65c4a99c2d8"/><file name="mysql4-install-0.7.0.php" hash="9a7775fe0c8d4f42b67d768cc447d7b6"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="50ac1a4d08833d9b1b36e769c0190bf9"/></dir></dir></dir><dir name="Payment"><dir name="Block"><dir name="Catalog"><dir name="Product"><dir name="View"><file name="Profile.php" hash="c8fef279bbcefed6a884c8876611ede9"/></dir></dir></dir><dir name="Form"><file name="Banktransfer.php" hash="99cb37d17e0fe70792d2cc0174495aed"/><file name="Cashondelivery.php" hash="af3dc833bb3ca32a83a382d3f2dd1cc7"/><file name="Cc.php" hash="14054d8c9b0d8e710586f0277c6dde60"/><file name="Ccsave.php" hash="93120aa9bd872a844d5c6933b0f7cda6"/><file name="Checkmo.php" hash="6a873d77f544848bc0996caf49637976"/><file name="Container.php" hash="947bdf43b770ddce45b10996fbfa45ac"/><file name="Purchaseorder.php" hash="71deba94c1580d63c5d2eba649f96c27"/></dir><file name="Form.php" hash="a606c801fdae62455aa809400cef815e"/><dir name="Info"><file name="Banktransfer.php" hash="94758f0f85a2c16c9889162bf934f93e"/><file name="Cc.php" hash="7185ae2c5c8f0e2c915dc024826db424"/><file name="Ccsave.php" hash="efa357d6d7640dba98562c41f8828aff"/><file name="Checkmo.php" hash="8490011a4f0844a58d29cf20461fee1e"/><file name="Container.php" hash="540b2356d3a6d1b49a816bf7009796e1"/><file name="Purchaseorder.php" hash="1d8649c0fc22e83e0f8a897a3132de3b"/></dir><file name="Info.php" hash="c7deec491ee07349bc72356e831a3cfc"/></dir><dir name="etc"><file name="adminhtml.xml" hash="2ca8211b1dcfe9609377a09a46d030ce"/><file name="config.xml" hash="15b092bdd0024ca64774a289c60a742b"/><file name="system.xml" hash="89220912efe730b89a46862be0a46530"/></dir><file name="Exception.php" hash="8654a507211a88d6312cb23070109f1f"/><dir name="Helper"><file name="Data.php" hash="cda6b5e0220422a83291e71630174094"/></dir><dir name="Model"><dir name="Billing"><dir name="Agreement"><file name="MethodInterface.php" hash="9ea2d1af29b219aed7b914e2e5c8d246"/></dir><file name="AgreementAbstract.php" hash="bfb93b8772ff8923bbdbb5bdba6af900"/></dir><file name="Config.php" hash="ae1bb11ff1199c11cbe1ef465129e4f1"/><dir name="Info"><file name="Exception.php" hash="b20621db63c4b0410ac1509f64089f4f"/></dir><file name="Info.php" hash="9719c1cfda3f1f24df3d4d5ebe860374"/><dir name="Method"><file name="Abstract.php" hash="45a2fce0229e618b0705d0ab8452066a"/><file name="Banktransfer.php" hash="d6cc5607dbbc0bc12ea4fcdf658778d4"/><file name="Cashondelivery.php" hash="fb9081177f4a9942e93f847d519912d0"/><file name="Cc.php" hash="3ec7b6ebbeac4d63dad2fc8bf1ecbc96"/><file name="Ccsave.php" hash="7b473493e2c4fef4a898b3207b3508a5"/><file name="Checkmo.php" hash="9f7fa217b0b812dae36038518c8182b9"/><file name="Free.php" hash="a0b611524e68bf30a6c4b8eca1647f60"/><file name="Purchaseorder.php" hash="52ed13e8a25e62df184c2b80e7a102df"/></dir><file name="Observer.php" hash="e77c4b1f6e6e30ed0792565bae1bbd76"/><dir name="Paygate"><file name="Request.php" hash="79939f5b9c17341809661e9e1ae8907f"/><file name="Result.php" hash="bd189bbbc5f7ad6dfcbb8c58b98d43c3"/></dir><dir name="Recurring"><dir name="Profile"><file name="MethodInterface.php" hash="9864b9f25408e6f9927d88e39e8b13c8"/></dir><file name="Profile.php" hash="fc439d8ba0479ec1d5f688f1dc59c8b9"/></dir><dir name="Source"><file name="Cctype.php" hash="54fb791f3199534f30b9201f9d522cf3"/><file name="Invoice.php" hash="58ca0a1f1124300a494cf3e47d4eef2d"/></dir></dir></dir><dir name="Paypal"><dir name="Block"><dir name="Adminhtml"><dir name="Settlement"><dir name="Details"><file name="Form.php" hash="9287b090950d29dfdf05c30114c8bb91"/></dir><file name="Details.php" hash="e34b85829b70e07a1647b5e731e36d2d"/><dir name="Report"><file name="Grid.php" hash="a73cfe6ca620c19efd5c7b07e453cc15"/></dir><file name="Report.php" hash="a9a4d7e8c3785242264672ab5063b284"/></dir><dir name="System"><dir name="Config"><file name="ApiWizard.php" hash="46017314d7b4dfd05ed69dad8eb38d9e"/><dir name="Field"><file name="Country.php" hash="09102c53ae367007cfaa16c16d3de393"/><file name="Hidden.php" hash="004fc9277fa3f97392482d4c9a92d811"/></dir><dir name="Fieldset"><file name="Expanded.php" hash="de012abf285a46d7eceaac4f2d75f52f"/><file name="Global.php" hash="e8b395fc63bc8f678931465d7efeb646"/><file name="Group.php" hash="a069822beac8c3fa695d01e1b715fee3"/><file name="Hint.php" hash="4e0dc2f1cdb4e7fc10e447ad4b9c6b2f"/><file name="Location.php" hash="a1ed0d3bdbae40419526d4b292863e96"/><file name="Payment.php" hash="01c9915805c3bb31db97f0f057f5260b"/><file name="Store.php" hash="e624156c5d5d9c014ac7ed7e9db2bdf0"/></dir><dir name="Payflowlink"><file name="Advanced.php" hash="d7fc6a51406872aaa597989fdc834b97"/><file name="Info.php" hash="935d5020da003ed0e94f69d224c1e90e"/></dir></dir></dir></dir><dir name="Express"><file name="Form.php" hash="64a124d9aeed9e470a35a8d7dde113aa"/><dir name="Review"><file name="Billing.php" hash="82d065f33b13a0ac21d507500c2e0683"/><file name="Details.php" hash="9674beed2105bd8275746b0f46fc03a2"/><file name="Shipping.php" hash="81759af60602039c45e4aa5f780e6da8"/></dir><file name="Review.php" hash="e1ef650c02470a48a3704341630e8ca3"/><file name="Shortcut.php" hash="4d59c28bc02b31beabef972c2921da71"/></dir><dir name="Hosted"><dir name="Pro"><file name="Form.php" hash="80a32bfa94107523b2596dcab4f69d43"/><file name="Iframe.php" hash="f1dc96ff319218232c44ccb079cc1580"/><file name="Info.php" hash="1745fe6bdfd976e4a8b64c4a6782961e"/></dir></dir><file name="Iframe.php" hash="31ba52bd7743106bc1c5715237d819dd"/><file name="Logo.php" hash="8da27cc047696dc69cc9b596c81ac815"/><dir name="Payflow"><dir name="Advanced"><file name="Form.php" hash="bc607f3182b35e595f8adb232fda4bd9"/><file name="Iframe.php" hash="5dbee6a0f23f564b3f0b7c6e3ae2b531"/><file name="Info.php" hash="4194c9697bfefa70230fe9ed00df7d17"/><file name="Review.php" hash="98b8f89f322af15883a22480caed18e4"/></dir><dir name="Link"><file name="Form.php" hash="9d4e4e6102d9839f899fd03605ec8a92"/><file name="Iframe.php" hash="5b126ebbc6724f87b75ecfbe30917c7b"/><file name="Info.php" hash="cba6aff46b7e0c329d4377f5966335a1"/><file name="Review.php" hash="fd82f78e60062b882ed48534e0a6783a"/></dir></dir><dir name="Payment"><file name="Info.php" hash="728ca85032cd5e621cadf9f46844f7e1"/></dir><dir name="Standard"><file name="Form.php" hash="a7595f9af3bacd2ef1b6371ed1ef24e7"/><file name="Redirect.php" hash="3ff12537fd311e7e117ce3625c67e6c2"/></dir></dir><dir name="Controller"><dir name="Express"><file name="Abstract.php" hash="19dbaf1226d857d356dc11174805dad2"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Paypal"><file name="ReportsController.php" hash="f33f37f7a4ee7eaec6037174df855d5c"/></dir></dir><file name="ExpressController.php" hash="59a7085ce8ff8919b787699ba7e0610a"/><file name="HostedproController.php" hash="09bb545892056e176ea47b8325b5be27"/><file name="IpnController.php" hash="e6efa853fec6a115cde9e708660c9348"/><file name="PayflowadvancedController.php" hash="a065facae9c469a0703a2c4ec12bb2a9"/><file name="PayflowController.php" hash="0b923d12ad420ea3220e1a3cb970f6b6"/><file name="StandardController.php" hash="5cb59bb4ac6078808f9390b9ac683334"/></dir><dir name="data"><dir name="paypal_setup"><file name="data-upgrade-1.6.0.2-1.6.0.3.php" hash="4a8d676d3c695e83d4bf5a0d6e40c9de"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="c1adcf02624e6657b7200673e700a72d"/><file name="config.xml" hash="cc2f294c42c6f025ddb04ef43e880e04"/><file name="system.xml" hash="1939fb6cb49f3e9d185548a75ee54b3b"/></dir><file name="Exception.php" hash="ce7ae11c73d5cb7abadce986fbec7dff"/><dir name="Helper"><file name="Checkout.php" hash="2c4643828d007c5373374cc1b3892b04"/><file name="Data.php" hash="6958a5d4f1c852ff648f802bde11c985"/><file name="Hss.php" hash="6e694dd9ce0a1efc2ab7de898329652a"/></dir><dir name="Model"><dir name="Api"><file name="Abstract.php" hash="27585bf3b3cde837bb970d567c517550"/><file name="Nvp.php" hash="643e1eb3b38ca6529eefbbef695992f5"/><file name="Standard.php" hash="df117a9edc0b981b996120372df10073"/></dir><file name="Cart.php" hash="8471aa552b142cdb89a9c4bd4182ec14"/><file name="Cert.php" hash="0f8622e510ba8b384e920ad46ed35044"/><file name="Config.php" hash="8c0c3e64ec5d33d016adf4355ee2804f"/><file name="Direct.php" hash="3989effef2a3a41b6d2fc4d8494010a2"/><dir name="Express"><file name="Checkout.php" hash="09a01abaf8f8dd9eb07b11e04262fe02"/></dir><file name="Express.php" hash="797d111073dca60d716fdfdfd6247871"/><dir name="Hostedpro"><file name="Request.php" hash="dafa46e0daa0f0bd5c45ee9148e85606"/></dir><file name="Hostedpro.php" hash="8aba8adcae8200b31e5c5144961d6098"/><file name="Info.php" hash="ca721b1804f3fea2d4d77fd9e649aa40"/><file name="Ipn.php" hash="aaaa8920dee711287a743ef4ccf86f4f"/><dir name="Method"><file name="Agreement.php" hash="f6856240ce52d5db17a640eb20293f18"/></dir><dir name="Mysql4"><file name="Cert.php" hash="13634249d45262334197b62d0f00674f"/><dir name="Report"><dir name="Settlement"><dir name="Row"><file name="Collection.php" hash="366db458aaedeef2118ecffa6ed2b52f"/></dir><file name="Row.php" hash="c8592681bb64b7224986db18ddc55ce9"/></dir><file name="Settlement.php" hash="bd0da36d11500bd89d072f1994474cce"/></dir><file name="Setup.php" hash="d716084dfc8ae9795b0ded112594044b"/></dir><file name="Observer.php" hash="042464b56ecda867444d5a9585c2337b"/><dir name="Payflow"><file name="Request.php" hash="bb0c1f7f1bad4c8361a16f2f5e608e49"/></dir><file name="Payflowadvanced.php" hash="04c0396a5f53242427d6f7e4f9c99101"/><file name="Payflowlink.php" hash="fafbf7a45d453119e6acf0c66dedc300"/><file name="Payflowpro.php" hash="4e8684735c4eb49728c7654791c7a6f5"/><dir name="Payment"><file name="Transaction.php" hash="e0bc4792d33223c07f802c9ef835efcf"/></dir><file name="Pro.php" hash="949a366f0da1ada26af6a1922b4b85df"/><dir name="Report"><dir name="Settlement"><file name="Row.php" hash="e4f9754dee817f5deb3fc5218b88d68f"/></dir><file name="Settlement.php" hash="29c43fca0e955084520629102e3bfe6a"/></dir><dir name="Resource"><file name="Cert.php" hash="7522b914e914933d3cb0e99eb67076f9"/><dir name="Payment"><dir name="Transaction"><file name="Collection.php" hash="2f598a3790e5442bbd0396943c55b5eb"/></dir><file name="Transaction.php" hash="8ec0a8c47fde8e18dd59d93267e67658"/></dir><dir name="Report"><dir name="Settlement"><dir name="Row"><file name="Collection.php" hash="a258be887b56f8689869cc763fd62111"/></dir><file name="Row.php" hash="d69dddc1bc2a81d09519f468bcc38969"/></dir><file name="Settlement.php" hash="cf94e2be70b8a7dacc14d9fcb361e02b"/></dir><file name="Setup.php" hash="9cda4402fc0a36eb7496b60b71bdd273"/></dir><file name="Session.php" hash="6ea5f5accdd8cdf27fe4b14372dc6d46"/><file name="Standard.php" hash="60028ae2d1e25fae83221f04b25b9c9f"/><dir name="System"><dir name="Config"><dir name="Backend"><file name="Cert.php" hash="e855a88c4dce4ebadc72ecaec2548f7c"/><file name="Cron.php" hash="4d410d50de911c2c481e9627e61dd869"/><file name="MerchantCountry.php" hash="71ada83f04d36c60b48bbd1986c380f2"/></dir><dir name="Source"><file name="AuthorizationAmounts.php" hash="4404a9d18e026c427a938756e299f5ab"/><file name="BuyerCountry.php" hash="44f21199a353dadbfea5b834174f8a0d"/><file name="FetchingSchedule.php" hash="90bd097a35cd19e58e389da979f8a2ee"/><file name="Logo.php" hash="a28088fd787156439fe396f73d32e645"/><file name="MerchantCountry.php" hash="50cd30cbd7119bc912af64a7b83349bb"/><dir name="PaymentActions"><file name="Express.php" hash="63683e1cd890db215cd699a179a593c2"/></dir><file name="PaymentActions.php" hash="852b9912ab96a7233719d1a30176ff8a"/><file name="RequireBillingAddress.php" hash="eec748bc0d8371e1f78f2b721a63de22"/><file name="UrlMethod.php" hash="806edab1bb0fb5f02facd1a1fc3807ba"/></dir></dir></dir></dir><dir name="sql"><dir name="paypal_setup"><file name="install-1.6.0.0.php" hash="14acd37a5e228a77974f53d2e81afb6d"/><file name="mysql4-install-0.7.0.php" hash="9cd714520f0afebf0c7fcd2495ead0be"/><file name="mysql4-install-1.4.0.0.php" hash="28bc6b61995a7a5f038b0c1be05b4b90"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="38d713ba0251c8b830f4b66a2a885380"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="8ffca1b59f274fd947f2d64962e4a6d6"/><file name="mysql4-upgrade-1.4.0.0-1.4.0.1.php" hash="90f86d9ac87358b9adc6036ebe9d08db"/><file name="mysql4-upgrade-1.4.0.1-1.4.0.2.php" hash="b92e43e6935aa8e49d7c942785c7d895"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="32b681f4e183d912a7e212bf7da707d6"/><file name="upgrade-1.6.0.0-1.6.0.1.php" hash="0ca7d5c76495a629462c394738a5b0cc"/><file name="upgrade-1.6.0.1-1.6.0.2.php" hash="4c49d24198d0bb28075412df3c862e14"/><file name="upgrade-1.6.0.3-1.6.0.4.php" hash="79ed29dbd0d98adc1d0fcd86d48906a5"/></dir></dir></dir><dir name="PaypalUk"><dir name="Block"><dir name="Express"><file name="Form.php" hash="675234e80b8a0f4b2562157e4c094167"/><file name="Shortcut.php" hash="14a1a9213b301aac43a2588bf1758526"/></dir></dir><dir name="controllers"><file name="ExpressController.php" hash="c7142fadccc45f38769d6576ff7d4fd3"/></dir><dir name="etc"><file name="config.xml" hash="8944143d2791c65f796ba631cf8cbd8a"/></dir><dir name="Helper"><file name="Data.php" hash="9de8dd42bc9145936da038e1c50b87cf"/></dir><dir name="Model"><dir name="Api"><file name="Nvp.php" hash="cb23f0d5e590c517b5d96233db958c13"/></dir><file name="Direct.php" hash="9c5f13b72c7b1b6ea8b0f2b3f1755e67"/><dir name="Express"><file name="Checkout.php" hash="2ab6feaf081f79e8b9c311f2c87d90c3"/></dir><file name="Express.php" hash="41aab85d8a4d5b57dcfbadb6ba70d324"/><file name="Pro.php" hash="3d76f08c350229746280e3974d765c81"/><file name="Session.php" hash="6bf8f32bdae8d30dc58d9a2fab85d08d"/></dir><dir name="sql"><dir name="paypaluk_setup"><file name="install-1.6.0.0.php" hash="0071f0613f985e696951177a3b7e7de9"/><file name="mysql4-install-0.7.0.php" hash="b2b44155ade7258b09dc1d4c32b9b0f1"/></dir></dir></dir><dir name="Persistent"><dir name="Block"><dir name="Form"><file name="Remember.php" hash="ff8df17ec27ba969bd196b8315695d16"/></dir><dir name="Header"><file name="Additional.php" hash="e0ab385a26b8c33822306954672356b3"/></dir></dir><dir name="controllers"><file name="IndexController.php" hash="234724920b48e144f0a95e195871a00f"/></dir><dir name="etc"><file name="adminhtml.xml" hash="07b0eea8422430d40a7f688071e9af43"/><file name="config.xml" hash="fb1fb9084c58abdddad9aa4f2922b783"/><file name="persistent.xml" hash="04182a1b113782e663584f8ed057d5db"/><file name="system.xml" hash="abeaf984dbed262195b6f71a35314a29"/></dir><dir name="Helper"><file name="Data.php" hash="63b0a64b351c780a7f8b502b69ffcf9c"/><file name="Session.php" hash="df62a0644cbb8d0c553542bd937daba7"/></dir><dir name="Model"><dir name="Observer"><file name="Session.php" hash="7b87e31979d69266fd448bbc9b05a1ee"/></dir><file name="Observer.php" hash="5450a8c2ae7ff14c52c3afef71c6ae0d"/><dir name="Persistent"><file name="Config.php" hash="eb157ddd874ab6c29860c784d650bafe"/></dir><dir name="Resource"><file name="Session.php" hash="2941b618de87394826dbb0629c973824"/></dir><file name="Session.php" hash="e16655b3d00bbc0bb3b5ce353b887fcf"/></dir><dir name="sql"><dir name="persistent_setup"><file name="install-1.0.0.0.php" hash="82069df6fe70f8b2d50437539cb29ba6"/></dir></dir></dir><dir name="Poll"><dir name="Block"><file name="ActivePoll.php" hash="954c5cdbe6a9a7d52e18d969f2d02ac0"/><file name="Poll.php" hash="a5ba22cd6eb9c34e5a536e1c35b7f4ce"/></dir><dir name="controllers"><file name="VoteController.php" hash="0b1458dfaa0c5173179eee549fc06e97"/></dir><dir name="data"><dir name="poll_setup"><file name="data-install-1.6.0.0.php" hash="471057d8abf86cb2df93ab7e5d8742db"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="905453d24c326bb59b3c88dbc0425b54"/><file name="config.xml" hash="e14b241ce78545e50396650a94416260"/><file name="system.xml" hash="599b3a4bf8e1a2c377f3bd6c1f3d2048"/></dir><dir name="Helper"><file name="Data.php" hash="faa62e5b6d70ab6f0f002e45acb32c41"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Poll"><dir name="Answer"><file name="Collection.php" hash="1d2c87b72abe9b00712dc666ae74648b"/></dir><file name="Answer.php" hash="3e6605f26efaf626be2f1588bd64aaab"/><file name="Collection.php" hash="4800b7335c1dfb953d224c168dc36131"/><file name="Vote.php" hash="50334679eb06bd61ee30b8f597fcbb39"/></dir><file name="Poll.php" hash="9bfa5fd6b7d954963203f2daab5b2464"/></dir><dir name="Poll"><file name="Answer.php" hash="03a22571d26d068711fa6a381f92f6de"/><file name="Vote.php" hash="6ae1d8b40f2324443efe254c19efef01"/></dir><file name="Poll.php" hash="68391855b2d3e6ede1f876b51c04b3ad"/><dir name="Resource"><dir name="Poll"><dir name="Answer"><file name="Collection.php" hash="3c2d27181cd4f5042a541954cf303beb"/></dir><file name="Answer.php" hash="a539558e40483e3a8b6412d15ac5edb5"/><file name="Collection.php" hash="f5c8a76bac64d701baeb8b9b6e813bd1"/><file name="Vote.php" hash="f2115993942595bb9ef35040fef7b408"/></dir><file name="Poll.php" hash="3af179bb36bbe57f00a75c1bf6ae3d32"/></dir></dir><dir name="sql"><dir name="poll_setup"><file name="install-1.6.0.0.php" hash="6183699a1d2391e4a7cf2a7624dd9f5e"/><file name="mysql4-install-0.7.0.php" hash="05287ee1b7bead94f61935f353acfa45"/><file name="mysql4-upgrade-0.6.0-0.6.1.php" hash="46930ddee4eee53fe4bd690e758227ea"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="c336015c5ae00159385efcdc8f3d2da7"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="11120b74156de38de238b77b577ee402"/></dir></dir></dir><dir name="ProductAlert"><dir name="Block"><dir name="Email"><file name="Abstract.php" hash="6f31eae5caffca7cc2ced585e322b6a5"/><file name="Price.php" hash="e843faa0b688ee3736de903ea95a904e"/><file name="Stock.php" hash="18fca7c85de2c98a788e5c161b873a8f"/></dir><file name="Price.php" hash="6e9258e675ef94bd07daf08ba15332be"/><dir name="Product"><file name="View.php" hash="457b8753af19efb258d3bc16158271a4"/></dir><file name="Stock.php" hash="1dfa6861eb468f24bd491f64b59a6351"/></dir><dir name="controllers"><file name="AddController.php" hash="aa481601b430ebf7a871c47457871233"/><file name="UnsubscribeController.php" hash="20755cbdef82ba9cfa37a877be211d2b"/></dir><dir name="etc"><file name="config.xml" hash="5c9761c4ce22a44fe4d3a8a15a64f894"/><file name="system.xml" hash="246a29c79196e1ec024cbcb9b277e5da"/></dir><dir name="Helper"><file name="Data.php" hash="498f69622ceac34e8ac996d797559fc4"/></dir><dir name="Model"><file name="Email.php" hash="c200061386861faff7dff5af7d25030e"/><dir name="Mysql4"><dir name="Price"><file name="Collection.php" hash="9c1b343e741040cab34739e6016eaf9b"/><dir name="Customer"><file name="Collection.php" hash="2fba78b724c1585f7923316be25a95b6"/></dir></dir><file name="Price.php" hash="987a20039b7df4ab955ebd34c17e1174"/><dir name="Stock"><file name="Collection.php" hash="7a978a1ff8c496b471a08a13e7d7d6d3"/><dir name="Customer"><file name="Collection.php" hash="bfa66da29ed06044d181a69b56b49e00"/></dir></dir><file name="Stock.php" hash="70d07a275e5b9a79804b114be5716022"/></dir><file name="Observer.php" hash="975d9b8019f315c00e90014d11261247"/><file name="Price.php" hash="4d065d2a5349ff94c752f0cf1fa7e62f"/><dir name="Resource"><file name="Abstract.php" hash="ab3e7f45ed4b853d48a9b2c97b8c3d0b"/><dir name="Price"><file name="Collection.php" hash="3baa71acbd8b7651d5cdefbb90a0049c"/><dir name="Customer"><file name="Collection.php" hash="74baec93225bcc23fe6ed89335f04209"/></dir></dir><file name="Price.php" hash="88bef31524ea97bf4bbda6e84745c9eb"/><dir name="Stock"><file name="Collection.php" hash="ffc2a627c9ad2042fc86faeae79a1d00"/><dir name="Customer"><file name="Collection.php" hash="b6acc3858be0ca356941499a999d8ff1"/></dir></dir><file name="Stock.php" hash="6b5fcba04cf684d73968de0ea9e6fec7"/></dir><file name="Stock.php" hash="725f5bd8230fe754ee3fe30db877a2c2"/></dir><dir name="sql"><dir name="productalert_setup"><file name="install-1.6.0.0.php" hash="306476f173b7f15ec9f35c73b3db389a"/><file name="mysql4-install-0.7.0.php" hash="3f055a61e7e4039a45beaae9d1d77ad5"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="0363dc8ad772a74454eaeb636a33fbba"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="ee93da8164f89ef4d9800c8ce2d29ebe"/></dir></dir></dir><dir name="Rating"><dir name="Block"><dir name="Entity"><file name="Detailed.php" hash="8710f08354d45b6ee76a784e186ef952"/></dir></dir><dir name="data"><dir name="rating_setup"><file name="data-install-1.6.0.0.php" hash="6135ca1fcbd9712f70cbd89d38896c23"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="5e753464c3d6863efa0adf729174f70d"/><file name="config.xml" hash="6fe309e950a8f3a4b5de14872fa7bad2"/></dir><dir name="Helper"><file name="Data.php" hash="59d6a0d726141cc0cd503a414dbecab2"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Rating"><file name="Collection.php" hash="7c2d1b04c22d3d0e21cd4addc938d282"/><file name="Entity.php" hash="7830f61bef21be13bbe00c52924e9514"/><dir name="Option"><file name="Collection.php" hash="6e7eee1b5acbaf7d0f5719aa4f27d31b"/><dir name="Vote"><file name="Collection.php" hash="56ea721ddb4d80ced768a5f9e39b02ba"/></dir><file name="Vote.php" hash="9b67209ec18628ec48bb8c0d4bd4b7b4"/></dir><file name="Option.php" hash="6cfd2cd1d9add1f2f3eb20bf731fc021"/></dir><file name="Rating.php" hash="1c8e9da357e27b6394f2384a73798fa9"/></dir><file name="Observer.php" hash="937a42280ba9d74bf500ffaaa7d2cee8"/><dir name="Rating"><file name="Entity.php" hash="6fa3ea4fb988e267c80130e3fe232e11"/><dir name="Option"><file name="Vote.php" hash="dccf22feb7ab9e110192b4771d439648"/></dir><file name="Option.php" hash="73acfef8054f425168d747a81dfc07d7"/></dir><file name="Rating.php" hash="58fe2acf2240a168166eb7ba9006b3d1"/><dir name="Resource"><dir name="Rating"><file name="Collection.php" hash="bb9ed1e87439c691df1b0ec868bb787e"/><file name="Entity.php" hash="43abf45304b77ceb1662502667ea9ac9"/><dir name="Option"><file name="Collection.php" hash="f351d06181979d45ac56375e4acba143"/><dir name="Vote"><file name="Collection.php" hash="b235575cbfda89255afcf06ad6901bf8"/></dir><file name="Vote.php" hash="cd889bf7608f7936f64b58cec7d34ed2"/></dir><file name="Option.php" hash="f461d15f11611bb030c20c786408fe67"/></dir><file name="Rating.php" hash="fa3904ec801fd53933e6dd6faf4d3629"/></dir></dir><dir name="sql"><dir name="rating_setup"><file name="install-1.6.0.0.php" hash="90201263b239eda7b3920a0a589ad1d0"/><file name="mysql4-install-0.7.0.php" hash="03f21f189f0b0d71b65f7509eaa5ac29"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="07dfa450476d0a915d54e1352182d074"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="9d9a8ce42a6d065194ed1b30a22ebf7f"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="20713b402edb64773a9307d887337a54"/></dir></dir></dir><dir name="Reports"><dir name="Block"><dir name="Product"><file name="Abstract.php" hash="6f0b62fc50a0e8c377fdb1021f8e76e8"/><file name="Compared.php" hash="86151aa60d2085c063da0c2def93e554"/><file name="Viewed.php" hash="0cea1406ec2574b91157559bf7f554b1"/><dir name="Widget"><file name="Compared.php" hash="518c255ea96d9a1fb491a89a263a3a77"/><file name="Viewed.php" hash="33f56b836895d45d7f0e187beee41b60"/></dir></dir></dir><dir name="data"><dir name="reports_setup"><file name="data-install-1.6.0.0.php" hash="e6b8c7a83598489e2b96acdc297998c7"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="a7005244de82da220a101d7c8ed323c8"/><file name="config.xml" hash="bf7347786b72cce2075da0e533e716fb"/><file name="system.xml" hash="a09b06273548ece5bb9addbe95add367"/><file name="widget.xml" hash="9a3496d98c7a5bca08d72a66e1748289"/></dir><file name="Exception.php" hash="b8f6e43a89f3664a8793778026cd695d"/><dir name="Helper"><file name="Data.php" hash="8e2e0860a81bb3fcd0ed98cb16ecd28c"/></dir><dir name="Model"><file name="Config.php" hash="93353ed155cec19d94f6d09de37fabc6"/><dir name="Event"><file name="Observer.php" hash="ce0da439f203bf47e91cd5f5eb6869fa"/><file name="Type.php" hash="1e2dac5f816c0f464f829a8ea935861a"/></dir><file name="Event.php" hash="2ea9a78cb06feb398d7a12b5d73c52a9"/><file name="Flag.php" hash="ca972f3fb30707ba8ceaef4c31e71e3b"/><dir name="Grouped"><file name="Collection.php" hash="e5a681308650a322d39c5962d24256f8"/></dir><dir name="Mysql4"><dir name="Accounts"><file name="Collection.php" hash="e4f605fd677fd4192b3f3ce1d860128b"/></dir><dir name="Coupons"><file name="Collection.php" hash="6e7a3ba71b619a04c3ef1b18e28b7e80"/></dir><dir name="Customer"><file name="Collection.php" hash="cccd1f90fa16bbdecdc24053bda54d7b"/><dir name="Orders"><file name="Collection.php" hash="d056aa6f487f596bce6652d580ba4755"/></dir><dir name="Totals"><file name="Collection.php" hash="1993929bd7e302d2cf5742be02336000"/></dir></dir><dir name="Entity"><dir name="Summary"><dir name="Collection"><file name="Abstract.php" hash="96dc444865f146c0be58b1767cccc5e3"/></dir></dir></dir><dir name="Event"><file name="Collection.php" hash="d3bcf4db28ce41e84f9d98f8152c998e"/><dir name="Type"><file name="Collection.php" hash="1677e024aae26c759fc00f516a3ee057"/></dir><file name="Type.php" hash="36263662032c752470c85be2e140f4d4"/></dir><file name="Event.php" hash="7258518645c031d8da30a73d06d4527f"/><dir name="Invoiced"><file name="Collection.php" hash="cd0d0e2651a1c23eef7895d6e2d89dd8"/></dir><dir name="Order"><file name="Collection.php" hash="838a4c07fbaef4a0978f3839fb2ef826"/></dir><dir name="Product"><file name="Collection.php" hash="57c1de1ed40dc826d0c1bbe1ffc8f40d"/><dir name="Downloads"><file name="Collection.php" hash="caa44048731148f11bcbc6cb862c1757"/></dir><dir name="Index"><file name="Abstract.php" hash="7cdff2cac45e92aad908ca6ea01e5751"/><dir name="Collection"><file name="Abstract.php" hash="3cc814ab7cf9ad386bcaab03cc9c8c41"/></dir><dir name="Compared"><file name="Collection.php" hash="396275c9d26661e6a0911d686615940a"/></dir><file name="Compared.php" hash="459187547853e5d2767bb49145f03735"/><dir name="Viewed"><file name="Collection.php" hash="ae80340127fdffc01a653b9ed54ecd26"/></dir><file name="Viewed.php" hash="5ae0e3079ac7dfbe8dcb41b35c9afe15"/></dir><dir name="Lowstock"><file name="Collection.php" hash="26030ea58790cda76cc5e1badfab55ba"/></dir><dir name="Ordered"><file name="Collection.php" hash="dc9aa0404503165df4a628af21eac87f"/></dir><dir name="Sold"><file name="Collection.php" hash="54366f87d1eec9beec7c227e12884689"/></dir><dir name="Viewed"><file name="Collection.php" hash="b775890e3e8f3a932872f031545ce5d6"/></dir></dir><dir name="Quote"><file name="Collection.php" hash="d308f055c8f67fa890a23c8469bed384"/></dir><dir name="Refunded"><file name="Collection.php" hash="d9c2f63aa0029f103524b8213de646ad"/></dir><dir name="Report"><file name="Abstract.php" hash="d8575ac7ce62d10c1a5ec7a7dc2e22e6"/><file name="Collection.php" hash="e5e8dfad4de1eb32bedee88acdd4ab12"/></dir><dir name="Review"><file name="Collection.php" hash="3076da05e42875f545a7e8f593135a93"/><dir name="Customer"><file name="Collection.php" hash="f8e24c55fdfcd19eebec45df72f732b4"/></dir><dir name="Product"><file name="Collection.php" hash="5d6e9df20c7125f27d252a4ad8ccc037"/></dir></dir><dir name="Shipping"><file name="Collection.php" hash="8f67eee4cad030ff6ce659240d99dc61"/></dir><dir name="Shopcart"><dir name="Product"><file name="Collection.php" hash="07fd035103f6a0cecdcec4b7655bd9bf"/></dir></dir><dir name="Tag"><file name="Collection.php" hash="9a257b5ac5a2fd2badda3ef31c111eb6"/><dir name="Customer"><file name="Collection.php" hash="249df272f63bfc99b8f20139fc37f545"/></dir><dir name="Product"><file name="Collection.php" hash="01967572ee4951cb4fd79c3f5f97a03b"/></dir></dir><dir name="Tax"><file name="Collection.php" hash="4544e017a56384c1835cd8fc03c602a8"/></dir><dir name="Wishlist"><file name="Collection.php" hash="ffce2511237fa818b652e1d4e498e840"/><dir name="Product"><file name="Collection.php" hash="d1da497513fa365f7d1eab50727d2409"/></dir></dir></dir><dir name="Product"><dir name="Index"><file name="Abstract.php" hash="d7608de113759fc20068c6ea2f6ccc68"/><file name="Compared.php" hash="67b613394ac8903c27dd3298b7a7f0c0"/><file name="Viewed.php" hash="e5d74b029acbdee4968d32866360b60c"/></dir></dir><file name="Report.php" hash="6e00b32680508f4e08cd6676cedd2a94"/><dir name="Resource"><dir name="Accounts"><file name="Collection.php" hash="9568022a2ee06d2298bf1dd6f38436ce"/></dir><dir name="Coupons"><file name="Collection.php" hash="66e690a39179f5e4db0f8d842926a4f9"/></dir><dir name="Customer"><file name="Collection.php" hash="f4718abc92e94156215ca604f7420ce8"/><dir name="Orders"><file name="Collection.php" hash="b93b272fdad6dd33b5d7d4ae995aed16"/></dir><dir name="Totals"><file name="Collection.php" hash="6004dfdf3f11fa07ae252f0cd6de0e34"/></dir></dir><dir name="Entity"><dir name="Summary"><dir name="Collection"><file name="Abstract.php" hash="8a995e6412d5d4e8478934b6042eefb5"/></dir></dir></dir><dir name="Event"><file name="Collection.php" hash="186a69e07be0ea06939ff724c9c72ed8"/><dir name="Type"><file name="Collection.php" hash="7b67a269187fef3f6620aa92aadf5378"/></dir><file name="Type.php" hash="4b8abf004b08aa95846b51966fecd62e"/></dir><file name="Event.php" hash="5d32f7e4507f9d384ef19f41caa41120"/><dir name="Helper"><file name="Interface.php" hash="858d9829729d760b741b87123f37c93f"/><file name="Mysql4.php" hash="9ba489cb3a582af7e2a84c72ac7a49d4"/></dir><dir name="Invoiced"><file name="Collection.php" hash="62e94eb90ffe59ae79bb20b1b61d8405"/></dir><dir name="Order"><file name="Collection.php" hash="2e547904f0e39d87e145d75fabc118a0"/></dir><dir name="Product"><file name="Collection.php" hash="30f88b2b095a6453a0e853b60845a164"/><dir name="Downloads"><file name="Collection.php" hash="c4e69533b1b18134172dd5b1d99f27a9"/></dir><dir name="Index"><file name="Abstract.php" hash="368d538d44a3a13cc79f92f79189e825"/><dir name="Collection"><file name="Abstract.php" hash="a1d0ac5ad62840f42bbaef6e9ef018e5"/></dir><dir name="Compared"><file name="Collection.php" hash="29d8dfdd64dc42e9b107ef81a25ace11"/></dir><file name="Compared.php" hash="ac6170f1148b8db1876e0911ae2153b1"/><dir name="Viewed"><file name="Collection.php" hash="7d5162193c4b481caa63265d48200606"/></dir><file name="Viewed.php" hash="fdb4f9b273c8e14afdb4340764c26590"/></dir><dir name="Lowstock"><file name="Collection.php" hash="992f12434023ca2264599074eed83513"/></dir><dir name="Ordered"><file name="Collection.php" hash="e74572e97f6c52ceceedddf454e0d3ab"/></dir><dir name="Sold"><file name="Collection.php" hash="770281a6ee43d39df3fb7cee4fcc2a6f"/></dir><dir name="Viewed"><file name="Collection.php" hash="11b2d0b23cbd91137768ac55dbadc345"/></dir></dir><dir name="Quote"><file name="Collection.php" hash="1bae38408456efe5c98b4587062f2eda"/></dir><dir name="Refunded"><file name="Collection.php" hash="f4318a70aa87adbab16fe9e384bac59d"/></dir><dir name="Report"><file name="Abstract.php" hash="7e235e2b244ace660959aa1ec2bdeae3"/><dir name="Collection"><file name="Abstract.php" hash="9605da6ba1ca83270ed066662789afb5"/></dir><file name="Collection.php" hash="65698e7ed5b280006b984152321fe631"/><dir name="Product"><dir name="Viewed"><file name="Collection.php" hash="c885811f21a874898d097c22fd95fe67"/></dir><file name="Viewed.php" hash="aa26b0123c8cd11330518241ef443675"/></dir></dir><dir name="Review"><file name="Collection.php" hash="cf59d2cf5fbc32ee2d1a81ed88642f9e"/><dir name="Customer"><file name="Collection.php" hash="c8b08e1a83750a9dd49ccbdd6f05ab16"/></dir><dir name="Product"><file name="Collection.php" hash="49a606ba0651018e2257233de2c67dcc"/></dir></dir><dir name="Shipping"><file name="Collection.php" hash="68e6fac25b480c5e390add20bd53b7e5"/></dir><dir name="Shopcart"><dir name="Product"><file name="Collection.php" hash="f5b61ffb17552d653bd163d01927b62d"/></dir></dir><dir name="Tag"><file name="Collection.php" hash="7f0387e3185d1c8816ffd6e9e9e1a205"/><dir name="Customer"><file name="Collection.php" hash="b4fd488184c83790700655ba4f0e94a2"/></dir><dir name="Product"><file name="Collection.php" hash="d854cc5cb7568a9b82e22a8d90044be2"/></dir></dir><dir name="Tax"><file name="Collection.php" hash="27ecb5bb6ceb5ab4fb807c5f8ef380cc"/></dir><dir name="Wishlist"><file name="Collection.php" hash="c405916913f56a54be65557d56a6fb74"/><dir name="Product"><file name="Collection.php" hash="f4a0f3cb00564e74c100e383b0350c29"/></dir></dir></dir><file name="Session.php" hash="90a1937d9b1181ca3d86a91af7105750"/><file name="Test.php" hash="6c12dc1b404173e9bc5ff879a0ddda6d"/><file name="Totals.php" hash="c937f869bb760029fdd1727673f86921"/></dir><dir name="sql"><dir name="reports_setup"><file name="install-1.6.0.0.php" hash="fce2efb27e84987145d0d8cf69dfa535"/><file name="mysql4-install-0.7.1.php" hash="a11f9fa85c524fac9f59f97422a91f53"/><file name="mysql4-install-1.5.0.0.php" hash="e0a88dd180254f8667f5499f5e8b8194"/><file name="mysql4-install-1.6.0.0.php" hash="bc4b6efa0100cb03134601abb7b1b741"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="5367a98d517289f6d269493704092f69"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="65e389d8d34990964554120c186bf5ca"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="cd1d5bb24de72f9dbbe37dbd4d3853ff"/><file name="mysql4-upgrade-0.7.3-0.7.4.php" hash="87e106317d9018597a86e68d8bbe4272"/><file name="mysql4-upgrade-0.7.4-0.7.5.php" hash="7941a2b79344e81c6ab4b3ab582bc2b8"/><file name="mysql4-upgrade-0.7.5-0.7.7.php" hash="a595f4b477bc7250004be129662f90b4"/><file name="mysql4-upgrade-0.7.7-0.7.8.php" hash="b949bf6cdd39adcadfaeaa4556bf3726"/><file name="mysql4-upgrade-0.7.8-0.7.9.php" hash="57f2ff852cfc1d72295aeb7ca6c256cc"/><file name="mysql4-upgrade-0.7.9-0.7.10.php" hash="9906e43aca73b2b00f043592ace8ac4a"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="ae3fe138dce31638cfe48c1bcc76ddfe"/><file name="upgrade-1.6.0.0-1.6.0.0.1.php" hash="5bc18bc67a7ac04317bdc20cb4e59520"/></dir></dir></dir><dir name="Review"><dir name="Block"><dir name="Customer"><file name="List.php" hash="512f6bccef84c8a74fda5f420445c4d0"/><file name="Recent.php" hash="1360e263f20197c4c490e58a76c75e84"/><file name="View.php" hash="79dcb73a30715fe0503714761d0cbc43"/></dir><file name="Form.php" hash="97e96bd77694697efd6ddad3a80886a6"/><file name="Helper.php" hash="c2898b88acfa4b895f175c434b0d23b7"/><dir name="Product"><dir name="View"><file name="List.php" hash="8d51b77d0c9c40d0a26ce6fc9e691ef1"/></dir><file name="View.php" hash="1ff570d54d2cc10293a95c6d470b7ab3"/></dir><file name="View.php" hash="3a14309417e3dc331693e339fc030dee"/></dir><dir name="controllers"><file name="CustomerController.php" hash="7f8bde1175d4f1c84e1003eb22a2a04f"/><file name="ProductController.php" hash="54a19e74ba34ff2775a9d734933173eb"/></dir><dir name="data"><dir name="review_setup"><file name="data-install-1.6.0.0.php" hash="06f866a61735b94c77e41eab769bfca9"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="c37c8b5ab9782f01b2052078804b756f"/><file name="config.xml" hash="ba18f2b1e9af08a7cca32ac29aad1f8b"/><file name="system.xml" hash="296917bd2227622735c06f2ad0efc10e"/></dir><dir name="Helper"><file name="Data.php" hash="77a835e8b76aaee5808b10acf14e85cc"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Review"><file name="Collection.php" hash="5b04aafae1ba00964a3e355702eb0e8e"/><dir name="Product"><file name="Collection.php" hash="665da21b59130b405bcbd02c881355f8"/></dir><dir name="Status"><file name="Collection.php" hash="232d1c40b0ce6d75a98222df25540b1a"/></dir><dir name="Summary"><file name="Collection.php" hash="4d74684b5238cb670d01256b71252d72"/></dir><file name="Summary.php" hash="51127438707df4925ca3eb4c46c88759"/></dir><file name="Review.php" hash="52165c52f6a55f95c04a9b8bcfe7916b"/></dir><file name="Observer.php" hash="cf41fc1dd4e1fd52f18d4702cf76b057"/><dir name="Resource"><dir name="Review"><file name="Collection.php" hash="313532b00b0f8c95efdc4b2861667972"/><dir name="Product"><file name="Collection.php" hash="0d00efec461805e8670cd171a167e0e1"/></dir><dir name="Status"><file name="Collection.php" hash="4e168c66bdb3ad0e7637745f22644fc4"/></dir><file name="Status.php" hash="0ee3c9050c5f8f7863101c64f0a7be17"/><dir name="Summary"><file name="Collection.php" hash="af6a615ac909f2f5bc66f5c45c06f00c"/></dir><file name="Summary.php" hash="af953b40062ca41c374bf52ef423d8e5"/></dir><file name="Review.php" hash="702d3cb8924128c9390bbf60bdccca9f"/></dir><dir name="Review"><file name="Status.php" hash="37d6b0248fc4db13ad37f57adb95ea0f"/><file name="Summary.php" hash="fa22e88d5721e74e396af6639cf4849e"/></dir><file name="Review.php" hash="548850726d7006c046e7d7c31012dbec"/><file name="Session.php" hash="5011f17908d79c4e7884211b82081c83"/></dir><dir name="sql"><dir name="review_setup"><file name="install-1.6.0.0.php" hash="608a4a29080becd12dc041ae5fc19514"/><file name="mysql4-install-0.7.0.php" hash="5a6f80f002bed460b1a987498a7a096b"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="d5fd6c392fbc64817d98c419ff54603d"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="7ac48a534bd8706db958ab3b9b6d2c2d"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="cc2ec170b5d31a80ce4b35ff0e8d5ae3"/><file name="mysql4-upgrade-0.7.3-0.7.4.php" hash="bdad8dfabbd5e5956ff7a139e405c3b1"/><file name="mysql4-upgrade-0.7.4-0.7.5.php" hash="1e448fec1c7d0c8d4cec3e8fe1d52855"/><file name="mysql4-upgrade-0.7.5-0.7.6.php" hash="1947e923106a808c80aa923a25b54491"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="7d58eb14c4475963abd496f3580035f1"/></dir></dir></dir><dir name="Rss"><dir name="Block"><file name="Abstract.php" hash="331a822c60937a0d471544df3de9d659"/><dir name="Catalog"><file name="Abstract.php" hash="cf7af7e78a5114dc5d958a338db5108f"/><file name="Category.php" hash="9389bf7aa38c2e618ca8a37b7864ddb4"/><file name="New.php" hash="77ebd6905023d62a97c70b517ff91702"/><file name="NotifyStock.php" hash="7c87d363b1fed1d13fc9e8a349120354"/><file name="Review.php" hash="cf9e97c6e005b741e5d38cf29af54769"/><file name="Salesrule.php" hash="48320719d42035795ea4257dc0a2de10"/><file name="Special.php" hash="5c2a557c0e4484545ae8816ba9671111"/><file name="Tag.php" hash="ca7621f8af888dc9b0ba5106271b9852"/></dir><file name="List.php" hash="0b3dd6ac95ad3a60855517bc4661b150"/><dir name="Order"><file name="Details.php" hash="1d243e3c908a1f3ece31e7d65f600e3f"/><file name="New.php" hash="ba413c58ebdfdf34653349c3224b5863"/><file name="Status.php" hash="6dc825ce1c71b2c20e2a31a927e0de69"/></dir><file name="Wishlist.php" hash="fcc30ea48b5a607e80a246e421f73def"/></dir><dir name="controllers"><file name="CatalogController.php" hash="9f7e4e48ab930df9f62a69864b28ab83"/><file name="IndexController.php" hash="eb30ab3ee18351e8de8891cb818097c6"/><file name="OrderController.php" hash="6e5eb5da17755081e2c8ded96a24c9bd"/></dir><dir name="etc"><file name="adminhtml.xml" hash="802ec822d5984fc507ecd00ae9987052"/><file name="config.xml" hash="3ba1c6b26f9c53f2242e9ea6a3acb962"/><file name="system.xml" hash="3b3d393672f9401cfb242022b53b4e5c"/></dir><dir name="Helper"><file name="Catalog.php" hash="e7c7bf342450791dcf5f5aeb67780c4d"/><file name="Data.php" hash="b60dd947d753c061ce26018f7e045703"/><file name="Order.php" hash="d2caf3b89eab2f9367eccc02b032d236"/></dir><dir name="Model"><dir name="Mysql4"><file name="Order.php" hash="a6cde6961f4a385a0cde9e6b7cc015ee"/></dir><file name="Observer.php" hash="9a9a9672089d466fdfbc8a646a8bb3b6"/><dir name="Resource"><file name="Order.php" hash="f5dcf5ddd7f0b3455929a64fe49ea00e"/></dir><file name="Rss.php" hash="e92c3c5832318244adc7ad24523ed6c2"/><file name="Session.php" hash="5ad7456a9aed6bfca235b4ca5024e0b5"/><dir name="System"><dir name="Config"><dir name="Backend"><file name="Links.php" hash="79e3bf8dad81d01888dd43c43d19c680"/></dir></dir></dir></dir></dir><dir name="Rule"><dir name="Block"><file name="Actions.php" hash="a0b150d68bb444eb7076d96afe32f556"/><file name="Conditions.php" hash="76029d83a9ef4b0ca4b85328c4a2e44e"/><file name="Editable.php" hash="e5f2554327d7d59c45bf9fd0fb71fd78"/><file name="Newchild.php" hash="4c43c3139e2c7a112ba3570001c55132"/><file name="Rule.php" hash="6849a19a500b281da15e63832051fac3"/></dir><dir name="etc"><file name="config.xml" hash="61983085b5622046f06a3d1b15585007"/></dir><dir name="Helper"><file name="Data.php" hash="9ea2a71c6cdbbe13c5033f3c3950546a"/></dir><dir name="Model"><file name="Abstract.php" hash="0a451a3cbb024527e89f3ec3d2ca706a"/><dir name="Action"><file name="Abstract.php" hash="6223e0acc6c3d4dd5491eb2afba20cfb"/><file name="Collection.php" hash="72aa17db211e2fe6c4fd8944f10635c5"/><file name="Interface.php" hash="68fcfdd1e53b958a602c594e97de1178"/></dir><dir name="Condition"><file name="Abstract.php" hash="f2814742717bf856bb89282921326b3f"/><file name="Combine.php" hash="011848c974b065087d312f5df1069129"/><file name="Interface.php" hash="5d5d7021e900e24ff83609e7af7143d8"/><dir name="Product"><file name="Abstract.php" hash="ccf5c0894026fca25a25f463b0913353"/></dir></dir><file name="Environment.php" hash="eab0f10cf2cc52b1dbde2c0bd73704e6"/><dir name="Mysql4"><dir name="Rule"><file name="Collection.php" hash="a5c3e8b06d349235eb3aa6d603a60ba8"/></dir><file name="Rule.php" hash="26c8ad9294a344f4e13d87bb9bc6e5fa"/></dir><dir name="Renderer"><file name="Actions.php" hash="90b7a62b5f9e53539ba1fa8208a0527e"/><file name="Conditions.php" hash="c075c7b79052eb75c24b26670b1839d3"/></dir><dir name="Resource"><file name="Abstract.php" hash="debae6fc267abfc7d43dadc2826dfca7"/><dir name="Rule"><dir name="Collection"><file name="Abstract.php" hash="b88069cea72d5383acc7a6e5fe4a80bc"/></dir><file name="Collection.php" hash="d73272762bd7e5e25d6912ffb7b76e8a"/><dir name="Condition"><file name="SqlBuilder.php" hash="5fe02f7f46ca3063fa63989b32212044"/></dir></dir><file name="Rule.php" hash="f431afc5ec1d904293122583760e19cc"/></dir><file name="Rule.php" hash="c9b4cfa869892b360ac6ecbdca971cce"/></dir></dir><dir name="Sales"><dir name="Block"><dir name="Adminhtml"><dir name="Billing"><dir name="Agreement"><file name="Grid.php" hash="663e48b2ae5d315c2ae2a0a754c67c7c"/><dir name="View"><file name="Form.php" hash="984ca7876570077960b563fa74278f6f"/><dir name="Tab"><file name="Info.php" hash="a64543dbf6fced6b7a108ce6ad90c43e"/><file name="Orders.php" hash="ba0f50ebbdbcd59f7fac237878e4b3f0"/></dir><file name="Tabs.php" hash="cbac95f69cb21c92c196ad2c19cda8bc"/></dir><file name="View.php" hash="be411d31e98963d73d4d6280e00b80a3"/></dir><file name="Agreement.php" hash="449fa7b6d10dee7018f41c275e271423"/></dir><dir name="Customer"><dir name="Edit"><dir name="Tab"><file name="Agreement.php" hash="04483b9d8432b77516c169b84f50b8f3"/><dir name="Recurring"><file name="Profile.php" hash="5f70ba08850e95b4e22995316f112684"/></dir></dir></dir></dir><dir name="Recurring"><dir name="Profile"><dir name="Edit"><file name="Form.php" hash="2622ba6fc27fe351ac84f79afe4f233c"/></dir><file name="Grid.php" hash="40355f4c8e1b37b553d189671b0c80e7"/><dir name="View"><file name="Getawayinfo.php" hash="9c2c03a4ca1c3e92c2685967db60ded3"/><file name="Info.php" hash="5c6edb9761e8e72b6dbeaa7f0b82653c"/><file name="Items.php" hash="3aa5473305d2f7473a66713608fe1b68"/><dir name="Tab"><file name="Info.php" hash="a2cb34ce79544cf9684e7ba274d8ae52"/><file name="Orders.php" hash="93bbd3811e3d7a0289238a298768ad86"/></dir></dir><file name="View.php" hash="b5cb8f2a0e9511e1593e00987016d455"/></dir><file name="Profile.php" hash="23f4f9a245cb99519d8d15428506eb64"/></dir><dir name="Report"><dir name="Filter"><dir name="Form"><file name="Coupon.php" hash="45e2c9bce0c153f10966b4557d749a9b"/><file name="Order.php" hash="e75e7771a337fd90aa303308aff0a53d"/></dir><file name="Form.php" hash="2abf3a948cfb32be1db773845e0430a3"/></dir></dir></dir><dir name="Billing"><dir name="Agreement"><file name="View.php" hash="e1ec10c82e53fd49f85b5f5148842f36"/></dir><file name="Agreements.php" hash="e59f440586c6551a8ba1bbc1dcc4c9a6"/></dir><dir name="Guest"><file name="Links.php" hash="9ea5a8e9f7aa1572efac642f21449841"/></dir><dir name="Items"><file name="Abstract.php" hash="c09fd47ee383879d0b3c6c0e1362614e"/></dir><dir name="Order"><file name="Comments.php" hash="a5f44559689b78f3ee3ddc4dda3dbab6"/><dir name="Creditmemo"><file name="Items.php" hash="d8009b9b7e66892c5a793ad39b869774"/><file name="Totals.php" hash="8e843e9bd47c2a282d809edb0b08c993"/></dir><file name="Creditmemo.php" hash="6aa17d7be7fad8db2d4da74627e5884d"/><file name="Details.php" hash="d159ff9c6c4d08028a7caef941ecb7c5"/><dir name="Email"><dir name="Creditmemo"><file name="Items.php" hash="afd28baa1c02bbd13da85cf3f5f4328b"/></dir><dir name="Invoice"><file name="Items.php" hash="d474773ba70575ee263567d7614304ab"/></dir><dir name="Items"><file name="Default.php" hash="aaea07e417958545c3d78ac6b9081f1a"/><dir name="Order"><file name="Default.php" hash="5b2785a6d26ad72260f05cbabdfc094d"/><file name="Grouped.php" hash="5abde96018674e60c8533067375b015d"/></dir></dir><file name="Items.php" hash="8aab6c6a12d226c2154171e88ed5adce"/><dir name="Shipment"><file name="Items.php" hash="cc6643f54bc7f620bfc51923558a21a3"/></dir></dir><file name="History.php" hash="79d820579e3ce317f5f9aaab00adce43"/><dir name="Info"><file name="Buttons.php" hash="58c61fd2ed7659363372d27d4bb2348f"/></dir><file name="Info.php" hash="452689591f840661befe37f599696fe3"/><dir name="Invoice"><file name="Items.php" hash="6de1df7bed7505f6ed510b8773df9e76"/><file name="Totals.php" hash="611df8dd9676593b59290774bbc6eaf8"/></dir><file name="Invoice.php" hash="3526efba6bd5d17551c2c38561237a6f"/><dir name="Item"><dir name="Renderer"><file name="Default.php" hash="4dc03ec3c63ed05dbe483c5011e09133"/><file name="Grouped.php" hash="a69b4e139fb887f240c8ed3531ca806a"/></dir></dir><file name="Items.php" hash="75d79776e3f7c1622058f2f639594f8f"/><dir name="Print"><file name="Creditmemo.php" hash="950ba9c464877866d854d99247a67fc7"/><file name="Invoice.php" hash="31e640f77a81994af4c33fbcf9995339"/><file name="Shipment.php" hash="f2c3e3fc9ee8d655084777f7888c8f5c"/></dir><file name="Print.php" hash="1ac6020966522d5f19d958a9b8a0d977"/><file name="Recent.php" hash="19828034c12eab875992fa41fb58901b"/><dir name="Shipment"><file name="Items.php" hash="64296d135f3896e4ace963ce454f633b"/></dir><file name="Shipment.php" hash="adfd4e0ac9fd1bd452ddf6f92afd1f8f"/><file name="Tax.php" hash="877a0541bf1c4fddab4f63b9c9ec24ab"/><file name="Totals.php" hash="a916f5cfe3c05f5f873bf01913d82127"/><file name="View.php" hash="3404763f9f2e696540ba0cbc7f091820"/></dir><dir name="Payment"><dir name="Form"><dir name="Billing"><file name="Agreement.php" hash="3c67c84c2aea873d0a75307d9fe72515"/></dir></dir><dir name="Info"><dir name="Billing"><file name="Agreement.php" hash="4e825763afe14c289d7417aec9c824af"/></dir></dir></dir><dir name="Recurring"><dir name="Profile"><file name="View.php" hash="1fb9198061970f6c857b78b3c82c7d41"/></dir><file name="Profiles.php" hash="06f12ec4b37a0c6b91c9a9187dd99ee7"/></dir><dir name="Reorder"><file name="Sidebar.php" hash="7879f83d7ab76500a5a68262b725d102"/></dir><dir name="Widget"><dir name="Guest"><file name="Form.php" hash="79328142adeef748e3b205ecdf36429f"/></dir></dir></dir><dir name="Controller"><file name="Abstract.php" hash="03628e37cf15b2c9a20208fb1637a951"/></dir><dir name="controllers"><dir name="Billing"><file name="AgreementController.php" hash="0c43ad9d5dc3faa2fe601cf1c42ff7ae"/></dir><file name="DownloadController.php" hash="40d1bb137de68983b28b5f15e3450014"/><file name="GuestController.php" hash="0740bef48e3c62203749ee97ac6d1a08"/><file name="OrderController.php" hash="bada7556cfb708a088b735e54b59aec9"/><dir name="Recurring"><file name="ProfileController.php" hash="7800235d5a27bc5c43f555cdb22e039e"/></dir></dir><dir name="data"><dir name="sales_setup"><file name="data-install-1.6.0.0.php" hash="07f8a46b6221cc6e732982e0f71646c3"/><file name="data-upgrade-1.6.0.4-1.6.0.5.php" hash="41b7c0a8985043718bdd7659de159ea4"/></dir></dir><dir name="doc"><file name="invoice.txt" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="order_actions.HTM" hash="b955e61bff753ea0534f907ef6ba9bb6"/><file name="order.txt" hash="5dce876530c94ebbedbba7a234c23846"/><file name="quote.txt" hash="55ecfbdd576958ff1b1fbf16957ba9df"/><file name="test.php" hash="9bc93498924ccbe63f0d08c4e8731fd0"/></dir><dir name="etc"><file name="adminhtml.xml" hash="e73bb044bad576aa131798df1790f66d"/><file name="api2.xml" hash="c60570acbefb8bf78cc2aab6c80617a1"/><file name="api.xml" hash="fcfbf7665494872e744b801bfa3574a1"/><file name="config.xml" hash="3d7711669d1524457f931c24677cefe2"/><file name="system.xml" hash="11767f93e25f4835df6cd3769eecc94d"/><file name="widget.xml" hash="0e5fe489ab86dbf266d5a89f3bb40040"/><file name="wsdl.xml" hash="ed13de1dde6408ab508892374ef57b81"/><file name="wsi.xml" hash="6aba2f44765955ec8bcd1afcebfb0800"/></dir><file name="Exception.php" hash="4441b7cbf57bfd39a5743010f45854bb"/><dir name="Helper"><file name="Data.php" hash="478a523e2bc3586de0425713e33dd23d"/><file name="Guest.php" hash="fbaf51d671ef9719b60aa9e1429ce82e"/><file name="Reorder.php" hash="f6a521d48892dcb49978bd832a34b864"/></dir><dir name="Model"><file name="Abstract.php" hash="11cf7f74476a6edca1cf03155f7fc06f"/><dir name="Api"><file name="Resource.php" hash="b72b10b689a1f2a2c91cbbb0fa4f967d"/></dir><dir name="Api2"><dir name="Order"><dir name="Address"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="67ebb4ba974d83416106286c8c9274fe"/></dir><dir name="Customer"><file name="V1.php" hash="b2740d9e4d25c52863c56bfdfe4781fb"/></dir></dir><file name="Rest.php" hash="5e8582adf0d32e3f533b82d5bfcc5465"/></dir><file name="Address.php" hash="729dfeaa5549c0d1ee6e885d46c38ae5"/><dir name="Comment"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="dbd47810c46fa094cfb0eadd796d9b2c"/></dir><dir name="Customer"><file name="V1.php" hash="1cc629a63b9b8ee871de8683f1133356"/></dir></dir><file name="Rest.php" hash="b041ed77886208f7685a27a922423285"/></dir><file name="Comment.php" hash="4392f5db6e41f2bbcfd9f2dfcd889d11"/><dir name="Item"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="f3ce8e9d41348d5717aed1002ed31716"/></dir><dir name="Customer"><file name="V1.php" hash="19dddbb520393cc073af190eb610ae99"/></dir></dir><file name="Rest.php" hash="3df89f39774d95d76baeb7151f7b12d9"/></dir><file name="Item.php" hash="81138d1ee990d24199cb8a75a09d1252"/><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="8767fa4db2feab9c400507d358dfe895"/></dir><dir name="Customer"><file name="V1.php" hash="66da449f274219d1de878b3dfa421d3a"/></dir></dir><file name="Rest.php" hash="d6c60e043702ea3f501cef93527204ce"/></dir><file name="Order.php" hash="6ecf5ce91303a518e498d200cdb8d86b"/></dir><dir name="Billing"><file name="Agreement.php" hash="7a681e26a78d503e4ad48e4f350025d0"/></dir><dir name="Config"><file name="Ordered.php" hash="27f854036b76e23f15bb732489f463c2"/></dir><file name="Config.php" hash="2d4f68d19647860304bb8be6103f224d"/><dir name="Convert"><file name="Order.php" hash="007a986acd83d82e65d441b9f91ccbed"/><file name="Quote.php" hash="35fe281999c4e12bfcd63346f453abf3"/></dir><dir name="Email"><file name="Template.php" hash="0b5d82151a0960d21821c64fc94ef201"/></dir><dir name="Entity"><dir name="Order"><dir name="Address"><file name="Collection.php" hash="5766d17a81b123d749621aa77a4c10f5"/></dir><file name="Address.php" hash="19c9f8830ad739eb5d8961eff1c09657"/><dir name="Attribute"><dir name="Backend"><file name="Billing.php" hash="a45641f010c69926e245ad84b3199b9e"/><file name="Child.php" hash="5fbc02a06aedb3f7d3818184df11b094"/><file name="Parent.php" hash="b04f050eea5b8c213b32affaef695586"/><file name="Shipping.php" hash="6a9c033db37ef99a2b674257c3be334a"/></dir></dir><file name="Collection.php" hash="0e4ccc29c9e78d2799719b84d8f1f43a"/><dir name="Creditmemo"><dir name="Attribute"><dir name="Backend"><file name="Child.php" hash="1a68c7ae98eb0800b0169cdcc508b35d"/><file name="Parent.php" hash="940fad4c1b0fa32ae1a27e2351c6b188"/></dir></dir><file name="Collection.php" hash="7a38a07a6fd04fde560364b4fade4e83"/><dir name="Comment"><file name="Collection.php" hash="2316d9141c43d866c0e51b7aa02d3613"/></dir><file name="Comment.php" hash="29cae325212acf2de3e30a28341d9aa5"/><dir name="Item"><file name="Collection.php" hash="bae6084a3fbd82593d80822aa642b4b5"/></dir><file name="Item.php" hash="98083afbc879289a97dbf91e28f0965d"/></dir><file name="Creditmemo.php" hash="a854ec87cdab64f8f80edd53ddf6e5bc"/><dir name="Invoice"><dir name="Attribute"><dir name="Backend"><file name="Child.php" hash="35926828dff48dcab530cbc643809d9c"/><file name="Item.php" hash="657a8ad83975e96d0b01f5fb5d173b75"/><file name="Order.php" hash="44b4edd447c511f67bb24190a30aa3c9"/><file name="Parent.php" hash="5045fdce051cd209e9b1acd81fc7dfed"/></dir></dir><file name="Collection.php" hash="1d2de78e72c3baf0bd13867431bb5884"/><dir name="Comment"><file name="Collection.php" hash="f41366a70181290fa097abf3604f6993"/></dir><file name="Comment.php" hash="2c5ac613b4c3ed93cf999e39f4cb612b"/><dir name="Item"><file name="Collection.php" hash="4a7b6593be9e179e8ecccceab1f4ff7b"/></dir><file name="Item.php" hash="84b4e02f49e0e461cad8e882b0aceae5"/></dir><file name="Invoice.php" hash="8a8ce3f016b773502d6e23a6c50e8d51"/><dir name="Item"><file name="Collection.php" hash="a8ef79b1c516b51d84777be58a50db8b"/></dir><file name="Item.php" hash="58ca9ea6aa3ab8bc8eb786b781cb03f9"/><dir name="Payment"><file name="Collection.php" hash="eb2b2badb21dd434fa38efa37245a481"/></dir><file name="Payment.php" hash="2f7842ec9ec111273721d19ba17148de"/><dir name="Shipment"><dir name="Attribute"><dir name="Backend"><file name="Child.php" hash="896c76b148112177cb00dbab3ff04e00"/><file name="Parent.php" hash="8df58202984af8587a586318aae68528"/></dir></dir><file name="Collection.php" hash="3ca3e22355ee024005834c4c0fd2c314"/><dir name="Comment"><file name="Collection.php" hash="4272836e8153f1689e2a0352e913d68e"/></dir><file name="Comment.php" hash="102fa89d48258947f665d5c982f99105"/><dir name="Item"><file name="Collection.php" hash="5395c94786cd0ba5a97fa03f04f69a10"/></dir><file name="Item.php" hash="4b9999d532791aaa7bef9541fa789b82"/><dir name="Track"><file name="Collection.php" hash="5971fdcda1ee2af75b5ca0b6cad8bb91"/></dir><file name="Track.php" hash="583328e30d02f3bbb6231a50b3f846c7"/></dir><file name="Shipment.php" hash="7cefc3d57fb6bac18e3ff2fe4d84461e"/><dir name="Status"><dir name="History"><file name="Collection.php" hash="c7efb1a3e07a6018a962e11b6a63098d"/></dir><file name="History.php" hash="7b62f81846aac3b1530e10a375c34127"/></dir></dir><file name="Order.php" hash="6172561cc551475f708dafd7db347e4e"/><dir name="Quote"><dir name="Address"><dir name="Attribute"><dir name="Backend"><file name="Child.php" hash="4e6001d4a13458bd4a3072479bdcb0f2"/><file name="Parent.php" hash="3e99e06c7759e3bcf64c70ccd5c69b2e"/><file name="Region.php" hash="846650adb4e9d136407eecc67b777035"/></dir><file name="Backend.php" hash="a6baf45d86523c0da8c738b46de34bf7"/><dir name="Frontend"><file name="Custbalance.php" hash="e2af566b37a8b580e32eacf75ad54359"/><file name="Discount.php" hash="5357ffca3917527b02b8b25717a593b3"/><file name="Grand.php" hash="f0f49960212176f27361f6622c524a39"/><file name="Shipping.php" hash="36c1b2fc02839705595427ef81cffe04"/><file name="Subtotal.php" hash="34de6a34cf0d9960ee07f3133cd5bf72"/><file name="Tax.php" hash="06e9a6ab4383348eaa3ea78248e8c0e4"/></dir><file name="Frontend.php" hash="b1029792df9b5faab32fd9ea72e9e7c5"/></dir><file name="Collection.php" hash="d64979d7d85bf9727f7bbe901faf5b04"/><dir name="Item"><file name="Collection.php" hash="4b3a00c9a61f7532c3c9ea9c5a5c6af7"/></dir><file name="Item.php" hash="dd7ca260fd23e0ea43bc7733264e4417"/><dir name="Rate"><file name="Collection.php" hash="7ad45cf8c8472935475aa966fff214d1"/></dir><file name="Rate.php" hash="4da2866b0b0de346b8261d3f6e322f4c"/></dir><file name="Address.php" hash="e600212b7895204482aa1138880a6810"/><file name="Collection.php" hash="2bc796f885f1956e5afed43d5ef54064"/><dir name="Item"><file name="Collection.php" hash="a9f32e705db227a6992a5d8219f881e3"/></dir><file name="Item.php" hash="03c05e524857ef664da61bbde0292024"/><dir name="Payment"><file name="Collection.php" hash="d3374a60fe829fc2556630538deb60a0"/></dir><file name="Payment.php" hash="d33ad08997fe1f34797cb45e29cf1307"/></dir><file name="Quote.php" hash="90e6131394be459c960a919496f2392d"/><dir name="Sale"><file name="Collection.php" hash="f84cf5dba0f39f31aacccc456b1f684c"/></dir><file name="Setup.php" hash="b2ed53d7646d549d5eb1ddcf638d6ec2"/></dir><dir name="Mysql4"><file name="Abstract.php" hash="128add902202303cb2cc50f83ac6c5fa"/><dir name="Billing"><dir name="Agreement"><file name="Collection.php" hash="a9163e84abbd23e110cc3f166436036b"/></dir><file name="Agreement.php" hash="0a0d0575aa6fa7b61eb9e3a47e1b220f"/></dir><dir name="Collection"><file name="Abstract.php" hash="82b22b98a63304124f8c8b7cfbdd69a7"/></dir><dir name="Order"><file name="Abstract.php" hash="e9bda3bece5826e87d0d4422db27ff74"/><dir name="Address"><file name="Collection.php" hash="49ecf4aa5f645fd556e847aef7631d8f"/></dir><file name="Address.php" hash="6b7f31ec020ebc154a7b0c925f2b425c"/><dir name="Attribute"><dir name="Backend"><file name="Billing.php" hash="954b13b81b33d0220cff629fe351d07c"/><file name="Child.php" hash="60d0ea5f3652b0dc694b1705f25e3c7b"/><file name="Parent.php" hash="13c6a4b7a45a286fe2eb1e4471febe80"/><file name="Shipping.php" hash="c6382b97fd956369a411e036320803cc"/></dir></dir><dir name="Collection"><file name="Abstract.php" hash="0ca49af555976302b079787517574d81"/></dir><file name="Collection.php" hash="934e03a6b2e1a205d1fe499770740b99"/><dir name="Comment"><dir name="Collection"><file name="Abstract.php" hash="8dc5749ab2b075db69858bd268f6c56a"/></dir></dir><dir name="Creditmemo"><dir name="Attribute"><dir name="Backend"><file name="Child.php" hash="e18db842b0815a134d71d86e26d1893d"/><file name="Parent.php" hash="856f71f2a531a2cb9927971d1252b3f7"/></dir></dir><file name="Collection.php" hash="81302a8789ee5b925a8b9f70d206897b"/><dir name="Comment"><file name="Collection.php" hash="57cc525da057dc2f43fc018eb4328421"/></dir><file name="Comment.php" hash="d1144bd9d3446bf32636b1e2a145f781"/><dir name="Grid"><file name="Collection.php" hash="9edc4ff74b8bc60172b4c89e96d136d5"/></dir><dir name="Item"><file name="Collection.php" hash="096b66c8dd41068af6484b22c051e14a"/></dir><file name="Item.php" hash="c299ff8271689c908613c49b49fe5e05"/></dir><file name="Creditmemo.php" hash="6578cbbb22a2a658abb04c421f3fb8da"/><dir name="Grid"><file name="Collection.php" hash="4de46611e98bf975a2faab35b1c521ce"/></dir><dir name="Invoice"><dir name="Attribute"><dir name="Backend"><file name="Child.php" hash="3ad1b41d9fea412445fc085fd4a44df6"/><file name="Item.php" hash="a7dd732b1c44d095baadc79fa03004b9"/><file name="Order.php" hash="95d04268dd02902957ae13dbfedcba00"/><file name="Parent.php" hash="16a1463dbf53cc977b46e571e629248c"/></dir></dir><file name="Collection.php" hash="d90d7493c81611fbcfdbe050730ed154"/><dir name="Comment"><file name="Collection.php" hash="e26f0d819ff1ce2b8fe7b231e72710d8"/></dir><file name="Comment.php" hash="d89d07a17bb347ddb5044eac5ea9692c"/><dir name="Grid"><file name="Collection.php" hash="f18b1bf1654da34c04daa98c912b3f40"/></dir><dir name="Item"><file name="Collection.php" hash="b98e39cc84e942ab9c22927f3325c801"/></dir><file name="Item.php" hash="23483baa22e9d49acda71932b3d95ea4"/></dir><file name="Invoice.php" hash="b41af8f8bbbdfc3154f4f391b3a1657d"/><dir name="Item"><file name="Collection.php" hash="792340760753ee53838fb6a82afcb8e6"/></dir><file name="Item.php" hash="7313d63910bbf281b2e0ee4d23766b82"/><dir name="Payment"><file name="Collection.php" hash="82d6533783a611d7465589c76b7ff874"/><dir name="Transaction"><file name="Collection.php" hash="9fa0a722e2e39398fda162f3af28afa2"/></dir><file name="Transaction.php" hash="c507b030526ab631a563b8369a976ac2"/></dir><file name="Payment.php" hash="df4e94c339c8098a5ef4ef38d51eb0e8"/><dir name="Shipment"><dir name="Attribute"><dir name="Backend"><file name="Child.php" hash="2d2ce48c0f6dd5b3332b242aee43105b"/><file name="Parent.php" hash="f3bf55cdb90f7cd19eeda63eaeae8d7b"/></dir></dir><file name="Collection.php" hash="8f7c55f8525dcd2f30cf9aaef5488b0d"/><dir name="Comment"><file name="Collection.php" hash="aae07d826e543599f87022d1cbf91012"/></dir><file name="Comment.php" hash="610aaae5149ad5d9d2733967a8de44dc"/><dir name="Grid"><file name="Collection.php" hash="9efeb3ec27d9ac2cd929730e37ef4e4f"/></dir><dir name="Item"><file name="Collection.php" hash="51e112df8b81ef310892b122e051b75c"/></dir><file name="Item.php" hash="b44a64b5654e9dd9ced6f941b6eb095b"/><dir name="Track"><file name="Collection.php" hash="a7c27e28803f12acb64692ca66de6837"/></dir><file name="Track.php" hash="3720baaebce72420c024157632ab99f9"/></dir><file name="Shipment.php" hash="b1eb09646e0c251ab83d5ad880d63cdc"/><dir name="Status"><file name="Collection.php" hash="3bee86636d708dc72b3bae367c78e5c3"/><dir name="History"><file name="Collection.php" hash="fc68c4a740c4fb2301346cd17287e053"/></dir><file name="History.php" hash="ebef39b8d1cba78fa2b472901b656994"/></dir><file name="Status.php" hash="2fcee2be0b2d402be0eae31c7059dce8"/><dir name="Tax"><file name="Collection.php" hash="6642b1bfd26fee9b775e6910d4021d2d"/></dir><file name="Tax.php" hash="fcb20608ae95407630c5d8bb33ab85b0"/></dir><file name="Order.php" hash="c40d54841d1a3027e1b5f6da9143d93d"/><dir name="Quote"><dir name="Address"><dir name="Attribute"><dir name="Backend"><file name="Child.php" hash="5e5981e1455701462a7f30b9b169aa3e"/><file name="Parent.php" hash="38aeac1afc6cb5db3afa7fdc08bb83e4"/><file name="Region.php" hash="b7adc57e6c16eb13b3690134ba9c564a"/></dir><file name="Backend.php" hash="edc8b860ae10b21bc4cac459c9dc0d48"/><dir name="Frontend"><file name="Custbalance.php" hash="e680ca81ba2a4845697b93c4a728a880"/><file name="Discount.php" hash="6a7dc5385377397a2fdc8902b59ef489"/><file name="Grand.php" hash="e68b97e262d97a8282232c71800c03b4"/><file name="Shipping.php" hash="53603ed1a56f474ba9ed8b9fb00bf32f"/><file name="Subtotal.php" hash="96c6dbee82c5da5dd3ac3d13a8a09a85"/><file name="Tax.php" hash="493aa07eaff245095336e83d8359dbc2"/></dir><file name="Frontend.php" hash="ef4679616bf7d42102fef461e28e7b74"/></dir><file name="Collection.php" hash="bfab1ab76703790ef2ea88178bc6deea"/><dir name="Item"><file name="Collection.php" hash="c31e142d560d9fc891f4f242e8216f94"/></dir><file name="Item.php" hash="d8a883ad952aa2ff14071e9859b4035b"/><dir name="Rate"><file name="Collection.php" hash="a2e3be0c0c4f6aedc7a3401373b5f641"/></dir><file name="Rate.php" hash="b6613721e91779d035c4df6b44126b6c"/></dir><file name="Address.php" hash="9e672c91dc6b76205491c39afc07d736"/><file name="Collection.php" hash="242eb33f4414e101a3adda458a0eec5e"/><dir name="Item"><file name="Collection.php" hash="11e6e994d2dd81133ac57d64eabaf344"/><dir name="Option"><file name="Collection.php" hash="ab10fde6fa328f6b6b28fe78939b3b2e"/></dir><file name="Option.php" hash="9e6185c8d738091b2bae6b1bb449254c"/></dir><file name="Item.php" hash="9c3ec7452ede7ca738c9b5a7949d8474"/><dir name="Payment"><file name="Collection.php" hash="63e1e84ce07530482b7602cf43e8e9ac"/></dir><file name="Payment.php" hash="721d8250d9822e93cd57f511ed297cf8"/></dir><file name="Quote.php" hash="315f6a2ecb39e0725f3f266c15e21674"/><dir name="Recurring"><dir name="Profile"><file name="Collection.php" hash="d3ac315015cc0e803f184a85125cef9d"/></dir><file name="Profile.php" hash="91aba342aa51acd78e6166438e8c65e5"/></dir><dir name="Report"><file name="Abstract.php" hash="5501ee57e374d9711d710ef72f2a85a2"/><dir name="Bestsellers"><file name="Collection.php" hash="524043554d7f1bfc76f6cfcebcab6125"/></dir><file name="Bestsellers.php" hash="e9819db1270b9ab2f5ddc760ec674a63"/><dir name="Collection"><file name="Abstract.php" hash="ab6550e2698c0cede5f5fddc4ea463d8"/></dir><dir name="Invoiced"><dir name="Collection"><file name="Invoiced.php" hash="6fe3c1017e086ba4e88edede5220ccf7"/><file name="Order.php" hash="238f218524e7f91ace6dad13d54d61a5"/></dir></dir><file name="Invoiced.php" hash="b9c9cba1c465c11091a4a2fbc0610e8e"/><dir name="Order"><file name="Collection.php" hash="522f29eec35c7fcdc4366c246d723480"/><dir name="Updatedat"><file name="Collection.php" hash="82606f09e07187ce6a65eaa1ecff06df"/></dir></dir><file name="Order.php" hash="4f8a1ae5542d891f3f193d6dcb7c5f38"/><dir name="Refunded"><dir name="Collection"><file name="Order.php" hash="62bb9d5309eceae85f87b5fd22aa96d4"/><file name="Refunded.php" hash="1637262766f63aaf091f2a7f8367a9ba"/></dir></dir><file name="Refunded.php" hash="e600376c3c03fcb83ca967adcdbce9e4"/><dir name="Shipping"><dir name="Collection"><file name="Order.php" hash="18c6adbab346f3d9cec5848a6cd5c70d"/><file name="Shipment.php" hash="963eee5684e3acf6d311151446870d73"/></dir></dir><file name="Shipping.php" hash="ed643f4dde6ca5aeed9989f570b13dcf"/></dir><file name="Report.php" hash="0d5ddcfe98cdf28de6a2a8dd55e4b968"/><dir name="Sale"><file name="Collection.php" hash="5cc429a18ee7758bbb4e1b8cd62fc668"/></dir><file name="Setup.php" hash="ab109d54b2e21bb90daf2c63652b00d5"/></dir><file name="Observer.php" hash="ef8e008d112171a941318c65183cfa96"/><dir name="Order"><file name="Address.php" hash="3dc2060d626b425c1e97b998ce94180b"/><dir name="Api"><file name="V2.php" hash="c5bec3186dd3a6c5ee954e2e84bd9f2f"/></dir><file name="Api.php" hash="901ce1705c0f7cc486bb8750c0330b30"/><file name="Config.php" hash="28d1dccebea93da875eb6ef3844bf05e"/><dir name="Creditmemo"><dir name="Api"><file name="V2.php" hash="605b5f520783ee1a07b5df1a2ca27adc"/></dir><file name="Api.php" hash="96056a119e6446e103b34849d0c31eca"/><file name="Comment.php" hash="f0a6f81b92fa7050e220817cae65e2d0"/><file name="Config.php" hash="55e7766ead48b3fa754e92c32e34c20a"/><file name="Item.php" hash="41307a104a0d62421d334057f5366b59"/><dir name="Total"><file name="Abstract.php" hash="b233b7c4a7e8991388cb3cccd696d73c"/><file name="Cost.php" hash="2a7e76ce7bb78c3037db47e3b0854707"/><file name="Discount.php" hash="87d45fa4b418574747bbcdf69106c454"/><file name="Grand.php" hash="2e2cbc584bb6c80ee2fd8bde4ee1dbe5"/><file name="Shipping.php" hash="2614d1326eacc24cf09254570aa13059"/><file name="Subtotal.php" hash="aad15222440186f5f1580cf907bbfb21"/><file name="Tax.php" hash="45779741ae5fcd94dcdc0ee19ca1ac14"/></dir></dir><file name="Creditmemo.php" hash="61bad416ec6c036f70b15ef9203a999f"/><dir name="Invoice"><dir name="Api"><file name="V2.php" hash="9df6d6338b591262d29ee1adf9b8c5a5"/></dir><file name="Api.php" hash="822b4a16c1c314a66e4d7711f86a5402"/><file name="Comment.php" hash="564093b8f554d09d3518b6d72144ceb4"/><file name="Config.php" hash="8a2c0f326a9c689a94272f7617e3c3de"/><file name="Item.php" hash="c82373a9630c66deb23f9b788dd8e94d"/><dir name="Total"><file name="Abstract.php" hash="6f34c9549184970731390eaea4adc55e"/><file name="Cost.php" hash="4a4f13dc7a8d54a4298beb28bda67321"/><file name="Discount.php" hash="e0542966680f7b8e26f1404f7a0ff541"/><file name="Grand.php" hash="f6d864ada64d499a00792d3d0feed544"/><file name="Shipping.php" hash="d8c5e2a78e17c0ffb10358e824a9cf15"/><file name="Subtotal.php" hash="9235bc533dc549819bb21f391d7b2ce4"/><file name="Tax.php" hash="fbfdd688d973475382749cdf807e2052"/></dir></dir><file name="Invoice.php" hash="5e161f0c2c3eaf0c1e43adb3c8e74c9c"/><file name="Item.php" hash="83572d7f04c792fbadcdf9bcc6d0df19"/><dir name="Payment"><file name="Transaction.php" hash="6eeb7f10c93aa10ee1072103a5aa4cf4"/></dir><file name="Payment.php" hash="b22c3506e388fe38f57486aa98ff3a00"/><dir name="Pdf"><file name="Abstract.php" hash="902134abb4f9e9871a7fa6b6f9e70dd5"/><file name="Creditmemo.php" hash="f69191824cd44c68d3ff5acc2aa2d1bd"/><file name="Invoice.php" hash="393b3cc227fdb034f7992b8cef16a413"/><dir name="Items"><file name="Abstract.php" hash="3aa560042bb31618caf2fc7b2cba2060"/><dir name="Creditmemo"><file name="Default.php" hash="17dbb2bd543a2e1329e6e8e219d2c550"/><file name="Grouped.php" hash="8660c15601d9cb09f2c9742bf1d64052"/></dir><dir name="Invoice"><file name="Default.php" hash="6e15fc399d6f5cba06182f869d63456f"/><file name="Grouped.php" hash="be281c626b13fd0a26fe57fd1730b780"/></dir><dir name="Shipment"><file name="Default.php" hash="db57ad093bd56e82aef1068c730bad75"/></dir></dir><dir name="Shipment"><file name="Packaging.php" hash="c5fecb46a2b085beb02177b6cfd68b49"/></dir><file name="Shipment.php" hash="feea28842c018237f7b1fef8c3f4d957"/><dir name="Total"><file name="Default.php" hash="9419424e3fcd76345f9df0c7e1e56db0"/></dir></dir><dir name="Shipment"><dir name="Api"><file name="V2.php" hash="e32616155bb6c3539bddca097a587d98"/></dir><file name="Api.php" hash="84bd899ca269cbf155980469a26197d6"/><file name="Comment.php" hash="5073f33a6209bdc069f6f98d5be73862"/><file name="Item.php" hash="ce8dd783d966b6471ec44c3b6814ee79"/><file name="Track.php" hash="9dbc703408c30c3915c92a0d33da44d2"/></dir><file name="Shipment.php" hash="4fe14c92d2714116cca06501fe1839aa"/><dir name="Status"><file name="History.php" hash="d4321ed258e1a466502238bf5c39dc96"/></dir><file name="Status.php" hash="d90607b997601faf5dcf17cc44f40282"/><file name="Tax.php" hash="a1292231c94e6b244d610350abdbb70b"/><dir name="Total"><file name="Abstract.php" hash="549e306a62d9ef240480e23c6e1c24dd"/><dir name="Config"><file name="Base.php" hash="87222530849a4e81284663e6f7289877"/></dir></dir><file name="Total.php" hash="7baf7dacd2022b0cd4b13372fa7ee619"/></dir><file name="Order.php" hash="7c7247e25a0a64599f047f257be8d1e8"/><dir name="Payment"><dir name="Method"><dir name="Billing"><file name="AgreementAbstract.php" hash="36ba727b4a2aa0312529cb741f1372d5"/></dir></dir></dir><dir name="Quote"><dir name="Address"><file name="Item.php" hash="eff19902344bb990881b1038bb264cd4"/><file name="Rate.php" hash="ac7568287619116ac83f8607f43c0d5b"/><dir name="Total"><file name="Abstract.php" hash="21c10520967a0e16aa64df88854180de"/><file name="Collector.php" hash="f91e7b06749ac4265a1275fcbf54faae"/><file name="Custbalance.php" hash="35b9490e871165f66047879f7369dcb6"/><file name="Discount.php" hash="4a5a30cf5eb3be66a69b1112c1ed47a1"/><file name="Grand.php" hash="dca10e6d8b57ac870f9a6836acfd30dc"/><file name="Msrp.php" hash="9f850fe69084f35810d6226e41c134a3"/><dir name="Nominal"><file name="Collector.php" hash="5ec913bb6420fa56f0ad8a9e22417e26"/><dir name="Recurring"><file name="Initial.php" hash="fcbca757c2e5e282c6aea7d3a20c6415"/><file name="Trial.php" hash="ddc90ef8436abf8092d5699a62e49e66"/></dir><file name="RecurringAbstract.php" hash="d523c7c7f18fca0c3f6009e1333f91ba"/><file name="Shipping.php" hash="7d1e40de396943bf1a84ea671e4c1f0b"/><file name="Subtotal.php" hash="8afed5a17f23ada2fcd1d634e0740704"/></dir><file name="Nominal.php" hash="841f9235da982912d6798965edf21e20"/><file name="Shipping.php" hash="ff5902ba7eef009dd761d779dcf29301"/><file name="Subtotal.php" hash="ef7d56e5990a8f875c16faca41a14169"/><file name="Tax.php" hash="981bf7aa646bb1450c7c7be4f92ca6b7"/></dir><file name="Total.php" hash="fef1fca517a7d0fd3cca9c2f03d0456c"/></dir><file name="Address.php" hash="75fc0a97a0278729f3e4232bff590207"/><file name="Config.php" hash="fd5cda737c90b7b755e4f4efb4a37cad"/><dir name="Item"><file name="Abstract.php" hash="6e635b3849d47d36b179a426e993a803"/><file name="Option.php" hash="df3a8fd94135e2cb7cc3f9c32331d4d7"/></dir><file name="Item.php" hash="1d3f62aae3f66dfecee703b190eab2b6"/><file name="Payment.php" hash="57f7756bec4af5ed67bb344ff503d3fe"/></dir><file name="Quote.php" hash="cca4f04ed32ff243cca1b4ecd45fb329"/><dir name="Recurring"><file name="Profile.php" hash="fe0c38bd6aa48f370bb2b251c2d84a4f"/></dir><dir name="Resource"><file name="Abstract.php" hash="965c88159aee43cabfdec2641177200b"/><dir name="Billing"><dir name="Agreement"><file name="Collection.php" hash="25ad2f5afc48e698b8e8056a2814e85d"/></dir><file name="Agreement.php" hash="473e173749fb98be9f7efb3249dbd611"/></dir><dir name="Collection"><file name="Abstract.php" hash="26966527173ed18054d52bae9de5c2d3"/></dir><dir name="Helper"><file name="Interface.php" hash="d1c46c3057e759117e469d86bd953b33"/><file name="Mysql4.php" hash="fc65f4cf5dac893a2069a664848de8b4"/></dir><dir name="Order"><file name="Abstract.php" hash="32ab9459a3a24adb3238de92f3661bf5"/><dir name="Address"><file name="Collection.php" hash="ccd4041780d6c16bedd7dbcf884987f4"/></dir><file name="Address.php" hash="857f15728597cf58cc1260b349cc2d17"/><dir name="Attribute"><dir name="Backend"><file name="Billing.php" hash="304614aa4850321917318c4bd7908eaa"/><file name="Child.php" hash="899f2157affe5933be5248d006de088c"/><file name="Parent.php" hash="be2bf80fe5fcc8092b75d73d067deb73"/><file name="Shipping.php" hash="9881f1a99c191047b140a3d68da9c71c"/></dir></dir><dir name="Collection"><file name="Abstract.php" hash="1e2f956381b66c7c22fbc69ccf40aaa6"/></dir><file name="Collection.php" hash="d79866ef0167541dbcdf5159c760aa2e"/><dir name="Comment"><dir name="Collection"><file name="Abstract.php" hash="3f5ce9561c599386d7f0bf109abd2505"/></dir></dir><dir name="Creditmemo"><dir name="Attribute"><dir name="Backend"><file name="Child.php" hash="06d2bcd645f58452f9a06c8b30ef8688"/><file name="Parent.php" hash="2afb484746b2e18732de65fbd72b460c"/></dir></dir><file name="Collection.php" hash="a007dbc7ac82a457c8a84abf14a24f38"/><dir name="Comment"><file name="Collection.php" hash="c185ec12bd5e2bceee51ce6038c02776"/></dir><file name="Comment.php" hash="63b5fad6fbd263928e1fb5917fc04172"/><dir name="Grid"><file name="Collection.php" hash="258269175792f51bddc85fb3c8930d80"/></dir><dir name="Item"><file name="Collection.php" hash="4ad0cc2456567e821d1a99478bd89212"/></dir><file name="Item.php" hash="9ba0e0b9be56aa3812a51683f9fdf422"/></dir><file name="Creditmemo.php" hash="af125788908439d3c8e0b038af166fb1"/><dir name="Grid"><file name="Collection.php" hash="dda047386011a00fb2340eaaee0d1e48"/></dir><dir name="Invoice"><dir name="Attribute"><dir name="Backend"><file name="Child.php" hash="142f38f6ff58f18d0d403ea9a44e4852"/><file name="Item.php" hash="42a8604d0c61a0d6b04124fdfd4e7384"/><file name="Order.php" hash="b672855cc69c1276f285c05b009af5e9"/><file name="Parent.php" hash="fb901af0e65d0382b0451c0375fda894"/></dir></dir><file name="Collection.php" hash="6bb8cc14b45ec00b218770f6f429db18"/><dir name="Comment"><file name="Collection.php" hash="89365d3ea9d1817d0ba5707ea5f8f60e"/></dir><file name="Comment.php" hash="372beebe081e537d4837cd2ab89d0da0"/><dir name="Grid"><file name="Collection.php" hash="0f203bfde746136f5c08688b2ec1bdf1"/></dir><dir name="Item"><file name="Collection.php" hash="096c0a890a6ce76900e8b640bdef4cbb"/></dir><file name="Item.php" hash="a59176d4b89deb3c9a7523db6cdb890f"/></dir><file name="Invoice.php" hash="665b61ff6a29e8ea59b7ca918890291a"/><dir name="Item"><file name="Collection.php" hash="62ba018017a8908478bf1efb39662b40"/></dir><file name="Item.php" hash="78e4cc62c73cedc68d1b9f2eb85badc3"/><dir name="Payment"><file name="Collection.php" hash="394854020d198ac30e2fd9e0e41d2008"/><dir name="Transaction"><file name="Collection.php" hash="5ef74f60a5fdb28d232148ad233817f4"/></dir><file name="Transaction.php" hash="6de5fa2beb04c4d7a86e5eec1f782499"/></dir><file name="Payment.php" hash="65bf1cf8dee902410067b4562ed2cd24"/><dir name="Shipment"><dir name="Attribute"><dir name="Backend"><file name="Child.php" hash="ec082c789f16f3ecc0eb39b70b611b3b"/><file name="Parent.php" hash="9619322e8c5aaeab4ba48d03c8ff7e55"/></dir></dir><file name="Collection.php" hash="e1efc1d9da2feccea03bf9dcbd139407"/><dir name="Comment"><file name="Collection.php" hash="4d1db0dabb28960a953b74a4c3b2ea03"/></dir><file name="Comment.php" hash="e5650a7235991ec395bf7fec018c3f9d"/><dir name="Grid"><file name="Collection.php" hash="79afe40956c7004c5f53f66679819085"/></dir><dir name="Item"><file name="Collection.php" hash="448e12a9faef64a0aeb5ce7900ac2e40"/></dir><file name="Item.php" hash="48008c49afe3d441ba2c84f19b2a0093"/><dir name="Track"><file name="Collection.php" hash="29960ae8bbade4a8fa5e21b5dbdcf2da"/></dir><file name="Track.php" hash="2188fb4705def80fcdc29b31b9e6fcd6"/></dir><file name="Shipment.php" hash="e9768724dace7c600b31e97730c300f1"/><dir name="Status"><file name="Collection.php" hash="a8bd7f557c8a08cf12df913e35306138"/><dir name="History"><file name="Collection.php" hash="aa16e025ad649fbc5b832b8b89d62a4a"/></dir><file name="History.php" hash="a76a35d29d1fd2869b9fc17f9d7b86c1"/></dir><file name="Status.php" hash="fda21503949180742d4280d7fdc580e1"/><dir name="Tax"><file name="Collection.php" hash="36954f1a1c3fb8b35aa7b1f3cec7d4d0"/></dir><file name="Tax.php" hash="d4745c233803a91cc8f4316b63bc9f61"/></dir><file name="Order.php" hash="40ee6cdea14682142a7ebd12b60487c3"/><dir name="Quote"><dir name="Address"><dir name="Attribute"><dir name="Backend"><file name="Child.php" hash="5abc3338c2d7db40aade669727544f59"/><file name="Parent.php" hash="e2caeca8114e64ce04cb519c240cd0e4"/><file name="Region.php" hash="34f069f3e95692b9f34609397f2618d4"/></dir><file name="Backend.php" hash="14700b0cec55b7f3c311897edebf9a47"/><dir name="Frontend"><file name="Custbalance.php" hash="ee638c4c27f7958281443cd1203fed4d"/><file name="Discount.php" hash="10851ec7a1023af38493121e34feaca0"/><file name="Grand.php" hash="8b7fe12e4440d2a41570be9333e94af1"/><file name="Shipping.php" hash="144296835d49f22ba5efd0754d661478"/><file name="Subtotal.php" hash="446905955d44771b7fcf014efd1be3e6"/><file name="Tax.php" hash="014748dd5d7a2f1b3c95417b7a4452d0"/></dir><file name="Frontend.php" hash="eee3eb15c8813b14a58504d5488a49d2"/></dir><file name="Collection.php" hash="967398dafa2523497e46bbad3751ba84"/><dir name="Item"><file name="Collection.php" hash="34d01f6c061fd431588a554a806ec04d"/></dir><file name="Item.php" hash="04b737a40b64c090c8d5b702271c263a"/><dir name="Rate"><file name="Collection.php" hash="8277e39f773174afc28eb7298dcbcf36"/></dir><file name="Rate.php" hash="ef2db701e0b81e14afd1871c584ae76b"/></dir><file name="Address.php" hash="3879b22837a8af256ab2caed7f77c328"/><file name="Collection.php" hash="fe51430903c77b924cc1f755e4f0179e"/><dir name="Item"><file name="Collection.php" hash="f286a4136041f92b9b5c71474dd3d997"/><dir name="Option"><file name="Collection.php" hash="12f805a396e26d3cfd618dd60f114d7f"/></dir><file name="Option.php" hash="2e58a20ff8a0c946b1a6decd71a72f63"/></dir><file name="Item.php" hash="6091b3595b06b5f42dd76dd8839d40b8"/><dir name="Payment"><file name="Collection.php" hash="f745ae2bc0602a381c2a6a3365450e7f"/></dir><file name="Payment.php" hash="56d621bee328306d2a3a9ac5e9b8da56"/></dir><file name="Quote.php" hash="0c5088f86c4cfae07a93e1ca7767bebf"/><dir name="Recurring"><dir name="Profile"><file name="Collection.php" hash="79875bab853b2f3c659bf33345f0b33d"/></dir><file name="Profile.php" hash="5c5285cf1fe7268f2135595b21380c9d"/></dir><dir name="Report"><file name="Abstract.php" hash="332b8ce3ed8f2293bdc934d637c3a491"/><dir name="Bestsellers"><file name="Collection.php" hash="4355e5e9c7fe83a3646c084f1947b1ea"/></dir><file name="Bestsellers.php" hash="4feea5e8f6e1f6d9666d49d259687b66"/><dir name="Collection"><file name="Abstract.php" hash="96d7fad23628ddadf2278e81dfaf24d8"/></dir><dir name="Invoiced"><dir name="Collection"><file name="Invoiced.php" hash="e6d635f272e970227b88fce09a6926fc"/><file name="Order.php" hash="5c866625639c6c60ee54124a400c2c70"/></dir></dir><file name="Invoiced.php" hash="23536b9a08f9add5c0e4a0d56a3bbe88"/><dir name="Order"><file name="Collection.php" hash="690b58217bc4056f73931d7c959e2141"/><file name="Createdat.php" hash="1718880b15efc91fc517a189b2e42a8c"/><dir name="Updatedat"><file name="Collection.php" hash="ae8eeeaba903e8e20b5e83b3ab94f35a"/></dir><file name="Updatedat.php" hash="1ba8fa75f1b253cdb2b3648a3fcc7ba3"/></dir><file name="Order.php" hash="59a840d296fc3231f6f9f56095644cad"/><dir name="Refunded"><dir name="Collection"><file name="Order.php" hash="a64c74a5e0e1f0ed15b3b920f7d50110"/><file name="Refunded.php" hash="2944216473831d884baf008c3bddaa5d"/></dir></dir><file name="Refunded.php" hash="4cb798ff1fb8b5a962deab0bc7519e3a"/><dir name="Shipping"><dir name="Collection"><file name="Order.php" hash="c40fbd1690f888058f2c984cd5e06898"/><file name="Shipment.php" hash="da422bf0ef86a63e966f30f1a9101fa4"/></dir></dir><file name="Shipping.php" hash="573a3cf436618fa8469770ee862c88b3"/></dir><file name="Report.php" hash="2f448aa355aba0c596d32e904c53dc1b"/><dir name="Sale"><file name="Collection.php" hash="c05e5cf2051874339652e84e286b1076"/></dir><file name="Setup.php" hash="4a0e245c700aab11b35638a246071b64"/></dir><dir name="Service"><file name="Order.php" hash="91dbb41dd2d829190716757a3640482a"/><file name="Quote.php" hash="fdfdc063f47d2ea933086c78741c8b36"/></dir><dir name="Status"><file name="List.php" hash="be1b304c8efe2c6f0c1d8ca5c3119e03"/></dir></dir><dir name="sql"><dir name="sales_setup"><file name="install-1.6.0.0.php" hash="b98abf3de6eb15f1b907f17b7c58bb92"/><file name="mysql4-install-0.7.0.php" hash="4b9a1e3cdf78707209871e12b4aa5066"/><file name="mysql4-install-0.8.11.php" hash="2b36df3df070e5d0572f2b9d49bee9f9"/><file name="mysql4-install-0.9.0.php" hash="465403c6100fd4bf42214c0693f71b73"/><file name="mysql4-install-1.4.0.0.php" hash="00b0f75293d649b1c71478d02364ed29"/><file name="mysql4-upgrade-0.6.2-0.7.0.php" hash="beab1065e53f27e1265e4734a142336a"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="212b06e70c37b4d1f536df665c463c40"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="c8254f51f628da9aa0b78e10b9069ed6"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="75760549a73d983e6221e744b30af7bc"/><file name="mysql4-upgrade-0.7.9-0.7.10.php" hash="375bf2c3335b19883f2e9e67511bb568"/><file name="mysql4-upgrade-0.8.0-0.8.1.php" hash="e6ee07cacecb386ace8ab39809b1ff9c"/><file name="mysql4-upgrade-0.8.1-0.8.2.php" hash="f5c53299875982d878fccf1cbcd7321e"/><file name="mysql4-upgrade-0.8.11-0.8.12.php" hash="23f1b680a0918171e71ce2d916e72513"/><file name="mysql4-upgrade-0.8.12-0.8.13.php" hash="da3bf8ed52f46b4372922c4e192c6468"/><file name="mysql4-upgrade-0.8.13-0.8.14.php" hash="561e4fb75aa6b6401e818e9c3c3e57e5"/><file name="mysql4-upgrade-0.8.14-0.8.15.php" hash="a0cb24425aa5a5a630b1b5e90264369a"/><file name="mysql4-upgrade-0.8.15-0.8.16.php" hash="5fcecac61c47ce3a82d6f1be7ff4cdf1"/><file name="mysql4-upgrade-0.8.16-0.8.17.php" hash="ec3bd339361fefff5cbee488bf165641"/><file name="mysql4-upgrade-0.8.17-0.8.18.php" hash="2d96dfea29a14ae93a15449e0f41f705"/><file name="mysql4-upgrade-0.8.18-0.8.19.php" hash="dbe5fb519c8b66c9042616283c1aee16"/><file name="mysql4-upgrade-0.8.19-0.8.20.php" hash="679b9423ba09ef07cc256e2d5daaa2f4"/><file name="mysql4-upgrade-0.8.20-0.8.21.php" hash="d9525600331fba32f27a6e2793b17848"/><file name="mysql4-upgrade-0.8.2-0.8.3.php" hash="c5ce1fa44d09de71d09e37fd5cca5134"/><file name="mysql4-upgrade-0.8.21-0.8.22.php" hash="7f4c696e155063f9f14bba5483a128aa"/><file name="mysql4-upgrade-0.8.22-0.8.23.php" hash="f46c800286bc2a85f5ab0ad9332dc89c"/><file name="mysql4-upgrade-0.8.23-0.8.24.php" hash="ea81dc0b1542a96317cf9a3ca6810b3b"/><file name="mysql4-upgrade-0.8.24-0.8.25.php" hash="16000b70fbb9bdc6be05c5ad9872aa10"/><file name="mysql4-upgrade-0.8.25-0.8.26.php" hash="3d2db72f51da1c8e3231df393b4f8615"/><file name="mysql4-upgrade-0.8.26-0.8.27.php" hash="d3870bfa2dd11317988d2bebb9a689f1"/><file name="mysql4-upgrade-0.8.27-0.8.28.php" hash="a92fd349f673e6cf2c7575c2c21d0909"/><file name="mysql4-upgrade-0.8.28-0.8.29.php" hash="d34d7c9e5e89ef5ed89490902b4e4dae"/><file name="mysql4-upgrade-0.8.29-0.9.0.php" hash="afefeaa33d7456ce3d65baeff06d3017"/><file name="mysql4-upgrade-0.8.3-0.8.4.php" hash="243594ac5d193d391ef63a089a990173"/><file name="mysql4-upgrade-0.8.6-0.8.7.php" hash="c5ce1fa44d09de71d09e37fd5cca5134"/><file name="mysql4-upgrade-0.8.7-0.8.8.php" hash="fdb96a8440868633b438917df8997e19"/><file name="mysql4-upgrade-0.8.8-0.8.9.php" hash="6732b0d0b0f68b5c65edde9a68952a2e"/><file name="mysql4-upgrade-0.9.0-0.9.1.php" hash="8a05f9548f1e987f03d556bcf0de426e"/><file name="mysql4-upgrade-0.9.10-0.9.11.php" hash="023c3db0357f42d6a7bd0751443b1ac4"/><file name="mysql4-upgrade-0.9.1-0.9.2.php" hash="d66cf931a3e08f4519ec3f7d00abf20f"/><file name="mysql4-upgrade-0.9.11-0.9.12.php" hash="b81009bb934c54ca68840f30e036f826"/><file name="mysql4-upgrade-0.9.12-0.9.13.php" hash="4ae0c5d67aadb79ded08113c4ead9e4d"/><file name="mysql4-upgrade-0.9.13-0.9.14.php" hash="d623f354da09f2225b8f7875505bbea8"/><file name="mysql4-upgrade-0.9.14-0.9.15.php" hash="95f85b386278819bba86017b871a55f6"/><file name="mysql4-upgrade-0.9.15-0.9.16.php" hash="d9ef049aa50ca89e600c6ab653633f62"/><file name="mysql4-upgrade-0.9.16-0.9.17.php" hash="a2c816508326ae16481a9bdbedeb21a1"/><file name="mysql4-upgrade-0.9.17-0.9.18.php" hash="97874c4308ced0bf894096ac6dcdf92a"/><file name="mysql4-upgrade-0.9.18-0.9.19.php" hash="1465c8ca5936d55028cbedc92f4611ad"/><file name="mysql4-upgrade-0.9.19-0.9.20.php" hash="e2eee984bef15830fb20ff1ce3305da7"/><file name="mysql4-upgrade-0.9.20-0.9.21.php" hash="bb84ad1111741ee18c099942c48043d1"/><file name="mysql4-upgrade-0.9.2-0.9.3.php" hash="0c37cf2c00a873bca3c6caea5ac070b3"/><file name="mysql4-upgrade-0.9.21-0.9.22.php" hash="bf927dde2181a1015830fc00bf05b092"/><file name="mysql4-upgrade-0.9.22-0.9.23.php" hash="a2659f70b2c73eeb1e6cd483d3dd9cc5"/><file name="mysql4-upgrade-0.9.23-0.9.24.php" hash="30d40247c45aeebcdca7602ac9c2d5c0"/><file name="mysql4-upgrade-0.9.24-0.9.25.php" hash="21db05a38f350d21fd87877388c09b40"/><file name="mysql4-upgrade-0.9.25-0.9.26.php" hash="004bce6f5c72a5b23333a845eec17439"/><file name="mysql4-upgrade-0.9.26-0.9.27.php" hash="845a503a66b530e0e217906a8eeaac77"/><file name="mysql4-upgrade-0.9.27-0.9.28.php" hash="a09d3916621f9045533c94b803593ca0"/><file name="mysql4-upgrade-0.9.28-0.9.29.php" hash="5fb2e735ef6b9ce799c2dcba209f16b7"/><file name="mysql4-upgrade-0.9.29-0.9.30.php" hash="9b286e17508e4846dd8de1162cad688d"/><file name="mysql4-upgrade-0.9.30-0.9.31.php" hash="f52304769317e715da824fabfb8c4d78"/><file name="mysql4-upgrade-0.9.3-0.9.4.php" hash="323ab2535384c3b3ff309e6c51485688"/><file name="mysql4-upgrade-0.9.31-0.9.32.php" hash="2f9a94b5603d828d4507f3ff9f5e2764"/><file name="mysql4-upgrade-0.9.32-0.9.33.php" hash="7e2117e44a7d1632fea2302016055b7b"/><file name="mysql4-upgrade-0.9.33-0.9.34.php" hash="78e35c53e6a5953c7c7bccbaa23fdbb7"/><file name="mysql4-upgrade-0.9.34-0.9.35.php" hash="120d02a930fb1e7a81d6866b3433ee24"/><file name="mysql4-upgrade-0.9.35-0.9.36.php" hash="5cd4071357986be36b28a9452ee90343"/><file name="mysql4-upgrade-0.9.36-0.9.37.php" hash="cb739343e58e69b65988d5389b5e99ef"/><file name="mysql4-upgrade-0.9.37-0.9.38.php" hash="d141a6245094bdd705473d18368070f5"/><file name="mysql4-upgrade-0.9.38-0.9.39.php" hash="3738cc7d46110210cf3a2d9e3a36a0a7"/><file name="mysql4-upgrade-0.9.39-0.9.40.php" hash="2d4b045a42666ec35734fef8f07c24ac"/><file name="mysql4-upgrade-0.9.40-0.9.41.php" hash="f4692aa7e894b48e205d2a51bb87abc2"/><file name="mysql4-upgrade-0.9.4-0.9.5.php" hash="9612aec0a082aaea1c71c4e5ad2bf297"/><file name="mysql4-upgrade-0.9.41-0.9.42.php" hash="12c15a8ddc10e167e61c46537b1193a3"/><file name="mysql4-upgrade-0.9.42-0.9.43.php" hash="55d333fb1aa66ce469320521f33624b8"/><file name="mysql4-upgrade-0.9.43-0.9.44.php" hash="afa60732bf868e2f441e6c2edfbf7b4b"/><file name="mysql4-upgrade-0.9.44-0.9.45.php" hash="ba15674857476bb15c51086912790a22"/><file name="mysql4-upgrade-0.9.45-0.9.46.php" hash="dccdb1bc407e413ee627abba93147acd"/><file name="mysql4-upgrade-0.9.46-0.9.47.php" hash="18c1ddb8f1beaac0a33f3fd48a0fcd10"/><file name="mysql4-upgrade-0.9.47-0.9.48.php" hash="20c8629f9f98f6a83e61490c62252c81"/><file name="mysql4-upgrade-0.9.48-0.9.49.php" hash="97baa6b0724357de2d9f525ef598b2ef"/><file name="mysql4-upgrade-0.9.49-0.9.50.php" hash="9559e5e5afd6e3b1f3a781a9fb723b59"/><file name="mysql4-upgrade-0.9.50-0.9.51.php" hash="2390a47e7d5f807425360e446c88f8b2"/><file name="mysql4-upgrade-0.9.5-0.9.6.php" hash="8791e9c2c594bd6005f3e83ff79da6ea"/><file name="mysql4-upgrade-0.9.51-0.9.52.php" hash="ab22ce4dcfae09a82c4ba4741b94b5fd"/><file name="mysql4-upgrade-0.9.52-0.9.53.php" hash="b438f2280db072a83ec96c6b70027313"/><file name="mysql4-upgrade-0.9.53-0.9.54.php" hash="d4add99e42c8433d5d139c973490a406"/><file name="mysql4-upgrade-0.9.54-0.9.55.php" hash="04eed526bd8dc639dba8d286b4f53e15"/><file name="mysql4-upgrade-0.9.55-0.9.56.php" hash="c6e5225b6a74faa96e3dee2e3ededd48"/><file name="mysql4-upgrade-0.9.6-0.9.7.php" hash="3b005e940d92ce2360a55ffe9ec25f2b"/><file name="mysql4-upgrade-0.9.7-0.9.8.php" hash="3a889d0bd51bb8d345bfb62f988168d0"/><file name="mysql4-upgrade-0.9.8-0.9.9.php" hash="c3a12268b0e90685fac4566fc43a85da"/><file name="mysql4-upgrade-0.9.9-0.9.10.php" hash="c83b56526b4bd24d5122be9de532be84"/><file name="mysql4-upgrade-1.3.99-1.4.0.0.php" hash="692255be7b28b3829ba37ab493fc575e"/><file name="mysql4-upgrade-1.4.0.0-1.4.0.1.php" hash="b2ac96298c9fc4e11d14b61ab54466a5"/><file name="mysql4-upgrade-1.4.0.1-1.4.0.2.php" hash="dcac057eeec4d9cb13b1d597686d9335"/><file name="mysql4-upgrade-1.4.0.15-1.4.0.16.php" hash="35d0ae339bcd0c741067bb9ae0ca89af"/><file name="mysql4-upgrade-1.4.0.16-1.4.0.17.php" hash="364143b23986f12a8bd40a62dce4524b"/><file name="mysql4-upgrade-1.4.0.17-1.4.0.18.php" hash="bc72bbd6c9ac93289431c8661938c1ac"/><file name="mysql4-upgrade-1.4.0.18-1.4.0.19.php" hash="796f4894e6a83b774ba37a66b54d50d2"/><file name="mysql4-upgrade-1.4.0.19-1.4.0.20.php" hash="b2f393e079c792b520c998355eb43997"/><file name="mysql4-upgrade-1.4.0.20-1.4.0.21.php" hash="4740fab098ae44794acd5994fa391cc9"/><file name="mysql4-upgrade-1.4.0.21-1.4.0.22.php" hash="b09db44659e37944cc55cd66b4f50dd2"/><file name="mysql4-upgrade-1.4.0.2-1.4.0.3.php" hash="48f1bb637e77ffd4a299bb8b38ee2276"/><file name="mysql4-upgrade-1.4.0.22-1.4.0.23.php" hash="4ec185d4510410034862bf69a87e1e7e"/><file name="mysql4-upgrade-1.4.0.23-1.4.0.24.php" hash="f70da1e0fcc9300cfa6c2bab30d560ea"/><file name="mysql4-upgrade-1.4.0.24-1.4.0.25.php" hash="153d4a3c81c8da5e021c149d6e90fcad"/><file name="mysql4-upgrade-1.4.0.3-1.4.0.4.php" hash="e431c07ca779465bd4a9e2d67628b62c"/><file name="mysql4-upgrade-1.4.0.4-1.4.0.5.php" hash="f7e976ddb517f17915f7b0f00bef0db5"/><file name="mysql4-upgrade-1.4.0.5-1.4.0.6.php" hash="bca5b279dda968d7394634438f68dae0"/><file name="mysql4-upgrade-1.4.0.6-1.4.0.7.php" hash="6253c6f6e8bb53e31d6a13af5f57fdd9"/><file name="mysql4-upgrade-1.4.0.7-1.4.0.8.php" hash="f091cf1bdb6685ca46eda523348a58b7"/><file name="mysql4-upgrade-1.4.0.8-1.4.0.15.php" hash="a26acb42f1df21b9a7c66de4697d1fec"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="710ccbd8fabe6bbffc37f1a63f9bf00e"/><file name="upgrade-1.6.0.0-1.6.0.1.php" hash="a8de44ceeaacebe522527f7c0779a7ae"/><file name="upgrade-1.6.0.1-1.6.0.2.php" hash="2aaa781b48b218c6a521a2a62c1bcba9"/><file name="upgrade-1.6.0.2-1.6.0.3.php" hash="2c4efa267e6e2cf90d7ab10f621e0d05"/><file name="upgrade-1.6.0.3-1.6.0.4.php" hash="024f5cb104f1b5de3f17d4b6189a1ea0"/><file name="upgrade-1.6.0.4-1.6.0.5.php" hash="94a5df5b1bfaf77748885076d0513925"/><file name="upgrade-1.6.0.5-1.6.0.6.php" hash="52d95387429b6dea5f8098125040b527"/><file name="upgrade-1.6.0.6-1.6.0.7.php" hash="c1a4e058656250b2221592d19a934aba"/><file name="upgrade-1.6.0.7-1.6.0.8.php" hash="5b04f0ba003e86309b59074c22495370"/></dir></dir></dir><dir name="SalesRule"><dir name="etc"><file name="adminhtml.xml" hash="ff93916bff1520bf5730e44bd16a90ca"/><file name="config.xml" hash="7afccbc8bcb0de4b276ec3c48e0f8f97"/><file name="system.xml" hash="ac643808a027d20a3cbc7316e5814e28"/></dir><file name="Exception.php" hash="a409d238cb2af66dc6f6b519ecec7cee"/><dir name="Helper"><file name="Coupon.php" hash="076661d433396d356704898fcede0ee4"/><file name="Data.php" hash="929a01bb7c298f09fade127f9a96a803"/></dir><dir name="Model"><dir name="Coupon"><file name="CodegeneratorInterface.php" hash="90dc22bd0d834fc6235c044c0d5a317a"/><file name="Codegenerator.php" hash="2a15fd1d5e15b8bdba3bd67c1ce00ab3"/><file name="Massgenerator.php" hash="54cf39978eddd79e90b52e8265ac93a1"/></dir><file name="Coupon.php" hash="ee82ad96128e2601efcdf6146032b503"/><dir name="Mysql4"><dir name="Coupon"><file name="Collection.php" hash="57e126d7c6a2456b20b51aa88054e862"/><file name="Usage.php" hash="9ce34d8783aaeaa4bd72ca46ba55424e"/></dir><file name="Coupon.php" hash="157c5b261db576e649fb00f4d11bc3b9"/><dir name="Report"><file name="Collection.php" hash="b28fc2de6f150ff180af2e358983f740"/><file name="Rule.php" hash="0965e501097c69da140a7852d9c5fa2d"/><dir name="Updatedat"><file name="Collection.php" hash="23a977b7151b30f28d3ddd778447c166"/></dir></dir><dir name="Rule"><file name="Collection.php" hash="757f49b5e7d79f2986cb6b93a53de2f3"/><dir name="Customer"><file name="Collection.php" hash="1361ad61dc0b5ffe5369596281916db8"/></dir><file name="Customer.php" hash="c7eccda260e18353414fc3154a7539e8"/><dir name="Product"><file name="Collection.php" hash="eb7d191db6ee5d456efaab94c29950e9"/></dir><file name="Product.php" hash="5a59acf4be1d2b4468aaece3d8ad2c09"/></dir><file name="Rule.php" hash="20ed1f0250038d66e1b96ea8195596f5"/></dir><file name="Observer.php" hash="dbb153ec2c913a163e7a236b4e2f8036"/><dir name="Quote"><file name="Discount.php" hash="b2089e266c907ca0ba51d6baee61619f"/><file name="Freeshipping.php" hash="1ebfc63207c3d27d79d5efa396de8f5a"/><dir name="Nominal"><file name="Discount.php" hash="b5e67125975bdcb9e53d641f6a0820c5"/></dir></dir><dir name="Resource"><dir name="Coupon"><file name="Collection.php" hash="6dda38b5688cb5ccac05ef7df8a6f753"/><file name="Usage.php" hash="08a551cba66f643e7de9404ad679e136"/></dir><file name="Coupon.php" hash="4c811df3792b33bf22bfd4c897357b4e"/><dir name="Report"><file name="Collection.php" hash="febe21862758025f362f4bdc2e6d4918"/><dir name="Rule"><file name="Createdat.php" hash="586dc29714e31865b29d9a0cac78948c"/><file name="Updatedat.php" hash="9bcb12ae4c44334f466be7372fd9c14a"/></dir><file name="Rule.php" hash="130d0727a98b3998c1d2ce76a38502d2"/><dir name="Updatedat"><file name="Collection.php" hash="e4edb856726c667985b7a0b7b6f1556b"/></dir></dir><dir name="Rule"><file name="Collection.php" hash="57368e21768358b34197092c2b3a3fcb"/><dir name="Customer"><file name="Collection.php" hash="9debd1d149568e48e83a2ed58578f495"/></dir><file name="Customer.php" hash="9d19d5a220bb2f10fe8c5462a3172c99"/><dir name="Product"><file name="Collection.php" hash="557ba4a92c17da54a7381ab69444c7c8"/></dir><file name="Product.php" hash="3ab0edcf3e175350f8b6bba179babd0c"/></dir><file name="Rule.php" hash="1c0980a1689c6299a8a52798501b1372"/></dir><dir name="Rule"><dir name="Action"><file name="Collection.php" hash="212889f3d946a8e798f471064d2046ce"/><file name="Product.php" hash="a72880d06ab690b3d4a007fce563a7af"/></dir><dir name="Condition"><file name="Address.php" hash="646b1c6a6ce277ab4af82456f87395be"/><file name="Combine.php" hash="ec8ab6d2df7e11f855b6fca7378d8a45"/><dir name="Product"><file name="Combine.php" hash="258d28cc4bdcfa9ad115969df0bb1bfe"/><file name="Found.php" hash="a67b3c470b855ce16ff98b638622df2a"/><file name="Subselect.php" hash="8eaecb6dfd5dfe9f95b3c137707eaf58"/></dir><file name="Product.php" hash="84cd47fc995d00a51d74eea5821cc39f"/></dir><file name="Customer.php" hash="209ae6365ca1d20b673b19185519e033"/><file name="Product.php" hash="198914e09b8478af575dc8705e9d90ba"/></dir><file name="Rule.php" hash="348c9fbed3ef437e1e4ed3e4614d10fd"/><dir name="System"><dir name="Config"><dir name="Source"><dir name="Coupon"><file name="Format.php" hash="7cb7aa6d341c2b927d6244d425bb0d69"/></dir></dir></dir></dir><file name="Validator.php" hash="744358396ec8fe1989ec7cf14bdd6737"/></dir><dir name="sql"><dir name="salesrule_setup"><file name="install-1.6.0.0.php" hash="698861afe0a373b8f559fb65477e8567"/><file name="mysql4-install-0.7.0.php" hash="4903cce758e16ff75dc7c12b590fcde9"/><file name="mysql4-install-1.4.0.0.0.php" hash="16684ede3995614979b75be2bf0d6025"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="75c35d8d93e22d212c0fe35d34f988a9"/><file name="mysql4-upgrade-0.7.10-0.7.11.php" hash="dcb292017db900eb638cff6ef613334d"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="1cc1a69ae2343c0121e60451bd00c2cf"/><file name="mysql4-upgrade-0.7.11-0.7.12.php" hash="bff6bfb3a8d0e6cbf4aac3c5d7d19771"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="3921056a40f3bba72eb8a3239849a4fb"/><file name="mysql4-upgrade-0.7.3-0.7.4.php" hash="8b3c2b7517393c38570b40ec2cf091c2"/><file name="mysql4-upgrade-0.7.4-0.7.5.php" hash="1b9bd67484b0ef6f2a91932c74c07cd5"/><file name="mysql4-upgrade-0.7.5-0.7.6.php" hash="ecf1285f37d3d66ff740b699488f6e79"/><file name="mysql4-upgrade-0.7.6-0.7.7.php" hash="f5a543fe35340290a07cbb57141b7e02"/><file name="mysql4-upgrade-0.7.7-0.7.8.php" hash="d5ec2cf90b1ebd178ed8ab2fc4b1edd9"/><file name="mysql4-upgrade-0.7.8-0.7.9.php" hash="60d53600cd2842b1e6037048e9ecae04"/><file name="mysql4-upgrade-0.7.9-0.7.10.php" hash="c0594b066de6cc9c581b49f6468b4843"/><file name="mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php" hash="b0903816ba4b446193d8a2710d52fa30"/><file name="mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php" hash="103484c82bc780497c17e8d30f6b5534"/><file name="mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php" hash="393edb2b3be82e7f75d4abd5f512aac6"/><file name="mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php" hash="11536328006166db5ecaed659691c654"/><file name="mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php" hash="f7da41eca333930247692a3a8df19546"/><file name="mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php" hash="a8aedcd0481b69c4a4743ca2dfd47af6"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="a75d6ca93798f42234bfdc5ce5c9e1ce"/><file name="upgrade-1.6.0.0-1.6.0.1.php" hash="ec2a8581cd420e4d323a82d3b4e20cd4"/><file name="upgrade-1.6.0.1-1.6.0.2.php" hash="39855fbe53640fe1f6e28cb114f76222"/><file name="upgrade-1.6.0.2-1.6.0.3.php" hash="9662353b312ad408f1ffd07dd51f4b27"/></dir></dir></dir><dir name="Sendfriend"><dir name="Block"><file name="Send.php" hash="e2b5745cc523434802ec2991b2904047"/></dir><dir name="controllers"><file name="ProductController.php" hash="bd3373fed47afe468a558b07e0364c12"/></dir><dir name="etc"><file name="config.xml" hash="f55b9e46645c7278dd1edea2af5f3779"/><file name="system.xml" hash="edbdee5e2ebe73438c90f9138c4ba09e"/></dir><dir name="Helper"><file name="Data.php" hash="4d3b820259b22472496bb9f73efe8e06"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Sendfriend"><file name="Collection.php" hash="fe3ced4f6b4aa4ab2fc2d641a1b44773"/></dir><file name="Sendfriend.php" hash="7195ec9a036a80ca6c5210751426c1d5"/><file name="Setup.php" hash="45cabaf79c4e62b778e0ad5d71363d78"/></dir><file name="Observer.php" hash="07e811348a56a9c655636b04146b947e"/><dir name="Resource"><dir name="Sendfriend"><file name="Collection.php" hash="8a01d00c6e572affda88b04df79f25b8"/></dir><file name="Sendfriend.php" hash="704694d2c2d5e2d994cc867d199f4b8b"/><file name="Setup.php" hash="383dcd85cc092214027e759fc33a0140"/></dir><file name="Sendfriend.php" hash="d5ed0964b697ca6bb3cecc9dd953c5ee"/></dir><dir name="sql"><dir name="sendfriend_setup"><file name="install-1.6.0.0.php" hash="53f2a780abfe4abf405f1e5c3b034e5a"/><file name="mysql4-install-0.7.0.php" hash="eb4c3df29d60bd4f6881421c4d7e37c2"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="80b037e0b717d97ad0d58b6a0ad0c98f"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="dc6ba7cabe9ba72dec8d0fb1a1cd4373"/><file name="mysql4-upgrade-0.7.3-0.7.4.php" hash="09c638f845ac7fbe8d586afe5c3d466b"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="37da2fcc56fd7a5146052c55effbb1a9"/></dir></dir></dir><dir name="Shipping"><dir name="Block"><dir name="Tracking"><file name="Ajax.php" hash="7686ab1d93520de9ebcaff5cda30791c"/><file name="Popup.php" hash="1e9babea1817ec28faa24657fb5d2f30"/></dir></dir><dir name="controllers"><file name="ShippingController.php" hash="949df82f1838565f8a1fb8af951397aa"/><file name="TrackingController.php" hash="b6e0d0be429af3d5b787d3aafabfb14b"/></dir><dir name="etc"><file name="adminhtml.xml" hash="db2375486ac500b756e59752ec256980"/><file name="config.xml" hash="0050f0736ab73f63b64a196a4d7c183f"/><file name="system.xml" hash="948f18c4e2f472f185becf448912ea8a"/></dir><file name="Exception.php" hash="882248ea959efbf84a8996902772c645"/><dir name="Helper"><file name="Data.php" hash="9953784509cb1a9e62ef4103585a5847"/></dir><dir name="Model"><dir name="Carrier"><file name="Abstract.php" hash="5be2be60a5722a298d7dd17b6546e287"/><file name="Flatrate.php" hash="4b431236510b4c72c5d7e7a4c34d3afb"/><file name="Freeshipping.php" hash="b4b77452ce4fd8c6174db2a3653e93a2"/><file name="Interface.php" hash="5fddefab850ca206ab6476c3868ea4f2"/><file name="Pickup.php" hash="42feda041aea6740362ba0e586a8c302"/><file name="Tablerate.php" hash="c8cfde307eb50129bf6b4a643a4703d1"/></dir><file name="Config.php" hash="5a5ed8afb5173825c8aa4f011a0392b1"/><file name="Info.php" hash="f44e7d42de59aeb4a194007b88df934e"/><dir name="Mysql4"><dir name="Carrier"><dir name="Tablerate"><file name="Collection.php" hash="70b33de2b6e2e03c539377bba090e82c"/></dir><file name="Tablerate.php" hash="c3e01a959796939cc7dac5eabb09c50e"/></dir></dir><dir name="Rate"><file name="Abstract.php" hash="63f7997d6298ebf86bcd917ade4d1f05"/><file name="Request.php" hash="450b67408f83d366154fd8085efb065a"/><dir name="Result"><file name="Abstract.php" hash="cd0ac38285c399ed9b57ae3644e3dd61"/><file name="Error.php" hash="cc1eff5ec956a04ba58c075e6f17cd55"/><file name="Method.php" hash="15f368a4d9da153b19d5e44395643f4e"/></dir><file name="Result.php" hash="493c2d3668e061211725cc4c1e33ea4d"/></dir><dir name="Resource"><dir name="Carrier"><dir name="Tablerate"><file name="Collection.php" hash="61ddddf6df1f42c359873f9d89204f7a"/></dir><file name="Tablerate.php" hash="ac12086fb986977fc9ddd1837de6ec7e"/></dir></dir><dir name="Shipment"><file name="Request.php" hash="d5391620172a22ed066af8181b4aa41d"/><file name="Return.php" hash="a29c9504d833cc119cdfdf7a12eb8e0e"/></dir><file name="Shipping.php" hash="2422229e12ac153e6eeea005dbd7e4d9"/><dir name="Source"><file name="HandlingAction.php" hash="71ae2035678e31890e4e4d0f3fd3a8d2"/><file name="HandlingType.php" hash="c30d5ff2c2be67b64d718fd27d6080dd"/></dir><dir name="Tracking"><dir name="Result"><file name="Abstract.php" hash="e0e0791dddac62fdf1539ee45cbaa8be"/><file name="Error.php" hash="eb5005dd4a6568cb7d598223dde7c9a0"/><file name="Status.php" hash="405a1d9a445dfdafa225dfeb1d9a4b75"/></dir><file name="Result.php" hash="dbd9ba830967809f7af471409e2e33df"/></dir></dir><dir name="sql"><dir name="shipping_setup"><file name="install-1.6.0.0.php" hash="28185965bfedc83ef2bf66857f64f31a"/><file name="mysql4-install-0.7.0.php" hash="a631f8b5a43af90b847cc123319b4d32"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="66f67b304d3174f075886bbb432758cd"/></dir></dir></dir><dir name="Sitemap"><dir name="etc"><file name="adminhtml.xml" hash="0b257eac32645ec0aa739f0c75968306"/><file name="config.xml" hash="7314bbdbc5c041c621b7958cd0eb77a9"/><file name="system.xml" hash="852e7ff6d07cacaa6463dedde3b1cf36"/></dir><dir name="Helper"><file name="Data.php" hash="3cb4143a8970445623e89092bebaf62e"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Catalog"><file name="Category.php" hash="231ebc544efc3416f80090d4c1e033a8"/><file name="Product.php" hash="999e159fc164c5a12bd74b884f0bf17b"/></dir><dir name="Cms"><file name="Page.php" hash="a9d114208f846b22df0ddb1c487f375b"/></dir><dir name="Sitemap"><file name="Collection.php" hash="ed5b1435e4062170105ea38e3a036a10"/></dir><file name="Sitemap.php" hash="ef8109d5a66414a7002373bd9b689c37"/></dir><file name="Observer.php" hash="8c6383fdd80a45d3b53a5e883b4a7fd5"/><dir name="Resource"><dir name="Catalog"><file name="Abstract.php" hash="8bf92d37248df8abcb2b41f4c290e541"/><file name="Category.php" hash="d6d051ede918ac943db1dd9ba09a8fb5"/><file name="Product.php" hash="653a11966b05802a2b76eb129d2f13e2"/></dir><dir name="Cms"><file name="Page.php" hash="a8f81fbefe527d2dbae688050cf75cee"/></dir><dir name="Sitemap"><file name="Collection.php" hash="7a3452d2dcf3a99e2347e535898a2d6a"/></dir><file name="Sitemap.php" hash="0fdfe75f60f1b4ba8c63fe15d9b95afe"/></dir><file name="Sitemap.php" hash="13d5fcecb49bae03df9693792f2b7b00"/></dir><dir name="sql"><dir name="sitemap_setup"><file name="install-1.6.0.0.php" hash="26c70b1a6af405d8345a308dd1788b3c"/><file name="mysql4-install-0.7.0.php" hash="e522cdb28dffa2468f53a30e52a250cc"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="d8b4671e0f309be995a1055d7848bcb9"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="1c7387e1ece649ca0e212dfbcd7b9290"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="7488b431eb50f2e4bfccadcc54941e8d"/></dir></dir></dir><dir name="Tag"><dir name="Block"><file name="All.php" hash="f33ead9ba0be3378feca5ba2c45059c9"/><dir name="Customer"><file name="Edit.php" hash="4ff989c4d46e866b3e522d54c01585b9"/><file name="Recent.php" hash="d6716a5fef4bb7aaefbf06ba8d26f872"/><file name="Tags.php" hash="95a2b1b7262cc8d2f95953c4ce8f4dc1"/><file name="View.php" hash="fa81ccff0aa437fae3400c257a3308b1"/></dir><file name="Popular.php" hash="0b057f325c6a1bc718d5c0ae6597d13b"/><dir name="Product"><file name="List.php" hash="998a74679d6fe5a7826777217c742344"/><file name="Result.php" hash="f2b02d37961335f779d21b43a0a8f6ff"/></dir></dir><dir name="controllers"><file name="CustomerController.php" hash="2b67cd860ff2023c70dae1a246ddace6"/><file name="IndexController.php" hash="4afe6ed35e16fc731d1144f2b787fe22"/><file name="ListController.php" hash="1142edb0164afcd7bfc39b3a1b07e8a9"/><file name="ProductController.php" hash="8d52a2fec606ab6dffe95abbdfb11d7d"/></dir><dir name="etc"><file name="adminhtml.xml" hash="7b407009828fe746ce57fd053b23b4ef"/><file name="api.xml" hash="e3a788fccb3b6c4db90457140a62cf68"/><file name="config.xml" hash="af266bf923b72f4a54ed1546e8a8cb32"/><file name="wsdl.xml" hash="e87343a710e0068dcc555ffc4b302a9b"/><file name="wsi.xml" hash="1d31787826a686590acf89ec2703b76e"/></dir><dir name="Helper"><file name="Data.php" hash="5cbc150b4cdec0c79ead34315ebaa285"/></dir><dir name="Model"><dir name="Api"><file name="V2.php" hash="f41142bd15cdf9d44e85af461cc2f93f"/></dir><file name="Api.php" hash="4e090a284dbebc7930a37e25ae74bd64"/><dir name="Entity"><dir name="Customer"><file name="Collection.php" hash="81aa0e6fe3c8e0a4c6e8b0739039bf8b"/></dir></dir><dir name="Indexer"><file name="Summary.php" hash="5d69f3ddd7b02f539031f6fd67209a46"/></dir><dir name="Mysql4"><dir name="Customer"><file name="Collection.php" hash="f01056bb8f3e3bbd7060d9d9729a274c"/></dir><dir name="Indexer"><file name="Summary.php" hash="a4c3918c38387d74c6ce04595811bc86"/></dir><dir name="Popular"><file name="Collection.php" hash="5231542fd8151d8181205a987d432376"/></dir><dir name="Product"><file name="Collection.php" hash="a01f4a872ede6b62dc3b8073161d664c"/></dir><dir name="Tag"><file name="Collection.php" hash="597b7b6ce09f9f3a6c702c9fcbd4b363"/><file name="Relation.php" hash="17a1f589cc3a9990ee898a1859a18059"/></dir><file name="Tag.php" hash="ef09e44a9a2c07510b896f45a7527d5c"/></dir><dir name="Resource"><dir name="Customer"><file name="Collection.php" hash="39f02126954abe5cef731d150cf95769"/></dir><dir name="Indexer"><file name="Summary.php" hash="da48f028113cea6ef75f2992f511e4a4"/></dir><dir name="Popular"><file name="Collection.php" hash="329debd9a048dffffd38fb9616896f2e"/></dir><dir name="Product"><file name="Collection.php" hash="52aa2f941e573670554787b1ccf63f8f"/></dir><dir name="Tag"><file name="Collection.php" hash="830c306564420664a6cb3882a05fd558"/><file name="Relation.php" hash="f02afc2e7ad327a0c6036a50a8aef05c"/></dir><file name="Tag.php" hash="79ea73ad81374d5c644d71b1cf0249bc"/></dir><file name="Session.php" hash="fa30f7e00923092a61a8852070bf13b0"/><dir name="Tag"><file name="Relation.php" hash="2fa7d3a3639e4d0cc2625a7e6de97fa8"/></dir><file name="Tag.php" hash="3d6fe943d6fe4c5b27873f7c33b3bee2"/></dir><dir name="sql"><dir name="tag_setup"><file name="install-1.6.0.0.php" hash="a3bdc9923b026d832549dde7e02acae9"/><file name="mysql4-install-0.7.0.php" hash="7e9a4937f7f6d2777a2314d5c96a2402"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="f599b838e287953bd0640f006a4ea6fc"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="d9e16e8dcaf4a7cde3d321b752652c37"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="f6bd1ecde00bbd5708542fd4534475b2"/><file name="mysql4-upgrade-0.7.3-0.7.4.php" hash="766c6f284749f670daa3d2539bab29f7"/><file name="mysql4-upgrade-0.7.4-0.7.5.php" hash="fbbadfb2c7b7c3966a7d706ffebb5e5e"/><file name="mysql4-upgrade-0.7.5-0.7.6.php" hash="690ce463262f5c8b9c715562e6aa156c"/><file name="mysql4-upgrade-0.7.6-0.7.7.php" hash="0e018d2285990d35ecfe60c285ab86c7"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="81a7f78ab5d033b149a805b7539b9bf5"/></dir></dir></dir><dir name="Tax"><dir name="Block"><dir name="Adminhtml"><dir name="Frontend"><dir name="Region"><file name="Updater.php" hash="4a12ba8b7ac01061a61fad0d419fc935"/></dir></dir><file name="Notifications.php" hash="2957501473984d69da90ed00fea6e0c2"/></dir><dir name="Checkout"><file name="Discount.php" hash="e2269b837c9cb60b025d9770b52728b7"/><file name="Grandtotal.php" hash="a64ec9510b1d0b14682176fd85f85e3e"/><file name="Shipping.php" hash="ebcdcb12d38c53c150013e7a24dc3358"/><file name="Subtotal.php" hash="f600b189f8dc13c3915a87dc9a06cb7e"/><file name="Tax.php" hash="f8c85b475192aec3177891902b4a199f"/></dir><dir name="Sales"><dir name="Order"><file name="Tax.php" hash="109ad96d92a06e6b91c30278c95a0c69"/></dir></dir></dir><dir name="data"><dir name="tax_setup"><file name="data-install-1.6.0.0.php" hash="5057b3bfc095c1b69c8bb2ad8094272d"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="47244086a2c28390bbc49699590716e6"/><file name="config.xml" hash="2fa7538cf8805d9cd8e1f79ec2a05e48"/><file name="system.xml" hash="2f6dd5b5eb33af90b8576db7e07cc1f9"/></dir><file name="Exception.php" hash="514f96cf9fa5869e6ac150de54780758"/><dir name="Helper"><file name="Data.php" hash="c6aa314b3631f636460cdc66999d07eb"/></dir><dir name="Model"><dir name="Calculation"><dir name="Rate"><file name="Title.php" hash="33c1dee6bee5ded5fa6939db074684fb"/></dir><file name="Rate.php" hash="748c838f792539116a5d6e894cb07342"/><file name="Rule.php" hash="acb788d83f93893d023aedb9dab3a43c"/></dir><file name="Calculation.php" hash="dc021e22834a421fdaec9081d6cb2064"/><dir name="Class"><dir name="Source"><file name="Customer.php" hash="3ba36de54b7807c5b0f9ea767dbef870"/><file name="Product.php" hash="6186209f503da12bc419ea57cc3da888"/></dir></dir><file name="Class.php" hash="2c261ac2c1277fa16aa47fa6acf99678"/><dir name="Config"><file name="Notification.php" hash="df646d22401890c00055d4236f18e64e"/><dir name="Price"><file name="Include.php" hash="f1db83dc30d6b55b62f153208dc06c30"/></dir></dir><file name="Config.php" hash="bb312fd84616fee3dbeab82686e4b1fd"/><dir name="Mysql4"><dir name="Calculation"><file name="Collection.php" hash="726abf19554993c4418010f6f107f5ee"/><dir name="Rate"><file name="Collection.php" hash="76c6f3d66c0f5c5c8d2351bf4eb30286"/><dir name="Title"><file name="Collection.php" hash="5a3260596000a96e9d4bcb93e86503f3"/></dir><file name="Title.php" hash="133b6e3e7a1a301adb89af8f9f8c7fb9"/></dir><file name="Rate.php" hash="196ea7649a5435ff1264ec2540ab8ce8"/><dir name="Rule"><file name="Collection.php" hash="b8bc72ff6e19558181b1b77b21557f95"/></dir><file name="Rule.php" hash="4bd85d0313d4de14a5cf9306aedf550f"/></dir><file name="Calculation.php" hash="a72ad404e8725e835d6397597b8bb456"/><dir name="Class"><file name="Collection.php" hash="a8dcdfd45b29341877045ce28a6bc064"/></dir><file name="Class.php" hash="c60feb072ddc76ef7b1d32e17e530c09"/><dir name="Report"><file name="Collection.php" hash="8d3123f585d5132b76a0906acc86e4be"/><file name="Tax.php" hash="feda87174168b78fadbd0ad30155709b"/><dir name="Updatedat"><file name="Collection.php" hash="f718e5d8b8f4d14a310fd815ab309775"/></dir></dir><dir name="Sales"><dir name="Order"><dir name="Tax"><file name="Collection.php" hash="ee89d1eb1d80af25c4ed7a3ba71db245"/></dir><file name="Tax.php" hash="4f44cb2e8e4ba37cff97a6f84da9f19a"/></dir></dir><file name="Setup.php" hash="bbb4503f460eae53870e47012ee4e3d2"/></dir><file name="Observer.php" hash="94a6724e7ecb19988127d345c14a2635"/><dir name="Resource"><dir name="Calculation"><file name="Collection.php" hash="3488ae3a3b038379ae414fe47ab49008"/><dir name="Rate"><file name="Collection.php" hash="9786ea3b0b3d29bd58a4c63ada201eb4"/><dir name="Title"><file name="Collection.php" hash="8074eb6c2b8ff1430947fa0e1fab1338"/></dir><file name="Title.php" hash="3aedf9f4e6c02fd5b05c7b489588d53c"/></dir><file name="Rate.php" hash="27828f35658e1b229529f612a4cfc8e0"/><dir name="Rule"><file name="Collection.php" hash="a6a4b44fd4ce40118504c36ac422b00b"/></dir><file name="Rule.php" hash="1707a81fa27eb4345f31df3c5612abb9"/></dir><file name="Calculation.php" hash="224f3cdcb92d6dc4fd307626b7bf9c3d"/><dir name="Class"><file name="Collection.php" hash="6e4766b9462fde5c027d6951a85ea4a3"/></dir><file name="Class.php" hash="eb17406180d7c5caf26db4cb2e4a865d"/><dir name="Report"><file name="Collection.php" hash="6025dd20763c2f0dfb4b03fdbb6cbb0c"/><dir name="Tax"><file name="Createdat.php" hash="56ee659df4d6daa7a52935e3ed547e3f"/><file name="Updatedat.php" hash="310dca9a5c6cc3aad79b297bf551f434"/></dir><file name="Tax.php" hash="09778fabba158b5ebaf65a1961db9979"/><dir name="Updatedat"><file name="Collection.php" hash="56ef9467fe5c901b80419ae74f46e906"/></dir></dir><dir name="Sales"><dir name="Order"><dir name="Tax"><file name="Collection.php" hash="266d4c71fd3d509ff6de63b8e0c76b29"/><dir name="Item"><file name="Collection.php" hash="d7acfafd84f1b67ae13d318df9380a7b"/></dir><file name="Item.php" hash="6bf3beb3cfbc73e7a70e59c2cab150e2"/></dir><file name="Tax.php" hash="556d3a47e3600bd3a037e74f8b5217c7"/></dir></dir><file name="Setup.php" hash="dea9eb05203beaf15e1f56882e37908d"/></dir><dir name="Sales"><dir name="Order"><dir name="Tax"><file name="Item.php" hash="d4e1eda4a6f04e9770cfec6f69a0628c"/></dir><file name="Tax.php" hash="d5e907e598a149b8cc9ee2de81113334"/></dir><dir name="Pdf"><file name="Grandtotal.php" hash="901c80ad2eace96851bf1b1035f9b6b2"/><file name="Shipping.php" hash="bdd77301e3e4fa946332eb559f5d2b2d"/><file name="Subtotal.php" hash="50d7049c5606167dad5de300721c3e21"/><file name="Tax.php" hash="034069ce124fec2c2750925cfc1e9bb2"/></dir><dir name="Total"><dir name="Quote"><file name="Discount.php" hash="b4eb6edd384889a13025e56b39f0e386"/><dir name="Nominal"><file name="Subtotal.php" hash="45b5fa458cb8c663161bddcc73038678"/><file name="Tax.php" hash="f582b148d1437a54616edc872236a40b"/></dir><file name="Shipping.php" hash="6d90558d9128ec49924cef72ba4da234"/><file name="Subtotal.php" hash="e6c47786d8da475d5fd10cb3f0a64672"/><file name="Tax.php" hash="f93274dc238f3edd352507743e883b2a"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Algorithm.php" hash="6d60cb74ca6952a1e75a65f55226b50e"/><file name="Apply.php" hash="2699fbe85e46e56e6e72269360fae9d1"/><file name="PriceType.php" hash="bd6be14b14289d911b09ecbe87199736"/><dir name="Tax"><file name="Country.php" hash="553692c48e14a430acad401bbdf954a6"/><dir name="Display"><file name="Type.php" hash="4eb61d5b320c2a84c0a45c0a12f32090"/></dir><file name="Region.php" hash="e2ca1b139bfcb51f052b65c295dd330f"/></dir></dir></dir></dir></dir><dir name="sql"><dir name="tax_setup"><file name="install-1.6.0.0.php" hash="eaa73936a798d30c979d453497e85369"/><file name="mysql4-install-0.7.0.php" hash="68f057d9696cf8974b01940f1cb95a8a"/><file name="mysql4-install-1.4.0.0.php" hash="357b2d3a3a7768512fc346ee777dc711"/><file name="mysql4-upgrade-0.6.1-0.7.0.php" hash="16b906e86bcc49de1dbe928f9f0c92a0"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="bef0cd4b44be8b547f2a95683801c1cf"/><file name="mysql4-upgrade-0.7.10-0.7.11.php" hash="3a5412eccf0f965d3e31194333b0ef9d"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="5cf0706979dfb6b2526c3f3931bb1569"/><file name="mysql4-upgrade-0.7.11-0.7.12.php" hash="e5f4768e8cabd4444aac41ac270139e2"/><file name="mysql4-upgrade-0.7.12-0.7.13.php" hash="3989f52a15a13cc4c0a14fa5c199f33d"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="09b521d44ed38a52cef4cc62e96f9c10"/><file name="mysql4-upgrade-0.7.3-0.7.4.php" hash="325d8de6f216f6d40377475659ca613b"/><file name="mysql4-upgrade-0.7.4-0.7.5.php" hash="4bae925a7396d3234145380e014a3766"/><file name="mysql4-upgrade-0.7.5-0.7.6.php" hash="a7eb0ebd38272b90ea6757ab9d01a060"/><file name="mysql4-upgrade-0.7.6-0.7.7.php" hash="005fdfafee45ce428a85a898cade8ebc"/><file name="mysql4-upgrade-0.7.7-0.7.8.php" hash="c209b767cc1d9803dd829546bafe0d70"/><file name="mysql4-upgrade-0.7.8-0.7.9.php" hash="cda1fd6a5e15274be819063cabee0084"/><file name="mysql4-upgrade-0.7.9-0.7.10.php" hash="7d6bfc9a05989b4b00967fc12c4c5434"/><file name="mysql4-upgrade-1.3.9-1.4.0.php" hash="f0679dff106261a60be0a284092a342d"/><file name="mysql4-upgrade-1.4.0.0-1.4.0.1.php" hash="f88561131551cff672d54416a0b3bf23"/><file name="mysql4-upgrade-1.4.0.1-1.4.0.2.php" hash="d1d519f08335b7f03736abd1effc0074"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="1c2636b79996f3f68c4fc58885ba130d"/><file name="upgrade-1.6.0.0-1.6.0.1.php" hash="43378fdde9b0b6af8f4f745016d88b64"/><file name="upgrade-1.6.0.1-1.6.0.2.php" hash="928b56a977e6061304b088d9933a88f2"/><file name="upgrade-1.6.0.2-1.6.0.3.php" hash="92c7340cba1444cde4bd99339767c77e"/><file name="upgrade-1.6.0.3-1.6.0.4.php" hash="1796e8585227c8212fb3430f18580baf"/></dir></dir></dir><dir name="Usa"><dir name="Block"><dir name="Adminhtml"><dir name="Dhl"><file name="Unitofmeasure.php" hash="752f96abcd38663b42b3a96501a2ba2b"/></dir></dir></dir><dir name="etc"><file name="config.xml" hash="573a0e9f45a58652c63ed564d8e97001"/><dir name="dhl"><dir name="international"><file name="countries.xml" hash="6484c011b94782626b3c800cde80e08f"/></dir></dir><file name="system.xml" hash="ace85f38c22f6bad2e07a58ee0b75ae4"/><dir name="wsdl"><dir name="FedEx"><file name="RateService_v10.wsdl" hash="352ed0cd739b31d42d206aba31bf4c31"/><file name="RateService_v9.wsdl" hash="5e698519a3b3ae3dcea2105545053763"/><file name="ShipService_v10.wsdl" hash="4e661e70491a1af695c27878610054e2"/><file name="ShipService_v9.wsdl" hash="9c3779aa87540dcae41b43b16b724df6"/><file name="TrackService_v5.wsdl" hash="89cc7077a8fc439446e70bac0ca0f0c1"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="12c5f5321b0013b80711561889464a17"/></dir><dir name="Model"><dir name="Shipping"><dir name="Carrier"><dir name="Abstract"><dir name="Source"><file name="Mode.php" hash="472cd4ed3dc1d8d66a4dbfeef55daaf4"/><file name="Requesttype.php" hash="1b37e0e5e75f800a22f369835ab439d8"/></dir></dir><file name="Abstract.php" hash="18acb6094fd01cfc3ec0516c688f188b"/><dir name="Dhl"><file name="Abstract.php" hash="27371027a2742e766bf4fe8c90e69989"/><dir name="International"><dir name="Source"><file name="Contenttype.php" hash="3f7ad79befb8d024621e88c44ff8fb4d"/><dir name="Method"><file name="Abstract.php" hash="812e1d8b6b721df3b2a5dcfde8c7a89a"/><file name="Doc.php" hash="2b226de0a5b4e980c7b7750e9a78aa91"/><file name="Freedoc.php" hash="a376828347ac478a54759234136fcf84"/><file name="Freenondoc.php" hash="20dd4095117152331aeffc3bd48ca98b"/><file name="Nondoc.php" hash="91cfd46975865daa2d5bad45eee6f0d7"/><file name="Size.php" hash="80efb82d49efcc80f4b95b19d0a872c0"/><file name="Unitofmeasure.php" hash="db516ec818cb62d09e7318e39cc419fe"/></dir></dir></dir><file name="International.php" hash="f742aa1c1227d248b19721427301aea4"/><dir name="Label"><dir name="Pdf"><file name="PageBuilder.php" hash="a1244a674c1f94bd8de4743dabf9df73"/><file name="Page.php" hash="26f5838bd5228dcff780decfcbaac8be"/></dir><file name="Pdf.php" hash="b3b92e30c6d116d7e11b624eeb4ff4a9"/></dir><dir name="Source"><file name="Dutypaymenttype.php" hash="4e2347366fc7a56eab9431e833197965"/><file name="Freemethod.php" hash="124f1cedf2211ea5be52179af407f427"/><file name="Method.php" hash="b4df2a5f2a7dd02f76bd8288c2dc3461"/><dir name="Protection"><file name="Rounding.php" hash="fab61796ae4becd1993ff1b514ff1ad2"/><file name="Value.php" hash="9747af15bc8ec86e758bdd8c983bd2dd"/></dir><file name="Shipmenttype.php" hash="0755f6c96748971df9d71407cd137bce"/></dir></dir><file name="Dhl.php" hash="3cff7e5e442b36f568abaff65e39bffb"/><dir name="Fedex"><dir name="Source"><file name="Dropoff.php" hash="ab1c1c54e22ed3f1c628cd2f34b50ea8"/><file name="Freemethod.php" hash="c9a73008682a1fee2701c63b221bb69f"/><file name="Method.php" hash="0f18a8b2ba195025973b695e8e026b72"/><file name="Packaging.php" hash="44ce1e140635d3ca9015d1fa69d32d1e"/><file name="Unitofmeasure.php" hash="98c7e7fa7fd6ec3a2f544324e7d04ff0"/></dir></dir><file name="Fedex.php" hash="58202bbec88ed2c1ef9a82e50ad0146a"/><dir name="Ups"><dir name="Source"><file name="Container.php" hash="087f0db941cb4d19ae7b68c12a7d33dd"/><file name="DestType.php" hash="b6894a44aed5b1bc738ae81269e930df"/><file name="Freemethod.php" hash="383d4fd7846c8e46f37df02a1a439e95"/><file name="Method.php" hash="85457353bf212965d57cb0fd21d527d3"/><file name="Mode.php" hash="824705212c40c38baa5d658cc5c496e4"/><file name="OriginShipment.php" hash="4047959177d1acb5abb8b60c13e1f786"/><file name="Pickup.php" hash="b1d14e211793157da597e87645868482"/><file name="Type.php" hash="be4e7749dd24008f22fe3926935fca21"/><file name="Unitofmeasure.php" hash="35c81117ae194b5851e9986a7aa6beeb"/></dir></dir><file name="Ups.php" hash="c1c176c696cfec97078c1fe7a6762272"/><dir name="Usps"><dir name="Source"><file name="Container.php" hash="7cacfc4771b6c5ead3952d56e13a50a7"/><file name="Freemethod.php" hash="80540774e75d1683952abd90d9d6c093"/><file name="Machinable.php" hash="a19b792aea3512bcdd41ad0c9cde6f37"/><file name="Method.php" hash="8712ae4ed7175b175ed52cef0a2cb50d"/><file name="Size.php" hash="a844ea645e9101a747383c4c7771705e"/></dir></dir><file name="Usps.php" hash="5fdc7092e678323f08057715b60bdb3a"/></dir></dir></dir><dir name="sql"><dir name="usa_setup"><file name="install-1.6.0.0.php" hash="d91d7e704c03fb17e4866a05622402e3"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="ac3205a9499f3aa732abcdd3f109a396"/><file name="upgrade-1.6.0.0-1.6.0.1.php" hash="c63ce436e8020a82d70a2a994ff161f0"/><file name="upgrade-1.6.0.1-1.6.0.2.php" hash="1f9b8ab5d153db1701a85cf10bd77137"/><file name="upgrade-1.6.0.2-1.6.0.3.php" hash="e5fea22f9747bf1a5c15dca35dab82a1"/></dir></dir></dir><dir name="Weee"><dir name="Block"><dir name="Element"><dir name="Weee"><file name="Tax.php" hash="db7122f75f83f6dd0cb37430f589ffb0"/></dir></dir><dir name="Renderer"><dir name="Weee"><file name="Tax.php" hash="a0fe85d4ccbd5493d63f786ddd953f87"/></dir></dir></dir><dir name="etc"><file name="config.xml" hash="6a99c2cdf718e202c28259adb16dc1d4"/><file name="system.xml" hash="58beb3dc2f47eb3e561cb9845b8dc245"/></dir><dir name="Helper"><file name="Data.php" hash="5607df816e29c55037a8fa5d85fbecac"/></dir><dir name="Model"><dir name="Attribute"><dir name="Backend"><dir name="Weee"><file name="Tax.php" hash="851508e6b1e10d366bf400877eb9af72"/></dir></dir></dir><dir name="Config"><dir name="Source"><file name="Display.php" hash="2c46bd17d9c834277617f5c4bb77e315"/></dir></dir><dir name="Mysql4"><dir name="Attribute"><dir name="Backend"><dir name="Weee"><file name="Tax.php" hash="3482fe4959a46dc1f87ebeb6200e1597"/></dir></dir></dir><file name="Setup.php" hash="aa82b716a786d9edc9539a7370247e59"/><file name="Tax.php" hash="b71e3ccccac4c049f3b66839158eb542"/></dir><file name="Observer.php" hash="0fd1a48ef2030ca0c5877357888021dc"/><dir name="Resource"><dir name="Attribute"><dir name="Backend"><dir name="Weee"><file name="Tax.php" hash="ab1b6f6100043b1d862257f28ba552d4"/></dir></dir></dir><file name="Setup.php" hash="bcd8dabf827d5dfe5ef0a51bcf499196"/><file name="Tax.php" hash="79acfa84ae3c44bc21095ef15cfd64a7"/></dir><file name="Tax.php" hash="c94141ed7f2ea989af1713ec3c58e7c1"/><dir name="Total"><dir name="Creditmemo"><file name="Weee.php" hash="eeba7624865af7f87d83d7de75b617a8"/></dir><dir name="Invoice"><file name="Weee.php" hash="0fa3da5c665fa31cb62e7b1e2147203e"/></dir><dir name="Quote"><dir name="Nominal"><file name="Weee.php" hash="fdba77c1529c8e8080932f6406cfd882"/></dir><file name="Weee.php" hash="15b531981457b8d768a31e2faa69d4fd"/></dir></dir></dir><dir name="sql"><dir name="weee_setup"><file name="install-1.6.0.0.php" hash="2fdb0cf303eec08f3cea0a4f6e94058b"/><file name="mysql4-install-0.1.php" hash="a0c573127f503981a597860fa5d5b68e"/><file name="mysql4-upgrade-0.10-0.11.php" hash="b0afbe121cf2ee69c70c2bb7a489db04"/><file name="mysql4-upgrade-0.1-0.2.php" hash="e7587be0ebf25f5ae5adbff12016f96e"/><file name="mysql4-upgrade-0.11-0.12.php" hash="545192ea5b24babe515b386b1e69584e"/><file name="mysql4-upgrade-0.12-0.13.php" hash="4dab305bbcd48e7611ef3914c8081fc3"/><file name="mysql4-upgrade-0.2-0.3.php" hash="f6e47d491b4468126e122f32e7016082"/><file name="mysql4-upgrade-0.3-0.4.php" hash="fa6e945a1801bdd2b8f7a40042d2e05d"/><file name="mysql4-upgrade-0.4-0.5.php" hash="99db48035f8fb206faba7808f1c9d1f2"/><file name="mysql4-upgrade-0.5-0.6.php" hash="0127e90d5934f825ec288cc8a7198da6"/><file name="mysql4-upgrade-0.6-0.7.php" hash="630199a25c1878f195493cbc444cba73"/><file name="mysql4-upgrade-0.7-0.8.php" hash="601fea24f808197366a9aac8761e4e5e"/><file name="mysql4-upgrade-0.8-0.9.php" hash="843d5ba27ca049c87c4eeac26a7e702d"/><file name="mysql4-upgrade-0.9-0.10.php" hash="450a11912e22a40a75d42f9ae8d1c18f"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="f090a2771a16657c2f52e2865abf8e93"/></dir></dir></dir><dir name="Widget"><dir name="Block"><dir name="Adminhtml"><dir name="Widget"><file name="Chooser.php" hash="849f52c01b73f1afd5f2f6299ccdadb3"/><file name="Form.php" hash="c70d938936d3e20f2df926849b41f077"/><dir name="Instance"><dir name="Edit"><dir name="Chooser"><file name="Block.php" hash="6e882eeb70bf2666e7de1a85caae1540"/><file name="Layout.php" hash="8dbb96175c541c00b498a547646f9014"/><file name="Template.php" hash="11cabd6f60abb168eeb6d3e010082e1e"/></dir><file name="Form.php" hash="bd93a6a67d2ca2caa3ec1428cc30ea6a"/><dir name="Tab"><dir name="Main"><file name="Layout.php" hash="cbc7730e6b53d90b9537569516bb1293"/></dir><file name="Main.php" hash="cf71d8445a6afc25faddb2256f780faf"/><file name="Properties.php" hash="4ae6932bd7dcb2c138712ef073cb1855"/><file name="Settings.php" hash="d587a9f4b17a882b7a1ad986dae204ee"/></dir><file name="Tabs.php" hash="7eb79b3e488d9837ea566fc3b1675401"/></dir><file name="Edit.php" hash="ed3f817c2653d2175e1974793b9288de"/><file name="Grid.php" hash="541bca12411fe919406d9ba63f886e7f"/></dir><file name="Instance.php" hash="78976bbf334a216dd6a3566a11ce3453"/><file name="Options.php" hash="3455c9a46b721414e1a543519f0c6a8f"/></dir><file name="Widget.php" hash="c64ffd1bf7f5b058dbf5d38099a8adcc"/></dir><file name="Interface.php" hash="9d8d9073052ec74cb3bcc90107053e33"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Widget"><file name="InstanceController.php" hash="ec52101ba2794ec939ce2488c995671b"/></dir><file name="WidgetController.php" hash="b0a799cdc44d2222a1b0fa80a6a3a15e"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="1b3766c87ed6fcd069c7883911839fe6"/><file name="config.xml" hash="fbf1db11668b549a94a89021a59f6117"/><file name="jstranslator.xml" hash="ece3f5e5e5c36902856a515304974a7f"/></dir><dir name="Helper"><file name="Data.php" hash="c356063f6d4b8d757544ddf267864853"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Widget"><dir name="Instance"><file name="Collection.php" hash="b29eb3e61fe4b2e46a319cc4aaf52f63"/></dir><file name="Instance.php" hash="5f9cfdac932704c3b0e6620ed6c44c7c"/></dir><file name="Widget.php" hash="76ca79096cc5ba66b5b90d0eee952261"/></dir><file name="Observer.php" hash="90858fbf4f82eacd258d1e36d8c9978b"/><dir name="Resource"><dir name="Widget"><dir name="Instance"><file name="Collection.php" hash="b15ad5ea41d073177aaac31b5630ecc4"/></dir><file name="Instance.php" hash="9a5cc69a61aff1709b5a1459a1c8bbc9"/></dir><file name="Widget.php" hash="43ab7cf7cf49f5a1bc0cd406e179cc37"/></dir><dir name="Template"><file name="Filter.php" hash="c2c3ddb7cb0c04bac83e77d75a22a9e3"/></dir><dir name="Widget"><file name="Config.php" hash="ce7da83573303308c56a9b775333307c"/><file name="Instance.php" hash="256a5e3f49c93858989b87f2d5f58a1d"/></dir><file name="Widget.php" hash="e6ae673d64e789e477c441770f3b4bdc"/></dir><dir name="sql"><dir name="widget_setup"><file name="install-1.6.0.0.php" hash="c58c238e776a67bab75f7e83a22a727c"/><file name="mysql4-install-1.4.0.0.0.php" hash="a0207b5fb894c7e923c7e1a13db6f13a"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="ae44d84762c86b96e80ec6e0350f893b"/></dir></dir></dir><dir name="Wishlist"><dir name="Block"><file name="Abstract.php" hash="70c0735c4f31ec3366851fdeb0b3d073"/><dir name="Customer"><file name="Sharing.php" hash="da391df5a73513523ca9ec6b06a86cb5"/><file name="Sidebar.php" hash="b42b42895ba4c34b259127df54489569"/><dir name="Wishlist"><file name="Button.php" hash="75fc65c987712a060a12e49449a83297"/><dir name="Item"><dir name="Column"><file name="Cart.php" hash="0a9a9dac808bc2fbf7b5721bef932d9a"/><file name="Comment.php" hash="8e13982d95fc82887089455999e322ec"/><file name="Image.php" hash="7d6cf74117d443b50e70398a500a7e96"/><file name="Remove.php" hash="2069c40f50887d801ea00542f918e073"/></dir><file name="Column.php" hash="2e9872680803a72bc67bf2260b3e5d67"/><file name="Options.php" hash="813ca3f92b76d9a897286ffd4fc59aef"/></dir><file name="Items.php" hash="ac432c88974949b32d71c2a2c1840e3c"/></dir><file name="Wishlist.php" hash="fb069b79e654b805f62c7c642e0e849e"/></dir><dir name="Item"><file name="Configure.php" hash="59743c0acb6dd996e7416d8cc3f5cc3c"/></dir><file name="Links.php" hash="2d3871055dd203ee01ceacf1482134f9"/><dir name="Render"><dir name="Item"><file name="Price.php" hash="fd102f24e73e54944275bd4d342624a3"/></dir></dir><dir name="Share"><dir name="Email"><file name="Items.php" hash="8566f7afde0aa047b8a7d30eb19347a4"/><file name="Rss.php" hash="36cb3df625529085d996a6b404c89b8d"/></dir><file name="Wishlist.php" hash="fe7cd5c69ec53082c4b46e253072324f"/></dir></dir><dir name="Controller"><file name="Abstract.php" hash="36904b669e9a66de69c9f5fa535e8d9c"/></dir><dir name="controllers"><file name="IndexController.php" hash="1086f91ebf568f590286bed2bb85a73a"/><file name="SharedController.php" hash="0775980b203a97f4b5991bae6b18d006"/></dir><dir name="etc"><file name="adminhtml.xml" hash="df16ea9169039cc0d8f5b2ade33f11c7"/><file name="config.xml" hash="de47a39f7d0b5f185c903c1ffd6d1cfb"/><file name="system.xml" hash="f0f962b7cf616f3e0657c5eaf3026874"/></dir><dir name="Helper"><file name="Data.php" hash="209bd9e195bbc6e6dd780d2bdd9b5ebf"/></dir><dir name="Model"><dir name="Config"><dir name="Source"><file name="Summary.php" hash="5b837c0de3e524ddf8db7a62ddbd7318"/></dir></dir><file name="Config.php" hash="f70c36f12598222eea5af0cc56c281ed"/><dir name="Item"><file name="Option.php" hash="1c29abefe8277f8e9304cb1b8d37fd47"/></dir><file name="Item.php" hash="cf707b92de0d719d0831af56dd0f789f"/><dir name="Mysql4"><dir name="Item"><file name="Collection.php" hash="7a4e745ec9f9926c3a094e1080fc1fd2"/><dir name="Option"><file name="Collection.php" hash="3451c62ee77d985e7340ea0bf3c96445"/></dir><file name="Option.php" hash="fe5c7b64a520a5dce11aac16dc15dbf0"/></dir><file name="Item.php" hash="d94ee9d970ff4326ca9de291a8279944"/><dir name="Product"><file name="Collection.php" hash="2aa0e7a1f052fdeb4d3cdeb74f4e4482"/></dir><dir name="Wishlist"><file name="Collection.php" hash="b02f0ddd0121a6d7039f8c8d11b4be2a"/></dir><file name="Wishlist.php" hash="9f7db1e4080cbfa3028bdb88cfbeb36b"/></dir><file name="Observer.php" hash="74c2346d19bb71d6f0ea7d0f62914fc7"/><dir name="Resource"><dir name="Item"><file name="Collection.php" hash="8b934c31e3e87c52caddf3da20713f8a"/><dir name="Option"><file name="Collection.php" hash="e726e7521f68377c534078304d4432d8"/></dir><file name="Option.php" hash="4cc83668c0febe2798db3b34ad96d23b"/></dir><file name="Item.php" hash="2226a4979c3152f608daee7fd42bb961"/><dir name="Product"><file name="Collection.php" hash="7d6284973fa8fed0b4df4080c9c48f6b"/></dir><dir name="Wishlist"><file name="Collection.php" hash="c55eadc461dd118b5ef8925156878569"/></dir><file name="Wishlist.php" hash="88b7ef634ed777c94ad39d968e163688"/></dir><file name="Session.php" hash="5fca6c71c18f63d80d4135dc7aadf27e"/><file name="Wishlist.php" hash="f5c04e2db769ed929ee37d148d0d23e1"/></dir><dir name="sql"><dir name="wishlist_setup"><file name="install-1.6.0.0.php" hash="31073f45370e6431b2d786a73c504fc7"/><file name="mysql4-install-0.7.0.php" hash="a097f3028ec3ba8f11c7b18040858d04"/><file name="mysql4-upgrade-0.7.0-0.7.1.php" hash="ddf9dfc1329698c654e3a6edad17de83"/><file name="mysql4-upgrade-0.7.1-0.7.2.php" hash="a292ef95bea613cdfc8325b6a952f94f"/><file name="mysql4-upgrade-0.7.2-0.7.4.php" hash="9c8de349323abfc195dd3c48438bcad3"/><file name="mysql4-upgrade-0.7.4-0.7.5.php" hash="46e1425fdabca50b7fe22405895cc99d"/><file name="mysql4-upgrade-0.7.5-0.7.6.php" hash="47fe21ade9c630c47cb1186c5689b513"/><file name="mysql4-upgrade-0.7.6-0.7.7.php" hash="46189698135c47e0ffc1314544ec9040"/><file name="mysql4-upgrade-0.7.7-0.7.8.php" hash="8641512cd1d5cef9577b1adb6477dbdc"/><file name="mysql4-upgrade-0.7.8-0.7.9.php" hash="11bc2b121db05033d7aaeff1cd5b10a2"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="020f9e5ef3531ab5e6e7b29370b1eebf"/></dir></dir></dir></dir><dir name="Zend"><file name="Date.php" hash="df6de8ff9dfdb044fe51cdf32e0af534"/><dir name="Db"><file name="Statement.php" hash="4b5b39a1e1c651ab9d6db332c882fdf7"/></dir><file name="Mime.php" hash="fcac9b00b4f04a99cddc8289dc10a33b"/><dir name="XmlRpc"><file name="Request.php" hash="819a8c3f2ca0a50028c51e8011ebd997"/><file name="Response.php" hash="8ca101f4782b43eaa58e3c81a6fbe26b"/></dir></dir></target><target name="mage"><dir name="app"><file name="Mage.php" hash="48a8188d1cdb1101e22f7f729b49d2d8"/><file name=".htaccess" hash="72617d60821288133a367f70bf39ad93"/></dir><dir name="."><file name="cron.php" hash="27893cef1ab2d45b952ade5620d4edb2"/><file name="LICENSE.txt" hash="59563e7be45096d0833dade102989042"/><file name="index.php.sample" hash="3c05ef39c5bdf92444b34b6bdd483c24"/><file name=".htaccess.sample" hash="1092ea05412986094c17f9143dff774a"/><file name="LICENSE_AFL.txt" hash="45a399f2095030865fb962263ccd7506"/><file name="LICENSE.html" hash="caf0a79ffb5e4719f9f4de286f253a61"/><file name="cron.sh" hash="c752a6d282579c3f2ed2e7a2e5864f28"/><file name="install.php" hash="689be80b5e0c2fdcb9dc9f031e29467b"/><file name="php.ini.sample" hash="d7412c2f78440a96fc2d9378ccf460cb"/><file name="get.php" hash="02ba078881f9b141a12c0cd51d3084ad"/><file name="RELEASE_NOTES.txt" hash="de14e209f5c91175d289d178b7d445db"/><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><file name="api.php" hash="6304dda413f235693b22bb21be5764f7"/></dir><dir name="errors"><file name="404.php" hash="d409d89b4d867a9307534c70cd662bfe"/><file name="503.php" hash="f0723ab668b765e518bf96eb8da62bd1"/><dir name="default"><file name="404.phtml" hash="6c74230baeb7cec598737dcc7811f57b"/><file name="503.phtml" hash="1040b486ae7f9ce1a2a3de69b9808b37"/><dir name="css"><file name="styles.css" hash="e9c08ef9e6672e5c46c8d79b3202166b"/></dir><dir name="images"><file name="bkg_body.gif" hash="82bfc5bfe346c8e974cd33b1314b0acf"/><file name="bkg_header.jpg" hash="0211c47be1493bd0ec72949c47932b81"/><file name="bkg_main1.gif" hash="a8f5717873dc6cf8f6bd22924b5838fe"/><file name="bkg_main2.gif" hash="cf18ba9f7c7e6b058b439cde1a897e9c"/><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><file name="i_msg-error.gif" hash="e4f28607f075a105e53fa3113d84bd26"/><file name="i_msg-note.gif" hash="e774ee481a2820789c1a77112377c4e0"/><file name="i_msg-success.gif" hash="834dfafd5f8b44c4b24a4c00add56fcf"/><file name="logo.gif" hash="48b7eb03807fdf80bdfb19b872cf84b8"/></dir><file name="page.phtml" hash="fa2466723abd0549457d66648f6af3c0"/><file name="report.phtml" hash="41a6a3fe256b901146d82690a737530f"/></dir><file name="design.xml" hash="819d056d17c0750a6a0ef425fdcc768a"/><file name="local.xml.sample" hash="36ee7204a2b65d93aae660b198c58715"/><file name="processor.php" hash="df0ce522c8f13312fef463d240199b7e"/><file name="report.php" hash="b9d0c4f93c500220d5e38191f4719b3d"/><file name=".htaccess" hash="8382e66b40fe15d7a1edfc780f9be92f"/><file name=".htaccess" hash="8382e66b40fe15d7a1edfc780f9be92f"/></dir><dir name="var"><file name=".htaccess" hash="72617d60821288133a367f70bf39ad93"/></dir><dir name="shell"><file name="abstract.php" hash="91e2b9f922756ffc1b3439c0fe2b10d4"/><file name="compiler.php" hash="810e20754b66351ea9472fcec3751ce6"/><file name="indexer.php" hash="b8ba3faf6220a8da07456c0cbded4602"/><file name="log.php" hash="ed2c3e2db2f847d9c238b9b2d0495e40"/></dir><dir name="lib"><file name=".htaccess" hash="72617d60821288133a367f70bf39ad93"/></dir><dir name="media"><file name=".htaccess" hash="08de5b2f5ea1ce6f51f40a19bacbf42e"/><dir name="dhl"><file name="logo.jpg" hash="68500df59e568e01333ba078a262ca27"/></dir><dir name="downloadable"><file name=".htaccess" hash="72617d60821288133a367f70bf39ad93"/></dir><dir name="customer"><file name=".htaccess" hash="72617d60821288133a367f70bf39ad93"/></dir></dir></target><target name="mageetc"><dir name="."><file name="config.xml" hash="bc7ec0259798ef5cc7780f8891031f55"/><file name="local.xml.template" hash="34a483f0d86fd40281973108294671a8"/><file name="local.xml.additional" hash="34fb19323cd20c39f75db57f396a8bd9"/></dir><dir name="modules"><file name="Mage_All.xml" hash="bf1a3f85706111df3fab762d05f7ea2f"/><file name="Mage_Bundle.xml" hash="ddf82cef3ac9e8befc8a931a32ef4c91"/><file name="Mage_Api.xml" hash="725d5b8e8fa02adb8f2ab033ed71c120"/><file name="Mage_Downloadable.xml" hash="4f90f37143d99f4b1b2d3d9a03740e4a"/><file name="Mage_Weee.xml" hash="71c1205345e7c44dad08a94149b10f2e"/><file name="Mage_Widget.xml" hash="cf7e92189bcfd63f98fc00602cf1c8d4"/><file name="Mage_Connect.xml" hash="e7952be9f88fb26f5bb0f6de500a740d"/><file name="Mage_ImportExport.xml" hash="74d4bd9f31a8740ffaaef6e3889a7eb6"/><file name="Mage_PageCache.xml" hash="b8f55cdbcf52233739b9b4fd007767ec"/><file name="Mage_Persistent.xml" hash="80778ab77968d909cb267e310014c857"/><file name="Mage_Authorizenet.xml" hash="6923bd24868f52f7dbdebbc08ccff147"/><file name="Mage_Captcha.xml" hash="d6918198c53d40628995143319250cb3"/><file name="Mage_CurrencySymbol.xml" hash="728b2d1fc124a64f40475ba290b45c2c"/><file name="Mage_Api2.xml" hash="58a4224035f99d2d9599f5b36b85d136"/><file name="Mage_Oauth.xml" hash="ec07ecb730b5ecfbbeea0bd6fd4c8a5a"/></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Lib_Varien</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package><package><name>Lib_Google_Checkout</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package><package><name>Lib_Js_Calendar</name><channel>community</channel><min>1.51.1.1</min><max>1.52</max></package><package><name>Lib_Js_Mage</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package><package><name>Lib_Js_Prototype</name><channel>community</channel><min>1.7.0.0.4</min><max>1.7.1.0</max></package><package><name>Lib_Phpseclib</name><channel>community</channel><min>1.5.0.0</min><max>1.5.1.0</max></package><package><name>Mage_Locale_en_US</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package><package><name>Lib_Mage</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package><package><name>Lib_Magento</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package><package><name>Lib_Credis</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package></required></dependencies>
+</package>
diff --git a/var/package/Mage_Downloader-1.8.0.0.xml b/var/package/Mage_Downloader-1.8.0.0.xml
new file mode 100644
index 00000000000..8f9e6de669d
--- /dev/null
+++ b/var/package/Mage_Downloader-1.8.0.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Mage_Downloader</name>
+    <version>1.8.0.0</version>
+    <stability>stable</stability>
+    <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>Magento Downloader</summary>
+    <description>Magento Downloader</description>
+    <notes>1.8.0.0</notes>
+    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:31:10</time>
+    <contents><target name="mage"><dir name="downloader"><dir name="js"><file name="prototype.js" hash="3766aeff5778b54f74f93670322ca0df"/></dir><dir name="Maged"><dir name="Connect"><file name="Frontend.php" hash="3e315c856c18220b927a307d1f690b6f"/></dir><file name="Connect.php" hash="01387e0a0f29672b4dbd183f7e6f5b88"/><file name="Controller.php" hash="de35abf47227d59731ee48e7010b63de"/><file name="Exception.php" hash="9c9a17e592593da67f406bf26b49b278"/><dir name="Model"><dir name="Config"><file name="Abstract.php" hash="1a403405e7562de45b575d06de02850e"/><file name="Community.php" hash="0777c96191c443db1c7252ed07791f22"/><file name="Interface.php" hash="3a0398615f1b23859eb7f3101150a5d0"/></dir><file name="Config.php" hash="06668269b50b5e29bcce9b06f1d728c5"/><dir name="Connect"><file name="Request.php" hash="a953309d522b24cf8e55e96ae61dfb78"/></dir><file name="Connect.php" hash="f9eb53f2f849704450f28c8696ff06c5"/><file name="Dowloader.php" hash="4524d4f7e66b05f8adc756aede034a75"/><file name="Session.php" hash="f9319d1cd536265d6146db6ba5bbb879"/></dir><file name="Model.php" hash="bba1d18dc2454a7c1adc806e816928aa"/><file name="View.php" hash="66a0942d5a6584e3d04f791a3836cc4f"/></dir><dir name="skin"><file name="boxes.css" hash="54410d6907c382ded8d95a5d229eb5a4"/><file name="ie7boxes.css" hash="071cb8848539db100ee670fa59a9fe94"/><file name="ieboxes.css" hash="c07afd178a1f945e0f4197e0df82383b"/><dir name="images"><file name="ajax-loader-tr.gif" hash="1ae32bc8232ff2527c627e5b38eb319a"/><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="header_bg.gif" hash="8440b04c5cb6b1451bb886bfbef260a5"/><file name="logo.gif" hash="5eb089ecea67d82311d7c91898460104"/><file name="Magento_Connect.jpg" hash="20e1378c09506fdc5723abc0115d5f57"/><file name="nav_bg.gif" hash="1cb1366f03a9efad6b17e4483aef20cf"/><file name="nav_separator.gif" hash="492011a7de2de84a9c7837bfd879ab95"/></dir><dir name="install"><file name="boxes.css" hash="25106a09d9667a1c4934bbc48b076ce5"/><file name="clears.css" hash="ba39414ec84f6a61340aa4c05fab2e73"/><file name="ie7minus.css" hash="aed0af69f833d58a6ccb9baba9f477d7"/><file name="iestyles.css" hash="7a97e16ac627d09521991e32a841c448"/><dir name="images"><file name="error_msg_icon.gif" hash="e4f28607f075a105e53fa3113d84bd26"/><file name="footer_bg.gif" hash="d59784af16fd95ea82226e5708a89232"/><file name="footer_container_bg.gif" hash="d468e3943943cbbf711586e69d40ca42"/><file name="footer_informational_bg.gif" hash="72d37f4b2ea747bf8969c2654ad1d1e0"/><file name="footer_info_separator.gif" hash="7da64eefaf4da3855ab6ee76dbced0c2"/><file name="footer_left.gif" hash="2b15a54bea9409a75c142d14a62f0149"/><file name="footer_legality_bg.gif" hash="4eb1602e3369dccd901ffe98ea0fd4b3"/><file name="footer_right.gif" hash="a45eaf35c8797d299bd4d9b936528e8f"/><file name="header_bg.gif" hash="795c6de754d0d49717ed08d5cd8168c8"/><file name="header_nav_bg.gif" hash="80c6a18686eb0243e06d6176506a2502"/><file name="header_top_bg.jpg" hash="143f524392ee62fcc8183f5930d7258b"/><file name="header_top_container_bg.jpg" hash="294c18f3f6b838bba06ae41dd3c3d638"/><file name="logo.gif" hash="073a947a39b967af678455a5c7f66e90"/><file name="main_bg.gif" hash="cf18ba9f7c7e6b058b439cde1a897e9c"/><file name="main_container_bg.gif" hash="a8f5717873dc6cf8f6bd22924b5838fe"/><file name="note_msg_icon.gif" hash="e774ee481a2820789c1a77112377c4e0"/><file name="success_msg_icon.gif" hash="834dfafd5f8b44c4b24a4c00add56fcf"/><file name="validation_advice_bg.gif" hash="b85432906de8985a8b14eeb2dc652d3c"/></dir><file name="reset.css" hash="0b8ed71ce8ca35a997d54dc6e8891add"/></dir></dir><dir name="template"><dir name="connect"><file name="iframe.phtml" hash="a66b2b3f8d12d531880884725bd03158"/><file name="packages.phtml" hash="0924a5e9bba65f3500aa2d63c6118ce2"/><file name="packages_prepare.phtml" hash="b3548ec4c0586c438dd14cb7dea6ea4f"/></dir><file name="exception.phtml" hash="6b0ddb91c2f4d09067fa4b305251a93d"/><file name="footer.phtml" hash="2454c152038fe8d8bc0e10c6943c398d"/><file name="header.phtml" hash="6231ab099f520beac19cfe360d1b47a6"/><file name="index.phtml" hash="785c2512054f7d9f8de42caa413496bc"/><dir name="install"><file name="download.phtml" hash="dbf4fecb2577a4ca725a6db4129eb545"/><file name="footer.phtml" hash="489b4f33d1a925e8e24c766e7cb4f2c9"/><file name="header.phtml" hash="1bdeb196d9b47d789b2e780361323d99"/><file name="writable.phtml" hash="3dd142d3f9674bd4e5ded8c4981931c2"/></dir><file name="login.phtml" hash="92dacb636f4dcf5f7ac7924870329eda"/><file name="messages.phtml" hash="1d9d42c32560f54c935bb1aace69d416"/><file name="noroute.phtml" hash="983854ed10319129336c3ed77970a6f6"/><file name="settings.phtml" hash="2c89da2434347acbf33e0d401f119009"/><file name="writable.phtml" hash="85e8e80a63c5a22c7165b4c78063ab4a"/><file name=".htaccess" hash="72617d60821288133a367f70bf39ad93"/></dir><file name="index.php" hash="6ad53537d306008fff577d2017764d7e"/><dir name="lib"><dir name="Mage"><dir name="Archive"><file name="Abstract.php" hash="f4d649347e4fa7ae9784158a257eaaef"/><file name="Bz.php" hash="9039902966481b8560163d94c4b22c3c"/><file name="Gz.php" hash="a5bc9a324bc3f3ca08b1549ef3542913"/><dir name="Helper"><dir name="File"><file name="Bz.php" hash="156b12ca6ddbbde4406a01c03438b86e"/><file name="Gz.php" hash="19a6749b192189fd503482d4da8fe57a"/></dir><file name="File.php" hash="1c72f2e1a32ee2dca4dae111ae373271"/></dir><file name="Interface.php" hash="0841d5d1e4b23680e2dbd689bf1b6a33"/><file name="Tar.php" hash="0ec5483d6b476834f3f4078b0431cc51"/></dir><file name="Archive.php" hash="1af1c989bd0e2e38da34934dac91a542"/><dir name="Autoload"><file name="Simple.php" hash="0c8d3465c180f64354c39ed107a9635a"/></dir><dir name="Backup"><file name="Abstract.php" hash="441668754244d4b2b87fb08a4e5bd31f"/><dir name="Archive"><file name="Tar.php" hash="28ef91c3f5d99e4956e2d28696025c77"/></dir><file name="Db.php" hash="74e1bb56407a29dd0a947068b7cda0ec"/><dir name="Exception"><file name="CantLoadSnapshot.php" hash="e91816fd87537c2c35335a3f0fe81c3e"/><file name="FtpConnectionFailed.php" hash="7bdcddafbfc6427d46f5d17967261e70"/><file name="FtpValidationFailed.php" hash="2967bb726b962b95d23b2ca2f57247cc"/><file name="NotEnoughFreeSpace.php" hash="e439369bb81723840ab1359f2dc61a42"/><file name="NotEnoughPermissions.php" hash="27d68a64520016f90e2a9bc5ce5c73ef"/></dir><file name="Exception.php" hash="e1bd215cf5dbaed8867c058e2b02e7c6"/><dir name="Filesystem"><file name="Helper.php" hash="e16670ae297edea4e0ae0f4ceecba9b3"/><dir name="Iterator"><file name="File.php" hash="3ded6524c9f2bdeb6be32c596d8f44fa"/><file name="Filter.php" hash="1972fa1d8f260ec6f35973a6568fac6d"/></dir><dir name="Rollback"><file name="Abstract.php" hash="6e2a0ce1deec9522e736d7a80694e12d"/><file name="Fs.php" hash="6a2948b658868b54a97bbe80429784bf"/><file name="Ftp.php" hash="748c28d1f91ed9fe28b0a1c1d0f1d842"/></dir></dir><file name="Filesystem.php" hash="90cfad334214b9a60ce4b93e67136798"/><file name="Interface.php" hash="5ff1b6881e479c0ec23523cd1b306ab2"/><file name="Media.php" hash="f539abf1e9cee09d33fff28635f9e310"/><file name="Nomedia.php" hash="a7e97100870190f33c3dec3116c712ed"/><file name="Snapshot.php" hash="01a37b814e574f473f823a85fc9d9777"/></dir><file name="Backup.php" hash="bc10651717e6985f03c34645ac7e5654"/><dir name="Connect"><dir name="Channel"><file name="Generator.php" hash="5b9ffa8a2b94bb5595b18225a77252c4"/><file name="Parser.php" hash="10b78fb4c38e50a844a9bcadc522a44b"/><file name="VO.php" hash="4d0ce27d65560b99af0f99af7e511c65"/></dir><dir name="Command"><file name="Channels_Header.php" hash="84ed69e83f299c0a6e312413468b743d"/><file name="Channels.php" hash="b1a0519001f0f77055262a036c3c7ede"/><file name="Config_Header.php" hash="b36e9b3b5de4d11f0782149f92587dc3"/><file name="Config.php" hash="a9aa732cb685f75d23f1118e1bae09ca"/><file name="Install_Header.php" hash="f9058eb6945f6ccaa59f68881bf4bdd3"/><file name="Install.php" hash="5400ae6f8509533800cb6ac2ce4b1749"/><file name="Package_Header.php" hash="5aeb0d6e88e4d2e6153c88e393738b2e"/><file name="Package.php" hash="5d0bf5b47296b03a8ce664de3143f5bf"/><file name="Registry_Header.php" hash="d3a8499899bd9dc0b36b0610693e203f"/><file name="Registry.php" hash="d12059ce97522a7a0eb46b90968b957c"/><file name="Remote_Header.php" hash="44653e5122aed25bc1c71d4f49ed48a3"/><file name="Remote.php" hash="1e39b0bc6a694a7ca41bd4c9b23ae852"/></dir><file name="Command.php" hash="5e116d0140b20d4c79faa2c3f7ac0a05"/><file name="Config.php" hash="ba5391b355e7593111ade799f1840533"/><file name="Converter.php" hash="a55728977dd0f52d8c3eaab1720e44f2"/><dir name="Frontend"><file name="CLI.php" hash="5b3515ab4128073563ae35947dca2496"/></dir><file name="Frontend.php" hash="f7c0cb1c38e83ccf05ceec2e55f5cca4"/><file name="Ftp.php" hash="d52387b79a7d132913a2397359116e83"/><dir name="Loader"><file name="Ftp.php" hash="44e6492faa044689f9ea4c1b6161eaf7"/></dir><file name="Loader.php" hash="d65ef46d600f823dca710de262c3ccbf"/><dir name="Package"><file name="Extension.php" hash="68b329da9893e34099c7d8ad5cb9c940"/><file name="Hotfix.php" hash="54a87d419ef853b0e8c0625de84e448c"/><file name="Maintainer.php" hash="68b329da9893e34099c7d8ad5cb9c940"/><file name="Reader.php" hash="542a6ece702e9d9efc42bf100440c9ae"/><file name="Target.php" hash="a9cb7e30bfb0876adc81abbe1ddb9f6c"/><file name="VO.php" hash="bc09f6972008c5faa4b837ea5cb76d8c"/><file name="Writer.php" hash="c6153a852693ff6a9198f41bef8a7479"/></dir><file name="Package.php" hash="a19cd14ed01aab18793f017de3fd9c45"/><file name="Packager.php" hash="1332698815c1e7cc1365ce39b2eb4805"/><dir name="Repository"><file name="Abstract.php" hash="68b329da9893e34099c7d8ad5cb9c940"/><dir name="Channel"><file name="Abstract.php" hash="68b329da9893e34099c7d8ad5cb9c940"/><file name="Commercial.php" hash="68b329da9893e34099c7d8ad5cb9c940"/><file name="Community.php" hash="68b329da9893e34099c7d8ad5cb9c940"/><file name="Core.php" hash="68b329da9893e34099c7d8ad5cb9c940"/></dir><file name="Channel.php" hash="68b329da9893e34099c7d8ad5cb9c940"/><file name="Local.php" hash="68b329da9893e34099c7d8ad5cb9c940"/></dir><file name="Repository.php" hash="68b329da9893e34099c7d8ad5cb9c940"/><file name="Rest.php" hash="04c1e9354736018e9629c4c550f1a5bf"/><file name="Singleconfig.php" hash="bc51dc77f5cc1ec5cf5240251ca3ecab"/><dir name="Structures"><file name="Graph.php" hash="d6708f769dbd570a78a20a5619e74139"/><file name="Node.php" hash="66c4ae859eac511908a8b674e618c7f3"/></dir><file name="Validator.php" hash="e2fad19cb2e7c370c8096a39e907dd17"/></dir><dir name="DB"><file name="Exception.php" hash="23f3db8f3f1a7b52cf36607ba73ff03f"/><file name="Mysqli.php" hash="78126b3f06e06ad10a5f7a17a722fa2a"/></dir><file name="Exception.php" hash="790ef89a62f7138f578c107ef4da9805"/><dir name="HTTP"><dir name="Client"><file name="Curl.php" hash="ccf7d1946e018fa043a78a4582f3820d"/><file name="Socket.php" hash="917fadb6a281e3d237ac18ff9171cbc3"/></dir><file name="Client.php" hash="29d7e75afde8ad00386174e282b32809"/><file name="IClient.php" hash="fe29b1f262014a0b88981f54b5ff2e5e"/></dir><dir name="System"><file name="Args.php" hash="b184bd53e2c9fc1059743c566bb34097"/><file name="Dirs.php" hash="40c09512300ba29d9759a7efff3d11b7"/><file name="Ftp.php" hash="29fbf5baafa72b887f4a03257dbacac4"/></dir><dir name="Xml"><file name="Generator.php" hash="785eb70fc4863f9ecef87f79b164c5b9"/><file name="Parser.php" hash="4cf004377b91f6e05c29a90a4a557f55"/></dir></dir></dir><file name="config.ini" hash="a52ba98e71ab19de387b3af1a04c6102"/><file name=".htaccess" hash="520cc012c84739584526b8a9ff098e23"/><file name="mage.php" hash="752b4eced46d1ed515c1e11eb7b4221b"/><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><file name="target.xml" hash="50d1653dcdd94bcc01899c9dacaceeb1"/></dir><dir name="."><file name=".htaccess" hash="7d69e28ca7c422e6de19ff51bb23dab1"/><file name="index.php" hash="73d62a354e51517afd247faa731f8ad3"/><file name="mage" hash="091c45355c62a9189cff45c09328037c"/></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
+</package>
diff --git a/var/package/Mage_Locale_en_US-1.8.0.0.xml b/var/package/Mage_Locale_en_US-1.8.0.0.xml
new file mode 100644
index 00000000000..36a040d6166
--- /dev/null
+++ b/var/package/Mage_Locale_en_US-1.8.0.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Mage_Locale_en_US</name>
+    <version>1.8.0.0</version>
+    <stability>stable</stability>
+    <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>en_US locale</summary>
+    <description>en_US locale</description>
+    <notes>1.8.0.0</notes>
+    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:31:10</time>
+    <contents><target name="magelocale"><dir name="en_US"><file name="Mage_AdminNotification.csv" hash="e240a88785e337747afb4d0bc83ccaba"/><file name="Mage_Api2.csv" hash="bc4b31da02edb34d29274da37a0a0f60"/><file name="Mage_Api.csv" hash="5a8919e82128dbd894c8f22c8238384d"/><file name="Mage_Authorizenet.csv" hash="204c3901c67b312a9ea21ffdf34fa9c3"/><file name="Mage_Backup.csv" hash="7fb40353a4c161de2a92edd8dcb35587"/><file name="Mage_Bundle.csv" hash="234b8f828cc0313f6ced8af6a9f08be0"/><file name="Mage_Captcha.csv" hash="de6aef08396245ed644b213ecfcf309b"/><file name="Mage_Catalog.csv" hash="847afe1d7b67e481f25e5afc3bfc06fe"/><file name="Mage_CatalogInventory.csv" hash="969014c8d71762ac5b9ed41c08412258"/><file name="Mage_CatalogRule.csv" hash="7b7d6ad17c61efa14ade33c0fb443d36"/><file name="Mage_CatalogSearch.csv" hash="9d822bca8067087dabe1d213193a2def"/><file name="Mage_Checkout.csv" hash="f6c6767b40c2f70912d09c0c6c68f453"/><file name="Mage_Cms.csv" hash="9a538e344acce7afa686fbed65082c63"/><file name="Mage_Connect.csv" hash="8cd1b22e3bb2b18a59b6bfb6a7e4e7f9"/><file name="Mage_Contacts.csv" hash="7e367e9a924c19b6df2fa5c8adca9be4"/><file name="Mage_Core.csv" hash="22f3b86b63a6f114cb4e08115103e14f"/><file name="Mage_Cron.csv" hash="e5803e0da7c568134db4864b8eb55f22"/><file name="Mage_CurrencySymbol.csv" hash="a10642c4b3d76b113f4023fa9bb337b3"/><file name="Mage_Customer.csv" hash="6c8628de9013ac6c2ef86623e1554ba2"/><file name="Mage_Dataflow.csv" hash="02ddb4090005e6678f020ac96c2cbe81"/><file name="Mage_Directory.csv" hash="615c41b2941e20bb118ebd41b862b934"/><file name="Mage_Downloadable.csv" hash="a6e6779b14563a09a8dd23e8ed20e418"/><file name="Mage_Eav.csv" hash="9b9e7506f519e45f5a9b44355425f04b"/><file name="Mage_GiftMessage.csv" hash="6cd672267af7f7183f47c58450c2779a"/><file name="Mage_GoogleAnalytics.csv" hash="8a3813e578283e2696f857515af5e3bc"/><file name="Mage_GoogleBase.csv" hash="453420e7b2a7c67d983436cd07c3f1c1"/><file name="Mage_GoogleCheckout.csv" hash="218bdb6351129bc11f5fbb7abeff7e18"/><file name="Mage_ImportExport.csv" hash="c41c3dec6db446ebb9b9f81bc3262709"/><file name="Mage_Index.csv" hash="a12d6e56dec19a45380375e7ea3f7a7c"/><file name="Mage_Install.csv" hash="ff1231e1db62fc550cac4674d0ba5190"/><file name="Mage_Log.csv" hash="671884c4618da93ca90d2d92404b6247"/><file name="Mage_Media.csv" hash="234187a0e1b83a03cb911452a4637357"/><file name="Mage_Newsletter.csv" hash="0b3f84564b496b40b47221f197d494d9"/><file name="Mage_Oauth.csv" hash="2f7bcd1ac430fe5de83a9af3a1ac8adf"/><file name="Mage_PageCache.csv" hash="4bd38621bb26a02a15251fcb37e1408b"/><file name="Mage_Page.csv" hash="d6940000f6f5db9b67ceb13eeccf3f55"/><file name="Mage_Paygate.csv" hash="311566b283975d5c481046346023026b"/><file name="Mage_Payment.csv" hash="5a0878ac6aa54689b3a8687197149c69"/><file name="Mage_Paypal.csv" hash="fe73439970f6d806c0ed0e0da05b6b51"/><file name="Mage_PaypalUk.csv" hash="d9d163d9c022d37e6bef2bf231469572"/><file name="Mage_Persistent.csv" hash="f84928d5a080bbfbb68f5becd12829c8"/><file name="Mage_Poll.csv" hash="01084dbcb43b1da9de35c5730fabd692"/><file name="Mage_ProductAlert.csv" hash="8ceb95248eeb2e4611d01767a7331840"/><file name="Mage_Rating.csv" hash="88db484c67afdb565255d210044bd034"/><file name="Mage_Reports.csv" hash="98f1525c2101c8557af6118e2dd48822"/><file name="Mage_Review.csv" hash="fd1b38a4863896e7112f642de243fdb8"/><file name="Mage_Rss.csv" hash="f99bd663f6b7becac87c8be1720f14b3"/><file name="Mage_Rule.csv" hash="0b655f98a5c7e98f672fcd04395c9a93"/><file name="Mage_Sales.csv" hash="6d83573670c49cd0adc67faa4d510345"/><file name="Mage_SalesRule.csv" hash="9e6fbd2421b33de74d74fa9b4b8ede6b"/><file name="Mage_Sendfriend.csv" hash="b1e310cf2fdaf674de1e7604826146e9"/><file name="Mage_Shipping.csv" hash="136d55ce3ccf70bc2a1c7412085b40bc"/><file name="Mage_Sitemap.csv" hash="4837691c0e5c8cfbc4d75b10f196eb65"/><file name="Mage_Tag.csv" hash="211c99ac80a4b4e02b40a9907a4bc89a"/><file name="Mage_Tax.csv" hash="9a6baf851a43b4a9bc23ca47b84043b2"/><file name="Mage_Usa.csv" hash="02d53f21df12c41de0067c44fac46a5c"/><file name="Mage_Weee.csv" hash="745389c13a6339af6028a350abcbb49e"/><file name="Mage_Widget.csv" hash="70a76519c347dd8f4209cb3dac849fe6"/><file name="Mage_Wishlist.csv" hash="8a27b7a9df533dc68f8f1df4338890fb"/><dir name="template"><dir name="email"><file name="account_new_confirmation.html" hash="46a81d771b81c580872c15937a2f5fdd"/><file name="account_new_confirmed.html" hash="83e4c39f5d47cf4636ed8a5bca07e314"/><file name="account_new.html" hash="8d252c5b90acb75b02faab0325e68aed"/><file name="account_password_reset_confirmation.html" hash="c811155d0c69f339b9a558dceb3c668a"/><file name="admin_password_new.html" hash="d2f3c73cb712d60da9384f1c5bfd31c0"/><file name="admin_password_reset_confirmation.html" hash="9e5c2fd7e57dcd19749cf27a9b41a9f4"/><file name="contact_form.html" hash="e04255e76e6e2d35f40d90ec5571d7e1"/><file name="currency_update_warning.html" hash="f6a4e8139468995c6561a12cd6cff860"/><file name="log_clean_warning.html" hash="0bd6a39803f8aa2eb46d6c110d8d0056"/><file name="newsletter_subscr_confirm.html" hash="f27b517857ba599274220a2f99384d89"/><file name="newsletter_subscr_success.html" hash="9179d85d345e2f2f48c13dd2578ddedd"/><file name="newsletter_unsub_success.html" hash="62704732a3ac8d6972949e17ee02ec79"/><file name="password_new.html" hash="696f240e0a22541d6e07f133fd16edab"/><file name="payment_failed.html" hash="c9b8cefda13ccc2909d570694052b4c7"/><file name="product_alert_cron_error.html" hash="edd49272b0b793941cd7138b253ae1b1"/><file name="product_price_alert.html" hash="4e881231e7e4acc729f3a74d7a29b6a8"/><file name="product_share.html" hash="806247d32fe9a818a25ad6b5640502c2"/><file name="product_stock_alert.html" hash="1d90357122b3a4a86b17ae006b7993df"/><dir name="sales"><file name="creditmemo_new_guest.html" hash="0ab9b3502f83e2d3dca9f86b15377293"/><file name="creditmemo_new.html" hash="5038d00d70f8e1f19af7be32cb4f48ec"/><file name="creditmemo_update_guest.html" hash="3187860fe86c3afafa8994f274a4da20"/><file name="creditmemo_update.html" hash="96b7addb6e2fed20ac0b10e30de79c5d"/><file name="invoice_new_guest.html" hash="f36ee8f3fff3af812b6e4d3455db46c2"/><file name="invoice_new.html" hash="e5774ea61dfa2bd89bb39d56c1a2c805"/><file name="invoice_update_guest.html" hash="39de992acddb54e9853d9cfca0ae042d"/><file name="invoice_update.html" hash="57a58cf5aedff8339b75cb6938c81347"/><file name="order_new_guest.html" hash="e0112ec1ec0423d7aeae9bb15babf697"/><file name="order_new.html" hash="cc64b39d5b998807aae6463fa30998ca"/><file name="order_update_guest.html" hash="685614e83fc56c309bfbc3800ac5105b"/><file name="order_update.html" hash="aab9710b137a65a63a35421ae50db29f"/><file name="shipment_new_guest.html" hash="6089497419c11440207ad092d9c8ae49"/><file name="shipment_new.html" hash="bd6091f6080f7387e81989b6c3d44a0d"/><file name="shipment_update_guest.html" hash="46094d88f821f7c59dc9a7c9e2c779bc"/><file name="shipment_update.html" hash="b6e286b85551f71d53ca54d82f52b92d"/></dir><file name="sitemap_generate_warning.html" hash="d9c1ebf086e2f12dac31b18ab964daaa"/><file name="token.html" hash="5174ed335ef4c84d350bc807250f1a98"/><file name="wishlist_share.html" hash="f17e23109ee21989fb369975f76a3d86"/></dir></dir></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
+</package>
diff --git a/var/package/Magento_Mobile-1.8.0.0.23.1.xml b/var/package/Magento_Mobile-1.8.0.0.23.1.xml
new file mode 100644
index 00000000000..422b085d0a5
--- /dev/null
+++ b/var/package/Magento_Mobile-1.8.0.0.23.1.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+    <name>Magento_Mobile</name>
+    <version>1.8.0.0.23.1</version>
+    <stability>stable</stability>
+    <license>mixed</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>Magento Mobile Xml Interface</summary>
+    <description>An integration Magento with mobile applications (e.g. iPhone, Android, iPad)</description>
+    <notes>1.8.0.0.23.1</notes>
+    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:31:10</time>
+    <contents><target name="magecore"><dir name="Mage"><dir name="XmlConnect"><dir><dir name="Block"><dir name="Adminhtml"><dir name="Admin"><dir name="Application"><dir name="Edit"><file name="Form.php" hash="b10c5c94b7c7dfc7b6bc2ed3d9c05154"/><dir name="Tab"><file name="Settings.php" hash="d3da5059c97aac80818bca1fe4cf7bd0"/></dir><file name="Tabs.php" hash="eed2f5e6bab63a54784cc4d2fb5a07d9"/></dir><file name="Edit.php" hash="452e7b1b369b9852d8e6b065c1c81b65"/></dir></dir><dir name="Connect"><file name="Config.php" hash="4cc28d1f2416a3ac27afcc178fb0a1e2"/><dir name="Dashboard"><file name="BestSellers.php" hash="25e5106c550bd8ff5607bee3c2c3790e"/><file name="Customers.php" hash="b0158f50ea81ecb6d60042b8d7e848c3"/><file name="GraphAmountsData.php" hash="dcae0b253edb37ec29ce06c85783c9d2"/><file name="GraphDataAbstract.php" hash="55588288e35b55e0b49be5154d92bf40"/><file name="GraphInfo.php" hash="8718c9700b50cab37806e58715892a19"/><file name="GraphOrderData.php" hash="2561eb26b2848febbd771e48da120a69"/><file name="GraphTotalsData.php" hash="718b45fe40f3aedf4ec532b1569ca5de"/><file name="LastOrders.php" hash="cb9914ca075a456055eaf9435c1e863c"/><file name="LastSearchTerms.php" hash="5f8ca12a1231e182ea7675d078e7254e"/><file name="MostViewedProducts.php" hash="a34b137c7a28f3a583cb578b53ae9df7"/><file name="NewCustomers.php" hash="95a6e0ac3db9687e5719280e9e249d1c"/><file name="SalesInfo.php" hash="0539f89331dd819f81af42e5baa84941"/><file name="StoreSwitcher.php" hash="96ae5c8e487f6b10512d2bd1bd1de2a6"/><file name="TopSearchTerms.php" hash="704b3e0cd12498ef61cccf5ee33f7dfb"/></dir><file name="Dashboard.php" hash="ee6957ea323f3a05abecceaf6deeecee"/><file name="Loginform.php" hash="a740db268a1eec7e107cb4b483131763"/></dir><dir name="History"><file name="Grid.php" hash="030e414ea540742750ac1fc1677d03a5"/></dir><file name="History.php" hash="f2eb57ca9cc43598de1ae6f232d536df"/><dir name="Mobile"><dir name="Edit"><file name="Form.php" hash="908e435cfa10e4ab97c4b56208f2fe02"/><file name="Submission.php" hash="45871ad74cfd35bb3b4cb739c5582d85"/><dir name="Tab"><file name="Cache.php" hash="c1d13633539eac6d737ae6cd7b40fbc4"/><file name="Content.php" hash="936f7b1b56de9a28e880a7184d1d44ae"/><dir name="Design"><dir name="Accordion"><file name="Images.php" hash="de7dfcaed4656e7338aa1d94be56b219"/><file name="Tabs.php" hash="4af4a5559de4402949574dca2ce01e23"/><file name="Themes.php" hash="ad1fa67c6b147edf95fe446104cb4806"/></dir><file name="Accordion.php" hash="724518e7be978123493749ddab723a71"/><file name="Images.php" hash="faff05cd2645d772798f31ccb981f3d7"/><file name="Preview.php" hash="e433f2d6de3f826e865ca25d66d60069"/><file name="Themes.php" hash="6c9de46ccea263ddf0d517650c3104f5"/></dir><file name="Design.php" hash="cbae80015fba4914f1f195755b71ff01"/><file name="Flurryanalytics.php" hash="b21ea9915949b35fb732e0ada19dadee"/><file name="General.php" hash="bdd72d4fba6a690d7b1e45777f75ce01"/><file name="Notification.php" hash="c3aa529d699cff0bf8bce894bd3cedf6"/><file name="OfflineCatalog.php" hash="793189ab71d77a8d3ac3ea0d50eaf875"/><file name="Payment.php" hash="8560ff9d32fed1717a54ccfdb2986826"/><file name="Settings.php" hash="bc8f3830e9f843de1dfeb92a0dab416c"/><file name="Social.php" hash="6b4ab98e9dad2651cd44f0176fdcdc0e"/><dir name="Submission"><file name="History.php" hash="e3d8bedf4859b6a8b64cd26f4e571f0d"/></dir></dir><file name="Tabs.php" hash="e8aedadae5cc393d52e249c39a88569e"/></dir><file name="Edit.php" hash="8d1b6f1038ab83698b6525e76e773d76"/><dir name="Form"><dir name="Element"><file name="Addrow.php" hash="f0c07343485e9ce4a73cf4715efac3f4"/><file name="Color.php" hash="a60f723c0f00f90edcd81439c084807c"/><file name="Country.php" hash="679cd11bd2a695ecea1af5c2676a53e2"/><file name="Datetime.php" hash="36984a0def1ebe717390cf0531b92969"/><file name="Font.php" hash="2c500653d6735da9e8664214460d2562"/><file name="Image.php" hash="124c4d4cbc364ce85db95077cd3c0bfe"/><file name="Page.php" hash="4a285a076975f78e96d2a0b0a86b0cd9"/><file name="Tabs.php" hash="6bd423b01de6207f06a5274571aaf223"/><file name="Theme.php" hash="d8ebdd24370350ce463d07f5f469fb73"/></dir></dir><dir name="Grid"><dir name="Renderer"><file name="Bool.php" hash="d4b2bfcc269acd216d7118167120397a"/><file name="Type.php" hash="57055805d643b788c2b31340cb8d1f15"/></dir></dir><file name="Grid.php" hash="509986ec3ac362845e82337127c52790"/><dir name="Preview"><file name="Content.php" hash="4e8f4d2f9b02bc3f78197a72c8a40aff"/><file name="Tabitems.php" hash="c1c9f56be3b8b4e192aa81dc57a7a65b"/></dir><dir name="Submission"><file name="Form.php" hash="7b3b24b95ec85a05b1a60f8e977b08cb"/><dir name="Renderer"><dir name="Country"><file name="Androidmarket.php" hash="4b1d1693d3c0247fd073639e8ec8c55d"/><file name="Istore.php" hash="dc7c354b8b5578b5efd7535f6c04e933"/></dir></dir><dir name="Tab"><dir name="Container"><file name="Submission.php" hash="94ecd8c931d2f6c4ebbcb0fbabd6a6f3"/></dir><file name="Container.php" hash="8f2d97ca8b75ee739ba7c0dcd7c2b550"/></dir><file name="Tabs.php" hash="b9edbfddfd2919c6bfdd75ec40eb8724"/></dir><file name="Submission.php" hash="1867bc9c3e7a9172927ce7bb78fe8c7e"/><dir name="Widget"><file name="Form.php" hash="bfcd2ae5c2664086c943d8ecffd550ef"/></dir></dir><file name="Mobile.php" hash="03d92dd4b6973f539282c5c44a17e594"/><dir name="Queue"><dir name="Edit"><file name="Form.php" hash="cd0404b98654c850102bc86532345110"/></dir><file name="Edit.php" hash="13f04522cdcd9b00530ccff1140f9fc3"/><dir name="Grid"><dir name="Renderer"><file name="Action.php" hash="d5f17771dc3786e33b4c8ff3a30f6059"/><file name="Application.php" hash="5272a01ff54fca1d0198c8d46e2da3c8"/><file name="Id.php" hash="6410d9bf4ef135f516ce0ed246ec8ce1"/><file name="Msgtitle.php" hash="aef6d1a37f690e97ed3c33121d253ba0"/><file name="Pushtitle.php" hash="da84ede503a533987cb9119a91de823e"/><file name="Status.php" hash="fb4e44bdb101d5200d09a31434ce5ae9"/><file name="Template.php" hash="9b5f8cee964b3cfcc009ffdae85ee206"/></dir></dir><file name="Grid.php" hash="70b9dcb80509409e88c21784baa0532b"/></dir><file name="Queue.php" hash="f4a9ea1bd5bdc67990838cd97504a393"/><dir name="Template"><dir name="Edit"><file name="Form.php" hash="638c1d41e38718d2a3ccc777f491bbd1"/></dir><file name="Edit.php" hash="27d161256c3b046b42d37f59c08e2bb6"/><dir name="Grid"><dir name="Renderer"><file name="Application.php" hash="c34c70dd991c0d695e3b9d815aeca348"/><file name="Name.php" hash="886376303d244e11cbf5c47bf8809414"/></dir></dir><file name="Grid.php" hash="7716ea17df130bd41600a5db1425f9da"/><dir name="Preview"><file name="Form.php" hash="8926ee9fa52e36c5c74d6d80ebd844ed"/></dir><file name="Preview.php" hash="94564a249cb9b6d3d15662494df1e487"/></dir><file name="Template.php" hash="7b8739475cbdc01ac713db1030a82621"/></dir><dir name="Cart"><dir name="CartTotals"><file name="Default.php" hash="c8ff7d7e31bef75ec9eff4948c43e7b3"/><file name="Grandtotal.php" hash="4934e430406b1011a9bca565d060c07c"/><dir name="Nodes"><file name="Default.php" hash="d8e069bf4d300ff20b1d81cf217f8705"/><file name="Giftcardaccount.php" hash="c88c113de4908d5421ef2b31d0431846"/></dir><file name="Shipping.php" hash="87172feac6d58d4eb45a239e32fb8242"/><file name="Subtotal.php" hash="915d613be9c50980a26242c27ccb2c2b"/></dir><file name="CartTotals.php" hash="eae6ac9e9b158f3ca41d513717a24618"/><file name="Crosssell.php" hash="693e78eb7e8d826f40e72c32a45fea2e"/><file name="Info.php" hash="1e7d8128dd1cb3e2a4aded6d6acce376"/><dir name="Item"><dir name="Renderer"><file name="Configurable.php" hash="a775bd000e9e96867bdcb7b2fe71d0f5"/><file name="Grouped.php" hash="efbb8d5ca854edea9768e0a5917b87e4"/></dir><file name="Renderer.php" hash="2174de1fdf9b9e3f2b5bf2b0b5771bd9"/></dir><file name="Items.php" hash="d251705042edb440ad95f09f15320aa9"/><dir name="Paypal"><dir name="Mecl"><file name="Details.php" hash="1e81321ec11a17e648ceb21dd53b0eaa"/><file name="OrderDetails.php" hash="c8a3884eca195380afa18ce54e5ff065"/><file name="Review.php" hash="4ce37ae651e4711379bfd240407f9d0a"/><file name="Shippingmethods.php" hash="7662aab61036ac80d16a560767a8685b"/></dir><dir name="Mep"><file name="Totals.php" hash="73794887f8bba536fa5d7372f19c5632"/></dir></dir><file name="Totals.php" hash="3444019386d2c9221ca82bca273f9eae"/></dir><file name="Cart.php" hash="f634a6bf4edaa9fed4db57b41566c52b"/><dir name="Catalog"><dir name="Category"><file name="Info.php" hash="4f584a53dcc3d44cad0598d5fbd613d2"/></dir><file name="Category.php" hash="e7a0d82550971d5fb15c60437a3fdb9b"/><file name="Filters.php" hash="7d48f39eae81ee46be3c32d47f271bb2"/><dir name="Product"><file name="Attributes.php" hash="a6f5d5a2c030379ffd30621124daca3b"/><file name="Gallery.php" hash="51c9c651c3e047bf9705cf923f035750"/><dir name="ItemPrice"><file name="Bundle.php" hash="51ffbac40f598e2a5da1eaee0a536d0e"/><file name="Default.php" hash="1507351706988afea4a6b44fefceac89"/><file name="Giftcard.php" hash="34ea16ffbe747ae7bd3cec3e9982bdb9"/></dir><file name="ItemPrice.php" hash="f1e9872e2bc8985700a2de73684e7190"/><file name="List.php" hash="0c1d0e33c6e34e9f493b2569cbc20b61"/><dir name="Options"><file name="Bundle.php" hash="7f2cd2644fd1842e1d7c4f0be60bef0c"/><file name="Configurable.php" hash="d30d4dd249b6a2dbe2d0aac0ae3c83b2"/><file name="Downloadable.php" hash="4d88edd97574ee96ebc94d6bfd434f69"/><file name="Giftcard.php" hash="6b5a4494608e7816d0de9a84e62767ad"/><file name="Grouped.php" hash="0ce924244d56fd14d424dd87e17d8f38"/><file name="Simple.php" hash="ead18f7a68dba84539e4237e6ae15a29"/><file name="Virtual.php" hash="0376a0063f7bfd9b3d3e58dcd169622e"/></dir><file name="Options.php" hash="30859e6a3ad127c63ca334a56594b7d9"/><dir name="Price"><file name="Bundle.php" hash="225410efec645d45bfdf7333cbbd4585"/><file name="Default.php" hash="5daa96abf89a00528d49c83fa59a8f1a"/><file name="Giftcard.php" hash="269cef2bd6b8fc038e923b20ca65453e"/></dir><file name="Price.php" hash="62f243e386283af580312bf893f01ea6"/><file name="Related.php" hash="26f03af42188cd00edf10d9af00b3e1b"/><dir name="Review"><file name="List.php" hash="e4ad8e91d1e6cb7f6f252e6841347e1c"/></dir><file name="Review.php" hash="e88823df020cde37b12f45b093c01ce8"/></dir><file name="Product.php" hash="d384ddadc9059d23496403b5bf66ae35"/><dir name="Search"><file name="Suggest.php" hash="c174891176f91b2f9f44b523a10b9cbf"/></dir><file name="Search.php" hash="9dbf5a085861303fb957001a276b2fd7"/></dir><file name="Catalog.php" hash="b07ab50d4b9fc5e831363a42eebb2b4e"/><dir name="Checkout"><dir name="Address"><file name="Billing.php" hash="d55fc39c0b076c0f18f3c8de09d97648"/><file name="Form.php" hash="47f069d2d44282462986a564642efb89"/><file name="Shipping.php" hash="85554583ee856d10f44d5c80968aa58a"/></dir><file name="Agreements.php" hash="ee37ab99f679e0e675eb31f39849106e"/><dir name="Cart"><dir name="Item"><dir name="Renderer"><file name="Bundle.php" hash="66aa300f9258901884b081bc20fa6700"/><file name="Configurable.php" hash="478d8ea4361018daede1ffa25809d48f"/><file name="Downloadable.php" hash="79e0b770949e3d8bf2ca8e2370b21db5"/><file name="Giftcard.php" hash="9d024707dac83c8d698cb10169874ded"/><file name="Grouped.php" hash="79e4f87094e6567610343a6c5d40c707"/></dir><file name="Renderer.php" hash="b9bd5689904302217b92111e0be18dd1"/></dir></dir><dir name="Onepage"><dir name="Address"><file name="Form.php" hash="48227f7aeaf553303e050bcfe5ef6184"/><file name="List.php" hash="c089d7aae70feeb541236e5063e47057"/></dir><file name="Address.php" hash="9edac7f767c200d29bf95f89261740f9"/><file name="Review.php" hash="b52556ed801a24e5dd9993d710309a98"/></dir><dir name="Order"><dir name="Review"><file name="Info.php" hash="70348506e8bb39e88d0dd6ec1414b68d"/></dir><file name="Review.php" hash="7f2da6dcf578f26c19eb7badf2a2f4ab"/></dir><dir name="Payment"><dir name="Method"><file name="Authorizenet.php" hash="02870a902f73ce6e1063095acd7ad8d3"/><file name="Ccsave.php" hash="202c09f11cd52ddf0af350befbf1a274"/><file name="Checkmo.php" hash="3856092c42ca177ffe7cdb3fd4089931"/><dir name="Info"><file name="Authorizenet.php" hash="2474ac40b4e1ec16d95286fbb8098ccc"/><file name="Ccsave.php" hash="3ee9fa6857c2e166c6580ba95da611fe"/><file name="Checkmo.php" hash="26f41556eeedcf1e681b8fef5684ea10"/><file name="Free.php" hash="2257f0b3078440569a560efad36acff2"/><dir name="Paypal"><file name="Abstract.php" hash="25ea64aafec4eec544252c2d3993a496"/><file name="Express.php" hash="37bef6c8c0903331dbea21c8f7e53ba5"/><file name="Mecl.php" hash="b5427b95f3c15be5b45349f0eb5a248d"/></dir><dir name="Pbridge"><file name="Authorizenet.php" hash="284febde754cae44d570a533da47bbf9"/><dir name="Paypal"><file name="Direct.php" hash="64ebed55eb3bb780a6eb6469b642db7e"/></dir><dir name="Paypaluk"><file name="Direct.php" hash="7ee203531ceb6738d0e1edcb4ed32a82"/></dir><file name="Verisign.php" hash="af9be389ccafdd65c778f9b96eb7a1e9"/></dir><file name="Purchaseorder.php" hash="b0f208daa22f673b141b899567622cb4"/></dir><file name="ListApi23.php" hash="bcef31640d788487ef9616354f1c1a17"/><file name="List.php" hash="6dc907293febb693f390f5138be3d460"/><dir name="Paypal"><file name="Direct.php" hash="07bd88a76fe4cf13b7d360f4b1b1e275"/><file name="Payflow.php" hash="82b5a5262ec6f639c965fd281bac85b7"/></dir><dir name="Pbridge"><file name="Abstract.php" hash="56dc10c5e3399645681cdee56acbac83"/><file name="Authorizenet.php" hash="b339effc96733f5932b5537e44b34a15"/><file name="Paypal.php" hash="4fb99bbdd42e2ef67ba464c728fceff0"/><file name="Paypaluk.php" hash="f86344d0c3a4b220355deca6381d89bc"/><file name="Verisign.php" hash="9723a47a219a64f071c53a077af8f355"/></dir><file name="Purchaseorder.php" hash="0bf2815b283df4201e68f9852cc69efe"/></dir></dir><dir name="Pbridge"><file name="Result.php" hash="3ad50ad9dce5a39ed7870a90805bba7b"/></dir><dir name="Shipping"><dir name="Method"><file name="AvailableList.php" hash="424f20dfe5960ce5dcd842485aabe3ac"/><file name="Available.php" hash="9f664cd0bfa1be34d8150c0484f55f8f"/></dir></dir></dir><dir name="Cms"><file name="Page.php" hash="548c9831b209b8a78531bae3f6a46e6c"/></dir><file name="Configuration.php" hash="7962b8a45b9234b7411c1cf099122dbe"/><dir name="Customer"><dir name="Address"><file name="Form.php" hash="2ba116fcead300b7bd858c75db27a9d8"/><file name="List.php" hash="48015a49578f5609bd6d069716409f20"/></dir><file name="Downloads.php" hash="b23712eda4178d7ebb9c15a903c3cc92"/><dir name="Form"><dir name="Renderer"><file name="Boolean.php" hash="213f530e3fc10c6499cac93badde23b8"/><file name="Date.php" hash="23392a77761c6ce55b3a8cbf00d3e308"/><file name="File.php" hash="acadd01185714686d4c5a753d0150c36"/><file name="Image.php" hash="71e1ee343cfb343045e3c401f17bd3d4"/><file name="Multiline.php" hash="7d721ab08e041779cc3c2f5c8b771370"/><file name="Multiselect.php" hash="e4c575ae29fe8868822f0e73b84c8376"/><file name="Select.php" hash="fb14b532cd7154012605c7a11f96dc47"/><file name="Textarea.php" hash="1a363e16dba52210cb58d77ff90db881"/><file name="Text.php" hash="2091a9307c3b065cc0ab43f21dc5e537"/></dir></dir><file name="Form.php" hash="7d384de50653123c24559a0465b119b8"/><file name="GiftcardCheck.php" hash="3052909f80f39ca2d5734e280e6962ad"/><dir name="Order"><file name="Details.php" hash="04248e063b4cacb82a1a503486a636e5"/><dir name="Item"><dir name="Renderer"><file name="Bundle.php" hash="b996eb0c52c70d8eccd3d2937cd20c01"/><file name="Default.php" hash="8b8d549ebaf4f9c342075067f84ee889"/><file name="Downloadable.php" hash="3b173d4b73f7a6890c23fe14609ae760"/><file name="Giftcard.php" hash="936c6ba3248d1a577d27aa4c4fd31ac8"/><file name="Grouped.php" hash="09365127cb2a879654af3fe622614467"/></dir></dir><file name="Items.php" hash="26f2327c27ca3e822536fb97bab5e283"/><file name="List.php" hash="09797784bed1d4eafcbca30f7f548d23"/><dir name="Totals"><dir name="Customerbalance"><file name="Refunded.php" hash="20425c03aaa0d4c391118df0244e41e0"/></dir><file name="Customerbalance.php" hash="bb771f908bd8cf270be62cdb043d48d0"/><file name="Giftcards.php" hash="853ef80cb824d885539b3206d55866ac"/><file name="Tax.php" hash="3586f406cc05c90e8ce9e06dd6632bf5"/></dir><file name="Totals.php" hash="684508ff133fa42ced2f2bbb96e30edb"/></dir><file name="Storecredit.php" hash="26cf399621bc6001c563d07d1cb61d98"/></dir><file name="Homebanners.php" hash="ddb3b5bd43db4c349971b01c0437c8b7"/><file name="Home.php" hash="ba9740cc1eb3a5ad4eac2c9cbcf1e956"/><file name="Localization.php" hash="ec70b2e0cfeef7b6466a91ea4ee7a171"/><dir name="Review"><file name="Form.php" hash="f8ee61661f6bca8dd5dab030b6717bda"/></dir><file name="ShoppingCart.php" hash="ee19b50120d4ee167a7aad14ed4ae281"/><file name="Wishlist.php" hash="2209cfc39772b2f5b03c95664a9aa18f"/></dir><dir name="Controller"><file name="Action.php" hash="98943d6e946fa615095a1caab402b2de"/><file name="AdminAction.php" hash="bfc7fdb9ffca3f93ba380aaa528f190a"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Admin"><file name="ApplicationController.php" hash="9e2c7a714d04d09fc110fb88fe75a63f"/></dir><dir name="Connect"><file name="ConfigController.php" hash="9b5d90e04520947487189f427ffeb6a4"/><file name="DashboardController.php" hash="1e5a577854ccc9adbceb7a8cb1d67aae"/><file name="UserController.php" hash="9b7ba51790b9976789e546f04f1a7239"/></dir><file name="MobileController.php" hash="bae8b1d38a75ac46da80d378026c9ed6"/></dir><file name="CartController.php" hash="070a7d8402fdafb1a655312aafe0c318"/><file name="CatalogController.php" hash="e267f6b3d9a9a95ddb1ad002108d0180"/><file name="CheckoutController.php" hash="7d380e4ad954e615b5bf9d584c01e59f"/><file name="CmsController.php" hash="d6880c202c1ceee2ada666b823d51069"/><file name="ConfigurationController.php" hash="994fa755704cfa8dda04d998bce844f6"/><file name="CustomerController.php" hash="d46fd02d028ef1573e939e63e5df3459"/><file name="HomebannersController.php" hash="8c54a450d9fd0e3924c3a1af390c429e"/><file name="IndexController.php" hash="ed722af2a3b921cd669fd4859b3175a4"/><file name="LocalizationController.php" hash="1e1a17b57c63136a76e6f2de51eda71d"/><file name="OfflineCatalogController.php" hash="5cd1afa273619dd7541ebd9725a48803"/><dir name="Paypal"><file name="MeclController.php" hash="77ddf93c7875f4d13707f443ea5dbf44"/><file name="MepController.php" hash="e425001a95489cd4ee0e36ca78846814"/></dir><file name="PbridgeController.php" hash="16232ee4b1c990e45516af8d454c92ed"/><file name="ReviewController.php" hash="d968dc6c98a4fdeffa7f04028caaade8"/><file name="WishlistController.php" hash="40dcdd24c8d7fa97e9b74363c83c9087"/></dir><dir name="etc"><file name="adminhtml.xml" hash="946ed3ca2b7e987f0c50733a0b8c0ae2"/><file name="config.xml" hash="43081985160bf9d003b2f00aa23356a1"/><file name="system.xml" hash="1b3d62b04b09e26c91471fdbbbb81bd1"/><dir name="themes"><file name="custom.xml" hash="675e0dcc0bfdaf87671fea2f164a3d7f"/><file name="default.xml" hash="7c250064150bb51ff7c6b2e471ad22e9"/><file name="funk_leaf.xml" hash="41016495adc80a6b0e8b665a83602505"/><file name="hot_red.xml" hash="70a88c96061d748bc3f3ff94d923f78b"/><file name="sky_blue.xml" hash="1dde52a19378fcb6d23533e6fe457e90"/></dir></dir><dir name="Helper"><file name="AdminApplication.php" hash="a13619e743ec75a66b1dee19344c32c2"/><dir name="Adminhtml"><dir name="Dashboard"><file name="Order.php" hash="3e6770020f1984ef52ee7d2fce9f1c74"/></dir></dir><file name="Android.php" hash="00e9c70a7d968e858c64fb4370c16563"/><dir name="Catalog"><dir name="Category"><file name="Image.php" hash="588323bde8eff16ab568b08806f4078d"/></dir><dir name="Product"><file name="Image.php" hash="a9b4c7d2444c3211d9d2a2ecd508460c"/></dir></dir><dir name="Customer"><dir name="Form"><file name="Renderer.php" hash="684f62d30c6fa01546cd63d5de10e16a"/></dir><file name="Order.php" hash="f2c39c97ce3d97d4b8115b3a2be2e81b"/></dir><file name="Data.php" hash="b0aae472d9ee4b671680bdcb649e1268"/><dir name="Device"><file name="Abstract.php" hash="f0d3a5015e288744e068cb0e45b70537"/></dir><file name="Image.php" hash="b910be83319261c591775e73c840531e"/><file name="Ipad.php" hash="54a15dec229a89c86dccda8a3a30bc3f"/><file name="Iphone.php" hash="b9f05cda36334e9c80cf391e5926bb5d"/><file name="OfflineCatalog.php" hash="6c6dc56e097b1cc91c42077da32a08f1"/><file name="Payment.php" hash="5c614bf7894fd8ffd4b0167bad6c9da6"/><file name="Theme.php" hash="fae57f78d387eed564ba69d0ee9ea449"/><file name="Translate.php" hash="df7e87deb3bc6f5bef5bf859d687ea3d"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="Search"><file name="Catalog.php" hash="a882038d2ddea12785c7a4c93d2663db"/><file name="Category.php" hash="9c9b1f6b96fba4afc1cf2493ca180738"/></dir><dir name="System"><dir name="Config"><dir name="Backend"><file name="Baseurl.php" hash="ae57b44859ceeeb7cd2a02a8d52b168a"/><dir name="Currency"><file name="Default.php" hash="bd4660fadfcfcb11c28ecaec085dbf12"/></dir></dir></dir></dir></dir><file name="Application.php" hash="bf22fe703014198891c0feed900070d4"/><dir name="Catalog"><dir name="Category"><file name="Image.php" hash="90fb4774d0853ac97e0d08537aec2adc"/><dir name="Media"><file name="Config.php" hash="2fe0140a0aecaf3fe63d5e3b18f41117"/></dir></dir></dir><file name="ConfigData.php" hash="3fe85fd42aafe5ed2012cf99c0679498"/><file name="Configuration.php" hash="6d07359db2a1f0a071063191a2f085af"/><dir name="Device"><file name="Abstract.php" hash="929550b4843f37ddc986dbb2da22a86b"/><file name="Android.php" hash="b0f56d0cfc5cb8ab4c0e65eb27434e0d"/><file name="Ipad.php" hash="c626a144f02ed01e63cf52ea639e5425"/><file name="Iphone.php" hash="e428471f6799d6e6a9ea3c8c22a3e24d"/></dir><file name="History.php" hash="493deedb6bb2e645aff6b3aaad84de3f"/><file name="ImageAction.php" hash="12a6e72f6a078a48d4f2727c686aab88"/><dir name="ImageLimits"><file name="Abstract.php" hash="649ca8f0f96b43a41db3c6d205d56d80"/></dir><file name="ImageLimits.php" hash="74eb7063efde71d37c0fa226b364a0c6"/><file name="Images.php" hash="6ab6cc2fbd9fddd9b69f903bb8363b22"/><dir name="Mysql4"><dir name="Application"><file name="Collection.php" hash="e11024d952ae5b11c888aa2beb7ac08f"/></dir><file name="Application.php" hash="72105d9bb249252a5e11c3d5f2b71fca"/><dir name="Cms"><dir name="Page"><file name="Collection.php" hash="39dc587c16a814e3621f5f546b3123d2"/></dir></dir><dir name="ConfigData"><file name="Collection.php" hash="e08bf889ec43e57fa7506a89c1640def"/></dir><file name="ConfigData.php" hash="5b6bafba186653bd9c183a49feef2cdf"/><dir name="Filter"><file name="Collection.php" hash="f37c4b45fe9b770e94bdbf672b691c07"/></dir><dir name="History"><file name="Collection.php" hash="cdb931bde27a76b3b1fcec4897f22d47"/></dir><file name="History.php" hash="9e9451a8a134afcd93d20dc365d31190"/><dir name="Queue"><file name="Collection.php" hash="8f09631aa0b5b7379b23cd6f8c38a150"/></dir><file name="Queue.php" hash="40a4f145b7eec58d6c81b7cd0183bd9a"/><file name="Setup.php" hash="3f3d42d0c201ce9cbf7d2c4c9144c420"/><dir name="Template"><file name="Collection.php" hash="1d5139cd64d1006e1093f6bf4a22ae86"/></dir><file name="Template.php" hash="fb62c844c1fea9c7b87c6fc7e29844de"/></dir><file name="Observer.php" hash="f4ef0f48829c19f373f3fbf3b94198e1"/><dir name="OfflineCatalog"><file name="Abstract.php" hash="5733e268a8475b708d9ca37146dc29ff"/><dir name="Category"><file name="Category.php" hash="d56570e7c08e49b743f61b594ababf4f"/><file name="IndexCategory.php" hash="3893f543d7475836535935849c4cf87a"/></dir><file name="Category.php" hash="21d9a14b98b5948f46e80395df148a25"/><file name="Config.php" hash="ff609a47e503980286d39800ab13352c"/><file name="Homebanners.php" hash="98bdb4c44e64741efdc01049cf91b01c"/><file name="Home.php" hash="44e9e37cefda5f2f7cb612895869ea3e"/><dir name="Product"><file name="Gallery.php" hash="aff96934b544b0adcc1b9d691be43db2"/><file name="Product.php" hash="6e6d8bb8c21f7e471a147cf1e57f2ad4"/><file name="Review.php" hash="477933be0f5827e7767328b76347b8c9"/></dir><file name="Product.php" hash="1a6c2da4c027a0d745297c8514402517"/></dir><file name="OfflineCatalog.php" hash="602bcbf8bdabc60d4b96a08393a2981c"/><dir name="Payment"><dir name="Method"><dir name="Paypal"><file name="Config.php" hash="3d56b57549a20bb66e7e1960dabe5e74"/><file name="Mecl.php" hash="30835befb7dba40300ec522e773c6afc"/><file name="Mep.php" hash="0cc005f74fb99b9cb75fdf7b5a473b7a"/><file name="Pro.php" hash="0044da22cfe130bad7becdcf2b6971ae"/></dir></dir></dir><dir name="Paypal"><dir name="Mecl"><file name="Checkout.php" hash="3fcb64755bedeac2c3277412c057cda0"/></dir><dir name="Mep"><file name="Checkout.php" hash="6d4100b5034bf755c691371e4989e096"/></dir></dir><dir name="Preview"><file name="Abstract.php" hash="223bfbf1e212350e340f4b3b603a7ac5"/><file name="Android.php" hash="cdcec341e574d20ed1d91ae6fd1c17da"/><file name="Ipad.php" hash="00c0497919c8de7fde1fa71469cd11c4"/><file name="Iphone.php" hash="350b01b27f768a6215fa6145f5f8313d"/></dir><file name="Queue.php" hash="3de7d74c418249986d09dd4492fe394f"/><dir name="Resource"><dir name="Application"><file name="Collection.php" hash="1e356a55c2afbc7f831ce16fe411d7c6"/></dir><file name="Application.php" hash="fdcaadf4c10d88fda930bacec0d79c8d"/><dir name="CategorySearch"><file name="Collection.php" hash="cbb7b82ded0b3a01f8c68210b301c0d8"/></dir><dir name="Cms"><dir name="Page"><file name="Collection.php" hash="7ad9fed29e97b4b7df1cc346e8728af3"/></dir></dir><dir name="ConfigData"><file name="Collection.php" hash="493c91b7c2a2cd481762a19aa54e9a61"/></dir><file name="ConfigData.php" hash="20fc003701c301d6aebdc56a891cf1d5"/><dir name="Filter"><file name="Collection.php" hash="10dfc66a6d1e36346ae7ddfb9826d70e"/></dir><dir name="History"><file name="Collection.php" hash="052b608fb7995e4079c7251ae2604ced"/></dir><file name="History.php" hash="538dc1f8eae7d6a1284ace658c8c0272"/><dir name="Images"><file name="Collection.php" hash="06b4fe6df9fc2692cc1b14529425f820"/></dir><file name="Images.php" hash="7af625dccc80b9daee5efb1e8cbd420c"/><dir name="Queue"><file name="Collection.php" hash="276fe714ddf4d08d3bafa18f6256e3d1"/></dir><file name="Queue.php" hash="0ec1c65b19513132127885b8efe921aa"/><file name="Setup.php" hash="da3215576f9f4d655d242cc220fcc1f2"/><dir name="Template"><file name="Collection.php" hash="c3a2feeb65499f8bf3b68855d9f7e828"/></dir><file name="Template.php" hash="04a3b5eddc6a7d484bc51fb9f915f783"/></dir><dir name="Simplexml"><file name="Element.php" hash="79cb561a33746d95e73976fcdc4f7bae"/><dir name="Form"><file name="Abstract.php" hash="765461ba4b1f1e6e3053a5ddad95adb5"/><dir name="Element"><file name="Abstract.php" hash="1572eeb8a55e9f1c65e297c449cce05e"/><file name="Checkbox.php" hash="4f9978736adeea315c459671dcc9c852"/><file name="Collection.php" hash="d3ddba2d118139eab2a0140cb6a5b4a2"/><file name="CountryListSelect.php" hash="ebefae27e3ec6e932e7e0ed6b62d3761"/><file name="Custom.php" hash="0a50b93bceb0498a154abdb01d10b5fb"/><file name="Date.php" hash="349f85444a26ba73fbe5e6874279b402"/><file name="Email.php" hash="f55c93cc4dbffc5169f6e65638346b01"/><file name="Fieldset.php" hash="9d751d8e92a2492e5cc880710b1c03c2"/><file name="File.php" hash="772d3d0bb6e7fc584dedeba0d4311fe7"/><file name="Image.php" hash="93df70a7ae715815f4ed94744160892b"/><file name="Multiline.php" hash="b6c317e8857831ee6373b12991aa659e"/><file name="Multiselect.php" hash="97a77379880a7ed262292f6e5787a118"/><file name="Password.php" hash="83731d3ae203139e28c3cae01229e08c"/><dir name="Renderer"><file name="Interface.php" hash="fe359ca0c3be3512f7d64d4fec47dec8"/></dir><file name="Select.php" hash="847a5bf855672f517961bfee8e7a0e90"/><file name="Textarea.php" hash="ba7003dcf83ec8d13dd160d170af5756"/><file name="Text.php" hash="da1d2e8f31d225a0ac784512942307cf"/><dir name="Validator"><file name="Abstract.php" hash="7a0c17b710711975bd3e3d3f61ebcf0a"/><file name="Rule.php" hash="971fa1fc137183b3c4f21793cc8a0bfa"/></dir><file name="Validator.php" hash="7505d1b3e95b169fcb05b8d5a1b7cc87"/></dir></dir><file name="Form.php" hash="682df3b5a5880d2ff69b5d9e93e478c6"/><dir name="Message"><file name="Abstract.php" hash="61535fded39b13695baace8c75c36c01"/><file name="Error.php" hash="38f98d0d6ecbfb83cbb922de8f648f8a"/><file name="Success.php" hash="293ff3d9292df84be4bec95b43521481"/></dir><file name="Message.php" hash="5bda406a4723dad32411682303a2889b"/></dir><file name="Tabs.php" hash="60fc3f0b73ee404a687da6cc06beaefc"/><file name="Template.php" hash="8f1ef4dcb6b3c53226ab6f0cec90b662"/><file name="Theme.php" hash="61bae247788e23060ef3a2e4ee3bdfdc"/></dir><dir name="sql"><dir name="xmlconnect_setup"><file name="install-1.6.0.0.php" hash="1ee32bae4304731320615472bb4a893f"/><file name="mysql4-data-upgrade-1.4.0.13-1.4.0.14.php" hash="0aba89ca2a1ca1b928c1534cec611a57"/><file name="mysql4-data-upgrade-1.5.9.9-1.6.0.0.php" hash="d9dce4c4283315b253b57ba6ab0f38db"/><file name="mysql4-data-upgrade-1.6.0.0-1.6.0.0.1.php" hash="3301e89eb8ef4fe5a2f5099763633b4a"/><file name="mysql4-install-1.4.0.8.php" hash="ca37b2a8950bc235ddcb4d2770d6c7c9"/><file name="mysql4-upgrade-1.4.0.10-1.4.0.11.php" hash="44f63e11b71dd6740d189a968b49db0b"/><file name="mysql4-upgrade-1.4.0.11-1.4.0.12.php" hash="620ea470fb0275250eb3ef378b38e494"/><file name="mysql4-upgrade-1.4.0.12-1.4.0.13.php" hash="d7eb2b2f1619ab8c388ee1a65e5d0f6c"/><file name="mysql4-upgrade-1.4.0.13-1.4.0.14.php" hash="9432b0a516a69b89833f18d6d7125199"/><file name="mysql4-upgrade-1.4.0.8-1.4.0.9.php" hash="5a9ac704763b3f0da39a50c19c0ade9a"/><file name="mysql4-upgrade-1.4.0.9-1.4.0.10.php" hash="fb5c5b901080ae7c4b957d90a64a9ad0"/><file name="mysql4-upgrade-1.5.9.9-1.6.0.0.php" hash="f13d345b7eed151251efea9cd1f3ad9c"/><file name="upgrade-1.6.0.0-1.6.0.0.1.php" hash="b64599ecaba8d51760dcb2dc791e089b"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="xmlconnect.xml" hash="aa5fafa4febd86bd6502ddb0dcb85c57"/></dir><dir name="template"><dir name="xmlconnect"><dir><dir name="centinel"><file name="authentication.phtml" hash="2a4e29974fdeefc4240616ea8f535fcd"/></dir><dir name="pbridge"><file name="result.phtml" hash="fdb04d22a06d1f0ccee0e3cf586adc1f"/></dir></dir></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="xmlconnect.xml" hash="a57bc541bf4ea36e65ec131de1044ec9"/></dir><dir name="template"><dir name="xmlconnect"><dir><dir name="edit"><dir name="tab"><file name="content.phtml" hash="8d6873de105590266d6b465f64d6e6a4"/><dir name="design"><file name="autocomplete.phtml" hash="487e0463641497282aa821069b6e79b1"/><file name="image_edit.phtml" hash="20b09b8ac0bfd54fa036aa00bdd977df"/><file name="images_android.phtml" hash="2aad52077703f7352c327418566d9808"/><file name="images_ipad.phtml" hash="49975f0f22cbbb060b0eeb154286fb69"/><file name="images_iphone.phtml" hash="cb4248b88be690dbae49cd07aa2cd7bf"/><dir name="preview"><file name="banner_rotator.phtml" hash="8abd478e5588876b32af31a49194c6d4"/><file name="catalog_android.phtml" hash="313545068ec05160e4a463978a6cb334"/><file name="catalog_hor_ipad.phtml" hash="1145fc562e160da053898e2b4de4d85c"/><file name="catalog_ipad.phtml" hash="9ab337d9ee74f6504c7a49b06044dcb7"/><file name="catalog_iphone.phtml" hash="b77f11a3a1d921aac530099ecee569b2"/><file name="home_android.phtml" hash="66d6de26e77386c1212051c8c55136ef"/><file name="home_hor_ipad.phtml" hash="045826515b6673269f3afbf81e9130db"/><file name="home_ipad.phtml" hash="59905f5d0ee1d537e5e903bfb5211a91"/><file name="home_iphone.phtml" hash="cc26687cf3b9d48473f4984379a28b8f"/><file name="productinfo_iphone.phtml" hash="aacaa720b9137b451909ba366c85cf65"/><file name="tab_items_android.phtml" hash="03967d079497779587cb0a1f69de1da4"/><file name="tab_items_ipad.phtml" hash="fa22c3f28ab4d0d98942daf129a9c3b0"/><file name="tab_items_iphone.phtml" hash="fca018a107ed5b05451122c3cbd2778a"/></dir><file name="preview_android.phtml" hash="6d2abb883e9181ff27742f5e81d84839"/><file name="preview_ipad.phtml" hash="f142b003e49a7b1471fd4c5ecd6447ff"/><file name="preview_iphone.phtml" hash="4c1b90365b138417034bee67dee13ed9"/></dir><file name="design.phtml" hash="dd3dc0b014620c7e33991844428e580e"/><file name="offlinecatalog.phtml" hash="e3da0144fde174d796bc8ec196b64368"/></dir></dir><dir name="form"><dir name="element"><file name="addrow.phtml" hash="91502e205fcb3c920b5203a1b27634db"/><file name="app_tabs_android.phtml" hash="2eaf0f60d65e58ee0db6e1b121362408"/><file name="app_tabs_ipad.phtml" hash="bfec24669ac91fde22b16262757494e9"/><file name="app_tabs_iphone.phtml" hash="4778521733484c0809e82e3d8d1af458"/><dir name="country"><file name="androidmarket.phtml" hash="c221c4cfd3cdf478cf05e14a19f2706c"/><file name="istore.phtml" hash="61d0d9e476baabae6f1a7dcd4f390d63"/></dir><file name="themes.phtml" hash="d8cfc2da13b9a298feece2ba1d06220e"/></dir></dir><dir name="mobile"><file name="notification_helper.phtml" hash="75086670d43a6b72bc05829a5a753875"/></dir><dir name="submission"><file name="app_icons_preview.phtml" hash="ad5fcda16948cac46fe4c8080b78052d"/><file name="container.phtml" hash="a60efd4606eb95bbadb702c84728307b"/></dir><dir name="template"><file name="preview.phtml" hash="5740ac70f627c655be8332b605739d86"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_XmlConnect.xml" hash="e1668e240ece742e48bf4f75a34a80d2"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Mage_XmlConnect.csv" hash="50e9493da78f8e6591fd3fad1311047c"/></dir></target><target name="magemedia"><dir name="xmlconnect"><dir><dir name="custom"><file name="ok.gif" hash="398f81b3983f802a99932eaf97ee0806"/></dir><dir name="original"><file name="ok.gif" hash="398f81b3983f802a99932eaf97ee0806"/></dir><dir name="system"><file name="ok.gif" hash="398f81b3983f802a99932eaf97ee0806"/></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="xmlconnect"><file name="boxes.css" hash="a3648c3516608a34ee7f53e447b1d9f4"/><file name="dropdown.css" hash="e5388a1fd90df2a2e3860516adef0367"/><dir><dir name="fonts"><file name="android_icons-webfont.eot" hash="2fc917efbfb3c933ccfddc108ef05f33"/><file name="android_icons-webfont.svg" hash="e8cb2b5ef019bbc2885c97ed0caaf2a0"/><file name="android_icons-webfont.ttf" hash="bc567dd7a381093fbb652c58cbad9430"/><file name="android_icons-webfont.woff" hash="8310b54d55bf84a8a3f3a86c22a51aef"/><file name="stars-webfont.eot" hash="019beb4b8ec19447657cf3106138bbe3"/><file name="stars-webfont.svg" hash="20cf0312c0b951d173d4531ea18abc6f"/><file name="stars-webfont.ttf" hash="d63d95e9adaf775f410437535622bf60"/><file name="stars-webfont.woff" hash="526d9756131c94139f0f1df5272197fd"/></dir></dir><file name="iestyles.css" hash="3e8a316291621eee4147373bd3003eb9"/><file name="mobile-android.css" hash="c932d2898a1ffd5545cfd76699260125"/><file name="mobile-catalog.css" hash="ca7c4c2c7643ca1249e00bbd45980fd2"/><file name="mobile-home.css" hash="b10c97acf5ac07c40d1db72b9d413841"/><file name="mobile-ipad-catalog.css" hash="2b35f47bb153c659640dd37beac277f1"/><file name="mobile-ipad-home.css" hash="270c8e4c8111de6c6173f9b6883c85ec"/><file name="remove.png" hash="b4903936d44dc498d2f32b72d9161ff0"/><file name="styles.css" hash="c87a56ddc3001a2e357d648695855f5f"/></dir><dir name="images"><dir name="xmlconnect"><file name="btn_edit.gif" hash="e7ecc9fea5c3813957814050508507a5"/><dir><dir name="design_default"><file name="accordion_open_android_l.png" hash="bc27688afbfd866c618477ea2c7bf0ee"/><file name="accordion_open_android.png" hash="7ef2f1d193990c3f4c2c90aae9ab3281"/><file name="accordion_open_android_p.png" hash="2e4549cba575c12ef2a39c12e9ffe173"/><file name="accordion_open_ipad_l.png" hash="dcdda97da6556393b972d6dae8d6bac5"/><file name="accordion_open_ipad_p.png" hash="55cca08a0ab79047961858789ff8c3a7"/><file name="accordion_open.png" hash="4c89d903ebbc61ee295ef64a60724b10"/><file name="banner_1_2.png" hash="0637d31df6b5a434c9a332ee46122ef4"/><file name="banner_android.png" hash="02695661b8e50e1a001c3369622f322f"/><file name="banner_ipad_l.png" hash="04e850d481a9ae902f33fd8c1f89cbf0"/><file name="banner_ipad.png" hash="c1d59a6ec67da1bb76c5142453da7acf"/><file name="smallIcon_1_6.png" hash="c1ce9e289eaf2c0504d502928693bd89"/></dir><dir name="mobile_preview"><file name="1.gif" hash="817fd84187db3eee00799b0acf316457"/><file name="2.gif" hash="1a842d8f3ac25cfcdeab6c86dd8fea89"/><file name="3.gif" hash="207cd55e968c284bd52c86efdcdda1c7"/><file name="actionsBackground.png" hash="11faa8baee72f3e6a9a02a83915c8658"/><file name="actionsBg.png" hash="9acccd1980f17006942d74a718ebd7da"/><dir name="android"><file name="background_home_landscape.jpg" hash="1f79a1f42ca4e2cf6010ab6c3ef66aa4"/><file name="background_portrait.jpg" hash="197b15e6455ad1a85e1bad6595371fa3"/><file name="bg_button_up.gif" hash="204f590a88933c930b7fc92963accfab"/><file name="bg_catalog_filters.png" hash="7464191ebaf576b73a3c021eb1cfcc25"/><file name="bg_catalog_filters_shadow.png" hash="5021ad60917190026d85fae1d33bdaa9"/><file name="bg_cat_item.png" hash="2859b45c387b66243d4af2ba973b2ae1"/><file name="bg_content.jpg" hash="70ddfc8959d878d1231dc7cbee4a063c"/><file name="bg_frame.gif" hash="7062ed9b7563fc658f49ce7cfdd34f1c"/><file name="bg_header_catalog.png" hash="c1080cd18a89e21da18fdc6955bf6230"/><file name="bg_header_home.png" hash="dfce0445ca7c7a45c7914a986b596ce0"/><file name="bg_header.png" hash="d4a46c8850d1d89259921b1c28b5bce1"/><file name="bg_home_content.jpg" hash="1d55a198279e4f2b163c98c18f699646"/><file name="bg_home_header.png" hash="8bc1887a0c5760cc47b77b8a7a320426"/><file name="bg_logo.png" hash="02695661b8e50e1a001c3369622f322f"/><file name="bg_page.png" hash="d65f1d123655c2eaf3bb4a1e6035a08d"/><file name="bg_star_empty.png" hash="3f0421fb8c8f6c4be6ca501168a881e8"/><file name="bg_star.png" hash="fc6de6c4e0ed3478b8840e1ab81da725"/><file name="bg_status_bar.png" hash="52b41106451ac34672f82338bbc5370c"/><file name="ico_account.png" hash="c1fd338c74fcf483155acbd37c430807"/><file name="ico_home.png" hash="2de37f640463b354d68945320bfe3e4f"/><file name="ico_search.png" hash="8b0dd17a3e9c3328e66204fe379c66aa"/><file name="logo_big.png" hash="693bb9d118155a146b21ce9fcfba08da"/><file name="product_image_1.jpg" hash="8994979d4dcc1f339c73cd1f44398a7d"/><file name="product_image_2.jpg" hash="26d6599bdb35d80b25a1e903b40cfa19"/><file name="product_image_3.jpg" hash="d7c6d05196a84341afe0025d01b9dc61"/><file name="product_image_4.jpg" hash="2a88ead3dbbeff1d40168db692841f2f"/><file name="product_image.png" hash="dd975b128ba303e0ae2adc9772e0433c"/></dir><file name="arrow.png" hash="837259a7c365e46034dca728bffe9070"/><file name="background.gif" hash="bd92833eb2eb32e4a0282cea153ac13f"/><file name="background.png" hash="3717f4b4ba725701e2a0604129a3a815"/><file name="banner.png" hash="0637d31df6b5a434c9a332ee46122ef4"/><file name="btn-l.png" hash="92b2454528e9d39119038777cf53329c"/><file name="btn-r.png" hash="8c6aa9fd9203bc10822e0505f11e0c4d"/><file name="circle.png" hash="f4c116cb0554bf936d3b9ee38b7f3d1f"/><dir name="custom_icons"><file name="account.png" hash="0498d73e47ed47179e5546dc15c17dc7"/><file name="actionsBg.jpg" hash="ee3db742cbec9a436ba46118c8a01303"/><file name="addToCart.png" hash="e33876648546e99d875ca92bd2cd78e9"/><file name="addToWishlist.png" hash="1018602b7c5e0e11f0427ace96fd7d52"/><file name="background.gif" hash="bd92833eb2eb32e4a0282cea153ac13f"/><file name="buttons.gif" hash="0cd19a9d9178976906161ea100cba958"/><file name="cart.png" hash="815b4c64fae21b4c162525ece76dc44d"/><file name="home.png" hash="9e473791b022b7c2dfc7d29b1b6de887"/><file name="image-bg.png" hash="14bde5cf8b00dc5f6c60e52a0fa964dc"/><file name="logo-small.png" hash="9b3477a4552bcb878b4943aae5351622"/><file name="rowBgIcon.gif" hash="9ee89b961ae2bb047672ba5d2d2677c6"/><file name="search.png" hash="10bfa7ec3361ce7cbcc5d25087f181eb"/><file name="shop.png" hash="e6639a9fdc143363da82a7d78e126f1c"/><file name="star-active.png" hash="d4ab959a92bda610527a3e3942c4c0b0"/><file name="star-inactive.png" hash="f7fb99710be4c03ac23b1206f20e761d"/><file name="tellAFriend.png" hash="46f8ef48b29f245977d66d9312d87e70"/><file name="viewDetails.png" hash="9bacc63bcc483d3db5614a026d9391f6"/><file name="viewGallery.png" hash="304f3d03949d07055bc056359fe17763"/></dir><dir name="gradients"><file name="footer.png" hash="31a2feed50ef9c8637b412c4211f8300"/><file name="header2.png" hash="ad5a2dc6ec93914e925cfe2d43fb30a2"/><file name="header3.png" hash="920ad8c6903e90323a57fb02dca37280"/><file name="header.png" hash="5386da930a944cd75562216249cce08a"/><file name="item-bg.png" hash="a14886d1f9e14284ac6b4f1b61e68646"/><file name="sort-bg.png" hash="b8053bb772e849909e5b87e4fd1ebbe4"/></dir><file name="grid.png" hash="23faa3f5572cdeb597c2bceedd93a7f8"/><dir name="icons"><file name="account.png" hash="0498d73e47ed47179e5546dc15c17dc7"/><file name="cart.png" hash="815b4c64fae21b4c162525ece76dc44d"/><file name="home.png" hash="9e473791b022b7c2dfc7d29b1b6de887"/><file name="more.png" hash="f3662ae29923b87eba3a729192aa3df3"/><file name="page.png" hash="2291d77f21de042040bc0864be40138b"/><file name="search.png" hash="10bfa7ec3361ce7cbcc5d25087f181eb"/><file name="shop.png" hash="e6639a9fdc143363da82a7d78e126f1c"/></dir><file name="image-bg.png" hash="a588b9cced95a25fc18e28c775d9a001"/><file name="info.png" hash="3f0d2ed85b81e8251f294457c6bfa404"/><dir name="ipad"><file name="background_home_landscape.jpg" hash="9e3ef117985113b804531142d539b60a"/><file name="background_portrait.jpg" hash="bdf9e034fd30b923086e6c622ea10451"/><file name="banner_image_l.png" hash="a070a40d57610b5cc7160fe894482a1c"/><file name="banner_image.png" hash="693bb9d118155a146b21ce9fcfba08da"/><file name="bg_catalog_header_hor.png" hash="f61a67aa288e1b8a8df7b4d4527c662e"/><file name="bg_content.jpg" hash="70ddfc8959d878d1231dc7cbee4a063c"/><file name="bg_filter_button.png" hash="728f1cd358446881ffd863eff12204a1"/><file name="bg_filters_buttons.png" hash="02fcb0ed7a7268e9f64ebaf06235bc09"/><file name="bg_filters_tooltip.png" hash="3b05ca6e585acd3d766be01eeaa23d47"/><file name="bg_filters_wrap.png" hash="31288784fe95c67de9b45b44458b4155"/><file name="bg_header.png" hash="e2cf5a575a27e6e4533e3c85e3472a82"/><file name="bg_home_content.jpg" hash="1d55a198279e4f2b163c98c18f699646"/><file name="bg_home_header_hor.png" hash="9bfef728ece003d5b3433d2623ea168c"/><file name="bg_home_header.png" hash="00f2fbf96d2b915dcbcd921b0301ef3f"/><file name="bg_home_products.png" hash="ac6a8a79b959a0c8298b1f607c0f0af8"/><file name="bg_home_shadow_hor.png" hash="0d21a99c5c749d0e5070e3585ff4a23f"/><file name="bg_home_shadow.png" hash="c54b071ca3e97a6ee67588ef74b7b44e"/><file name="bg_product_image.png" hash="4da74325c1a4ee1ca19b414e5d590f75"/><file name="bg_search.png" hash="6ee08d05d0c4ef9ed64b9914b821f408"/><file name="bg_sections.jpg" hash="0ee90005663aced09a9ce6385bdbce2c"/><file name="bg_status_bar_hor.png" hash="bd4a9f11ecb1c896145267731d8a951d"/><file name="bg_status_bar.png" hash="17124d9d392bb8e37b202c80a595df54"/><file name="i_cart.png" hash="1bbe0a0e54eed5bb14b9bfcce83da758"/><file name="i_info.png" hash="3f0fda8b294b67bf698badbcaa99150b"/><file name="i_login.png" hash="deb4089bdc61582c78c90ef192d577e8"/><file name="i_remove.png" hash="4923eb5e76b3c6ba6df5c667db816a0c"/><file name="logo_big.png" hash="693bb9d118155a146b21ce9fcfba08da"/><file name="logo.png" hash="49c19f59b459b6c0b3b99daa3fe7f932"/><file name="product_image.jpg" hash="2bb6c69129bcb18dc93e9f48605647c6"/><file name="sections_arrow.png" hash="7db7144083a31882e8a62cb9579f478f"/><file name="stars.png" hash="70d38cd9883d70e4f6b21ac4874b9868"/></dir><file name="lightStar2.png" hash="75928926a6112540c9cb073157cb7d95"/><file name="lightStar.png" hash="b5dc40d5b793dae6a069357f49cccc24"/><file name="lines-h.png" hash="ea3d95812c9838affc6df2f3a3cb1977"/><file name="lines-v.png" hash="9e3ffee29ba28477d50da9642019bc0a"/><file name="login-btn-left-alt.png" hash="71bb6c7d24252aace27bee711d7616f4"/><file name="login-btn-left.png" hash="cbbf9afc6e9fc433f57270e88b63f351"/><file name="login-btn.png" hash="051ee2c1a8ce3f7b8de3293cd2e2ed85"/><file name="login-btn-right.png" hash="438fcc598d012bf6d33184e95accfd24"/><file name="logo_25.png" hash="ba41ed568d916175c32803b614442447"/><file name="logo-small.png" hash="9b3477a4552bcb878b4943aae5351622"/><file name="men.png" hash="46d7d1773118ef0a27353e8a9f6719fe"/><file name="mm-frame.gif" hash="eebf30806f1dbf2118e7ec39a016c86d"/><file name="mobile-catalog.css" hash="80cbd74984354df2d86f4ad68b9123a3"/><file name="mobile-home.css" hash="b57641c73c4eae08e0a02cd7291d9465"/><file name="rowBgIcon.gif" hash="9ee89b961ae2bb047672ba5d2d2677c6"/><dir name="slider"><file name="actionsBg.jpg" hash="ee3db742cbec9a436ba46118c8a01303"/><file name="addToCart.png" hash="2a146be4bc63713df19cc353e030d44f"/><file name="addToWishlist.png" hash="9b23a4e0d9acfc79f314e9082f14c4de"/><file name="tellAFriend.png" hash="b7600fa2ae52bdb1d6bb86fe4d9f1773"/><file name="viewDetails.png" hash="90cf37c6dbbee1861350b4c05469e3ae"/><file name="viewGallery.png" hash="304f3d03949d07055bc056359fe17763"/></dir><file name="slider.gif" hash="c6b87bf15b85b18c0515e2cbefaabe60"/><file name="smallIcon.png" hash="e76d2a6364042f41b3f35fc8cdc9c0ee"/><dir name="sort_buttons"><file name="bg_button.png" hash="87d0f1b123f01c3aea3cb8a2b146306e"/><file name="buttons.gif" hash="2f14f1a3f0fb38790779c992a58654ae"/><file name="buttons.png" hash="b4a3f17370e03bf5d2a5cdf7800c25a7"/><file name="button_up.gif" hash="7ad527f99b9975d5634fb2d5cc99e6b3"/><file name="center-active.png" hash="5903988cd458cd794f23a212d51aa725"/><file name="center-inactive.png" hash="135b46aaa5c3b131a5a7e9c45c004e06"/><file name="filters.png" hash="3837ab6fcfe959833dd998533db1ca7f"/><file name="left-active.png" hash="86e94441b96a0d27d0b0a7e5108f86ed"/><file name="left-inactive.png" hash="0ddcb75aa9971cca39a5a65b4bdff8c4"/><file name="right-active.png" hash="320740ff608187301b06a96eab2f9e8e"/><file name="right-inactive.png" hash="cac4b39ab380353ffd5fdbcedb6e0a0a"/></dir><file name="star-active.png" hash="d4ab959a92bda610527a3e3942c4c0b0"/><file name="star-inactive.png" hash="f7fb99710be4c03ac23b1206f20e761d"/><file name="t-shirt.gif" hash="7505efdaabf13c4f8e26f7cfe15c8c96"/><file name="t-shirt.png" hash="46d7d1773118ef0a27353e8a9f6719fe"/><file name="women.png" hash="46d7d1773118ef0a27353e8a9f6719fe"/><file name="youth.png" hash="46d7d1773118ef0a27353e8a9f6719fe"/></dir></dir><file name="dropdown-arrow.gif" hash="332e99ca6b4d1e0d39972e04fb0b2395"/><file name="empty.png" hash="23dc9dc3c4751f83c2df7a5c42668824"/><file name="full-arrow.gif" hash="36ddff0fca1c7d8900cb3633e0a30cea"/><file name="full-arrow-left.gif" hash="8ec91b60d38d1a16cba7670f2088a5c7"/><file name="gel_green.png" hash="591959d831e8e42c9175d12a88f0bae2"/><file name="gel_red.png" hash="db442c023014df9da32b84bc1bb5a39f"/><file name="l-arrow.gif" hash="ee49f7eab64657b5131953acef0238fd"/><file name="loading.gif" hash="5d25806dac7cbee5f894b13144783866"/><file name="r-arrow.gif" hash="d0429a9781e915fc9d9ca8875c470d32"/><file name="remove.png" hash="ee9497c5f31933eaab3e9e352495ee12"/><file name="small_logo.gif" hash="d5c8be7c0f16aac2549759c0228492d6"/><file name="swatch_black.gif" hash="fd31d6a3a435c8ad1f7c43f346bb47e4"/><file name="swatch_custom.gif" hash="fb34791a48366957a141e12b563888c2"/><file name="swatch_default.gif" hash="fb34791a48366957a141e12b563888c2"/><file name="swatch_funk_leaf.gif" hash="f1d3ba87efb742b47da879a6f48909c4"/><file name="swatch_hot_red.gif" hash="d9363d45dc2993c2fdc3ea43c5b6f71c"/><file name="swatch_sky_blue.gif" hash="ded1455db119d09a3aedd7474fd1875a"/><file name="swatch_user_custom.gif" hash="a24f31421a1ff56d1be0845f9a7c7020"/><file name="switch-arrow.gif" hash="dc7243962b341f366cd072d486687e6a"/><file name="tab_account_android.png" hash="77605cbc87f75ca17e91a5393765ceb1"/><file name="tab_account_ipad.png" hash="2997de5402195d0720309b73c6446fab"/><file name="tab_account.png" hash="27101fbaa78a07426be4768acc4c53ff"/><file name="tab_cart_android.png" hash="477e97f8d03ea8aa674e952709f86578"/><file name="tab_cart.png" hash="e803f760ee81cb35183f1122f388b774"/><file name="tab_empty.png" hash="bdd4cc355566e8861b2c45424ad94516"/><file name="tab_home_active.png" hash="bba5eb9bb724c84c1ede9e6f4bec3575"/><file name="tab_home_android.png" hash="1fefc6b070cc21b31b43194a7d85f9d9"/><file name="tab_home.png" hash="dfa104e4da74e4a55d3c98d6ee0f7122"/><file name="tab_info_android.png" hash="67fc19d8d926f7aede482f5a7083fc71"/><file name="tab_more.png" hash="2803359cb3e795bf67457e727aa16020"/><file name="tab_page.png" hash="ca05dbc42f944b8d4255f6675f6dd93a"/><file name="tab_search_android.png" hash="932c2c568872fd9e119367c887f0539a"/><file name="tab_search.png" hash="2cf29dbe325558353621b4241543204f"/><file name="tab_shop_active.png" hash="de907d6a52d477d4319649f9b0e2e4aa"/><file name="tab_shop_android.png" hash="e119fcd20f8cba856d550a64d775ddbb"/><file name="tab_shop.png" hash="f36be0d3d27f2b37626247d3f6a55e2a"/><file name="tmp-icon.gif" hash="58b759aecf3bdae26d5aaff7a0be5c90"/><file name="xmlconnect_tab.png" hash="cd99a7e01a42a6c82d866f7684faeb95"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="xmlconnect"><dir><dir name="catalog"><dir name="category"><dir name="placeholder"><file name="image.jpg" hash="097ab8a3051bc037ea3de0e17f440540"/><file name="small_image.jpg" hash="f825d16f97a640453553c79c48ebaa73"/><file name="thumbnail.jpg" hash="b2b682d28a08a748a73d2cda70ab5a57"/></dir></dir></dir></dir><file name="tab_account.png" hash="0498d73e47ed47179e5546dc15c17dc7"/><file name="tab_cart.png" hash="9055ba76e256a51d3fee53a8c41d5226"/><file name="tab_home.png" hash="07d0af93e167b9366d3d4fb3d6cdb31c"/><file name="tab_more.png" hash="b9fc21feb8d7655bc9c2985c37b0de2f"/><file name="tab_page.png" hash="ca05dbc42f944b8d4255f6675f6dd93a"/><file name="tab_search.png" hash="25e880eb2a4d06828e2e1c3f32d22400"/><file name="tab_shop.png" hash="fe602fc2e7093efef5ecc0b027a32d91"/></dir></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="jscolor"><file name="arrow.gif" hash="5034704a76cd55c1cbcbc58ea6bf523f"/><file name="cross.gif" hash="ba9a274b9323753cd95bc3b1eb2f4e5f"/><file name="demo.html" hash="edf71251cb2be20322d2efb00aee86a6"/><file name="hs.png" hash="fefa1a03d92ebad25c88dca94a0b63db"/><file name="hv.png" hash="990d71cada17da100653636cf8490884"/><file name="jscolor.js" hash="b65a1505390592ac6c0177d6b84774e0"/></dir></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package></required></dependencies>
+</package>
diff --git a/var/package/Phoenix_Moneybookers-1.3.2.xml b/var/package/Phoenix_Moneybookers-1.3.2.xml
new file mode 100644
index 00000000000..cf6c79d02ee
--- /dev/null
+++ b/var/package/Phoenix_Moneybookers-1.3.2.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<package>
+    <name>Phoenix_Moneybookers</name>
+    <version>1.3.2</version>
+    <stability>stable</stability>
+    <license>mixed</license>
+    <channel>community</channel>
+    <extends/>
+    <summary>Moneybookers payment gateway integration</summary>
+    <description>Moneybookers payment gateway official integration, implemented by Phoenix Medien GmbH. Provides integration for payment options powered by Moneybookers, as separate payment methods:
+All Credit Cards / Visa, Mastercard, AMEX, JCB, Diners - International
+CartaSi - Italy
+Lastschrift (ELV) - Germany
+Dankort - Denmark
+Nordea Solo - Sweden
+eNETS - Singapore
+Carte Bleue - France
+Giropay - Germany
+iDeal - Netherlands
+Laser - Ireland
+EPS Online-&#xDC;berweisung - Austria
+POLi - Australia
+Postepay - Italy
+Przelewy24 - Poland
+Sofort&#xFC;berweisung - Germany
+Nordea Solo - Finland
+Moneybookers eWallet</description>
+    <notes>1.3.2</notes>
+    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
+    <date>2013-09-23</date>
+    <time>18:31:11</time>
+    <contents><target name="magecommunity"><dir name="Phoenix"><dir name="Moneybookers"><dir name="Block"><file name="Form.php" hash="d370e3ba59cc15b139c7e1e79e2ec3a8"/><file name="Info.php" hash="62e0b852138497e92e28c9b739fdeb51"/><file name="Jsinit.php" hash="806c21c3c1f6891e056c4fe217e5374b"/><file name="Payment.php" hash="47d945df55393205e90df2bdee7f57ee"/><file name="Placeform.php" hash="bb0a62dde1c87ee4518fad309ecca426"/><file name="Redirect.php" hash="690db6960e1d664f98071cc3363bbf82"/></dir><dir name="controllers"><file name="MoneybookersController.php" hash="1053419f00a59f2066eba6cee216a268"/><file name="ProcessingController.php" hash="abbb7c0deac91e3706bec90441ce1d93"/></dir><dir name="etc"><file name="config.xml" hash="e4ef3eb7e2c9e2034b4742d17a1c5172"/><file name="system.xml" hash="88c6ba64f6818bec99318033a65d21ce"/></dir><dir name="Helper"><file name="Data.php" hash="1bcfdee03be9c9b9f1de57945bc10fd8"/></dir><dir name="Model"><file name="Abstract.php" hash="a2baa08ad86464916d7ffff3911c6615"/><file name="Acc.php" hash="9acaa3fe91835c9b5cd76ca6c9652c24"/><file name="Csi.php" hash="800984e5e8f2dd8389db023f0bf94ba8"/><file name="Did.php" hash="2aabc76e6b2fce0fcd2b79fcdae2f39f"/><file name="Dnk.php" hash="5f6a72c8b66d82e1b596af71ff7761ef"/><file name="Ebt.php" hash="6f0700837364d81149375a5aff3cb432"/><file name="Ent.php" hash="e14c39741e0fa1685695f7b03ade94c7"/><file name="Event.php" hash="2157aee0bbdd7e617e38d93aa7ea25cb"/><file name="Gcb.php" hash="164aaab54b6588476311553fa1e8aa8e"/><file name="Gir.php" hash="8cbbe836c24a75f96ca254cc64b37530"/><file name="Idl.php" hash="406ea46922aec31a9a36e7546b536e93"/><file name="Lsr.php" hash="b6123f853a9c50e8a9042f22322a3c6a"/><file name="Mae.php" hash="27d52b915464d18e796e40ee1934eda4"/><file name="Npy.php" hash="3e7de0ae735d2ab2ed25f699760c0aa1"/><file name="Obt.php" hash="50574d80cbef899ede7d633578b2e501"/><file name="Pli.php" hash="03287f56e87f6c3e49b85e1f3da924c6"/><file name="Psp.php" hash="6d332cc36358e9f3f5ac620cba9af1d9"/><file name="Pwy.php" hash="51c8d18558856ad32d72cba9f98a855f"/><file name="Sft.php" hash="0b9ed6c8854b102c4a517e173254980f"/><file name="So2.php" hash="ddfb8422fcbf683bc638d30b444a33cf"/><file name="Wlt.php" hash="274c375afcbfb88771c46a690de0a28e"/></dir><dir name="sql"><dir name="moneybookers_setup"><file name="install-1.6.0.0.php" hash="a5edad640edce622fc5d38cf5c66690b"/><file name="mysql4-upgrade-1.2-1.2.0.1.php" hash="b5cdb216060dedaf870604fdfd6dc931"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Phoenix_Moneybookers.xml" hash="ac10e8e7bdc6f31b337a04ddf02b848c"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="moneybookers"><file name="info.phtml" hash="371de569215d4856bc5dd750da7bfeb4"/><file name="jsinit.phtml" hash="d20a9548b3d14db5ff25aacc0ddb1a95"/><dir name="pdf"><file name="info.phtml" hash="51f684ec55ffaef804824e20e25ebfa0"/></dir></dir></dir><dir name="layout"><file name="moneybookers.xml" hash="0acb6d2751e50ff872ceb73a8815b832"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="moneybookers"><file name="blank.phtml" hash="979c41c03b99c115e8d321ef62894eb3"/><file name="form.phtml" hash="879d913e2f6c7998e2b3807ae0ac4ea4"/><file name="info.phtml" hash="fe7450458a4474af9a8504e5f9c6532a"/><file name="payment.phtml" hash="a0c66a3b497ba93d42d60d2066b12cfb"/><file name="placeform.phtml" hash="bda8632a83fd18084b940de62b0b34a6"/><file name="redirect.phtml" hash="99811d651f215827bbd85db9ade1824b"/></dir></dir><dir name="layout"><file name="moneybookers.xml" hash="77c8ea88bca59d2ae02227329deca4ec"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Phoenix_Moneybookers.csv" hash="c92cee5c0ca36fdedfbab70e95a91983"/><dir name="template"><dir name="email"><file name="moneybookers_activateemail.html" hash="035d73b26c54c8042e03e7551df49457"/></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="moneybookers"><file name="banner_120_de.gif" hash="74815117bf378543e5b3496bb5bc4e8a"/><file name="banner_120_de.png" hash="6c3f708fcb6dac92e53472d4c2246c68"/><file name="banner_120_dk.gif" hash="2106bd994d188d40474bf2a2e8d62a8d"/><file name="banner_120_fr.gif" hash="a84241eef7bc38fb38567e7aa8ca245a"/><file name="banner_120_fr.png" hash="8994d1dc3b4f5c9e5efc67ce3f9f55a9"/><file name="banner_120_int.gif" hash="e23ddcf71e15f0a9300062ef9cdea512"/><file name="banner_120_int.png" hash="f9dfbc26041e52b34eea65348707d64f"/><file name="banner_120_pl.gif" hash="44313c7d27cdcf59c2f66708c6c5abd5"/><file name="banner_120_pl.png" hash="67d3385f93bc9113880305ee7c7da9de"/><file name="banner_120_sp.gif" hash="a003ed8db63620672ae945682b1e1e39"/><file name="banner_120_sp.png" hash="f9c4a653d6814ab3f8c535da706f5f77"/><file name="moneybookers_acc.png" hash="a3e639a68fafdffaca81e91985127735"/><file name="moneybookers_csi.gif" hash="4eec4ed7c494d01d518a3c6c691128e9"/><file name="moneybookers_did.gif" hash="6a3a3365894e9cdb199647a5b74ba35b"/><file name="moneybookers_dnk.gif" hash="7d4b8d27784f8a6fa6ef81c4e911831b"/><file name="moneybookers_ebt.gif" hash="9911d8cc223e7f3d9ec12f50c280ec61"/><file name="moneybookers_ent.gif" hash="704e9551ed4aff82b67114242b9fba1a"/><file name="moneybookers_gcb.gif" hash="e2e7c0f501e5ab0136f859ca5f57abc2"/><file name="moneybookers_gir.gif" hash="f16e949bc60bbd812f803d5e377d47f6"/><file name="moneybookers_idl.gif" hash="fe0ad1efc12d43df6c9ff3ffdd9dd59b"/><file name="moneybookers_lsr.gif" hash="58cdadfa20b6d37aeaa19e50995e4baf"/><file name="moneybookers_mae.gif" hash="4d4b5f0cf3377939c7738fc7e416d25f"/><file name="moneybookers_npy.gif" hash="01242c5ad7bc667e7493b550b6397fab"/><file name="moneybookers_obt_de.png" hash="ce44fd2974b8d279401778292e2c4484"/><file name="moneybookers_obt_dk.png" hash="2985e8cb472d1886d584fa31d56bee92"/><file name="moneybookers_obt_ee.png" hash="cb186be1c7595544f61d3737c7bf85aa"/><file name="moneybookers_obt_en.png" hash="eee098a06e3ea34f33e276724b084774"/><file name="moneybookers_obt_fl.png" hash="6c3766df052d875ce399e62ad8a435f8"/><file name="moneybookers_obt_lt.png" hash="adf61f248fc6d5985840db3e0c23391e"/><file name="moneybookers_obt_lv.png" hash="4e7f16b4988ea30f049942d4dcdb5f78"/><file name="moneybookers_obt_pl.png" hash="fb2c43c18ba73d390e5b5f5261261f4a"/><file name="moneybookers_obt_se.png" hash="9028412e9c3f25d114bf40bb2049d225"/><file name="moneybookers_pli.gif" hash="93989e85caff760af7a61838db0300bf"/><file name="moneybookers_psp.gif" hash="7abffc2246f172625be2ce31f4315cb2"/><file name="moneybookers_pwy.gif" hash="b4a0b9db9a031855e6e3899592012fae"/><file name="moneybookers_sft.gif" hash="e9e774163c99a8ab4deb18d37feaf658"/><file name="moneybookers_so2.gif" hash="9911d8cc223e7f3d9ec12f50c280ec61"/><file name="moneybookers_wlt.gif" hash="4b9cbc5aa5c32f3015ce7bec98da2670"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="moneybookers"><file name="banner.jpg" hash="382b1eea5550ce6c1b88cd4444058362"/></dir></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="mage"><dir name="adminhtml"><file name="moneybookers.js" hash="2756bb10b93219bd265e8d2759ab7123"/></dir></dir></dir></target></contents>
+    <compatible/>
+    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package></required></dependencies>
+</package>